From 3f629504991dff37c7b9678cfd6435b4e378ebba Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 31 五月 2020 19:52:22 +0800
Subject: [PATCH] 优化添加员工 报错entity
---
Api/src/main/java/com/java110/api/bmo/machine/impl/MachineBMOImpl.java | 53 +++++++++++++++++------------------------------------
1 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/bmo/machine/impl/MachineBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/machine/impl/MachineBMOImpl.java
index 52275e5..f636e44 100644
--- a/Api/src/main/java/com/java110/api/bmo/machine/impl/MachineBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/machine/impl/MachineBMOImpl.java
@@ -6,8 +6,8 @@
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
import com.java110.dto.hardwareAdapation.MachineDto;
+import com.java110.po.machine.MachinePo;
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;
@@ -27,6 +27,7 @@
public class MachineBMOImpl extends ApiBaseBMO implements IMachineBMO {
@Autowired
private IMachineInnerServiceSMO machineInnerServiceSMOImpl;
+
/**
* 娣诲姞灏忓尯淇℃伅
*
@@ -34,18 +35,10 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject deleteMachine(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void deleteMachine(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_MACHINE);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessMachine = new JSONObject();
- businessMachine.putAll(paramInJson);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessMachine", businessMachine);
- return business;
+ MachinePo machinePo = BeanConvertUtil.covertBean(paramInJson, MachinePo.class);
+ super.delete(dataFlowContext, machinePo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_MACHINE);
}
/**
@@ -55,20 +48,17 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addMachine(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addMachine(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessMachine = new JSONObject();
businessMachine.putAll(paramInJson);
businessMachine.put("state", "1000");
businessMachine.put("machineId", "-1");
//璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessMachine", businessMachine);
- return business;
+
+ MachinePo machinePo = BeanConvertUtil.covertBean(businessMachine, MachinePo.class);
+ super.insert(dataFlowContext, machinePo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE);
+
}
/**
@@ -78,19 +68,14 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject updateMachine(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void updateMachine(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_MACHINE);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessMachine = new JSONObject();
businessMachine.putAll(paramInJson);
businessMachine.put("state", "1000");
//璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessMachine", businessMachine);
- return business;
+ MachinePo machinePo = BeanConvertUtil.covertBean(businessMachine, MachinePo.class);
+ super.update(dataFlowContext, machinePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_MACHINE);
}
/**
@@ -100,7 +85,7 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject updateMachineState(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void updateMachineState(JSONObject paramInJson, DataFlowContext dataFlowContext) {
MachineDto machineDto = new MachineDto();
machineDto.setCommunityId(paramInJson.getString("communityId"));
@@ -108,16 +93,12 @@
List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
Assert.listOnlyOne(machineDtos, "鏍规嵁璁惧缂栫爜鏌ヨ鍒板鏉¤褰曪紝璇锋鏌ユ暟鎹�");
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_MACHINE);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessMachine = new JSONObject();
businessMachine.putAll(BeanConvertUtil.beanCovertMap(machineDtos.get(0)));
businessMachine.put("state", paramInJson.getString("state"));
//璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessMachine", businessMachine);
- return business;
+ MachinePo machinePo = BeanConvertUtil.covertBean(businessMachine, MachinePo.class);
+ super.update(dataFlowContext, machinePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_MACHINE);
+
}
}
--
Gitblit v1.8.0