From f7b32b8f0143ea03f81ff5a54a5fd1fd208b921b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 28 五月 2020 15:33:50 +0800
Subject: [PATCH] 优化完成巡检计划
---
Api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java | 154 ++++++++++++++++----------------------------------
1 files changed, 50 insertions(+), 104 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
index 6d1e5d5..c6ece15 100644
--- a/Api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
@@ -11,6 +11,7 @@
import com.java110.dto.community.CommunityDto;
import com.java110.po.community.CommunityMemberPo;
import com.java110.po.community.CommunityPo;
+import com.java110.po.fee.PayFeeConfigPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
@@ -214,18 +215,10 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject deleteCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void deleteCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_COMMUNITY_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessCommunity = new JSONObject();
- businessCommunity.putAll(paramInJson);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunity", businessCommunity);
- return business;
+ CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
+ super.delete(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_COMMUNITY_INFO);
}
@@ -236,14 +229,9 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addFeeConfigProperty(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
+ public void addFeeConfigProperty(JSONObject paramInJson, DataFlowContext dataFlowContext) {
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_PROPERTY);
@@ -256,10 +244,10 @@
businessFeeConfig.put("additionalAmount", "0.00");
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
+ businessFeeConfig.put("billType", "002");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
- return business;
+ PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+ super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
}
/**
@@ -269,12 +257,8 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addFeeConfigParkingSpaceUpSell(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addFeeConfigParkingSpaceUpSell(JSONObject paramInJson, DataFlowContext dataFlowContext) {
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 2);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE);
@@ -287,10 +271,11 @@
businessFeeConfig.put("additionalAmount", "0.00");
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
+ businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
businessFeeConfig.put("isDefault", "T");
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
- return business;
+ PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+
+ super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
}
/**
@@ -300,12 +285,8 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addFeeConfigParkingSpaceDownSell(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addFeeConfigParkingSpaceDownSell(JSONObject paramInJson, DataFlowContext dataFlowContext) {
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 3);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE);
@@ -318,10 +299,11 @@
businessFeeConfig.put("additionalAmount", "0.00");
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
+ businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
businessFeeConfig.put("isDefault", "T");
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
- return business;
+ PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+
+ super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
}
/**
@@ -331,12 +313,8 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addFeeConfigParkingSpaceUpHire(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addFeeConfigParkingSpaceUpHire(JSONObject paramInJson, DataFlowContext dataFlowContext) {
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 4);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE);
@@ -349,10 +327,11 @@
businessFeeConfig.put("additionalAmount", "0.00");
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
+ businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
businessFeeConfig.put("isDefault", "T");
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
- return business;
+ PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+
+ super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
}
/**
@@ -362,12 +341,8 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addFeeConfigParkingSpaceDownHire(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addFeeConfigParkingSpaceDownHire(JSONObject paramInJson, DataFlowContext dataFlowContext) {
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 5);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE);
@@ -380,10 +355,11 @@
businessFeeConfig.put("additionalAmount", "0.00");
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
+ businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
businessFeeConfig.put("isDefault", "T");
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
- return business;
+ PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+
+ super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
}
/**
@@ -393,12 +369,8 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addFeeConfigParkingSpaceTemp(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addFeeConfigParkingSpaceTemp(JSONObject paramInJson, DataFlowContext dataFlowContext) {
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 6);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_TEMP_DOWN_PARKING_SPACE);
@@ -411,10 +383,11 @@
businessFeeConfig.put("additionalAmount", "0.00");
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
+ businessFeeConfig.put("billType", "004");//鎸夊ぉ鍑鸿处
businessFeeConfig.put("isDefault", "T");
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
- return business;
+ PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+
+ super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
}
/**
@@ -423,53 +396,37 @@
* @param paramInJson 缁勮 妤煎皬鍖哄叧绯�
* @return 灏忓尯鎴愬憳淇℃伅
*/
- public JSONArray addCommunityMembers(JSONObject paramInJson) {
+ public void addCommunityMembers(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONArray businesses = new JSONArray();
-
- //娣诲姞浠ｇ悊鍟嗘埛
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_ORDER + 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("storeId"));
businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.AGENT);
businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
- businesses.add(business);
+ CommunityMemberPo communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
+ super.insert(dataFlowContext, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
//娣诲姞杩愮淮鍟嗘埛
//娣诲姞寮�鍙戝晢鎴�
- business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_ORDER + 2);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
businessCommunityMember = new JSONObject();
businessCommunityMember.put("communityMemberId", "-1");
businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
businessCommunityMember.put("memberId", "400000000000000001");
businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.OPT);
businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
- businesses.add(business);
+ communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
+ super.insert(dataFlowContext, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
- business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_ORDER + 3);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
businessCommunityMember = new JSONObject();
businessCommunityMember.put("communityMemberId", "-1");
businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
businessCommunityMember.put("memberId", "400000000000000002");
businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.DEV);
businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
- businesses.add(business);
+ communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
+ super.insert(dataFlowContext, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
- return businesses;
}
/**
@@ -479,19 +436,13 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject addCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void addCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext) {
paramInJson.put("communityId", GenerateCodeFactory.getCommunityId());
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMMUNITY_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessCommunity = new JSONObject();
- businessCommunity.putAll(paramInJson);
- businessCommunity.put("state", "1000");
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunity", businessCommunity);
- return business;
+ paramInJson.put("state", "1000");
+ CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
+ super.insert(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMMUNITY_INFO);
+
}
/**
@@ -501,17 +452,12 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public JSONObject updateCommunityOne(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public void updateCommunityOne(JSONObject paramInJson, DataFlowContext dataFlowContext) {
- JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
- business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMMUNITY_INFO);
- business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
- business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
- JSONObject businessCommunity = new JSONObject();
- businessCommunity.putAll(paramInJson);
- //璁＄畻 搴旀敹閲戦
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunity", businessCommunity);
- return business;
+ CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
+
+ super.update(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMMUNITY_INFO);
+
}
}
--
Gitblit v1.8.0