修改获取除臭配置问题。

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/SprayTimeServiceImpl.java

@@ -31,13 +31,16 @@ public class SprayTimeServiceImpl implements ISprayTimeService {
     public String getSprayTimeByDeviceCode(String deviceCode) {
         EnvSprayTimeEntity envSprayTimeEntity = new EnvSprayTimeEntity();
         envSprayTimeEntity.setDeviceCode(deviceCode);
+        System.out.println("envSprayTimeEntity="+envSprayTimeEntity);
         Example<EnvSprayTimeEntity> example = Example.of(envSprayTimeEntity);
         List<EnvSprayTimeEntity> envSprayTimeEntityList = envSprayTimeEntityRepo.findAll(example);
+        System.out.println("envSprayTimeEntityList.size()="+envSprayTimeEntityList.size());
         StringBuilder timeBuilder = new StringBuilder();
         int a=0;
         for(EnvSprayTimeEntity sprayTimeEntity:envSprayTimeEntityList){
             //开始时间(分秒)
             if(sprayTimeEntity.getOpenTime() != null && sprayTimeEntity.getOpenTime().trim().length() > 0){
+                System.out.println("sprayTimeEntity.getOpenTime()="+sprayTimeEntity.getOpenTime());
                 if(timeBuilder.length()>0){
                     timeBuilder.append(",");
                 }
@@ -47,6 +50,7 @@ public class SprayTimeServiceImpl implements ISprayTimeService {
             }
             //持续时间
             if(sprayTimeEntity.getDuration() != null && sprayTimeEntity.getDuration() > 0){
+                System.out.println("sprayTimeEntity.getDuration()="+sprayTimeEntity.getDuration());
                 if(timeBuilder.length()>0){
                     timeBuilder.append(",");
                 }
@@ -56,13 +60,16 @@ public class SprayTimeServiceImpl implements ISprayTimeService {
             }
             //开关时长
             if(sprayTimeEntity.getOpenMode() != null && sprayTimeEntity.getOpenMode().trim().length() > 0){
+                System.out.println("sprayTimeEntity.getOpenMode()="+sprayTimeEntity.getOpenMode());
                 if(timeBuilder.length()>0){
                     timeBuilder.append(",");
                 }
                 String openMode = sprayTimeEntity.getOpenMode();
-                String[] openModeArray = openMode.split(":");
+                System.out.println("openMode="+openMode);
+                String[] openModeArray = openMode.split(",");
                 //分钟-->秒钟
                 timeBuilder.append(String.valueOf(Integer.parseInt(openModeArray[0])*60)+","+String.valueOf(Integer.parseInt(openModeArray[1])*60));
+                System.out.println("timeBuilder="+timeBuilder.toString());
             }else{
                 log.error("开始时长为null或为空.");
             }

huimv-env-platform/huimv-env-device/pom.xml

@@ -52,10 +52,10 @@
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
         <!-- redis -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-data-redis</artifactId>-->
+<!--        </dependency>-->
         <!-- actuator -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

huimv-env-platform/huimv-env-device/src/main/resources/application-prod.yml

@@ -0,0 +1,104 @@
+server:
+  port: 8092
+
+spring:
+  application:
+    name: huimv-env-device
+
+  datasource:
+    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    open-in-view: true
+
+  #配置rabbitMq 服务器
+#  rabbitmq:
+#    host: 10.0.0.4
+#    port: 5672
+#    username: huimv
+#    password: hm123456
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /
+  rabbitmq:
+    host: 121.36.134.218
+    port: 5672
+    username: admin
+    password: admin
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /env
+
+    #确认消息已发送到交换机(Exchange)
+#    publisher-confirms: true #(过时、弃用)
+    publisher-confirm-type: correlated
+    #确认消息已发送到队列(Queue)
+    publisher-returns: true
+
+  #redis
+#  redis:
+#    database: 0
+#    host: 192.168.1.68
+#    port: 6379
+#    password: hm123456
+#    timeout: 5000ms
+#    jedis:
+#      pool:
+#        max-active: 20
+#        max-wait: -1
+#        max-idle: 10
+#        min-idle: 0
+#    lettuce:
+#      pool:
+#        max-active: 3
+#        min-idle: 2
+#        max-idle: 3
+#        max-wait: 1
+#      shutdown-timeout: 100
+
+#  data:
+#    redis:
+#      repositories:
+#        enabled: false
+
+  #是否缓存空值
+#  cache:
+#    redis:
+#      cache-null-values: false
+
+
+
+    #server:
+#  port: 9110
+#spring:
+#  application:
+#    name: huimv-hy-autoGetData
+#
+#  datasource:
+##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    username: root
+#    password: hm123456
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#  jpa:
+#    properties:
+#      hibernate:
+#        enable_lazy_load_no_trans: true
+#    show-sql: true
+#    database: mysql
+#    hibernate:
+#      ddl-auto: update
+#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+#    open-in-view: true
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"   # * 在yaml 文件属于关键字，所以需要加引号
+

huimv-env-platform/huimv-env-device/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=dev
+spring.profiles.active=prod
 
 #\u5F00\u542F\u5065\u5EB7\u76D1\u63A7
 management.endpoints.web.exposure.include=*

huimv-env-platform/huimv-env-input/pom.xml

@@ -84,6 +84,10 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+        </dependency>
         <!-- 一方包统一版本管理 -->
         <dependency>
             <groupId>com.huimv</groupId>

huimv-env-platform/huimv-env-input/src/main/java/com/huimv/env/input/server/EnvInputServerHandler.java

@@ -12,6 +12,7 @@ import com.huimv.env.input.service.ICommandProcessorService;
 import com.huimv.env.input.utils.DateUtil2;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;

huimv-env-platform/huimv-env-input/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-env-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -41,35 +41,35 @@ spring:
     publisher-returns: true
 
   #redis
-  redis:
-    database: 0
-    host: 192.168.1.68
-    port: 6379
-    password: hm123456
-    timeout: 5000ms
-    jedis:
-      pool:
-        max-active: 20
-        max-wait: -1
-        max-idle: 10
-        min-idle: 0
-    lettuce:
-      pool:
-        max-active: 3
-        min-idle: 2
-        max-idle: 3
-        max-wait: 1
-      shutdown-timeout: 100
+#  redis:
+#    database: 0
+#    host: 192.168.1.68
+#    port: 6379
+#    password: hm123456
+#    timeout: 5000ms
+#    jedis:
+#      pool:
+#        max-active: 20
+#        max-wait: -1
+#        max-idle: 10
+#        min-idle: 0
+#    lettuce:
+#      pool:
+#        max-active: 3
+#        min-idle: 2
+#        max-idle: 3
+#        max-wait: 1
+#      shutdown-timeout: 100
 
-  data:
-    redis:
-      repositories:
-        enabled: false
+#  data:
+#    redis:
+#      repositories:
+#        enabled: false
 
   #是否缓存空值
-  cache:
-    redis:
-      cache-null-values: false
+#  cache:
+#    redis:
+#      cache-null-values: false
 
 
 

huimv-env-platform/huimv-env-input/src/main/resources/application-prod.yml

@@ -0,0 +1,104 @@
+server:
+  port: 8090
+
+spring:
+  application:
+    name: huimv-env-input
+
+  datasource:
+    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    open-in-view: true
+
+  #配置rabbitMq 服务器
+#  rabbitmq:
+#    host: 10.0.0.4
+#    port: 5672
+#    username: huimv
+#    password: hm123456
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /
+  rabbitmq:
+    host: 121.36.134.218
+    port: 5672
+    username: admin
+    password: admin
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /env
+
+    #确认消息已发送到交换机(Exchange)
+#    publisher-confirms: true #(过时、弃用)
+    publisher-confirm-type: correlated
+    #确认消息已发送到队列(Queue)
+    publisher-returns: true
+
+  #redis
+  redis:
+    database: 0
+    host: 192.168.1.68
+    port: 6379
+    password: hm123456
+    timeout: 5000ms
+    jedis:
+      pool:
+        max-active: 20
+        max-wait: -1
+        max-idle: 10
+        min-idle: 0
+    lettuce:
+      pool:
+        max-active: 3
+        min-idle: 2
+        max-idle: 3
+        max-wait: 1
+      shutdown-timeout: 100
+
+  data:
+    redis:
+      repositories:
+        enabled: false
+
+  #是否缓存空值
+  cache:
+    redis:
+      cache-null-values: false
+
+
+
+    #server:
+#  port: 9110
+#spring:
+#  application:
+#    name: huimv-hy-autoGetData
+#
+#  datasource:
+##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    username: root
+#    password: hm123456
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#  jpa:
+#    properties:
+#      hibernate:
+#        enable_lazy_load_no_trans: true
+#    show-sql: true
+#    database: mysql
+#    hibernate:
+#      ddl-auto: update
+#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+#    open-in-view: true
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"   # * 在yaml 文件属于关键字，所以需要加引号
+

huimv-env-platform/huimv-env-input/src/main/resources/application.properties

@@ -1,20 +1,20 @@
-spring.profiles.active=dev
+spring.profiles.active=prod
 
-#开启健康监控
+#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 management.endpoints.web.exposure.include=*
 
 #########################################################
-###             配置undertow取代tomcat                ###
+###             \uFFFD\uFFFD\uFFFD\uFFFDundertow\u0221\uFFFD\uFFFDtomcat                ###
 #########################################################
-# 是否打开 undertow 日志，默认为 false
+# \uFFFD\u01F7\uFFFD\uFFFD undertow \uFFFD\uFFFD\u05BE\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA false
 server.undertow.accesslog.enabled=false
-# 设置访问日志所在目录
+# \uFFFD\uFFFD\uFFFD\u00F7\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\u013F\u00BC
 server.undertow.accesslog.dir=logs
-# 指定工作者线程的 I/0 线程数，默认为 2 或者 CPU 的个数
+# \u05B8\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F3\u0335\uFFFD I/0 \uFFFD\u07F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA 2 \uFFFD\uFFFD\uFFFD\uFFFD CPU \uFFFD\u0138\uFFFD\uFFFD\uFFFD
 server.undertow.io-threads=
-# 指定工作者线程个数，默认为 I/O 线程个数的 8 倍
+# \u05B8\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F3\u0338\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA I/O \uFFFD\u07F3\u0338\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD 8 \uFFFD\uFFFD
 server.undertow.worker-threads=
-# 设置 HTTP POST 内容的最大长度，默认不做限制
+# \uFFFD\uFFFD\uFFFD\uFFFD HTTP POST \uFFFD\uFFFD\uFFFD\u0775\uFFFD\uFFFD\uFFFD\uDB8E\uDD36\u0223\uFFFD\u012C\uFFFD\u03F2\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 server.undertow.max-http-post-size=0
 
 #########################################################
@@ -22,10 +22,10 @@ server.undertow.max-http-post-size=0
 #########################################################
 management.security.enabled=false
 
-# 数据处理流程
+# \uFFFD\uFFFD\uFFFD\u0774\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 data.input.flow=2
 
-# 是否写入测试数据(1:写入 0:不写入)
+# \uFFFD\u01F7\uFFFD\u0434\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD(1:\u0434\uFFFD\uFFFD 0:\uFFFD\uFFFD\u0434\uFFFD\uFFFD)
 data.test.input=0
 
 

huimv-env-platform/pom.xml

@@ -67,8 +67,6 @@
                 <artifactId>captcha-core</artifactId>
                 <version>${captcha.version}</version>
             </dependency>
-
-
             <dependency>
                 <groupId>cn.dustlight.captcha</groupId>
                 <artifactId>redis-store</artifactId>