From 8ddb4e5684d0270e206fff6e063552abec835d59 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 五月 2020 17:25:20 +0800
Subject: [PATCH] 优化心跳线程
---
Api/src/main/java/com/java110/api/bmo/inspectionTask/impl/InspectionTaskBMOImpl.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/bmo/inspectionTask/impl/InspectionTaskBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/inspectionTask/impl/InspectionTaskBMOImpl.java
index 3d45374..42be43c 100644
--- a/Api/src/main/java/com/java110/api/bmo/inspectionTask/impl/InspectionTaskBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/inspectionTask/impl/InspectionTaskBMOImpl.java
@@ -5,10 +5,15 @@
import com.java110.api.bmo.inspectionTask.IInspectionTaskBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.inspectionTask.IInspectionTaskInnerServiceSMO;
+import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service("inspectionTaskBMOImpl")
public class InspectionTaskBMOImpl extends ApiBaseBMO implements IInspectionTaskBMO {
@@ -46,27 +51,27 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- /* public JSONObject updateInspectionTask(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public JSONObject updateInspectionTask(JSONObject paramInJson, DataFlowContext dataFlowContext) {
InspectionTaskDto inspectionTaskDto = new InspectionTaskDto();
- inspectionTaskDto.setInspectionTaskId(paramInJson.getString("inspectionTaskId"));
+ inspectionTaskDto.setTaskId(paramInJson.getString("taskId"));
inspectionTaskDto.setCommunityId(paramInJson.getString("communityId"));
List<InspectionTaskDto> inspectionTaskDtos = inspectionTaskInnerServiceSMOImpl.queryInspectionTasks(inspectionTaskDto);
- Assert.listOnlyOne(inspectionTaskDtos, "鏈壘鍒伴渶瑕佷慨鏀圭殑娲诲姩 鎴栧鏉℃暟鎹�");
+ Assert.listOnlyOne(inspectionTaskDtos, "鏈壘鍒伴渶瑕佷慨鏀圭殑宸℃浠诲姟 鎴栧鏉℃暟鎹�");
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_inspectionTask);
+ business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_TASK);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessInspectionTask = new JSONObject();
- businessInspectionTask.putAll(activitiesDtos.get(0));
+ businessInspectionTask.putAll(BeanConvertUtil.beanCovertMap(inspectionTaskDtos.get(0)));
businessInspectionTask.putAll(paramInJson);
//璁＄畻 搴旀敹閲戦
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessInspectionTask", businessInspectionTask);
return business;
- }*/
+ }
/**
@@ -76,11 +81,11 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- /*public JSONObject deleteInspectionTask(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public JSONObject deleteInspectionTask(JSONObject paramInJson, DataFlowContext dataFlowContext) {
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_inspectionTask);
+ business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_INSPECTION_TASK);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessInspectionTask = new JSONObject();
@@ -89,5 +94,30 @@
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessInspectionTask", businessInspectionTask);
return business;
}
-*/
+
+ /**
+ * 娣诲姞鐗╀笟璐圭敤
+ *
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param dataFlowContext 鏁版嵁涓婁笅鏂�
+ * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
+ */
+ public JSONObject addPhoto(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+
+ JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+ business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
+ business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 2);
+ business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+ 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"));
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
+
+ return business;
+ }
}
--
Gitblit v1.8.0