modify

java110-bean/src/main/java/com/java110/po/accessControlWhite/AccessControlWhitePo.java

@@ -17,6 +17,7 @@ package com.java110.po.accessControlWhite;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2023-01-24 00:53:53 mail: 928255095@qq.com
@@ -28,97 +29,122 @@ import java.util.Date;
 public class AccessControlWhitePo implements Serializable {
 
     private String thirdId;
-private String idCard;
-private String accessControlKey;
-private String statusCd = "0";
-private String personName;
-private String machineId;
-private String acwId;
-private String personId;
-private String tel;
-private String startTime;
-private String endTime;
-private String communityId;
-private String personType;
-public String getThirdId() {
+    private String idCard;
+    private String accessControlKey;
+    private String statusCd = "0";
+    private String personName;
+    private String machineId;
+    private String acwId;
+    private String personId;
+    private String tel;
+    private String startTime;
+    private String endTime;
+    private String communityId;
+    private String personType;
+
+    public String getThirdId() {
         return thirdId;
     }
-public void setThirdId(String thirdId) {
+
+    public void setThirdId(String thirdId) {
         this.thirdId = thirdId;
     }
-public String getIdCard() {
+
+    public String getIdCard() {
         return idCard;
     }
-public void setIdCard(String idCard) {
+
+    public void setIdCard(String idCard) {
         this.idCard = idCard;
     }
-public String getAccessControlKey() {
+
+    public String getAccessControlKey() {
         return accessControlKey;
     }
-public void setAccessControlKey(String accessControlKey) {
+
+    public void setAccessControlKey(String accessControlKey) {
         this.accessControlKey = accessControlKey;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getPersonName() {
+
+    public String getPersonName() {
         return personName;
     }
-public void setPersonName(String personName) {
+
+    public void setPersonName(String personName) {
         this.personName = personName;
     }
-public String getMachineId() {
+
+    public String getMachineId() {
         return machineId;
     }
-public void setMachineId(String machineId) {
+
+    public void setMachineId(String machineId) {
         this.machineId = machineId;
     }
-public String getAcwId() {
+
+    public String getAcwId() {
         return acwId;
     }
-public void setAcwId(String acwId) {
+
+    public void setAcwId(String acwId) {
         this.acwId = acwId;
     }
-public String getPersonId() {
+
+    public String getPersonId() {
         return personId;
     }
-public void setPersonId(String personId) {
+
+    public void setPersonId(String personId) {
         this.personId = personId;
     }
-public String getTel() {
+
+    public String getTel() {
         return tel;
     }
-public void setTel(String tel) {
+
+    public void setTel(String tel) {
         this.tel = tel;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getPersonType() {
+
+    public String getPersonType() {
         return personType;
     }
-public void setPersonType(String personType) {
+
+    public void setPersonType(String personType) {
         this.personType = personType;
     }
 
 
-
 }

service-api/src/main/java/com/java110/api/controller/app/file/UserDownloadFileController.java

@@ -1,6 +1,5 @@
 package com.java110.api.controller.app.file;
 
-import com.java110.api.controller.app.payment.NotifyPaymentController;
 import com.java110.core.client.FileUploadTemplate;
 import com.java110.core.log.LoggerFactory;
 import com.java110.dto.userDownloadFile.UserDownloadFileDto;

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

@@ -22,6 +22,8 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.accessControlWhite.AccessControlWhiteAuthDto;
+import com.java110.dto.accessControlWhite.AccessControlWhiteDto;
 import com.java110.intf.common.IAccessControlWhiteAuthV1InnerServiceSMO;
 import com.java110.po.accessControlWhiteAuth.AccessControlWhiteAuthPo;
 import com.java110.utils.exception.CmdException;
@@ -58,6 +60,14 @@ public class SaveAccessControlWhiteAuthCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "machineId", "请求报文中未包含machineId");
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
 
+        AccessControlWhiteAuthDto accessControlWhiteAuthDto = new AccessControlWhiteAuthDto();
+        accessControlWhiteAuthDto.setAcwId(reqJson.getString("acwId"));
+        accessControlWhiteAuthDto.setMachineId(reqJson.getString("machineId"));
+        int count = accessControlWhiteAuthV1InnerServiceSMOImpl.queryAccessControlWhiteAuthsCount(accessControlWhiteAuthDto);
+
+        if (count > 0) {
+            throw new CmdException("请勿重复授权");
+        }
     }
 
     @Override

service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java

@@ -176,6 +176,9 @@ public class ListVisitsCmd extends Cmd {
 
         for(ApiVisitDataVo apiVisitDataVo: visits){
             for(OwnerDto tmpOwnerDto : ownerDtos){
+                if(StringUtil.isEmpty(apiVisitDataVo.getOwnerId())){
+                    continue;
+                }
                 if(!apiVisitDataVo.getOwnerId().equals(tmpOwnerDto.getOwnerId())){
                     continue;
                 }

service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java

@@ -77,7 +77,7 @@ public class SaveVisitSettingCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "typeName", "请求报文中未包含typeName");
         Assert.hasKeyAndValue(reqJson, "faceWay", "请求报文中未包含faceWay");
         Assert.hasKeyAndValue(reqJson, "carNumWay", "请求报文中未包含carNumWay");
-        Assert.hasKeyAndValue(reqJson, "paId", "请求报文中未包含paId");
+
         Assert.hasKeyAndValue(reqJson, "auditWay", "请求报文中未包含auditWay");
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");