优化代码

java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -290,7 +290,9 @@ public class GenerateCodeFactory {
             count = lastCount++;
         } finally {
             LOCK.unlock();
-            return getRandom() + String.format(idLength, count);
+            String id = getRandom() + String.format(idLength, count);
+            id = id.replace("-","");
+            return id;
         }
     }
 

service-job/src/main/java/com/java110/job/adapt/hcIot/machine/AddAccessControlWhiteToIotAdapt.java

@@ -15,26 +15,17 @@
  */
 package com.java110.job.adapt.hcIot.machine;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.RoomDto;
+import com.java110.dto.accessControlWhite.AccessControlWhiteAuthDto;
 import com.java110.dto.accessControlWhite.AccessControlWhiteDto;
-import com.java110.dto.file.FileDto;
 import com.java110.dto.file.FileRelDto;
-import com.java110.dto.machine.MachineDto;
 import com.java110.dto.owner.OwnerAttrDto;
-import com.java110.dto.owner.OwnerDto;
 import com.java110.entity.order.Business;
-import com.java110.intf.common.IAccessControlWhiteV1InnerServiceSMO;
-import com.java110.intf.common.IFileInnerServiceSMO;
-import com.java110.intf.common.IFileRelInnerServiceSMO;
-import com.java110.intf.common.IMachineInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.intf.common.*;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
 import com.java110.po.accessControlWhite.AccessControlWhitePo;
-import com.java110.po.owner.OwnerPo;
+import com.java110.po.accessControlWhiteAuth.AccessControlWhiteAuthPo;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.*;
@@ -51,8 +42,8 @@ import java.util.List;
  *
  * @desc add by 吴学文 18:58
  */
-@Component(value = "addAccessControlWhiteToIotAdapt")
-public class AddAccessControlWhiteToIotAdapt extends DatabusAdaptImpl {
+@Component(value = "addAccessControlWhiteAuthToIotAdapt")
+public class AddAccessControlWhiteAuthToIotAdapt extends DatabusAdaptImpl {
 
     @Autowired
     private IIotSendAsyn hcMachineAsynImpl;
@@ -62,6 +53,8 @@ public class AddAccessControlWhiteToIotAdapt extends DatabusAdaptImpl {
 
     @Autowired
     private IAccessControlWhiteV1InnerServiceSMO accessControlWhiteV1InnerServiceSMOImpl;
+    @Autowired
+    private IAccessControlWhiteAuthV1InnerServiceSMO accessControlWhiteAuthV1InnerServiceSMOImpl;
 
     @Autowired
     private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
@@ -92,10 +85,18 @@ public class AddAccessControlWhiteToIotAdapt extends DatabusAdaptImpl {
 
         System.out.printf("进入门禁白名单页面");
 
-        AccessControlWhitePo accessControlWhitePo = BeanConvertUtil.covertBean(data, AccessControlWhitePo.class);
+        AccessControlWhiteAuthPo accessControlWhiteAuthPo = BeanConvertUtil.covertBean(data, AccessControlWhiteAuthPo.class);
+
+        AccessControlWhiteAuthDto accessControlWhiteAuthDto = new AccessControlWhiteAuthDto();
+        accessControlWhiteAuthDto.setAcwaId(accessControlWhiteAuthPo.getAcwaId());
+        List<AccessControlWhiteAuthDto> accessControlWhiteAuthDtos
+                = accessControlWhiteAuthV1InnerServiceSMOImpl.queryAccessControlWhiteAuths(accessControlWhiteAuthDto);
+        if(accessControlWhiteAuthDtos == null || accessControlWhiteAuthDtos.size()<1){
+            return ;
+        }
 
         AccessControlWhiteDto accessControlWhiteDto = new AccessControlWhiteDto();
-        accessControlWhiteDto.setAcwId(accessControlWhitePo.getAcwId());
+        accessControlWhiteDto.setAcwId(accessControlWhiteAuthDtos.get(0).getAcwId());
         accessControlWhiteDto.setCommunityId(accessControlWhiteDto.getCommunityId());
         accessControlWhiteDto.setPage(1);
         accessControlWhiteDto.setRow(1);
@@ -106,7 +107,7 @@ public class AddAccessControlWhiteToIotAdapt extends DatabusAdaptImpl {
         AccessControlWhiteDto tmpAccessControlWhiteDto = accessControlWhiteDtos.get(0);
 
         FileRelDto fileRelDto = new FileRelDto();
-        fileRelDto.setObjId(accessControlWhitePo.getAcwId());
+        fileRelDto.setObjId(accessControlWhiteAuthDtos.get(0).getAcwId());
         //fileRelDto.setRelTypeCd("10000");
         List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
         if (fileRelDtos == null || fileRelDtos.size() != 1) {
@@ -137,8 +138,8 @@ public class AddAccessControlWhiteToIotAdapt extends DatabusAdaptImpl {
         postParameters.put("name", tmpAccessControlWhiteDto.getPersonName());
         postParameters.put("idNumber", tmpAccessControlWhiteDto.getIdCard());
         postParameters.put("link", tmpAccessControlWhiteDto.getTel());
-        //postParameters.put("machineCode", tmpAccessControlWhiteDto.getMachineCode());
-        postParameters.put("extMachineId", tmpAccessControlWhiteDto.getMachineId());
+        postParameters.put("machineCode", accessControlWhiteAuthDtos.get(0).getMachineCode());
+        postParameters.put("extMachineId", accessControlWhiteAuthDtos.get(0).getMachineId());
         postParameters.put("extCommunityId", tmpAccessControlWhiteDto.getCommunityId());
         List<OwnerAttrDto> ownerAttrDtos = new ArrayList<>();
         OwnerAttrDto ownerAttrDto = new OwnerAttrDto();

service-job/src/main/java/com/java110/job/adapt/hcIot/machine/DeleteAccessControlWhiteToIotAdapt.java

@@ -15,26 +15,22 @@
  */
 package com.java110.job.adapt.hcIot.machine;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.accessControlWhite.AccessControlWhiteAuthDto;
 import com.java110.dto.accessControlWhite.AccessControlWhiteDto;
-import com.java110.dto.machine.MachineDto;
-import com.java110.dto.owner.OwnerDto;
 import com.java110.entity.order.Business;
+import com.java110.intf.common.IAccessControlWhiteAuthV1InnerServiceSMO;
 import com.java110.intf.common.IAccessControlWhiteV1InnerServiceSMO;
 import com.java110.intf.common.IMachineInnerServiceSMO;
-import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
 import com.java110.po.accessControlWhite.AccessControlWhitePo;
-import com.java110.po.owner.OwnerPo;
-import com.java110.utils.constant.StatusConstant;
+import com.java110.po.accessControlWhiteAuth.AccessControlWhiteAuthPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -44,8 +40,8 @@ import java.util.List;
  *
  * @desc add by 吴学文 18:58
  */
-@Component(value = "deleteAccessControlWhiteToIotAdapt")
-public class DeleteAccessControlWhiteToIotAdapt extends DatabusAdaptImpl {
+@Component(value = "deleteAccessControlWhiteAuthToIotAdapt")
+public class DeleteAccessControlWhiteAuthToIotAdapt extends DatabusAdaptImpl {
 
     @Autowired
     private IIotSendAsyn hcMachineAsynImpl;
@@ -56,6 +52,9 @@ public class DeleteAccessControlWhiteToIotAdapt extends DatabusAdaptImpl {
     @Autowired
     private IAccessControlWhiteV1InnerServiceSMO accessControlWhiteV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IAccessControlWhiteAuthV1InnerServiceSMO accessControlWhiteAuthV1InnerServiceSMOImpl;
+
 
     /**
      * {
@@ -74,14 +73,23 @@ public class DeleteAccessControlWhiteToIotAdapt extends DatabusAdaptImpl {
 
     private void doSendMachine(Business business, JSONObject data) {
 
-        AccessControlWhitePo accessControlWhitePo = BeanConvertUtil.covertBean(data, AccessControlWhitePo.class);
+        AccessControlWhiteAuthPo accessControlWhiteAuthPo = BeanConvertUtil.covertBean(data, AccessControlWhiteAuthPo.class);
+
+        AccessControlWhiteAuthDto accessControlWhiteAuthDto = new AccessControlWhiteAuthDto();
+        accessControlWhiteAuthDto.setAcwaId(accessControlWhiteAuthPo.getAcwaId());
+        accessControlWhiteAuthDto.setStatusCd("1");
+        List<AccessControlWhiteAuthDto> accessControlWhiteAuthDtos
+                = accessControlWhiteAuthV1InnerServiceSMOImpl.queryAccessControlWhiteAuths(accessControlWhiteAuthDto);
+        if(accessControlWhiteAuthDtos == null || accessControlWhiteAuthDtos.size()<1){
+            return ;
+        }
 
         AccessControlWhiteDto accessControlWhiteDto = new AccessControlWhiteDto();
-        accessControlWhiteDto.setAcwId(accessControlWhitePo.getAcwId());
+        accessControlWhiteDto.setAcwId(accessControlWhiteAuthDtos.get(0).getAcwId());
         accessControlWhiteDto.setCommunityId(accessControlWhiteDto.getCommunityId());
         accessControlWhiteDto.setPage(1);
         accessControlWhiteDto.setRow(1);
-        accessControlWhiteDto.setStatusCd("1"); //这个时候已经删除了 所以查询删除记录
+        accessControlWhiteDto.setStatusCd(""); //这个时候已经删除了 所以查询删除记录
         List<AccessControlWhiteDto> accessControlWhiteDtos = accessControlWhiteV1InnerServiceSMOImpl.queryAccessControlWhites(accessControlWhiteDto);
         Assert.listOnlyOne(accessControlWhiteDtos, "门禁白名单不存在");
 
@@ -90,7 +98,7 @@ public class DeleteAccessControlWhiteToIotAdapt extends DatabusAdaptImpl {
         //postParameters.put("machineCode", tmpAccessControlWhiteDto.getMachineCode());
         postParameters.put("userId", tmpAccessControlWhiteDto.getPersonId());
         postParameters.put("name", tmpAccessControlWhiteDto.getPersonName());
-        postParameters.put("extMachineId", tmpAccessControlWhiteDto.getMachineId());
+        postParameters.put("extMachineId", accessControlWhiteAuthDtos.get(0).getMachineId());
         postParameters.put("extCommunityId", tmpAccessControlWhiteDto.getCommunityId());
         hcMachineAsynImpl.sendDeleteOwner(postParameters);
 

service-job/src/main/java/com/java110/job/adapt/hcIot/machine/EditAccessControlWhiteToIotAdapt.java

@@ -16,14 +16,12 @@
 package com.java110.job.adapt.hcIot.machine;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.accessControlWhite.AccessControlWhiteAuthDto;
 import com.java110.dto.accessControlWhite.AccessControlWhiteDto;
 import com.java110.dto.file.FileRelDto;
 import com.java110.dto.owner.OwnerAttrDto;
 import com.java110.entity.order.Business;
-import com.java110.intf.common.IAccessControlWhiteV1InnerServiceSMO;
-import com.java110.intf.common.IFileInnerServiceSMO;
-import com.java110.intf.common.IFileRelInnerServiceSMO;
-import com.java110.intf.common.IMachineInnerServiceSMO;
+import com.java110.intf.common.*;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
 import com.java110.po.accessControlWhite.AccessControlWhitePo;
@@ -58,6 +56,9 @@ public class EditAccessControlWhiteToIotAdapt extends DatabusAdaptImpl {
     @Autowired
     private IAccessControlWhiteV1InnerServiceSMO accessControlWhiteV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IAccessControlWhiteAuthV1InnerServiceSMO accessControlWhiteAuthV1InnerServiceSMOImpl;
+
     @Autowired
     private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
 
@@ -107,12 +108,12 @@ public class EditAccessControlWhiteToIotAdapt extends DatabusAdaptImpl {
         String fileName = fileRelDtos.get(0).getFileSaveName();
 
 
-        if(StringUtil.isEmpty(fileName)){
-            return ;
+        if (StringUtil.isEmpty(fileName)) {
+            return;
         }
-        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
-        if(!fileName.startsWith("http")){
-            fileName = imgUrl +fileName;
+        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
+        if (!fileName.startsWith("http")) {
+            fileName = imgUrl + fileName;
         }
 
         String faceBase64 = ImageUtils.getBase64ByImgUrl(fileName);
@@ -120,25 +121,35 @@ public class EditAccessControlWhiteToIotAdapt extends DatabusAdaptImpl {
             return;
         }
 
-        JSONObject postParameters = new JSONObject();
-
-        postParameters.put("userId", tmpAccessControlWhiteDto.getPersonId());
-        postParameters.put("faceBase64", faceBase64);
-        postParameters.put("startTime", tmpAccessControlWhiteDto.getStartTime());
-        postParameters.put("endTime", tmpAccessControlWhiteDto.getEndTime());
-        postParameters.put("name", tmpAccessControlWhiteDto.getPersonName());
-        postParameters.put("idNumber", tmpAccessControlWhiteDto.getIdCard());
-        postParameters.put("link", tmpAccessControlWhiteDto.getTel());
-       // postParameters.put("machineCode", tmpAccessControlWhiteDto.getMachineCode());
-        postParameters.put("extMachineId", tmpAccessControlWhiteDto.getMachineId());
-        postParameters.put("extCommunityId", tmpAccessControlWhiteDto.getCommunityId());
-        List<OwnerAttrDto> ownerAttrDtos = new ArrayList<>();
-        OwnerAttrDto ownerAttrDto = new OwnerAttrDto();
-        ownerAttrDto.setSpecCd(OwnerAttrDto.SPEC_CD_ACCESS_CONTROL_KEY);
-        ownerAttrDto.setValue(tmpAccessControlWhiteDto.getAccessControlKey());
-        ownerAttrDto.setCommunityId(tmpAccessControlWhiteDto.getCommunityId());
-        ownerAttrDtos.add(ownerAttrDto);
-        postParameters.put("attrs", ownerAttrDtos);
-        hcMachineAsynImpl.sendUpdateOwner(postParameters);
+        AccessControlWhiteAuthDto accessControlWhiteAuthDto = new AccessControlWhiteAuthDto();
+        accessControlWhiteAuthDto.setAcwId(accessControlWhiteDtos.get(0).getAcwId());
+        List<AccessControlWhiteAuthDto> accessControlWhiteAuthDtos
+                = accessControlWhiteAuthV1InnerServiceSMOImpl.queryAccessControlWhiteAuths(accessControlWhiteAuthDto);
+        if (accessControlWhiteAuthDtos == null || accessControlWhiteAuthDtos.size() < 1) {
+            return;
+        }
+
+        for (AccessControlWhiteAuthDto tmpAccessControlWhiteAuthDto : accessControlWhiteAuthDtos) {
+            JSONObject postParameters = new JSONObject();
+
+            postParameters.put("userId", tmpAccessControlWhiteDto.getPersonId());
+            postParameters.put("faceBase64", faceBase64);
+            postParameters.put("startTime", tmpAccessControlWhiteDto.getStartTime());
+            postParameters.put("endTime", tmpAccessControlWhiteDto.getEndTime());
+            postParameters.put("name", tmpAccessControlWhiteDto.getPersonName());
+            postParameters.put("idNumber", tmpAccessControlWhiteDto.getIdCard());
+            postParameters.put("link", tmpAccessControlWhiteDto.getTel());
+            postParameters.put("machineCode", tmpAccessControlWhiteAuthDto.getMachineCode());
+            postParameters.put("extMachineId", tmpAccessControlWhiteAuthDto.getMachineId());
+            postParameters.put("extCommunityId", tmpAccessControlWhiteDto.getCommunityId());
+            List<OwnerAttrDto> ownerAttrDtos = new ArrayList<>();
+            OwnerAttrDto ownerAttrDto = new OwnerAttrDto();
+            ownerAttrDto.setSpecCd(OwnerAttrDto.SPEC_CD_ACCESS_CONTROL_KEY);
+            ownerAttrDto.setValue(tmpAccessControlWhiteDto.getAccessControlKey());
+            ownerAttrDto.setCommunityId(tmpAccessControlWhiteDto.getCommunityId());
+            ownerAttrDtos.add(ownerAttrDto);
+            postParameters.put("attrs", ownerAttrDtos);
+            hcMachineAsynImpl.sendUpdateOwner(postParameters);
+        }
     }
 }