隐患排查暂存问题和地图绑定路口问题修改

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

@@ -33,6 +33,13 @@ public class ConfigController extends HiatmpController {
         return ServerResponse.ok(streetCommunity);
     }
 
+    @GetMapping("/getStreetCommunityByXq")
+    public ServerResponse<?> getStreetCommunityByXq(@RequestParam String xqcode
+    ){
+        List<StreetCommunity> streetCommunity = configService.getStreetCommunityByXq(xqcode);
+        return ServerResponse.ok(streetCommunity);
+    }
+
     /*
      * 获取辖区街道数据
      */

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

@@ -58,6 +58,39 @@ public class HighDangerController {
 
     @Value("${spring.ftp.currentdir}")
     private String CURRENT_DIR;     // 文件存放的目录
+
+    /*
+        新增隐患排查（测试用）
+     */
+    @Transactional
+    @GetMapping("/insertDangerTest")
+    public ServerResponse<?> insertDanger(@RequestParam String name){
+
+        HighDangerBase highDangerBase = new HighDangerBase();
+        HighDangerRoad highDangerRoad = new HighDangerRoad();
+
+        UUID uuid = UUID.fromString(UUID.randomUUID().toString());
+        String nid = uuid.toString().replaceAll("-", "");
+        String businessId = "ZZ" + highDangerService.random12();
+
+        // base主键
+        highDangerBase.setNid(nid);
+        // 隐患id
+        highDangerBase.setBusinessId(businessId);
+        // 隐患名称
+        highDangerBase.setName(name);
+
+        // 道路NID
+        highDangerRoad.setNid(nid);
+        // 隐患主键
+        highDangerRoad.setBusinessId(businessId);
+
+        // 分别插入两张表
+        highDangerService.insertDanger(highDangerBase);
+        highDangerService.insertDangerRoad(highDangerRoad);
+        return ServerResponse.ok();
+    }
+
     /*
         查询各个状态的数据情况
      */
@@ -416,12 +449,14 @@ public class HighDangerController {
         HighDangerRoad roadInfo = highDangerMapper.getRoadInfo(businessId);
         roadInfo.setDeptId(operatorMapper.getOperatorById(roadInfo.getOperator()).getCdepartmentid());
 
-        if (roadInfo.getCoordinate() == null) {
-            return ServerResponse.ok("无对应路口信息", null);
+        SectionVO sectionByCode = highDangerMapper.getSectionByCode(roadInfo.getSectionCode());
+
+        if (sectionByCode.getPosition() == null) {
+            return ServerResponse.ok("路段点位为空", null);
         }
         LinkedList<Map<String, Double>> coordinateMapTemporary = new LinkedList<>();
 
-        String[] split = roadInfo.getCoordinate().split(",");
+        String[] split = sectionByCode.getPosition().split(",");
         for (int i = 0; i < split.length; i += 2) {
             //CoordinateConverter coordinateConverter = new CoordinateConverter();
             Map<String, Double> pointMap = new LinkedHashMap<>();
@@ -441,6 +476,7 @@ public class HighDangerController {
             pointMap.put("latitude", aMap.getLatitude());
             coordinateMapTemporary.add(pointMap);
         }
+        roadInfo.setAddress(sectionByCode.getSectionName());
         roadInfo.setCoordinateList(coordinateMapTemporary);
 
         Date nowDate = new Date();
@@ -603,11 +639,12 @@ public class HighDangerController {
     public ServerResponse<?> getSectionInfo(@RequestParam String businessId, HttpServletRequest request) {
         log.info("/getSectionInfo（获取基础数据（第一页））接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(), businessId);
 
-        ThtSectionInfoDTO sectionInfo = highDangerMapper.getSectionInfo(businessId);
+        List<ThtSectionInfoDTO> sectionInfo = highDangerMapper.getSectionInfo(businessId);
+        ThtSectionInfoDTO thtSectionInfoDTO = sectionInfo.get(0);
 
         log.info("/getSectionInfo（获取基础数据（第一页））接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), sectionInfo);
         if (sectionInfo != null) {
-            return ServerResponse.ok(sectionInfo);
+            return ServerResponse.ok(thtSectionInfoDTO);
         } else {
             return ServerResponse.ok("无基本信息内容", null);
         }
@@ -738,7 +775,8 @@ public class HighDangerController {
         // 保存轄區和街道
         highDangerMapper.updateSectionCommunity(manualInvestigation.getBusinessId(),manualInvestigation.getXqcode(),manualInvestigation.getJdcode());
 
-        ThtSectionInfoDTO sectionInfo = highDangerMapper.getSectionInfo(manualInvestigation.getBusinessId());
+        List<ThtSectionInfoDTO> sectionInfos = highDangerMapper.getSectionInfo(manualInvestigation.getBusinessId());
+        ThtSectionInfoDTO sectionInfo  = sectionInfos.get(0);
         if (sectionInfo != null) {
             // 更新基础数据（步骤1）
             highDangerMapper.updateSectionInfo(manualInvestigation);
@@ -896,6 +934,15 @@ public class HighDangerController {
         return ServerResponse.ok("状态修改成功,状态为:" + pcType, pcType);
     }
 
+    @GetMapping("/getRoadTypes")
+    public ServerResponse<?> getRoadType(){
+
+        List<EnumRoadType> roadTypes = highDangerService.getRoadTypes();
+        return ServerResponse.ok(roadTypes);
+    }
+
+
+
     // 图片上传接口
     /*@PostMapping("/uploadImage")
     public ServerResponse<?> uploadImage(@RequestBody MultipartFile multipartFile) throws IOException {

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

@@ -17,5 +17,7 @@ public interface ConfigMapper {
 
     StreetCommunity getStreetCommunityById(@Param("xqcode") String xqcode,@Param("jdcode") String jdcode);
 
+    List<StreetCommunity> getStreetCommunityByXq(String xqcode);
+
     LineInfo getDangerBaseData(String sectionCode);
 }

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

@@ -11,6 +11,10 @@ import java.util.List;
 @Repository
 public interface HighDangerMapper{
 
+    void insertDanger(HighDangerBase highDangerBase);
+
+    void insertDangerRoad(HighDangerRoad highDangerRoad);
+
 //    String getHighDangerStatusNum(@Param("postId") String postId);
     // 主页获取各类型数据
     List<HighDangerBaseNum> getStatusCounts(String cdepartmentid);
@@ -49,7 +53,7 @@ public interface HighDangerMapper{
 
     String setApproval(String businessId);
 
-    ThtSectionInfoDTO getSectionInfo(String businessId);
+    List<ThtSectionInfoDTO> getSectionInfo(String businessId);
 
     ThtSectionTrafficDTO getSectionTraffic(String businessId);
 
@@ -94,5 +98,7 @@ public interface HighDangerMapper{
 
     void updateSectionCommunity(@Param("businessId") String businessId,@Param("xqcode") String xqcode,@Param("jdcode") String jdcode);
 
+    List<EnumRoadType> getRoadTypes();
 
+    SectionVO getSectionByCode(String sectionCode);
 }

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

@@ -1,5 +1,8 @@
 package com.hisense.hiatmp.server_api.service;
 
+import com.hisense.hiatmp.model.common.EnumRoadType;
+import com.hisense.hiatmp.model.common.HighDangerBase;
+import com.hisense.hiatmp.model.common.HighDangerRoad;
 import com.hisense.hiatmp.model.common.ThtDangerItems;
 import com.hisense.hiatmp.model.dmr.Point;
 import com.hisense.hiatmp.server_api.utils.CoordinateConverter;
@@ -28,5 +31,12 @@ public interface HighDangerService {
 
     CoordinateConverter.AMap transform(double wgLon, double wgLat);
 
-//    Map<String, Map<Double,String>> sortMapByValue(HashMap<String, Object> unsortedMap);
+    void insertDanger(HighDangerBase highDangerBase);
+
+    void insertDangerRoad(HighDangerRoad highDangerRoad);
+
+    List<EnumRoadType> getRoadTypes();
+
+    // 随机生成12位数字
+    String random12();
 }

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

@@ -15,5 +15,7 @@ public interface IConfigService {
     // 获取辖区-街道回显
     StreetCommunity getStreetCommunityById(String xqcode, String jdcode);
 
+    List<StreetCommunity> getStreetCommunityByXq(String xqcode);
+
     LineInfo getDangerBaseData(String sectionCode);
 }

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

@@ -32,6 +32,10 @@ public class ConfigServiceImpl implements IConfigService {
         return configMapper.getStreetCommunityById(xqcode,jdcode);
     }
 
+public List<StreetCommunity> getStreetCommunityByXq(String xqcode) {
+        return configMapper.getStreetCommunityByXq(xqcode);
+    }
+
     @Override
     public LineInfo getDangerBaseData(String sectionCode) {
 

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

@@ -1,5 +1,8 @@
 package com.hisense.hiatmp.server_api.service.impl;
 
+import com.hisense.hiatmp.model.common.EnumRoadType;
+import com.hisense.hiatmp.model.common.HighDangerBase;
+import com.hisense.hiatmp.model.common.HighDangerRoad;
 import com.hisense.hiatmp.server_api.mapper.HighDangerMapper;
 import com.hisense.hiatmp.server_api.service.HighDangerService;
 import com.hisense.hiatmp.model.common.ThtDangerItems;
@@ -313,6 +316,54 @@ public class HighDangerBaseServiceImpl implements HighDangerService {
         }
     }
 
+    public void insertDanger(HighDangerBase highDangerBase){
+
+        Date date = new Date();
+
+        // 隐患名称
+        highDangerBase.setName(highDangerBase.getName());
+        // 隐患类型
+        highDangerBase.setType("1");
+        highDangerBase.setSource("1");
+        highDangerBase.setFindWay("001");
+        highDangerBase.setArea("430182000000");
+        highDangerBase.setStatus("10");
+        highDangerBase.setFindTime(date);
+        highDangerBase.setOperator("admin1");
+        highDangerBase.setInsertTime(date);
+        highDangerBase.setPcStartTime(date);
+        highDangerBase.setReportDept("370200000000");
+        highDangerBase.setHandleDept("370200000000");
+        highDangerBase.setDelayCount("0");
+        highDangerBase.setDelayDay("0");
+        highDangerBase.setPcCount("0");
+
+       highDangerMapper.insertDanger(highDangerBase);
+    }
+
+    public void insertDangerRoad(HighDangerRoad highDangerRoad){
+        highDangerRoad.setPcCount("0");
+
+        highDangerMapper.insertDangerRoad(highDangerRoad);
+    }
+
+    @Override
+    public List<EnumRoadType> getRoadTypes() {
+        // 获取道路类型
+        return highDangerMapper.getRoadTypes();
+    }
+
+    public  String random12(){
+        Random random = new Random();
+        StringBuilder sb = new StringBuilder();
+
+        for (int i = 0; i < 12; i++) {
+            sb.append(random.nextInt(10));
+        }
+
+        return sb.toString();
+    }
+
 //    public Map<String, Map<Double,String>> sortMapByValue(HashMap<String, Object> unsortedMap) {
 //        Map<String, Map<Double,String>> sortedMap = new LinkedHashMap<>();
 //        Comparator<Double> valueComparator = Comparator.naturalOrder();
@@ -322,4 +373,6 @@ public class HighDangerBaseServiceImpl implements HighDangerService {
 //        return sortedMap;
 //    }
 
+
+
 }

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

@@ -17,6 +17,10 @@
         where xqcode = #{xqcode} and jdcode = #{jdcode}
     </select>
 
+    <select id="getStreetCommunityByXq" resultType="com.hisense.hiatmp.server_api.model.StreetCommunity">
+        select DISTINCT xqcode,xqname,jdcode,jdname from tlv_street_community where xqcode = #{xqcode};
+    </select>
+
     <select id="getDangerBaseData" resultType="com.hisense.hiatmp.model.dmr.LineInfo">
         select * from bis_section where section_code = #{sectionCode};
     </select>

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

@@ -4,6 +4,55 @@
 
 <mapper namespace="com.hisense.hiatmp.server_api.mapper.HighDangerMapper">
 
+    <insert id="insertDanger">
+        insert into tht_hidden_danger_base
+        (nid,
+         business_id,
+         name,
+         type,
+         source,
+         find_way,
+         area,
+         status,
+         find_time,
+         pc_start_time,
+         report_dept,
+         handle_dept,
+         delay_count,
+         delay_day,
+         pc_count)
+        values
+            (
+             #{nid},
+             #{businessId},
+             #{name},
+             #{type},
+             #{source},
+             #{findWay},
+             #{area},
+             #{status},
+             #{findTime},
+             #{pcStartTime},
+             #{reportDept},
+             #{handleDept},
+             #{delayCount},
+             #{delayDay},
+             #{pcCount}
+            )
+    </insert>
+
+    <insert id="insertDangerRoad">
+        insert into tht_hidden_danger_road
+        (nid,
+         business_id,
+         pc_count)
+        values
+            (
+                #{nid},
+                #{businessId},
+                #{pcCount}
+            )
+    </insert>
 
     <select id="getStatusCounts" resultType="com.hisense.hiatmp.model.common.HighDangerBaseNum">
         SELECT 'Unconfirmed' AS status, SUM(CASE WHEN hdb.status = '0' or hdb.status = '99' THEN 1 ELSE 0 END) AS count
@@ -114,7 +163,8 @@
     </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,hdr.belong_xq,hdr.xzjd,bs.section_name,bs.section_code
+        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
@@ -270,21 +320,17 @@
     </update>
 
     <select id="getImportDangerInfo" resultType="com.hisense.hiatmp.model.common.ImportDangerInfoDTO">
-            SELECT
-                C.nid,
-                C.itemid,
-                C.order,
-                C.type,
-                C.name,
-                C.standar,
-                C.unit
-            FROM
-                tht_danger_item_relation rr
-                    LEFT JOIN tht_hidden_data_collect_config C ON C.nid = rr.itemid
-            WHERE
-                rr.dangerid = #{dangerId}
-            ORDER BY
-                rr.ORDER
+        SELECT C.nid,
+               C.itemid,
+               C.order,
+               C.type,
+               C.name,
+               C.standar,
+               C.unit
+        FROM tht_danger_item_relation rr
+                 LEFT JOIN tht_hidden_data_collect_config C ON C.nid = rr.itemid
+        WHERE rr.dangerid = #{dangerId}
+        ORDER BY rr.ORDER
     </select>
 
     <select id="setApproval" resultType="String">
@@ -294,9 +340,16 @@
     </select>
 
     <select id="getSectionInfo" resultType="com.hisense.hiatmp.model.common.ThtSectionInfoDTO">
-        SELECT *
-        FROM tht_section_info
-        where "BUSINESS_ID" = #{businessId}
+        SELECT
+            tsi.*,
+            tsc.*
+        FROM
+            tht_section_info tsi
+                LEFT JOIN tht_hidden_danger_road thdr ON tsi."BUSINESS_ID" = thdr.business_id
+                LEFT JOIN tlv_street_community tsc ON thdr.belong_xq = tsc.xqcode
+                AND thdr.xzjd = tsc.jdcode
+        WHERE
+            tsi."BUSINESS_ID" = #{businessId}
     </select>
 
     <select id="getSectionTraffic" resultType="com.hisense.hiatmp.model.common.ThtSectionTrafficDTO">
@@ -382,10 +435,10 @@
 
     <update id="updateDangerRoad">
         update tht_hidden_danger_road
-        set hd_flag = #{hdFlag}
-        ,pc_end_time = CURRENT_TIMESTAMP
+        set hd_flag     = #{hdFlag}
+          , pc_end_time = CURRENT_TIMESTAMP
         where business_id = #{businessId}
-        and pc_count = #{pcCount}
+          and pc_count = #{pcCount}
     </update>
 
     <insert id="saveHiddenDataCollectConfig">
@@ -477,8 +530,16 @@
 
     <update id="updateSectionCommunity">
         update tht_hidden_danger_road
-        set belong_xq = #{xqcode} ,
-            xzjd = #{jdcode}
+        set belong_xq = #{xqcode},
+            xzjd      = #{jdcode}
         where business_id = #{businessId}
     </update>
+
+    <select id="getRoadTypes" resultType="com.hisense.hiatmp.model.common.EnumRoadType">
+        select * from bis_enum_type where enumtype_id = '303'
+    </select>
+
+    <select id="getSectionByCode" resultType="com.hisense.hiatmp.model.common.SectionVO">
+        select * from bis_section where section_code = #{sectionCode}
+    </select>
 </mapper>

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

@@ -0,0 +1,18 @@
+package com.hisense.hiatmp.model.common;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class EnumRoadType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String enumtypeId;
+    private String enumvalue;
+    private String enumName;
+    private String isDefault;
+    private String dispindx;
+    private String isActive;
+}

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

@@ -58,7 +58,7 @@ public class HighDangerBase implements Serializable {
     /**
      * find_time
      */
-    private String findTime;
+    private Date findTime;
 
     /**
      * operator
@@ -70,7 +70,7 @@ public class HighDangerBase implements Serializable {
     /**
      * insert_time
      */
-    private String insertTime;
+    private Date insertTime;
 
     /**
      * pc_start_time

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

@@ -67,5 +67,14 @@ public class ThtSectionInfoDTO implements Serializable {
     */
     private String limitSpeed;
 
+    // 辖区id
+    private String xqcode;
+    // 辖区名称
+    private String xqname;
+    // 街道id
+    private String jdcode;
+    // 街道名称
+    private String jdname;
+
     public ThtSectionInfoDTO() {}
 }