Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/Enum/KGName.java

@@ -13,7 +13,10 @@ public enum KGName {
     GCK("高测控","gck"),
     CK("测控","ck"),
     MXDZ("母线PT刀闸","mxdc"),
-    BTCK("本体测控","btck");
+    BTCK("本体测控","btck"),
+    QGYX("前光Ⅰ线", "qgyx"),
+    QGEX("前光Ⅱ线", "qgex"),
+    YZYB("Ⅰ母PT", "yzyb");
 
 
 

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

@@ -46,4 +46,6 @@ public interface MonitorFanIndicatorMapper extends BaseMapper<MonitorFanIndicato
                                                          @Param("sort") String sort);
 
     List<Map<String, String>> getBoosterStationInfo2(@Param("gatewayId") String boosterGatewayId);
+
+    List<Map<String, String>> getBoosterStationInfoNormal(@Param("gatewayId") String boosterGatewayId);
 }

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

@@ -188,4 +188,19 @@
             limit 1
     </select>
 
+    <select id="getBoosterStationInfoNormal" resultType="java.util.Map">
+        select
+        `sequence_nbr` as id,
+        `gateway_id` as gatewayId,
+        `booster_name` as text,
+        booster_name as boosterName,
+        `booster_code` as boosterCode,
+        `sort` as value
+        from booster_station_info
+        <where>
+            <if test="gatewayId != null and gatewayId != ''">
+                AND gateway_id = #{gatewayId}
+            </if>
+        </where>
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -453,16 +453,13 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "升压站主屏消息接口")
     @GetMapping("/getMajorAnalogQuantityByPage")
-    public ResponseModel getMajorAnalogQuantityByPage() {
-        LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
-        List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper);
-        for (StationBasic stationBasic : stationBasics) {
-            String gatewayId = stationBasic.getBoosterGatewayId();
-            if ("夏造风电站".equals(stationBasic.getStationName())) {
-                monitorFanIndicator.getMajorAnalogQuantityByPage(gatewayId, stationBasic.getSequenceNbr().toString());
-            } else if ("泰和前进光伏站".equals(stationBasic.getStationName())) {
-                monitorFanIndicator.getMajorAnalogQuantityByPageByTHGF(gatewayId, stationBasic.getSequenceNbr().toString());
-            }
+    public ResponseModel getMajorAnalogQuantityByPage(@RequestParam (required = false) String stationId) {
+        StationBasic stationBasic = stationBasicMapper.selectById(stationId);
+        String gatewayId = stationBasic.getBoosterGatewayId();
+        if ("夏造风电站".equals(stationBasic.getStationName())) {
+            monitorFanIndicator.getMajorAnalogQuantityByPage(gatewayId, stationBasic.getSequenceNbr().toString());
+        } else if ("泰和前进光伏站".equals(stationBasic.getStationName())) {
+            monitorFanIndicator.getMajorAnalogQuantityByPageByTHGF(gatewayId, stationBasic.getSequenceNbr().toString());
         }
         return CommonResponseUtil.success();
     }

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

@@ -893,12 +893,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     public List<Map<String, String>> getBoosterStationInfo(String stationId) {
         StationBasic stationBasic = getOneByStationNumber(stationId);
-        List<Map<String, String>> boosterStationInfo = monitorFanIndicatorregionMapper.getBoosterStationInfo2(stationBasic.getBoosterGatewayId());
-//        List<Map<String, String>> value = boosterStationInfo.stream().filter(item -> !"2".equals(item.get("value"))).collect(Collectors.toList());
-//        HashMap<String, String> stringStringHashMap = new HashMap<>();
-//        stringStringHashMap.put();
-
-
+        List<Map<String, String>> boosterStationInfo = new ArrayList<>();
+        if ("夏造风电站".equals(stationBasic.getStationName())) {
+             boosterStationInfo = monitorFanIndicatorregionMapper.getBoosterStationInfo2(stationBasic.getBoosterGatewayId());
+        } else {
+             boosterStationInfo = monitorFanIndicatorregionMapper.getBoosterStationInfoNormal(stationBasic.getBoosterGatewayId());
+        }
         return boosterStationInfo;
     }
 
@@ -1191,7 +1191,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     public void getMajorAnalogQuantityByPageByTHGF(String gatewayId, String stationId) {
         if (StringUtils.isNotEmpty(gatewayId)) {
             // 10kVⅡ段母线数据
-            String xianSql = String.format("SELECT equipmentIndexName, value, frontModule, unit, displayName FROM \"indicators_%s\" WHERE systemType = '模拟量' and frontModule = '10kVⅡ段母线'", gatewayId);
+            String xianSql = String.format("SELECT equipmentIndexName, value, frontModule, unit, displayName FROM \"indicators_%s\" WHERE systemType = '模拟量' and frontModule = '35kVⅠ母PT'", gatewayId);
             List<IndicatorsDto> xianData = influxDButils.getListData(xianSql, IndicatorsDto.class);
             HashMap<String, Object> resultMap = new HashMap<>();
             xianData.forEach(item -> resultMap.put(item.getDisplayName(), item.getValue()));
@@ -1282,13 +1282,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
 
     public Map<String, Object> getSwitchUrl(String gatewayId,String equipName ){
-        String sql = "SELECT * FROM indicators_" + gatewayId + " WHERE systemType = '开关'" + " and displayName =~/合位$/";
-        String sql1 = "SELECT * FROM indicators_" + gatewayId + " WHERE systemType = '开关'" + " and displayName =~/远方就地开关$/";
-        String sql2 = "SELECT * FROM indicators_" + gatewayId + " WHERE systemType = '开关'" + " and displayName =~/接地刀位置$/";
+        String sql = "SELECT * FROM indicators_" + gatewayId + " WHERE systemType =~/开关/" + " and displayName =~/合位$/";
+        String sql1 = "SELECT * FROM indicators_" + gatewayId + " WHERE systemType =~/开关/" + " and displayName =~/远方就地开关$/";
+        String sql2 = "SELECT * FROM indicators_" + gatewayId + " WHERE systemType =~/开关/" + " and displayName =~/接地刀位置$/";
         if (StringUtils.isNotEmpty(equipName)) {
-             sql = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType = '开关' and frontModule =~ /"+equipName+"/ and displayName =~/合位$/";
-             sql1 = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType = '开关' and frontModule =~ /"+equipName+"/ and displayName =~/远方就地开关$/";
-             sql2 = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType = '开关' and frontModule =~ /"+equipName+"/ and displayName =~/接地刀位置$/";
+             sql = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType =~/开关/ and frontModule =~ /"+equipName+"/ and displayName =~/合位$/";
+             sql1 = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType =~/开关/ and frontModule =~ /"+equipName+"/ and displayName =~/远方就地开关$/";
+             sql2 = "SELECT * FROM indicators_"+gatewayId+" WHERE systemType =~/开关/ and frontModule =~ /"+equipName+"/ and displayName =~/接地刀位置$/";
         }
         List<IndicatorsDto> listData = influxDButils.getListData(sql, IndicatorsDto.class);
         List<IndicatorsDto> listDatas = influxDButils.getListData(sql1, IndicatorsDto.class);
@@ -1309,7 +1309,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         for (IndicatorsDto data : listDatas) {
             String url = "";
             String[] urls = data.getPictureName().split(",");
-            if (data.getValue().equals("true")){
+            if (StringUtils.isNotEmpty(data.getValue()) && data.getValue().equals("true")){
                 url =pictureUrl+urls[0];
             }else {
                 url =pictureUrl+ urls[1];;