优化代码

service-api/src/main/java/com/java110/api/listener/mapping/DeleteMappingListener.java

@@ -1,79 +0,0 @@
-package com.java110.api.listener.mapping;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.utils.constant.*;
-import com.java110.utils.exception.ListenerExecuteException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.IMappingInnerServiceSMO;
-import com.java110.dto.mapping.MappingDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import com.java110.core.annotation.Java110Listener;
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("deleteMappingListener")
-public class DeleteMappingListener extends AbstractServiceApiListener {
-
-
-    @Autowired
-    private IMappingInnerServiceSMO mappingInnerServiceSMOImpl;
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "id", "编码ID不能为空");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        MappingDto mappingDto = BeanConvertUtil.covertBean(reqJson, MappingDto.class);
-
-        int count = mappingInnerServiceSMOImpl.deleteMapping(mappingDto);
-
-        if (count < 1) {
-            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "编辑数据失败");
-        }
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>("", HttpStatus.OK);
-
-        context.setResponseEntity(responseEntity);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMappingConstant.DELETE_MAPPING;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-
-
-    public IMappingInnerServiceSMO getMappingInnerServiceSMOImpl() {
-        return mappingInnerServiceSMOImpl;
-    }
-
-    public void setMappingInnerServiceSMOImpl(IMappingInnerServiceSMO mappingInnerServiceSMOImpl) {
-        this.mappingInnerServiceSMOImpl = mappingInnerServiceSMOImpl;
-    }
-}

service-api/src/main/java/com/java110/api/listener/menuGroup/DeleteMenuGroupListener.java

@@ -1,75 +0,0 @@
-package com.java110.api.listener.menuGroup;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.IMenuInnerServiceSMO;
-import com.java110.dto.menuGroup.MenuGroupDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import com.java110.core.annotation.Java110Listener;
-import com.java110.utils.constant.ServiceCodeMenuGroupConstant;
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("deleteMenuGroupListener")
-public class DeleteMenuGroupListener extends AbstractServiceApiListener {
-
-    @Autowired
-    private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "gId", "组Id不能为空");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        ResponseEntity<String> responseEntity = null;
-
-        MenuGroupDto menuGroupDto = BeanConvertUtil.covertBean(reqJson, MenuGroupDto.class);
-
-
-        int saveFlag = menuInnerServiceSMOImpl.deleteMenuGroup(menuGroupDto);
-
-        responseEntity = new ResponseEntity<String>(saveFlag > 0 ? "成功" : "失败", saveFlag > 0 ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
-
-        context.setResponseEntity(responseEntity);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMenuGroupConstant.DELETE_MENUGROUP;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IMenuInnerServiceSMO getMenuInnerServiceSMOImpl() {
-        return menuInnerServiceSMOImpl;
-    }
-
-    public void setMenuInnerServiceSMOImpl(IMenuInnerServiceSMO menuInnerServiceSMOImpl) {
-        this.menuInnerServiceSMOImpl = menuInnerServiceSMOImpl;
-    }
-}

service-api/src/main/java/com/java110/api/listener/menuGroup/UpdateMenuGroupListener.java

@@ -1,77 +0,0 @@
-package com.java110.api.listener.menuGroup;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.IMenuInnerServiceSMO;
-import com.java110.dto.menuGroup.MenuGroupDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import com.java110.utils.constant.ServiceCodeMenuGroupConstant;
-
-/**
- * 保存菜单组侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("updateMenuGroupListener")
-public class UpdateMenuGroupListener extends AbstractServiceApiListener {
-
-    @Autowired
-    private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "gId", "组Id不能为空");
-        Assert.hasKeyAndValue(reqJson, "name", "必填，请填写组名称");
-        Assert.hasKeyAndValue(reqJson, "icon", "必填，请填写icon");
-        Assert.hasKeyAndValue(reqJson, "seq", "必填，请填写序列");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-
-        ResponseEntity<String> responseEntity = null;
-
-        MenuGroupDto menuGroupDto = BeanConvertUtil.covertBean(reqJson, MenuGroupDto.class);
-
-
-        int saveFlag = menuInnerServiceSMOImpl.updateMenuGroup(menuGroupDto);
-
-        responseEntity = new ResponseEntity<String>(saveFlag > 0 ? "成功" : "失败", saveFlag > 0 ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
-
-        context.setResponseEntity(responseEntity);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMenuGroupConstant.UPDATE_MENUGROUP;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IMenuInnerServiceSMO getMenuInnerServiceSMOImpl() {
-        return menuInnerServiceSMOImpl;
-    }
-
-    public void setMenuInnerServiceSMOImpl(IMenuInnerServiceSMO menuInnerServiceSMOImpl) {
-        this.menuInnerServiceSMOImpl = menuInnerServiceSMOImpl;
-    }
-}

service-dev/src/main/java/com/java110/dev/cmd/SaveMappingCmd.java

@@ -1,25 +0,0 @@
-package com.java110.dev.cmd;
-
-import com.alibaba.fastjson.JSONObject;
-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.utils.exception.CmdException;
-
-/**
- * 保存编码映射处理类
- */
-@Java110Cmd(serviceCode = "mapping.saveMapping")
-public class SaveMappingCmd extends Cmd {
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-
-    }
-
-    @Override
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-    }
-}

service-dev/src/main/java/com/java110/dev/cmd/mapping/DeleteMappingCmd.java

@@ -0,0 +1,42 @@
+package com.java110.dev.cmd.mapping;
+
+import com.alibaba.fastjson.JSONObject;
+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.mapping.MappingDto;
+import com.java110.intf.community.IMappingInnerServiceSMO;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+@Java110Cmd(serviceCode = "mapping.deleteMapping")
+public class DeleteMappingCmd extends Cmd {
+    @Autowired
+    private IMappingInnerServiceSMO mappingInnerServiceSMOImpl;
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "id", "编码ID不能为空");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        MappingDto mappingDto = BeanConvertUtil.covertBean(reqJson, MappingDto.class);
+
+        int count = mappingInnerServiceSMOImpl.deleteMapping(mappingDto);
+
+        if (count < 1) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "编辑数据失败");
+        }
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>("", HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+    }
+}

service-api/src/main/java/com/java110/api/listener/mapping/ListMappingsListener.java

@@ -1,66 +1,37 @@
-package com.java110.api.listener.mapping;
+package com.java110.dev.cmd.mapping;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.IMappingInnerServiceSMO;
+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.mapping.MappingDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.intf.community.IMappingInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.mapping.ApiMappingDataVo;
 import com.java110.vo.api.mapping.ApiMappingVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import com.java110.utils.constant.ServiceCodeMappingConstant;
 
 import java.util.ArrayList;
 import java.util.List;
 
-
-/**
- * 查询小区侦听类
- */
-@Java110Listener("listMappingsListener")
-public class ListMappingsListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "mapping.listMappings")
+public class ListMappingsCmd extends Cmd {
 
     @Autowired
     private IMappingInnerServiceSMO mappingInnerServiceSMOImpl;
 
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMappingConstant.LIST_MAPPINGS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IMappingInnerServiceSMO getMappingInnerServiceSMOImpl() {
-        return mappingInnerServiceSMOImpl;
-    }
-
-    public void setMappingInnerServiceSMOImpl(IMappingInnerServiceSMO mappingInnerServiceSMOImpl) {
-        this.mappingInnerServiceSMOImpl = mappingInnerServiceSMOImpl;
-    }
 
     @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 {
 
         MappingDto mappingDto = BeanConvertUtil.covertBean(reqJson, MappingDto.class);
 
@@ -83,6 +54,5 @@ public class ListMappingsListener extends AbstractServiceApiListener {
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiMappingVo), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
     }
 }

service-api/src/main/java/com/java110/api/listener/mapping/SaveMappingListener.java

@@ -1,46 +1,35 @@
-package com.java110.api.listener.mapping;
+package com.java110.dev.cmd.mapping;
 
 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.intf.community.IMappingInnerServiceSMO;
+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.mapping.MappingDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.intf.community.IMappingInnerServiceSMO;
 import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.ServiceCodeMappingConstant;
+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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("saveMappingListener")
-public class SaveMappingListener extends AbstractServiceApiListener {
-
-
+@Java110Cmd(serviceCode = "mapping.saveMapping")
+public class SaveMappingCmd extends Cmd {
     @Autowired
     private IMappingInnerServiceSMO mappingInnerServiceSMOImpl;
-
     @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "domain", "必填，请填写域");
         Assert.hasKeyAndValue(reqJson, "name", "必填，请填写名称");
         Assert.hasKeyAndValue(reqJson, "key", "必填，请填写键");
         Assert.hasKeyAndValue(reqJson, "value", "必填，请填写值");
-
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
 
         MappingDto mappingDto = BeanConvertUtil.covertBean(reqJson, MappingDto.class);
 
@@ -55,28 +44,4 @@ public class SaveMappingListener extends AbstractServiceApiListener {
 
         context.setResponseEntity(responseEntity);
     }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMappingConstant.ADD_MAPPING;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IMappingInnerServiceSMO getMappingInnerServiceSMOImpl() {
-        return mappingInnerServiceSMOImpl;
-    }
-
-    public void setMappingInnerServiceSMOImpl(IMappingInnerServiceSMO mappingInnerServiceSMOImpl) {
-        this.mappingInnerServiceSMOImpl = mappingInnerServiceSMOImpl;
-    }
 }

service-api/src/main/java/com/java110/api/listener/mapping/UpdateMappingListener.java

@@ -1,45 +1,38 @@
-package com.java110.api.listener.mapping;
+package com.java110.dev.cmd.mapping;
 
 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.intf.community.IMappingInnerServiceSMO;
+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.mapping.MappingDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.intf.community.IMappingInnerServiceSMO;
 import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.ServiceCodeMappingConstant;
+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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
-/**
- * 保存编码映射侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("updateMappingListener")
-public class UpdateMappingListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "mapping.updateMapping")
+public class UpdateMappingCmd extends Cmd {
 
     @Autowired
     private IMappingInnerServiceSMO mappingInnerServiceSMOImpl;
 
     @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "id", "编码ID不能为空");
         Assert.hasKeyAndValue(reqJson, "domain", "必填，请填写域");
         Assert.hasKeyAndValue(reqJson, "name", "必填，请填写名称");
         Assert.hasKeyAndValue(reqJson, "key", "必填，请填写键");
         Assert.hasKeyAndValue(reqJson, "value", "必填，请填写值");
-
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
 
         MappingDto mappingDto = BeanConvertUtil.covertBean(reqJson, MappingDto.class);
 
@@ -54,28 +47,4 @@ public class UpdateMappingListener extends AbstractServiceApiListener {
 
         context.setResponseEntity(responseEntity);
     }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMappingConstant.UPDATE_MAPPING;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IMappingInnerServiceSMO getMappingInnerServiceSMOImpl() {
-        return mappingInnerServiceSMOImpl;
-    }
-
-    public void setMappingInnerServiceSMOImpl(IMappingInnerServiceSMO mappingInnerServiceSMOImpl) {
-        this.mappingInnerServiceSMOImpl = mappingInnerServiceSMOImpl;
-    }
 }

service-dev/src/main/java/com/java110/dev/cmd/menuGroup/DeleteMenuGroupCmd.java

@@ -0,0 +1,43 @@
+package com.java110.dev.cmd.menuGroup;
+
+import com.alibaba.fastjson.JSONObject;
+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.menuGroup.MenuGroupDto;
+import com.java110.intf.community.IMenuInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+@Java110Cmd(serviceCode = "menuGroup.deleteMenuGroup")
+public class DeleteMenuGroupCmd extends Cmd{
+    @Autowired
+    private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+        Assert.hasKeyAndValue(reqJson, "gId", "组Id不能为空");
+
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+        ResponseEntity<String> responseEntity = null;
+
+        MenuGroupDto menuGroupDto = BeanConvertUtil.covertBean(reqJson, MenuGroupDto.class);
+
+
+        int saveFlag = menuInnerServiceSMOImpl.deleteMenuGroup(menuGroupDto);
+
+        responseEntity = new ResponseEntity<String>(saveFlag > 0 ? "成功" : "失败", saveFlag > 0 ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
+
+        context.setResponseEntity(responseEntity);
+    }
+}

service-api/src/main/java/com/java110/api/listener/menuGroup/ListMenuGroupsListener.java

@@ -1,60 +1,37 @@
-package com.java110.api.listener.menuGroup;
+package com.java110.dev.cmd.menuGroup;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.utils.constant.ServiceCodeMenuGroupConstant;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.IMenuInnerServiceSMO;
+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.menuGroup.MenuGroupDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.intf.community.IMenuInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.menuGroup.ApiMenuGroupDataVo;
 import com.java110.vo.api.menuGroup.ApiMenuGroupVo;
 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("listMenuGroupsListener")
-public class ListMenuGroupsListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "menuGroup.listMenuGroups")
+public class ListMenuGroupsCmd extends Cmd{
 
     @Autowired
     private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
 
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMenuGroupConstant.LIST_MENUGROUPS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
 
     @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-
-    @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 {
         MenuGroupDto menuGroupDto = BeanConvertUtil.covertBean(reqJson, MenuGroupDto.class);
 
         int count = menuInnerServiceSMOImpl.queryMenuGroupsCount(menuGroupDto);
@@ -76,14 +53,5 @@ public class ListMenuGroupsListener extends AbstractServiceApiListener {
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiMenuGroupVo), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
-    }
-
-    public IMenuInnerServiceSMO getMenuInnerServiceSMOImpl() {
-        return menuInnerServiceSMOImpl;
-    }
-
-    public void setMenuInnerServiceSMOImpl(IMenuInnerServiceSMO menuInnerServiceSMOImpl) {
-        this.menuInnerServiceSMOImpl = menuInnerServiceSMOImpl;
     }
 }

service-api/src/main/java/com/java110/api/listener/menuGroup/SaveMenuGroupListener.java

@@ -1,46 +1,36 @@
-package com.java110.api.listener.menuGroup;
+package com.java110.dev.cmd.menuGroup;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.core.context.DataFlowContext;
+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.core.factory.GenerateCodeFactory;
-import com.java110.intf.community.IMenuInnerServiceSMO;
 import com.java110.dto.menuGroup.MenuGroupDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.intf.community.IMenuInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import com.java110.utils.constant.ServiceCodeMenuGroupConstant;
-
 
-import com.java110.core.annotation.Java110Listener;
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("saveMenuGroupListener")
-public class SaveMenuGroupListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "menuGroup.saveMenuGroup")
+public class SaveMenuGroupCmd extends Cmd{
 
     @Autowired
     private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
 
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "name", "必填，请填写组名称");
         Assert.hasKeyAndValue(reqJson, "icon", "必填，请填写icon");
         Assert.hasKeyAndValue(reqJson, "seq", "必填，请填写序列");
-
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         ResponseEntity<String> responseEntity = null;
 
         MenuGroupDto menuGroupDto = BeanConvertUtil.covertBean(reqJson, MenuGroupDto.class);
@@ -67,28 +57,4 @@ public class SaveMenuGroupListener extends AbstractServiceApiListener {
         //生成流水
         menuGroupDto.setgId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.MENU_GROUP));
     }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMenuGroupConstant.ADD_MENUGROUP;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IMenuInnerServiceSMO getMenuInnerServiceSMOImpl() {
-        return menuInnerServiceSMOImpl;
-    }
-
-    public void setMenuInnerServiceSMOImpl(IMenuInnerServiceSMO menuInnerServiceSMOImpl) {
-        this.menuInnerServiceSMOImpl = menuInnerServiceSMOImpl;
-    }
 }

service-dev/src/main/java/com/java110/dev/cmd/menuGroup/UpdateMenuGroupCmd.java

@@ -0,0 +1,43 @@
+package com.java110.dev.cmd.menuGroup;
+
+import com.alibaba.fastjson.JSONObject;
+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.menuGroup.MenuGroupDto;
+import com.java110.intf.community.IMenuInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+@Java110Cmd(serviceCode = "menuGroup.updateMenuGroup")
+public class UpdateMenuGroupCmd extends Cmd {
+    @Autowired
+    private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "gId", "组Id不能为空");
+        Assert.hasKeyAndValue(reqJson, "name", "必填，请填写组名称");
+        Assert.hasKeyAndValue(reqJson, "icon", "必填，请填写icon");
+        Assert.hasKeyAndValue(reqJson, "seq", "必填，请填写序列");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        ResponseEntity<String> responseEntity = null;
+
+        MenuGroupDto menuGroupDto = BeanConvertUtil.covertBean(reqJson, MenuGroupDto.class);
+
+
+        int saveFlag = menuInnerServiceSMOImpl.updateMenuGroup(menuGroupDto);
+
+        responseEntity = new ResponseEntity<String>(saveFlag > 0 ? "成功" : "失败", saveFlag > 0 ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
+
+        context.setResponseEntity(responseEntity);
+    }
+}