场站图钉接口缺失逻辑补充

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/StationBasicMapper.java

@@ -42,7 +42,7 @@ public interface StationBasicMapper extends BaseMapper<StationBasic> {
     );
 
     //获取场站列表信息
-    List<StationRecordInfo> getStationList(@Param("areaCode")String areaCode);
+    List<StationRecordInfo> getStationList(@Param("regionId")String regionId);
     int deleteStationCoordinateByStationid (@Param("sequence_nbr") Long sequence_nbr );
     int getStationPersonByStationID (@Param("sequence_nbr") String sequence_nbr );
 

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -128,8 +128,8 @@
         LEFT JOIN station_coordinate ON station_basic.sequence_nbr = station_coordinate.station_id
         GROUP BY
         ( station_basic.sequence_nbr ))
-        <if test="areaCode != null and areaCode != ''">
-            AND station_basic.area_code like concat('%',#{areaCode},'%')
+        <if test="regionId != null and regionId != ''">
+            AND station_basic.belong_area like concat('%',#{regionId},'%')
         </if>
     </select>
     <select id="getStationPersonByStationID" resultType="int">

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/RegionServiceImpl.java

@@ -35,4 +35,8 @@ public class RegionServiceImpl extends BaseService<RegionDto,Region,RegionMapper
     public Region getRegionByRegionCode ( String regionCode){
         return  this.getOne(new QueryWrapper<Region>().eq("REGION_CODE",regionCode));
     }
+    //根据regionName获取regionCode
+    public Region getRegionCodeByRegionName(String regionName) {
+        return this.getOne(new QueryWrapper<Region>().like("REGION_NAME",regionName).eq("LEVEL",1));
+    }
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationBasicServiceImpl.java

@@ -55,6 +55,8 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
     IndicatorServiceImpl indicatorServiceImpl;
     @Autowired
     RegionServiceImpl regionServiceImpl;
+    @Autowired
+    MapRegionServiceImpl mapRegionServiceImpl;
     private final String CZLX = "CZLX";
 
     /**
@@ -272,26 +274,47 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
     }
 
     public List<StationInfoDto> getStationList(String areaCode, String type) {
-        List<StationInfoDto>  stationInfoDtoList = new LinkedList<>();
-        List<Indicator>  indicatorList= indicatorServiceImpl.getIndicatorByType(type);
-        List<StationRecordInfo> list = stationBasicMapper.getStationList(areaCode);
-        if(list.isEmpty()){
+        List<StationInfoDto> stationInfoDtoList = new LinkedList<>();
+        List<StationRecordInfo> list = new ArrayList<>();
+        List<Indicator> indicatorList = indicatorServiceImpl.getIndicatorByType(type);
+        if (areaCode != null) {
+            MapRegion mapRegion = mapRegionServiceImpl.getOne(new QueryWrapper<MapRegion>().eq("name", areaCode));
+            if (mapRegion != null) {
+                ArrayList<String> provinces = mapRegion.getProvince();
+                if (!provinces.isEmpty()) {
+                    for (int i = 0; i < provinces.size(); i++) {
+                        Region region = regionServiceImpl.getRegionCodeByRegionName(provinces.get(i));
+                        if (region != null && region.getRegionCode() != null) {
+                            list.addAll(stationBasicMapper.getStationList(String.valueOf(region.getRegionCode())));
+                        }
+                    }
+                }
+            } else {
+                Region region = regionServiceImpl.getRegionCodeByRegionName(areaCode);
+                if (region != null && region.getRegionCode() != null) {
+                    list = stationBasicMapper.getStationList(String.valueOf(region.getRegionCode()));
+                }
+            }
+        }
+
+        if (list.isEmpty()) {
             return stationInfoDtoList;
-        }else{
-            list.forEach(stationRecordInfo ->{
-                StationInfoDto  stationInfoDto =new StationInfoDto();
+        } else {
+            list.forEach(stationRecordInfo -> {
+                StationInfoDto stationInfoDto = new StationInfoDto();
                 stationInfoDto.setStationName(stationRecordInfo.getStationName());
                 stationInfoDto.setType(stationRecordInfo.getStationType());
+                //url 暂时写死
                 stationInfoDto.setUrl("https://tse4-mm.cn.bing.net/th/id/OIP-C.ySnewoc464X4Aecg9jl03AAAAA?w=162&h=180&c=7&r=0&o=5&pid=1.7");
                 stationInfoDto.setJumpPath(stationRecordInfo.getJumpPath());
-                if(stationRecordInfo.getBelongArea()!=null){
-                        stationInfoDto.setRegion(this.getProviceName(stationRecordInfo.getBelongArea()));
+                if (stationRecordInfo.getBelongArea() != null) {
+                    stationInfoDto.setRegion(this.getProviceName(stationRecordInfo.getBelongArea()));
                 }
-                ArrayList<Double> arrayList=MapUtils.geoTo3d(Double.valueOf(stationRecordInfo.getLongitude()),Double.valueOf(stationRecordInfo.getLaitude()));
+                ArrayList<Double> arrayList = MapUtils.geoTo3d(Double.valueOf(stationRecordInfo.getLongitude()), Double.valueOf(stationRecordInfo.getLaitude()));
                 stationInfoDto.setTitlePos(arrayList);
                 stationInfoDto.setIndicatorData(indicatorList);
                 stationInfoDtoList.add(stationInfoDto);
-            } );
+            });
         }
         return stationInfoDtoList;
     }
@@ -300,13 +323,13 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
         return stationBasicMapper.getStationPersonByStationID(id);
     }
 
-    public  String getProviceName (String  belongArea){
+    public String getProviceName(String belongArea) {
         String proviceName = "湖北";
-        if(belongArea!=null){
-            String [] strings = belongArea.replace("[","").replace("]","").split(",");
-            if(strings.length>0){
-                Region region =regionServiceImpl.getRegionByRegionCode(strings[0]);
-                proviceName = region.getRegionName().replace("省","").replace("市","");
+        if (belongArea != null) {
+            String[] strings = belongArea.replace("[", "").replace("]", "").split(",");
+            if (strings.length > 0) {
+                Region region = regionServiceImpl.getRegionByRegionCode(strings[0]);
+                proviceName = region.getRegionName().replace("省", "").replace("市", "");
             }
         }
         return proviceName;