优化代码

java110-bean/src/main/java/com/java110/dto/importData/ImportOwnerRoomDto.java

@@ -26,6 +26,11 @@ public class ImportOwnerRoomDto implements Serializable {
     private String userId;
     private String roomState;
 
+    private String personType;
+    private String personRole;
+    private String concactPerson;
+    private String concactLink;
+
 
     public String getFloorNum() {
         return floorNum;
@@ -187,4 +192,36 @@ public class ImportOwnerRoomDto implements Serializable {
     public void setRoomState(String roomState) {
         this.roomState = roomState;
     }
+
+    public String getPersonType() {
+        return personType;
+    }
+
+    public void setPersonType(String personType) {
+        this.personType = personType;
+    }
+
+    public String getPersonRole() {
+        return personRole;
+    }
+
+    public void setPersonRole(String personRole) {
+        this.personRole = personRole;
+    }
+
+    public String getConcactPerson() {
+        return concactPerson;
+    }
+
+    public void setConcactPerson(String concactPerson) {
+        this.concactPerson = concactPerson;
+    }
+
+    public String getConcactLink() {
+        return concactLink;
+    }
+
+    public void setConcactLink(String concactLink) {
+        this.concactLink = concactLink;
+    }
 }

service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataCleaningAdapt.java

@@ -1,6 +1,8 @@
 package com.java110.api.importData.adapt;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.api.importData.DefaultImportDataAdapt;
+import com.java110.api.importData.IImportDataCleaningAdapt;
 import com.java110.dto.importData.ImportOwnerRoomDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.room.RoomDto;
@@ -8,8 +10,6 @@ import com.java110.dto.system.ComponentValidateResult;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.ImportExcelUtils;
 import com.java110.utils.util.StringUtil;
-import com.java110.api.importData.DefaultImportDataAdapt;
-import com.java110.api.importData.IImportDataCleaningAdapt;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.stereotype.Service;
@@ -79,6 +79,9 @@ public class ImportRoomOwnerDataCleaningAdapt extends DefaultImportDataAdapt imp
                 Assert.hasValue(os[14], (osIndex + 1) + "行手机号不能为空");
                 //Assert.hasValue(os[15], (osIndex + 1) + "行身份证不能为空");
                 Assert.hasValue(os[16], (osIndex + 1) + "行业主类型不能为空");
+                Assert.hasValue(os[17], (osIndex + 1) + "行人员类型不能为空");
+                Assert.hasValue(os[18], (osIndex + 1) + "行人员角色不能为空");
+                Assert.hasValue(os[19], (osIndex + 1) + "行联系人不能为空");
             }
 
             importOwnerRoomDto = new ImportOwnerRoomDto();
@@ -106,6 +109,12 @@ public class ImportRoomOwnerDataCleaningAdapt extends DefaultImportDataAdapt imp
                 String idCard = StringUtil.isNullOrNone(os[15]) ? "" : os[15].toString().trim();
                 importOwnerRoomDto.setIdCard(idCard);
                 importOwnerRoomDto.setOwnerTypeCd(os[16].toString().trim());
+                importOwnerRoomDto.setPersonType(os[17].toString().trim());
+                importOwnerRoomDto.setPersonRole(os[18].toString().trim());
+                importOwnerRoomDto.setConcactPerson(os[19].toString().trim());
+            }
+            if (os.length > 20 && !StringUtil.isNullOrNone(os[20])) {
+                importOwnerRoomDto.setConcactLink(os[20].toString().trim());
             }
 
 
@@ -227,3 +236,4 @@ public class ImportRoomOwnerDataCleaningAdapt extends DefaultImportDataAdapt imp
         }
     }
 }
+

service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java

@@ -29,6 +29,7 @@ import com.java110.utils.constant.UserLevelConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -165,7 +166,7 @@ public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implement
         OwnerPo ownerPo = null;
 
         int flag = 0;
-        if (ownerDtos == null || ownerDtos.size() < 1) {
+        if (ListUtil.isNull(ownerDtos)) {
             ownerPo = new OwnerPo();
             ownerPo.setState(OwnerDto.STATE_FINISH);
             ownerPo.setOwnerFlag(OwnerDto.OWNER_FLAG_TRUE);
@@ -181,6 +182,10 @@ public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implement
             ownerPo.setMemberId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
             ownerPo.setRemark("房产导入");
             ownerPo.setUserId(importOwnerRoomDto.getUserId());
+            ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
+            ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
+            ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
+            ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
             flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
 
             if (flag < 1) {
@@ -202,6 +207,10 @@ public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implement
             ownerPo.setMemberId(ownerDtos.get(0).getMemberId());
             ownerPo.setRemark("房产导入");
             ownerPo.setUserId(importOwnerRoomDto.getUserId());
+            ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
+            ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
+            ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
+            ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
             flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
             if (flag < 1) {
                 throw new IllegalArgumentException("导入业主失败");
@@ -225,7 +234,7 @@ public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implement
         List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
         String ownerId = "";
         int flag = 0;
-        if (ownerDtos == null || ownerDtos.size() < 1) {
+        if (ListUtil.isNull(ownerDtos)) {
             ownerId = doSaveOwnerInfo(importOwnerRoomDto);
         } else {
             ownerId = ownerDtos.get(0).getOwnerId();
@@ -237,7 +246,7 @@ public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implement
         ownerRoomRelDto.setRoomId(roomId);
         ownerRoomRelDto.setOwnerId(ownerId);
         List<OwnerRoomRelDto> roomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
-        if (roomRelDtos != null && roomRelDtos.size() > 0) {
+        if (!ListUtil.isNull(roomRelDtos)) {
             return;
         }
 
@@ -275,6 +284,10 @@ public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implement
         ownerPo.setMemberId(ownerPo.getOwnerId());
         ownerPo.setRemark("房产导入");
         ownerPo.setUserId(importOwnerRoomDto.getUserId());
+        ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
+        ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
+        ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
+        ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
         flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
         if (flag < 1) {
             throw new IllegalArgumentException("导入业主失败");
@@ -298,6 +311,10 @@ public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implement
         ownerPo.setMemberId(ownerPo.getOwnerId());
         ownerPo.setRemark("房产导入");
         ownerPo.setUserId(importOwnerRoomDto.getUserId());
+        ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
+        ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
+        ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
+        ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
         flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
         if (flag < 1) {
             throw new IllegalArgumentException("导入业主失败");

service-user/src/main/java/com/java110/user/cmd/owner/UploadOwnerPhotoCmd.java

@@ -3,6 +3,7 @@ package com.java110.user.cmd.owner;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
@@ -22,11 +23,14 @@ import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.po.file.FileRelPo;
 import com.java110.po.owner.OwnerAppUserPo;
 import com.java110.po.owner.OwnerPo;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -58,12 +62,12 @@ import java.util.List;
 )
 
 @Java110ExampleDoc(
-        reqBody="{\n" +
+        reqBody = "{\n" +
                 "\t\"memberId\": 123123123,\n" +
                 "\t\"ownerPhoto\": \"\",\n" +
                 "\t\"communityId\": \"2022121921870161\"\n" +
                 "}",
-        resBody="{\"code\":0,\"msg\":\"成功\"}"
+        resBody = "{\"code\":0,\"msg\":\"成功\"}"
 )
 @Java110Cmd(serviceCode = "owner.uploadOwnerPhoto")
 public class UploadOwnerPhotoCmd extends Cmd {
@@ -89,94 +93,64 @@ public class UploadOwnerPhotoCmd extends Cmd {
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-        Assert.jsonObjectHaveKey(reqJson, "memberId", "请求报文中未包含ownerId");
-        Assert.jsonObjectHaveKey(reqJson, "photo", "请求报文中未包含photo");
-        Assert.jsonObjectHaveKey(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "photo", "请求报文中未包含photo");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
-        if (reqJson.containsKey("photo") && !StringUtils.isEmpty(reqJson.getString("photo"))) {
-            FileDto fileDto = new FileDto();
-            fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
-            fileDto.setFileName(fileDto.getFileId());
-            fileDto.setContext(reqJson.getString("photo"));
-            fileDto.setSuffix("jpeg");
-            fileDto.setCommunityId(reqJson.getString("communityId"));
-            String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
-            reqJson.put("ownerPhotoId", fileDto.getFileId());
-            reqJson.put("fileSaveName", fileName);
-
-            editOwnerPhoto(reqJson);
 
+        String userId = CmdContextUtils.getUserId(context);
+
+        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+        ownerAppUserDto.setUserId(userId);
+        ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
+        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+
+        if (ListUtil.isNull(ownerAppUserDtos)) {
+            throw new CmdException("未绑定业主");
         }
-        //添加小区楼
-        editOwner(reqJson);
-    }
 
-    public void editOwnerPhoto(JSONObject paramInJson) {
-
-        FileRelDto fileRelDto = new FileRelDto();
-        fileRelDto.setRelTypeCd("10000");
-        fileRelDto.setObjId(paramInJson.getString("memberId"));
-        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-        if (ListUtil.isNull(fileRelDtos)) {
-            JSONObject businessUnit = new JSONObject();
-            businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
-            businessUnit.put("relTypeCd", "10000");
-            businessUnit.put("saveWay", "table");
-            businessUnit.put("objId", paramInJson.getString("memberId"));
-            businessUnit.put("fileRealName", paramInJson.getString("fileSaveName"));
-            businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
-            FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
-            fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
-            return;
+        String memberId = "";
+        for (OwnerAppUserDto tmpOwnerAppUserDto : ownerAppUserDtos) {
+            if ("-1".equals(tmpOwnerAppUserDto.getMemberId())) {
+                continue;
+            }
+            memberId = tmpOwnerAppUserDto.getMemberId();
+        }
+        if (StringUtil.isEmpty(memberId)) {
+            throw new CmdException("还没有认证房屋，请先认证房屋");
         }
 
-        JSONObject businessUnit = new JSONObject();
-        businessUnit.putAll(BeanConvertUtil.beanCovertMap(fileRelDtos.get(0)));
-        businessUnit.put("fileRealName", paramInJson.getString("fileSaveName"));
-        businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
-        FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
-        fileRelInnerServiceSMOImpl.updateFileRel(fileRelPo);
+        FileDto fileDto = new FileDto();
+        fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
+        fileDto.setFileName(fileDto.getFileId());
+        fileDto.setContext(reqJson.getString("photo"));
+        fileDto.setSuffix("jpeg");
+        fileDto.setCommunityId(reqJson.getString("communityId"));
+        String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
+        reqJson.put("ownerPhotoId", fileDto.getFileId());
+        reqJson.put("fileSaveName", fileName);
 
+        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
+        String faceUrl = imgUrl + fileName;
 
-    }
-
-    public void editOwner(JSONObject paramInJson) {
 
+        //添加小区楼
         OwnerDto ownerDto = new OwnerDto();
-        ownerDto.setMemberId(paramInJson.getString("memberId"));
+        ownerDto.setMemberId(memberId);
         List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
 
         Assert.listOnlyOne(ownerDtos, "未查询到业主信息或查询到多条");
 
-        JSONObject businessOwner = new JSONObject();
-        businessOwner.putAll(BeanConvertUtil.beanCovertMap(ownerDtos.get(0)));
-        businessOwner.putAll(paramInJson);
-
-        if (paramInJson.containsKey("wxPhoto")) {
-            businessOwner.put("link", paramInJson.getString("wxPhoto"));
-        }
-        businessOwner.put("state", ownerDtos.get(0).getState());
-        OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
+        OwnerPo ownerPo = new OwnerPo();
+        ownerPo.setMemberId(memberId);
+        ownerPo.setFaceUrl(faceUrl);
         int flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
-        if(flag < 1){
+        if (flag < 1) {
             throw new CmdException("修改业主");
         }
-        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
-        ownerAppUserDto.setMemberId(paramInJson.getString("ownerId"));
-        //查询app用户表
-        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
-        if (ownerAppUserDtos != null && ownerAppUserDtos.size() > 0) {
-            for (OwnerAppUserDto ownerAppUser : ownerAppUserDtos) {
-                OwnerAppUserPo ownerAppUserPo = BeanConvertUtil.covertBean(ownerAppUser, OwnerAppUserPo.class);
-                ownerAppUserPo.setLink(paramInJson.getString("link"));
-                ownerAppUserPo.setIdCard(paramInJson.getString("idCard"));
-                ownerAppUserV1InnerServiceSMOImpl.updateOwnerAppUser(ownerAppUserPo);
-            }
-        }
     }
 
 }

springboot/src/main/java/com/java110/boot/importData/adapt/ImportRoomOwnerDataCleaningAdapt.java

@@ -79,6 +79,9 @@ public class ImportRoomOwnerDataCleaningAdapt extends DefaultImportDataAdapt imp
                 Assert.hasValue(os[14], (osIndex + 1) + "行手机号不能为空");
                 //Assert.hasValue(os[15], (osIndex + 1) + "行身份证不能为空");
                 Assert.hasValue(os[16], (osIndex + 1) + "行业主类型不能为空");
+                Assert.hasValue(os[17], (osIndex + 1) + "行人员类型不能为空");
+                Assert.hasValue(os[18], (osIndex + 1) + "行人员角色不能为空");
+                Assert.hasValue(os[19], (osIndex + 1) + "行联系人不能为空");
             }
 
             importOwnerRoomDto = new ImportOwnerRoomDto();
@@ -106,6 +109,12 @@ public class ImportRoomOwnerDataCleaningAdapt extends DefaultImportDataAdapt imp
                 String idCard = StringUtil.isNullOrNone(os[15]) ? "" : os[15].toString().trim();
                 importOwnerRoomDto.setIdCard(idCard);
                 importOwnerRoomDto.setOwnerTypeCd(os[16].toString().trim());
+                importOwnerRoomDto.setPersonType(os[17].toString().trim());
+                importOwnerRoomDto.setPersonRole(os[18].toString().trim());
+                importOwnerRoomDto.setConcactPerson(os[19].toString().trim());
+            }
+            if (os.length > 20 && !StringUtil.isNullOrNone(os[20])) {
+                importOwnerRoomDto.setConcactLink(os[20].toString().trim());
             }