From 9fa63e316511ca3b116fe86776c04b3b2ac13f97 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 07 十一月 2022 02:27:52 +0800
Subject: [PATCH] 优化 保养计划

---
 service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 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..1b3495e 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,7 +5,7 @@
 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.dto.UnitDto;
@@ -22,12 +22,11 @@
 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;
 
 @Java110Cmd(serviceCode = "room.updateRoom")
-public class UpdateRoomCmd extends AbstractServiceCmdListener {
+public class UpdateRoomCmd extends Cmd {
 
     @Autowired
     private IUnitV1InnerServiceSMO unitV1InnerServiceSMOImpl;
@@ -47,7 +46,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 +65,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 +161,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