Skip to content

Commit 5048779

Browse files
928255095928255095
committed
优化代码
1 parent 7935724 commit 5048779

5 files changed

Lines changed: 121 additions & 74 deletions

File tree

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ public class ImportOwnerRoomDto implements Serializable {
2626
private String userId;
2727
private String roomState;
2828

29+
private String personType;
30+
private String personRole;
31+
private String concactPerson;
32+
private String concactLink;
33+
2934

3035
public String getFloorNum() {
3136
return floorNum;
@@ -187,4 +192,36 @@ public String getRoomState() {
187192
public void setRoomState(String roomState) {
188193
this.roomState = roomState;
189194
}
195+
196+
public String getPersonType() {
197+
return personType;
198+
}
199+
200+
public void setPersonType(String personType) {
201+
this.personType = personType;
202+
}
203+
204+
public String getPersonRole() {
205+
return personRole;
206+
}
207+
208+
public void setPersonRole(String personRole) {
209+
this.personRole = personRole;
210+
}
211+
212+
public String getConcactPerson() {
213+
return concactPerson;
214+
}
215+
216+
public void setConcactPerson(String concactPerson) {
217+
this.concactPerson = concactPerson;
218+
}
219+
220+
public String getConcactLink() {
221+
return concactLink;
222+
}
223+
224+
public void setConcactLink(String concactLink) {
225+
this.concactLink = concactLink;
226+
}
190227
}

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.java110.api.importData.adapt;
22

33
import com.alibaba.fastjson.JSONObject;
4+
import com.java110.api.importData.DefaultImportDataAdapt;
5+
import com.java110.api.importData.IImportDataCleaningAdapt;
46
import com.java110.dto.importData.ImportOwnerRoomDto;
57
import com.java110.dto.owner.OwnerDto;
68
import com.java110.dto.room.RoomDto;
79
import com.java110.dto.system.ComponentValidateResult;
810
import com.java110.utils.util.Assert;
911
import com.java110.utils.util.ImportExcelUtils;
1012
import com.java110.utils.util.StringUtil;
11-
import com.java110.api.importData.DefaultImportDataAdapt;
12-
import com.java110.api.importData.IImportDataCleaningAdapt;
1313
import org.apache.poi.ss.usermodel.Sheet;
1414
import org.apache.poi.ss.usermodel.Workbook;
1515
import org.springframework.stereotype.Service;
@@ -79,6 +79,9 @@ private void getOwnerRooms(Workbook workbook, List<ImportOwnerRoomDto> ownerRoom
7979
Assert.hasValue(os[14], (osIndex + 1) + "行手机号不能为空");
8080
//Assert.hasValue(os[15], (osIndex + 1) + "行身份证不能为空");
8181
Assert.hasValue(os[16], (osIndex + 1) + "行业主类型不能为空");
82+
Assert.hasValue(os[17], (osIndex + 1) + "行人员类型不能为空");
83+
Assert.hasValue(os[18], (osIndex + 1) + "行人员角色不能为空");
84+
Assert.hasValue(os[19], (osIndex + 1) + "行联系人不能为空");
8285
}
8386

8487
importOwnerRoomDto = new ImportOwnerRoomDto();
@@ -106,6 +109,12 @@ private void getOwnerRooms(Workbook workbook, List<ImportOwnerRoomDto> ownerRoom
106109
String idCard = StringUtil.isNullOrNone(os[15]) ? "" : os[15].toString().trim();
107110
importOwnerRoomDto.setIdCard(idCard);
108111
importOwnerRoomDto.setOwnerTypeCd(os[16].toString().trim());
112+
importOwnerRoomDto.setPersonType(os[17].toString().trim());
113+
importOwnerRoomDto.setPersonRole(os[18].toString().trim());
114+
importOwnerRoomDto.setConcactPerson(os[19].toString().trim());
115+
}
116+
if (os.length > 20 && !StringUtil.isNullOrNone(os[20])) {
117+
importOwnerRoomDto.setConcactLink(os[20].toString().trim());
109118
}
110119

111120

@@ -227,3 +236,4 @@ private void validateRoomInfo(List<ImportOwnerRoomDto> ownerRooms) {
227236
}
228237
}
229238
}
239+

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

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.java110.utils.exception.CmdException;
3030
import com.java110.utils.util.Assert;
3131
import com.java110.utils.util.DateUtil;
32+
import com.java110.utils.util.ListUtil;
3233
import com.java110.utils.util.StringUtil;
3334
import org.slf4j.Logger;
3435
import org.springframework.beans.factory.annotation.Autowired;
@@ -165,7 +166,7 @@ private void doSaveOwnerMember(ImportOwnerRoomDto importOwnerRoomDto, String roo
165166
OwnerPo ownerPo = null;
166167

167168
int flag = 0;
168-
if (ownerDtos == null || ownerDtos.size() < 1) {
169+
if (ListUtil.isNull(ownerDtos)) {
169170
ownerPo = new OwnerPo();
170171
ownerPo.setState(OwnerDto.STATE_FINISH);
171172
ownerPo.setOwnerFlag(OwnerDto.OWNER_FLAG_TRUE);
@@ -181,6 +182,10 @@ private void doSaveOwnerMember(ImportOwnerRoomDto importOwnerRoomDto, String roo
181182
ownerPo.setMemberId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
182183
ownerPo.setRemark("房产导入");
183184
ownerPo.setUserId(importOwnerRoomDto.getUserId());
185+
ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
186+
ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
187+
ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
188+
ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
184189
flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
185190

186191
if (flag < 1) {
@@ -202,6 +207,10 @@ private void doSaveOwnerMember(ImportOwnerRoomDto importOwnerRoomDto, String roo
202207
ownerPo.setMemberId(ownerDtos.get(0).getMemberId());
203208
ownerPo.setRemark("房产导入");
204209
ownerPo.setUserId(importOwnerRoomDto.getUserId());
210+
ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
211+
ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
212+
ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
213+
ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
205214
flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
206215
if (flag < 1) {
207216
throw new IllegalArgumentException("导入业主失败");
@@ -225,7 +234,7 @@ private void doSaveOwner(ImportOwnerRoomDto importOwnerRoomDto, String roomId) {
225234
List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
226235
String ownerId = "";
227236
int flag = 0;
228-
if (ownerDtos == null || ownerDtos.size() < 1) {
237+
if (ListUtil.isNull(ownerDtos)) {
229238
ownerId = doSaveOwnerInfo(importOwnerRoomDto);
230239
} else {
231240
ownerId = ownerDtos.get(0).getOwnerId();
@@ -237,7 +246,7 @@ private void doSaveOwner(ImportOwnerRoomDto importOwnerRoomDto, String roomId) {
237246
ownerRoomRelDto.setRoomId(roomId);
238247
ownerRoomRelDto.setOwnerId(ownerId);
239248
List<OwnerRoomRelDto> roomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
240-
if (roomRelDtos != null && roomRelDtos.size() > 0) {
249+
if (!ListUtil.isNull(roomRelDtos)) {
241250
return;
242251
}
243252

@@ -275,6 +284,10 @@ private void doUpdateOwnerInfo(ImportOwnerRoomDto importOwnerRoomDto, String own
275284
ownerPo.setMemberId(ownerPo.getOwnerId());
276285
ownerPo.setRemark("房产导入");
277286
ownerPo.setUserId(importOwnerRoomDto.getUserId());
287+
ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
288+
ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
289+
ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
290+
ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
278291
flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
279292
if (flag < 1) {
280293
throw new IllegalArgumentException("导入业主失败");
@@ -298,6 +311,10 @@ private String doSaveOwnerInfo(ImportOwnerRoomDto importOwnerRoomDto) {
298311
ownerPo.setMemberId(ownerPo.getOwnerId());
299312
ownerPo.setRemark("房产导入");
300313
ownerPo.setUserId(importOwnerRoomDto.getUserId());
314+
ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
315+
ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
316+
ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
317+
ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
301318
flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
302319
if (flag < 1) {
303320
throw new IllegalArgumentException("导入业主失败");

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

Lines changed: 43 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.alibaba.fastjson.JSONObject;
44
import com.java110.core.annotation.Java110Cmd;
55
import com.java110.core.annotation.Java110Transactional;
6+
import com.java110.core.context.CmdContextUtils;
67
import com.java110.core.context.DataFlowContext;
78
import com.java110.core.context.ICmdDataFlowContext;
89
import com.java110.core.event.cmd.Cmd;
@@ -22,11 +23,14 @@
2223
import com.java110.po.file.FileRelPo;
2324
import com.java110.po.owner.OwnerAppUserPo;
2425
import com.java110.po.owner.OwnerPo;
26+
import com.java110.utils.cache.MappingCache;
2527
import com.java110.utils.constant.BusinessTypeConstant;
28+
import com.java110.utils.constant.MappingConstant;
2629
import com.java110.utils.exception.CmdException;
2730
import com.java110.utils.util.Assert;
2831
import com.java110.utils.util.BeanConvertUtil;
2932
import com.java110.utils.util.ListUtil;
33+
import com.java110.utils.util.StringUtil;
3034
import org.apache.commons.lang3.StringUtils;
3135
import org.springframework.beans.factory.annotation.Autowired;
3236

@@ -58,12 +62,12 @@
5862
)
5963

6064
@Java110ExampleDoc(
61-
reqBody="{\n" +
65+
reqBody = "{\n" +
6266
"\t\"memberId\": 123123123,\n" +
6367
"\t\"ownerPhoto\": \"\",\n" +
6468
"\t\"communityId\": \"2022121921870161\"\n" +
6569
"}",
66-
resBody="{\"code\":0,\"msg\":\"成功\"}"
70+
resBody = "{\"code\":0,\"msg\":\"成功\"}"
6771
)
6872
@Java110Cmd(serviceCode = "owner.uploadOwnerPhoto")
6973
public class UploadOwnerPhotoCmd extends Cmd {
@@ -89,94 +93,64 @@ public class UploadOwnerPhotoCmd extends Cmd {
8993

9094
@Override
9195
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
92-
Assert.jsonObjectHaveKey(reqJson, "memberId", "请求报文中未包含ownerId");
93-
Assert.jsonObjectHaveKey(reqJson, "photo", "请求报文中未包含photo");
94-
Assert.jsonObjectHaveKey(reqJson, "communityId", "请求报文中未包含communityId");
96+
Assert.hasKeyAndValue(reqJson, "photo", "请求报文中未包含photo");
97+
Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
9598
}
9699

97100
@Override
98101
@Java110Transactional
99102
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
100-
if (reqJson.containsKey("photo") && !StringUtils.isEmpty(reqJson.getString("photo"))) {
101-
FileDto fileDto = new FileDto();
102-
fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
103-
fileDto.setFileName(fileDto.getFileId());
104-
fileDto.setContext(reqJson.getString("photo"));
105-
fileDto.setSuffix("jpeg");
106-
fileDto.setCommunityId(reqJson.getString("communityId"));
107-
String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
108-
reqJson.put("ownerPhotoId", fileDto.getFileId());
109-
reqJson.put("fileSaveName", fileName);
110-
111-
editOwnerPhoto(reqJson);
112103

104+
String userId = CmdContextUtils.getUserId(context);
105+
106+
OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
107+
ownerAppUserDto.setUserId(userId);
108+
ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
109+
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
110+
111+
if (ListUtil.isNull(ownerAppUserDtos)) {
112+
throw new CmdException("未绑定业主");
113113
}
114-
//添加小区楼
115-
editOwner(reqJson);
116-
}
117114

118-
public void editOwnerPhoto(JSONObject paramInJson) {
119-
120-
FileRelDto fileRelDto = new FileRelDto();
121-
fileRelDto.setRelTypeCd("10000");
122-
fileRelDto.setObjId(paramInJson.getString("memberId"));
123-
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
124-
if (ListUtil.isNull(fileRelDtos)) {
125-
JSONObject businessUnit = new JSONObject();
126-
businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
127-
businessUnit.put("relTypeCd", "10000");
128-
businessUnit.put("saveWay", "table");
129-
businessUnit.put("objId", paramInJson.getString("memberId"));
130-
businessUnit.put("fileRealName", paramInJson.getString("fileSaveName"));
131-
businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
132-
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
133-
fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
134-
return;
115+
String memberId = "";
116+
for (OwnerAppUserDto tmpOwnerAppUserDto : ownerAppUserDtos) {
117+
if ("-1".equals(tmpOwnerAppUserDto.getMemberId())) {
118+
continue;
119+
}
120+
memberId = tmpOwnerAppUserDto.getMemberId();
121+
}
122+
if (StringUtil.isEmpty(memberId)) {
123+
throw new CmdException("还没有认证房屋，请先认证房屋");
135124
}
136125

137-
JSONObject businessUnit = new JSONObject();
138-
businessUnit.putAll(BeanConvertUtil.beanCovertMap(fileRelDtos.get(0)));
139-
businessUnit.put("fileRealName", paramInJson.getString("fileSaveName"));
140-
businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
141-
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
142-
fileRelInnerServiceSMOImpl.updateFileRel(fileRelPo);
126+
FileDto fileDto = new FileDto();
127+
fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
128+
fileDto.setFileName(fileDto.getFileId());
129+
fileDto.setContext(reqJson.getString("photo"));
130+
fileDto.setSuffix("jpeg");
131+
fileDto.setCommunityId(reqJson.getString("communityId"));
132+
String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
133+
reqJson.put("ownerPhotoId", fileDto.getFileId());
134+
reqJson.put("fileSaveName", fileName);
143135

136+
String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
137+
String faceUrl = imgUrl + fileName;
144138

145-
}
146-
147-
public void editOwner(JSONObject paramInJson) {
148139

140+
//添加小区楼
149141
OwnerDto ownerDto = new OwnerDto();
150-
ownerDto.setMemberId(paramInJson.getString("memberId"));
142+
ownerDto.setMemberId(memberId);
151143
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
152144

153145
Assert.listOnlyOne(ownerDtos, "未查询到业主信息或查询到多条");
154146

155-
JSONObject businessOwner = new JSONObject();
156-
businessOwner.putAll(BeanConvertUtil.beanCovertMap(ownerDtos.get(0)));
157-
businessOwner.putAll(paramInJson);
158-
159-
if (paramInJson.containsKey("wxPhoto")) {
160-
businessOwner.put("link", paramInJson.getString("wxPhoto"));
161-
}
162-
businessOwner.put("state", ownerDtos.get(0).getState());
163-
OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
147+
OwnerPo ownerPo = new OwnerPo();
148+
ownerPo.setMemberId(memberId);
149+
ownerPo.setFaceUrl(faceUrl);
164150
int flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
165-
if(flag < 1){
151+
if (flag < 1) {
166152
throw new CmdException("修改业主");
167153
}
168-
OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
169-
ownerAppUserDto.setMemberId(paramInJson.getString("ownerId"));
170-
//查询app用户表
171-
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
172-
if (ownerAppUserDtos != null && ownerAppUserDtos.size() > 0) {
173-
for (OwnerAppUserDto ownerAppUser : ownerAppUserDtos) {
174-
OwnerAppUserPo ownerAppUserPo = BeanConvertUtil.covertBean(ownerAppUser, OwnerAppUserPo.class);
175-
ownerAppUserPo.setLink(paramInJson.getString("link"));
176-
ownerAppUserPo.setIdCard(paramInJson.getString("idCard"));
177-
ownerAppUserV1InnerServiceSMOImpl.updateOwnerAppUser(ownerAppUserPo);
178-
}
179-
}
180154
}
181155

182156
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ private void getOwnerRooms(Workbook workbook, List<ImportOwnerRoomDto> ownerRoom
7979
Assert.hasValue(os[14], (osIndex + 1) + "行手机号不能为空");
8080
//Assert.hasValue(os[15], (osIndex + 1) + "行身份证不能为空");
8181
Assert.hasValue(os[16], (osIndex + 1) + "行业主类型不能为空");
82+
Assert.hasValue(os[17], (osIndex + 1) + "行人员类型不能为空");
83+
Assert.hasValue(os[18], (osIndex + 1) + "行人员角色不能为空");
84+
Assert.hasValue(os[19], (osIndex + 1) + "行联系人不能为空");
8285
}
8386

8487
importOwnerRoomDto = new ImportOwnerRoomDto();
@@ -106,6 +109,12 @@ private void getOwnerRooms(Workbook workbook, List<ImportOwnerRoomDto> ownerRoom
106109
String idCard = StringUtil.isNullOrNone(os[15]) ? "" : os[15].toString().trim();
107110
importOwnerRoomDto.setIdCard(idCard);
108111
importOwnerRoomDto.setOwnerTypeCd(os[16].toString().trim());
112+
importOwnerRoomDto.setPersonType(os[17].toString().trim());
113+
importOwnerRoomDto.setPersonRole(os[18].toString().trim());
114+
importOwnerRoomDto.setConcactPerson(os[19].toString().trim());
115+
}
116+
if (os.length > 20 && !StringUtil.isNullOrNone(os[20])) {
117+
importOwnerRoomDto.setConcactLink(os[20].toString().trim());
109118
}
110119

111120

0 commit comments

Comments
 (0)