From bb198fb66045329b6dc47a031f202aabc6b8a1dd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 31 五月 2020 21:33:01 +0800
Subject: [PATCH] 优化代码
---
Api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java | 134 +++++++++++++-------------------------------
1 files changed, 39 insertions(+), 95 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
index f18af19..f4d78f6 100644
--- a/Api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.ApiBaseBMO;
-import com.java110.api.bmo.parkingArea.IParkingAreaBMO;
import com.java110.api.bmo.parkingSpace.IParkingSpaceBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
@@ -12,6 +11,10 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.parking.ParkingSpaceDto;
+import com.java110.po.car.OwnerCarPo;
+import com.java110.po.fee.PayFeeDetailPo;
+import com.java110.po.fee.PayFeePo;
+import com.java110.po.parking.ParkingSpacePo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.FeeTypeConstant;
@@ -44,24 +47,19 @@
private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
@Autowired
private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
+
/**
* 娣诲姞灏忓尯妤间俊鎭�
*
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject deleteParkingSpace(JSONObject paramInJson) {
+ public void deleteParkingSpace(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_PARKING_SPACE);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessParkingSpace = new JSONObject();
businessParkingSpace.put("psId", paramInJson.getString("psId"));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessParkingSpace", businessParkingSpace);
-
- return business;
+ ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
+ super.delete(dataFlowContext, parkingSpacePo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_PARKING_SPACE);
}
/**
@@ -70,7 +68,7 @@
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject editParkingSpace(JSONObject paramInJson) {
+ public void editParkingSpace(JSONObject paramInJson, DataFlowContext dataFlowContext) {
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
parkingSpaceDto.setCommunityId(paramInJson.getString("communityId"));
@@ -82,18 +80,12 @@
}
parkingSpaceDto = parkingSpaceDtos.get(0);
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_PARKING_SPACE);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessParkingSpace = new JSONObject();
businessParkingSpace.putAll(paramInJson);
businessParkingSpace.put("state", parkingSpaceDto.getState());
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessParkingSpace", businessParkingSpace);
-
- return business;
+ ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
+ super.update(dataFlowContext, parkingSpacePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_PARKING_SPACE);
}
/**
@@ -103,22 +95,17 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject exitParkingSpace(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void exitParkingSpace(JSONObject paramInJson, DataFlowContext dataFlowContext) {
OwnerCarDto ownerCarDto = (OwnerCarDto) paramInJson.get("ownerCarDto");
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_CAR);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessOwnerCar = new JSONObject();
//businessUnit.putAll(paramInJson);
businessOwnerCar.put("carId", ownerCarDto.getCarId());
//businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOwnerCar", businessOwnerCar);
-
- return business;
+ OwnerCarPo ownerCarPo = BeanConvertUtil.covertBean(businessOwnerCar, OwnerCarPo.class);
+ super.delete(dataFlowContext, ownerCarPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_CAR);
}
/**
@@ -127,7 +114,7 @@
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject modifyParkingSpaceState(JSONObject paramInJson) {
+ public void modifyParkingSpaceState(JSONObject paramInJson, DataFlowContext dataFlowContext) {
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
parkingSpaceDto.setCommunityId(paramInJson.getString("communityId"));
@@ -140,20 +127,12 @@
parkingSpaceDto = parkingSpaceDtos.get(0);
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_PARKING_SPACE);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessParkingSpace = new JSONObject();
businessParkingSpace.putAll(BeanConvertUtil.beanCovertMap(parkingSpaceDto));
businessParkingSpace.put("state", "F");
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessParkingSpace", businessParkingSpace);
-
- paramInJson.put("parkingSpaceDto", parkingSpaceDto);
-
- return business;
+ ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
+ super.update(dataFlowContext, parkingSpacePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_PARKING_SPACE);
}
/**
@@ -163,7 +142,7 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject exitParkingSpaceFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void exitParkingSpaceFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
ParkingSpaceDto parkingSpaceDto = (ParkingSpaceDto) paramInJson.get("parkingSpaceDto");
@@ -177,8 +156,8 @@
? FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE
: FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE)
: ("H".equals(parkingSpaceDto.getState())
- ?FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE
- :FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE));
+ ? FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE
+ : FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE));
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
if (feeDtos == null || feeDtos.size() != 1) {
@@ -186,17 +165,12 @@
}
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessFee = new JSONObject();
//businessUnit.putAll(paramInJson);
businessFee.put("feeId", feeDtos.get(0).getFeeId());
//businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessFee);
-
- return business;
+ PayFeePo payFeePo = BeanConvertUtil.covertBean(businessFee, PayFeePo.class);
+ super.delete(dataFlowContext, payFeePo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_INFO);
}
/**
@@ -211,22 +185,15 @@
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addParkingSpace(JSONObject paramInJson) {
+ public void addParkingSpace(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_PARKING_SPACE);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessParkingSpace = new JSONObject();
businessParkingSpace.putAll(paramInJson);
businessParkingSpace.put("state", "F");
businessParkingSpace.put("psId", "-1");
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessParkingSpace", businessParkingSpace);
-
- return business;
+ ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
+ super.delete(dataFlowContext, parkingSpacePo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_PARKING_SPACE);
}
-
/**
@@ -241,19 +208,13 @@
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject sellParkingSpace(JSONObject paramInJson) {
+ public void sellParkingSpace(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_CAR);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessOwnerCar = new JSONObject();
businessOwnerCar.putAll(paramInJson);
businessOwnerCar.put("carId", "-1");
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOwnerCar", businessOwnerCar);
-
- return business;
+ OwnerCarPo ownerCarPo = BeanConvertUtil.covertBean(businessOwnerCar, OwnerCarPo.class);
+ super.delete(dataFlowContext, ownerCarPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_CAR);
}
/**
@@ -262,7 +223,7 @@
* @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject modifySellParkingSpaceState(JSONObject paramInJson) {
+ public void modifySellParkingSpaceState(JSONObject paramInJson, DataFlowContext dataFlowContext) {
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
parkingSpaceDto.setCommunityId(paramInJson.getString("communityId"));
@@ -275,17 +236,12 @@
parkingSpaceDto = parkingSpaceDtos.get(0);
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_PARKING_SPACE);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessParkingSpace = new JSONObject();
businessParkingSpace.putAll(BeanConvertUtil.beanCovertMap(parkingSpaceDto));
businessParkingSpace.put("state", this.isHireParkingSpace(paramInJson) ? "H" : "S");
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessParkingSpace", businessParkingSpace);
-
- return business;
+ ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
+ super.delete(dataFlowContext, parkingSpacePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_PARKING_SPACE);
}
@@ -296,13 +252,8 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addParkingSpaceFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addParkingSpaceFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- 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 + 2);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
businessUnit.put("feeId", paramInJson.getString("feeId"));
businessUnit.put("feeTypeCd", paramInJson.getString("feeTypeCd"));
@@ -317,9 +268,8 @@
businessUnit.put("feeFlag", this.isHireParkingSpace(paramInJson) ? "1003006" : "2006012");
businessUnit.put("state", this.isHireParkingSpace(paramInJson) ? "2008001" : "2009001");
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- 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);
}
/**
@@ -329,22 +279,16 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addFeeDetail(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addFeeDetail(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 3);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessFeeDetail = new JSONObject();
businessFeeDetail.putAll(paramInJson);
businessFeeDetail.put("detailId", "-1");
businessFeeDetail.put("primeRate", "1.00");
businessFeeDetail.put("cycles", paramInJson.getString("cycles"));
businessFeeDetail.put("receivableAmount", paramInJson.getString("receivableAmount"));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeDetail", businessFeeDetail);
-
- return business;
+ PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(businessFeeDetail, PayFeeDetailPo.class);
+ super.insert(dataFlowContext, payFeeDetailPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL);
}
/**
@@ -365,7 +309,7 @@
*
* @param paramInJson 浼犲叆鏁版嵁瀛楁
*/
- public void computeFeeInfo(JSONObject paramInJson) {
+ public void computeFeeInfo(JSONObject paramInJson, DataFlowContext dataFlowContext) {
//鏍规嵁鍋滆溅浣岻D鏌ヨ鏄湴涓婅繕鏄湴涓嬪仠杞︿綅
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
@@ -410,7 +354,7 @@
* Double.parseDouble(paramInJson.getString("cycles")) : Double.parseDouble(feeConfigDto.getAdditionalAmount());
paramInJson.put("receivableAmount", receivableAmount);
- paramInJson.put("configId",feeConfigDto.getConfigId());
+ paramInJson.put("configId", feeConfigDto.getConfigId());
//璁＄畻 amount
String amount = isHireParkingSpace(paramInJson) ? "-1.00" : String.valueOf(receivableAmount);
--
Gitblit v1.8.0