From 7cd9cc73b6bbae05e8fa734e29f6cd435e2599ba Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 28 六月 2023 14:27:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/cmd/complaint/SaveComplaintCmd.java | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/complaint/SaveComplaintCmd.java b/service-store/src/main/java/com/java110/store/cmd/complaint/SaveComplaintCmd.java
index 473dc6a..59e2793 100644
--- a/service-store/src/main/java/com/java110/store/cmd/complaint/SaveComplaintCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/complaint/SaveComplaintCmd.java
@@ -8,19 +8,22 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.community.CommunityMemberDto;
import com.java110.dto.complaint.ComplaintDto;
import com.java110.dto.file.FileDto;
import com.java110.intf.common.IComplaintUserInnerServiceSMO;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.IComplaintV1InnerServiceSMO;
import com.java110.po.complaint.ComplaintPo;
import com.java110.po.file.FileRelPo;
-import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
@Java110Cmd(serviceCode = "complaint.saveComplaint")
public class SaveComplaintCmd extends Cmd{
@@ -37,9 +40,12 @@
@Autowired
private IComplaintV1InnerServiceSMO complaintV1InnerServiceSMOImpl;
+ @Autowired
+ private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
- Assert.hasKeyAndValue(reqJson, "storeId", "蹇呭～锛岃濉啓鍟嗘埛ID");
+// Assert.hasKeyAndValue(reqJson, "storeId", "蹇呭～锛岃濉啓鍟嗘埛ID");
Assert.hasKeyAndValue(reqJson, "typeCd", "蹇呭～锛岃閫夋嫨鎶曡瘔绫诲瀷");
Assert.hasKeyAndValue(reqJson, "roomId", "蹇呭～锛岃閫夋嫨鎴垮眿缂栧彿");
Assert.hasKeyAndValue(reqJson, "complaintName", "蹇呭～锛岃濉啓鎶曡瘔浜�");
@@ -47,12 +53,21 @@
Assert.hasKeyAndValue(reqJson, "userId", "蹇呭～锛岃濉啓鐢ㄦ埛淇℃伅");
Assert.hasKeyAndValue(reqJson, "context", "蹇呭～锛岃濉啓鎶曡瘔鍐呭");
Assert.hasKeyAndValue(reqJson, "communityId", "蹇呭～锛岃濉啓灏忓尯ID");
+
+
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ CommunityMemberDto communityMemberDto = new CommunityMemberDto();
+ communityMemberDto.setCommunityId(reqJson.getString("communityId"));
+ communityMemberDto.setMemberTypeCd("390001200002");
+ List<CommunityMemberDto> communityMemberDtos = communityInnerServiceSMOImpl.getCommunityMembers(communityMemberDto);
+
+ Assert.listOnlyOne(communityMemberDtos,"灏忓尯鏈叆椹�");
+ reqJson.put("storeId",communityMemberDtos.get(0).getMemberId());
reqJson.put("startUserId", reqJson.getString("userId"));
reqJson.put("complaintId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_complaintId));
reqJson.put("state", "10001");
@@ -65,25 +80,23 @@
if (reqJson.containsKey("photos") && reqJson.getJSONArray("photos").size() > 0) {
JSONArray photos = reqJson.getJSONArray("photos");
for (int photoIndex = 0; photoIndex < photos.size(); photoIndex++) {
-
- JSONObject photoObj = photos.getJSONObject(photoIndex);
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(photoObj.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", "-1");
businessUnit.put("relTypeCd", "13000");
businessUnit.put("saveWay", "table");
businessUnit.put("objId", reqJson.getString("complaintId"));
- businessUnit.put("fileRealName", fileDto.getFileId());
- businessUnit.put("fileSaveName", fileName);
+ businessUnit.put("fileRealName", _photo);
+ businessUnit.put("fileSaveName", _photo);
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
}
--
Gitblit v1.8.0