From 8db876498c0179e8ffab848237eccd66436ccacc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 13:46:12 +0800
Subject: [PATCH] 优化疫情上报功能
---
service-community/src/main/java/com/java110/community/cmd/floor/SaveFloorCmd.java | 82 +++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 47 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/floor/SaveFloorCmd.java b/service-community/src/main/java/com/java110/community/cmd/floor/SaveFloorCmd.java
index e966654..e38697f 100644
--- a/service-community/src/main/java/com/java110/community/cmd/floor/SaveFloorCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/floor/SaveFloorCmd.java
@@ -1,79 +1,67 @@
-/*
- * 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.FloorDto;
+import com.java110.intf.community.IFloorInnerServiceSMO;
import com.java110.intf.community.IFloorV1InnerServiceSMO;
import com.java110.po.floor.FloorPo;
+import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.CmdException;
+import com.java110.utils.exception.ListenerExecuteException;
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.saveFloor
- * 璇锋眰璺姴锛�/app/floor.SaveFloor
- * 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.saveFloorV1")
-public class SaveFloorCmd extends AbstractServiceCmdListener {
-
- private static Logger logger = LoggerFactory.getLogger(SaveFloorCmd.class);
-
- public static final String CODE_PREFIX_ID = "10";
+@Java110Cmd(serviceCode = "floor.saveFloor")
+public class SaveFloorCmd extends Cmd {
+ @Autowired
+ private IFloorInnerServiceSMO floorInnerServiceSMOImpl;
@Autowired
private IFloorV1InnerServiceSMO floorV1InnerServiceSMOImpl;
@Override
- protected void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "floorId", "璇锋眰鎶ユ枃涓湭鍖呭惈floorId");
- Assert.hasKeyAndValue(reqJson, "bId", "璇锋眰鎶ユ枃涓湭鍖呭惈bId");
- Assert.hasKeyAndValue(reqJson, "floorNum", "璇锋眰鎶ユ枃涓湭鍖呭惈floorNum");
- Assert.hasKeyAndValue(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
- Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈userId");
- Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
- Assert.hasKeyAndValue(reqJson, "floorArea", "璇锋眰鎶ユ枃涓湭鍖呭惈floorArea");
+ public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+ Assert.jsonObjectHaveKey(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
+ Assert.jsonObjectHaveKey(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈userId");
+ Assert.jsonObjectHaveKey(reqJson, "floorNum", "璇锋眰鎶ユ枃涓湭鍖呭惈floorNum");
+ Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+ FloorDto floorDto = new FloorDto();
+ floorDto.setFloorNum(reqJson.getString("floorNum"));
+ floorDto.setCommunityId(reqJson.getString("communityId"));
+
+ int floorCount = floorInnerServiceSMOImpl.queryFloorsCount(floorDto);
+
+ if (floorCount > 0) {
+ throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "妤兼爧缂栧彿宸茬粡瀛樺湪");
+ }
}
@Override
@Java110Transactional
- protected void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
- FloorPo floorPo = BeanConvertUtil.covertBean(reqJson, FloorPo.class);
- floorPo.setFloorId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ String floorId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_floorId);
+ JSONObject businessFloor = new JSONObject();
+ businessFloor.put("floorId", floorId);
+ businessFloor.put("name", reqJson.getString("name"));
+ businessFloor.put("remark", reqJson.getString("remark"));
+ businessFloor.put("userId", reqJson.getString("userId"));
+ businessFloor.put("floorNum", reqJson.getString("floorNum"));
+ businessFloor.put("communityId", reqJson.getString("communityId"));
+ businessFloor.put("floorArea", reqJson.getString("floorArea"));
+ FloorPo floorPo = BeanConvertUtil.covertBean(businessFloor, FloorPo.class);
int flag = floorV1InnerServiceSMOImpl.saveFloor(floorPo);
if (flag < 1) {
- throw new CmdException("淇濆瓨鏁版嵁澶辫触");
+ throw new CmdException("淇濆瓨妤兼爧澶辫触");
}
cmdDataFlowContext.setResponseEntity(ResultVo.success());
--
Gitblit v1.8.0