添加修改时的IP和mac验证

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

@@ -37,7 +37,6 @@ public class SysClientVpController {
     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());

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

@@ -60,8 +60,6 @@ public class SysClientVpServiceImpl implements SysClientVpService {
 
     @Override
     public XzxtRestResult SaveClientVp(SysClientVp sysClientVp) {
-        sysClientVp.setId(getNextId());
-        sysClientVp.setScbz("0");
         //加密算法（自定义）
         sysClientVp.setPid(xzxtencode(sysClientVp.getPid()));
         sysClientVp.setVid(xzxtencode(sysClientVp.getVid()));
@@ -73,6 +71,8 @@ public class SysClientVpServiceImpl implements SysClientVpService {
         if(checknum>=1){
             return XzxtRestResult.build(203,"ip与mac已经注册");
         }else {
+            sysClientVp.setId(getNextId());
+            sysClientVp.setScbz("0");
             int num = sysClientVpMapper.saveSysClientVp(sysClientVp);
             if (num == 1) {
                 return XzxtRestResult.build(201, "存入成功");
@@ -113,11 +113,16 @@ public class SysClientVpServiceImpl implements SysClientVpService {
         //ip  mac 加密
         sysClientVp.setIp(xzxtencode(sysClientVp.getIp()));
         sysClientVp.setMac(xzxtencode(sysClientVp.getMac()));
-        int num=sysClientVpMapper.updateSysClientVp(sysClientVp);
-        if(num==1){
-            return XzxtRestResult.build(201,"更新成功");
-        }else{
-            return XzxtRestResult.build(202,"更新失败");
+        int checknum = sysClientVpMapper.checkSysClientVp(sysClientVp);
+        if(checknum>=1){
+            return XzxtRestResult.build(203,"ip与mac已经注册");
+        }else {
+            int num = sysClientVpMapper.updateSysClientVp(sysClientVp);
+            if (num == 1) {
+                return XzxtRestResult.build(201, "更新成功");
+            } else {
+                return XzxtRestResult.build(202, "更新失败");
+            }
         }
     }
 

src/main/resources/mapper/SysClientVpMapper.xml

@@ -343,6 +343,8 @@
 
     <select id="checkSysClientVp" parameterType="com.founder.model.SysClientVp" resultType="java.lang.Integer">
         select count(1) from Sys_Client_Vp
-         where Ip = #{ip,jdbcType=VARCHAR }  and mac = #{mac,jdbcType=VARCHAR } AND SCBZ='0'
+         where Ip = #{ip,jdbcType=VARCHAR }  and mac = #{mac,jdbcType=VARCHAR }
+        <if test="id!=null and id !=''">AND  id != #{id}</if>
+          AND SCBZ='0'
     </select>
 </mapper>
\ No newline at end of file