优化菜单未cmd 方式

service-api/src/main/java/com/java110/api/listener/menu/DeleteMenuListener.java

@@ -1,77 +0,0 @@
-package com.java110.api.listener.menu;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.utils.constant.ResponseConstant;
-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.IMenuInnerServiceSMO;
-import com.java110.dto.menu.MenuDto;
-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.ServiceCodeMenuConstant;
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("deleteMenuListener")
-public class DeleteMenuListener extends AbstractServiceApiListener {
-
-    @Autowired
-    private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "mId", "菜单ID不能为空");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        MenuDto menuDto = BeanConvertUtil.covertBean(reqJson, MenuDto.class);
-
-
-        int count = menuInnerServiceSMOImpl.deleteMenu(menuDto);
-
-        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 ServiceCodeMenuConstant.DELETE_MENU;
-    }
-
-    @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/menu/SaveMenuListener.java

@@ -1,53 +0,0 @@
-package com.java110.api.listener.menu;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.utils.util.Assert;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import org.springframework.http.HttpMethod;
-import com.java110.utils.constant.ServiceCodeMenuConstant;
-
-
-import com.java110.core.annotation.Java110Listener;
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("saveMenuListener")
-public class SaveMenuListener extends AbstractServiceApiListener {
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "name", "必填，请填写菜单名称");
-        Assert.hasKeyAndValue(reqJson, "url", "必填，请菜单菜单地址");
-        Assert.hasKeyAndValue(reqJson, "seq", "必填，请填写序列");
-        Assert.hasKeyAndValue(reqJson, "isShow", "必填，请选择是否显示菜单");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMenuConstant.ADD_MENU;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-}

service-api/src/main/java/com/java110/api/listener/menu/UpdateMenuListener.java

@@ -1,81 +0,0 @@
-package com.java110.api.listener.menu;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.ServiceCodeMenuConstant;
-import com.java110.utils.exception.ListenerExecuteException;
-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.menu.MenuDto;
-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;
-
-/**
- * 编辑菜单侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("updateMenuListener")
-public class UpdateMenuListener extends AbstractServiceApiListener {
-
-    @Autowired
-    private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "mId", "菜单ID不能为空");
-        Assert.hasKeyAndValue(reqJson, "name", "必填，请填写菜单名称");
-        Assert.hasKeyAndValue(reqJson, "url", "必填，请菜单菜单地址");
-        Assert.hasKeyAndValue(reqJson, "seq", "必填，请填写序列");
-        Assert.hasKeyAndValue(reqJson, "isShow", "必填，请选择是否显示菜单");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        MenuDto menuDto = BeanConvertUtil.covertBean(reqJson, MenuDto.class);
-
-
-        int count = menuInnerServiceSMOImpl.updateMenu(menuDto);
-
-        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 ServiceCodeMenuConstant.UPDATE_MENU;
-    }
-
-    @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/menu/DeleteMenuCmd.java

@@ -0,0 +1,44 @@
+package com.java110.dev.cmd.menu;
+
+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.menu.MenuDto;
+import com.java110.intf.community.IMenuInnerServiceSMO;
+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 = "menu.deleteMenu")
+public class DeleteMenuCmd extends Cmd {
+
+    @Autowired
+    private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "mId", "菜单ID不能为空");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        MenuDto menuDto = BeanConvertUtil.covertBean(reqJson, MenuDto.class);
+
+
+        int count = menuInnerServiceSMOImpl.deleteMenu(menuDto);
+
+        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/menu/ListMenusListener.java

@@ -1,66 +1,37 @@
-package com.java110.api.listener.menu;
+package com.java110.dev.cmd.menu;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.utils.constant.ServiceCodeMenuConstant;
-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.menu.MenuDto;
-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.menu.ApiMenuDataVo;
 import com.java110.vo.api.menu.ApiMenuVo;
 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("listMenusListener")
-public class ListMenusListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "menu.listMenus")
+public class ListMenusCmd extends Cmd {
 
     @Autowired
     private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
 
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMenuConstant.LIST_MENUS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
 
     @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IMenuInnerServiceSMO getMenuInnerServiceSMOImpl() {
-        return menuInnerServiceSMOImpl;
-    }
-
-    public void setMenuInnerServiceSMOImpl(IMenuInnerServiceSMO menuInnerServiceSMOImpl) {
-        this.menuInnerServiceSMOImpl = menuInnerServiceSMOImpl;
-    }
-
-    @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 {
         MenuDto menuDto = BeanConvertUtil.covertBean(reqJson, MenuDto.class);
 
         int count = menuInnerServiceSMOImpl.queryMenusCount(menuDto);
@@ -82,7 +53,5 @@ public class ListMenusListener extends AbstractServiceApiListener {
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiMenuVo), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
-
     }
 }

service-dev/src/main/java/com/java110/dev/cmd/menu/UpdateMenuCmd.java

@@ -0,0 +1,49 @@
+package com.java110.dev.cmd.menu;
+
+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.menu.MenuDto;
+import com.java110.intf.community.IMenuInnerServiceSMO;
+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.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+@Java110Cmd(serviceCode = "menu.updateMenu")
+public class UpdateMenuCmd extends Cmd {
+
+    @Autowired
+    private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "mId", "菜单ID不能为空");
+        Assert.hasKeyAndValue(reqJson, "name", "必填，请填写菜单名称");
+        Assert.hasKeyAndValue(reqJson, "url", "必填，请菜单菜单地址");
+        Assert.hasKeyAndValue(reqJson, "seq", "必填，请填写序列");
+        Assert.hasKeyAndValue(reqJson, "isShow", "必填，请选择是否显示菜单");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        MenuDto menuDto = BeanConvertUtil.covertBean(reqJson, MenuDto.class);
+
+
+        int count = menuInnerServiceSMOImpl.updateMenu(menuDto);
+
+        if (count < 1) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "修改数据失败");
+        }
+
+
+        context.setResponseEntity(ResultVo.success());
+    }
+}