【pc端 -新增网格实体化详情】【查询出 社区下所属网格接口添加】魏凯 2020-12-8

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -356,8 +356,8 @@ public class SysDeptController {
      * @date 2020-12-08 11:16
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>>
      */
-    @GetMapping("getKpiGridIds")
+    @PostMapping("getKpiGridIds")
-    public Result<List<SysDeptDTO>> getKpiGridIds(KpiGridIdsFormDTO dto){
+    public Result<List<SysDeptDTO>> getKpiGridIds(@RequestBody KpiGridIdsFormDTO dto){
         List<SysDeptDTO> list= sysDeptService.getKpiGridIds(dto);
         return new Result<List<SysDeptDTO>>().ok(list);
     }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictChildResultDTO.java

@@ -0,0 +1,19 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ *详情页面子 - 组成返回类
+ * @author sarnath
+ * @version 1.0
+ * @date 2020-12-08 14:13
+ */
+@Data
+public class SubDetailDictChildResultDTO implements Serializable {
+    private static final long serialVersionUID = -1L;
+    private String id;
+    private String label;
+}

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictResultDTO.java

@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 详情页面 - 组成返回类
+ * @author sarnath
+ * @version 1.0
+ * @date 2020-12-08 14:11
+ */
+@Data
+public class SubDetailDictResultDTO implements Serializable {
+    private static final long serialVersionUID = -1L;
+    private String id;
+    private String label;
+    private List<SubDetailDictChildResultDTO> childDiction;
+}

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubCheckDictionaryController.java

@@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.SubCheckDictionaryDTO;
 import com.elink.esua.epdc.dto.result.CheckResourcesListResultDTO;
+import com.elink.esua.epdc.dto.result.SubDetailDictResultDTO;
 import com.elink.esua.epdc.excel.SubCheckDictionaryExcel;
 import com.elink.esua.epdc.service.SubCheckDictionaryService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -97,5 +98,16 @@ public class SubCheckDictionaryController {
         List<SubCheckDictionaryDTO> list = subCheckDictionaryService.list(params);
         ExcelUtils.exportExcelToTarget(response, null, list, SubCheckDictionaryExcel.class);
     }
+    /*
+     * 
+     * 组装详情页面
+     * @author wk 
+     * @date 2020-12-08 14:19
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.SubDetailDictResultDTO>
+     */
+    @GetMapping("getdetaildict")
+    public Result<List<SubDetailDictResultDTO>> getDetailDict(){
+        return subCheckDictionaryService.getDetailDict();
+    }
 
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubCheckDictionaryDao.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.result.CheckResourcesListResultDTO;
+import com.elink.esua.epdc.dto.result.SubDetailDictResultDTO;
 import com.elink.esua.epdc.entity.SubCheckDictionaryEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -35,4 +36,13 @@ public interface SubCheckDictionaryDao extends BaseDao<SubCheckDictionaryEntity>
 
     List<CheckResourcesListResultDTO> getResourceList();
 
+    /*
+     * 
+     * 组装详情页面 
+     * @author wk 
+     * @date 2020-12-08 14:21
+     * @return com.elink.esua.epdc.dto.result.SubDetailDictResultDTO
+     */
+    List<SubDetailDictResultDTO> getDetailDict();
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -116,6 +116,6 @@ public interface AdminFeignClient {
      * @date 2020-12-08 13:57
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>>
      */
-    @GetMapping("/sys/dept/getKpiGridIds")
+    @PostMapping("/sys/dept/getKpiGridIds")
     Result<List<SysDeptDTO>> getKpiGridIds(KpiGridIdsFormDTO dto);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubCheckDictionaryService.java

@@ -19,7 +19,9 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.SubCheckDictionaryDTO;
+import com.elink.esua.epdc.dto.result.SubDetailDictResultDTO;
 import com.elink.esua.epdc.entity.SubCheckDictionaryEntity;
 
 import java.util.List;
@@ -101,4 +103,13 @@ public interface SubCheckDictionaryService extends BaseService<SubCheckDictionar
      * @date 2020-12-07
      */
     void delete(String[] ids);
+
+    /*
+     *
+     * 组装详情页面
+     * @author wk
+     * @date 2020-12-08 14:18
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.SubDetailDictResultDTO>
+     */
+    Result<List<SubDetailDictResultDTO>> getDetailDict();
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubCheckDictionaryServiceImpl.java

@@ -24,11 +24,13 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.commons.tools.utils.TreeUtilsNew;
 import com.elink.esua.epdc.dao.SubCheckDictionaryDao;
 import com.elink.esua.epdc.dto.SubCheckDictionaryDTO;
 import com.elink.esua.epdc.dto.result.CheckResourcesListResultDTO;
+import com.elink.esua.epdc.dto.result.SubDetailDictResultDTO;
 import com.elink.esua.epdc.entity.SubCheckDictionaryEntity;
 import com.elink.esua.epdc.redis.SubCheckDictionaryRedis;
 import com.elink.esua.epdc.service.SubCheckDictionaryService;
@@ -138,4 +140,17 @@ public class SubCheckDictionaryServiceImpl extends BaseServiceImpl<SubCheckDicti
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /*
+     *
+     * 组装详情页面
+     * @author wk
+     * @date 2020-12-08 14:20
+     * @return com.elink.esua.epdc.dto.result.SubDetailDictResultDTO
+     */
+    @Override
+    public Result<List<SubDetailDictResultDTO>> getDetailDict() {
+        List<SubDetailDictResultDTO> resultdto = baseDao.getDetailDict();
+        return new Result<List<SubDetailDictResultDTO>>().ok(resultdto);
+    }
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java

@@ -55,6 +55,7 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
     @Autowired
     private SubPositionCheckDetailRedis subPositionCheckDetailRedis;
 
+    @Autowired
     private AdminFeignClient  adminFeignClient;
 
     @Override

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubCheckDictionaryDao.xml

@@ -34,6 +34,16 @@
         <result property="checkDescribe" column="CHECK_DESCRIBE"/>
     </resultMap>
 
+
+    <resultMap id="detailMap" type="com.elink.esua.epdc.dto.result.SubDetailDictResultDTO">
+        <result property="id" column="ID"/>
+        <result property="label" column="CHECK_LABEL"/>
+        <collection property="childDiction" ofType="com.elink.esua.epdc.dto.result.SubDetailDictChildResultDTO">
+            <result property="id" column="cid"/>
+            <result property="label" column="cname"/>
+        </collection>
+    </resultMap>
+
     <select id="getResourceList" resultMap="checkDictionaryMap">
         SELECT
 	        erd.*,
@@ -54,5 +64,24 @@
         order by erd.SORT
     </select>
 
+    <select id="getDetailDict" resultMap="detailMap">
+        SELECT
+        a.ID,
+        a.CHECK_LABEL,
+        b.ID as cid,
+        b.CHECK_LABEL as cname
+    FROM
+        epdc_sub_check_dictionary a
+        LEFT JOIN epdc_sub_check_dictionary b ON a.ID = b.PID
+        AND b.DEL_FLAG = 0
+        AND b.SHOW_FLAG = 1
+    WHERE
+        a.DEL_FLAG = 0
+        AND a.PID = 0
+        AND a.SHOW_FLAG = 1
+        ORDER BY
+        a.SORT
+    </select>
+
 
 </mapper>