优化代码

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

@@ -30,6 +30,7 @@ public class AccessControlWhiteDto extends MachineDto implements Serializable {
     private String personType;
 
     private String statusCd = "0";
+    private String personFace;
 
 
     public String getThirdId() {
@@ -137,4 +138,12 @@ public class AccessControlWhiteDto extends MachineDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPersonFace() {
+        return personFace;
+    }
+
+    public void setPersonFace(String personFace) {
+        this.personFace = personFace;
+    }
 }

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

@@ -20,7 +20,11 @@ import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.file.FileRelDto;
+import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.intf.common.IAccessControlWhiteV1InnerServiceSMO;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
@@ -53,6 +57,9 @@ public class ListAccessControlWhiteCmd extends Cmd {
     @Autowired
     private IAccessControlWhiteV1InnerServiceSMO accessControlWhiteV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
@@ -69,6 +76,7 @@ public class ListAccessControlWhiteCmd extends Cmd {
 
         if (count > 0) {
             accessControlWhiteDtos = accessControlWhiteV1InnerServiceSMOImpl.queryAccessControlWhites(accessControlWhiteDto);
+            refreshPhoto(accessControlWhiteDtos);
         } else {
             accessControlWhiteDtos = new ArrayList<>();
         }
@@ -79,4 +87,36 @@ public class ListAccessControlWhiteCmd extends Cmd {
 
         cmdDataFlowContext.setResponseEntity(responseEntity);
     }
+
+    private void refreshPhoto(List<AccessControlWhiteDto> accessControlWhiteDtos) {
+        if(accessControlWhiteDtos == null || accessControlWhiteDtos.size() < 1){
+            return;
+        }
+
+        List<String> acwId = new ArrayList<>();
+        for(AccessControlWhiteDto accessControlWhiteDto: accessControlWhiteDtos){
+            acwId.add(accessControlWhiteDto.getAcwId());
+        }
+
+        FileRelDto fileRelDto = new FileRelDto();
+        fileRelDto.setObjIds(acwId.toArray(new String[acwId.size()]));
+        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+
+        if(fileRelDtos == null || fileRelDtos.size() < 1){
+            return ;
+        }
+        String imgUrl = MappingCache.getValue("IMG_PATH");
+        for(AccessControlWhiteDto accessControlWhiteDto: accessControlWhiteDtos){
+            for(FileRelDto tmpFileRelDto : fileRelDtos){
+                if(!accessControlWhiteDto.getAcwId().equals(tmpFileRelDto.getObjId())){
+                    continue;
+                }
+                if(tmpFileRelDto.getFileSaveName().startsWith("http")){
+                    accessControlWhiteDto.setPersonFace(tmpFileRelDto.getFileSaveName() );
+                }else{
+                    accessControlWhiteDto.setPersonFace(imgUrl +tmpFileRelDto.getFileSaveName() );
+                }
+            }
+        }
+    }
 }

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

@@ -22,6 +22,7 @@ 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.core.smo.IPhotoSMO;
 import com.java110.intf.common.IAccessControlWhiteV1InnerServiceSMO;
 import com.java110.po.accessControlWhite.AccessControlWhitePo;
 import com.java110.utils.exception.CmdException;
@@ -52,6 +53,9 @@ public class SaveAccessControlWhiteCmd extends Cmd {
     @Autowired
     private IAccessControlWhiteV1InnerServiceSMO accessControlWhiteV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IPhotoSMO photoSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "machineId", "请求报文中未包含machineId");
@@ -76,6 +80,9 @@ public class SaveAccessControlWhiteCmd extends Cmd {
             throw new CmdException("保存数据失败");
         }
 
+        photoSMOImpl.savePhoto(reqJson, accessControlWhitePo.getAcwId(), reqJson.getString("communityId"));
+
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }