From 5075e695fdbc738bdac890a81be6be942bfaf80c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 11 八月 2022 22:52:48 +0800
Subject: [PATCH] 优化 修改

---
 service-community/src/main/java/com/java110/community/cmd/floor/DeleteFloorCmd.java |   57 ++++++++++++++++++++++-----------------------------------
 1 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/cmd/floor/DeleteFloorCmd.java b/service-community/src/main/java/com/java110/community/cmd/floor/DeleteFloorCmd.java
index d9cadef..bf1bafd 100644
--- a/service-community/src/main/java/com/java110/community/cmd/floor/DeleteFloorCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/floor/DeleteFloorCmd.java
@@ -1,69 +1,56 @@
-/*
- * Copyright 2017-2020 鍚村鏂� and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.java110.community.cmd.floor;
 
 import com.alibaba.fastjson.JSONObject;
 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;
+import com.java110.intf.community.IFloorInnerServiceSMO;
 import com.java110.intf.community.IFloorV1InnerServiceSMO;
+import com.java110.intf.community.IUnitV1InnerServiceSMO;
 import com.java110.po.floor.FloorPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-/**
- * 绫昏〃杩帮細鍒犻櫎
- * 鏈嶅姟缂栫爜锛歠loor.deleteFloor
- * 璇锋眰璺姴锛�/app/floor.DeleteFloor
- * add by 鍚村鏂� at 2021-09-13 16:41:17 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 瀹樼綉锛歨ttp://www.homecommunity.cn
- * 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
- * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
- */
-@Java110Cmd(serviceCode = "floor.deleteFloorV1")
-public class DeleteFloorCmd extends AbstractServiceCmdListener {
-    private static Logger logger = LoggerFactory.getLogger(DeleteFloorCmd.class);
+@Java110Cmd(serviceCode = "floor.deleteFloor")
+public class DeleteFloorCmd extends Cmd {
+    @Autowired
+    private IFloorInnerServiceSMO floorInnerServiceSMOImpl;
 
     @Autowired
     private IFloorV1InnerServiceSMO floorV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IUnitV1InnerServiceSMO unitV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "floorId", "floorId涓嶈兘涓虹┖");
+        Assert.jsonObjectHaveKey(reqJson, "floorId", "璇锋眰鎶ユ枃涓湭鍖呭惈floorId");
+        Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
 
+        UnitDto unitDto = new UnitDto();
+        unitDto.setFloorId(reqJson.getString("floorId"));
+        unitDto.setCommunityId(reqJson.getString("communityId"));
+//        unitDto.setRoomUnit(UnitDto.ROOM_UNIT_Y);
+        int count = unitV1InnerServiceSMOImpl.queryUnitsCount(unitDto);
+        if (count > 0) {
+            throw new IllegalArgumentException("璇峰厛鍒犻櫎鍗曞厓 鍐嶅垹闄ゆゼ鏍�");
+        }
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
         FloorPo floorPo = BeanConvertUtil.covertBean(reqJson, FloorPo.class);
         int flag = floorV1InnerServiceSMOImpl.deleteFloor(floorPo);
 
         if (flag < 1) {
-            throw new CmdException("鍒犻櫎鏁版嵁澶辫触");
+            throw new CmdException("鍒犻櫎妤兼爧澶辫触");
         }
 
         cmdDataFlowContext.setResponseEntity(ResultVo.success());

--
Gitblit v1.8.0