闵行代码代码提交

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseGgpFacilityController.java

@@ -45,5 +45,7 @@ public class BaseGgpFacilityController {
     public ApiResult<List<BaseGgpFacilityStatisticVO>> statistic(@RequestBody BaseGgpFacilityVO baseGgpFacilityVO){
         return ApiResult.success(baseGgpFacilityService.statistic(baseGgpFacilityVO));
     }
+
+
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemGridMemberController.java

@@ -63,10 +63,10 @@ public class DemGridMemberController {
      * @return
      */
     @GetMapping("gridMemberScatter")
-    public ApiResult<List<DemGridMember>> gridMemberScatter(@RequestParam(value = "gridArea",required = false) String gridArea,
-                                                            @RequestParam(value = "mapGridName",required = false) String mapGridName,
-                                                            @RequestParam(value = "gridGrade",required = false) Integer gridGrade,
-                                                            @RequestParam(value = "seniorGrid",required = false) Integer seniorGrid) {
+    public ApiResult<List<DemGridMember>> gridMemberScatter(@RequestParam(value = "gridArea", required = false) String gridArea,
+                                                            @RequestParam(value = "mapGridName", required = false) String mapGridName,
+                                                            @RequestParam(value = "gridGrade", required = false) Integer gridGrade,
+                                                            @RequestParam(value = "seniorGrid", required = false) Integer seniorGrid) {
         return ApiResult.success(demGridMemberService.gridMemberScatter(gridArea, mapGridName, gridGrade, seniorGrid));
     }
 
@@ -76,7 +76,7 @@ public class DemGridMemberController {
      * @return
      */
     @GetMapping("gridMemderViceStatistic")
-    public ApiResult<List<Map<String ,Object>>> gridMemderViceStatistic(){
+    public ApiResult<List<Map<String, Object>>> gridMemderViceStatistic() {
         return ApiResult.success(demGridMemberService.gridMemderViceStatistic());
     }
 
@@ -141,5 +141,19 @@ public class DemGridMemberController {
         return ApiResult.success();
     }
 
+    /**
+     * 获取OneMap地图信息
+     *
+     * @param lon 经度
+     * @param lat 纬度
+     * @param onemap_mapkey oneMap密钥
+     * @return
+     */
+    @GetMapping("getOneMap")
+    public ApiResult<Map<String, Double>> getOneMap(@RequestParam(value = "lon") double lon,
+                                                    @RequestParam(value = "lat") double lat,
+                                                    @RequestParam(value = "onemap_mapkey") String onemap_mapkey) {
+        return ApiResult.success(demGridMemberService.getOneMap(lon, lat, onemap_mapkey));
+    }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemGridMemberService.java

@@ -32,4 +32,6 @@ public interface DemGridMemberService extends CrudService<DemGridMember> {
     void updateGridMember(DemGridMember demGridMember);
 
     void delGridMember(Integer id);
+
+    Map<String, Double> getOneMap(double lon, double lat, String onemap_mapkey);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemGridMemberServiceImpl.java

@@ -24,9 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -48,7 +46,7 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
         LambdaQueryWrapper<DemGridMember> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DemGridMember::getDeleteFlag, 0)
                 .eq(StringUtils.isNotBlank(streetTown), DemGridMember::getStreetTown, streetTown)
-                .eq(id != null&&id != 0, DemGridMember::getId, id)
+                .eq(id != null && id != 0, DemGridMember::getId, id)
                 .like(StringUtils.isNotBlank(gridArea), DemGridMember::getGridArea, gridArea)
                 .like(StringUtils.isNotBlank(gridPersonnel), DemGridMember::getGridPersonnel, gridPersonnel)
                 .orderByDesc(DemGridMember::getId);
@@ -79,14 +77,14 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
     }
 
     @Override
-    public List<DemGridMember> gridMemberScatter(String gridArea, String mapGridName, Integer gridGrade, Integer seniorGrid){
+    public List<DemGridMember> gridMemberScatter(String gridArea, String mapGridName, Integer gridGrade, Integer seniorGrid) {
         List<DemGridMember> list = new ArrayList<>();
         LambdaQueryWrapper<DemGridMember> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DemGridMember::getDeleteFlag, 0)
-                .eq(StringUtils.isNotBlank(gridArea),DemGridMember::getGridArea, gridArea)
-                .eq(StringUtils.isNotBlank(mapGridName),DemGridMember::getMapGridName, mapGridName)
-                .eq(gridGrade != null,DemGridMember::getGridGrade, gridGrade)
-                .eq(seniorGrid != null,DemGridMember::getId, seniorGrid);
+                .eq(StringUtils.isNotBlank(gridArea), DemGridMember::getGridArea, gridArea)
+                .eq(StringUtils.isNotBlank(mapGridName), DemGridMember::getMapGridName, mapGridName)
+                .eq(gridGrade != null, DemGridMember::getGridGrade, gridGrade)
+                .eq(seniorGrid != null, DemGridMember::getId, seniorGrid);
         list = this.list(queryWrapper);
         if (CollectionUtils.isNotEmpty(list)) {
             List<Integer> gridMemberId = new ArrayList<>();
@@ -99,9 +97,9 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
             }
             if (CollectionUtils.isNotEmpty(demGridMemderVicesList)) {
                 QueryWrapper<DemGridMember> queryWrapper1 = Wrappers.query();
-                queryWrapper1.select("senior_grid as seniorGrid","count(*) as count1")
+                queryWrapper1.select("senior_grid as seniorGrid", "count(*) as count1")
                         .groupBy("senior_grid");
-                List<Map<String,Object>> map = this.listMaps(queryWrapper1);
+                List<Map<String, Object>> map = this.listMaps(queryWrapper1);
 
                 for (int i = 0; i < list.size(); i++) {
                     List<DemGridMemderVice> gridMemderViceList = new ArrayList<>();
@@ -114,9 +112,9 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
 
                     }
                     list.get(i).setGridMemderViceList(gridMemderViceList);
-                    if(map.size() > 0){
+                    if (map.size() > 0) {
                         for (int j = 0; j < map.size(); j++) {
-                            if(list.get(i).getId().equals(Integer.parseInt(map.get(j).get("seniorGrid").toString()))){
+                            if (list.get(i).getId().equals(Integer.parseInt(map.get(j).get("seniorGrid").toString()))) {
                                 list.get(i).setNum(Integer.parseInt(map.get(j).get("count1").toString()));
                             }
                         }
@@ -128,11 +126,11 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
     }
 
     @Override
-    public List<Map<String ,Object>> gridMemderViceStatistic(){
+    public List<Map<String, Object>> gridMemderViceStatistic() {
         QueryWrapper<DemGridMemderVice> queryWrapper = Wrappers.query();
-        queryWrapper.select("personnel_type as personnelType","count(*) as count")
+        queryWrapper.select("personnel_type as personnelType", "count(*) as count")
                 .groupBy("personnel_type");
-        List<Map<String,Object>> list = demGridMemderViceService.listMaps(queryWrapper);
+        List<Map<String, Object>> list = demGridMemderViceService.listMaps(queryWrapper);
 
         return list;
     }
@@ -142,7 +140,7 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
         LambdaQueryWrapper<DemGridMember> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DemGridMember::getDeleteFlag, 0)
                 .eq(StringUtils.isNotBlank(streetTown), DemGridMember::getStreetTown, streetTown)
-                .eq(id != null&&id != 0, DemGridMember::getId, id)
+                .eq(id != null && id != 0, DemGridMember::getId, id)
                 .like(StringUtils.isNotBlank(gridArea), DemGridMember::getGridArea, gridArea)
                 .like(StringUtils.isNotBlank(gridPersonnel), DemGridMember::getGridPersonnel, gridPersonnel)
                 .orderByDesc(DemGridMember::getId);
@@ -172,11 +170,11 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
                 if (CollectionUtils.isNotEmpty(demGridMemderVicesList)) {
                     for (int j = 0; j < demGridMemderVicesList.size(); j++) {
                         if (list1.get(i).getId() == demGridMemderVicesList.get(j).getGridMemberId()) {
-                            if(demGridMemderVicesList.get(j).getPersonnelType() == 1){
+                            if (demGridMemderVicesList.get(j).getPersonnelType() == 1) {
                                 gridPersonStr.append(",").append(demGridMemderVicesList.get(j).getPersonnelName());
                                 gridPhoneStr.append(",").append(demGridMemderVicesList.get(j).getPhone());
                             }
-                            if(demGridMemderVicesList.get(j).getPersonnelType() == 2){
+                            if (demGridMemderVicesList.get(j).getPersonnelType() == 2) {
                                 addPersonStr.append(demGridMemderVicesList.get(j).getPersonnelName()).append(",");
                                 addPhoneStr.append(demGridMemderVicesList.get(j).getPhone()).append(",");
 
@@ -191,10 +189,10 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
 
                 demGridMemberVO.setGridPersonnel(gridPerson);
                 demGridMemberVO.setGridPhone(gridPhone);
-                if(StringUtils.isNotBlank(addPerson)){
-                    demGridMemberVO.setAddPersonnel(addPerson.substring(0,addPerson.length()-1));
+                if (StringUtils.isNotBlank(addPerson)) {
+                    demGridMemberVO.setAddPersonnel(addPerson.substring(0, addPerson.length() - 1));
                 }
-                if(StringUtils.isNotBlank(addPhone)) {
+                if (StringUtils.isNotBlank(addPhone)) {
                     demGridMemberVO.setAddPhone(addPhone.substring(0, addPhone.length() - 1));
                 }
                 demGridMemberVO.setCreateTime((list1.get(i).getCreateTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -283,4 +281,12 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
         }
     }
 
+    @Override
+    public Map<String, Double> getOneMap(double lon, double lat, String onemap_mapkey) {
+        Map<String, Double> map = new HashMap<>();
+        map.put("x", 0.0);
+        map.put("y", 0.0);
+        StringUtils.isNotBlank(onemap_mapkey);
+        return map;
+    }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemGridMemderStatisticVO.java

@@ -0,0 +1,11 @@
+package com.usky.fire.service.vo;
+
+/**
+ * 网格基础信息统计
+ * @author fyc
+ * @email yuchuan.fu@chinausky.com
+ * @date 2025/10/13
+ */
+public class DemGridMemderStatisticVO {
+
+}

service-fire/service-fire-biz/src/main/resources/application.yml

@@ -43,12 +43,12 @@ spring:
     dynamic:
       datasource:
         master:
-          #          url: jdbc:mysql://192.168.10.165:3306/usky-fire?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&queryTimeout=2400
-          #          username: root
-          #          password: yt123456
-          driver-class-name: dm.jdbc.driver.DmDriver
-          password: Yt#75Usky
-          url: jdbc:dm://localhost:5237/SYSDBA?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
+          url: jdbc:mysql://192.168.10.165:3306/usky-fire?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&queryTimeout=2400
+          username: root
+          password: yt123456
+      #          driver-class-name: dm.jdbc.driver.DmDriver
+      #          password: Yt#75Usky
+      #          url: jdbc:dm://localhost:5237/SYSDBA?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
       #          username: SYSDBA
       #        mhsystem:
       #          password: mysql570