From 9fa63e316511ca3b116fe86776c04b3b2ac13f97 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 07 十一月 2022 02:27:52 +0800
Subject: [PATCH] 优化 保养计划
---
service-community/src/main/java/com/java110/community/cmd/ownerRepair/SaveOwnerRepairCmd.java | 66 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/SaveOwnerRepairCmd.java b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/SaveOwnerRepairCmd.java
index d4dcba6..29b7544 100644
--- a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/SaveOwnerRepairCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/SaveOwnerRepairCmd.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -20,8 +21,10 @@
import com.java110.intf.community.IRepairUserV1InnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.INotepadV1InnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.file.FileRelPo;
+import com.java110.po.notepad.NotepadPo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
import com.java110.utils.cache.MappingCache;
@@ -43,9 +46,6 @@
public class SaveOwnerRepairCmd extends Cmd {
@Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
- @Autowired
private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
@Autowired
@@ -62,6 +62,12 @@
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
+ @Autowired
+ private INotepadV1InnerServiceSMO notepadV1InnerServiceSMOImpl;
//鍩�
public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
@@ -82,20 +88,21 @@
Assert.hasKeyAndValue(reqJson, "context", "蹇呭～锛岃濉啓鎶ヤ慨鍐呭");
Assert.hasKeyAndValue(reqJson, "communityId", "蹇呭～锛岃濉啓灏忓尯ID");
- String userId = context.getReqHeaders().get("user-id");
- Assert.hasLength(userId,"璇峰～鍐欐彁浜ょ敤鎴稩D");
- UserDto userDto = new UserDto();
- userDto.setUserId(userId);
- userDto.setPage(1);
- userDto.setRow(1);
+ String userId = context.getReqHeaders().get("user-id");
+ Assert.hasLength(userId, "璇峰～鍐欐彁浜ょ敤鎴稩D");
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ userDto.setPage(1);
+ userDto.setRow(1);
List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
- Assert.listOnlyOne(userDtos,"鏈煡璇㈠埌鐢ㄦ埛");
- reqJson.put("userId",userDtos.get(0).getUserId());
- reqJson.put("userName",userDtos.get(0).getName());
+ Assert.listOnlyOne(userDtos, "鏈煡璇㈠埌鐢ㄦ埛");
+ reqJson.put("userId", userDtos.get(0).getUserId());
+ reqJson.put("userName", userDtos.get(0).getName());
}
@Override
+ @Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
//鑾峰彇褰撳墠灏忓尯id
String communityId = reqJson.getString("communityId");
@@ -152,22 +159,23 @@
if (reqJson.containsKey("photos") && !StringUtils.isEmpty(reqJson.getString("photos"))) {
JSONArray photos = reqJson.getJSONArray("photos");
for (int _photoIndex = 0; _photoIndex < photos.size(); _photoIndex++) {
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(photos.getJSONObject(_photoIndex).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 _photo = photos.getString(_photoIndex);
+ if(_photo.length()> 512){
+ FileDto fileDto = new FileDto();
+ fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
+ fileDto.setFileName(fileDto.getFileId());
+ fileDto.setContext(_photo);
+ fileDto.setSuffix("jpeg");
+ fileDto.setCommunityId(reqJson.getString("communityId"));
+ _photo = fileInnerServiceSMOImpl.saveFile(fileDto);
+ }
JSONObject businessUnit = new JSONObject();
- businessUnit.put("fileRelId", "-" + (_photoIndex + 1));
+ businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId("12"));
businessUnit.put("relTypeCd", FileRelDto.REL_TYPE_CD_REPAIR);
businessUnit.put("saveWay", "ftp");
businessUnit.put("objId", businessOwnerRepair.getString("repairId"));
- businessUnit.put("fileRealName", fileName);
- businessUnit.put("fileSaveName", fileName);
+ businessUnit.put("fileRealName", _photo.toString());
+ businessUnit.put("fileSaveName", _photo.toString());
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
if (flag < 1) {
@@ -175,5 +183,15 @@
}
}
}
+
+ if (StringUtil.jsonHasKayAndValue(reqJson, "noteId")) {
+ NotepadPo notepadPo = new NotepadPo();
+ notepadPo.setNoteId(reqJson.getString("noteId"));
+ notepadPo.setThridId(repairPoolPo.getRepairId());
+ flag = notepadV1InnerServiceSMOImpl.updateNotepad(notepadPo);
+ if (flag < 1) {
+ throw new CmdException("淇敼涓氫富鍙嶉澶辫触");
+ }
+ }
}
}
--
Gitblit v1.8.0