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/maintainanceTask/UpdateMaintainanceTaskDetailCmd.java | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 217 insertions(+), 8 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskDetailCmd.java b/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskDetailCmd.java
index de19710..7f24320 100644
--- a/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskDetailCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskDetailCmd.java
@@ -15,21 +15,36 @@
*/
package com.java110.community.cmd.maintainanceTask;
+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.dto.maintainanceTask.MaintainanceTaskDto;
+import com.java110.dto.maintainanceTaskDetail.MaintainanceTaskDetailDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IMaintainanceTaskDetailV1InnerServiceSMO;
+import com.java110.intf.community.IMaintainanceTaskV1InnerServiceSMO;
+import com.java110.po.file.FileRelPo;
+import com.java110.po.maintainanceTask.MaintainanceTaskPo;
import com.java110.po.maintainanceTaskDetail.MaintainanceTaskDetailPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
/**
@@ -42,19 +57,30 @@
* 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
-@Java110Cmd(serviceCode = "maintainanceTaskDetail.updateMaintainanceTaskDetail")
+@Java110Cmd(serviceCode = "maintainanceTask.updateMaintainanceTaskDetail")
public class UpdateMaintainanceTaskDetailCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(UpdateMaintainanceTaskDetailCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(UpdateMaintainanceTaskDetailCmd.class);
@Autowired
private IMaintainanceTaskDetailV1InnerServiceSMO maintainanceTaskDetailV1InnerServiceSMOImpl;
+ @Autowired
+ private IMaintainanceTaskV1InnerServiceSMO maintainanceTaskV1InnerServiceSMOImpl;
+
+
+
+
+
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "taskDetailId", "taskDetailId涓嶈兘涓虹┖");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
}
@@ -62,13 +88,196 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- MaintainanceTaskDetailPo maintainanceTaskDetailPo = BeanConvertUtil.covertBean(reqJson, MaintainanceTaskDetailPo.class);
- int flag = maintainanceTaskDetailV1InnerServiceSMOImpl.updateMaintainanceTaskDetail(maintainanceTaskDetailPo);
-
- if (flag < 1) {
- throw new CmdException("鏇存柊鏁版嵁澶辫触");
+ if (reqJson.containsKey("photos")) {
+ dealPhotos(reqJson);
}
+ //娣诲姞鍗曞厓淇℃伅
+ reqJson.put("state", "20200407");//宸℃鐐瑰畬鎴�
+ try {
+ updateMaintainanceTaskDetail(reqJson);
+ } catch (ParseException e) {
+ logger.error("鏇存柊鏄庣粏澶辫触", e);
+ throw new CmdException(e.getMessage());
+ }
+
+ MaintainanceTaskDto maintainanceTaskDto = new MaintainanceTaskDto();
+ maintainanceTaskDto.setTaskId(reqJson.getString("taskId"));
+ maintainanceTaskDto.setCommunityId(reqJson.getString("communityId"));
+ maintainanceTaskDto.setState("20200405");
+ List<MaintainanceTaskDto> maintainanceTaskDtos = maintainanceTaskV1InnerServiceSMOImpl.queryMaintainanceTasks(maintainanceTaskDto);
+
+ if (maintainanceTaskDtos != null && maintainanceTaskDtos.size() > 0) {
+ reqJson.put("state", "20200406");
+ updateMaintainanceTask(reqJson);
+ }
+
+ MaintainanceTaskDetailDto maintainanceTaskDetailDto = new MaintainanceTaskDetailDto();
+ maintainanceTaskDetailDto.setCommunityId(reqJson.getString("communityId"));
+ maintainanceTaskDetailDto.setTaskId(reqJson.getString("taskId"));
+ maintainanceTaskDetailDto.setState("20200405");
+ int count = maintainanceTaskDetailV1InnerServiceSMOImpl.queryMaintainanceTaskDetailsCount(maintainanceTaskDetailDto);
+
+ if (count > 0) {//璇存槑杩樻病鏈夊贰妫�瀹�
+ return;
+ }
+ reqJson.put("state", "20200407");//宸℃瀹屾垚
+ updateMaintainanceTask(reqJson);
+
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
+
+
+ private void dealPhotos(JSONObject reqJson) {
+ JSONArray photos = reqJson.getJSONArray("photos");
+ for (int photoIndex = 0; photoIndex < photos.size(); photoIndex++) {
+ 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", GenerateCodeFactory.getGeneratorId("10"));
+ businessUnit.put("relTypeCd", "90000");
+ businessUnit.put("saveWay", "ftp");
+ businessUnit.put("objId", paramInJson.getString("taskDetailId"));
+ 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) {
+ throw new CmdException("淇濆瓨鍥剧墖澶辫触");
+ }
+ }
+
+ public void updateMaintainanceTaskDetail(JSONObject paramInJson) throws ParseException {
+ MaintainanceTaskDetailDto maintainanceTaskDetailDto = new MaintainanceTaskDetailDto();
+ maintainanceTaskDetailDto.setTaskDetailId(paramInJson.getString("taskDetailId"));
+ maintainanceTaskDetailDto.setCommunityId(paramInJson.getString("communityId"));
+ List<MaintainanceTaskDetailDto> maintainanceTaskDetailDtos = maintainanceTaskDetailV1InnerServiceSMOImpl.queryMaintainanceTaskDetails(maintainanceTaskDetailDto);
+ Assert.listOnlyOne(maintainanceTaskDetailDtos, "鏈壘鍒伴渶瑕佷慨鏀圭殑娲诲姩 鎴栧鏉℃暟鎹�");
+ JSONObject businessMaintainanceTaskDetail = new JSONObject();
+ businessMaintainanceTaskDetail.putAll(BeanConvertUtil.beanCovertMap(maintainanceTaskDetailDtos.get(0)));
+ businessMaintainanceTaskDetail.putAll(paramInJson);
+ MaintainanceTaskDetailPo maintainanceTaskDetailPoPo = BeanConvertUtil.covertBean(businessMaintainanceTaskDetail, MaintainanceTaskDetailPo.class);
+ maintainanceTaskDetailPoPo.setInspectionTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ maintainanceTaskDetailPoPo.setActUserId(paramInJson.getString("userId"));
+ maintainanceTaskDetailPoPo.setActUserName(paramInJson.getString("userName"));
+ //鑾峰彇浠诲姟id
+ String taskId = paramInJson.getString("taskId");
+ MaintainanceTaskDto maintainanceTaskDto = new MaintainanceTaskDto();
+ maintainanceTaskDto.setTaskId(taskId);
+ List<MaintainanceTaskDto> maintainanceTaskDtos = maintainanceTaskV1InnerServiceSMOImpl.queryMaintainanceTasks(maintainanceTaskDto);
+ Assert.listOnlyOne(maintainanceTaskDtos, "鏌ヨ宸℃浠诲姟鏁版嵁閿欒锛�");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = new Date();
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
+ String currentDate = sdf1.format(date);
+
+ //鑾峰彇宸℃鐐圭殑宸℃鐐规椂闂撮檺鍒�
+ String maintainanceStartTime = "";
+ String maintainanceEndTime = "";
+ long planStartTime;
+ long planFinishTime;
+ String pointStartTime = maintainanceTaskDetailDtos.get(0).getPointStartTime();
+ String pointEndTime = maintainanceTaskDetailDtos.get(0).getPointEndTime();
+ if (!StringUtil.isEmpty(pointStartTime)) {
+ maintainanceStartTime = pointStartTime ;
+ Date startTime = format.parse(maintainanceStartTime);
+ planStartTime = startTime.getTime();
+ } else {
+ //鑾峰彇璁″垝宸℃寮�濮嬫椂闂�
+ String planInsTime = maintainanceTaskDtos.get(0).getPlanInsTime();
+ Date startTime = format.parse(planInsTime);
+ planStartTime = startTime.getTime();
+ }
+ if (!StringUtil.isEmpty(pointEndTime)) {
+ maintainanceEndTime = pointEndTime ;
+ Date endTime = format.parse(maintainanceEndTime);
+ planFinishTime = endTime.getTime();
+ } else {
+ //鑾峰彇璁″垝宸℃缁撴潫鏃堕棿
+ String planEndTime = maintainanceTaskDtos.get(0).getPlanEndTime();
+ Date endTime = format.parse(planEndTime);
+ planFinishTime = endTime.getTime();
+ }
+
+ //鑾峰彇璁″垝宸℃寮�濮嬫椂闂�
+// String planInsTime = maintainanceTaskDtos.get(0).getPlanInsTime();
+// Date startTime = format.parse(planInsTime);
+// long planStartTime = startTime.getTime();
+// //鑾峰彇璁″垝宸℃缁撴潫鏃堕棿
+// String planEndTime = maintainanceTaskDtos.get(0).getPlanEndTime();
+// Date endTime = format.parse(planEndTime);
+// long planFinishTime = endTime.getTime();
+ //鑾峰彇宸℃鐐圭鍒版椂闂�
+ String maintainanceTime = maintainanceTaskDetailPoPo.getInspectionTime();
+ Date maintainanceDetailTime = format.parse(maintainanceTime);
+ long detailTime = maintainanceDetailTime.getTime();
+ maintainanceTaskDetailPoPo.setState(MaintainanceTaskDetailDto.STATE_FINISH);
+
+// if (detailTime < planStartTime) { //濡傛灉宸℃鐐圭鍒版椂闂村皬浜庡贰妫�璁″垝寮�濮嬫椂闂达紝绛惧埌鐘舵�佸氨鏄棭鍒�
+// maintainanceTaskDetailPoPo.setState(MaintainanceTaskDetailDto.STATE_FINISH);
+// } else if (detailTime > planFinishTime) { //濡傛灉宸℃鐐圭鍒版椂闂村ぇ浜庡贰妫�璁″垝缁撴潫鏃堕棿锛岀鍒扮姸鎬佸氨鏄繜鍒�
+// maintainanceTaskDetailPoPo.setState("50000");
+// } else { //濡傛灉宸℃鐐圭鍒版椂闂村湪宸℃璁″垝寮�濮嬫椂闂村拰宸℃璁″垝缁撴潫鏃堕棿涔嬮棿锛岀鍒扮姸鎬佸氨鏄甯�
+// maintainanceTaskDetailPoPo.setState("60000");
+// }
+
+ int flag = maintainanceTaskDetailV1InnerServiceSMOImpl.updateMaintainanceTaskDetail(maintainanceTaskDetailPoPo);
+
+ if (flag < 1) {
+ throw new CmdException("鏇存柊浠诲姟鏄庣粏澶辫触");
+ }
+ //宸℃瀹屾垚鍚庢洿鏀瑰贰妫�浠诲姟琛ㄧ姸鎬�
+// MaintainanceTaskDto maintainanceTask= new MaintainanceTaskDto();
+// maintainanceTask.setTaskId(maintainanceTaskDetailPoPo.getTaskId());
+// maintainanceTask.setState(maintainanceTaskDetailPoPo.getState());
+// maintainanceTaskInnerServiceSMOImpl.updateMaintainanceTask(maintainanceTask);
+ }
+
+ /**
+ * 娣诲姞娲诲姩淇℃伅
+ *
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
+ */
+ public void updateMaintainanceTask(JSONObject paramInJson) {
+
+ MaintainanceTaskDto maintainanceTaskDto = new MaintainanceTaskDto();
+ maintainanceTaskDto.setTaskId(paramInJson.getString("taskId"));
+ maintainanceTaskDto.setCommunityId(paramInJson.getString("communityId"));
+ List<MaintainanceTaskDto> maintainanceTaskDtos = maintainanceTaskV1InnerServiceSMOImpl.queryMaintainanceTasks(maintainanceTaskDto);
+
+ Assert.listOnlyOne(maintainanceTaskDtos, "鏈壘鍒伴渶瑕佷慨鏀圭殑宸℃浠诲姟 鎴栧鏉℃暟鎹�");
+
+ JSONObject businessMaintainanceTask = new JSONObject();
+ businessMaintainanceTask.putAll(BeanConvertUtil.beanCovertMap(maintainanceTaskDtos.get(0)));
+
+ MaintainanceTaskPo maintainanceTaskPo = BeanConvertUtil.covertBean(businessMaintainanceTask, MaintainanceTaskPo.class);
+ maintainanceTaskPo.setActInsTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ maintainanceTaskPo.setActUserId(paramInJson.getString("userId"));
+ maintainanceTaskPo.setActUserName(paramInJson.getString("userName"));
+ maintainanceTaskPo.setState(paramInJson.getString("state"));
+ if (!StringUtil.isEmpty(paramInJson.getString("taskType")) && paramInJson.getString("taskType").equals("2000")) {
+// maintainanceTaskPo.setOriginalPlanUserId(maintainanceTaskPo.getPlanUserId());
+// maintainanceTaskPo.setOriginalPlanUserName(maintainanceTaskPo.getPlanUserName());
+ maintainanceTaskPo.setPlanUserId(paramInJson.getString("staffId"));
+ maintainanceTaskPo.setPlanUserName(paramInJson.getString("staffName"));
+ maintainanceTaskPo.setTaskType(paramInJson.getString("taskType"));
+ maintainanceTaskPo.setTransferDesc(paramInJson.getString("transferDesc"));
+ }
+ int flag = maintainanceTaskV1InnerServiceSMOImpl.updateMaintainanceTask(maintainanceTaskPo);
+ if (flag < 1) {
+ throw new CmdException("淇敼浠诲姟澶辫触");
+ }
+ }
}
--
Gitblit v1.8.0