排查一级页面辖区街道数据和默认数据展示

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java

@@ -1,14 +1,13 @@
 package com.hisense.hiatmp.server_api.controller;
 
+import com.hisense.hiatmp.model.dmr.LineInfo;
 import com.hisense.hiatmp.server_api.model.ModuleCustomConfig;
+import com.hisense.hiatmp.server_api.model.StreetCommunity;
 import com.hisense.hiatmp.server_api.service.IConfigService;
 import com.hisense.hiatmp.common.controller.HiatmpController;
 import com.hisense.hiatmp.model.common.ServerResponse;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -24,28 +23,32 @@ public class ConfigController extends HiatmpController {
     }
 
     /*
-        基础信息预留展示接口
+     * 获取辖区街道数据
      */
-    @GetMapping("/showDangerBaseData")
+    @GetMapping("/getStreetCommunityById")
-    public ServerResponse<?> showBaseData(){
+    public ServerResponse<?> getStreetCommunityById(@RequestParam String xqcode,
-
+                                                    @RequestParam String jdcode
-
+    ){
-
+        StreetCommunity streetCommunity = configService.getStreetCommunityById(xqcode,jdcode);
-
+        return ServerResponse.ok(streetCommunity);
-        return ServerResponse.ok();
     }
 
-
     /*
-       统计数据预留展示接口
+     * 获取辖区街道数据
      */
-    @GetMapping("/showDangerStatisticsData")
+    @GetMapping("/getStreetCommunity")
-    public ServerResponse<?> showStatisticsData(){
+    public ServerResponse<?> getStreetCommunity(){
-
+        List<StreetCommunity> streetCommunity = configService.getStreetCommunity();
-
+        return ServerResponse.ok(streetCommunity);
-
-
-        return ServerResponse.ok();
     }
 
+    /*
+        基础信息预留展示接口
+     */
+    @GetMapping("/getDangerBaseData")
+    public ServerResponse<?> getBaseData(@RequestParam String sectionCode){
+        // 查询默认数据
+        LineInfo dangerBaseData = configService.getDangerBaseData(sectionCode);
+        return ServerResponse.ok(dangerBaseData);
+    }
 }

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java

@@ -573,11 +573,11 @@ public class HighDangerController {
 
     // 重点排查二级页面信息
     @GetMapping("/getImportDangerInfo")
-    public ServerResponse<?> getImportDangerInfo(@RequestParam String sid, HttpServletRequest request) {
+    public ServerResponse<?> getImportDangerInfo(@RequestParam String dangerId, HttpServletRequest request) {
 
-        log.info("/getImportDangerInfo（排查第三页--重点排查新增标签详情数据（默认数据-无用户数据后调用））接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(), sid);
+        log.info("/getImportDangerInfo（排查第三页--重点排查新增标签详情数据（默认数据-无用户数据后调用））接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(), dangerId);
 
-        List<ImportDangerInfoDTO> importDangerInfo = highDangerMapper.getImportDangerInfo(sid);
+        List<ImportDangerInfoDTO> importDangerInfo = highDangerMapper.getImportDangerInfo(dangerId);
         log.info("/getImportDangerInfo（排查第三页--重点排查新增标签详情数据（默认数据-无用户数据后调用））接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), importDangerInfo);
         if (importDangerInfo != null) {
             return ServerResponse.ok(importDangerInfo);
@@ -735,6 +735,9 @@ public class HighDangerController {
         Date lastModDate = new Date();
         manualInvestigation.setLastModeDate(lastModDate);
 
+        // 保存轄區和街道
+        highDangerMapper.updateSectionCommunity(manualInvestigation.getBusinessId(),manualInvestigation.getXqcode(),manualInvestigation.getJdcode());
+
         ThtSectionInfoDTO sectionInfo = highDangerMapper.getSectionInfo(manualInvestigation.getBusinessId());
         if (sectionInfo != null) {
             // 更新基础数据（步骤1）

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java

@@ -1,6 +1,9 @@
 package com.hisense.hiatmp.server_api.mapper;
 
+import com.hisense.hiatmp.model.dmr.LineInfo;
 import com.hisense.hiatmp.server_api.model.ModuleCustomConfig;
+import com.hisense.hiatmp.server_api.model.StreetCommunity;
+import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -8,4 +11,11 @@ import java.util.List;
 @Repository
 public interface ConfigMapper {
     List<ModuleCustomConfig> getModuleCustomConfigList();
+
+
+    List<StreetCommunity> getStreetCommunity();
+
+    StreetCommunity getStreetCommunityById(@Param("xqcode") String xqcode,@Param("jdcode") String jdcode);
+
+    LineInfo getDangerBaseData(String sectionCode);
 }

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java

@@ -45,7 +45,7 @@ public interface HighDangerMapper{
 
     int saveCrossing(SectionOrCrossAdd sectionOrCrossAdd);
 
-    List<ImportDangerInfoDTO> getImportDangerInfo(String sid);
+    List<ImportDangerInfoDTO> getImportDangerInfo(String dangerId);
 
     String setApproval(String businessId);
 
@@ -92,4 +92,7 @@ public interface HighDangerMapper{
     void HighDangerSaveStatus(@Param("businessId") String businessId,@Param("pcType") String pcType);
 
 
+    void updateSectionCommunity(@Param("businessId") String businessId,@Param("xqcode") String xqcode,@Param("jdcode") String jdcode);
+
+
 }

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/model/StreetCommunity.java

@@ -0,0 +1,25 @@
+package com.hisense.hiatmp.server_api.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class StreetCommunity implements Serializable {
+
+    private static final long serialVersionUID = -8763233643579533471L;
+
+    // 辖区id
+    private String xqcode;
+    // 辖区名
+    private String xqname;
+    // 街道id
+    private String jdcode;
+
+    private String jdname;
+    private String sqcode;
+    private String sqname;
+    private String zdcode;
+    private String zdname;
+
+}

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/IConfigService.java

@@ -1,11 +1,21 @@
 package com.hisense.hiatmp.server_api.service;
 
 
+import com.hisense.hiatmp.model.dmr.LineInfo;
 import com.hisense.hiatmp.server_api.model.ModuleCustomConfig;
+import com.hisense.hiatmp.server_api.model.StreetCommunity;
 
 import java.util.List;
 
 public interface IConfigService {
 
     List<ModuleCustomConfig> getModuleCustomConfigList();
+
+    // 获取辖区街道集合
+    List<StreetCommunity> getStreetCommunity();
+
+    // 获取辖区-街道回显
+    StreetCommunity getStreetCommunityById(String xqcode, String jdcode);
+
+    LineInfo getDangerBaseData(String sectionCode);
 }

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ConfigServiceImpl.java

@@ -1,11 +1,14 @@
 package com.hisense.hiatmp.server_api.service.impl;
 
+import com.hisense.hiatmp.model.dmr.LineInfo;
 import com.hisense.hiatmp.server_api.mapper.ConfigMapper;
 import com.hisense.hiatmp.server_api.model.ModuleCustomConfig;
+import com.hisense.hiatmp.server_api.model.StreetCommunity;
 import com.hisense.hiatmp.server_api.service.IConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -18,4 +21,22 @@ public class ConfigServiceImpl implements IConfigService {
     public List<ModuleCustomConfig> getModuleCustomConfigList() {
         return configMapper.getModuleCustomConfigList();
     }
+
+    @Override
+    public List<StreetCommunity> getStreetCommunity() {
+        return configMapper.getStreetCommunity();
+    }
+
+    @Override
+    public StreetCommunity getStreetCommunityById(String xqcode,String jdcode) {
+        return configMapper.getStreetCommunityById(xqcode,jdcode);
+    }
+
+    @Override
+    public LineInfo getDangerBaseData(String sectionCode) {
+
+        return configMapper.getDangerBaseData(sectionCode);
+    }
+
+
 }

hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml

@@ -8,4 +8,16 @@
         select * from module_custom_config
 	</select>
 
+    <select id="getStreetCommunity" resultType="com.hisense.hiatmp.server_api.model.StreetCommunity">
+        select DISTINCT * from tlv_street_community;
+    </select>
+
+    <select id="getStreetCommunityById" resultType="com.hisense.hiatmp.server_api.model.StreetCommunity">
+        select DISTINCT * from tlv_street_community
+        where xqcode = #{xqcode} and jdcode = #{jdcode}
+    </select>
+
+    <select id="getDangerBaseData" resultType="com.hisense.hiatmp.model.dmr.LineInfo">
+        select * from bis_section where section_code = #{sectionCode};
+    </select>
 </mapper>

hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml

@@ -114,13 +114,14 @@
     </select>
 
     <select id="getHigDangerDealt" resultType="com.hisense.hiatmp.model.common.HighDangerBase">
-        SELECT hdb.*,hdr.pc_type,hdr.pc_end_time as road_pc_end_time
+        SELECT hdb.*,hdr.pc_type,hdr.pc_end_time as road_pc_end_time,hdr.belong_xq,hdr.xzjd,bs.section_name,bs.section_code
         FROM tht_hidden_danger_base hdb
         LEFT JOIN tht_hidden_danger_road hdr ON hdb.business_id = hdr.business_id
         AND hdb.pc_count = hdr.pc_count
         LEFT JOIN department dp ON hdb.handle_dept = dp.cdepartmentid
         LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601'
         AND et.enumvalue = hdb.status
+        LEFT JOIN bis_section bs ON hdr.section_code = bs.section_code
         WHERE hdb.handle_dept = #{cdepartmentid}
         <!--<if test="status != null and status == 0">
             AND hdb.status in ('0','99')
@@ -281,7 +282,7 @@
                 tht_danger_item_relation rr
                     LEFT JOIN tht_hidden_data_collect_config C ON C.nid = rr.itemid
             WHERE
-                rr.dangerid = #{nid}
+                rr.dangerid = #{dangerId}
             ORDER BY
                 rr.ORDER
     </select>
@@ -474,5 +475,9 @@
         where business_id = #{businessId}
     </update>
 
-
+    <update id="updateSectionCommunity">
+        update tht_hidden_danger_road
+        set belong_xq = #{xqcode} and xzjd = #{jdcode}
+        where business_id = #{businessId}
+    </update>
 </mapper>

hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerBase.java

@@ -189,4 +189,15 @@ public class HighDangerBase implements Serializable {
     // 画圆半径
     private String radius;
 
+    // 辖区
+    private String belongXq;
+
+    // 乡镇街道
+    private String xzjd;
+
+    // 道路主键
+    private String sectionCode;
+    // 道路名称
+    private String sectionName;
+
 }

hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ManualInvestigation.java

@@ -16,6 +16,12 @@ public class ManualInvestigation implements Serializable {
 
     // 第一页，基本信息
     String businessId;
+
+    // 轄區code
+    String xqcode;
+    // 街道code
+    String jdcode;
+
     String roadType;
     String roadWidth;
     String laneCount;

hiatmp-model/src/main/java/com/hisense/hiatmp/model/dmr/LineInfo.java

@@ -5,8 +5,19 @@ import java.util.List;
 @Data
 public class LineInfo {
     private String lineId;
+    // 道路类型
+    private String sectionType;
+    // 道路名称
     private String lineName;
+    // 车道数
     private String laneNum;
+    // 宽度
+    private String width;
+    // 限速
+    private String speed;
+    // 道路长度
+    private String length;
+
     private String linePosition;
     private String lineModel;
     private String lineType;