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/room/impl/RoomBMOImpl.java | 163 +++++++++++++++++------------------------------------
1 files changed, 53 insertions(+), 110 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java
index 5212c52..34aa209 100644
--- a/Api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java
@@ -12,7 +12,18 @@
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerRoomRelDto;
-import com.java110.utils.constant.*;
+import com.java110.po.community.CommunityMemberPo;
+import com.java110.po.fee.PayFeePo;
+import com.java110.po.floor.FloorPo;
+import com.java110.po.owner.OwnerRoomRelPo;
+import com.java110.po.room.RoomPo;
+import com.java110.po.unit.UnitPo;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.CommunityMemberTypeConstant;
+import com.java110.utils.constant.FeeTypeConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.StateConstant;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -52,7 +63,7 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject updateRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void updateRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
RoomDto roomDto = new RoomDto();
roomDto.setCommunityId(paramInJson.getString("communityId"));
@@ -61,30 +72,19 @@
Assert.listOnlyOne(roomDtos, "瀛樺湪" + roomDtos.size() + "鏉℃埧灞嬩俊鎭�");
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_ROOM_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
businessUnit.putAll(BeanConvertUtil.beanCovertMap(roomDtos.get(0)));
businessUnit.putAll(paramInJson);
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRoom", businessUnit);
-
- return business;
+ RoomPo roomPo = BeanConvertUtil.covertBean(businessUnit, RoomPo.class);
+ super.update(dataFlowContext, roomPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_ROOM_INFO);
}
- public JSONObject addBusinessFloor(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FLOOR_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessObj = new JSONObject();
- businessObj.putAll(paramInJson);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFloor", businessObj);
- return business;
+ public void addBusinessFloor(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+ FloorPo floorPo = BeanConvertUtil.covertBean(paramInJson, FloorPo.class);
+ super.insert(dataFlowContext, floorPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FLOOR_INFO);
}
/**
@@ -93,46 +93,28 @@
* @param paramInJson 缁勮 妤煎皬鍖哄叧绯�
* @return 灏忓尯鎴愬憳淇℃伅
*/
- public JSONObject addCommunityMember(JSONObject paramInJson,DataFlowContext dataFlowContext) {
+ public void addCommunityMember(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessCommunityMember = new JSONObject();
businessCommunityMember.put("communityMemberId", "-1");
businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
businessCommunityMember.put("memberId", paramInJson.getString("floorId"));
businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.FLOOR);
businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
-
- return business;
+ CommunityMemberPo communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
+ super.insert(dataFlowContext, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
}
- public JSONObject addBusinessUnit(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_UNIT_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessObj = new JSONObject();
- businessObj.putAll(paramInJson);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessUnit", businessObj);
- return business;
+ public void addBusinessUnit(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+ UnitPo unitPo = BeanConvertUtil.covertBean(paramInJson, UnitPo.class);
+ super.insert(dataFlowContext, unitPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_UNIT_INFO);
}
- public JSONObject addBusinessRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ROOM_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessObj = new JSONObject();
- businessObj.putAll(paramInJson);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRoom", businessObj);
- return business;
+ public void addBusinessRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+ RoomPo roomPo = BeanConvertUtil.covertBean(paramInJson, RoomPo.class);
+ super.insert(dataFlowContext, roomPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ROOM_INFO);
}
/**
@@ -142,19 +124,14 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject deleteRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void deleteRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_ROOM_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
businessUnit.putAll(paramInJson);
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRoom", businessUnit);
-
- return business;
+ RoomPo roomPo = BeanConvertUtil.covertBean(businessUnit, RoomPo.class);
+ super.delete(dataFlowContext, roomPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_ROOM_INFO);
}
/**
@@ -164,7 +141,7 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject exitRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void exitRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
//鏍规嵁ownerId 鍜� roomId 鏌ヨrelId 鍒犻櫎
OwnerRoomRelDto ownerRoomRelDto = BeanConvertUtil.covertBean(paramInJson, OwnerRoomRelDto.class);
@@ -175,19 +152,13 @@
}
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_ROOM_REL);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
//businessUnit.putAll(paramInJson);
businessUnit.put("relId", ownerRoomRelDtos.get(0).getRelId());
//businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOwnerRoomRel", businessUnit);
-
- return business;
+ OwnerRoomRelPo roomPo = BeanConvertUtil.covertBean(businessUnit, OwnerRoomRelPo.class);
+ super.delete(dataFlowContext, roomPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_ROOM_REL);
}
-
/**
@@ -197,7 +168,7 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject exitPropertyFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void exitPropertyFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
//鏍￠獙鐗╀笟璐规槸鍚﹀凡缁忎氦娓�
@@ -212,18 +183,12 @@
throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏁版嵁瀛樺湪闂锛岀墿涓氳垂瀵瑰簲鍏崇郴涓嶆槸涓�鏉�");
}
-
- 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);
}
/**
@@ -233,21 +198,16 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ROOM_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
businessUnit.putAll(paramInJson);
businessUnit.put("roomId", "-1");
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRoom", businessUnit);
-
- return business;
+ RoomPo roomPo = BeanConvertUtil.covertBean(businessUnit, RoomPo.class);
+ super.delete(dataFlowContext, roomPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ROOM_INFO);
}
+
/**
* 鍞崠鎴垮眿淇℃伅
*
@@ -255,20 +215,14 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject sellRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void sellRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_ROOM_REL);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
businessUnit.putAll(paramInJson);
businessUnit.put("relId", "-1");
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessOwnerRoomRel", businessUnit);
-
- return business;
+ OwnerRoomRelPo ownerRoomRelPo = BeanConvertUtil.covertBean(businessUnit, OwnerRoomRelPo.class);
+ super.insert(dataFlowContext, ownerRoomRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_ROOM_REL);
}
/**
@@ -278,7 +232,7 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addPropertyFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addPropertyFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setCommunityId(paramInJson.getString("communityId"));
feeConfigDto.setIsDefault("T");
@@ -286,11 +240,6 @@
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMO.queryFeeConfigs(feeConfigDto);
Assert.listOnlyOne(feeConfigDtos, "鐗╀笟璐归粯璁ら厤缃笉瀛樺湪鎴栧瓨鍦ㄥ鏉¤妫�鏌�");
-
- 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", "-1");
businessUnit.put("configId", feeConfigDtos.get(0).getConfigId());
@@ -305,10 +254,10 @@
businessUnit.put("feeFlag", "1003006");
businessUnit.put("state", "2008001");
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.delete(dataFlowContext, payFeePo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO);
}
+
/**
* 娣诲姞灏忓尯妤间俊鎭�
*
@@ -316,19 +265,13 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject updateShellRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void updateShellRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_ROOM_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessUnit = new JSONObject();
businessUnit.putAll(paramInJson);
businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRoom", businessUnit);
-
- return business;
+ RoomPo roomPo = BeanConvertUtil.covertBean(businessUnit, RoomPo.class);
+ super.update(dataFlowContext, roomPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_ROOM_INFO);
}
--
Gitblit v1.8.0