解决冲突

amos-boot-module/amos-boot-module-api/amos-boot-module-kgd-api/src/main/java/com/yeejoin/amos/kgd/config/SocketConfig.java

@@ -26,6 +26,9 @@ public class SocketConfig {
     @Value("${amos.system.socket.port}")
     private Integer port;
 
+    @Value("${amos.system.socket.hostAndPort}")
+    private String hostAndPort;
+
     private static final ThreadPoolExecutor threadpool = new ThreadPoolExecutor(15, 15,
             10L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
 
@@ -46,7 +49,7 @@ public class SocketConfig {
                 clientSocket.setSoTimeout(10000);
                 // 创建新线程处理连接
                 log.info("接收到客户端socket: {}", clientSocket.getRemoteSocketAddress());
-                threadpool.execute(new ClientHandler(clientSocket));
+                threadpool.execute(new ClientHandler(clientSocket,hostAndPort));
             }
         } catch (IOException e) {
             throw new RuntimeException(e);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanHealthIndexController.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanHealthIndexDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRecord;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanHealthIndexServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,6 +16,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -154,6 +158,33 @@ public class IdxBizFanHealthIndexController extends BaseController {
 		return ResponseHelper.buildResponse(	idxBizFanHealthIndexServiceImpl.queryForLeftTableListByPointNum(STATION, HEALTHLEVEL, EQUIPMENTNAME,POINTNAME));
 	}
 
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@ApiOperation(httpMethod = "GET",value = "预警监测设备级统计",   notes = "预警监测设备级统计")
+	@GetMapping(value = "/queryForPointNum")
+	public ResponseModel<List<Map<String,Object>>> queryForLeftTableListByPointNum(@RequestParam(required = false) String STATION,@RequestParam(required = false) String SUBARRAY,@RequestParam(required = false) String  EQUIPMENTNAME) {
+		List<IdxBizFanWarningRecord> idxBizPvWarningRecordList = idxBizFanHealthIndexServiceImpl.warningData(STATION, SUBARRAY, EQUIPMENTNAME);
+		int total = idxBizFanHealthIndexServiceImpl.pointNum(STATION, SUBARRAY, EQUIPMENTNAME);
+
+		Map<String,Object> warningNum =new HashMap<>();
+		warningNum.put("name","注意");
+		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count());
+		warningNum.put("name","警告");
+		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count());
+		warningNum.put("name","危险");
+		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("危险")).count());
+
+		Map<String,Object> pointNum =new  HashMap<>();
+		pointNum.put("name","正常");
+		pointNum.put("value",total  - idxBizPvWarningRecordList.size());
+
+		List<Map<String,Object>> list = new ArrayList<>();
+		list.add(pointNum);
+		list.add(warningNum);
+
+		return ResponseHelper.buildResponse(list);
+	}
+
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(httpMethod = "GET",value = "测点运行趋势图",   notes = "测点运行趋势图")
     @GetMapping(value = "/getqyt")

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvHealthIndexController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvHealthIndexDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvHealthIndexServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -166,16 +167,20 @@ public class IdxBizPvHealthIndexController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "预警监测设备级统计",   notes = "预警监测设备级统计")
 	@GetMapping(value = "/queryForPointNum")
 	public ResponseModel<List<Map<String,Object>>> queryForLeftTableListByPointNum(@RequestParam(required = false) String STATION,@RequestParam(required = false) String SUBARRAY,@RequestParam(required = false) String  EQUIPMENTNAME) {
-		List<Map<String, Object>> maps = idxBizPvHealthIndexServiceImpl.warningData(STATION, SUBARRAY, EQUIPMENTNAME);
+		List<IdxBizPvWarningRecord> idxBizPvWarningRecordList = idxBizPvHealthIndexServiceImpl.warningData(STATION, SUBARRAY, EQUIPMENTNAME);
 		int total = idxBizPvHealthIndexServiceImpl.pointNum(STATION, SUBARRAY, EQUIPMENTNAME);
 
 		Map<String,Object> warningNum =new  HashMap<>();
-		warningNum.put("name","异常");
-		warningNum.put("value",maps.size());
+		warningNum.put("name","注意");
+		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count());
+		warningNum.put("name","警告");
+		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count());
+		warningNum.put("name","危险");
+		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("危险")).count());
 
 		Map<String,Object> pointNum =new  HashMap<>();
 		pointNum.put("name","正常");
-		pointNum.put("value",total  - maps.size());
+		pointNum.put("value",total  - idxBizPvWarningRecordList.size());
 
 		List<Map<String,Object>> list = new ArrayList<>();
 		list.add(pointNum);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/kafka/KafkaConsumerService.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.*;
@@ -198,12 +199,12 @@ public class KafkaConsumerService {
                 List<IdxBizFanPointVarCentralValue> insertList = new ArrayList<>();
                 for (int i = 0; i < length; i++) {
                     IdxBizFanPointVarCentralValue idxBizFanPointVarCentralValue = new IdxBizFanPointVarCentralValue();
-                    idxBizFanPointVarCentralValue.setProcess1Min(jsonObject.getJSONArray("process1Min").getDoubleValue(i));
-                    idxBizFanPointVarCentralValue.setProcess2Min(jsonObject.getJSONArray("process2Min").getDoubleValue(i));
-                    idxBizFanPointVarCentralValue.setProcess3Min(jsonObject.getJSONArray("process3Min").getDoubleValue(i));
-                    idxBizFanPointVarCentralValue.setProcess1Max(jsonObject.getJSONArray("process1Max").getDoubleValue(i));
-                    idxBizFanPointVarCentralValue.setPorcess2Max(jsonObject.getJSONArray("process2Max").getDoubleValue(i));
-                    idxBizFanPointVarCentralValue.setProcess3Max(jsonObject.getJSONArray("process3Max").getDoubleValue(i));
+                    idxBizFanPointVarCentralValue.setProcess1Min(ObjectUtils.isNull(jsonObject.getJSONArray("process1Min").get(i)) ? null : jsonObject.getJSONArray("process1Min").getDoubleValue(i));
+                    idxBizFanPointVarCentralValue.setProcess2Min(ObjectUtils.isNull(jsonObject.getJSONArray("process2Min").get(i)) ? null : jsonObject.getJSONArray("process2Min").getDoubleValue(i));
+                    idxBizFanPointVarCentralValue.setProcess3Min(ObjectUtils.isNull(jsonObject.getJSONArray("process3Min").get(i)) ? null : jsonObject.getJSONArray("process3Min").getDoubleValue(i));
+                    idxBizFanPointVarCentralValue.setProcess1Max(ObjectUtils.isNull(jsonObject.getJSONArray("process1Max").get(i)) ? null : jsonObject.getJSONArray("process1Max").getDoubleValue(i));
+                    idxBizFanPointVarCentralValue.setPorcess2Max(ObjectUtils.isNull(jsonObject.getJSONArray("process2Max").get(i)) ? null : jsonObject.getJSONArray("process2Max").getDoubleValue(i));
+                    idxBizFanPointVarCentralValue.setProcess3Max(ObjectUtils.isNull(jsonObject.getJSONArray("process3Max").get(i)) ? null : jsonObject.getJSONArray("process3Max").getDoubleValue(i));
                     idxBizFanPointVarCentralValue.setAnalysisPointId(analysisVariableId);
                     idxBizFanPointVarCentralValue.setAnalysisPointName(analysisVariable.getPointName());
                     idxBizFanPointVarCentralValue.setProcessPoint1Id(data1.get("processVariable1Id").toString());
@@ -212,8 +213,8 @@ public class KafkaConsumerService {
                     idxBizFanPointVarCentralValue.setProcessPoint2Name(processVariableList.get(1).getPointName());
                     idxBizFanPointVarCentralValue.setProcessPoint3Id(data1.get("processVariable3Id").toString());
                     idxBizFanPointVarCentralValue.setProcessPoint3Name(processVariableList.get(2).getPointName());
-                    idxBizFanPointVarCentralValue.setAnalysisStdDev(jsonObject.getJSONArray("stdDev").getDoubleValue(i));
-                    idxBizFanPointVarCentralValue.setAnalysisCenterValue(jsonObject.getJSONArray("centerValue").getDoubleValue(i));
+                    idxBizFanPointVarCentralValue.setAnalysisStdDev(ObjectUtils.isNull(jsonObject.getJSONArray("stdDev").get(i)) ? null : jsonObject.getJSONArray("stdDev").getDoubleValue(i));
+                    idxBizFanPointVarCentralValue.setAnalysisCenterValue(ObjectUtils.isNull(jsonObject.getJSONArray("centerValue").get(i)) ? null : jsonObject.getJSONArray("centerValue").getDoubleValue(i));
                     idxBizFanPointVarCentralValue.setArae(analysisVariable.getArae());
                     idxBizFanPointVarCentralValue.setStation(analysisVariable.getStation());
                     idxBizFanPointVarCentralValue.setSubSystem(analysisVariable.getSubSystem());
@@ -835,12 +836,12 @@ public class KafkaConsumerService {
                 List<IdxBizPvPointVarCentralValue> insertList = new ArrayList<>();
                 for (int i = 0; i < length; i++) {
                     IdxBizPvPointVarCentralValue idxBizPvPointVarCentralValue = new IdxBizPvPointVarCentralValue();
-                    idxBizPvPointVarCentralValue.setProcess1Min(jsonObject.getJSONArray("process1Min").getDoubleValue(i));
-                    idxBizPvPointVarCentralValue.setProcess2Min(jsonObject.getJSONArray("process2Min").getDoubleValue(i));
-                    idxBizPvPointVarCentralValue.setProcess3Min(jsonObject.getJSONArray("process3Min").getDoubleValue(i));
-                    idxBizPvPointVarCentralValue.setProcess1Max(jsonObject.getJSONArray("process1Max").getDoubleValue(i));
-                    idxBizPvPointVarCentralValue.setProcess2Max(jsonObject.getJSONArray("process2Max").getDoubleValue(i));
-                    idxBizPvPointVarCentralValue.setProcess3Max(jsonObject.getJSONArray("process3Max").getDoubleValue(i));
+                    idxBizPvPointVarCentralValue.setProcess1Min(ObjectUtils.isNull(jsonObject.getJSONArray("process1Min").get(i)) ? null : jsonObject.getJSONArray("process1Min").getDoubleValue(i));
+                    idxBizPvPointVarCentralValue.setProcess2Min(ObjectUtils.isNull(jsonObject.getJSONArray("process2Min").get(i)) ? null : jsonObject.getJSONArray("process2Min").getDoubleValue(i));
+                    idxBizPvPointVarCentralValue.setProcess3Min(ObjectUtils.isNull(jsonObject.getJSONArray("process3Min").get(i)) ? null : jsonObject.getJSONArray("process3Min").getDoubleValue(i));
+                    idxBizPvPointVarCentralValue.setProcess1Max(ObjectUtils.isNull(jsonObject.getJSONArray("process1Max").get(i)) ? null : jsonObject.getJSONArray("process1Max").getDoubleValue(i));
+                    idxBizPvPointVarCentralValue.setProcess2Max(ObjectUtils.isNull(jsonObject.getJSONArray("process2Max").get(i)) ? null : jsonObject.getJSONArray("process2Max").getDoubleValue(i));
+                    idxBizPvPointVarCentralValue.setProcess3Max(ObjectUtils.isNull(jsonObject.getJSONArray("process3Max").get(i)) ? null : jsonObject.getJSONArray("process3Max").getDoubleValue(i));
                     idxBizPvPointVarCentralValue.setAnalysisPointId(jsonObject.getString("analysisVariableId"));
                     idxBizPvPointVarCentralValue.setAnalysisPointIdName(analysisVariable.getPointName());
                     idxBizPvPointVarCentralValue.setProcessPoint1Id(jsonObject.getString("processVariable1Id"));
@@ -849,8 +850,8 @@ public class KafkaConsumerService {
                     idxBizPvPointVarCentralValue.setProcessPoint2IdName(processVariableList.get(1).getPointName());
                     idxBizPvPointVarCentralValue.setProcessPoint3Id(jsonObject.getString("processVariable3Id"));
                     idxBizPvPointVarCentralValue.setProcessPoint3IdName(processVariableList.get(2).getPointName());
-                    idxBizPvPointVarCentralValue.setAnalysisStdDev(jsonObject.getJSONArray("stdDev").getDoubleValue(i));
-                    idxBizPvPointVarCentralValue.setAnalysisCenterValue(jsonObject.getJSONArray("centerValue").getDoubleValue(i));
+                    idxBizPvPointVarCentralValue.setAnalysisStdDev(ObjectUtils.isNull(jsonObject.getJSONArray("stdDev").get(i)) ? null : jsonObject.getJSONArray("stdDev").getDoubleValue(i));
+                    idxBizPvPointVarCentralValue.setAnalysisCenterValue(ObjectUtils.isNull(jsonObject.getJSONArray("centerValue").get(i)) ? null : jsonObject.getJSONArray("centerValue").getDoubleValue(i));
                     idxBizPvPointVarCentralValue.setArae(analysisVariable.getArae());
                     idxBizPvPointVarCentralValue.setStation(analysisVariable.getStation());
                     idxBizPvPointVarCentralValue.setSubarray(analysisVariable.getSubarray());

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanHealthIndexMapper.java

@@ -5,6 +5,8 @@ import com.yeejoin.amos.boot.module.jxiop.biz.dto.FullViewRecallDataDTO;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanHealthIndexDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthIndex;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthLevel;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRecord;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -113,4 +115,9 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
 
     Map<String,Object> queryForLeftTableListByPointNum(String STATION, String HEALTHLEVEL,String EQUIPMENTNAME,String POINTNAME);
 
+
+
+    List<IdxBizFanWarningRecord> warningData(String STATION, String SUBARRAY, String EQUIPMENTNAME);
+    Integer pointNum(String STATION, String SUBARRAY, String EQUIPMENTNAME);
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizPvHealthIndexMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvHealthIndexDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvHealthIndex;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord;
 
 import java.util.List;
 import java.util.Map;
@@ -27,7 +28,7 @@ public interface IdxBizPvHealthIndexMapper extends BaseMapper<IdxBizPvHealthInde
     int queryForLeftTableListByPointCount(String STATION, String SUBARRAY, String HEALTHLEVEL, String EQUIPMENTNAME,String POINTNAME);
 
 
-    List<Map<String,Object>> warningData(String STATION, String SUBARRAY, String EQUIPMENTNAME);
+    List<IdxBizPvWarningRecord> warningData(String STATION, String SUBARRAY, String EQUIPMENTNAME);
     Integer pointNum(String STATION, String SUBARRAY, String EQUIPMENTNAME);
 
 

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

@@ -144,6 +144,14 @@ public class IdxBizFanHealthIndexServiceImpl extends BaseService<IdxBizFanHealth
         return  this.getBaseMapper().queryForLeftTableListByPointNum(STATION,HEALTHLEVEL,EQUIPMENTNAME,POINTNAME);
     }
 
+    public int pointNum(String STATION, String SUBARRAY,String EQUIPMENTNAME) {
+        return this.getBaseMapper().pointNum(STATION, SUBARRAY,EQUIPMENTNAME);
+    }
+
+    public  List<IdxBizFanWarningRecord> warningData(String STATION, String SUBARRAY , String EQUIPMENTNAME) {
+        return this.getBaseMapper().warningData(STATION, SUBARRAY, EQUIPMENTNAME);
+    }
+
 
 
 }
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvHealthIndexDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvHealthIndex;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvHealthIndexMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizPvHealthIndexService;
 import org.springframework.stereotype.Service;
@@ -61,7 +62,7 @@ public class IdxBizPvHealthIndexServiceImpl extends BaseService<IdxBizPvHealthIn
         return this.getBaseMapper().pointNum(STATION, SUBARRAY,EQUIPMENTNAME);
     }
 
-    public  List<Map<String,Object>> warningData(String STATION, String SUBARRAY , String EQUIPMENTNAME) {
+    public  List<IdxBizPvWarningRecord> warningData(String STATION, String SUBARRAY , String EQUIPMENTNAME) {
         return this.getBaseMapper().warningData(STATION, SUBARRAY, EQUIPMENTNAME);
     }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml

@@ -231,7 +231,7 @@
     <select id="getHealthInfoByStation" resultType="java.util.Map">
         SELECT
             a.STATION as station,
-            avg( a.avgHealthIndex ) AS healthIndex
+            CEILING(avg( a.avgHealthIndex )) AS healthIndex
         FROM
             (
                 SELECT
@@ -593,7 +593,7 @@
 
 <select id="getPvSubSystemInfo" resultType="java.util.Map">
     SELECT
-    IFNULL( AVG( HEALTH_INDEX ), 0 ) AS avgHealthIndex,
+    CEILING(IFNULL( AVG( HEALTH_INDEX ), 100 )) AS avgHealthIndex,
     EQUIPMENT_NAME AS equipmentName
     FROM
     idx_biz_pv_health_index
@@ -1171,4 +1171,41 @@
         </where>
     </select>
 
+    <select id="warningData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRecord">
+        SELECT
+        *
+        FROM
+        idx_biz_fan_warning_record re
+        WHERE
+        re.`STATUS` = 0
+        <if test="EQUIPMENTNAME != '' and EQUIPMENTNAME != null">
+            AND re.EQUIPMENT_NAME = #{EQUIPMENTNAME}
+        </if>
+        <if test="SUBARRAY != null and  SUBARRAY != '' ">
+            AND re.SUBARRAY = #{SUBARRAY}
+        </if>
+        <if test="STATION != null and  STATION != '' ">
+            AND re.STATION = #{STATION}
+        </if>
+    </select>
+
+    <select id="pointNum" resultType="int">
+        SELECT
+        count(1)
+        FROM
+        idx_biz_fan_point_process_variable_classification cl
+        WHERE
+        cl.TAG_CODE = '分析变量'
+        <if test="EQUIPMENTNAME != '' and EQUIPMENTNAME != null">
+            AND cl.EQUIPMENT_NAME = #{EQUIPMENTNAME}
+        </if>
+        <if test="SUBARRAY != null and  SUBARRAY != '' ">
+            AND cl.SUBARRAY = #{SUBARRAY}
+        </if>
+        <if test="STATION != null and  STATION != '' ">
+            AND cl.STATION = #{STATION}
+        </if>
+    </select>
+
+
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvHealthIndexMapper.xml

@@ -239,29 +239,22 @@
     </select>
 
 
-    <select id="warningData" resultType="map">
-        SELECT * FROM    (SELECT
-        cl. STATION,
-        cl. SUBARRAY,
-        cl.EQUIPMENT_NAME
+    <select id="warningData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord">
+        SELECT
+        *
         FROM
-            idx_biz_pv_point_process_variable_classification cl
-                INNER JOIN idx_biz_pv_warning_record re ON re.EQUIPMENT_NAME = cl.EQUIPMENT_NAME  AND re.STATION = cl.STATION AND re.SUBARRAY = cl.SUBARRAY
-                AND re.`STATUS` = 0
+        idx_biz_pv_warning_record re
         WHERE
-            cl.TAG_CODE = '分析变量'
-        GROUP BY cl.EQUIPMENT_NAME)  a
-        <where>
+        re.`STATUS` = 0
         <if test="EQUIPMENTNAME != '' and EQUIPMENTNAME != null">
-                AND a.EQUIPMENT_NAME = #{EQUIPMENTNAME}
+            AND re.EQUIPMENT_NAME = #{EQUIPMENTNAME}
         </if>
         <if test="SUBARRAY != null and  SUBARRAY != '' ">
-                AND a.SUBARRAY = #{SUBARRAY}
+            AND re.SUBARRAY = #{SUBARRAY}
         </if>
         <if test="STATION != null and  STATION != '' ">
-                AND a.STATION = #{STATION}
+            AND re.STATION = #{STATION}
         </if>
-        </where>
     </select>
 
     <select id="pointNum" resultType="int">

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tasks/BigScreenTask.java

@@ -39,7 +39,7 @@ public class BigScreenTask {
      * 但是大屏也需使用此功能，由于算法折线图样式与大屏风格不一致，故新画页面查询算法的预测表，
      * 但是算法服务只有调用查询，才生成数据，所以必须调用，否则大屏查询无预测数据
      */
-    @Scheduled(cron = "0 0/2 * * * ?")
+    @Scheduled(cron = "0 0/20 * * * ?")
     public void predictDataCreate() {
         List<StationBasicDto> stations = stationBasicService.getBaseMapper().getStationBasicListAll();
         stations.forEach(s -> {

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

@@ -259,12 +259,12 @@ public class DemoController extends BaseController {
                     equipmentsJxiopDocMysqlList.forEach(equipmentsJxiopDocMysql -> {
                         ESEquipments esEquipments = equipmentsRepository.findById(equipmentsJxiopDocMysql.getId()).get();
                         //更新模块
-                        if (equipmentsJxiopDocMysql.getFrontModule().contains(pointImportDto.getFrontModule())) {
+                        if (!equipmentsJxiopDocMysql.getFrontModule().contains(pointImportDto.getFrontModule())) {
                             equipmentsJxiopDocMysql.setFrontModule(equipmentsJxiopDocMysql.getFrontModule() + "," + pointImportDto.getFrontModule());
                             esEquipments.setFrontModule(equipmentsJxiopDocMysql.getFrontModule() + "," + pointImportDto.getFrontModule());
                         }
                         //更新类型
-                        if (equipmentsJxiopDocMysql.getSystemType().contains(pointImportDto.getSystemType())) {
+                        if (!equipmentsJxiopDocMysql.getSystemType().contains(pointImportDto.getSystemType())) {
                             equipmentsJxiopDocMysql.setSystemType(equipmentsJxiopDocMysql.getSystemType()+","+pointImportDto.getSystemType());
                             esEquipments.setSystemType(equipmentsJxiopDocMysql.getSystemType()+","+pointImportDto.getSystemType());
                         }

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

@@ -1378,8 +1378,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             Map<String, List<String>> queryCodtion = new HashMap<>();
             Map<String, String> likeMap = new HashMap<>();
             queryCodtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-            queryCodtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList("模拟量"));
+//            queryCodtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList("模拟量"));
             likeMap.put(CommonConstans.QueryStringFrontMoudle, map.get("boosterName"));
+            likeMap.put(CommonConstans.QueryStringSystemTypeKeyword, "模拟量");
             if ("1主变高压侧".equals(map.get("boosterName")) || "1主变低压侧".equals(map.get("boosterName"))) {
                 likeMap.put(CommonConstans.QueryStringFrontMoudle, "压侧");
                 List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryCodtion, null, ESEquipments.class, likeMap);
@@ -1407,6 +1408,11 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 }
             } else {
                 List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryCodtion, null, ESEquipments.class, likeMap);
+                Integer traceIdCount = listData.stream().filter(esEquipments -> !StringUtils.isEmpty(esEquipments.getTraceId())).collect(Collectors.toList()).size();
+                if (traceIdCount > 0) {
+                    listData = listData.stream().filter(esEquipments -> !StringUtils.isEmpty(esEquipments.getTraceId())).collect(Collectors.toList());
+                    listData.sort(Comparator.comparing(ESEquipments::getTraceId, Comparator.comparingInt(Integer::parseInt)));
+                }
                 ArrayList<Map<String, String>> resultList = new ArrayList<>();
                 listData.forEach(item -> {
                     HashMap<String, String> stringStringHashMap = new HashMap<>();

amos-boot-system-kgd/src/main/resources/application-dev.properties

 ## DB properties:
-spring.datasource.url=jdbc:mysql://172.16.3.18:3306/amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://172.16.3.221:3306/amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 ## eureka properties:
-eureka.instance.hostname=172.16.3.18
+eureka.instance.hostname=172.16.3.221
 eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=172.16.3.18
+spring.redis.host=172.16.3.221
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -43,13 +43,13 @@ lettuce.timeout=10000
 
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.3.18:2883
+emqx.broker=tcp://172.16.3.221:2883
 emqx.client-user-name=super
 emqx.client-password=a123456
 emqx.max-inflight=1000
 
 
-spring.influx.url=http://39.98.246.31:8086
+spring.influx.url=http://172.16.3.221:8086
 spring.influx.password=Yeejoin@2020
 spring.influx.user=root
 spring.influx.database=iot_platform

amos-boot-system-kgd/src/main/resources/application.properties

@@ -55,8 +55,11 @@ spring.http.encoding.charset=utf-8
 spring.http.encoding.enabled=true
 spring.http.encoding.force=true
 
+
+amos.system.socket.hostAndPort=172.16.3.221:10005
 amos.system.socket.port=7777
-amos.system.user.user-name=qms_sys
+amos.system.user.user-name=kgd_gdd
 amos.system.user.password=a1234560
 amos.system.user.app-key=AMOS_STUDIO
 amos.system.user.product=AMOS_STUDIO_WEB
+