From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/ownerRepair/SaveOwnerRepairCmd.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 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 0a73f74..76de35b 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,16 +3,20 @@
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;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
import com.java110.dto.user.UserDto;
+import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
import com.java110.intf.community.IRepairUserV1InnerServiceSMO;
@@ -26,6 +30,7 @@
import com.java110.po.owner.RepairUserPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.FeeTypeConstant;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -38,6 +43,48 @@
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",
+ seq = 23
+)
+//鍏ュ弬瑕佹眰
+@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 {
@@ -59,6 +106,9 @@
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IFileInnerServiceSMO fileInnerServiceSMOImpl;
@Autowired
private INotepadV1InnerServiceSMO notepadV1InnerServiceSMOImpl;
@@ -96,6 +146,7 @@
}
@Override
+ @Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
//鑾峰彇褰撳墠灏忓尯id
String communityId = reqJson.getString("communityId");
@@ -117,7 +168,7 @@
//鏌ヨ鎶ヤ慨涓氫富澶勭悊涓殑鎶ヤ慨璐�
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
//鍙栧嚭寮�鍏虫槧灏勭殑鍊�(缁翠慨甯堝倕鏈鐞嗘渶澶у崟鏁�)
- String repairFeeNumber = MappingCache.getValue(DOMAIN_COMMON, REPAIR_FEE_NUMBER);
+ String repairFeeNumber = MappingCache.getValue(MappingConstant.REPAIR_DOMAIN, REPAIR_FEE_NUMBER);
if (feeDtos != null && StringUtil.isInteger(repairFeeNumber) && feeDtos.size() >= Integer.parseInt(repairFeeNumber)) {
ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "璇ユ埧灞嬪瓨鍦�" + Integer.parseInt(repairFeeNumber) + "鏉℃湭澶勭悊鐨勮垂鐢紝璇风即璐瑰悗鍐嶈繘琛屾姤淇紒");
context.setResponseEntity(responseEntity);
@@ -152,9 +203,18 @@
if (reqJson.containsKey("photos") && !StringUtils.isEmpty(reqJson.getString("photos"))) {
JSONArray photos = reqJson.getJSONArray("photos");
for (int _photoIndex = 0; _photoIndex < photos.size(); _photoIndex++) {
- Object _photo = photos.get(_photoIndex);
+ 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"));
--
Gitblit v1.8.0