From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/api/ContractChangePlanRoomApi.java | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/api/ContractChangePlanRoomApi.java b/service-store/src/main/java/com/java110/store/api/ContractChangePlanRoomApi.java
index aabb4b6..6214830 100644
--- a/service-store/src/main/java/com/java110/store/api/ContractChangePlanRoomApi.java
+++ b/service-store/src/main/java/com/java110/store/api/ContractChangePlanRoomApi.java
@@ -1,11 +1,12 @@
package com.java110.store.api;
-import com.java110.dto.Dto;.ContractChangePlanRoomDto;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto;
import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
-import com.java110.store.bmo.ContractChangePlanRoom.IDeleteContractChangePlanRoomBMO;
-import com.java110.store.bmo.ContractChangePlanRoom.IGetContractChangePlanRoomBMO;
-import com.java110.store.bmo.ContractChangePlanRoom.ISaveContractChangePlanRoomBMO;
-import com.java110.store.bmo.ContractChangePlanRoom.IUpdateContractChangePlanRoomBMO;
+import com.java110.store.bmo.contractChangePlanRoom.IDeleteContractChangePlanRoomBMO;
+import com.java110.store.bmo.contractChangePlanRoom.IGetContractChangePlanRoomBMO;
+import com.java110.store.bmo.contractChangePlanRoom.ISaveContractChangePlanRoomBMO;
+import com.java110.store.bmo.contractChangePlanRoom.IUpdateContractChangePlanRoomBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,16 +29,17 @@
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
- * @serviceCode /contractChangePlanRoom/saveContractChangePlanRoom
- * @path /app/contractChangePlanRoom/saveContractChangePlanRoom
+ *
* @param reqJson
* @return
+ * @serviceCode /contractChangePlanRoom/saveContractChangePlanRoom
+ * @path /app/contractChangePlanRoom/saveContractChangePlanRoom
*/
@RequestMapping(value = "/saveContractChangePlanRoom", method = RequestMethod.POST)
public ResponseEntity<String> saveContractChangePlanRoom(@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "planId", "璇锋眰鎶ユ枃涓湭鍖呭惈planId");
-Assert.hasKeyAndValue(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId");
+ Assert.hasKeyAndValue(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId");
ContractChangePlanRoomPo contractChangePlanRoomPo = BeanConvertUtil.covertBean(reqJson, ContractChangePlanRoomPo.class);
@@ -46,17 +48,18 @@
/**
* 寰俊淇敼娑堟伅妯℃澘
- * @serviceCode /contractChangePlanRoom/updateContractChangePlanRoom
- * @path /app/contractChangePlanRoom/updateContractChangePlanRoom
+ *
* @param reqJson
* @return
+ * @serviceCode /contractChangePlanRoom/updateContractChangePlanRoom
+ * @path /app/contractChangePlanRoom/updateContractChangePlanRoom
*/
@RequestMapping(value = "/updateContractChangePlanRoom", method = RequestMethod.POST)
public ResponseEntity<String> updateContractChangePlanRoom(@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "planId", "璇锋眰鎶ユ枃涓湭鍖呭惈planId");
-Assert.hasKeyAndValue(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId");
-Assert.hasKeyAndValue(reqJson, "prId", "prId涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId");
+ Assert.hasKeyAndValue(reqJson, "prId", "prId涓嶈兘涓虹┖");
ContractChangePlanRoomPo contractChangePlanRoomPo = BeanConvertUtil.covertBean(reqJson, ContractChangePlanRoomPo.class);
@@ -65,10 +68,11 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
- * @serviceCode /contractChangePlanRoom/deleteContractChangePlanRoom
- * @path /app/contractChangePlanRoom/deleteContractChangePlanRoom
+ *
* @param reqJson
* @return
+ * @serviceCode /contractChangePlanRoom/deleteContractChangePlanRoom
+ * @path /app/contractChangePlanRoom/deleteContractChangePlanRoom
*/
@RequestMapping(value = "/deleteContractChangePlanRoom", method = RequestMethod.POST)
public ResponseEntity<String> deleteContractChangePlanRoom(@RequestBody JSONObject reqJson) {
@@ -83,19 +87,20 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param storeId 鍟嗘埛ID
+ * @return
* @serviceCode /contractChangePlanRoom/queryContractChangePlanRoom
* @path /app/contractChangePlanRoom/queryContractChangePlanRoom
- * @param communityId 灏忓尯ID
- * @return
*/
@RequestMapping(value = "/queryContractChangePlanRoom", method = RequestMethod.GET)
- public ResponseEntity<String> queryContractChangePlanRoom(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ public ResponseEntity<String> queryContractChangePlanRoom(@RequestHeader(value = "shore-id") String storeId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
ContractChangePlanRoomDto contractChangePlanRoomDto = new ContractChangePlanRoomDto();
contractChangePlanRoomDto.setPage(page);
contractChangePlanRoomDto.setRow(row);
- contractChangePlanRoomDto.setCommunityId(communityId);
+ contractChangePlanRoomDto.setStoreId(storeId);
return getContractChangePlanRoomBMOImpl.get(contractChangePlanRoomDto);
}
}
--
Gitblit v1.8.0