1.工况变量区间划分相关代码提交

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java

@@ -102,7 +102,7 @@ public class MyBatisPlusCodeGenerator {
         gc.setActiveRecord(false);
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://39.98.45.134:3306/tzs_amos_ugp_biz?serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://172.16.10.220:3306/yeeamos_amos_idx_biz?serverTimezone=GMT%2B8");
         // dsc.setSchemaName("public");
 //        dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");

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

@@ -51,6 +51,6 @@ public class TestController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "test",   notes = "列表全部数据查询")
 	@GetMapping(value = "/test")
 	public void selectForListTest() {
-		 commonServiceImpl.getGateWayId();
+		 commonServiceImpl.getIdxBizUxfvList();
 	}
 }

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

@@ -45,10 +45,10 @@ public class IdxBizC80cDto  {
     private Double correlationCoefficient;
 
     @TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+    private Long analysisPointId;
 
     @TableField("PROCESS_POINT_ID")
-    private Integer processPointId;
+    private Long processPointId;
 
     @ApiModelProperty(value = "片区")
     @TableField("ARAE")

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

@@ -45,10 +45,10 @@ public class IdxBizHjevDto {
     private Double correlationCoefficient;
 
     @TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+    private Long analysisPointId;
 
     @TableField("PROCESS_POINT_ID")
-    private Integer processPointId;
+    private Long processPointId;
 
     @ApiModelProperty(value = "片区")
     @TableField("ARAE")

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

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.experimental.Accessors;
-import java.time.LocalDateTime;
+
+import java.util.Date;
 
 
 /**
@@ -36,7 +37,7 @@ public class IdxBiz208l  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 
@@ -96,13 +97,13 @@ public class IdxBiz208l  {
      * 
      */
 	@TableField("ANALYSIS_START_TIME")
-    private LocalDateTime analysisStartTime;
+    private Date analysisStartTime;
 
     /**
      *
      */
 	@TableField("ANALYSIS_END_TIME")
-    private LocalDateTime analysisEndTime;
+    private Date analysisEndTime;
 
     /**
      * 片区

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBiz3yud  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBiz59c8  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizAahn  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizBtlq  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

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

@@ -69,13 +69,13 @@ public class IdxBizC80c  {
      * 
      */
 	@TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+    private Long analysisPointId;
 
     /**
      * 
      */
 	@TableField("PROCESS_POINT_ID")
-    private Integer processPointId;
+    private Long processPointId;
 
     /**
      * 片区

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

@@ -40,7 +40,7 @@ public class IdxBizFelk {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 
@@ -70,7 +70,7 @@ public class IdxBizFelk {
      * 分析维度seq
      */
 	@TableField("ANALYSIS_OBJ_SEQ")
-    private Integer analysisObjSeq;
+    private Long analysisObjSeq;
 
     /**
      * 
@@ -100,13 +100,13 @@ public class IdxBizFelk {
      * 
      */
 	@TableField("ANALYSIS_START_TIME")
-    private LocalDateTime analysisStartTime;
+    private Date analysisStartTime;
 
     /**
      * 
      */
 	@TableField("ANALYSIS_END_TIME")
-    private LocalDateTime analysisEndTime;
+    private Date analysisEndTime;
 
     /**
      * 片区

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

@@ -68,13 +68,13 @@ public class IdxBizHjev  {
      * 
      */
 	@TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+    private Long analysisPointId;
 
     /**
      * 
      */
 	@TableField("PROCESS_POINT_ID")
-    private Integer processPointId;
+    private Long processPointId;
 
     /**
      * 片区

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizIegc  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizKsia  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizP2z9  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizPldo {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizUhef  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizUxfv  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizYh88  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizZrdb  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

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

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizUxfv;
 
+import java.util.List;
+
 /**
  *  Mapper 接口
  *
@@ -10,5 +12,6 @@ import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizUxfv;
  * @date 2023-08-14
  */
 public interface IdxBizUxfvMapper extends BaseMapper<IdxBizUxfv> {
+    List<String> gateWayIdListFan();
 
 }

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBiz3yud;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizC80c;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizHjev;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizUxfv;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBiz3yudMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizC80cMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizHjevMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizUxfvMapper;
 import com.yeejoin.amos.component.influxdb.InfluxdbUtil;
+import org.apache.poi.ss.formula.functions.T;
+import org.elasticsearch.gateway.Gateway;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
+
 @Service
 public class CommonServiceImpl {
+    //    idx_biz_hjev 光伏监测变量
+    //    idx_biz_c80c 风电监测变量 （根据设备、系统、型号查分析和工况测点）
+    //    idx_biz_3yud 光伏工况变量划分
+    //    idx_biz_uxfv 风电 工况变量划分 （工况/分析变量划分）
+    //    idx_biz_iegc光伏 预警记录
+    //    idx_biz_zrdb 风电 预警记录
+    //    idx_biz_felk 光伏 健康状态指数
+    //    idx_biz_208l风电 健康状态指数
+    //    idx_biz_uhef 风电 工况组合中心
+    //    idx_biz_59c8 光伏 工况组合中心
+    //    idx_biz_yh88风电 工况数据字典
+    //    idx_biz_ksia光伏 工况数据字典
+    //    idx_biz_p2z9光伏 预警规则配置表
+    //    idx_biz_aahn风电 预警规则配置表
+    //    idx_biz_btlq光伏 健康等级划分表
+    //    idx_biz_pldo 风电 健康等级划分表
+
+    //    idx_biz_c80c 风电监测变量 （根据设备、系统、型号查分析和工况测点）
     @Autowired
     private IdxBizC80cMapper idxBizC80cMapper;
+    //    idx_biz_hjev 光伏监测变量
     @Autowired
     private IdxBizHjevMapper idxBizHjevMapper;
-
+    //    idx_biz_3yud 光伏工况变量划分
+    @Autowired
+    private IdxBiz3yudMapper idxBiz3yudMapper;
+    //    idx_biz_uxfv 风电 工况变量划分 （工况/分析变量划分）
+    @Autowired
+    private IdxBizUxfvMapper idxBizUxfvMapper;
     @Autowired
     InfluxdbUtil influxdbUtil;
 
-    public List<IdxBizC80c> getAllFanstationTestPoint(){
+    public List<IdxBizC80c> getAllFanstationTestPoint() {
         List<IdxBizC80c> idxBizC80cList = new ArrayList<>();
         idxBizC80cList = idxBizC80cMapper.selectList(new QueryWrapper<IdxBizC80c>().isNotNull("SEQUENCE_NBR"));
         return idxBizC80cList;
     }
-    public List<IdxBizHjev> getAllPVstationTestPoint(){
+
+    public List<IdxBizHjev> getAllPVstationTestPoint() {
         List<IdxBizHjev> idxBizC80cList = new ArrayList<>();
         idxBizC80cList = idxBizHjevMapper.selectList(new QueryWrapper<IdxBizHjev>().isNotNull("SEQUENCE_NBR"));
         return idxBizC80cList;
     }
-     public List<String> getGateWayId(){
-        List<String> gateWayIdList=idxBizC80cMapper.gateWayIdListFan();
+
+    public List<String> getGateWayId() {
+        List<String> gateWayIdList = idxBizC80cMapper.gateWayIdListFan();
         return gateWayIdList;
-     }
- }
+    }
+
+    /**
+     * @return
+     * @deprecated 获取网关及及工况变量列表
+     */
+    public HashMap<String, List<IdxBizUxfv>> getIdxBizUxfvList() {
+
+        HashMap<String, List<IdxBizUxfv>> IdxBizUxfvHashMap = new HashMap<>();
+        List<String> gateWayIdList = idxBizUxfvMapper.gateWayIdListFan();
+        List<IdxBizUxfv> idxBizUxfvList = idxBizUxfvMapper.selectList(new QueryWrapper<IdxBizUxfv>().isNotNull("SEQUENCE_NBR").eq("TAG_CODE", "工况变量"));
+        List<IdxBizUxfv> finalIdxBizUxfvList = idxBizUxfvList;
+        gateWayIdList.forEach(s -> {
+            IdxBizUxfvHashMap.put("iot_data_" + s, finalIdxBizUxfvList.stream().filter(idxBizUxfv -> idxBizUxfv.getGatewayId().equals(s)).collect(Collectors.toList()));
+        });
+        return IdxBizUxfvHashMap;
+    }
+
+    public void getConditionVariablesByTime(String startTime, String endTime) {
+        HashMap<String, List<IdxBizUxfv>> IdxBizUxfvHashMap = getIdxBizUxfvList();
+        IdxBizUxfvHashMap.keySet().forEach(s -> {
+            List<IdxBizUxfv> list = IdxBizUxfvHashMap.get(s);
+            foreachHandlerConditionVariab(s, list, startTime, endTime);
+        });
+    }
+
+    public void foreachHandlerConditionVariab(String tableName, List<IdxBizUxfv> list, String startTime, String endTime) {
+        HashMap<String, List<IdxBizUxfv>> IdxBizUxfvHashMap = getIdxBizUxfvList();
+        List<Map<String, String>> params = new ArrayList<>();
+        list.forEach(idxBizUxfv -> {
+            String sql = String.format("select value from %s wehre index_addres='%s' and where time >= '%s' and where time <= '%s' ", tableName, idxBizUxfv.getIndexAddress(), startTime, endTime);
+            List<Map<String, Object>> returnList = influxdbUtil.query(sql);
+            returnList.forEach((k) -> {
+                Map<String, String> map = new HashMap<>();
+                map.put("", k.get("value").toString());
+                map.put("", idxBizUxfv.getSequenceNbr());
+                params.add(map);
+            });
+        });
+        System.out.println(params.size());
+    }
+}

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizUxfvMapper">
-
+    <select id="gateWayIdListFan" resultType="java.lang.String">
+        select GATEWAY_ID from idx_biz_uxfv group by GATEWAY_ID;
+    </select>
 </mapper>