外挂接口-查询组织部门网格树、查询组织或网格对应组织信息

epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpController.java

@@ -112,5 +112,15 @@ public class OpenUpController {
         return new Result<AgencyInfoResultDTO>().ok(openUpService.agencyInfo(formDTO));
     }
 
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    @PostMapping("organizetree")
+    Result<OrganizeTreeResultDTO> organizeTree(@RequestBody OrganizeTreeFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, OrganizeTreeFormDTO.StaffIdGroup.class);
+        return new Result<OrganizeTreeResultDTO>().ok(openUpService.organizeTree(formDTO));
+    }
+
 }
 

epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/service/OpenUpService.java

@@ -1,13 +1,7 @@
 package com.epmet.service;
 
-import com.epmet.dto.form.AgencyInfoFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.StaffSinAgencyFormDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.form.StaffSinDeptFormDTO;
-import com.epmet.dto.form.StaffSinGridFormDTO;
-import com.epmet.dto.result.AgencyInfoResultDTO;
-import com.epmet.dto.result.StaffSinAgencyResultDTO;
-import com.epmet.dto.result.StaffSinDeptResultDTO;
-import com.epmet.dto.result.StaffSinGridResultDTO;
 
 import java.util.List;
 
@@ -46,4 +40,10 @@ public interface OpenUpService {
      * @author sun
      **/
     AgencyInfoResultDTO agencyInfo(AgencyInfoFormDTO formDTO);
+
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    OrganizeTreeResultDTO organizeTree(OrganizeTreeFormDTO formDTO);
 }

epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/service/impl/OpenUpServiceImpl.java

@@ -6,10 +6,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ModuleConstant;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.AgencyInfoResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.StaffSinAgencyResultDTO;
-import com.epmet.dto.result.StaffSinDeptResultDTO;
-import com.epmet.dto.result.StaffSinGridResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.OpenUpService;
@@ -137,4 +134,17 @@ public class OpenUpServiceImpl implements OpenUpService {
         return result.getData();
     }
 
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    @Override
+    public OrganizeTreeResultDTO organizeTree(OrganizeTreeFormDTO formDTO) {
+        Result<OrganizeTreeResultDTO> result = govOrgOpenFeignClient.organizeTree(formDTO.getAgencyId());
+        if (!result.success()){
+            throw new RenException(ModuleConstant.ERROR_AGENCY);
+        }
+        return result.getData();
+    }
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyInfoFormDTO.java

@@ -7,15 +7,26 @@ import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
- * @Author zxc
+ * 对外接口-根据组织Id获取组织信息-接口入参
- * @DateTime 2020/8/17 10:37 上午
+ * @Author sun
  */
 @Data
 public class AgencyInfoFormDTO implements Serializable {
 
     private static final long serialVersionUID = -1719033407335647411L;
-    @NotBlank(message = "组织Id不能为空" , groups = StaffIdGroup.class)
-    private String agencyId;
 
-    public interface StaffIdGroup extends CustomerClientShowGroup {}
+    /**
+     * 组织或网格Id
+     */
+    @NotBlank(message = "组织或网格Id不能为空", groups = StaffIdGroup.class)
+    private String orgId;
+    /**
+     * 组织或网格类型（agency/grid）
+     */
+    @NotBlank(message = "组织或网格类型不能为空", groups = StaffIdGroup.class)
+    private String orgType;
+    public interface StaffIdGroup extends CustomerClientShowGroup {
+    }
+
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizeTreeDeptResultDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 外挂-部门信息
+ * @Auth sun
+ */
+@Data
+public class OrganizeTreeDeptResultDTO implements Serializable {
+    private static final long serialVersionUID = 1792371558965832432L;
+
+    /**
+     * 部门Id
+     * */
+    private String deptId;
+    /**
+     * 部门名称
+     * */
+    private String deptName;
+    /**
+     * 所有上级组织机构ID(以英文:隔开)
+     */
+    private String pids;
+    /**
+     * 所有上级名称,以-连接
+     */
+    private String allParentName;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizeTreeGridResultDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 外挂-网格信息
+ * @Auth sun
+ */
+@Data
+public class OrganizeTreeGridResultDTO implements Serializable {
+    private static final long serialVersionUID = -4531574240525562587L;
+
+    /**
+     * 网格Id
+     * */
+        private String gridId;
+    /**
+     * 网格名称
+     * */
+    private String gridName;
+    /**
+     * 所有上级组织机构ID(以英文:隔开)
+     */
+    private String pids;
+    /**
+     * 所有上级名称,以-连接
+     */
+    private String allParentName;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizeTreeResultDTO.java

@@ -0,0 +1,50 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据-接口返参
+ * @Auth sun
+ */
+@Data
+public class OrganizeTreeResultDTO implements Serializable {
+    private static final long serialVersionUID = 2513553862809278219L;
+
+    /**
+     * 直属机关Id
+     * */
+    private String agencyId;
+    /**
+     * 直属机关名称
+     * */
+    private String agencyName;
+    /**
+     * 机关级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province）
+     * */
+    private String level;
+    /**
+     * 所有上级组织机构ID(以英文:隔开)
+     */
+    private String pids;
+    /**
+     * 所有上级名称,以-连接
+     */
+    private String allParentName;
+
+    /**
+     * 直属机关直属网格列表
+     * */
+    private List<OrganizeTreeGridResultDTO> gridList = new ArrayList<>();
+    /**
+     * 直属机关直属部门列表
+     * */
+    private List<OrganizeTreeDeptResultDTO> departmentList = new ArrayList<>();
+    /**
+     * 子集机关列表
+     * */
+    private List<OrganizeTreeResultDTO> subAgencyList = new ArrayList<>();
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -262,10 +262,17 @@ public interface GovOrgOpenFeignClient {
 
     /**
      * @param formDTO
-     * @return
      * @Author sun
      * @Description 根据组织Id获取组织信息
      */
     @PostMapping("/gov/org/customeragency/agencyinfo")
     Result<AgencyInfoResultDTO> agencyInfo(@RequestBody AgencyInfoFormDTO formDTO);
+
+    /**
+     * @param agencyId
+     * @Author sun
+     * @Description 获取当前组织及部门、网格数据，递归查询所有下级数据
+     */
+    @PostMapping("/gov/org/customeragency/organizetree/{agencyId}")
+    Result<OrganizeTreeResultDTO> organizeTree(@PathVariable("agencyId") String agencyId);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -156,4 +156,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<AgencyInfoResultDTO> agencyInfo(AgencyInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "agencyInfo", formDTO);
     }
+
+    @Override
+    public Result<OrganizeTreeResultDTO> organizeTree(String agencyId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "organizeTree", agencyId);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -251,4 +251,13 @@ public class CustomerAgencyController {
     Result<AgencyInfoResultDTO> agencyInfo(@RequestBody AgencyInfoFormDTO formDTO) {
         return new Result<AgencyInfoResultDTO>().ok(customerAgencyService.agencyInfo(formDTO));
     }
+
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    @PostMapping("organizetree/{agencyId}")
+    Result<OrganizeTreeResultDTO> organizeTree(@PathVariable("agencyId") String agencyId) {
+        return new Result<OrganizeTreeResultDTO>().ok(customerAgencyService.organizeTree(agencyId));
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -175,4 +175,25 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @Description 查询工作人员所属组织信息
      **/
     AgencyResultDTO selectAgencyByStaffId(@Param("staffId") String staffId);
+
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    OrganizeTreeResultDTO selectorganizeTree(@Param("agencyId") String agencyId);
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    List<OrganizeTreeGridResultDTO> selectAgencyGridList(@Param("agencyId") String agencyId);
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    List<OrganizeTreeDeptResultDTO> selectAgencyDeptList(@Param("agencyId") String agencyId);
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    List<OrganizeTreeResultDTO> selectAllSub(@Param("agencyId") String agencyId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@@ -219,4 +219,10 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @author sun
      **/
     AgencyInfoResultDTO agencyInfo(AgencyInfoFormDTO formDTO);
+
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    OrganizeTreeResultDTO organizeTree(String agencyId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -1001,7 +1001,18 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
     @Override
     public AgencyInfoResultDTO agencyInfo(AgencyInfoFormDTO formDTO) {
         AgencyInfoResultDTO resultDTO = new AgencyInfoResultDTO();
-        CustomerAgencyEntity entity = baseDao.selectById(formDTO.getAgencyId());
+        String agencyId = formDTO.getOrgId();
+        //1.判断是否为网格类型，是网格则查询网格基本信息
+        if("grid".equals(formDTO.getOrgType())){
+            CustomerGridEntity gridEntity = customerGridDao.selectById(formDTO.getOrgId());
+            if(null == gridEntity){
+                logger.error(String.format("根据网格Id未查询到网格数据，网格Id：%s", formDTO.getOrgId()));
+                throw new RenException("获取网格数据失败");
+            }
+            agencyId = gridEntity.getPid();
+        }
+        //2.查询组织基本信息
+        CustomerAgencyEntity entity = baseDao.selectById(agencyId);
         if(entity!=null){
             resultDTO = ConvertUtils.sourceToTarget(entity, AgencyInfoResultDTO.class);
             resultDTO.setAgencyId(entity.getId());
@@ -1010,4 +1021,13 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return resultDTO;
     }
 
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    @Override
+    public OrganizeTreeResultDTO organizeTree(String agencyId) {
+        return baseDao.selectorganizeTree(agencyId);
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -292,4 +292,85 @@
         AND csa.user_id = #{staffId}
     </select>
 
+    <!-- sql递归 查询组织、组织下部门、组织下网格基本信息及递归查询下级信息 start-->
+    <resultMap id="organizeTree" type="com.epmet.dto.result.OrganizeTreeResultDTO">
+        <id column="agencyId" property="agencyId"/>
+        <result column="agencyName" property="agencyName"/>
+        <result column="level" property="level"/>
+        <result column="pids" property="pids"/>
+        <result column="allParentName" property="allParentName"/>
+
+        <collection property="gridList" column="agencyId" ofType="com.epmet.dto.result.OrganizeTreeGridResultDTO" select="selectAgencyGridList">
+            <id column="gridId" property="gridId"/>
+            <result column="gridName" property="gridName"/>
+            <result column="pids" property="pids"/>
+            <result column="allParentName" property="allParentName"/>
+        </collection>
+
+        <collection property="departmentList" column="agencyId" ofType="com.epmet.dto.result.OrganizeTreeDeptResultDTO" select="selectAgencyDeptList">
+            <id column="deptId" property="deptId"/>
+            <result column="deptName" property="deptName"/>
+            <result column="pids" property="pids"/>
+            <result column="allParentName" property="allParentName"/>
+        </collection>
+
+        <collection property="subAgencyList" column="agencyId" ofType="com.epmet.dto.result.ExtStaffPermissionResultDTO" select="selectAllSub">
+        </collection>
+    </resultMap>
+    <select id="selectorganizeTree" resultMap="organizeTree">
+        SELECT
+            ca.id AS agencyId,
+            ca.organization_name AS agencyName,
+            ca.level AS level,
+            ca.pids AS pids,
+            ca.all_parent_name AS allParentName
+        FROM
+            customer_agency ca
+        WHERE
+            ca.del_flag = '0'
+            AND ca.id = #{agencyId}
+    </select>
+    <select id="selectAgencyGridList" resultType="com.epmet.dto.result.OrganizeTreeGridResultDTO">
+        SELECT
+            cg.id AS gridId,
+            cg.grid_name AS gridName,
+            CONCAT(ca.pids,if(ca.pids="","",":"),ca.id) AS pids,
+            CONCAT(ca.all_parent_name,if(ca.all_parent_name="","","-"),ca.organization_name) AS allParentName
+        FROM
+            customer_grid cg
+        LEFT JOIN customer_agency ca ON cg.pid = ca.id
+        WHERE
+            cg.del_flag = '0'
+         AND ca.del_flag = '0'
+        AND cg.pid = #{agencyId}
+    </select>
+    <select id="selectAgencyDeptList" resultType="com.epmet.dto.result.OrganizeTreeDeptResultDTO">
+        SELECT
+            cd.id AS deptId,
+            cd.department_name AS deptName,
+            CONCAT(ca.pids,if(ca.pids="","",":"),ca.id) AS pids,
+            CONCAT(ca.all_parent_name,if(ca.all_parent_name="","","-"),ca.organization_name) AS allParentName
+        FROM
+            customer_department cd
+        LEFT JOIN customer_agency ca ON cd.agency_id = ca.id
+        WHERE
+            cd.del_flag = '0'
+         AND ca.del_flag = '0'
+        AND cd.agency_id = #{agencyId}
+    </select>
+    <select id="selectAllSub" resultMap="organizeTree">
+        SELECT
+            ca.id AS agencyId,
+            ca.organization_name AS agencyName,
+            ca.level AS level,
+            ca.pids AS pids,
+            ca.all_parent_name AS allParentName
+        FROM
+            customer_agency ca
+        WHERE
+            ca.del_flag = '0'
+            AND ca.pid = #{agencyId}
+    </select>
+    <!-- sql递归 查询组织、组织下部门、组织下网格基本信息及递归查询下级信息 end-->
+
 </mapper>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/OrganizeTreeFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据-接口入参
+ * @Auth sun
+ */
+@Data
+public class OrganizeTreeFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -5093758817860808310L;
+    @NotBlank(message = "组织Id不能为空" , groups = StaffIdGroup.class)
+    private String agencyId;
+
+    public interface StaffIdGroup extends CustomerClientShowGroup{}
+}