优化查询组织小区为 cmd 模式

service-api/src/main/java/com/java110/api/listener/org/ListOrgsListener.java

@@ -1,120 +0,0 @@
-package com.java110.api.listener.org;
-
-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.dto.basePrivilege.BasePrivilegeDto;
-import com.java110.dto.org.OrgStaffRelDto;
-import com.java110.dto.purchaseApply.PurchaseApplyDto;
-import com.java110.intf.community.IMenuInnerServiceSMO;
-import com.java110.intf.user.IOrgInnerServiceSMO;
-import com.java110.dto.org.OrgDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
-import com.java110.utils.constant.ServiceCodeOrgConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.api.org.ApiOrgDataVo;
-import com.java110.vo.api.org.ApiOrgVo;
-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;
-import java.util.Map;
-
-
-/**
- * 查询小区侦听类
- */
-@Java110Listener("listOrgsListener")
-public class ListOrgsListener extends AbstractServiceApiListener {
-
-    @Autowired
-    private IOrgInnerServiceSMO orgInnerServiceSMOImpl;
-
-    @Autowired
-    private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
-
-    @Autowired
-    private IOrgStaffRelInnerServiceSMO iOrgStaffRelInnerServiceSMO;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeOrgConstant.LIST_ORGS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IOrgInnerServiceSMO getOrgInnerServiceSMOImpl() {
-        return orgInnerServiceSMOImpl;
-    }
-
-    public void setOrgInnerServiceSMOImpl(IOrgInnerServiceSMO orgInnerServiceSMOImpl) {
-        this.orgInnerServiceSMOImpl = orgInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
-        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        OrgDto orgDto = BeanConvertUtil.covertBean(reqJson, OrgDto.class);
-        //2级别组织信息
-        if (reqJson.containsKey("orgLevel") && reqJson.getString("orgLevel").equals("2")) {
-            //默认只查看当前归属组织架构
-            BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
-            basePrivilegeDto.setResource("/viewAllOrganization");
-            basePrivilegeDto.setUserId(reqJson.getString("userId"));
-            List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
-            if (privileges.size() == 0) {
-                //查询员工所属二级组织架构
-                OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
-                orgStaffRelDto.setStaffId(reqJson.getString("userId"));
-                List<OrgStaffRelDto> orgStaffRelDtos = iOrgStaffRelInnerServiceSMO.queryOrgInfoByStaffIds(orgStaffRelDto);
-                if (orgStaffRelDtos.size() > 0) {
-                    orgDto.setOrgId(orgStaffRelDtos.get(0).getCompanyId());//当前人虽归属的二级组织信息
-                }
-
-            }
-        }
-
-        int count = orgInnerServiceSMOImpl.queryOrgsCount(orgDto);
-
-        List<ApiOrgDataVo> orgs = null;
-
-        if (count > 0) {
-            orgs = BeanConvertUtil.covertBeanList(orgInnerServiceSMOImpl.queryOrgs(orgDto), ApiOrgDataVo.class);
-        } else {
-            orgs = new ArrayList<>();
-        }
-
-        ApiOrgVo apiOrgVo = new ApiOrgVo();
-
-        apiOrgVo.setTotal(count);
-        apiOrgVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
-        apiOrgVo.setOrgs(orgs);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiOrgVo), HttpStatus.OK);
-
-        context.setResponseEntity(responseEntity);
-
-    }
-}

service-api/src/main/java/com/java110/api/listener/org/ListParentOrgsListener.java

@@ -1,83 +0,0 @@
-package com.java110.api.listener.org;
-
-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.user.IOrgInnerServiceSMO;
-import com.java110.dto.org.OrgDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeOrgConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.api.org.ApiOrgDataVo;
-import com.java110.vo.api.org.ApiOrgVo;
-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.List;
-
-
-/**
- * 查询上级组织侦听类
- */
-@Java110Listener("listParentOrgsListener")
-public class ListParentOrgsListener extends AbstractServiceApiListener {
-
-    @Autowired
-    private IOrgInnerServiceSMO orgInnerServiceSMOImpl;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeOrgConstant.LIST_PARENT_ORGS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IOrgInnerServiceSMO getOrgInnerServiceSMOImpl() {
-        return orgInnerServiceSMOImpl;
-    }
-
-    public void setOrgInnerServiceSMOImpl(IOrgInnerServiceSMO orgInnerServiceSMOImpl) {
-        this.orgInnerServiceSMOImpl = orgInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //super.validatePageInfo(reqJson);
-        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        OrgDto orgDto = BeanConvertUtil.covertBean(reqJson, OrgDto.class);
-
-
-
-        List<ApiOrgDataVo> parentOrgs = BeanConvertUtil.covertBeanList(orgInnerServiceSMOImpl.queryParentOrgs(orgDto), ApiOrgDataVo.class);
-
-
-        ApiOrgVo apiOrgVo = new ApiOrgVo();
-
-        apiOrgVo.setOrgs(parentOrgs);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiOrgVo), HttpStatus.OK);
-
-        context.setResponseEntity(responseEntity);
-
-    }
-}

service-api/src/main/java/com/java110/api/listener/org/ListOrgCommunitysListener.java

@@ -1,63 +1,41 @@
-package com.java110.api.listener.org;
+package com.java110.user.cmd.org;
 
 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.user.IOrgCommunityInnerServiceSMO;
+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.org.OrgCommunityDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeOrgConstant;
+import com.java110.intf.user.IOrgCommunityInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.org.ApiOrgCommunityDataVo;
 import com.java110.vo.api.org.ApiOrgCommunityVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
 
-/**
- * 查询小区侦听类
- */
-@Java110Listener("listOrgCommunitysListener")
-public class ListOrgCommunitysListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "org.listOrgCommunitys")
+public class ListOrgCommunitysCmd extends Cmd {
 
     @Autowired
     private IOrgCommunityInnerServiceSMO orgCommunityInnerServiceSMOImpl;
 
     @Override
-    public String getServiceCode() {
-        return ServiceCodeOrgConstant.LIST_ORG_COMMUNITYS;
-    }
-
-    @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);
         Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
         Assert.hasKeyAndValue(reqJson, "orgId", "必填，请填写组织ID");
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
         OrgCommunityDto orgCommunityDto = BeanConvertUtil.covertBean(reqJson, OrgCommunityDto.class);
 
         int count = orgCommunityInnerServiceSMOImpl.queryOrgCommunitysCount(orgCommunityDto);
@@ -79,15 +57,5 @@ public class ListOrgCommunitysListener extends AbstractServiceApiListener {
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiOrgVo), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
-    }
-
-
-    public IOrgCommunityInnerServiceSMO getOrgCommunityInnerServiceSMOImpl() {
-        return orgCommunityInnerServiceSMOImpl;
-    }
-
-    public void setOrgCommunityInnerServiceSMOImpl(IOrgCommunityInnerServiceSMO orgCommunityInnerServiceSMOImpl) {
-        this.orgCommunityInnerServiceSMOImpl = orgCommunityInnerServiceSMOImpl;
     }
 }

service-user/src/main/java/com/java110/user/cmd/org/ListParentOrgsCmd.java

@@ -0,0 +1,51 @@
+package com.java110.user.cmd.org;
+
+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.org.OrgDto;
+import com.java110.intf.user.IOrgInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.api.org.ApiOrgDataVo;
+import com.java110.vo.api.org.ApiOrgVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.text.ParseException;
+import java.util.List;
+
+@Java110Cmd(serviceCode = "org.listParentOrgs")
+public class ListParentOrgsCmd extends Cmd {
+
+    @Autowired
+    private IOrgInnerServiceSMO orgInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        //super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        OrgDto orgDto = BeanConvertUtil.covertBean(reqJson, OrgDto.class);
+
+
+
+        List<ApiOrgDataVo> parentOrgs = BeanConvertUtil.covertBeanList(orgInnerServiceSMOImpl.queryParentOrgs(orgDto), ApiOrgDataVo.class);
+
+
+        ApiOrgVo apiOrgVo = new ApiOrgVo();
+
+        apiOrgVo.setOrgs(parentOrgs);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiOrgVo), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+    }
+}