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

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

@@ -705,6 +705,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "箱变实时开关状态")
     @GetMapping("/equipSwitchStatus")
+    @Scheduled(cron = "0/10 * * * * ? ")
     public ResponseModel<Map<String,Object>> getEquipSwitchStatus() {
 
 

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

@@ -1436,7 +1436,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     public HashMap<String, Object> getEquipInfoByEquipNum(String gatewayId ,String equipmentNumber){
         HashMap<String, Object> resultMap = new HashMap<>();
-        String sql = "SELECT * FROM indicators_"+gatewayId+" WHERE equipmentNumber ='"+equipmentNumber +"'and equipmentIndexName = '运行' limit 1  ";
+        String sql = "SELECT * FROM indicators_"+gatewayId+" WHERE equipmentNumber ='"+equipmentNumber +"' limit 1  ";
         List<IndicatorsDto> list = influxDButils.getListData(sql, IndicatorsDto.class);
         if (!ValidationUtil.isEmpty(list)){
             resultMap.put("equipmentSpecificName",list.get(0).getEquipmentSpecificName());
@@ -1511,7 +1511,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                     }else {
                         picturl = pictureUrl+"dlg-h-green.png";
                     }
-                if(e.getEquipmentIndexName().contains("合闸")){
+                if(e.getEquipmentIndexName().endsWith("断路器合闸")){
                     resultMap.put(e.getEquipmentIndexName().substring(0,3),picturl);
                     }else {
                     resultMap.put("gy",picturl);