修改客户端采集功能

src/main/java/com/founder/cjqx/controller/SysClientVpController.java

@@ -4,6 +4,7 @@ package com.founder.cjqx.controller;
 import com.founder.cjqx.service.SysClientVpService;
 import com.founder.model.ResultMap;
 import com.founder.model.SysClientVp;
+import com.founder.model.User;
 import com.founder.model.XzxtRestResult;
 import com.founder.utils.SysUitl;
 import org.slf4j.Logger;
@@ -15,6 +16,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+import static com.cc.utls.Base64Util.xzxtencode;
 
 /**
  * Created by changchao on 2018/12/5.
@@ -30,8 +34,25 @@ public class SysClientVpController {
       */
     @GetMapping("/sysClientVplist")
     @ResponseBody
-    public ResultMap sysClientVplist(Model model, SysClientVp sysClientVp){
+    public ResultMap sysClientVplist(Model model, SysClientVp sysClientVp,HttpServletRequest request){
         ResultMap resultMap=new ResultMap();
+        User user =(User)request.getSession().getAttribute("User");
+        System.out.println("sysClientVp.getCjsblxcode()===" + sysClientVp.getCjsblxcode());
+        //设备审批管理  默认查询本单位
+        if(sysClientVp.getCjsblxcode().equals("1")){
+            sysClientVp.setSsdwcode(user.getUnitcode());
+        }
+        //我的设备管理  默认查询本人采集
+        if(sysClientVp.getCjsblxcode().equals("2")){
+            sysClientVp.setZrmjjh(user.getPolicemanid());
+        }
+        //ip  mac 加密   查询条件加密
+        if(sysClientVp.getIp()!=null&&!sysClientVp.getIp().equals("")){
+            sysClientVp.setIp(xzxtencode(sysClientVp.getIp()));
+        }
+        if(sysClientVp.getMac()!=null&&!sysClientVp.getMac().equals("")){
+            sysClientVp.setMac(xzxtencode(sysClientVp.getMac()));
+        }
         resultMap =sysClientVpService.ClientVpAll(sysClientVp);
         return resultMap;
     }
@@ -51,9 +72,8 @@ public class SysClientVpController {
     public String newSheb(HttpServletRequest request, HttpServletResponse response, Model model){
         try {
             String ip = SysUitl.getIp(request);
-            //  System.out.println("mac====" + SysUitl.getLocalMac());
             model.addAttribute("sip", ip);
-            model.addAttribute("mac", SysUitl.getMac(ip));
+            model.addAttribute("mac", SysUitl.getkhdMac(ip));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -69,7 +89,7 @@ public class SysClientVpController {
         return "cjqx/shebupdate";
     }
     //修改
-    @PutMapping("/UpdateClientVp")
+    @PostMapping("/updateClientVp")
     @ResponseBody
     public XzxtRestResult UpdateClientVp(SysClientVp sysClientVp){
         return sysClientVpService.updateClientVp(sysClientVp);
@@ -80,4 +100,14 @@ public class SysClientVpController {
     public XzxtRestResult deleteClientVp(@PathVariable("id") String id){
         return sysClientVpService.deleteClientVp(id);
     }
+
+    /*
+审批设备
+*/
+    @GetMapping("/spClientVp/{id}")
+    @ResponseBody
+    public XzxtRestResult spClientVp(@PathVariable("id") String id, @RequestParam(name = "spzt") String spzt,HttpServletRequest request){
+        User user =(User)request.getSession().getAttribute("User");
+        return sysClientVpService.spClientVp(id,spzt,user);
+    }
 }

src/main/java/com/founder/cjqx/dao/SysClientVpMapper.java

@@ -15,4 +15,5 @@ public interface SysClientVpMapper {
     SysClientVp selectSysClientVp(String id);
     int updateSysClientVp(SysClientVp sysClientVp);
     int deleteSysClientVp(String id);
+    int checkSysClientVp(SysClientVp sysClientVp);
 }
\ No newline at end of file

src/main/java/com/founder/cjqx/service/SysClientVpService.java

@@ -2,6 +2,7 @@ package com.founder.cjqx.service;
 
 import com.founder.model.ResultMap;
 import com.founder.model.SysClientVp;
+import com.founder.model.User;
 import com.founder.model.XzxtRestResult;
 
 /**
@@ -13,5 +14,6 @@ public interface SysClientVpService {
     XzxtRestResult SelectClientVp(String id);
     XzxtRestResult updateClientVp(SysClientVp sysClientVp);
     XzxtRestResult deleteClientVp(String id);
+    XzxtRestResult spClientVp(String id, String spzt, User user);
 
 }

src/main/java/com/founder/cjqx/service/impl/SysClientVpServiceImpl.java

@@ -5,6 +5,7 @@ import com.founder.cjqx.dao.SysClientVpMapper;
 import com.founder.cjqx.service.SysClientVpService;
 import com.founder.model.ResultMap;
 import com.founder.model.SysClientVp;
+import com.founder.model.User;
 import com.founder.model.XzxtRestResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,6 +43,12 @@ public class SysClientVpServiceImpl implements SysClientVpService {
                 if(sysClient.getVid().length()>=24){
                     sysClient.setVid(xzxtdecode(sysClient.getVid()));
                 }
+                if(sysClient.getIp()!=null && sysClient.getIp().length()>=24){
+                    sysClient.setIp(xzxtdecode(sysClient.getIp()));
+                }
+                if(sysClient.getMac()!=null && sysClient.getMac().length()>=24){
+                    sysClient.setMac(xzxtdecode(sysClient.getMac()));
+                }
             }
             int totals=sysClientVpMapper.selectPageCount(sysClientVp);
             resultMap.setCount(totals);
@@ -58,11 +65,20 @@ public class SysClientVpServiceImpl implements SysClientVpService {
         //加密算法（自定义）
         sysClientVp.setPid(xzxtencode(sysClientVp.getPid()));
         sysClientVp.setVid(xzxtencode(sysClientVp.getVid()));
-        int num=sysClientVpMapper.saveSysClientVp(sysClientVp);
-        if(num==1){
-            return XzxtRestResult.build(201,"存入成功");
-        }else{
-            return XzxtRestResult.build(202,"存入失败");
+        //ip  mac 加密
+        sysClientVp.setIp(xzxtencode(sysClientVp.getIp()));
+        sysClientVp.setMac(xzxtencode(sysClientVp.getMac()));
+        //插入之前先进行验证   ip和mac 唯一性
+        int checknum = sysClientVpMapper.checkSysClientVp(sysClientVp);
+        if(checknum>=1){
+            return XzxtRestResult.build(203,"ip与mac已经注册");
+        }else {
+            int num = sysClientVpMapper.saveSysClientVp(sysClientVp);
+            if (num == 1) {
+                return XzxtRestResult.build(201, "存入成功");
+            } else {
+                return XzxtRestResult.build(202, "存入失败");
+            }
         }
     }
 
@@ -77,6 +93,12 @@ public class SysClientVpServiceImpl implements SysClientVpService {
             if(sysClientVp.getVid().length()>=24){
                 sysClientVp.setVid(xzxtdecode(sysClientVp.getVid()));
             }
+            if(sysClientVp.getIp().length()>=24){
+                sysClientVp.setIp(xzxtdecode(sysClientVp.getIp()));
+            }
+            if(sysClientVp.getMac().length()>=24){
+                sysClientVp.setMac(xzxtdecode(sysClientVp.getMac()));
+            }
             return XzxtRestResult.build(201,"读取成功",sysClientVp);
         }else{
             return XzxtRestResult.build(202,"读取失败","");
@@ -88,6 +110,9 @@ public class SysClientVpServiceImpl implements SysClientVpService {
         //加密算法（自定义）
         sysClientVp.setPid(xzxtencode(sysClientVp.getPid()));
         sysClientVp.setVid(xzxtencode(sysClientVp.getVid()));
+        //ip  mac 加密
+        sysClientVp.setIp(xzxtencode(sysClientVp.getIp()));
+        sysClientVp.setMac(xzxtencode(sysClientVp.getMac()));
         int num=sysClientVpMapper.updateSysClientVp(sysClientVp);
         if(num==1){
             return XzxtRestResult.build(201,"更新成功");
@@ -106,4 +131,34 @@ public class SysClientVpServiceImpl implements SysClientVpService {
             return XzxtRestResult.build(202,"删除失败");
         }
     }
+
+    @Override
+    public XzxtRestResult spClientVp(String id,String spzt,User user)
+    {
+       // SysClientVp sysClientVp=sysClientVpMapper.selectSysClientVp(id);
+       //只更新审批相关字段
+        SysClientVp sysClientVp = new SysClientVp();
+        sysClientVp.setId(id);
+        sysClientVp.setSpzt(spzt);
+        sysClientVp.setSpsj(new Date());
+        sysClientVp.setSprjh(user.getPolicemanid());
+        sysClientVp.setSprxm(user.getTrueName());
+        sysClientVp.setSprdwdm(user.getUnitcode());
+        sysClientVp.setSprdwmc(user.getUnitname());
+        if(spzt.equals("1")){//通过
+            sysClientVp.setSpyj("通过");
+            sysClientVp.setSbztstr("启用");
+        }else{  //退回
+            sysClientVp.setSpyj("退回");
+            sysClientVp.setSbztstr("禁用");
+        }
+        int num=sysClientVpMapper.updateSysClientVp(sysClientVp);
+        if(spzt.equals("1")&&num==1){
+            return XzxtRestResult.build(201,"审批通过");
+        }else if(spzt.equals("2")&&num==1){
+           return XzxtRestResult.build(202,"审批退回");
+        }else{
+            return XzxtRestResult.build(203,"操作失败");
+        }
+    }
 }

src/main/java/com/founder/model/SysClientVp.java

@@ -27,7 +27,7 @@ public class SysClientVp extends PageBean{
 
     private String edzydqcode;
 
-    private String sftzzccjyname;
+    private String sftzzzcjyname;
 
     private String sftzzzcjycode;
 
@@ -103,6 +103,20 @@ public class SysClientVp extends PageBean{
 
     private String sbztstr;
 
+    private String spyj;
+
+    private Date spsj;
+
+    private Date gxsj;
+
+    private String sprjh;
+
+    private String sprxm;
+
+    private String sprdwdm;
+
+    private String sprdwmc;
+
 
     public String getCjsblxcode() {
         return cjsblxcode;
@@ -209,13 +223,6 @@ public class SysClientVp extends PageBean{
         this.edzydqcode = edzydqcode;
     }
 
-    public String getSftzzccjyname() {
-        return sftzzccjyname;
-    }
-
-    public void setSftzzccjyname(String sftzzccjyname) {
-        this.sftzzccjyname = sftzzccjyname;
-    }
 
     public String getSftzzzcjycode() {
         return sftzzzcjycode;
@@ -505,6 +512,71 @@ public class SysClientVp extends PageBean{
         this.sbztstr = sbztstr;
     }
 
+    public String getSpyj() {
+        return spyj;
+    }
+
+    public void setSpyj(String spyj) {
+        this.spyj = spyj;
+    }
+
+    public Date getSpsj() {
+        return spsj;
+    }
+
+    public void setSpsj(Date spsj) {
+        this.spsj = spsj;
+    }
+
+    public Date getGxsj() {
+        return gxsj;
+    }
+
+    public void setGxsj(Date gxsj) {
+        this.gxsj = gxsj;
+    }
+
+    public String getSftzzzcjyname() {
+        return sftzzzcjyname;
+    }
+
+    public void setSftzzzcjyname(String sftzzzcjyname) {
+        this.sftzzzcjyname = sftzzzcjyname;
+    }
+
+    public String getSprjh() {
+        return sprjh;
+    }
+
+    public void setSprjh(String sprjh) {
+        this.sprjh = sprjh;
+    }
+
+    public String getSprxm() {
+        return sprxm;
+    }
+
+    public void setSprxm(String sprxm) {
+        this.sprxm = sprxm;
+    }
+
+    public String getSprdwdm() {
+        return sprdwdm;
+    }
+
+    public void setSprdwdm(String sprdwdm) {
+        this.sprdwdm = sprdwdm;
+    }
+
+    public String getSprdwmc() {
+        return sprdwmc;
+    }
+
+    public void setSprdwmc(String sprdwmc) {
+        this.sprdwmc = sprdwmc;
+    }
+
+
 
 
 }
\ No newline at end of file