1.智能分析平台修改表后业务代码更新

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

@@ -18,7 +18,7 @@ import java.util.Date;
 @Data
 
 @Accessors(chain = true)
-@TableName(value = "idx_biz_c80c",autoResultMap = true)
+@TableName(value = "idx_biz_fan_point_var_correlation",autoResultMap = true)
 public class IdxBizC80c  {
 
     private static final long serialVersionUID = 1L;

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

@@ -17,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-@TableName(value = "idx_biz_uxfv",autoResultMap = true)
+@TableName(value = "idx_biz_fan_point_process_variable_classification",autoResultMap = true)
 public class IdxBizUxfv  {
 
     private static final long serialVersionUID = 1L;

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 cn.hutool.http.HttpUtil;
-import cn.hutool.log.LogFactory;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ResultTreeType;
-import com.yeejoin.amos.AmosJxiopAnalyseApplication;
 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;
@@ -33,7 +30,7 @@ public class CommonServiceImpl {
     @Value("${base.url:http://36.40.66.175:30009/maas/maas/processes/api/}")
     String baseUrl;
     //----------------工况变量工况变量划分请求属性配置------------------------
-    @Value("${gkblhf.url:901b4627-4fb0-4527-ab2d-f6ea936c9b9d}")
+    @Value("${gkblhf.url:71ed06a2-4f09-44b5-a667-8547e4019525}")
     String gkqjhfurl;
     @Value("${gkblhf.key:input 1}")
     String gkqjhfkey;
@@ -390,9 +387,8 @@ public class CommonServiceImpl {
         return resultList;
     }
 
-    public List<Map<String, Object>> getInfluxdbDataByConditon() {
-        String sql = "select * from %s";
-        List<Map<String, Object>> result = influxdbUtil.query(sql);
-        return result;
+    public List<Map<String, Object>> getInfluxdbDataByConditon(String gateaway,String indictorName,String startTime,String endTime) {
+        String sql = String.format("select * from iot_data_%s where indictorName='%s' and time > '%s' and time < 'endTime' )",gateaway,indictorName,startTime,endTime);
+        return influxdbUtil.query(sql);
     }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application-dev.properties

@@ -7,7 +7,7 @@ spring.db1.datasource.password=Yeejoin@2020
 spring.db1.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
 ## db2-sync_data
 spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db2.datasource.url=jdbc:mysql://172.16.10.220:3306/yeeamos_amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db2.datasource.url=jdbc:mysql://36.40.66.175:3306/yeeamos_amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db2.datasource.username=root
 spring.db2.datasource.password=Yeejoin@2020
 spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver

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

@@ -2,6 +2,6 @@
 <!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.IdxBizC80cMapper">
     <select id="gateWayIdListFan" resultType="java.lang.String">
-        select ANALYSIS_GATEWAY_ID from idx_biz_c80c group by ANALYSIS_GATEWAY_ID;
+        select ANALYSIS_GATEWAY_ID from idx_biz_fan_point_var_correlation group by ANALYSIS_GATEWAY_ID;
     </select>
 </mapper>

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

@@ -51,6 +51,6 @@
     </select>
 
     <select id="gateWayIdListFan" resultType="java.lang.String">
-        select GATEWAY_ID from idx_biz_uxfv group by GATEWAY_ID;
+        select GATEWAY_ID from idx_biz_fan_point_process_variable_classification group by GATEWAY_ID;
     </select>
 </mapper>