From 5589528feb385d7881f8dbf9314b3abf5d4f4e9e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 27 一月 2023 19:21:11 +0800
Subject: [PATCH] 优化 房屋页面查询功能
---
service-community/src/main/java/com/java110/community/cmd/ownerRepair/SaveOwnerRepairCmd.java | 108 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 84 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..7cba6a9 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,10 +3,12 @@
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;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.file.FileDto;
@@ -20,8 +22,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;
@@ -38,12 +42,50 @@
import java.text.ParseException;
import java.util.List;
+/**
+ * 涓氫富鎻愪氦鎶ヤ慨 鍔熻兘
+ * 璇锋眰鍦板潃涓�/app/ownerRepair.saveOwnerRepair
+ */
+
+@Java110CmdDoc(title = "涓氫富鎶ヤ慨",
+ description = "涓昏鐢ㄤ簬涓氫富鎶ヤ慨",
+ httpMethod = "post",
+ url = "http://{ip}:{port}/app/ownerRepair.saveOwnerRepair",
+ resource = "communityDoc",
+ author = "寮犲嘲",
+ serviceCode = "ownerRepair.saveOwnerRepair"
+)
+//鍏ュ弬瑕佹眰
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "communityId", length = 30, remark = "灏忓尯缂栫爜"),
+ @Java110ParamDoc(name = "appointmentTime", length = 30, remark = "棰勭害鏃堕棿"),
+ @Java110ParamDoc(name = "context", length = 30, remark = "鎶ヤ慨鍐呭"),
+ @Java110ParamDoc(name = "photos", length = 30, remark = "鎶ヤ慨鍥剧墖"),
+ @Java110ParamDoc(name = "repairName", length = 30, remark = "鎶ヤ慨浜哄鍚�"),
+ @Java110ParamDoc(name = "repairObjName", length = 30, remark = "鎶ヤ慨浜轰綇鍧�"),
+ @Java110ParamDoc(name = "repairObjName", length = 30, remark = "鎶ヤ慨浜烘墍鍦ㄥ皬鍖�"),
+ @Java110ParamDoc(name = "roomId", length = 30, remark = "鎴垮眿id"),
+ @Java110ParamDoc(name = "tel", length = 30, remark = "鎶ヤ慨鑱旂郴鐢佃瘽"),
+ @Java110ParamDoc(name = "userName", length = 30, remark = "涓氫富鎴栨垚鍛樺鍚�"),
+ @Java110ParamDoc(name = "repairChannel", length = 30, remark = "鎶ヤ慨娓犻亾"),
+ @Java110ParamDoc(name = "repairType", length = 30, remark = "娲惧崟绫诲瀷"),
+ @Java110ParamDoc(name = "repairObjType", length = 30, remark = "鎴垮眿锛燂紵"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+ @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎶ヤ慨鎴愬姛")
+ }
+)
+
+@Java110ExampleDoc(
+ reqBody="{\"repairName\":\"娴嬭瘯\",\"repairType\":\"102022081592760001\",\"appointmentTime\":\"2022-11-26 15:18:00\",\"tel\":\"15239726115\",\"roomId\":\"752022090312040033\",\"photos\":[],\"context\":\"鍙嶅弽澶嶅鐑︾儲鐑",\"userId\":\"302022102708350644\",\"userName\":\"娴嬭瘯\",\"communityId\":\"2022032267510001\",\"bindDate\":\"2022-11-26\",\"bindTime\":\"15:18\",\"repairObjType\":\"004\",\"repairChannel\":\"Z\",\"repairObjId\":\"752022090312040033\",\"repairObjName\":\"1鍙锋ゼ1鍗曞厓202瀹"}",
+ resBody="{\"code\":0,\"msg\":\"鎴愬姛\",\"page\":0,\"records\":0,\"rows\":0,\"total\":0}"
+)
@Java110Cmd(serviceCode = "ownerRepair.saveOwnerRepair")
public class SaveOwnerRepairCmd extends Cmd {
-
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
@Autowired
private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
@@ -62,6 +104,12 @@
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
+ @Autowired
+ private INotepadV1InnerServiceSMO notepadV1InnerServiceSMOImpl;
//鍩�
public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
@@ -82,20 +130,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 +201,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 +225,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