From c0328edb2de39f27e47b7ad1eedf8f80b883335e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 24 一月 2023 17:41:49 +0800
Subject: [PATCH] 优化 供应链 类型的bug
---
service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairFinishCmd.java | 58 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairFinishCmd.java b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairFinishCmd.java
index ce92b8b..b780efe 100644
--- a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairFinishCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairFinishCmd.java
@@ -57,7 +57,6 @@
@Java110Cmd(serviceCode = "ownerRepair.repairFinish")
public class RepairFinishCmd extends Cmd {
-
@Autowired
private IRepairUserInnerServiceSMO repairUserInnerServiceSMOImpl;
@@ -66,9 +65,6 @@
@Autowired
private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
-
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
@Autowired
private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMO;
@@ -102,6 +98,9 @@
@Autowired
private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
+
+ @Autowired
+ private IFileInnerServiceSMO fileInnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -415,8 +414,8 @@
repairUserPo.setStaffId(ownerId);
repairUserPo.setStaffName(ownerName);
}
- repairUserPo.setPreStaffId(userId);
- repairUserPo.setPreStaffName(userName);
+ repairUserPo.setPreStaffId(repairUserDtos.get(0).getStaffId());
+ repairUserPo.setPreStaffName(repairUserDtos.get(0).getStaffName());
repairUserPo.setPreRuId(repairUserDtos.get(0).getRuId());
repairUserPo.setRepairEvent(RepairUserDto.REPAIR_EVENT_PAY_USER);
repairUserPo.setCommunityId(reqJson.getString("communityId"));
@@ -429,22 +428,23 @@
if (reqJson.containsKey("beforeRepairPhotos") && !StringUtils.isEmpty(reqJson.getString("beforeRepairPhotos"))) {
JSONArray beforeRepairPhotos = reqJson.getJSONArray("beforeRepairPhotos");
for (int _photoIndex = 0; _photoIndex < beforeRepairPhotos.size(); _photoIndex++) {
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(beforeRepairPhotos.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 = beforeRepairPhotos.getJSONObject(_photoIndex).getString("photo");
+ 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", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
businessUnit.put("relTypeCd", FileRelDto.BEFORE_REPAIR_PHOTOS);
businessUnit.put("saveWay", "ftp");
businessUnit.put("objId", reqJson.getString("repairId"));
- businessUnit.put("fileRealName", fileName);
- businessUnit.put("fileSaveName", fileName);
+ businessUnit.put("fileRealName", photo);
+ businessUnit.put("fileSaveName", photo);
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
if (flag < 1) {
@@ -456,22 +456,23 @@
if (reqJson.containsKey("afterRepairPhotos") && !StringUtils.isEmpty(reqJson.getString("afterRepairPhotos"))) {
JSONArray afterRepairPhotos = reqJson.getJSONArray("afterRepairPhotos");
for (int _photoIndex = 0; _photoIndex < afterRepairPhotos.size(); _photoIndex++) {
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(afterRepairPhotos.getJSONObject(_photoIndex).getString("photo"));
- fileDto.setSuffix("jpeg");
- fileDto.setCommunityId(reqJson.getString("communityId"));
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- reqJson.put("ownerFinishPhotoId", fileDto.getFileId());
- reqJson.put("fileFinishSaveName", fileName);
+ String photo = afterRepairPhotos.getJSONObject(_photoIndex).getString("photo");
+ 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", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
businessUnit.put("relTypeCd", FileRelDto.AFTER_REPAIR_PHOTOS);
businessUnit.put("saveWay", "ftp");
businessUnit.put("objId", reqJson.getString("repairId"));
- businessUnit.put("fileRealName", fileName);
- businessUnit.put("fileSaveName", fileName);
+ businessUnit.put("fileRealName", photo);
+ businessUnit.put("fileSaveName", photo);
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
if (flag < 1) {
@@ -531,6 +532,7 @@
feePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
feePo.setState(FeeDto.STATE_DOING);
feePo.setUserId(userId);
+ feePo.setbId("-1");
flag = payFeeV1InnerServiceSMOImpl.savePayFee(feePo);
if (flag < 1) {
--
Gitblit v1.8.0