From d040ab399d9a18d3a2581790d3cd5cd4b74b5325 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 29 五月 2020 15:17:01 +0800
Subject: [PATCH] 代码未调整完
---
Api/src/main/java/com/java110/api/bmo/ownerRepair/impl/OwnerRepairBMOImpl.java | 95 +++++++++++++++--------------------------------
1 files changed, 30 insertions(+), 65 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/bmo/ownerRepair/impl/OwnerRepairBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/ownerRepair/impl/OwnerRepairBMOImpl.java
index 194d821..9149da3 100644
--- a/Api/src/main/java/com/java110/api/bmo/ownerRepair/impl/OwnerRepairBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/ownerRepair/impl/OwnerRepairBMOImpl.java
@@ -3,14 +3,14 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.ownerRepair.IOwnerRepairBMO;
-import com.java110.api.listener.ownerRepair.CloseRepairDispatchListener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.repair.IRepairInnerServiceSMO;
import com.java110.core.smo.repair.IRepairUserInnerServiceSMO;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
+import com.java110.po.owner.RepairPoolPo;
+import com.java110.po.owner.RepairUserPo;
import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.StateConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -39,29 +39,23 @@
@Autowired
private IRepairInnerServiceSMO repairInnerServiceSMOImpl;
- public JSONObject modifyBusinessRepairUser(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void modifyBusinessRepairUser(JSONObject paramInJson, DataFlowContext dataFlowContext) {
RepairUserDto repairUserDto = new RepairUserDto();
repairUserDto.setRepairId(paramInJson.getString("repairId"));
repairUserDto.setUserId(paramInJson.getString("staffId"));
List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
Assert.isOne(repairUserDtos, "鏌ヨ鍒板鏉℃暟鎹紝repairId=" + repairUserDto.getRepairId() + " userId = " + repairUserDto.getUserId());
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR_USER);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessObj = new JSONObject();
businessObj.putAll(BeanConvertUtil.beanCovertMap(repairUserDtos.get(0)));
businessObj.put("state", paramInJson.getString("state"));
businessObj.put("context", paramInJson.getString("context"));
- //businessObj.put("ruId", "-1");
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRepairUser", businessObj);
- return business;
+
+ RepairUserPo repairUserPo = BeanConvertUtil.covertBean(businessObj, RepairUserPo.class);
+ super.update(dataFlowContext, repairUserPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR_USER);
}
- public JSONObject modifyBusinessRepair(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void modifyBusinessRepair(JSONObject paramInJson, DataFlowContext dataFlowContext) {
//鏌ヨ鎶ヤ慨鍗�
RepairDto repairDto = new RepairDto();
repairDto.setRepairId(paramInJson.getString("repairId"));
@@ -72,18 +66,12 @@
logger.debug("鏌ヨ鎶ヤ慨鍗曠粨鏋滐細" + JSONObject.toJSONString(repairDtos.get(0)));
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessOwnerRepair = new JSONObject();
businessOwnerRepair.putAll(BeanConvertUtil.beanCovertMap(repairDtos.get(0)));
businessOwnerRepair.put("state", "10002".equals(paramInJson.getString("state")) ? StateConstant.REPAIR_DISPATCH_FINISH : StateConstant.REPAIR_NO_DISPATCH);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRepair", businessOwnerRepair);
- logger.debug("鎷艰淇敼 鎶ヤ慨鍗曠姸鎬佹姤鏂囷細" + business.toJSONString());
- return business;
+ RepairPoolPo repairPoolPo = BeanConvertUtil.covertBean(businessOwnerRepair, RepairPoolPo.class);
+ super.update(dataFlowContext, repairPoolPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR);
}
/**
@@ -93,58 +81,44 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject deleteOwnerRepair(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void deleteOwnerRepair(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_REPAIR);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessOwnerRepair = new JSONObject();
businessOwnerRepair.putAll(paramInJson);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRepair", businessOwnerRepair);
- return business;
+
+ RepairPoolPo repairPoolPo = BeanConvertUtil.covertBean(businessOwnerRepair, RepairPoolPo.class);
+ super.delete(dataFlowContext, repairPoolPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_REPAIR);
}
- public JSONObject addBusinessRepairUser(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_REPAIR_USER);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+ public void addBusinessRepairUser(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
JSONObject businessObj = new JSONObject();
businessObj.putAll(paramInJson);
businessObj.put("state", StateConstant.STAFF_NO_FINISH_ORDER);
businessObj.put("ruId", "-1");
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRepairUser", businessObj);
- return business;
+ RepairUserPo repairUserPo = BeanConvertUtil.covertBean(businessObj, RepairUserPo.class);
+ super.insert(dataFlowContext, repairUserPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_REPAIR_USER);
}
- public JSONObject modifyBusinessRepairDispatch(JSONObject paramInJson, DataFlowContext dataFlowContext){
+ public void modifyBusinessRepairDispatch(JSONObject paramInJson, DataFlowContext dataFlowContext) {
//鏌ヨ鎶ヤ慨鍗�
RepairDto repairDto = new RepairDto();
repairDto.setRepairId(paramInJson.getString("repairId"));
List<RepairDto> repairDtos = repairInnerServiceSMOImpl.queryRepairs(repairDto);
- Assert.isOne(repairDtos, "鏌ヨ鍒板鏉℃暟鎹紝repairId="+ repairDto.getRepairId());
+ Assert.isOne(repairDtos, "鏌ヨ鍒板鏉℃暟鎹紝repairId=" + repairDto.getRepairId());
- logger.debug("鏌ヨ鎶ヤ慨鍗曠粨鏋滐細"+JSONObject.toJSONString(repairDtos.get(0)));
+ logger.debug("鏌ヨ鎶ヤ慨鍗曠粨鏋滐細" + JSONObject.toJSONString(repairDtos.get(0)));
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ+1);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+
JSONObject businessOwnerRepair = new JSONObject();
businessOwnerRepair.putAll(BeanConvertUtil.beanCovertMap(repairDtos.get(0)));
businessOwnerRepair.put("state", StateConstant.REPAIR_DISPATCHING);
//璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRepair", businessOwnerRepair);
- logger.debug("鎷艰淇敼 鎶ヤ慨鍗曠姸鎬佹姤鏂囷細"+business.toJSONString());
-
- return business;
+ RepairPoolPo repairPoolPo = BeanConvertUtil.covertBean(businessOwnerRepair, RepairPoolPo.class);
+ super.update(dataFlowContext, repairPoolPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR);
}
/**
@@ -154,20 +128,15 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addOwnerRepair(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addOwnerRepair(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_REPAIR);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessOwnerRepair = new JSONObject();
businessOwnerRepair.putAll(paramInJson);
businessOwnerRepair.put("repairId", "-1");
businessOwnerRepair.put("state", StateConstant.REPAIR_NO_DISPATCH);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRepair", businessOwnerRepair);
- return business;
+ RepairPoolPo repairPoolPo = BeanConvertUtil.covertBean(businessOwnerRepair, RepairPoolPo.class);
+ super.insert(dataFlowContext, repairPoolPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_REPAIR);
}
/**
@@ -177,18 +146,14 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject updateOwnerRepair(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void updateOwnerRepair(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessOwnerRepair = new JSONObject();
businessOwnerRepair.putAll(paramInJson);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRepair", businessOwnerRepair);
- return business;
+
+ RepairPoolPo repairPoolPo = BeanConvertUtil.covertBean(businessOwnerRepair, RepairPoolPo.class);
+ super.update(dataFlowContext, repairPoolPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR);
}
}
--
Gitblit v1.8.0