优化添加 门禁白名单

java110-bean/src/main/java/com/java110/dto/accessControlWhite/AccessControlWhiteDto.java

@@ -28,6 +28,8 @@ public class AccessControlWhiteDto extends MachineDto implements Serializable {
     private String endTime;
     private String communityId;
     private String personType;
+    private String personTypeName;
+
 
     private String statusCd = "0";
     private String personFace;
@@ -146,4 +148,12 @@ public class AccessControlWhiteDto extends MachineDto implements Serializable {
     public void setPersonFace(String personFace) {
         this.personFace = personFace;
     }
+
+    public String getPersonTypeName() {
+        return personTypeName;
+    }
+
+    public void setPersonTypeName(String personTypeName) {
+        this.personTypeName = personTypeName;
+    }
 }

java110-db/src/main/resources/mapper/common/AccessControlWhiteV1ServiceDaoImplMapper.xml

@@ -21,7 +21,7 @@
         accessControlKey,t.status_cd,t.status_cd statusCd,t.person_name,t.person_name
         personName,t.machine_id,t.machine_id machineId,t.acw_id,t.acw_id acwId,t.person_id,t.person_id
         personId,t.tel,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id
-        communityId,t.person_type,t.person_type personType,t.create_time createTime,m.machine_code,m.machine_name machineName,
+        communityId,t.person_type,t.person_type personType,t.create_time createTime,m.machine_code machineCode,m.machine_name machineName,
         td.`name` personTypeName
         from access_control_white t
         left join machine m on t.machine_id = m.machine_id and m.status_cd = '0'

service-common/src/main/java/com/java110/common/cmd/machine/SaveAccessControlWhiteCmd.java

@@ -23,6 +23,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.smo.IPhotoSMO;
+import com.java110.dto.accessControlWhite.AccessControlWhiteDto;
 import com.java110.intf.common.IAccessControlWhiteV1InnerServiceSMO;
 import com.java110.po.accessControlWhite.AccessControlWhitePo;
 import com.java110.utils.exception.CmdException;
@@ -66,6 +67,14 @@ public class SaveAccessControlWhiteCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
         Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
 
+        AccessControlWhiteDto accessControlWhiteDto = new AccessControlWhiteDto();
+        accessControlWhiteDto.setCommunityId(reqJson.getString("communityId"));
+        accessControlWhiteDto.setTel(reqJson.getString("tel"));
+        int count = accessControlWhiteV1InnerServiceSMOImpl.queryAccessControlWhitesCount(accessControlWhiteDto);
+        if (count > 0) {
+            throw new CmdException(reqJson.getString("personName") + "-" + reqJson.getString("tel") + ",人员已存在，您可以删除重新添加，或者修改");
+        }
+
     }
 
     @Override