From 22e8a676ee42c0d78b3526bcd9a635abbe8dca03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 11:28:21 +0800
Subject: [PATCH] 优化databus bug
---
service-user/src/main/java/com/java110/user/api/RentingApi.java | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 12 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/RentingApi.java b/service-user/src/main/java/com/java110/user/api/RentingApi.java
old mode 100644
new mode 100755
index 98797b2..4f09d46
--- a/service-user/src/main/java/com/java110/user/api/RentingApi.java
+++ b/service-user/src/main/java/com/java110/user/api/RentingApi.java
@@ -1,26 +1,28 @@
package com.java110.user.api;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.utils.StringUtils;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.rentingConfig.RentingConfigDto;
import com.java110.dto.rentingPool.RentingPoolDto;
import com.java110.dto.rentingPoolAttr.RentingPoolAttrDto;
import com.java110.po.rentingConfig.RentingConfigPo;
import com.java110.po.rentingPool.RentingPoolPo;
import com.java110.po.rentingPoolAttr.RentingPoolAttrPo;
+import com.java110.po.rentingPoolFlow.RentingPoolFlowPo;
import com.java110.user.bmo.rentingConfig.IDeleteRentingConfigBMO;
import com.java110.user.bmo.rentingConfig.IGetRentingConfigBMO;
import com.java110.user.bmo.rentingConfig.ISaveRentingConfigBMO;
import com.java110.user.bmo.rentingConfig.IUpdateRentingConfigBMO;
-import com.java110.user.bmo.rentingPool.IDeleteRentingPoolBMO;
-import com.java110.user.bmo.rentingPool.IGetRentingPoolBMO;
-import com.java110.user.bmo.rentingPool.ISaveRentingPoolBMO;
-import com.java110.user.bmo.rentingPool.IUpdateRentingPoolBMO;
+import com.java110.user.bmo.rentingPool.*;
import com.java110.user.bmo.rentingPoolAttr.IDeleteRentingPoolAttrBMO;
import com.java110.user.bmo.rentingPoolAttr.IGetRentingPoolAttrBMO;
import com.java110.user.bmo.rentingPoolAttr.ISaveRentingPoolAttrBMO;
import com.java110.user.bmo.rentingPoolAttr.IUpdateRentingPoolAttrBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -60,6 +62,9 @@
@Autowired
private IGetRentingPoolAttrBMO getRentingPoolAttrBMOImpl;
+
+ @Autowired
+ private IAuditRentingBMO auditRentingBMOImpl;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -122,7 +127,7 @@
*/
@RequestMapping(value = "/deleteRentingConfig", method = RequestMethod.POST)
public ResponseEntity<String> deleteRentingConfig(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
+ ;
Assert.hasKeyAndValue(reqJson, "rentingConfigId", "rentingConfigId涓嶈兘涓虹┖");
@@ -141,10 +146,12 @@
@RequestMapping(value = "/queryRentingConfig", method = RequestMethod.GET)
public ResponseEntity<String> queryRentingConfig(
@RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "row") int row,
+ @RequestParam(value = "rentingConfigId", required = false) String rentingConfigId) {
RentingConfigDto rentingConfigDto = new RentingConfigDto();
rentingConfigDto.setPage(page);
rentingConfigDto.setRow(row);
+ rentingConfigDto.setRentingConfigId(rentingConfigId);
return getRentingConfigBMOImpl.get(rentingConfigDto);
}
@@ -163,16 +170,23 @@
Assert.hasKeyAndValue(reqJson, "rentingTitle", "璇锋眰鎶ユ枃涓湭鍖呭惈rentingTitle");
Assert.hasKeyAndValue(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+ Assert.hasKeyAndValue(reqJson, "communityName", "璇锋眰鎶ユ枃涓湭鍖呭惈communityName");
Assert.hasKeyAndValue(reqJson, "price", "璇锋眰鎶ユ枃涓湭鍖呭惈price");
Assert.hasKeyAndValue(reqJson, "paymentType", "璇锋眰鎶ユ枃涓湭鍖呭惈paymentType");
- Assert.hasKeyAndValue(reqJson, "checkInDate", "璇锋眰鎶ユ枃涓湭鍖呭惈checkInDate");
+ Assert.hasKeyAndValue(reqJson, "checkIn", "璇锋眰鎶ユ枃涓湭鍖呭惈checkIn");
Assert.hasKeyAndValue(reqJson, "rentingConfigId", "璇锋眰鎶ユ枃涓湭鍖呭惈rentingConfigId");
Assert.hasKeyAndValue(reqJson, "ownerName", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerName");
Assert.hasKeyAndValue(reqJson, "ownerTel", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerTel");
+ JSONArray photos = null;
+ if (reqJson.containsKey("photos")) {
+ photos = reqJson.getJSONArray("photos");
+ }else{
+ photos = new JSONArray();
+ }
RentingPoolPo rentingPoolPo = BeanConvertUtil.covertBean(reqJson, RentingPoolPo.class);
- return saveRentingPoolBMOImpl.save(rentingPoolPo);
+ return saveRentingPoolBMOImpl.save(rentingPoolPo,photos);
}
/**
@@ -190,8 +204,7 @@
Assert.hasKeyAndValue(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
Assert.hasKeyAndValue(reqJson, "price", "璇锋眰鎶ユ枃涓湭鍖呭惈price");
- Assert.hasKeyAndValue(reqJson, "paymentType", "璇锋眰鎶ユ枃涓湭鍖呭惈paymentType");
- Assert.hasKeyAndValue(reqJson, "checkInDate", "璇锋眰鎶ユ枃涓湭鍖呭惈checkInDate");
+ Assert.hasKeyAndValue(reqJson, "checkIn", "璇锋眰鎶ユ枃涓湭鍖呭惈checkInDate");
Assert.hasKeyAndValue(reqJson, "rentingConfigId", "璇锋眰鎶ユ枃涓湭鍖呭惈rentingConfigId");
Assert.hasKeyAndValue(reqJson, "ownerName", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerName");
Assert.hasKeyAndValue(reqJson, "ownerTel", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerTel");
@@ -230,13 +243,26 @@
* @path /app/renting/queryRentingPool
*/
@RequestMapping(value = "/queryRentingPool", method = RequestMethod.GET)
- public ResponseEntity<String> queryRentingPool(@RequestParam(value = "communityId") String communityId,
+ public ResponseEntity<String> queryRentingPool(@RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "communityName", required = false) String communityName,
@RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "row") int row,
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "rentingType", required = false) String rentingType,
+ @RequestParam(value = "rentingId", required = false) String rentingId
+ ) {
RentingPoolDto rentingPoolDto = new RentingPoolDto();
rentingPoolDto.setPage(page);
rentingPoolDto.setRow(row);
rentingPoolDto.setCommunityId(communityId);
+ rentingPoolDto.setCommunityName(communityName);
+ rentingPoolDto.setRentingId(rentingId);
+ rentingPoolDto.setRentingType(rentingType);
+ if (!StringUtils.isEmpty(state) && state.contains(",")) {
+ rentingPoolDto.setStates(state.split(","));
+ } else {
+ rentingPoolDto.setState(state);
+ }
return getRentingPoolBMOImpl.get(rentingPoolDto);
}
@@ -317,4 +343,35 @@
rentingPoolAttrDto.setCommunityId(communityId);
return getRentingPoolAttrBMOImpl.get(rentingPoolAttrDto);
}
+
+ /**
+ * 浠ｇ悊鍟� 鎴栬�呰繍钀ュ洟闃熷鏍�
+ *
+ * @param reqJson 璇锋眰淇℃伅
+ * @return
+ * @serviceCode /renting/auditRenting
+ * @path /app/renting/auditRenting
+ */
+ @RequestMapping(value = "/auditRenting", method = RequestMethod.POST)
+ public ResponseEntity<String> auditRenting(@RequestBody JSONObject reqJson,
+ @RequestHeader(value = "store-id") String storeId,
+ @RequestHeader(value = "user-id") String userId) {
+ Assert.hasKeyAndValue(reqJson, "rentingId", "璇锋眰鎶ユ枃涓湭鍖呭惈鍑虹淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈鐘舵��");
+ Assert.hasKeyAndValue(reqJson, "context", "璇锋眰鎶ユ枃涓湭鍖呭惈瀹℃牳鍐呭");
+ Assert.hasKeyAndValue(reqJson, "userRole", "璇锋眰鎶ユ枃涓湭鍖呭惈瑙掕壊");
+ Assert.hasValue(storeId, "璇锋眰鎶ユ枃涓湭鍖呭惈鍟嗘埛ID");
+ Assert.hasValue(userId, "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛ID");
+
+
+ RentingPoolFlowPo rentingPoolFlowPo = new RentingPoolFlowPo();
+ rentingPoolFlowPo.setContext(reqJson.getString("context"));
+ rentingPoolFlowPo.setDealTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ rentingPoolFlowPo.setFlowId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_flowId));
+ rentingPoolFlowPo.setRentingId(reqJson.getString("rentingId"));
+ rentingPoolFlowPo.setState(reqJson.getString("state"));
+ rentingPoolFlowPo.setUserRole(reqJson.getString("userRole"));
+
+ return auditRentingBMOImpl.audit(rentingPoolFlowPo, userId);
+ }
}
--
Gitblit v1.8.0