Merge remote-tracking branch 'origin/master'

huimv-eartag2-admin/pom.xml

@@ -27,7 +27,11 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
-
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
         <dependency>
             <groupId>cn.dustlight.captcha</groupId>
             <artifactId>redis-store</artifactId>

huimv-eartag2-admin/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #spring.profiles.active=dev
-#spring.profiles.active=lishui
-spring.profiles.active=qingshan
+spring.profiles.active=lishui
+#spring.profiles.active=qingshan
 
 device.register.prefix=device_register_
 redis.expire.eartag_online_set=25

huimv-farm-produce/src/main/java/com/huimv/produce/warning/service/impl/AlarmServiceImpl.java

@@ -189,7 +189,7 @@ public class AlarmServiceImpl implements IAlarmService {
             int rywgQuantity = 0;
             if(farmId == 1) {
                 String personAlarmTotal = SendMassageGetPagePersonAlarm(startTime, endTime);
-                if (personAlarmTotal != null) {
+                if (personAlarmTotal != null && personAlarmTotal.substring(1, personAlarmTotal.length() - 1).length() != 0) {
                     rywgQuantity = Integer.parseInt(personAlarmTotal);
                 }
             }

huimv-farm-produce/src/test/java/com.huimv.produce/service/CodeGenerator.java

@@ -17,7 +17,8 @@ import com.baomidou.mybatisplus.generator.config.PackageConfig;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.rules.DateType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import org.junit.platform.commons.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
+
 
 import java.util.Scanner;