From 5589528feb385d7881f8dbf9314b3abf5d4f4e9e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 27 一月 2023 19:21:11 +0800
Subject: [PATCH] 优化 房屋页面查询功能
---
service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java | 91 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java b/service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java
index b67eff8..fccf55b 100644
--- a/service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java
@@ -5,9 +5,10 @@
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
import com.java110.dto.UnitDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.intf.community.*;
@@ -22,12 +23,64 @@
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
-import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+
+@Java110CmdDoc(title = "淇敼鎴垮眿",
+ description = "瀵瑰簲鍚庡彴 淇敼鎴垮眿鍔熻兘",
+ httpMethod = "post",
+ url = "http://{ip}:{port}/app/room.updateRoom",
+ resource = "communityDoc",
+ author = "鍚村鏂�",
+ serviceCode = "room.updateRoom"
+)
+
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "communityId", length = 30, remark = "灏忓尯ID"),
+ @Java110ParamDoc(name = "roomNum", length = 64, remark = "鎴垮彿"),
+ @Java110ParamDoc(name = "layer", length = 12, remark = "灞傛暟"),
+ @Java110ParamDoc(name = "unitId", length = 30, remark = "鍗曞厓ID"),
+ @Java110ParamDoc(name = "roomId", length = 30, remark = "鍗曞厓ID"),
+ @Java110ParamDoc(name = "section", length = 12, remark = "鎴垮眿涓暟"),
+ @Java110ParamDoc(name = "apartment", length = 12, remark = "鍥哄畾 10102"),
+ @Java110ParamDoc(name = "builtUpArea", length = 12, remark = "寤虹瓚闈㈢Н"),
+ @Java110ParamDoc(name = "feeCoefficient", length = 12, remark = "绠楄垂绯绘暟 鍥哄畾1"),
+ @Java110ParamDoc(name = "roomSubType", length = 12, remark = "鎴垮眿绫诲瀷 110\t浣忓畢\n" +
+ "120\t鍔炲叕瀹n" +
+ "119\t瀹胯垗"),
+ @Java110ParamDoc(name = "roomArea", length = 12, remark = "瀹ゅ唴闈㈢Н"),
+ @Java110ParamDoc(name = "roomRent", length = 12, remark = "鍔炲叕瀹� 鎴栬�呭鑸� 鏃剁閲�"),
+ @Java110ParamDoc(name = "remark", length = 512, remark = "澶囨敞"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+ @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+ }
+)
+
+@Java110ExampleDoc(
+ reqBody="{\n" +
+ "\t\"roomNum\": \"88488\",\n" +
+ "\t\"layer\": \"1\",\n" +
+ "\t\"unitId\":\"123123123\",\n" +
+ "\t\"section\": \"0\",\n" +
+ "\t\"apartment\": \"10102\",\n" +
+ "\t\"builtUpArea\": \"110\",\n" +
+ "\t\"feeCoefficient\": \"1.00\",\n" +
+ "\t\"roomId\": \"123123123123\",\n" +
+ "\t\"remark\": \"sdf\",\n" +
+ "\t\"roomSubType\": \"110\",\n" +
+ "\t\"roomArea\": \"110\",\n" +
+ "\t\"roomRent\": \"0\",\n" +
+ "\t\"communityId\": \"2022121921870161\",\n" +
+ "}",
+ resBody="{\"code\":0,\"msg\":\"鎴愬姛\"}"
+)
@Java110Cmd(serviceCode = "room.updateRoom")
-public class UpdateRoomCmd extends AbstractServiceCmdListener {
+public class UpdateRoomCmd extends Cmd {
@Autowired
private IUnitV1InnerServiceSMO unitV1InnerServiceSMOImpl;
@@ -47,7 +100,7 @@
private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
@Override
- public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws Exception {
+ public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId鑺傜偣");
Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
Assert.jsonObjectHaveKey(reqJson, "roomNum", "璇锋眰鎶ユ枃涓湭鍖呭惈roomNum鑺傜偣");
@@ -66,9 +119,18 @@
String state = reqJson.getString("state");
if (!StringUtil.isEmpty(state) && state.equals("2006")) { //宸插嚭绉�
//鑾峰彇璧风鏃堕棿
- Date startTime = DateUtil.getDateFromString(reqJson.getString("startTime"), DateUtil.DATE_FORMATE_STRING_B);
+ Date startTime = null;
+ Date endTime = null;
+
+ try {
+ startTime = DateUtil.getDateFromString(reqJson.getString("startTime"), DateUtil.DATE_FORMATE_STRING_B);
+ endTime = DateUtil.getDateFromString(reqJson.getString("endTime"), DateUtil.DATE_FORMATE_STRING_B);
+
+ } catch (Exception e) {
+ throw new CmdException(e.getMessage());
+ }
//鑾峰彇鎴鏃堕棿
- Date endTime = DateUtil.getDateFromString(reqJson.getString("endTime"), DateUtil.DATE_FORMATE_STRING_B);
+
if (startTime.getTime() > endTime.getTime()) {
throw new IllegalArgumentException("璧风鏃堕棿涓嶈兘澶т簬鎴鏃堕棿锛�");
@@ -153,6 +215,23 @@
JSONObject businessUnit = new JSONObject();
businessUnit.putAll(paramInJson);
RoomPo roomPo = BeanConvertUtil.covertBean(businessUnit, RoomPo.class);
+ if (paramInJson.containsKey("apartment1") && paramInJson.getString("apartment1").equals("10")) {
+ roomPo.setSection("1");
+ } else if (paramInJson.containsKey("apartment1") && paramInJson.getString("apartment1").equals("20")) {
+ roomPo.setSection("2");
+ } else if (paramInJson.containsKey("apartment1") && paramInJson.getString("apartment1").equals("30")) {
+ roomPo.setSection("3");
+ } else if (paramInJson.containsKey("apartment1") && paramInJson.getString("apartment1").equals("40")) {
+ roomPo.setSection("4");
+ } else if (paramInJson.containsKey("apartment1") && paramInJson.getString("apartment1").equals("50")) {
+ roomPo.setSection("5");
+ } else if (paramInJson.containsKey("apartment1") && paramInJson.getString("apartment1").equals("60")) {
+ roomPo.setSection("6");
+ } else if (paramInJson.containsKey("apartment1") && paramInJson.getString("apartment1").equals("70")) {
+ roomPo.setSection("7");
+ } else if (paramInJson.containsKey("apartment1") && paramInJson.getString("apartment1").equals("80")) {
+ roomPo.setSection("8");
+ }
int flag = roomV1InnerServiceSMOImpl.updateRoom(roomPo);
if (flag < 1) {
throw new CmdException("淇敼鎴垮眿澶辫触");
--
Gitblit v1.8.0