优化 编辑楼栋

service-api/src/main/java/com/java110/api/listener/floor/EditFloorListener.java

@@ -1,57 +0,0 @@
-package com.java110.api.listener.floor;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.floor.IFloorBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.utils.constant.ServiceCodeConstant;
-import com.java110.utils.util.Assert;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * @ClassName EditFloorListener
- * @Description TODO 编辑小区楼信息
- * @Author wuxw
- * @Date 2019/4/28 15:19
- * @Version 1.0
- * add by wuxw 2019/4/28
- **/
-@Java110Listener("editFloorListener")
-public class EditFloorListener extends AbstractServiceApiPlusListener {
-
-    private static Logger logger = LoggerFactory.getLogger(EditFloorListener.class);
-
-    @Autowired
-    private IFloorBMO floorBMOImpl;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_EDIT_FLOOR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        Assert.jsonObjectHaveKey(reqJson, "floorId", "请求报文中未包含floorId");
-        Assert.jsonObjectHaveKey(reqJson, "name", "请求报文中未包含name");
-        Assert.jsonObjectHaveKey(reqJson, "userId", "请求报文中未包含userId");
-        Assert.jsonObjectHaveKey(reqJson, "floorNum", "请求报文中未包含floorNum");
-        Assert.jsonObjectHaveKey(reqJson, "communityId", "请求报文中未包含communityId");
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        floorBMOImpl.editFloor(reqJson,context);
-    }
-
-
-}

service-community/src/main/java/com/java110/community/cmd/floor/EditFloorCmd.java

@@ -0,0 +1,60 @@
+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.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;
+
+@Java110Cmd(serviceCode = "floor.editFloor")
+public class EditFloorCmd extends AbstractServiceCmdListener {
+    @Autowired
+    private IFloorInnerServiceSMO floorInnerServiceSMOImpl;
+
+    @Autowired
+    private IFloorV1InnerServiceSMO floorV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.jsonObjectHaveKey(reqJson, "floorId", "请求报文中未包含floorId");
+        Assert.jsonObjectHaveKey(reqJson, "name", "请求报文中未包含name");
+        Assert.jsonObjectHaveKey(reqJson, "userId", "请求报文中未包含userId");
+        Assert.jsonObjectHaveKey(reqJson, "floorNum", "请求报文中未包含floorNum");
+        Assert.jsonObjectHaveKey(reqJson, "communityId", "请求报文中未包含communityId");
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        JSONObject businessFloor = new JSONObject();
+        businessFloor.put("floorId", reqJson.getString("floorId"));
+        businessFloor.put("name", reqJson.getString("floorName"));
+        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.updateFloor(floorPo);
+
+        if (flag < 1) {
+            throw new CmdException("修改楼栋失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-community/src/main/java/com/java110/community/cmd/floor/SaveFloorCmd.java

@@ -33,8 +33,6 @@ public class SaveFloorCmd extends AbstractServiceCmdListener {
         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"));