From b480fc1df57d1e11b836f6dac27bff4d25617a05 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 30 五月 2020 14:56:25 +0800
Subject: [PATCH] 删除logagent cache 模块 合并至core
---
Api/src/main/java/com/java110/api/bmo/machineTranslate/impl/MachineTranslateBMOImpl.java | 142 +++++++++++++++++------------------------------
1 files changed, 52 insertions(+), 90 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/bmo/machineTranslate/impl/MachineTranslateBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/machineTranslate/impl/MachineTranslateBMOImpl.java
index b0e7a28..228d33b 100644
--- a/Api/src/main/java/com/java110/api/bmo/machineTranslate/impl/MachineTranslateBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/machineTranslate/impl/MachineTranslateBMOImpl.java
@@ -17,7 +17,16 @@
import com.java110.dto.hardwareAdapation.CarInoutDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.utils.constant.*;
+import com.java110.po.car.CarInoutDetailPo;
+import com.java110.po.car.CarInoutPo;
+import com.java110.po.fee.PayFeePo;
+import com.java110.po.file.FileRelPo;
+import com.java110.po.machine.MachineRecordPo;
+import com.java110.po.machine.MachineTranslatePo;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.CommunityMemberTypeConstant;
+import com.java110.utils.constant.FeeTypeConstant;
+import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -51,6 +60,7 @@
@Autowired
private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+
/**
* 娣诲姞灏忓尯淇℃伅
*
@@ -58,19 +68,13 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject deleteMachineTranslate(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void deleteMachineTranslate(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ MachineTranslatePo machineTranslatePo = BeanConvertUtil.covertBean(paramInJson, MachineTranslatePo.class);
+ super.delete(dataFlowContext, machineTranslatePo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_MACHINE_TRANSLATE);
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_MACHINE_TRANSLATE);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessMachineTranslate = new JSONObject();
- businessMachineTranslate.putAll(paramInJson);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessMachineTranslate", businessMachineTranslate);
- return business;
}
+
/**
* 娣诲姞灏忓尯淇℃伅
*
@@ -78,13 +82,8 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addCarInoutDetail(JSONObject paramInJson, DataFlowContext dataFlowContext, String communityId, MachineDto machineDto) {
+ public void addCarInoutDetail(JSONObject paramInJson, DataFlowContext dataFlowContext, String communityId, MachineDto machineDto) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_CAR_INOUT);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessCarInoutDetail = new JSONObject();
businessCarInoutDetail.put("carNum", paramInJson.getString("carNum"));
businessCarInoutDetail.put("inoutId", paramInJson.getString("inoutId"));
@@ -93,9 +92,9 @@
businessCarInoutDetail.put("machineCode", machineDto.getMachineCode());
businessCarInoutDetail.put("carInout", machineDto.getDirection());
businessCarInoutDetail.put("detailId", "-1");
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCarInoutDetail", businessCarInoutDetail);
- return business;
+ CarInoutDetailPo carInoutDetailPo = BeanConvertUtil.covertBean(businessCarInoutDetail, CarInoutDetailPo.class);
+ super.insert(dataFlowContext, carInoutDetailPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_CAR_INOUT);
+
}
@@ -106,22 +105,17 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addCarInout(JSONObject paramInJson, DataFlowContext dataFlowContext, String communityId) {
+ public void addCarInout(JSONObject paramInJson, DataFlowContext dataFlowContext, String communityId) {
paramInJson.put("inoutId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_inoutId));
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_CAR_INOUT);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessCarInout = new JSONObject();
businessCarInout.put("carNum", paramInJson.getString("carNum"));
businessCarInout.put("inoutId", paramInJson.getString("inoutId"));
businessCarInout.put("communityId", communityId);
businessCarInout.put("state", "100300");
businessCarInout.put("inTime", DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_A));
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCarInout", businessCarInout);
- return business;
+ CarInoutPo carInoutPo = BeanConvertUtil.covertBean(businessCarInout, CarInoutPo.class);
+ super.insert(dataFlowContext, carInoutPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_CAR_INOUT);
}
/**
@@ -131,8 +125,8 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addCarInoutFee(JSONObject paramInJson, DataFlowContext dataFlowContext, String communityId) {
- return addCarInoutFee(paramInJson, dataFlowContext, communityId, DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ public void addCarInoutFee(JSONObject paramInJson, DataFlowContext dataFlowContext, String communityId) {
+ addCarInoutFee(paramInJson, dataFlowContext, communityId, DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
}
@@ -143,7 +137,7 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addCarInoutFee(JSONObject paramInJson, DataFlowContext dataFlowContext, String communityId, String startTime) {
+ public void addCarInoutFee(JSONObject paramInJson, DataFlowContext dataFlowContext, String communityId, String startTime) {
CommunityMemberDto communityMemberDto = new CommunityMemberDto();
communityMemberDto.setCommunityId(communityId);
communityMemberDto.setMemberTypeCd(CommunityMemberTypeConstant.PROPERTY);
@@ -164,10 +158,6 @@
feeConfigDto = feeConfigDtos.get(0);
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
businessUnit.put("feeId", "-1");
businessUnit.put("configId", feeConfigDto.getConfigId());
@@ -182,27 +172,22 @@
businessUnit.put("feeFlag", "2006012"); // 涓�娆℃�ц垂鐢�
businessUnit.put("state", "2008001"); // 鏀惰垂涓�
businessUnit.put("userId", "-1");
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessUnit);
-
- return business;
+ PayFeePo payFeePo = BeanConvertUtil.covertBean(businessUnit, PayFeePo.class);
+ super.insert(dataFlowContext, payFeePo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO);
}
- public JSONObject modifyCarInout(JSONObject reqJson, DataFlowContext context, CarInoutDto carInoutDto) {
- return modifyCarInout(reqJson, context, carInoutDto, "100500", DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_A));
+ public void modifyCarInout(JSONObject reqJson, DataFlowContext context, CarInoutDto carInoutDto) {
+ modifyCarInout(reqJson, context, carInoutDto, "100500", DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_A));
}
- public JSONObject modifyCarInout(JSONObject reqJson, DataFlowContext context, CarInoutDto carInoutDto, String state, String endTime) {
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_CAR_INOUT);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+ public void modifyCarInout(JSONObject reqJson, DataFlowContext context, CarInoutDto carInoutDto, String state, String endTime) {
+
JSONObject businessCarInout = new JSONObject();
businessCarInout.putAll(BeanConvertUtil.beanCovertMap(carInoutDto));
businessCarInout.put("state", state);
businessCarInout.put("outTime", endTime);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCarInout", businessCarInout);
- return business;
+ CarInoutPo carInoutPo = BeanConvertUtil.covertBean(businessCarInout, CarInoutPo.class);
+ super.update(context, carInoutPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_CAR_INOUT);
}
/**
@@ -211,9 +196,7 @@
* @param reqJson
* @param context
*/
- public JSONObject savePhoto(JSONObject reqJson, DataFlowContext context) {
-
-
+ public void savePhoto(JSONObject reqJson, DataFlowContext context) {
FileDto fileDto = new FileDto();
fileDto.setCommunityId(reqJson.getString("communityId"));
fileDto.setFileId(reqJson.getString("fileId"));
@@ -221,10 +204,6 @@
fileDto.setContext(reqJson.getString("photo"));
fileDto.setSuffix("jpeg");
String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- 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", reqJson.getString("relTypeCd"));
@@ -232,9 +211,8 @@
businessUnit.put("objId", reqJson.getString("machineRecordId"));
businessUnit.put("fileRealName", reqJson.getString("fileId"));
businessUnit.put("fileSaveName", fileName);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
-
- return business;
+ FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
+ super.insert(context, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
}
@@ -245,7 +223,7 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addMachineRecord(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addMachineRecord(JSONObject paramInJson, DataFlowContext dataFlowContext) {
if (!paramInJson.containsKey("openTypeCd")) {
paramInJson.put("openTypeCd", "1000");
@@ -256,7 +234,7 @@
}
paramInJson.put("fileTime", DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_A));
- paramInJson.put("machineRecordId",GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineRecordId));
+ paramInJson.put("machineRecordId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineRecordId));
String objId = paramInJson.getString("userId");
//杩欓噷objId 鍙兘鏄� 涓氫富ID 涔熷彲鑳芥槸閽ュ寵ID
@@ -271,7 +249,7 @@
paramInJson.put("name", ownerDtos.get(0).getName());
paramInJson.put("tel", ownerDtos.get(0).getLink());
paramInJson.put("idCard", ownerDtos.get(0).getIdCard());
- paramInJson.put("relTypeCd", "10000");
+ paramInJson.put("relTypeCd", "60000");
} else { //閽ュ寵鐢宠ID
ApplicationKeyDto applicationKeyDto = new ApplicationKeyDto();
applicationKeyDto.setCommunityId(paramInJson.getString("communityId"));
@@ -283,22 +261,15 @@
paramInJson.put("name", applicationKeyDtos.get(0).getName());
paramInJson.put("tel", applicationKeyDtos.get(0).getTel());
paramInJson.put("idCard", applicationKeyDtos.get(0).getIdCard());
- paramInJson.put("relTypeCd", "30000");
+ paramInJson.put("relTypeCd", "60000");
}
-
- 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;
+ MachineRecordPo machineRecordPo = BeanConvertUtil.covertBean(paramInJson, MachineRecordPo.class);
+ super.insert(dataFlowContext, machineRecordPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE_RECORD);
}
+
/**
* 娣诲姞灏忓尯淇℃伅
*
@@ -306,19 +277,18 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addMachineTranslate(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addMachineTranslate(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE_TRANSLATE);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessMachineTranslate = new JSONObject();
businessMachineTranslate.putAll(paramInJson);
businessMachineTranslate.put("machineTranslateId", "-1");
//璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessMachineTranslate", businessMachineTranslate);
- return business;
+
+ MachineTranslatePo machineTranslatePo = BeanConvertUtil.covertBean(businessMachineTranslate, MachineTranslatePo.class);
+ super.insert(dataFlowContext, machineTranslatePo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE_TRANSLATE);
+
}
+
/**
* 娣诲姞璁惧鍚屾淇℃伅
*
@@ -326,17 +296,9 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject updateMachineTranslate(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void updateMachineTranslate(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_MACHINE_TRANSLATE);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessMachineTranslate = new JSONObject();
- businessMachineTranslate.putAll(paramInJson);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessMachineTranslate", businessMachineTranslate);
- return business;
+ MachineTranslatePo machineTranslatePo = BeanConvertUtil.covertBean(paramInJson, MachineTranslatePo.class);
+ super.update(dataFlowContext, machineTranslatePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_MACHINE_TRANSLATE);
}
}
--
Gitblit v1.8.0