优化代码

service-api/src/main/java/com/java110/api/listener/community/DeleteCommunityListener.java

@@ -1,81 +0,0 @@
-package com.java110.api.listener.community;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.community.ICommunityBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.context.Environment;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
-import com.java110.dto.community.CommunityDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-import java.util.List;
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("deleteCommunityListener")
-public class DeleteCommunityListener extends AbstractServiceApiPlusListener {
-    @Autowired
-    private ICommunityBMO communityBMOImpl;
-    @Autowired
-    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-        Environment.isDevEnv();
-
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-
-        CommunityDto communityDto = new CommunityDto();
-        communityDto.setCommunityId((String) reqJson.get("communityId"));
-        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
-        if (communityDtos.size() == 0 || communityDtos == null) {
-            throw new IllegalArgumentException("没有查询到communityId为：" + communityDto.getCommunityId() + "小区信息");
-        }
-        if ("1100".equals(communityDtos.get(0).getState())) {
-            throw new IllegalArgumentException("删除失败,该小区已审核通过");
-        }
-        //添加单元信息
-        communityBMOImpl.deleteCommunity(reqJson, context);
-
-    }
-
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_DELETE_COMMUNITY;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public ICommunityInnerServiceSMO getCommunityInnerServiceSMOImpl() {
-        return communityInnerServiceSMOImpl;
-    }
-
-    public void setCommunityInnerServiceSMOImpl(ICommunityInnerServiceSMO communityInnerServiceSMOImpl) {
-        this.communityInnerServiceSMOImpl = communityInnerServiceSMOImpl;
-    }
-}

service-community/src/main/java/com/java110/community/cmd/community/DeleteCommunityCmd.java

@@ -18,9 +18,12 @@ package com.java110.community.cmd.community;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.Environment;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.community.CommunityDto;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
 import com.java110.intf.community.ICommunityV1InnerServiceSMO;
 import com.java110.po.community.CommunityPo;
 import com.java110.utils.exception.CmdException;
@@ -31,6 +34,8 @@ import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 /**
  * 类表述：删除
  * 服务编码：community.deleteCommunity
@@ -48,17 +53,29 @@ public class DeleteCommunityCmd extends Cmd {
     @Autowired
     private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
 
+    @Autowired
+    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+        Environment.isDevEnv();
+
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
 
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
+        CommunityDto communityDto = new CommunityDto();
+        communityDto.setCommunityId((String) reqJson.get("communityId"));
+        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+        if (communityDtos.size() == 0 || communityDtos == null) {
+            throw new IllegalArgumentException("没有查询到communityId为：" + communityDto.getCommunityId() + "小区信息");
+        }
+        if ("1100".equals(communityDtos.get(0).getState())) {
+            throw new IllegalArgumentException("删除失败,该小区已审核通过");
+        }
         CommunityPo communityPo = BeanConvertUtil.covertBean(reqJson, CommunityPo.class);
         int flag = communityV1InnerServiceSMOImpl.deleteCommunity(communityPo);
 

service-api/src/main/java/com/java110/api/listener/community/ListCommunitysListener.java

@@ -1,32 +1,27 @@
-package com.java110.api.listener.community;
+package com.java110.community.cmd.community;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.area.AreaDto;
 import com.java110.dto.community.CommunityDto;
 import com.java110.intf.common.IAreaInnerServiceSMO;
 import com.java110.intf.community.ICommunityInnerServiceSMO;
-import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.community.ApiCommunityDataVo;
 import com.java110.vo.api.community.ApiCommunityVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import java.util.ArrayList;
 import java.util.List;
 
-
-/**
- * 查询小区侦听类
- */
-@Java110Listener("listCommunitysListener")
-public class ListCommunitysListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "community.listCommunitys")
+public class ListCommunitysCmd extends Cmd {
 
     @Autowired
     private IAreaInnerServiceSMO areaInnerServiceSMOImpl;
@@ -35,38 +30,12 @@ public class ListCommunitysListener extends AbstractServiceApiListener {
     private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
 
     @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_LIST_COMMUNITYS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public ICommunityInnerServiceSMO getCommunityInnerServiceSMOImpl() {
-        return communityInnerServiceSMOImpl;
-    }
-
-    public void setCommunityInnerServiceSMOImpl(ICommunityInnerServiceSMO communityInnerServiceSMOImpl) {
-        this.communityInnerServiceSMOImpl = communityInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         CommunityDto communityDto = BeanConvertUtil.covertBean(reqJson, CommunityDto.class);
 
         int count = communityInnerServiceSMOImpl.queryCommunitysCount(communityDto);
@@ -118,12 +87,4 @@ public class ListCommunitysListener extends AbstractServiceApiListener {
             }
         }
     }
-
-    public IAreaInnerServiceSMO getAreaInnerServiceSMOImpl() {
-        return areaInnerServiceSMOImpl;
-    }
-
-    public void setAreaInnerServiceSMOImpl(IAreaInnerServiceSMO areaInnerServiceSMOImpl) {
-        this.areaInnerServiceSMOImpl = areaInnerServiceSMOImpl;
-    }
 }