From dea2325896c7f8bd7df5107569b71d15fede79c7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 22 九月 2022 20:11:55 +0800
Subject: [PATCH] 1、优化图片异步上传2、bug修复3、合同bug修复4、车场相关问题
---
service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/UpdateInspectionTaskDetailCmd.java | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/UpdateInspectionTaskDetailCmd.java b/service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/UpdateInspectionTaskDetailCmd.java
index 3fa184e..2eb7e9e 100644
--- a/service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/UpdateInspectionTaskDetailCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/inspectionTaskDetail/UpdateInspectionTaskDetailCmd.java
@@ -7,12 +7,9 @@
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.core.log.LoggerFactory;
-import com.java110.dto.file.FileDto;
import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
import com.java110.dto.inspectionPlan.InspectionTaskDto;
-import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
import com.java110.intf.community.IInspectionTaskDetailV1InnerServiceSMO;
@@ -36,10 +33,8 @@
@Java110Cmd(serviceCode = "inspectionTaskDetail.updateInspectionTaskDetail")
public class UpdateInspectionTaskDetailCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(UpdateInspectionTaskDetailCmd.class);
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+ private static Logger logger = LoggerFactory.getLogger(UpdateInspectionTaskDetailCmd.class);
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
@@ -108,38 +103,27 @@
private void dealPhotos(JSONObject reqJson) {
JSONArray photos = reqJson.getJSONArray("photos");
- JSONObject photo = null;
for (int photoIndex = 0; photoIndex < photos.size(); photoIndex++) {
- photo = photos.getJSONObject(photoIndex);
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(photo.getString("photo"));
- fileDto.setSuffix("jpeg");
- fileDto.setCommunityId(reqJson.getString("communityId"));
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- reqJson.put("photoId", fileDto.getFileId());
- reqJson.put("fileSaveName", fileName);
-
+ Object photo = photos.get(photoIndex);
+ reqJson.put("fileName", photo.toString());
addPhoto(reqJson);
}
}
/**
- * 娣诲姞鐗╀笟璐圭敤
+ * 娣诲姞鍥剧墖
*
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public void addPhoto(JSONObject paramInJson) {
-
JSONObject businessUnit = new JSONObject();
businessUnit.put("fileRelId", "-1");
businessUnit.put("relTypeCd", "90000");
businessUnit.put("saveWay", "ftp");
businessUnit.put("objId", paramInJson.getString("taskDetailId"));
- businessUnit.put("fileRealName", paramInJson.getString("photoId"));
- businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
+ businessUnit.put("fileRealName", paramInJson.getString("fileName"));
+ businessUnit.put("fileSaveName", paramInJson.getString("fileName"));
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
int flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
if (flag < 1) {
@@ -170,8 +154,6 @@
Date date = new Date();
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
String currentDate = sdf1.format(date);
- System.out.println(currentDate);
-
//鑾峰彇宸℃鐐圭殑宸℃鐐规椂闂撮檺鍒�
String inspectionStartTime = "";
@@ -224,8 +206,13 @@
int flag = inspectionTaskDetailV1InnerServiceSMOImpl.updateInspectionTaskDetail(inspectionTaskDetailPoPo);
if (flag < 1) {
- throw new CmdException("淇濆瓨鏄庣粏澶辫触");
+ throw new CmdException("鏇存柊浠诲姟鏄庣粏澶辫触");
}
+ //宸℃瀹屾垚鍚庢洿鏀瑰贰妫�浠诲姟琛ㄧ姸鎬�
+ InspectionTaskDto inspectionTask= new InspectionTaskDto();
+ inspectionTask.setTaskId(inspectionTaskDetailPoPo.getTaskId());
+ inspectionTask.setState(inspectionTaskDetailPoPo.getState());
+ inspectionTaskInnerServiceSMOImpl.updateInspectionTask(inspectionTask);
}
/**
--
Gitblit v1.8.0