Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/TanYinApiUtils.java

@@ -160,7 +160,7 @@ public class TanYinApiUtils {
         headers.put("Authorization", "Bearer " + getAccessToken(clientKey, clientSecret));
 
         // 记录请求日志。
-        log.debug("请求 => 碳银{}接口，url：{}，参数：{}，headers：{}", desc, url, paramsJsonStr, JSON.toJSONString(headers));
+        log.info("请求 => 碳银{}接口，url：{}，参数：{}，headers：{}", desc, url, paramsJsonStr, JSON.toJSONString(headers));
 
         HttpResponse response = null;
         try {
@@ -254,7 +254,7 @@ public class TanYinApiUtils {
     @SuppressWarnings ("unchecked")
     public <T, R> R parseResponse(String desc, HttpResponse response, Class<T> resultClass) {
         // 记录响应日志，包括接口描述、HTTP状态码和响应体。
-        log.debug("响应 => 碳银{}接口，httpCode：{}, response：{}", desc, response.getStatus(), response.body());
+        log.info("响应 => 碳银{}接口，httpCode：{}, response：{}", desc, response.getStatus(), response.body());
 
         // 检查响应是否成功，如果不成功则直接返回null。
         if (!response.isOk()) {
@@ -296,7 +296,7 @@ public class TanYinApiUtils {
      */
     public <T> PageInfo<T> parsePageResponse(String desc, HttpResponse response, Class<T> resultClass) {
         // 记录请求的响应信息到日志，包括描述、HTTP状态码和响应体。
-        log.info("响应 => 碳银{}接口，httpCode：{}, response：{}", desc, response.getStatus(), response.body());
+         log.debug("响应 => 碳银{}接口，httpCode：{}, response：{}", desc, response.getStatus(), response.body());
 
         // 将响应体解析为TanYinBaseResultDTO对象，其中包含分页数据。
         TanYinBaseResultDTO<JSONObject> listResult = JSONObject.parseObject(response.body(), TanYinBaseResultDTO.class);
@@ -318,10 +318,11 @@ public class TanYinApiUtils {
         TanYinPageResultDTO tanYinPageResultDTO = JSONObject.parseObject(listResult.getData().toJSONString(), TanYinPageResultDTO.class);
 
         // 将分页数据中的列表数据转换为指定类型的集合。
-        List<T> newList = (List<T>) tanYinPageResultDTO.getList().parallelStream().map(json -> JSON.toJavaObject((JSON) json, resultClass)).collect(Collectors.toList());
-
-        // 将转换后的集合设置到PageInfo对象中。
-        pageInfo.setList(newList);
+        if (tanYinPageResultDTO.getList() != null) {
+            List<T> newList = (List<T>) tanYinPageResultDTO.getList().parallelStream().map(json -> JSON.toJavaObject((JSON) json, resultClass)).collect(Collectors.toList());
+            // 将转换后的集合设置到PageInfo对象中。
+            pageInfo.setList(newList);
+        }
 
         // 设置分页信息，包括总页数、每页大小、当前页码和总记录数。
         pageInfo.setPages(tanYinPageResultDTO.getTotalPage() == null ? 0 : tanYinPageResultDTO.getTotalPage());

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/constant/TanYinConstant.java

@@ -29,6 +29,10 @@ public class TanYinConstant {
      */
     public static String inverterListUrl = "/v1/station/getTodayDetail";
     /**
+     * 电站逆变器故障信息接口
+     */
+    public static String inverterAlramUrl = "/v1/yx/query/invert/fault";
+    /**
      * 获取 Access_Token
      */
     public static String getAccessTokenUrl = "/v1/auth/getAccessToken";
@@ -47,7 +51,7 @@ public class TanYinConstant {
 
     public static final HashMap<String, String> intoNetWorkStatus = new HashMap<String, String>() {
         {
-            put("0", "普通并网");
+            put("0", "固定全额上网");
         }
     };
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TanYinAlramInfo.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 客户信息
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/15 16:11
+ */
+@NoArgsConstructor
+@Data
+@TableName (value = "tanyin_alram_info", autoResultMap = true)
+public class TanYinAlramInfo {
+
+    @ApiModelProperty ("项目编号")
+    @TableField ("project_no")
+    private String projectNo;
+
+    @TableField("create_time")
+    private Long createTime;
+
+    @ApiModelProperty ("逆变器 SN")
+    @TableField ("sn")
+    private String sn;
+
+    @ApiModelProperty ("故障状态")
+    @TableField ("status")
+    private String status;
+
+    @ApiModelProperty ("故障码")
+    @TableField ("code")
+    private String code;
+
+    @ApiModelProperty ("故障等级")
+    @TableField ("level")
+    private String level;
+
+    @ApiModelProperty ("故障内容")
+    @TableField ("content")
+    private String content;
+
+    @ApiModelProperty ("解决方法")
+    @TableField ("solution")
+    private String solution;
+
+    @ApiModelProperty ("故障发生时间")
+    @TableField ("fault_occur_time")
+    private String faultOccurTime;
+
+    @ApiModelProperty ("故障结束时间")
+    @TableField ("fault_end_time")
+    private String faultEndTime;
+
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TanYinAlramInfoMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TanYinAlramInfo;
+
+public interface TanYinAlramInfoMapper extends BaseMapper<TanYinAlramInfo> {
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TanYinCustomerInfoMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface TanYinCustomerInfoMapper extends BaseMapper<TanYinCustomerInfo> {
 
-    @Select("select project_no from tanyin_customer_info")
+    @Select("select project_no from tanyin_customer_info group by project_no")
     List<String> listProjectNo();
 
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/TanYinDataAcquisitionService.java

@@ -43,4 +43,13 @@ public interface TanYinDataAcquisitionService {
      */
     void inverterList();
 
+    /**
+     * 告警信息
+     *
+     * @return {@link }
+     * @throws
+     * @author yangyang
+     * @date 2024/7/24 09:44
+     */
+    void inverAlramInfo();
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-dev.properties

 ## DB properties hygf
 ## db1-production database
 spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db1.datasource.url=jdbc:mysql://47.92.234.253:3306/amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db1.datasource.url=jdbc:mysql://47.92.234.253:13306/amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db1.datasource.username=root
-spring.db1.datasource.password=Yeejoin@2020
+spring.db1.datasource.password=Yeejoin_1234
 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://47.92.234.253:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db2.datasource.url=jdbc:mysql://47.92.234.253:13306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db2.datasource.username=root
-spring.db2.datasource.password=Yeejoin@2020
+spring.db2.datasource.password=Yeejoin_1234
 spring.db2.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 ## db3-taosiData
 spring.db3.datasource.type: com.alibaba.druid.pool.DruidDataSource
@@ -78,4 +78,5 @@ dataRequstScheduled.Sofar=0 0/50 * * * *
 tanYin.api.apiUrl=https://userauth.tanwin.cn
 tanYin.api.clientSecret=rKrWVa2sXsSZeNAOW43v
 tanYin.api.clientKey=yx10001
-dataRequestScheduled.tanYin=0 0/10 * * * *
+dataRequestScheduled.tanYin=0 0/10 * * * *
\ No newline at end of file
+dataRequestScheduled.tanYin.warn=0 0/5 * * * *
\ No newline at end of file

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-dev1.properties

@@ -44,4 +44,11 @@ emqx.client-user-name=admin
 emqx.client-password=public
 
 ##biz custem properties
-biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
+biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
\ No newline at end of file
+
+# 碳银
+tanYin.api.apiUrl=https://userauth.tanwin.cn
+tanYin.api.clientSecret=rKrWVa2sXsSZeNAOW43v
+tanYin.api.clientKey=yx10001
+dataRequestScheduled.tanYin=0 0/10 * * * *
+dataRequestScheduled.tanYin.warn=0 0/5 * * * *
\ No newline at end of file

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-kingbase8.properties

@@ -72,4 +72,11 @@ dataRequstScheduled.keshida=0 0/50 * * * *
 dataRequstScheduled.Sunlight=0 0/50 * * * *
 dataRequstScheduled.GoodWe=0 0/3 * * * *
 
-dataRequstScheduled.Sofar=0 0/50 * * * *
+dataRequstScheduled.Sofar=0 0/50 * * * *
\ No newline at end of file
+
+# 碳银
+tanYin.api.apiUrl=https://userauth.tanwin.cn
+tanYin.api.clientSecret=rKrWVa2sXsSZeNAOW43v
+tanYin.api.clientKey=yx10001
+dataRequestScheduled.tanYin=0 0/10 * * * *
+dataRequestScheduled.tanYin.warn=0 0/5 * * * *
\ No newline at end of file

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-qa.properties

@@ -46,4 +46,11 @@ emqx.user-name=admin
 emqx.password=public
 
 ##biz custem properties
-biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
+biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
\ No newline at end of file
+
+# 碳银
+tanYin.api.apiUrl=https://userauth.tanwin.cn
+tanYin.api.clientSecret=rKrWVa2sXsSZeNAOW43v
+tanYin.api.clientKey=yx10001
+dataRequestScheduled.tanYin=0 0/10 * * * *
+dataRequestScheduled.tanYin.warn=0 0/5 * * * *
\ No newline at end of file

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

@@ -254,7 +254,8 @@ hygf.icbc.corpNo=10000000000000088011
 hygf.icbc.myPrivateKey=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCxMt/01YNUsTfG6ml8Nyw7Xs80k3G72mmnD8mpR5v6ZU0v7i8lynBJxqDWFRqo6brZr/yzneyuEM0c+qbhYA4NNgWuri87PFWZND5H249ZpEZPmnZSOg6R7RwiFQG8uhwMTlZwYkNJc6fBFnLvUwMu3pPHINx10iHh7dawbX1GZDKk82gUBaTzYMkg0CW8PtOUdGwW+4uyt5KGWp90MTqS47JmGCLWWwLMW3MhPe8/PBApFdRQi2cdOXHQ+HwleTL7kHXi2XEHnbIxZuOuyXUkiRog4fajs+ZS+o+YgC2JEhGN5om64LrSUXrEyeOZSdHMriKLxsBUbS5AUP8rOvqjAgMBAAECggEBAKwB55YhoK+Yq70ilSzn3b7wBJFTwyaIGOD7mVUCVy3UIf4x5oB3p1JmRoAp0kw/PorLo7CzzykU1BaaVV4XQOygERoEqYKFyc3DAeX9AoUQytPA67Rb+QK8OP/4hkwuGMX1UUEckZZ+d0wev4kDeuaHVsoIYxjX1t4aYrm2PtIRGFLYZvB44Chu8oCK/yesZ9JP+BKKPLJzsx1bEnxZHkQK4IJBWbxSbi/QGiJ254Q4nyinCPUuaRzpiiN/ZmbdLIZ4NYZeQr7sK4wXhgy6XMeMZFHm/WE0EKSBqR82oO6PL/AOR6v9GVMj9kGLfegQHsFyiDJKHzYqj80hX5tyZIkCgYEA6PdmNOpiplNBkg9xxGgSZIWqbRqKBTR51QDB2WPKkC27S7Biy1E+ncz7osSP9X16Y87eKV32ioqJzZ9eND1ri9DnETkPhnYfv4DJRsD3fTHZCtPh274KXASma4DyZnCJY913vjHKqAjJKwl10SR7EFGwQ1LOHKXkLrUa4rASvH0CgYEAwrfxXj+94YnFkialYNbVT3pYdYR0x6b9z70YnYktaZtWZO01hV8lpdpKi/6f5DMIrDC6d9QsjmVXEjZFv1YLlkqEc8FXsThsXWphCr27EtEwymlN90RiIjBInhUh4BrQqMRKbz8CAQgyxiNohEJUVwVlESNSBjfi0eNHFwRg3Z8CgYBE/X73DLJKLz2r04cNcwR/YFYoGUPmZrPtsFu31SWXrPNaZtHbBCRW9u1ONoerW41zIUAJYBoyzPQiQJ/VOJswvJyxLQS7/R9JxwnUOjEQkkKEQlsQiCbpOTdPftBKJemJ+XwMhxJM0M1CQXryhKstGgPo7Ay9zyLT8i4UE7B4wQKBgQCKiNo2Jv2OUDn7sHkq+84J3M7A1XtMbLfZq/yuYGGp6DXAWrAgcsBTToqJLaBOeCysbYLNLGyC5wDa2TgoWCyoQd4YiS89zBn1IHFodfJ6AdFHwUISMVnsXxPbPMe8LPfViso2ecqQN2gAZkK/Dn3458KvPcTm3a4HjD8Q1jGgmwKBgHbzvyt1R38BEGeDhJhqOaBuTeqgChPyQrd1dFRE2VicrTksldel3eHbLgq1iYRyw+l9M66a/03XiCa3yLMIGOn/hOQE7dGxmBI2x44Tf5LugBuQnc5WSXwJ3Qa4+Yjw5yMBL/Hw8hRFlt5ycpy2YyAZ/jdnoNiOuM5koFpQFvfs
 hygf.icbc.serviceUrl=https://apipcs3.dccnet.com.cn
 hygf.icbc.aesKey=5xGJdh7qb+B95SUoxDlatg==
-hygf.icbc.camsPublicKey=040978047533e0e7381dbb5d794b268cd68ad4655712d3de5bb37d6883c02e474374ff4dac6d706cef661aaa788c1dfc2c2f74b91d05f406ea135b865b416c8f97
+#hygf.icbc.camsPublicKey=040978047533e0e7381dbb5d794b268cd68ad4655712d3de5bb37d6883c02e474374ff4dac6d706cef661aaa788c1dfc2c2f74b91d05f406ea135b865b416c8f97
+hygf.icbc.camsPublicKey=7E095625BE87DF744C916E40BD6B1C1EA486125CA566006062D8FFBBD8BD536ABA64DA6B6A6070D65148A734F660A2A742372E5965E87F99CD644FAB5F6DF2B2
 hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03ctKM7KV+16bWZ5BMNgvEeuEQwfQYkRVwI9HFOGkwNTMn5hiJXHnlXYCX+zp5r6R52MY0O7BsTCLT7aHaxsANsvI9ABGx3OaTVlPB59M6GPbJh0uXvio0m1r/lTW3Z60RU6Q3oid/rNhP3CiNgg0W6O3AGqwIDAQAB
 hygf.icbc.outVendorId=071301
 hygf.icbc.projectId=PJ14001401B000160171

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev1.properties

@@ -255,8 +255,8 @@ hygf.icbc.corpNo=10000000000000088011
 hygf.icbc.myPrivateKey=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCxMt/01YNUsTfG6ml8Nyw7Xs80k3G72mmnD8mpR5v6ZU0v7i8lynBJxqDWFRqo6brZr/yzneyuEM0c+qbhYA4NNgWuri87PFWZND5H249ZpEZPmnZSOg6R7RwiFQG8uhwMTlZwYkNJc6fBFnLvUwMu3pPHINx10iHh7dawbX1GZDKk82gUBaTzYMkg0CW8PtOUdGwW+4uyt5KGWp90MTqS47JmGCLWWwLMW3MhPe8/PBApFdRQi2cdOXHQ+HwleTL7kHXi2XEHnbIxZuOuyXUkiRog4fajs+ZS+o+YgC2JEhGN5om64LrSUXrEyeOZSdHMriKLxsBUbS5AUP8rOvqjAgMBAAECggEBAKwB55YhoK+Yq70ilSzn3b7wBJFTwyaIGOD7mVUCVy3UIf4x5oB3p1JmRoAp0kw/PorLo7CzzykU1BaaVV4XQOygERoEqYKFyc3DAeX9AoUQytPA67Rb+QK8OP/4hkwuGMX1UUEckZZ+d0wev4kDeuaHVsoIYxjX1t4aYrm2PtIRGFLYZvB44Chu8oCK/yesZ9JP+BKKPLJzsx1bEnxZHkQK4IJBWbxSbi/QGiJ254Q4nyinCPUuaRzpiiN/ZmbdLIZ4NYZeQr7sK4wXhgy6XMeMZFHm/WE0EKSBqR82oO6PL/AOR6v9GVMj9kGLfegQHsFyiDJKHzYqj80hX5tyZIkCgYEA6PdmNOpiplNBkg9xxGgSZIWqbRqKBTR51QDB2WPKkC27S7Biy1E+ncz7osSP9X16Y87eKV32ioqJzZ9eND1ri9DnETkPhnYfv4DJRsD3fTHZCtPh274KXASma4DyZnCJY913vjHKqAjJKwl10SR7EFGwQ1LOHKXkLrUa4rASvH0CgYEAwrfxXj+94YnFkialYNbVT3pYdYR0x6b9z70YnYktaZtWZO01hV8lpdpKi/6f5DMIrDC6d9QsjmVXEjZFv1YLlkqEc8FXsThsXWphCr27EtEwymlN90RiIjBInhUh4BrQqMRKbz8CAQgyxiNohEJUVwVlESNSBjfi0eNHFwRg3Z8CgYBE/X73DLJKLz2r04cNcwR/YFYoGUPmZrPtsFu31SWXrPNaZtHbBCRW9u1ONoerW41zIUAJYBoyzPQiQJ/VOJswvJyxLQS7/R9JxwnUOjEQkkKEQlsQiCbpOTdPftBKJemJ+XwMhxJM0M1CQXryhKstGgPo7Ay9zyLT8i4UE7B4wQKBgQCKiNo2Jv2OUDn7sHkq+84J3M7A1XtMbLfZq/yuYGGp6DXAWrAgcsBTToqJLaBOeCysbYLNLGyC5wDa2TgoWCyoQd4YiS89zBn1IHFodfJ6AdFHwUISMVnsXxPbPMe8LPfViso2ecqQN2gAZkK/Dn3458KvPcTm3a4HjD8Q1jGgmwKBgHbzvyt1R38BEGeDhJhqOaBuTeqgChPyQrd1dFRE2VicrTksldel3eHbLgq1iYRyw+l9M66a/03XiCa3yLMIGOn/hOQE7dGxmBI2x44Tf5LugBuQnc5WSXwJ3Qa4+Yjw5yMBL/Hw8hRFlt5ycpy2YyAZ/jdnoNiOuM5koFpQFvfs
 hygf.icbc.serviceUrl=https://apipcs3.dccnet.com.cn
 hygf.icbc.aesKey=5xGJdh7qb+B95SUoxDlatg==
-hygf.icbc.camsPublicKey=040978047533e0e7381dbb5d794b268cd68ad4655712d3de5bb37d6883c02e474374ff4dac6d706cef661aaa788c1dfc2c2f74b91d05f406ea135b865b416c8f97
-hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03ctKM7KV+16bWZ5BMNgvEeuEQwfQYkRVwI9HFOGkwNTMn5hiJXHnlXYCX+zp5r6R52MY0O7BsTCLT7aHaxsANsvI9ABGx3OaTVlPB59M6GPbJh0uXvio0m1r/lTW3Z60RU6Q3oid/rNhP3CiNgg0W6O3AGqwIDAQAB
+#hygf.icbc.camsPublicKey=040978047533e0e7381dbb5d794b268cd68ad4655712d3de5bb37d6883c02e474374ff4dac6d706cef661aaa788c1dfc2c2f74b91d05f406ea135b865b416c8f97
+hygf.icbc.camsPublicKey=7E095625BE87DF744C916E40BD6B1C1EA486125CA566006062D8FFBBD8BD536ABA64DA6B6A6070D65148A734F660A2A742372E5965E87F99CD644FAB5F6DF2B2hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03ctKM7KV+16bWZ5BMNgvEeuEQwfQYkRVwI9HFOGkwNTMn5hiJXHnlXYCX+zp5r6R52MY0O7BsTCLT7aHaxsANsvI9ABGx3OaTVlPB59M6GPbJh0uXvio0m1r/lTW3Z60RU6Q3oid/rNhP3CiNgg0W6O3AGqwIDAQAB
 hygf.icbc.outVendorId=071301
 hygf.icbc.projectId=PJ14001401B000160171
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev220.properties

@@ -233,8 +233,8 @@ hygf.icbc.corpNo=10000000000000088011
 hygf.icbc.myPrivateKey=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCxMt/01YNUsTfG6ml8Nyw7Xs80k3G72mmnD8mpR5v6ZU0v7i8lynBJxqDWFRqo6brZr/yzneyuEM0c+qbhYA4NNgWuri87PFWZND5H249ZpEZPmnZSOg6R7RwiFQG8uhwMTlZwYkNJc6fBFnLvUwMu3pPHINx10iHh7dawbX1GZDKk82gUBaTzYMkg0CW8PtOUdGwW+4uyt5KGWp90MTqS47JmGCLWWwLMW3MhPe8/PBApFdRQi2cdOXHQ+HwleTL7kHXi2XEHnbIxZuOuyXUkiRog4fajs+ZS+o+YgC2JEhGN5om64LrSUXrEyeOZSdHMriKLxsBUbS5AUP8rOvqjAgMBAAECggEBAKwB55YhoK+Yq70ilSzn3b7wBJFTwyaIGOD7mVUCVy3UIf4x5oB3p1JmRoAp0kw/PorLo7CzzykU1BaaVV4XQOygERoEqYKFyc3DAeX9AoUQytPA67Rb+QK8OP/4hkwuGMX1UUEckZZ+d0wev4kDeuaHVsoIYxjX1t4aYrm2PtIRGFLYZvB44Chu8oCK/yesZ9JP+BKKPLJzsx1bEnxZHkQK4IJBWbxSbi/QGiJ254Q4nyinCPUuaRzpiiN/ZmbdLIZ4NYZeQr7sK4wXhgy6XMeMZFHm/WE0EKSBqR82oO6PL/AOR6v9GVMj9kGLfegQHsFyiDJKHzYqj80hX5tyZIkCgYEA6PdmNOpiplNBkg9xxGgSZIWqbRqKBTR51QDB2WPKkC27S7Biy1E+ncz7osSP9X16Y87eKV32ioqJzZ9eND1ri9DnETkPhnYfv4DJRsD3fTHZCtPh274KXASma4DyZnCJY913vjHKqAjJKwl10SR7EFGwQ1LOHKXkLrUa4rASvH0CgYEAwrfxXj+94YnFkialYNbVT3pYdYR0x6b9z70YnYktaZtWZO01hV8lpdpKi/6f5DMIrDC6d9QsjmVXEjZFv1YLlkqEc8FXsThsXWphCr27EtEwymlN90RiIjBInhUh4BrQqMRKbz8CAQgyxiNohEJUVwVlESNSBjfi0eNHFwRg3Z8CgYBE/X73DLJKLz2r04cNcwR/YFYoGUPmZrPtsFu31SWXrPNaZtHbBCRW9u1ONoerW41zIUAJYBoyzPQiQJ/VOJswvJyxLQS7/R9JxwnUOjEQkkKEQlsQiCbpOTdPftBKJemJ+XwMhxJM0M1CQXryhKstGgPo7Ay9zyLT8i4UE7B4wQKBgQCKiNo2Jv2OUDn7sHkq+84J3M7A1XtMbLfZq/yuYGGp6DXAWrAgcsBTToqJLaBOeCysbYLNLGyC5wDa2TgoWCyoQd4YiS89zBn1IHFodfJ6AdFHwUISMVnsXxPbPMe8LPfViso2ecqQN2gAZkK/Dn3458KvPcTm3a4HjD8Q1jGgmwKBgHbzvyt1R38BEGeDhJhqOaBuTeqgChPyQrd1dFRE2VicrTksldel3eHbLgq1iYRyw+l9M66a/03XiCa3yLMIGOn/hOQE7dGxmBI2x44Tf5LugBuQnc5WSXwJ3Qa4+Yjw5yMBL/Hw8hRFlt5ycpy2YyAZ/jdnoNiOuM5koFpQFvfs
 hygf.icbc.serviceUrl=https://apipcs3.dccnet.com.cn
 hygf.icbc.aesKey=5xGJdh7qb+B95SUoxDlatg==
-hygf.icbc.camsPublicKey=040978047533e0e7381dbb5d794b268cd68ad4655712d3de5bb37d6883c02e474374ff4dac6d706cef661aaa788c1dfc2c2f74b91d05f406ea135b865b416c8f97
-hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03ctKM7KV+16bWZ5BMNgvEeuEQwfQYkRVwI9HFOGkwNTMn5hiJXHnlXYCX+zp5r6R52MY0O7BsTCLT7aHaxsANsvI9ABGx3OaTVlPB59M6GPbJh0uXvio0m1r/lTW3Z60RU6Q3oid/rNhP3CiNgg0W6O3AGqwIDAQAB
+#hygf.icbc.camsPublicKey=040978047533e0e7381dbb5d794b268cd68ad4655712d3de5bb37d6883c02e474374ff4dac6d706cef661aaa788c1dfc2c2f74b91d05f406ea135b865b416c8f97
+hygf.icbc.camsPublicKey=7E095625BE87DF744C916E40BD6B1C1EA486125CA566006062D8FFBBD8BD536ABA64DA6B6A6070D65148A734F660A2A742372E5965E87F99CD644FAB5F6DF2B2hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03ctKM7KV+16bWZ5BMNgvEeuEQwfQYkRVwI9HFOGkwNTMn5hiJXHnlXYCX+zp5r6R52MY0O7BsTCLT7aHaxsANsvI9ABGx3OaTVlPB59M6GPbJh0uXvio0m1r/lTW3Z60RU6Q3oid/rNhP3CiNgg0W6O3AGqwIDAQAB
 hygf.icbc.outVendorId=071301
 hygf.icbc.projectId=PJ14001401B000160171
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-kingbase8.properties

@@ -255,8 +255,8 @@ hygf.icbc.corpNo=10000000000000088011
 hygf.icbc.myPrivateKey=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCxMt/01YNUsTfG6ml8Nyw7Xs80k3G72mmnD8mpR5v6ZU0v7i8lynBJxqDWFRqo6brZr/yzneyuEM0c+qbhYA4NNgWuri87PFWZND5H249ZpEZPmnZSOg6R7RwiFQG8uhwMTlZwYkNJc6fBFnLvUwMu3pPHINx10iHh7dawbX1GZDKk82gUBaTzYMkg0CW8PtOUdGwW+4uyt5KGWp90MTqS47JmGCLWWwLMW3MhPe8/PBApFdRQi2cdOXHQ+HwleTL7kHXi2XEHnbIxZuOuyXUkiRog4fajs+ZS+o+YgC2JEhGN5om64LrSUXrEyeOZSdHMriKLxsBUbS5AUP8rOvqjAgMBAAECggEBAKwB55YhoK+Yq70ilSzn3b7wBJFTwyaIGOD7mVUCVy3UIf4x5oB3p1JmRoAp0kw/PorLo7CzzykU1BaaVV4XQOygERoEqYKFyc3DAeX9AoUQytPA67Rb+QK8OP/4hkwuGMX1UUEckZZ+d0wev4kDeuaHVsoIYxjX1t4aYrm2PtIRGFLYZvB44Chu8oCK/yesZ9JP+BKKPLJzsx1bEnxZHkQK4IJBWbxSbi/QGiJ254Q4nyinCPUuaRzpiiN/ZmbdLIZ4NYZeQr7sK4wXhgy6XMeMZFHm/WE0EKSBqR82oO6PL/AOR6v9GVMj9kGLfegQHsFyiDJKHzYqj80hX5tyZIkCgYEA6PdmNOpiplNBkg9xxGgSZIWqbRqKBTR51QDB2WPKkC27S7Biy1E+ncz7osSP9X16Y87eKV32ioqJzZ9eND1ri9DnETkPhnYfv4DJRsD3fTHZCtPh274KXASma4DyZnCJY913vjHKqAjJKwl10SR7EFGwQ1LOHKXkLrUa4rASvH0CgYEAwrfxXj+94YnFkialYNbVT3pYdYR0x6b9z70YnYktaZtWZO01hV8lpdpKi/6f5DMIrDC6d9QsjmVXEjZFv1YLlkqEc8FXsThsXWphCr27EtEwymlN90RiIjBInhUh4BrQqMRKbz8CAQgyxiNohEJUVwVlESNSBjfi0eNHFwRg3Z8CgYBE/X73DLJKLz2r04cNcwR/YFYoGUPmZrPtsFu31SWXrPNaZtHbBCRW9u1ONoerW41zIUAJYBoyzPQiQJ/VOJswvJyxLQS7/R9JxwnUOjEQkkKEQlsQiCbpOTdPftBKJemJ+XwMhxJM0M1CQXryhKstGgPo7Ay9zyLT8i4UE7B4wQKBgQCKiNo2Jv2OUDn7sHkq+84J3M7A1XtMbLfZq/yuYGGp6DXAWrAgcsBTToqJLaBOeCysbYLNLGyC5wDa2TgoWCyoQd4YiS89zBn1IHFodfJ6AdFHwUISMVnsXxPbPMe8LPfViso2ecqQN2gAZkK/Dn3458KvPcTm3a4HjD8Q1jGgmwKBgHbzvyt1R38BEGeDhJhqOaBuTeqgChPyQrd1dFRE2VicrTksldel3eHbLgq1iYRyw+l9M66a/03XiCa3yLMIGOn/hOQE7dGxmBI2x44Tf5LugBuQnc5WSXwJ3Qa4+Yjw5yMBL/Hw8hRFlt5ycpy2YyAZ/jdnoNiOuM5koFpQFvfs
 hygf.icbc.serviceUrl=https://apipcs3.dccnet.com.cn
 hygf.icbc.aesKey=5xGJdh7qb+B95SUoxDlatg==
-hygf.icbc.camsPublicKey=040978047533e0e7381dbb5d794b268cd68ad4655712d3de5bb37d6883c02e474374ff4dac6d706cef661aaa788c1dfc2c2f74b91d05f406ea135b865b416c8f97
-hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03ctKM7KV+16bWZ5BMNgvEeuEQwfQYkRVwI9HFOGkwNTMn5hiJXHnlXYCX+zp5r6R52MY0O7BsTCLT7aHaxsANsvI9ABGx3OaTVlPB59M6GPbJh0uXvio0m1r/lTW3Z60RU6Q3oid/rNhP3CiNgg0W6O3AGqwIDAQAB
+#hygf.icbc.camsPublicKey=040978047533e0e7381dbb5d794b268cd68ad4655712d3de5bb37d6883c02e474374ff4dac6d706cef661aaa788c1dfc2c2f74b91d05f406ea135b865b416c8f97
+hygf.icbc.camsPublicKey=7E095625BE87DF744C916E40BD6B1C1EA486125CA566006062D8FFBBD8BD536ABA64DA6B6A6070D65148A734F660A2A742372E5965E87F99CD644FAB5F6DF2B2hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03ctKM7KV+16bWZ5BMNgvEeuEQwfQYkRVwI9HFOGkwNTMn5hiJXHnlXYCX+zp5r6R52MY0O7BsTCLT7aHaxsANsvI9ABGx3OaTVlPB59M6GPbJh0uXvio0m1r/lTW3Z60RU6Q3oid/rNhP3CiNgg0W6O3AGqwIDAQAB
 hygf.icbc.outVendorId=071301
 hygf.icbc.projectId=PJ14001401B000160171
 

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

-spring.application.name=AMOS-HYGF-CZ
+spring.application.name=AMOS-HYGF-YY
 server.servlet.context-path=/hygf
 server.port=33330
 server.uri-encoding=UTF-8
-spring.profiles.active=kingbase8
+spring.profiles.active=dev
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml
@@ -12,7 +12,16 @@ logging.config=classpath:logback-${spring.profiles.active}.xml
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 ## DB properties:
-
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=25
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=120000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.connection-test-query=SELECT 1
 
 
 ##liquibase
@@ -22,7 +31,7 @@ spring.liquibase.enabled=true
 
 ## eureka properties:
 eureka.instance.prefer-ip-address=true
-eureka.instance.ip-address=172.16.3.6
+eureka.instance.ip-address=172.26.190.244
 eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.health-check-url-path=/actuator/health
 eureka.instance.lease-expiration-duration-in-seconds=10
@@ -35,7 +44,7 @@ spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=10
 spring.redis.lettuce.pool.min-idle=0
-## redis失效时间
+## redisʧЧʱ��
 redis.cache.failure.time=10800
 
 spring.servlet.multipart.maxFileSize=100MB
@@ -49,14 +58,21 @@ spring.http.encoding.force=true
 
 
 privilege.fegin.name=AMOS-API-PRIVILEGE
-feign.client.config.default.connect-timeout=40000
-feign.client.config.default.read-timeout=40000
+feign.client.config.default.connect-timeout=20000
+feign.client.config.default.read-timeout=20000
 
 amos.system.user.user-name=hygf_robot
-amos.system.user.password=a1234560
+amos.system.user.password=a123456789
 amos.system.user.product=AMOS_STUDIO_WEB
 amos.system.user.app-key=AMOS_STUDIO
-workflow.feign.name=AMOS-API-WORKFLOW
 
 
-feign.okhttp.enabled= true
+
\ No newline at end of file
+dealer.appcode.manage=studio_normalapp_5155413,studio_normalapp_5133538
+dealer.appcode.role=1767363928842571777
+dealer.amosDealerId=1767820997374775298
+
+
+feign.okhttp.enabled= true
+
+workflow.feign.name=AMOS-API-WORKFLOW

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

@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
+import cn.hutool.core.date.DateUtil;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -176,4 +177,19 @@ public class TestController extends BaseController {
 			pvWaringRecordMapper.saveBatchWarningRecords(list1);
 		}
 	}
+
+	@TycloudOperation(ApiLevel = UserType.PUBLIC)
+	@ApiOperation(httpMethod = "GET", value = "test2", notes = "test1", hidden = true)
+	@GetMapping("/insertMomentData")
+	public void insertMomentData() {
+		try {
+			Date time = new Date();
+			time = DateUtil.offsetMinute(time, -DateUtil.minute(time) % 10);
+			String format = DateUtil.format(time, "yyyy-MM-dd HH:mm:00");
+			time = DateUtil.parse(format, "yyyy-MM-dd HH:mm:00");
+			tdengineTimeService.insertMomentDataNew(format);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 }

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex;
+
+import java.util.List;
+
+/**
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.boot.module.jxiop.biz.service
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/23 21:55
+ */
+public interface IFanHealthIndexService {
+
+    List<FanHealthIndex> getInfoListByGroupByZxtFan(String startTime, String tableName, String analysisObjectType);
+
+    /**
+     * 设备加权平均
+     * 加权平均数 = (w1 * x1 + w2 * x2 + … + wn * xn) / (w1 + w2 + … + wn)
+     * w1, w2, …, wn 是各个数据点的权重；
+     * x1, x2, …, xn 是各个数据点的数值；
+     * n 是数据点的总数。
+     *
+     * @param startTime          startTime
+     * @param tableName          tableName
+     * @param analysisObjectType analysisObjectType
+     * @return {@link  List< FanHealthIndex>}
+     * @throws
+     * @author yangyang
+     * @date 2024/7/23 21:02
+     */
+    List<FanHealthIndex> getInfoListByGroupBySbFan(String startTime, String tableName, String analysisObjectType);
+
+    /**
+     * 场站加权平均
+     * 加权平均数 = (w1 * x1 + w2 * x2 + … + wn * xn) / (w1 + w2 + … + wn)
+     * w1, w2, …, wn 是各个数据点的权重；
+     * x1, x2, …, xn 是各个数据点的数值；
+     * n 是数据点的总数。
+     *
+     * @param startTime          startTime
+     * @param tableName          tableName
+     * @param analysisObjectType analysisObjectType
+     * @return {@link  List< FanHealthIndex>}
+     * @throws
+     * @author yangyang
+     * @date 2024/7/23 21:02
+     */
+    List<FanHealthIndex> getInfoListByGroupByCzFan(String startTime, String tableName, String analysisObjectType);
+
+    /**
+     * 区域加权平均
+     * 加权平均数 = (w1 * x1 + w2 * x2 + … + wn * xn) / (w1 + w2 + … + wn)
+     * w1, w2, …, wn 是各个数据点的权重；
+     * x1, x2, …, xn 是各个数据点的数值；
+     * n 是数据点的总数。
+     *
+     * @param startTime          startTime
+     * @param tableName          tableName
+     * @param analysisObjectType analysisObjectType
+     * @return {@link  List< FanHealthIndex>}
+     * @throws
+     * @author yangyang
+     * @date 2024/7/23 21:02
+     */
+    List<FanHealthIndex> getInfoListByGroupByQyFan(String startTime, String tableName, String analysisObjectType);
+
+    /**
+     * 全域【所有 / 全国】加权平均
+     * 加权平均数 = (w1 * x1 + w2 * x2 + … + wn * xn) / (w1 + w2 + … + wn)
+     * w1, w2, …, wn 是各个数据点的权重；
+     * x1, x2, …, xn 是各个数据点的数值；
+     * n 是数据点的总数。
+     *
+     * @param startTime          startTime
+     * @param tableName          tableName
+     * @param analysisObjectType analysisObjectType
+     * @return {@link  List< FanHealthIndex>}
+     * @throws
+     * @author yangyang
+     * @date 2024/7/23 21:02
+     */
+    List<FanHealthIndex> getInfoListByGroupByQgFan(String startTime, String tableName, String analysisObjectType);
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * ProjectName: amos-boot-zx-biz
+ * PackageName: com.yeejoin.amos.boot.module.jxiop.biz.service.impl
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2024/7/23 21:59
+ */
+public interface IPvHealthIndexService {
+
+
+    /**
+     * 设备加权平均
+     * 加权平均数 = (w1 * x1 + w2 * x2 + … + wn * xn) / (w1 + w2 + … + wn)
+     * w1, w2, …, wn 是各个数据点的权重；
+     * x1, x2, …, xn 是各个数据点的数值；
+     * n 是数据点的总数。
+     *
+     * @param startTime          startTime
+     * @param tableName          tableName
+     * @param analysisObjectType analysisObjectType
+     * @return {@link  List <  FanHealthIndex >}
+     * @throws
+     * @author yangyang
+     * @date 2024/7/23 21:02
+     */
+    List<PvHealthIndex> getInfoListByGroupBySbPv(String startTime,
+                                                 String tableName,
+                                                 String analysisObjectType);
+
+    /**
+     * 子阵加权平均
+     * 加权平均数 = (w1 * x1 + w2 * x2 + … + wn * xn) / (w1 + w2 + … + wn)
+     * w1, w2, …, wn 是各个数据点的权重；
+     * x1, x2, …, xn 是各个数据点的数值；
+     * n 是数据点的总数。
+     *
+     * @param startTime          startTime
+     * @param tableName          tableName
+     * @param analysisObjectType analysisObjectType
+     * @return {@link  List< FanHealthIndex>}
+     * @throws
+     * @author yangyang
+     * @date 2024/7/23 21:02
+     */
+    List<PvHealthIndex> getInfoListByGroupByZzPv(String startTime,
+                                                 String tableName,
+                                                 String analysisObjectType);
+
+    /**
+     * 场站加权平均
+     * 加权平均数 = (w1 * x1 + w2 * x2 + … + wn * xn) / (w1 + w2 + … + wn)
+     * w1, w2, …, wn 是各个数据点的权重；
+     * x1, x2, …, xn 是各个数据点的数值；
+     * n 是数据点的总数。
+     *
+     * @param startTime          startTime
+     * @param tableName          tableName
+     * @param analysisObjectType analysisObjectType
+     * @return {@link  List< FanHealthIndex>}
+     * @throws
+     * @author yangyang
+     * @date 2024/7/23 21:02
+     */
+    List<PvHealthIndex> getInfoListByGroupByCzPv(String startTime,
+                                                 String tableName,
+                                                 String analysisObjectType);
+
+    /**
+     * 片区加权平均
+     * 加权平均数 = (w1 * x1 + w2 * x2 + … + wn * xn) / (w1 + w2 + … + wn)
+     * w1, w2, …, wn 是各个数据点的权重；
+     * x1, x2, …, xn 是各个数据点的数值；
+     * n 是数据点的总数。
+     *
+     * @param startTime          startTime
+     * @param tableName          tableName
+     * @param analysisObjectType analysisObjectType
+     * @return {@link  List< FanHealthIndex>}
+     * @throws
+     * @author yangyang
+     * @date 2024/7/23 21:02
+     */
+    List<PvHealthIndex> getInfoListByGroupByQyPv(String startTime,
+                                                 String tableName,
+                                                 String analysisObjectType);
+
+    /**
+     * 全域【所有 / 全国】加权平均
+     * 加权平均数 = (w1 * x1 + w2 * x2 + … + wn * xn) / (w1 + w2 + … + wn)
+     * w1, w2, …, wn 是各个数据点的权重；
+     * x1, x2, …, xn 是各个数据点的数值；
+     * n 是数据点的总数。
+     *
+     * @param startTime          startTime
+     * @param tableName          tableName
+     * @param analysisObjectType analysisObjectType
+     * @return {@link  List< FanHealthIndex>}
+     * @throws
+     * @author yangyang
+     * @date 2024/7/23 21:02
+     */
+    List<PvHealthIndex> getInfoListByGroupByQgPv(String startTime,
+                                                 String tableName,
+                                                 String analysisObjectType);
+}

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

@@ -9,6 +9,8 @@ import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvHealthLevel;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanHealthLevelMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvHealthIndexMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvHealthLevelMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IFanHealthIndexService;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IPvHealthIndexService;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.FanHealthIndexMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvHealthIndexMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex;
@@ -16,7 +18,6 @@ import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -54,6 +55,12 @@ public class TdengineTimeServiceImpl {
     @Autowired
     private HealthStatusIndicatorServiceImpl healthStatusIndicatorServiceImpl;
 
+    @Autowired
+    private IFanHealthIndexService fanHealthIndexService;
+
+    @Autowired
+    private IPvHealthIndexService pvHealthIndexService;
+
     /**
      * 风电 - 按时刻生成子系统、设备、场站、区域 数据
      */
@@ -83,6 +90,38 @@ public class TdengineTimeServiceImpl {
 
     }
 
+    public void insertMomentDataNew(String recDate) throws ParseException {
+        //s 489分钟 为  8小时  +  19分钟
+        String startTime = DateUtils.dateFormat(DateUtils.dateAddMinutes(new Date(), -489), DateUtils.DATE_TIME_PATTERN);
+        startTime = "2024-07-23 08:00:00";
+
+        // 子系统
+        List<IdxBizFanHealthLevel> levelListZxt = idxBizFanHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, "子系统").last("limit 4"));
+
+        List<FanHealthIndex> fanHealthIndices = fanHealthIndexService.getInfoListByGroupByZxtFan(startTime, "fan_health_index_moment", "测点");
+
+
+       List<FanHealthIndex> fanHealthIndicesZxt = fanHealthIndexMapper.getInfoListByGroupByZxtFan(startTime, "fan_health_index_moment", "测点");
+        //saveBatchFan(fanHealthIndicesZxt, "fan_health_index_moment", recDate, WarningPeriodEnum.MINUTES.getName(), levelListZxt);
+        // 设备
+        List<IdxBizFanHealthLevel> levelListSb = idxBizFanHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, "设备").last("limit 4"));
+        List<FanHealthIndex> fanHealthIndicesSb = fanHealthIndexMapper.getInfoListByGroupBySbFan(startTime, "fan_health_index_moment", "子系统");
+        //saveBatchFan(fanHealthIndicesSb, "fan_health_index_moment", recDate, WarningPeriodEnum.MINUTES.getName(), levelListSb);
+        // 场站
+        List<IdxBizFanHealthLevel> levelListCz = idxBizFanHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, "场站").last("limit 4"));
+        List<FanHealthIndex> fanHealthIndicesCz = fanHealthIndexMapper.getInfoListByGroupByCzFan(startTime, "fan_health_index_moment", "设备");
+        //saveBatchFan(fanHealthIndicesCz, "fan_health_index_moment", recDate, WarningPeriodEnum.MINUTES.getName(), levelListCz);
+        // 区域
+        List<IdxBizFanHealthLevel> levelListQy = idxBizFanHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, "片区").last("limit 4"));
+        List<FanHealthIndex> fanHealthIndicesQy = fanHealthIndexMapper.getInfoListByGroupByQyFan(startTime, "fan_health_index_moment", "场站");
+        //saveBatchFan(fanHealthIndicesQy, "fan_health_index_moment", recDate, WarningPeriodEnum.MINUTES.getName(), levelListQy);
+        // 全域【所有 / 全国】
+        List<IdxBizFanHealthLevel> levelListQg = idxBizFanHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, "全域").last("limit 4"));
+        List<FanHealthIndex> fanHealthIndicesQg = fanHealthIndexMapper.getInfoListByGroupByQgFan(startTime, "fan_health_index_moment", "片区");
+       // saveBatchFan(fanHealthIndicesQg, "fan_health_index_moment", recDate, WarningPeriodEnum.MINUTES.getName(), levelListQg);
+
+    }
+
 
     /**
      * 风电 - 按小时生成测点、子系统、设备、场站、区域 数据

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanHealthIndexMapper.java

@@ -102,4 +102,9 @@ public interface FanHealthIndexMapper extends BaseMapper<FanHealthIndex> {
     List<Map<String,Object>> getInfoByHour(@Param("areaCode") String areaCode, @Param("stationCode") String stationCode, @Param("list") List<String> list);
     
     List<Map<String,Object>> getInfoByMoment(@Param("areaCode") String areaCode, @Param("stationCode") String stationCode, @Param("list") List<String> list);
+
+    List<FanHealthIndex> getInfoList(@Param("startTime") String startTime,
+                                                    @Param("tableName") String tableName,
+                                                    @Param("analysisObjectType") String analysisObjectType);
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexMapper.java

@@ -62,4 +62,8 @@ public interface PvHealthIndexMapper extends BaseMapper<PvHealthIndex> {
     List<PvHealthIndex> getInfoByPage(@Param("dto") PvHealthIndexDto dto);
 
     Integer getInfoByPageTotal(@Param("dto") PvHealthIndexDto dto);
+
+    List<PvHealthIndex> getInfoList(@Param("startTime") String startTime,
+                                                 @Param("tableName") String tableName,
+                                                 @Param("analysisObjectType") String analysisObjectType);
 }

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

 ## DB properties:
 ## db1-production database
 spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db1.datasource.url=jdbc:mysql://139.9.173.44:3306/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db1.datasource.url=jdbc:mysql://47.92.234.253:13306/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db1.datasource.username=root
-spring.db1.datasource.password=Yeejoin@2020
+spring.db1.datasource.password=Yeejoin_1234
 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://139.9.173.44:3306/amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db2.datasource.url=jdbc:mysql://47.92.234.253:13306/amos_idx_biz_new?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db2.datasource.username=root
-spring.db2.datasource.password=Yeejoin@2020
+spring.db2.datasource.password=Yeejoin_1234
 spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
 
 ## db5-sync_data
 spring.db5.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db5.datasource.url=jdbc:mysql://139.9.173.44:3306/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db5.datasource.url=jdbc:mysql://47.92.234.253:13306/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db5.datasource.username=root
-spring.db5.datasource.password=Yeejoin@2020
+spring.db5.datasource.password=Yeejoin_1234
 spring.db5.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
 ## amos-project
 spring.db6.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db6.datasource.url=jdbc:mysql://139.9.173.44:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db6.datasource.url=jdbc:mysql://47.92.234.253:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db6.datasource.username=root
-spring.db6.datasource.password=Yeejoin@2020
+spring.db6.datasource.password=Yeejoin_1234
 spring.db6.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
 
 ## eureka properties:
-eureka.instance.hostname=139.9.173.44
+eureka.instance.hostname=47.92.234.253
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=139.9.173.44
+spring.redis.host=47.92.234.253
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -66,10 +66,10 @@ lettuce.timeout=10000
 
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://139.9.173.44:2883
+emqx.broker=tcp://47.92.234.253:2883
 emqx.user-name=admin
 emqx.password=public
-mqtt.scene.host=mqtt://139.9.173.44:8083/mqtt
+mqtt.scene.host=mqtt://47.92.234.253:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
@@ -79,13 +79,13 @@ emqx.client-password=public
 
 tdengine-server:
 driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
-jdbc-url: jdbc:TAOS-RS://139.9.170.47:6041/iot_data_1?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+jdbc-url: jdbc:TAOS-RS://47.92.234.253:6041/iot_data_1?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 username: root
 password: taosdata
 
 
 #spring.db3.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db3.datasource.url=jdbc:TAOS-RS://10.20.0.203:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.db3.datasource.url=jdbc:TAOS-RS://47.92.234.253:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 spring.db3.datasource.username=root
 spring.db3.datasource.password=taosdata
 spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
@@ -93,7 +93,7 @@ spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
 
 # ����ר��td���ݿ� analyse_data
 #spring.db4.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db4.datasource.url=jdbc:TAOS-RS://10.20.0.203:6041/analysis_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.db4.datasource.url=jdbc:TAOS-RS://47.92.234.253:6041/analysis_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 spring.db4.datasource.username=root
 spring.db4.datasource.password=taosdata
 spring.db4.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
@@ -101,7 +101,7 @@ spring.db4.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
 
 ## influxDB
 #spring.influx.url= http://172.16.3.155:18186
-#spring.influx.password=Yeejoin@2020
+#spring.influx.password=Yeejoin_1234
 #spring.influx.user=root
 #spring.influx.database=iot_platform
 #spring.influx.retention_policy=default
@@ -120,8 +120,8 @@ spring.db4.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
 #spring.influx.bufferLimit=20000
 
 
-spring.influx.url=http://139.9.173.44:8086
-spring.influx.password=Yeejoin@2020
+spring.influx.url=http://47.92.234.253:8086
+spring.influx.password=Yeejoin_1234
 spring.influx.user=root
 spring.influx.database=iot_platform
 spring.influx.retention_policy=default
@@ -150,7 +150,7 @@ amos.secret.key=qaz
 #eureka.instance.ip-address=172.16.3.122
 
 
-spring.activemq.broker-url=tcp://139.9.173.44:61616
+spring.activemq.broker-url=tcp://47.92.234.253:61616
 spring.activemq.user=admin
 spring.activemq.password=admin
 spring.jms.pub-sub-domain=false
@@ -166,16 +166,16 @@ pictureUrl=upload/jxiop/syz/
 
 
 #kafka
-spring.kafka.bootstrap-servers=139.9.173.44:9092
+spring.kafka.bootstrap-servers=47.92.234.253:9092
 spring.kafka.producer.retries=1
-spring.kafka.producer.bootstrap-servers=139.9.173.44:9092
+spring.kafka.producer.bootstrap-servers=47.92.234.253:9092
 spring.kafka.producer.batch-size=16384
 spring.kafka.producer.buffer-memory=33554432
 spring.kafka.producer.acks=1
 spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.consumer.group-id=consumerGroup
-spring.kafka.consumer.bootstrap-servers=139.9.173.44:9092
+spring.kafka.consumer.bootstrap-servers=47.92.234.253:9092
 spring.kafka.consumer.enable-auto-commit=false
 spring.kafka.consumer.auto-offset-reset=earliest
 spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
@@ -197,4 +197,6 @@ base.url.GKHF=http://139.9.171.247:8052/intelligent-analysis/working-condition-d
 #����� �㷨����
 base.url.ZXZ=http://139.9.171.247:8052/intelligent-analysis/central-value
 #ָ���������㷨����
-base.url.zsfx:http://139.9.171.247:8052/intelligent-analysis/index-analysis
+base.url.zsfx:http://139.9.171.247:8052/intelligent-analysis/index-analysis
\ No newline at end of file
+
+logic=
\ No newline at end of file

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

@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-ANALYSE-CZ
 server.servlet.context-path=/jxiop-analyse
 server.port=33400
 server.uri-encoding=UTF-8
-spring.profiles.active=dev1
+spring.profiles.active=dev
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanHealthIndex.xml

@@ -529,4 +529,24 @@
         analysis_obj_type,
         org_code
 </select>
+
+
+    <select id="getInfoList" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
+        select
+            gateway_id ,
+            station,
+            analysis_obj_type,
+            area,
+            sub_system,
+            equipment_name,
+            number,
+            anomaly,
+            org_code,
+            health_index
+        from
+            #{tableName}
+        where
+            analysis_obj_type = #{analysisObjectType}
+            and ts > #{startTime}
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/PvHealthIndex.xml

@@ -293,4 +293,22 @@
             analysis_obj_type,
             org_code
     </select>
+
+    <select id="getInfoList" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
+        select
+            gateway_id ,
+            station,
+            analysis_obj_type,
+            area,
+            subarray,
+            equipment_name,
+            anomaly,
+            org_code,
+            health_index
+        from
+            #{tableName}
+        where
+            analysis_obj_type = #{analysisObjectType}
+            and ts > #{startTime}
+    </select>
 </mapper>