大屏-网格治理-地图数据新增议题

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java

@@ -309,6 +309,20 @@ public class EpdcScreenController {
         return epdcScreenService.itemList(formDto);
     }
 
+    /**
+     * 网格治理-议题列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenIssueListResultDTO>>
+     * @author lc
+     * @since 2021/8/23 19:02
+     */
+    @GetMapping("gridGovernance/mapIssueList")
+    public Result<List<EpdcScreenIssueListResultDTO>> issueList(@RequestBody EpdcScreenItemListFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.issueList(formDto);
+    }
+
     /**
      * 多元服务-党员服务列表
      * @params [formDto]

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java

@@ -247,6 +247,16 @@ public interface EpdcScreenDao extends BaseDao<EpdcScreenGridGovernanceItemResul
      */
     List<EpdcScreenItemListResultDTO> itemList(EpdcScreenItemListFormDTO formDto);
 
+    /**
+     * 网格治理-议题列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenIssueListResultDTO>>
+     * @author lc
+     * @since 2021/8/23 19:02
+     */
+    List<EpdcScreenIssueListResultDTO> issueList(EpdcScreenItemListFormDTO formDto);
+
     /**
      * 多元服务-党员服务列表
      * @params [formDto]

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java

@@ -220,6 +220,16 @@ public interface EpdcScreenService {
      */
     Result<List<EpdcScreenItemListResultDTO>> itemList(EpdcScreenItemListFormDTO formDto);
 
+    /**
+     * 网格治理-议题列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemListResultDTO>>
+     * @author lc
+     * @since 2021/8/23 19:02
+     */
+    Result<List<EpdcScreenIssueListResultDTO>> issueList(EpdcScreenItemListFormDTO formDto);
+
     /**
      * 多元服务-党员服务列表
      * @params [formDto]

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java

@@ -184,6 +184,12 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl<EpdcScreenDao, EpdcSc
         return new Result<List<EpdcScreenItemListResultDTO>>().ok(data);
     }
 
+    @Override
+    public Result<List<EpdcScreenIssueListResultDTO>> issueList(EpdcScreenItemListFormDTO formDto) {
+        List<EpdcScreenIssueListResultDTO> data = baseDao.issueList(formDto);
+        return new Result<List<EpdcScreenIssueListResultDTO>>().ok(data);
+    }
+
     @Override
     public Result<List<EpdcScreenPartyMemberServicesResultDTO>> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto) {
         List<EpdcScreenPartyMemberServicesResultDTO> data = baseDao.partyMemberServices(formDto);

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

@@ -520,21 +520,38 @@
     </select>
 
     <select id="itemList" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenItemListResultDTO">
-        SELECT
-            ID,
-            ITEM_CONTENT,
-            ISSUE_LATITUDE,
-            ISSUE_LONGITUDE,
-            ITEM_STATE
-        FROM
-            esua_epdc_events.epdc_item
-        WHERE
-            DEL_FLAG = '0'
-        ORDER BY
-            CREATED_TIME DESC
+        SELECT i.ID,
+               i.ITEM_CONTENT,
+               i.ISSUE_LATITUDE,
+               i.ISSUE_LONGITUDE,
+               i.ITEM_STATE,
+               CASE WHEN(i.`ITEM_STATE`= 10
+                   or i.`ITEM_STATE`= 5)  THEN '4' WHEN(TIMESTAMPDIFF(HOUR, i.`LAST_HANDLE_TIME`, now())> 72
+                   AND i.`ITEM_STATE`= 0)  THEN '3' ELSE '2' END AS colorType,
+               '2' AS typeCode
+        FROM esua_epdc_events.epdc_item i
+        WHERE i.DEL_FLAG= '0'
+        ORDER BY i.CREATED_TIME DESC
         LIMIT #{pageIndex}, #{pageSize}
     </select>
 
+    <select id="issueList" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenIssueListResultDTO">
+        SELECT i.ID,
+               i.`ISSUE_CONTENT`,
+               i.ISSUE_LATITUDE,
+               i.ISSUE_LONGITUDE,
+               i.ISSUE_STATE,
+               CASE WHEN TIMESTAMPDIFF(HOUR, MAX(h.`CREATED_TIME`), now())> 72 THEN '2' ELSE '1' END AS colorType,
+               '1' AS typeCode
+        FROM esua_epdc_events.epdc_issue i
+                 LEFT JOIN `esua_epdc_events`.`epdc_issue_handle` h on h.`ISSUE_ID` = i.`ID` AND h.`DEL_FLAG` = '0'
+        WHERE i.DEL_FLAG= '0'
+          AND i.`ISSUE_STATE` = 0
+        GROUP BY i.`ID`
+        ORDER BY i.CREATED_TIME DESC
+            LIMIT #{pageIndex}, #{pageSize}
+    </select>
+
     <select id="partyMemberServices" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPartyMemberServicesResultDTO">
         SELECT
             ug.NICKNAME,