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 | 246 ++++++++++++++++++-------------------------------
1 files changed, 90 insertions(+), 156 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 73cdbf7..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,14 +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;
@@ -54,6 +56,7 @@
private IApplicationKeyInnerServiceSMO applicationKeyInnerServiceSMOImpl;
@Autowired
private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
+
/**
* 娣诲姞灏忓尯淇℃伅
*
@@ -61,18 +64,11 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject deleteApplicationKey(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void deleteApplicationKey(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_APPLICATION_KEY);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessApplicationKey = new JSONObject();
- businessApplicationKey.putAll(paramInJson);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessApplicationKey", businessApplicationKey);
- return business;
+ ApplicationKeyPo applicationKeyPo = BeanConvertUtil.covertBean(paramInJson, ApplicationKeyPo.class);
+ super.delete(dataFlowContext, applicationKeyPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_APPLICATION_KEY);
}
/**
@@ -82,23 +78,15 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addOwnerPhoto(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", "30000");
- businessUnit.put("saveWay", "table");
- 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);
-
- return business;
+ public void addOwnerPhoto(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ FileRelPo fileRelPo = new FileRelPo();
+ fileRelPo.setFileRelId("-1");
+ fileRelPo.setRelTypeCd("30000");
+ fileRelPo.setSaveWay("table");
+ fileRelPo.setObjId(paramInJson.getString("applicationKeyId"));
+ fileRelPo.setFileRealName(paramInJson.getString("applicationKeyPhotoId"));
+ fileRelPo.setFileSaveName(paramInJson.getString("fileSaveName"));
+ super.insert(dataFlowContext, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
}
/**
@@ -115,23 +103,15 @@
* @return
*/
- public Object addMsg(JSONObject paramInJson, DataFlowContext context) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_MSG);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessMsg = new JSONObject();
- //businessApplicationKey.putAll(paramInJson);
- businessMsg.put("msgId", "-1");
- businessMsg.put("msgType", "10002");
- businessMsg.put("title", "鎮ㄦ湁涓�鏉￠挜鍖欏鏍稿崟");
- businessMsg.put("url", "/flow/auditApplicationKeyFlow");
- businessMsg.put("viewTypeCd", "30000");
- businessMsg.put("viewObjId", paramInJson.getString("storeId"));
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessMsg", businessMsg);
- return business;
+ public void addMsg(JSONObject paramInJson, DataFlowContext context) {
+ MsgPo msgPo = new MsgPo();
+ msgPo.setMsgId("-1");
+ msgPo.setMsgType("10002");
+ msgPo.setTitle("鎮ㄦ湁涓�鏉￠挜鍖欏鏍稿崟");
+ msgPo.setUrl("/admin.html#/pages/property/auditApplicationKey");
+ msgPo.setViewObjId(paramInJson.getString("storeId"));
+ msgPo.setViewTypeCd("30000");
+ super.insert(context, msgPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_MSG);
}
/**
@@ -141,37 +121,28 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject editApplicationKeyPhoto(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void editApplicationKeyPhoto(JSONObject paramInJson, DataFlowContext dataFlowContext) {
FileRelDto fileRelDto = new FileRelDto();
fileRelDto.setRelTypeCd("30000");
fileRelDto.setObjId(paramInJson.getString("applicationKeyId"));
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
if (fileRelDtos == null || fileRelDtos.size() == 0) {
- 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", "30000");
- businessUnit.put("saveWay", "table");
- 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);
- return business;
+ FileRelPo fileRelPo = new FileRelPo();
+ fileRelPo.setFileRelId("-1");
+ fileRelPo.setRelTypeCd("3000");
+ fileRelPo.setSaveWay("table");
+ fileRelPo.setObjId(paramInJson.getString("applicationKeyId"));
+ fileRelPo.setFileSaveName(paramInJson.getString("fileSaveName"));
+ fileRelPo.setFileRealName(paramInJson.getString("applicationKeyPhotoId"));
+ super.insert(dataFlowContext, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
+ return;
}
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_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.putAll(BeanConvertUtil.beanCovertMap(fileRelDtos.get(0)));
- businessUnit.put("fileRealName", paramInJson.getString("applicationKeyPhotoId"));
- businessUnit.put("fileSaveName", paramInJson.getString("applicationKeyPhotoId"));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
- return business;
+
+ FileRelPo fileRelPo = BeanConvertUtil.covertBean(fileRelDtos.get(0), FileRelPo.class);
+ fileRelPo.setFileRealName(paramInJson.getString("applicationKeyPhotoId"));
+ fileRelPo.setFileSaveName(paramInJson.getString("applicationKeyPhotoId"));
+ super.update(dataFlowContext, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FILE_REL);
}
/**
@@ -181,7 +152,7 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject updateApplicationKey(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void updateApplicationKey(JSONObject paramInJson, DataFlowContext dataFlowContext) {
//鏍规嵁浣嶇疆id 鍜� 浣嶇疆瀵硅薄鏌ヨ鐩稿簲 璁惧ID
MachineDto machineDto = new MachineDto();
machineDto.setLocationObjId(paramInJson.getString("locationObjId"));
@@ -194,24 +165,18 @@
List<ApplicationKeyDto> applicationKeyDtos = applicationKeyInnerServiceSMOImpl.queryApplicationKeys(applicationKeyDto);
Assert.listOnlyOne(applicationKeyDtos, "鏈壘鍒扮敵璇疯褰曟垨鎵惧埌澶氭潯璁板綍");
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_APPLICATION_KEY);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessApplicationKey = new JSONObject();
- businessApplicationKey.putAll(paramInJson);
- businessApplicationKey.put("machineId", machineDtos.get(0).getMachineId());
- businessApplicationKey.put("state", applicationKeyDtos.get(0).getState());
+ ApplicationKeyPo applicationKeyPo = BeanConvertUtil.covertBean(paramInJson, ApplicationKeyPo.class);
+ applicationKeyPo.setMachineId(machineDtos.get(0).getMachineId());
+ applicationKeyPo.setState(applicationKeyDtos.get(0).getState());
if (!paramInJson.containsKey("pwd") || StringUtil.isEmpty(paramInJson.getString("pwd"))) {
- businessApplicationKey.put("pwd", applicationKeyDtos.get(0).getPwd());
+ applicationKeyPo.setPwd(applicationKeyDtos.get(0).getPwd());
}
if ("1100103".equals(paramInJson.getString("typeFlag"))) { // 涓存椂璁块棶瀵嗙爜,鍙缃垚24灏忔椂
- businessApplicationKey.put("endTime", applicationKeyDtos.get(0).getEndTime());
+ applicationKeyPo.setEndTime(applicationKeyDtos.get(0).getEndTime());
}
- businessApplicationKey.put("typeFlag", applicationKeyDtos.get(0).getTypeCd());
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessApplicationKey", businessApplicationKey);
- return business;
+ applicationKeyPo.setTypeFlag(applicationKeyDtos.get(0).getTypeFlag());
+
+ super.update(dataFlowContext, applicationKeyPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_APPLICATION_KEY);
}
/**
@@ -221,38 +186,30 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addApplicationKey(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addApplicationKey(JSONObject paramInJson, DataFlowContext dataFlowContext) {
String applicationKeyId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applicationKeyId);
- paramInJson.put("applicationKeyId",applicationKeyId);
+ paramInJson.put("applicationKeyId", applicationKeyId);
//鏍规嵁浣嶇疆id 鍜� 浣嶇疆瀵硅薄鏌ヨ鐩稿簲 璁惧ID
- if(!paramInJson.containsKey("machineId")) {
+ if (!paramInJson.containsKey("machineId")) {
MachineDto machineDto = new MachineDto();
machineDto.setLocationObjId(paramInJson.getString("locationObjId"));
machineDto.setLocationTypeCd(paramInJson.getString("locationTypeCd"));
List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
Assert.listOnlyOne(machineDtos, "璇ヤ綅缃繕娌℃湁鐩稿簲鐨勯棬绂佽澶�");
- paramInJson.put("machineId",machineDtos.get(0).getMachineId());
+ paramInJson.put("machineId", machineDtos.get(0).getMachineId());
}
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_APPLICATION_KEY);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessApplicationKey = new JSONObject();
- businessApplicationKey.putAll(paramInJson);
- //businessApplicationKey.put("machineId", machineId);
- businessApplicationKey.put("applicationKeyId", applicationKeyId);
- businessApplicationKey.put("state", "10002");
- businessApplicationKey.put("pwd",this.getRandom());
- if("1100103".equals(paramInJson.getString("typeFlag"))){ // 涓存椂璁块棶瀵嗙爜,鍙缃垚24灏忔椂
+ ApplicationKeyPo applicationKeyPo = BeanConvertUtil.covertBean(paramInJson, ApplicationKeyPo.class);
+ applicationKeyPo.setApplicationKeyId(applicationKeyId);
+ applicationKeyPo.setState("10002");
+ applicationKeyPo.setPwd(this.getRandom());
+ if ("1100103".equals(paramInJson.getString("typeFlag"))) { // 涓存椂璁块棶瀵嗙爜,鍙缃垚24灏忔椂
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.HOUR, 24);
- businessApplicationKey.put("endTime", DateUtil.getFormatTimeString(calendar.getTime(),DateUtil.DATE_FORMATE_STRING_A));
+ applicationKeyPo.setEndTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
}
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessApplicationKey", businessApplicationKey);
- return business;
+ super.insert(dataFlowContext, applicationKeyPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_APPLICATION_KEY);
}
@@ -263,25 +220,16 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addApplicationVisitKey(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addApplicationVisitKey(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- //鏌ヨ 鏄惁浣忔埛瀵嗙爜宸茬粡瀹℃牳瀹屾垚
+ //鏌ヨ 鏄惁浣忔埛瀵嗙爜宸茬粡瀹℃牳瀹�
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_APPLICATION_KEY);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessApplicationKey = new JSONObject();
- businessApplicationKey.putAll(paramInJson);
- businessApplicationKey.put("applicationKeyId", paramInJson.getString("applicationKeyId"));
- businessApplicationKey.put("state", "10001");
- businessApplicationKey.put("typeFlag", "1100103");
- businessApplicationKey.put("startTime", DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_A));
-
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessApplicationKey", businessApplicationKey);
- return business;
+ ApplicationKeyPo applicationKeyPo = BeanConvertUtil.covertBean(paramInJson, ApplicationKeyPo.class);
+ applicationKeyPo.setApplicationKeyId(paramInJson.getString("applicationKeyId"));
+ applicationKeyPo.setState("10001");
+ applicationKeyPo.setTypeFlag("1100103");
+ applicationKeyPo.setStartTime(DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_A));
+ super.insert(dataFlowContext, applicationKeyPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_APPLICATION_KEY);
}
/**
@@ -289,7 +237,7 @@
*
* @return
*/
- private String getRandom() {
+ private String getRandom() {
Random random = new Random();
String result = "";
for (int i = 0; i < 6; i++) {
@@ -305,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");
@@ -319,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);
+
}
@@ -332,24 +277,18 @@
* @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);
}
+
/**
* 娣诲姞灏忓尯妤间俊鎭�
* <p>
@@ -362,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();
@@ -376,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);
+
}
@@ -398,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");
@@ -412,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