Bladeren bron

examine staff

java110 3 jaren geleden
bovenliggende
commit
20d0d60259

+ 11 - 0
java110-bean/src/main/java/com/java110/dto/examineStaff/ExamineStaffDto.java

@@ -23,6 +23,9 @@ public class ExamineStaffDto extends PageDto implements Serializable {
     private String staffId;
     private String staffId;
 
 
     private String post;
     private String post;
+
+    private String headerImg;
+
     private Date createTime;
     private Date createTime;
 
 
     private String statusCd = "0";
     private String statusCd = "0";
@@ -94,4 +97,12 @@ public class ExamineStaffDto extends PageDto implements Serializable {
     public void setPost(String post) {
     public void setPost(String post) {
         this.post = post;
         this.post = post;
     }
     }
+
+    public String getHeaderImg() {
+        return headerImg;
+    }
+
+    public void setHeaderImg(String headerImg) {
+        this.headerImg = headerImg;
+    }
 }
 }

+ 48 - 0
service-user/src/main/java/com/java110/user/cmd/examine/ListExamineStaffCmd.java

@@ -21,9 +21,14 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.examineStaffProject.ExamineStaffProjectDto;
 import com.java110.dto.examineStaffProject.ExamineStaffProjectDto;
+import com.java110.dto.file.FileRelDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.user.IExamineStaffProjectV1InnerServiceSMO;
 import com.java110.intf.user.IExamineStaffProjectV1InnerServiceSMO;
 import com.java110.intf.user.IExamineStaffV1InnerServiceSMO;
 import com.java110.intf.user.IExamineStaffV1InnerServiceSMO;
 import com.java110.po.examineStaffProject.ExamineStaffProjectPo;
 import com.java110.po.examineStaffProject.ExamineStaffProjectPo;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.BeanConvertUtil;
@@ -60,6 +65,9 @@ public class ListExamineStaffCmd extends Cmd {
     @Autowired
     @Autowired
     private IExamineStaffProjectV1InnerServiceSMO examineStaffProjectV1InnerServiceSMOImpl;
     private IExamineStaffProjectV1InnerServiceSMO examineStaffProjectV1InnerServiceSMOImpl;
 
 
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
     @Override
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
         super.validatePageInfo(reqJson);
@@ -79,6 +87,7 @@ public class ListExamineStaffCmd extends Cmd {
             examineStaffDtos = examineStaffV1InnerServiceSMOImpl.queryExamineStaffs(examineStaffDto);
             examineStaffDtos = examineStaffV1InnerServiceSMOImpl.queryExamineStaffs(examineStaffDto);
 
 
             freshStaffProjects(examineStaffDtos);
             freshStaffProjects(examineStaffDtos);
+            updatePhone(examineStaffDtos);
         } else {
         } else {
             examineStaffDtos = new ArrayList<>();
             examineStaffDtos = new ArrayList<>();
         }
         }
@@ -90,6 +99,45 @@ public class ListExamineStaffCmd extends Cmd {
         cmdDataFlowContext.setResponseEntity(responseEntity);
         cmdDataFlowContext.setResponseEntity(responseEntity);
     }
     }
 
 
+    private boolean updatePhone(List<ExamineStaffDto> examineStaffDtos) {
+        if (examineStaffDtos.size() > 100) {
+            return true;
+        }
+
+        List<String> esIds = new ArrayList<>();
+
+        for (ExamineStaffDto tmpExamineStaffDto : examineStaffDtos) {
+            esIds.add(tmpExamineStaffDto.getEsId());
+        }
+
+        FileRelDto fileRelDto = new FileRelDto();
+        //fileRelDto.setObjId(owners.get(0).getMemberId());
+        fileRelDto.setObjIds(esIds.toArray(new String[esIds.size()]));
+        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+
+        if (fileRelDtos == null || fileRelDtos.size() < 1) {
+            return true;
+        }
+
+        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
+
+        for (ExamineStaffDto tmpExamineStaffDto : examineStaffDtos) {
+            for (FileRelDto tmpFileRelDto : fileRelDtos) {
+                if (!tmpExamineStaffDto.getEsId().equals(tmpFileRelDto.getObjId())) {
+                    continue;
+                }
+
+                if (tmpFileRelDto.getFileSaveName().startsWith("http")) {
+                    tmpExamineStaffDto.setHeaderImg(tmpFileRelDto.getFileSaveName());
+                } else {
+                    tmpExamineStaffDto.setHeaderImg(imgUrl + tmpFileRelDto.getFileSaveName());
+                }
+            }
+        }
+
+        return false;
+    }
+
     /**
     /**
      *
      *
      * @param examineStaffDtos
      * @param examineStaffDtos

+ 10 - 2
service-user/src/main/java/com/java110/user/cmd/examine/SaveExamineStaffCmd.java

@@ -23,6 +23,7 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.smo.IPhotoSMO;
 import com.java110.dto.user.UserDto;
 import com.java110.dto.user.UserDto;
 import com.java110.intf.user.IExamineStaffIntroductionV1InnerServiceSMO;
 import com.java110.intf.user.IExamineStaffIntroductionV1InnerServiceSMO;
 import com.java110.intf.user.IExamineStaffProjectV1InnerServiceSMO;
 import com.java110.intf.user.IExamineStaffProjectV1InnerServiceSMO;
@@ -71,6 +72,9 @@ public class SaveExamineStaffCmd extends Cmd {
     @Autowired
     @Autowired
     private IExamineStaffIntroductionV1InnerServiceSMO examineStaffIntroductionV1InnerServiceSMOImpl;
     private IExamineStaffIntroductionV1InnerServiceSMO examineStaffIntroductionV1InnerServiceSMOImpl;
 
 
+    @Autowired
+    private IPhotoSMO photoSMOImpl;
+
     @Override
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "staffId", "请求报文中未包含staffId");
         Assert.hasKeyAndValue(reqJson, "staffId", "请求报文中未包含staffId");
@@ -111,7 +115,7 @@ public class SaveExamineStaffCmd extends Cmd {
         JSONArray projectIds = reqJson.getJSONArray("projectIds");
         JSONArray projectIds = reqJson.getJSONArray("projectIds");
 
 
         ExamineStaffProjectPo tmpExamineStaffProjectPo = null;
         ExamineStaffProjectPo tmpExamineStaffProjectPo = null;
-        for(int projectIndex = 0;projectIndex < projectIds.size();projectIndex ++){
+        for (int projectIndex = 0; projectIndex < projectIds.size(); projectIndex++) {
             tmpExamineStaffProjectPo = new ExamineStaffProjectPo();
             tmpExamineStaffProjectPo = new ExamineStaffProjectPo();
             tmpExamineStaffProjectPo.setEsId(examineStaffPo.getEsId());
             tmpExamineStaffProjectPo.setEsId(examineStaffPo.getEsId());
             tmpExamineStaffProjectPo.setCommunityId(examineStaffPo.getCommunityId());
             tmpExamineStaffProjectPo.setCommunityId(examineStaffPo.getCommunityId());
@@ -121,7 +125,7 @@ public class SaveExamineStaffCmd extends Cmd {
         }
         }
 
 
         // todo save examine staff introduction
         // todo save examine staff introduction
-        if(reqJson.containsKey("introduction") && !StringUtil.isEmpty(reqJson.getString("introduction"))){
+        if (reqJson.containsKey("introduction") && !StringUtil.isEmpty(reqJson.getString("introduction"))) {
             ExamineStaffIntroductionPo examineStaffIntroductionPo = new ExamineStaffIntroductionPo();
             ExamineStaffIntroductionPo examineStaffIntroductionPo = new ExamineStaffIntroductionPo();
             examineStaffIntroductionPo.setEsiId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
             examineStaffIntroductionPo.setEsiId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
             examineStaffIntroductionPo.setStaffId(reqJson.getString("staffId"));
             examineStaffIntroductionPo.setStaffId(reqJson.getString("staffId"));
@@ -130,6 +134,10 @@ public class SaveExamineStaffCmd extends Cmd {
             examineStaffIntroductionV1InnerServiceSMOImpl.saveExamineStaffIntroduction(examineStaffIntroductionPo);
             examineStaffIntroductionV1InnerServiceSMOImpl.saveExamineStaffIntroduction(examineStaffIntroductionPo);
         }
         }
 
 
+        // todo save examine staff face image
+        photoSMOImpl.savePhoto(reqJson.getString("headerImg"),
+                examineStaffPo.getEsId(),
+                reqJson.getString("communityId"));
 
 
 
 
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
         cmdDataFlowContext.setResponseEntity(ResultVo.success());