解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/Enum/SmartAnalyseEnum.java

+package com.yeejoin.amos.boot.module.jxiop.biz.Enum;
+
+public enum SmartAnalyseEnum {
+    FAN_QJHF("FAN_QJHF", "风机区间变量划分"),
+    FAN_XGX("FAN_XGX","风机相关性"),
+
+    FAN_ZXZ("FAN_ZXZ","风机中心值"),
+
+    PV_QJHF("PV_QJHF","光伏区间变量划分"),
+
+    PV_XGX("PV_XGX","光伏相关性"),
+
+    PV_ZXZ("PV_ZXZ","光伏中心值");
+
+    private String key;
+    private String name;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    SmartAnalyseEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/Thread/MyServiceThread.java

+package com.yeejoin.amos.boot.module.jxiop.biz.Thread;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.Enum.SmartAnalyseEnum;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+
+public class MyServiceThread extends Thread {
+    Logger logger = LoggerFactory.getLogger(MyServiceThread.class);
+    private String startTime;
+    private String endTime;
+    private CommonServiceImpl commonService;
+    private String type;
+
+
+    public MyServiceThread(CommonServiceImpl commonService, String startTime, String endTime, String type) {
+        this.commonService = commonService;
+        this.startTime = startTime;
+        this.endTime = endTime;
+        this.type = type;
+    }
+
+    @Override
+    public void run() {
+        if (type.equals(SmartAnalyseEnum.FAN_QJHF.getKey())) {
+            this.commonService.getFanConditionVariablesByTime(this.startTime, this.endTime);
+            logger.info("--------------------------开始通过线程调用风机区间划分算法-----------------------");
+        } else if (type.equals(SmartAnalyseEnum.FAN_XGX.getKey())) {
+           this.commonService.getFanConditionVariablesByTimeAnalyse(startTime, endTime);
+            logger.info("--------------------------开始通过线程调用风机相关性算法-----------------------");
+        } else if (type.equals(SmartAnalyseEnum.FAN_ZXZ.getKey())) {
+            this.commonService.getFanConditionVariablesByTimeAnalyse1(startTime, endTime);
+            logger.info("--------------------------开始通过线程调用风机中心值算法-----------------------");
+        } else if (type.equals(SmartAnalyseEnum.PV_QJHF.getKey())) {
+            this.commonService.getPvConditionVariablesByTime(startTime, endTime);
+            logger.info("--------------------------开始通过线程调用光伏区间划分算法-----------------------");
+        } else if (type.equals(SmartAnalyseEnum.PV_XGX.getKey())) {
+            this.commonService.getPvConditionVariablesByTimeAnalyse(startTime, endTime);
+            logger.info("--------------------------开始通过线程调用光伏相关性算法-----------------------");
+        } else if (type.equals(SmartAnalyseEnum.PV_ZXZ.getKey())) {
+            this.commonService.getPvConditionVariablesByTimeAnalyse1(startTime, endTime);
+            logger.info("--------------------------开始通过线程调用光伏中心值算法-----------------------");        }
+    }
+}

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

@@ -29,38 +29,38 @@ public class AnalyseController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "工况测点区间划分-风机", notes = "工况测点区间划分-风机")
     @GetMapping(value = "/getFanConditionVariablesByTime")
-    public void getFanConditionVariablesByTime(@RequestParam String startTime, @RequestParam String endTime) {
-        commonServiceImpl.getFanConditionVariablesByTime(startTime, endTime);
+    public ResponseModel<String> getFanConditionVariablesByTime(@RequestParam String startTime, @RequestParam String endTime) {
+        return ResponseHelper.buildResponse(commonServiceImpl.getFanConditionVariablesByTimeThread(startTime, endTime));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "工况测点区间划分-光伏", notes = "工况测点区间划分-光伏")
     @GetMapping(value = "/getPvConditionVariablesByTime")
-    public void getPvConditionVariablesByTime(@RequestParam String startTime, @RequestParam String endTime) {
-        commonServiceImpl.getPvConditionVariablesByTime(startTime, endTime);
+    public ResponseModel<String> getPvConditionVariablesByTime(@RequestParam String startTime, @RequestParam String endTime) {
+        return ResponseHelper.buildResponse(commonServiceImpl.getPvConditionVariablesByTimeThread(startTime, endTime));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "相关性分析-风机", notes = "相关性分析-风机")
     @GetMapping(value = "/getFanConditionVariablesByTimeAnalyse")
-    public void getFanConditionVariablesByTimeAnalyse(@RequestParam String startTime, @RequestParam String endTime) {
-        commonServiceImpl.getFanConditionVariablesByTimeAnalyse(startTime, endTime);
+    public ResponseModel<String> getFanConditionVariablesByTimeAnalyse(@RequestParam String startTime, @RequestParam String endTime) {
+        return ResponseHelper.buildResponse(commonServiceImpl.getFanConditionVariablesByTimeAnalyseThread(startTime, endTime));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "相关性分析-风机", notes = "相关性分析-风机")
     @GetMapping(value = "/getPvConditionVariablesByTimeAnalyse")
-    public void getPvConditionVariablesByTimeAnalyse(@RequestParam String startTime, @RequestParam String endTime) {
-        commonServiceImpl.getPvConditionVariablesByTimeAnalyse(startTime, endTime);
+    public ResponseModel<String> getPvConditionVariablesByTimeAnalyse(@RequestParam String startTime, @RequestParam String endTime) {
+        return ResponseHelper.buildResponse(commonServiceImpl.getPvConditionVariablesByTimeAnalyseThread(startTime, endTime));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "中心值计算-风机", notes = "中心值计算-风机")
     @GetMapping(value = "/getFanConditionVariablesByTimeAnalyse1")
-    public void getFanConditionVariablesByTimeAnalyse1(@RequestParam String startTime, @RequestParam String endTime) {
-        commonServiceImpl.getFanConditionVariablesByTimeAnalyse1(startTime, endTime);
+    public ResponseModel<String> getFanConditionVariablesByTimeAnalyse1(@RequestParam String startTime, @RequestParam String endTime) {
+        return ResponseHelper.buildResponse(commonServiceImpl.getFanConditionVariablesByTimeAnalyse1Thread(startTime, endTime));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "中心值计算-光伏", notes = "中心值计算-光伏")
     @GetMapping(value = "/getPvConditionVariablesByTimeAnalyse1")
-    public void getPvConditionVariablesByTimeAnalyse1(@RequestParam String startTime, @RequestParam String endTime) {
-        commonServiceImpl.getPvConditionVariablesByTimeAnalyse1(startTime, endTime);
+    public ResponseModel<String> getPvConditionVariablesByTimeAnalyse1(@RequestParam String startTime, @RequestParam String endTime) {
+        return ResponseHelper.buildResponse(commonServiceImpl.getPvConditionVariablesByTimeAnalyse1Thread(startTime, endTime));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizPvPointProcessVariableClassificationDto.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -29,7 +30,7 @@ public class IdxBizPvPointProcessVariableClassificationDto  {
     private String record;
 
     @TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     @TableField("REC_USER_ID")
     private String recUserId;
@@ -92,7 +93,7 @@ public class IdxBizPvPointProcessVariableClassificationDto  {
     private String subarray;
 
     @TableField("GATEWAY_ID")
-    private Integer gatewayId;
+    private String gatewayId;
 
     @ApiModelProperty(value = "点表地址")
     @TableField("INDEX_ADDRESS")
@@ -102,4 +103,11 @@ public class IdxBizPvPointProcessVariableClassificationDto  {
     @TableField("KKS")
     private String kks;
 
+ private Double currentValue;
+
+ private String pointOneId;
+ private String pointTwoId;
+ private String pointThreeId;
+
+ private String analysVariableId;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanHealthIndex.java

@@ -2,12 +2,11 @@ package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
+import java.util.Date;
+
 
 /**
  * 
@@ -38,7 +37,7 @@ public class IdxBizFanHealthIndex {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 
@@ -68,7 +67,7 @@ public class IdxBizFanHealthIndex {
      * 分析维度seq
      */
 	@TableField("ANALYSIS_OBJ_SEQ")
-    private Integer analysisObjSeq;
+    private String analysisObjSeq;
 
     /**
      * 
@@ -98,13 +97,13 @@ public class IdxBizFanHealthIndex {
      * 
      */
 	@TableField("ANALYSIS_START_TIME")
-    private LocalDateTime analysisStartTime;
+    private Date analysisStartTime;
 
     /**
      * 
      */
 	@TableField("ANALYSIS_END_TIME")
-    private LocalDateTime analysisEndTime;
+    private Date analysisEndTime;
 
     /**
      * 片区
@@ -148,4 +147,8 @@ public class IdxBizFanHealthIndex {
 	@TableField("INDEX_ADDRESS")
     private String indexAddress;
 
+
+    @TableField("ANOMALY")
+    private Double ANOMALY;
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanPointProcessVariableClassification.java

 package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
@@ -17,7 +18,6 @@ import java.util.Date;
  * @date 2023-08-15
  */
 @Data
-
 @Accessors(chain = true)
 @TableName("idx_biz_fan_point_process_variable_classification")
 public class IdxBizFanPointProcessVariableClassification{
@@ -27,7 +27,7 @@ public class IdxBizFanPointProcessVariableClassification{
     /**
      * 
      */
-	@TableField("SEQUENCE_NBR")
+	@TableId("SEQUENCE_NBR")
     private String sequenceNbr;
 
     /**

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanPointVarCentralValue.java

 package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -28,7 +29,7 @@ public class IdxBizFanPointVarCentralValue{
     /**
      * 
      */
-	@TableId("SEQUENCE_NBR")
+	@TableId(value = "SEQUENCE_NBR",type = IdType.UUID)
     private String sequenceNbr;
 
     /**
@@ -79,11 +80,6 @@ public class IdxBizFanPointVarCentralValue{
 	@TableField("INTERVAL_COMBINATION")
     private String intervalCombination;
 
-    /**
-     * 
-     */
-//	@TableField("ANALYSIS_POINT_ID")
-//    private String analysisPointId;
 
     /**
      * 片区
@@ -133,11 +129,6 @@ public class IdxBizFanPointVarCentralValue{
 	@TableField("PROCESS1_MAX")
     private Double process1Max;
 
-    /**
-     * 工况变量1ID
-     */
-//	@TableField("PROCESS_POINT1_ID")
-//    private String processPoint1Id;
 
     /**
      * 工况量2区间最小值

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanPointVarCorrelation.java

 package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
@@ -27,7 +28,7 @@ public class IdxBizFanPointVarCorrelation{
     /**
      * 
      */
-	@TableField("SEQUENCE_NBR")
+	@TableId("SEQUENCE_NBR")
     private String sequenceNbr;
 
     /**

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanWarningRecord.java

@@ -69,13 +69,13 @@ public class IdxBizFanWarningRecord{
      * 
      */
 	@TableField("HEALTH_INDEX_SEQ")
-    private Integer healthIndexSeq;
+    private String healthIndexSeq;
 
     /**
      * 
      */
 	@TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+    private String analysisPointId;
 
     /**
      * 预警等级

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvHealthIndex.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 
@@ -39,7 +40,7 @@ public class IdxBizPvHealthIndex{
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 
@@ -69,7 +70,7 @@ public class IdxBizPvHealthIndex{
      * 分析维度seq
      */
 	@TableField("ANALYSIS_OBJ_SEQ")
-    private Integer analysisObjSeq;
+    private String analysisObjSeq;
 
     /**
      * 
@@ -141,7 +142,7 @@ public class IdxBizPvHealthIndex{
      * 网关ID
      */
 	@TableField("GATEWAY_ID")
-    private Integer gatewayId;
+    private String gatewayId;
 
     /**
      * 点表地址
@@ -155,4 +156,8 @@ public class IdxBizPvHealthIndex{
 	@TableField("EQUIPMENT_NAME")
     private String equipmentName;
 
+
+	@TableField("ANOMALY")
+    private Double ANOMALY;
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointProcessVariableClassification.java

 package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
@@ -27,7 +29,7 @@ public class IdxBizPvPointProcessVariableClassification{
     /**
      * 
      */
-	@TableField("SEQUENCE_NBR")
+	@TableId(value="SEQUENCE_NBR",type = IdType.UUID)
     private String sequenceNbr;
 
     /**
@@ -64,31 +66,31 @@ public class IdxBizPvPointProcessVariableClassification{
      * 工况区间值1
      */
 	@TableField("INTERVAL_VALUE1")
-    private Integer intervalValue1;
+    private Double intervalValue1;
 
     /**
      * 工况区间值2
      */
 	@TableField("INTERVAL_VALUE2")
-    private Integer intervalValue2;
+    private Double intervalValue2;
 
     /**
      * 工况区间值3
      */
 	@TableField("INTERVAL_VALUE3")
-    private Integer intervalValue3;
+    private Double intervalValue3;
 
     /**
      * 工况区间值4
      */
 	@TableField("INTERVAL_VALUE4")
-    private Integer intervalValue4;
+    private Double intervalValue4;
 
     /**
      * 工况区间值5
      */
 	@TableField("INTERVAL_VALUE5")
-    private Integer intervalValue5;
+    private Double intervalValue5;
 
     /**
      * 标签
@@ -121,6 +123,12 @@ public class IdxBizPvPointProcessVariableClassification{
     private String equipmentName;
 
     /**
+     * 测点
+     */
+    @TableField("POINT_NAME")
+    private String pointName;
+
+    /**
      * 厂商
      */
 	@TableField("MANUFACTURER")

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointVarCentralValue.java

@@ -80,8 +80,8 @@ public class IdxBizPvPointVarCentralValue{
     /**
      * 
      */
-//	@TableField("ANALYSIS_POINT_ID")
-//    private Integer analysisPointId;
+	@TableField("ANALYSIS_POINT_ID")
+    private String analysisPointId;
 
     /**
      * 片区
@@ -118,12 +118,22 @@ public class IdxBizPvPointVarCentralValue{
      */
 	@TableField("DEVICE_TYPE")
     private String deviceType;
+    /**
+     *
+     */
+    @TableField("PROCESS1_MIN")
+    private Double process1Min;
 
     /**
      * 
      */
 	@TableField("PROCESS2_MIN")
     private Double process2Min;
+    /**
+     *
+     */
+    @TableField("PROCESS1_MAX")
+    private Double process1Max;
 
     /**
      * 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointVarCorrelation.java

 package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
@@ -27,7 +28,7 @@ public class IdxBizPvPointVarCorrelation{
     /**
      * 
      */
-	@TableField("SEQUENCE_NBR")
+	@TableId("SEQUENCE_NBR")
     private String sequenceNbr;
 
     /**

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvWarningRecord.java

@@ -75,7 +75,7 @@ public class IdxBizPvWarningRecord{
      * 
      */
 	@TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+    private String analysisPointId;
 
     /**
      * 预警等级
@@ -117,7 +117,7 @@ public class IdxBizPvWarningRecord{
      * 网关ID
      */
 	@TableField("GATEWAY_ID")
-    private Integer gatewayId;
+    private String gatewayId;
 
     /**
      * 点表地址
@@ -131,4 +131,9 @@ public class IdxBizPvWarningRecord{
 	@TableField("EQUIPMENT_NAME")
     private String equipmentName;
 
+    /**
+     * 预警内容
+     * */
+    @TableField("CONTENT")
+    private String CONTENT;
 }

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

 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.IdxBizFanPointProcessVariableClassificationDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableClassificationDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvPointProcessVariableClassification;
 
 import java.util.List;
@@ -13,4 +15,7 @@ import java.util.List;
  */
 public interface IdxBizPvPointProcessVariableClassificationMapper extends BaseMapper<IdxBizPvPointProcessVariableClassification> {
     List<String> gateWayIdListPv();
+
+    List<IdxBizPvPointProcessVariableClassificationDto> getInfluxDBData();
+
 }

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

@@ -4,4 +4,54 @@
     <select id="gateWayIdListPv" resultType="java.lang.String">
         select GATEWAY_ID from idx_biz_pv_point_process_variable_classification group by GATEWAY_ID;
     </select>
+
+    <select id="getInfluxDBData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableClassificationDto">
+        SELECT b.*,
+               ibfpvcv.PROCESS_POINT1_ID as pointOneId,
+               ibfpvcv.PROCESS_POINT2_ID as pointTwoId,
+               ibfpvcv.PROCESS_POINT3_ID as pointThreeId,
+               ibfpvcv.ANALYSIS_POINT_ID as pointId
+        FROM (
+                 SELECT *
+                 FROM idx_biz_pv_point_process_variable_classification uxfv
+                 WHERE uxfv.SEQUENCE_NBR IN (
+                     SELECT PROCESS_POINT1_ID
+                     FROM `idx_biz_pv_point_var_central_value`
+                     WHERE ANALYSIS_POINT_ID IS NOT NULL
+                     GROUP BY ANALYSIS_POINT_ID,
+                              PROCESS_POINT1_ID,
+                              PROCESS_POINT3_ID,
+                              PROCESS_POINT2_ID
+                     UNION ALL
+                     SELECT PROCESS_POINT2_ID
+                     FROM `idx_biz_pv_point_var_central_value`
+                     WHERE ANALYSIS_POINT_ID IS NOT NULL
+                     GROUP BY ANALYSIS_POINT_ID,
+                              PROCESS_POINT1_ID,
+                              PROCESS_POINT3_ID,
+                              PROCESS_POINT2_ID
+                     UNION ALL
+                     SELECT PROCESS_POINT3_ID
+                     FROM `idx_biz_pv_point_var_central_value`
+                     WHERE ANALYSIS_POINT_ID IS NOT NULL
+                     GROUP BY ANALYSIS_POINT_ID,
+                              PROCESS_POINT1_ID,
+                              PROCESS_POINT3_ID,
+                              PROCESS_POINT2_ID
+                     UNION ALL
+                     SELECT ANALYSIS_POINT_ID
+                     FROM `idx_biz_pv_point_var_central_value`
+                     WHERE ANALYSIS_POINT_ID IS NOT NULL
+                     GROUP BY ANALYSIS_POINT_ID,
+                              PROCESS_POINT1_ID,
+                              PROCESS_POINT3_ID,
+                              PROCESS_POINT2_ID
+                 )) AS b,
+             idx_biz_pv_point_var_central_value ibfpvcv
+        WHERE b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT1_ID
+           OR b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT2_ID
+           OR b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT3_ID
+           OR b.SEQUENCE_NBR = ibfpvcv.ANALYSIS_POINT_ID
+        GROUP BY b.SEQUENCE_NBR
+    </select>
 </mapper>

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

@@ -23,4 +23,13 @@ public enum QrcodeColorEnum {
         }
         return null;
     }
+    public static String getName(String code) {
+
+        for (QrcodeColorEnum qrcodeColorEnum : QrcodeColorEnum.values()) {
+            if (qrcodeColorEnum.getCode().equals(code)) {
+                return qrcodeColorEnum.getName();
+            }
+        }
+        return null;
+    }
 }

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

 package com.yeejoin.amos.boot.module.jxiop.api.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.EXPersonUser;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.UserMapperDto;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 人员基本信息 Mapper 接口
@@ -44,4 +46,13 @@ public interface PersonBasicMapper extends BaseMapper<PersonBasic> {
                                            @Param("orgCode") String orgCode,
                                            @Param("ids")  String [] ids
     );
+
+    List<Map<String, Object>> getPersonYardStatistics(@Param("parentCode") String parentCode);
+
+
+    List<Map<String, Object>> getPersonYardByPage(@Param("current") Integer current,
+                                                  @Param("size")  Integer size,
+                                                  @Param("parentCode") String parentCode);
+
+    Integer getPersonYardByPageCount(@Param("parentCode") String parentCode);
 }

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

@@ -193,5 +193,50 @@
 
     </select>
 
+    <select id="getPersonYardStatistics" resultType="java.util.Map">
+        SELECT
+            qrcode_color as qrCodeColor,
+            count( 1 ) as value
+        FROM
+            person_basic
+            <where>
+                <if test="parentCode != null and parentCode != ''">
+                    AND project_org_code like concat(#{parentCode},'%')
+                </if>
+            </where>
+        GROUP BY
+            qrcode_color
+    </select>
 
+    <select id="getPersonYardByPage" resultType="java.util.Map">
+        SELECT
+        ifnull(b.name, '') as personName ,
+        ifnull(a.qrcode_color, '') AS qrCodeColor,
+        ifnull(c.station_name, '') AS stationName
+        FROM
+        person_basic a
+        LEFT JOIN person_account b ON a.sequence_nbr = b.person_id
+        LEFT JOIN station_basic c ON a.project_org_code = c.project_org_code
+        <where>
+            <if test="parentCode != null and parentCode != ''">
+                AND a.project_org_code like concat(#{parentCode},'%')
+            </if>
+        </where>
+        ORDER BY  a.rec_date DESC
+        limit #{current},#{size}
+    </select>
+
+    <select id="getPersonYardByPageCount" resultType="java.lang.Integer">
+        SELECT
+        count(1)
+        FROM
+        person_basic a
+        LEFT JOIN person_account b ON a.sequence_nbr = b.person_id
+        LEFT JOIN station_basic c ON a.project_org_code = c.project_org_code
+        <where>
+            <if test="parentCode != null and parentCode != ''">
+                AND a.project_org_code like concat(#{parentCode},'%')
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -14,6 +14,8 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.text.ParseException;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.PersonBasicServiceImpl;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -177,4 +179,33 @@ public class PersonBasicController extends BaseController {
         response.setDevMessage(message);
         return response;
     }
+
+    /**
+     * 评估大屏 - 人员赋码环形图查询
+     *
+     * @param parentCode 父级code
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getPersonYardStatistics")
+    @ApiOperation(httpMethod = "GET", value = "评估大屏 - 人员赋码环形图查询", notes = "评估大屏 - 人员赋码环形图查询")
+    public ResponseModel<List<Map<String, Object>>> getPersonYardStatistics(@RequestParam(required = false, value = "parentCode") String parentCode) {
+        List<Map<String, Object>> resultList = personBasicServiceImpl.getPersonYardStatistics(parentCode);
+        return ResponseHelper.buildResponse(resultList);
+    }
+
+    /**
+     * 评估大屏 - 人员赋码列表查询
+     *
+     * @param parentCode 父级code
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getPersonYardByPage")
+    @ApiOperation(httpMethod = "GET", value = "评估大屏 - 人员赋码列表查询", notes = "评估大屏 - 人员赋码列表查询")
+    public ResponseModel<Page<Map<String, Object>>> getPersonYardByPage(@RequestParam(required = false, value = "parentCode") String parentCode,
+                                                                        @RequestParam(value = "current") Integer current,
+                                                                        @RequestParam(value = "size") Integer size) {
+        Page<Map<String, Object>> resultList = personBasicServiceImpl.getPersonYardByPage(parentCode, current, size);
+        return ResponseHelper.buildResponse(resultList);
+    }
+
 }

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

@@ -602,4 +602,30 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         return page;
     }
 
+    public List<Map<String, Object>> getPersonYardStatistics(String parentCode) {
+        List<Map<String, Object>> resultList = personBasicMapper.getPersonYardStatistics(parentCode);
+        resultList.forEach(item -> {
+            String name = QrcodeColorEnum.getName(String.valueOf(item.get("qrCodeColor")));
+            item.put("name", name);
+            item.put("value", Integer.parseInt(item.get("value").toString()));
+        });
+        return resultList;
+    }
+
+
+    public Page<Map<String, Object>> getPersonYardByPage(String parentCode, Integer current, Integer size) {
+        List<Map<String, Object>> resultList = personBasicMapper.getPersonYardByPage((current - 1) * size, size , parentCode);
+        Integer count = personBasicMapper.getPersonYardByPageCount(parentCode);
+
+        resultList.forEach(item -> {
+            String name = QrcodeColorEnum.getName(String.valueOf(item.get("qrCodeColor")));
+            item.put("name", name);
+        });
+        Page<Map<String, Object>> mapPage = new Page<>();
+        mapPage.setRecords(resultList);
+        mapPage.setCurrent(current);
+        mapPage.setSize(size);
+        mapPage.setTotal(count);
+        return mapPage;
+    }
 }
\ No newline at end of file

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

@@ -640,7 +640,7 @@ public class MonitorFanIdxController extends BaseController {
         data8.put("title",columnMap.get("总辐射累计").toString());
         objects.add(data8);
         Map<String, Object> data9 = new HashMap<>();
-        data9.put("title","84.00%");//综合效率
+        data9.put("title","0.00%");//综合效率
         objects.add(data9);
 
 

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

@@ -254,7 +254,7 @@ public class MonitoringServiceIMQTTmpl {
             data6.put("title", Float.valueOf(columnMap.get("有功功率").toString()));
             objects.add(data6);
             Map<String, Object> data7 = new HashMap<>();
-            data7.put("title", 7.47);
+            data7.put("title", 0.00);
             objects.add(data7);
             IPage<Map<String, Object>> result = new Page<>();
             result.setRecords(objects);

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

@@ -423,7 +423,7 @@ public class MonitoringServiceImpl {
                     speendOrirradiate = String.valueOf(commonServiceImpl.getAvgvalueByIndicatior(stationBasic.getFanGatewayId(), "30秒平均风速"));
                     homeMapStationInfoDto.setSpeendOrirradiate(speendOrirradiate);
                 } else {
-                    homeMapStationInfoDto.setSpeendOrirradiate(String.valueOf(Math.random() * 100));
+                    homeMapStationInfoDto.setSpeendOrirradiate("0.00");
                 }
                 StationCoordinate stationCoordinate = stationCoordinateList.stream().filter(stationCoordinate1 -> stationCoordinate1.getStationId().equals(stationBasic.getSequenceNbr())).collect(Collectors.toList()).get(0);
                 //获取场站经纬度