From 10ba6daa2817c3a806ef21d3abd270674ae8f70e Mon Sep 17 00:00:00 2001 From: Zangzhipeng Date: Tue, 30 Jul 2024 10:58:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E6=9F=A5=E4=B8=80=E7=BA=A7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=BE=96=E5=8C=BA=E8=A1=97=E9=81=93=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=92=8C=E9=BB=98=E8=AE=A4=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ConfigController.java | 49 ++++++++++--------- .../controller/HighDangerController.java | 9 ++-- .../server_api/mapper/ConfigMapper.java | 10 ++++ .../server_api/mapper/HighDangerMapper.java | 5 +- .../server_api/model/StreetCommunity.java | 25 ++++++++++ .../server_api/service/IConfigService.java | 10 ++++ .../service/impl/ConfigServiceImpl.java | 21 ++++++++ .../resources/sql-mapper/ConfigMapper.xml | 12 +++++ .../resources/sql-mapper/HighDangerMapper.xml | 11 +++-- .../hiatmp/model/common/HighDangerBase.java | 11 +++++ .../model/common/ManualInvestigation.java | 6 +++ .../hisense/hiatmp/model/dmr/LineInfo.java | 11 +++++ 12 files changed, 150 insertions(+), 30 deletions(-) create mode 100644 hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/model/StreetCommunity.java diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java index 9fc6323..e867fb7 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java +++ b/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.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -24,28 +23,32 @@ public class ConfigController extends HiatmpController { } /* - 基础信息预留展示接口 + * 获取辖区街道数据 */ - @GetMapping("/showDangerBaseData") - public ServerResponse showBaseData(){ - - - - - return ServerResponse.ok(); + @GetMapping("/getStreetCommunityById") + public ServerResponse getStreetCommunityById(@RequestParam String xqcode, + @RequestParam String jdcode + ){ + StreetCommunity streetCommunity = configService.getStreetCommunityById(xqcode,jdcode); + return ServerResponse.ok(streetCommunity); } - /* - 统计数据预留展示接口 - */ - @GetMapping("/showDangerStatisticsData") - public ServerResponse showStatisticsData(){ - - - - - return ServerResponse.ok(); + * 获取辖区街道数据 + */ + @GetMapping("/getStreetCommunity") + public ServerResponse getStreetCommunity(){ + List streetCommunity = configService.getStreetCommunity(); + return ServerResponse.ok(streetCommunity); } -} + /* + 基础信息预留展示接口 + */ + @GetMapping("/getDangerBaseData") + public ServerResponse getBaseData(@RequestParam String sectionCode){ + // 查询默认数据 + LineInfo dangerBaseData = configService.getDangerBaseData(sectionCode); + return ServerResponse.ok(dangerBaseData); + } +} \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java index c75f64b..ba62b28 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java +++ b/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 importDangerInfo = highDangerMapper.getImportDangerInfo(sid); + List 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） diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java index 19a6a73..765403e 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java +++ b/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 getModuleCustomConfigList(); + + + List getStreetCommunity(); + + StreetCommunity getStreetCommunityById(@Param("xqcode") String xqcode,@Param("jdcode") String jdcode); + + LineInfo getDangerBaseData(String sectionCode); } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java index e5a0173..83b8553 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java +++ b/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 getImportDangerInfo(String sid); + List 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); + + } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/model/StreetCommunity.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/model/StreetCommunity.java new file mode 100644 index 0000000..5e09f6e --- /dev/null +++ b/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; + +} diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/IConfigService.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/IConfigService.java index 0397150..0337ab5 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/IConfigService.java +++ b/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 getModuleCustomConfigList(); + + // 获取辖区街道集合 + List getStreetCommunity(); + + // 获取辖区-街道回显 + StreetCommunity getStreetCommunityById(String xqcode, String jdcode); + + LineInfo getDangerBaseData(String sectionCode); } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ConfigServiceImpl.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ConfigServiceImpl.java index ff5541f..973e0a6 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/ConfigServiceImpl.java +++ b/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 getModuleCustomConfigList() { return configMapper.getModuleCustomConfigList(); } + + @Override + public List 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); + } + + } diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml index eb36876..db27405 100644 --- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml @@ -8,4 +8,16 @@ select * from module_custom_config + + + + + \ No newline at end of file diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml index f9c5d29..9dae0ad 100644 --- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml @@ -114,13 +114,14 @@