天气接口

huimv-admin/pom.xml

@@ -29,6 +29,12 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.2.5</version>
+        </dependency>
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>

huimv-admin/src/main/java/com/huimv/admin/HuimvAdminApplication.java

@@ -1,8 +1,12 @@
 package com.huimv.admin;
 
+import org.apache.tomcat.util.http.LegacyCookieProcessor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.embedded.tomcat.TomcatContextCustomizer;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.client.RestTemplate;
@@ -19,4 +23,12 @@ public class HuimvAdminApplication {
     public static RestTemplate getRestTemplate(){
         return new RestTemplate();
     }
+
+    @Bean
+    public WebServerFactoryCustomizer<TomcatServletWebServerFactory> cookieProcessorCustomizer() {
+        return tomcatServletWebServerFactory -> tomcatServletWebServerFactory.addContextCustomizers((TomcatContextCustomizer) context -> {
+            context.setCookieProcessor(new LegacyCookieProcessor());
+        });
+    }
+
 }

huimv-admin/src/main/java/com/huimv/admin/timer/CarmeraTimer.java

@@ -80,15 +80,4 @@ public class CarmeraTimer {
         System.out.println(" ====== getCameras请求返回结果：【{" + data + "}】");
         return data;
     }
-
-    public static void main(String[] args) throws Exception {
-        Map<String, Object> map = new HashMap<String, Object>();
-        String s = HttpClientSSLUtils.doPost("https://yzwlw.loongk.com/mobile/loginO?username=华统&password=21218cca77804d2ba1922c33e0151105",JSON.toJSONString(map));
-        LoginDto loginDto = JSONUtil.toBean(s, LoginDto.class);
-        DataToken token = loginDto.getData().getToken();
-        String encode = Base64.encode(token.getUserId() + "_" + token.getToken());
-    }
-
-
-
 }

huimv-admin/src/main/java/com/huimv/admin/timer/EnergyTimer.java

@@ -43,7 +43,8 @@ public class EnergyTimer {
 
             String feed = NumberUtils.getNumFloat2(6.00,6.50);
             String water = NumberUtils.getNumFloat2(0.08,0.15);
-            String gas = NumberUtils.getNum(200, 280, 1);
+//            String gas = NumberUtils.getNum(200, 280, 1);
+            String gas = "0";
             String electricity = NumberUtils.getNum(70, 90, 1);
 
             EnergyData energyData = new EnergyData();
@@ -72,7 +73,7 @@ public class EnergyTimer {
                 String format = df.format(waterCount);
                 EnergyWarningInfo warningInfo = new EnergyWarningInfo();
                 warningInfo.setWarningType(1);
-                warningInfo.setWarningContent("今日累计用水量" + format + "超过阈值");
+                warningInfo.setWarningContent("今日累计用水量" + format + "t,超过阈值");
                 warningInfo.setUnitName(basePigpen.getBuildName());
                 warningInfo.setUnitId(energyEnvDevice.getUnitId());
                 warningInfo.setDeviceId(energyEnvDevice.getId());
@@ -87,7 +88,7 @@ public class EnergyTimer {
                 String format = df.format(electricityCount);
                 EnergyWarningInfo warningInfo = new EnergyWarningInfo();
                 warningInfo.setWarningType(2);
-                warningInfo.setWarningContent("今日累计用电量" + format + "超过阈值");
+                warningInfo.setWarningContent("今日累计用电量" + format + "kw/h,超过阈值");
                 warningInfo.setUnitName(basePigpen.getBuildName());
                 warningInfo.setUnitId(energyEnvDevice.getUnitId());
                 warningInfo.setDeviceId(energyEnvDevice.getId());
@@ -102,7 +103,7 @@ public class EnergyTimer {
                 String format = df.format(feedCount);
                 EnergyWarningInfo warningInfo = new EnergyWarningInfo();
                 warningInfo.setWarningType(3);
-                warningInfo.setWarningContent("今日累计用料量" + format + "超过阈值");
+                warningInfo.setWarningContent("今日累计用料量" + format + "kg,超过阈值");
                 warningInfo.setUnitName(basePigpen.getBuildName());
                 warningInfo.setUnitId(energyEnvDevice.getUnitId());
                 warningInfo.setDeviceId(energyEnvDevice.getId());
@@ -117,7 +118,7 @@ public class EnergyTimer {
                 String format = df.format(gasCount);
                 EnergyWarningInfo warningInfo = new EnergyWarningInfo();
                 warningInfo.setWarningType(4);
-                warningInfo.setWarningContent("今日累计用气量" + format + "超过阈值");
+                warningInfo.setWarningContent("今日累计用气量" + format + "m³,超过阈值");
                 warningInfo.setUnitName(basePigpen.getBuildName());
                 warningInfo.setUnitId(energyEnvDevice.getUnitId());
                 warningInfo.setDeviceId(energyEnvDevice.getId());

huimv-admin/src/main/resources/application-prod.yml

@@ -6,10 +6,17 @@ spring:
     name: huimv-admin
 
   datasource:
-    url: jdbc:mysql://115.238.57.190:3306/huimv-huatong?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    druid:
+      url: jdbc:mysql://115.238.57.190:3306/huimv-huatong?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      username: root
+      password: WICi9V6VC1GYjMR0ITj5mzmW7dzu7UsYubjyyHJbx3TlL7L8n+CGCnPE61gLWuhxn4mKqX7zdrYCfKy/4rITtg==
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      filters: config
+      connect-properties:
+        config.decrypt: true
+        config.decrypt.key: ${spring.datasource.druid.publickey}
+    type: com.alibaba.druid.pool.DruidDataSource
+
 
   #配置rabbitMq 服务器
 #  rabbitmq:
@@ -25,6 +32,9 @@ spring:
     host: 122.112.224.199
     port: 6379
     password: hm123456
+  reactor:
+    debug-agent:
+      enabled: true
 #  Nacos 配置
 #  cloud:
 #    nacos: