From b61309edd49fca3ca2e7572d67b2d67ffe292ce6 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期二, 12 四月 2022 10:13:37 +0800
Subject: [PATCH] 1、优化访客登记，增加车辆信息2、页面显示问题
---
service-community/src/main/java/com/java110/community/cmd/room/DeleteRoomCmd.java | 86 +++++++++++++++++++++++-------------------
1 files changed, 47 insertions(+), 39 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/room/DeleteRoomCmd.java b/service-community/src/main/java/com/java110/community/cmd/room/DeleteRoomCmd.java
index e1b8f27..e0ae71c 100644
--- a/service-community/src/main/java/com/java110/community/cmd/room/DeleteRoomCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/room/DeleteRoomCmd.java
@@ -1,20 +1,6 @@
-/*
- * 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.room;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
@@ -22,51 +8,73 @@
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.community.IRoomV1InnerServiceSMO;
+import com.java110.dto.UnitDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
+import com.java110.intf.community.*;
+import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
+import com.java110.po.owner.OwnerRoomRelPo;
+import com.java110.po.room.RoomAttrPo;
import com.java110.po.room.RoomPo;
+import com.java110.utils.constant.CommonConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-/**
- * 绫昏〃杩帮細鍒犻櫎
- * 鏈嶅姟缂栫爜锛歳oom.deleteRoom
- * 璇锋眰璺姴锛�/app/room.DeleteRoom
- * add by 鍚村鏂� at 2021-09-14 14:28:56 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 = "room.DeleteRoom")
+import java.util.Date;
+import java.util.List;
+
+@Java110Cmd(serviceCode = "room.deleteRoom")
public class DeleteRoomCmd extends AbstractServiceCmdListener {
- private static Logger logger = LoggerFactory.getLogger(DeleteRoomCmd.class);
+
+ @Autowired
+ private IUnitV1InnerServiceSMO unitV1InnerServiceSMOImpl;
+ @Autowired
+ private IUnitInnerServiceSMO unitInnerServiceSMOImpl;
+ @Autowired
+ private IFloorV1InnerServiceSMO floorV1InnerServiceSMOImpl;
+
@Autowired
private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
- @Override
- public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "roomId", "roomId涓嶈兘涓虹┖");
- Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
+ @Autowired
+ private IRoomAttrV1InnerServiceSMO roomAttrV1InnerServiceSMOImpl;
+
+ @Override
+ public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ Assert.jsonObjectHaveKey(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId鑺傜偣");
+ Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
+ Assert.jsonObjectHaveKey(reqJson, "unitId", "璇锋眰鎶ユ枃涓湭鍖呭惈unitId鑺傜偣");
+
+
+ UnitDto unitDto = new UnitDto();
+ unitDto.setCommunityId(reqJson.getString("communityId"));
+ unitDto.setUnitId(reqJson.getString("unitId"));
+ //鏍￠獙灏忓尯妤糏D鍜屽皬鍖烘槸鍚︽湁瀵瑰簲鍏崇郴
+ List<UnitDto> units = unitInnerServiceSMOImpl.queryUnitsByCommunityId(unitDto);
+
+ if (units == null || units.size() < 1) {
+ throw new IllegalArgumentException("浼犲叆鍗曞厓ID涓嶆槸璇ュ皬鍖虹殑鍗曞厓");
+ }
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
- RoomPo roomPo = BeanConvertUtil.covertBean(reqJson, RoomPo.class);
+ JSONObject businessUnit = new JSONObject();
+ businessUnit.putAll(reqJson);
+ RoomPo roomPo = BeanConvertUtil.covertBean(businessUnit, RoomPo.class);
int flag = roomV1InnerServiceSMOImpl.deleteRoom(roomPo);
-
if (flag < 1) {
- throw new CmdException("鍒犻櫎鏁版嵁澶辫触");
+ throw new CmdException("鍒犻櫎鎴垮眿澶辫触");
}
-
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
+
+
}
--
Gitblit v1.8.0