From 793a80e25c218d2a1c7078b6aeda8e0032b89efd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 31 五月 2020 23:22:44 +0800
Subject: [PATCH] 优化 钥匙类型 错误问题
---
Api/src/main/java/com/java110/api/bmo/applicationKey/impl/ApplicationKeyBMOImpl.java | 58 +++++++++++++++++++++-------------------------------------
1 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/bmo/applicationKey/impl/ApplicationKeyBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/applicationKey/impl/ApplicationKeyBMOImpl.java
index b3d8d6f..eb69e56 100644
--- a/Api/src/main/java/com/java110/api/bmo/applicationKey/impl/ApplicationKeyBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/applicationKey/impl/ApplicationKeyBMOImpl.java
@@ -10,17 +10,16 @@
import com.java110.core.smo.hardwareAdapation.IApplicationKeyInnerServiceSMO;
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
import com.java110.core.smo.owner.IOwnerRoomRelInnerServiceSMO;
-import com.java110.dto.community.CommunityDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
import com.java110.dto.hardwareAdapation.MachineDto;
-import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.po.applicationKey.ApplicationKeyPo;
import com.java110.po.file.FileRelPo;
+import com.java110.po.machine.MachineRecordPo;
import com.java110.po.message.MsgPo;
+import com.java110.po.owner.OwnerPo;
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 com.java110.utils.util.DateUtil;
@@ -175,7 +174,7 @@
if ("1100103".equals(paramInJson.getString("typeFlag"))) { // 涓存椂璁块棶瀵嗙爜,鍙缃垚24灏忔椂
applicationKeyPo.setEndTime(applicationKeyDtos.get(0).getEndTime());
}
- applicationKeyPo.setTypeFlag(applicationKeyDtos.get(0).getTypeCd());
+ applicationKeyPo.setTypeFlag(applicationKeyDtos.get(0).getTypeFlag());
super.update(dataFlowContext, applicationKeyPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_APPLICATION_KEY);
}
@@ -254,13 +253,9 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addPhoto(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void 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", "60000");
@@ -268,9 +263,10 @@
businessUnit.put("objId", paramInJson.getString("applicationKeyId"));
businessUnit.put("fileRealName", paramInJson.getString("applicationKeyPhotoId"));
businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
+ FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
- return business;
+ super.insert(dataFlowContext, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
+
}
@@ -281,23 +277,16 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addMachineRecord(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addMachineRecord(JSONObject paramInJson, DataFlowContext dataFlowContext) {
//paramInJson.put("fileTime", DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_A));
paramInJson.put("name", "鍖垮悕");
paramInJson.put("tel", "");
paramInJson.put("idCard", "");
paramInJson.put("openTypeCd", "2000");
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE_RECORD);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessMachineRecord = new JSONObject();
- businessMachineRecord.putAll(paramInJson);
- businessMachineRecord.put("machineRecordId", "-1");
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessMachineRecord", businessMachineRecord);
- return business;
+ paramInJson.put("machineRecordId", "-1");
+ MachineRecordPo machineRecordPo = BeanConvertUtil.covertBean(paramInJson, MachineRecordPo.class);
+ super.insert(dataFlowContext, machineRecordPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE_RECORD);
}
/**
@@ -312,7 +301,7 @@
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addMember(JSONObject paramInJson) {
+ public void addMember(JSONObject paramInJson, DataFlowContext context) {
//鏍规嵁鎴垮眿ID鏌ヨ涓氫富ID锛岃嚜鍔ㄧ敓鎴愭垚鍛業D
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
@@ -326,18 +315,15 @@
String memberId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId);
paramInJson.put("memberId", memberId);
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessOwner = new JSONObject();
businessOwner.putAll(paramInJson);
businessOwner.put("ownerTypeCd", "1004");//涓存椂浜哄憳
businessOwner.put("state", "1000");//寰呭鏍�
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOwner", businessOwner);
- return business;
+ OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
+
+ super.insert(context, ownerPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_INFO);
+
}
@@ -348,13 +334,9 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addOwnerKeyPhoto(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addOwnerKeyPhoto(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", "10000");
@@ -362,9 +344,11 @@
businessUnit.put("objId", paramInJson.getString("memberId"));
businessUnit.put("fileRealName", paramInJson.getString("ownerPhotoId"));
businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
- return business;
+ FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
+
+ super.insert(dataFlowContext, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
+
}
}
--
Gitblit v1.8.0