【feat】 添加对外服务 api

huimv-eartag2-platform/huimv-eartag2-admin/pom.xml

@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>0.0.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -59,43 +59,43 @@
             </plugin>
 
             <!--  代码混淆proguard maven插件  -->
-            <plugin>
-                <groupId>com.github.wvengen</groupId>
-                <artifactId>proguard-maven-plugin</artifactId>
-                <version>2.6.0</version>
-                <executions>
-                    <!--   package时执行proguard   -->
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>proguard</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <putLibraryJarsInTempDir>true</putLibraryJarsInTempDir>
-                    <!--  输入的jar包  -->
-                    <injar>${project.build.finalName}.jar</injar>
-                    <!--  输出的jar包  -->
-                    <outjar>${project.build.finalName}.jar</outjar>
-                    <!--  是否进行混淆，默认为true  -->
-                    <obfuscate>true</obfuscate>
-                    <!--  配置文件,通常为proguard.cfg,主要对options选项进行配置,所有的options选项都可以进行配置  -->
-                    <proguardInclude>../huimv-eartag2-eartag/proguard.cfg</proguardInclude>
-                    <!--  额外的jar,项目编译所需的jar  -->
-                    <libs>
-                        <lib>${java.home}/lib/rt.jar</lib>
-                        <!--<lib>${java.home}/lib/jce.jar</lib>-->
-                        <lib>${java.home}/lib/jsse.jar</lib>
-                    </libs>
-                    <!--  对输入jar进行过滤，如对META-INFO文件不处理  -->
-                    <inLibsFilter>!META-INF/**,!META-INF/versions/**</inLibsFilter>
-                    <!--  输出路径配置,必须包含injar标签中填写的jar  -->
-                    <outputDirectory>${project.build.directory}</outputDirectory>
-                    <!--  上面使用了conf配置文件，options无需配置  -->
-                    <!--<options></options>-->
-                </configuration>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>com.github.wvengen</groupId>-->
+<!--                <artifactId>proguard-maven-plugin</artifactId>-->
+<!--                <version>2.6.0</version>-->
+<!--                <executions>-->
+<!--                    &lt;!&ndash;   package时执行proguard   &ndash;&gt;-->
+<!--                    <execution>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>proguard</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <putLibraryJarsInTempDir>true</putLibraryJarsInTempDir>-->
+<!--                    &lt;!&ndash;  输入的jar包  &ndash;&gt;-->
+<!--                    <injar>${project.build.finalName}.jar</injar>-->
+<!--                    &lt;!&ndash;  输出的jar包  &ndash;&gt;-->
+<!--                    <outjar>${project.build.finalName}.jar</outjar>-->
+<!--                    &lt;!&ndash;  是否进行混淆，默认为true  &ndash;&gt;-->
+<!--                    <obfuscate>true</obfuscate>-->
+<!--                    &lt;!&ndash;  配置文件,通常为proguard.cfg,主要对options选项进行配置,所有的options选项都可以进行配置  &ndash;&gt;-->
+<!--                    <proguardInclude>../huimv-eartag2-eartag/proguard.cfg</proguardInclude>-->
+<!--                    &lt;!&ndash;  额外的jar,项目编译所需的jar  &ndash;&gt;-->
+<!--                    <libs>-->
+<!--                        <lib>${java.home}/lib/rt.jar</lib>-->
+<!--                        &lt;!&ndash;<lib>${java.home}/lib/jce.jar</lib>&ndash;&gt;-->
+<!--                        <lib>${java.home}/lib/jsse.jar</lib>-->
+<!--                    </libs>-->
+<!--                    &lt;!&ndash;  对输入jar进行过滤，如对META-INFO文件不处理  &ndash;&gt;-->
+<!--                    <inLibsFilter>!META-INF/**,!META-INF/versions/**</inLibsFilter>-->
+<!--                    &lt;!&ndash;  输出路径配置,必须包含injar标签中填写的jar  &ndash;&gt;-->
+<!--                    <outputDirectory>${project.build.directory}</outputDirectory>-->
+<!--                    &lt;!&ndash;  上面使用了conf配置文件，options无需配置  &ndash;&gt;-->
+<!--                    &lt;!&ndash;<options></options>&ndash;&gt;-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 </project>

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/SysAccountMultilevelController.java

@@ -90,8 +90,6 @@ public class SysAccountMultilevelController {
 
     @PostMapping("/update")
     public Result update(@RequestBody SysAccountMultilevel sysAccountMultilevel , HttpServletRequest request){
-        Integer userId = TokenSign.getMemberIdByJwtToken(request);
-        sysAccountMultilevel.setId(userId);
         accountMultilevelService.updateById(sysAccountMultilevel);
 
         return new Result(10000,"修改成功",true);

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

@@ -1,9 +1,9 @@
 #±¾µØÊý¾Ý¿â
 #spring.profiles.active=dev
 #Ô¶³ÌÊý¾Ý¿â
-spring.profiles.active=prod
+#spring.profiles.active=prod
 #spring.profiles.active=prod2
-#spring.profiles.active=prod3
+spring.profiles.active=prod3
 
 device.register.prefix=device_register_
 redis.expire.eartag_online_set=25

huimv-eartag2-platform/huimv-eartag2-api/pom.xml

@@ -15,37 +15,15 @@
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>0.0.3-SNAPSHOT</version>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <!-- 排除Tomcat容器 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <!-- 移除掉默认支持的 Tomcat -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <!-- 添加 Undertow 容器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
-        <!-- -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.5</version>
-        </dependency>
+
         <!--Mybatis-Plus生成器依赖-->
         <dependency>
             <groupId>com.baomidou</groupId>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/config/WebSocket.java

@@ -1,61 +1,61 @@
-package com.huimv.eartag2.api.config;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.websocket.OnClose;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-//注册成组件
-@Component
-//定义websocket服务器端，它的功能主要是将目前的类定义成一个websocket服务器端。注解的值将被用于监听用户连接的终端访问URL地址
-@ServerEndpoint("/websocket")
-//如果不想每次都写private  final Logger logger = LoggerFactory.getLogger(当前类名.class); 可以用注解@Slf4j;可以直接调用log.info
-@Slf4j
-public class WebSocket {
- 
-    //实例一个session，这个session是websocket的session
-    private Session session;
- 
-    //存放websocket的集合（本次demo不会用到，聊天室的demo会用到）
-    private static CopyOnWriteArraySet<WebSocket> webSocketSet = new CopyOnWriteArraySet<>();
- 
-    //前端请求时一个websocket时
-    @OnOpen
-    public void onOpen(Session session) {
-        this.session = session;
-        webSocketSet.add(this);
-        log.info("【websocket消息】有新的连接, 总数:{}", webSocketSet.size());
-    }
- 
-    //前端关闭时一个websocket时
-    @OnClose
-    public void onClose() {
-        webSocketSet.remove(this);
-        log.info("【websocket消息】连接断开, 总数:{}", webSocketSet.size());
-    }
- 
-    //前端向后端发送消息
-    @OnMessage
-    public void onMessage(String message) {
-        log.info("【websocket消息】收到客户端发来的消息:{}", message);
-    }
-
-    //新增一个方法用于主动向客户端发送消息
-    public static void sendMessage(String message) {
-        for (WebSocket webSocket: webSocketSet) {
-            log.info("【websocket消息】广播消息, message={}", message);
-            try {
-                webSocket.session.getBasicRemote().sendText(message);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-
-}
+//package com.huimv.eartag2.api.config;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+//import javax.websocket.OnClose;
+//import javax.websocket.OnMessage;
+//import javax.websocket.OnOpen;
+//import javax.websocket.Session;
+//import javax.websocket.server.ServerEndpoint;
+//import java.util.concurrent.CopyOnWriteArraySet;
+//
+////注册成组件
+//@Component
+////定义websocket服务器端，它的功能主要是将目前的类定义成一个websocket服务器端。注解的值将被用于监听用户连接的终端访问URL地址
+//@ServerEndpoint("/websocket")
+////如果不想每次都写private  final Logger logger = LoggerFactory.getLogger(当前类名.class); 可以用注解@Slf4j;可以直接调用log.info
+//@Slf4j
+//public class WebSocket {
+//
+//    //实例一个session，这个session是websocket的session
+//    private Session session;
+//
+//    //存放websocket的集合（本次demo不会用到，聊天室的demo会用到）
+//    private static CopyOnWriteArraySet<WebSocket> webSocketSet = new CopyOnWriteArraySet<>();
+//
+//    //前端请求时一个websocket时
+//    @OnOpen
+//    public void onOpen(Session session) {
+//        this.session = session;
+//        webSocketSet.add(this);
+//        log.info("【websocket消息】有新的连接, 总数:{}", webSocketSet.size());
+//    }
+//
+//    //前端关闭时一个websocket时
+//    @OnClose
+//    public void onClose() {
+//        webSocketSet.remove(this);
+//        log.info("【websocket消息】连接断开, 总数:{}", webSocketSet.size());
+//    }
+//
+//    //前端向后端发送消息
+//    @OnMessage
+//    public void onMessage(String message) {
+//        log.info("【websocket消息】收到客户端发来的消息:{}", message);
+//    }
+//
+//    //新增一个方法用于主动向客户端发送消息
+//    public static void sendMessage(String message) {
+//        for (WebSocket webSocket: webSocketSet) {
+//            log.info("【websocket消息】广播消息, message={}", message);
+//            try {
+//                webSocket.session.getBasicRemote().sendText(message);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+//    }
+//
+//
+//}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/config/WebSocketConfig.java

@@ -1,19 +1,19 @@
-package com.huimv.eartag2.api.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-
-/**
- * websocket
- * 的配置信息
- */
-@Configuration
-public class WebSocketConfig {
-
-    @Bean
-    public ServerEndpointExporter serverEndpointExporter() {
-
-        return new ServerEndpointExporter();
-    }
-}
+//package com.huimv.eartag2.api.config;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+//
+///**
+// * websocket
+// * 的配置信息
+// */
+//@Configuration
+//public class WebSocketConfig {
+//
+//    @Bean
+//    public ServerEndpointExporter serverEndpointExporter() {
+//
+//        return new ServerEndpointExporter();
+//    }
+//}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BaseFarmer.java

@@ -20,7 +20,7 @@ public class BaseFarmer implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     private String farmer;

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/service/impl/EartagServiceImpl.java

@@ -34,7 +34,7 @@ import java.util.*;
  **/
 @Service
 @Slf4j
-public class EartagServiceImpl implements IEartagService {
+public class EartagServiceApiImpl implements IEartagService {
     @Autowired
     private BasePigpenMapper basePigpenMapper;
     @Autowired

huimv-eartag2-platform/huimv-eartag2-api/src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ server:
   port: 8099
 spring:
   application:
-    name: huimv-eartag2-manage2
+    name: huimv-eartag2-api
 
   datasource:
     url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
@@ -110,4 +110,4 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   # mapper.xml文件所存放的位置
-  mapper-locations: classpath*:com/huimv/eartag2/manage2/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”
+  mapper-locations: classpath*:com/huimv/eartag2/api/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”

huimv-eartag2-platform/huimv-eartag2-api/src/main/resources/application-dev2.yml

@@ -2,7 +2,7 @@ server:
   port: 8093
 spring:
   application:
-    name: huimv-eartag2-manage2
+    name: huimv-eartag2-api
 
   datasource:
     url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai

huimv-eartag2-platform/huimv-eartag2-api/src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ server:
   port: 8099
 spring:
   application:
-    name: huimv-eartag2-manage2
+    name: huimv-eartag2-api
 
   datasource:
     url: jdbc:mysql://115.238.57.190:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
@@ -108,5 +108,5 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   # mapper.xml文件所存放的位置
-  mapper-locations: classpath*:com/huimv/eartag2/manage2/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”
+  mapper-locations: classpath*:com/huimv/eartag2/api/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/BaseFarmMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.eartag2.manage2.mapper.BaseFarmMapper">
+<mapper namespace="com.huimv.eartag2.api.mapper.BaseFarmMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.BaseFarm">

huimv-eartag2-platform/huimv-eartag2-common/pom.xml

@@ -11,7 +11,6 @@
 <!--    <packaging>pom</packaging>-->
     <packaging>jar</packaging>
 
-    <groupId>com.huimv</groupId>
     <artifactId>huimv-eartag2-common</artifactId>
     <version>0.0.3-SNAPSHOT</version>
 

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

@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>0.0.3-SNAPSHOT</version>
         </dependency>
 
         <!-- 排除Tomcat容器 -->

huimv-eartag2-platform/huimv-eartag2-eartag/pom.xml

@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>0.0.3-SNAPSHOT</version>
         </dependency>
         <!--  -->
 <!--        <dependency>-->

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/service/impl/EartagServiceImpl.java

@@ -801,12 +801,12 @@ public class EartagServiceImpl implements IEartagService {
             //上一次处于离线状态
             eartagOnlineStatusEntity.setOnline(eartagOnlineStatusEntity.getOnline() + 1);
             eartagOnlineStatusEntity.setOffline(eartagOnlineStatusEntity.getOffline() - 1);
-            String onlineEarmark = eartagOnlineStatusEntity.getOnlineEarmark();
-            if (onlineEarmark.trim().length() > 0) {
-                onlineEarmark += ",";
-            }
-            onlineEarmark += earmark;
-            eartagOnlineStatusEntity.setOnlineEarmark(onlineEarmark);
+//            String onlineEarmark = eartagOnlineStatusEntity.getOnlineEarmark();
+//            if (onlineEarmark.trim().length() > 0) {
+//                onlineEarmark += ",";
+//            }
+//            onlineEarmark += earmark;
+//            eartagOnlineStatusEntity.setOnlineEarmark(onlineEarmark);
             String offlineEarmark = eartagOnlineStatusEntity.getOfflineEarmark();
             offlineEarmark = offlineEarmark.replace(offlineEarmark, "");
             eartagOnlineStatusEntity.setOfflineEarmark(offlineEarmark);
@@ -1257,7 +1257,6 @@ public class EartagServiceImpl implements IEartagService {
         EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getByDeviceCode(deviceCode);
         Integer unitId = deviceRegisterEntity.getUnitId();
         Integer pigpenId = deviceRegisterEntity.getPigpenId();
-        Map pigpenMap = new HashMap();
         List<BasePigpenEntity> basePigpenEntityList = basePigpenRepo.getPigpenByPigpenIdAndUnitId(pigpenId, unitId);
         if (basePigpenEntityList.size() == 0) {
             log.error("栋舍不存在[" + pigpenId + "," + unitId + "].");

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-prod3.yml

@@ -140,4 +140,7 @@ mybatis-plus:
 #      ddl-auto: update
 #    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
 #    open-in-view: true
+redis:
+  expire:
+    eartag_online_set: 25
 

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application.properties

@@ -1,8 +1,8 @@
 #spring.profiles.active=test
 #spring.profiles.active=local
 #spring.profiles.active=dev
-spring.profiles.active=prod2
-#spring.profiles.active=prod3
+#spring.profiles.active=prod2
+spring.profiles.active=prod3
 #spring.profiles.active=test2
 
 #device.register.prefix=device_register_

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

@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.3-SNAPSHOT</version>
         </dependency>
         <!-- 排除Tomcat容器 -->
         <dependency>

huimv-eartag2-platform/huimv-eartag2-manage/pom.xml

@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>0.0.3-SNAPSHOT</version>
         </dependency>
         <!--rabbitmq-->
         <dependency>

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/impl/DeviceRegisterServiceImpl.java

@@ -178,7 +178,7 @@ public class DeviceRegisterServiceImpl implements IDeviceRegisterService {
         String id = "1";
         Integer id2 = 1;
 
-        deviceRegisterRepo.getById(id2);
+        deviceRegisterRepo.findById(id2);
 
         return null;
     }
@@ -188,7 +188,7 @@ public class DeviceRegisterServiceImpl implements IDeviceRegisterService {
 //        System.out.println("## <setDeviceStatus> id="+id);
 //        System.out.println("## <setDeviceStatus> deviceStatus="+deviceStatus);
         //
-        EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getById(id);
+        EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.findById(id).get();
         if(deviceRegisterEntity == null){
             log.error(BizConst.MSG_DEVICE_REGISTER_NO_EXIST);
             return new Result(BizConst.CODE_DEVICE_REGISTER_NO_EXIST,BizConst.MSG_DEVICE_REGISTER_NO_EXIST,false);
@@ -274,7 +274,7 @@ public class DeviceRegisterServiceImpl implements IDeviceRegisterService {
         String[] idArray = ids.split(",");
         List deviceCodeList = new ArrayList();
         for(int a=0;a<idArray.length;a++){
-            EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getById(Integer.parseInt(idArray[a]));
+            EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.findById(Integer.parseInt(idArray[a])).get();
             if(deviceRegisterEntity == null){
                 //暂不确定这里怎么写
                 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

huimv-eartag2-platform/huimv-eartag2-manage2/pom.xml

@@ -25,10 +25,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
         <!-- 排除Tomcat容器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagData2ServiceImpl.java

@@ -296,17 +296,6 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
             list7.add( eartagData2.getEarTemp1());
         }
         Map endMap = new HashMap();
-//        int size = list1.size();
-//        if (size > 10){
-//            List<Double> firstPart = list1.subList(0, size - 10);
-//            List<Double> lastTen = list1.subList(size - 10, size);
-//            Filter filter1 = new Filter(firstPart,0.2);
-//            List<Double> earTemp1 = filter1.max(20, 200, 30, 40);
-//            earTemp1.addAll(lastTen);
-//            endMap.put("earTemp1",earTemp1.stream().map(number -> String.format("%.2f", number)).collect(Collectors.toList()));
-//        }else {
-//            endMap.put("earTemp1",list1.stream().map(number -> String.format("%.2f", number)).collect(Collectors.toList()));
-//        }
 
         Filter filter1 = new Filter(list1,0.2);
         List<Double> earTemp1 = filter1.max(20, 200, 30, 40);
@@ -323,7 +312,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         endMap.put("earTemp",list7.stream().map(number -> String.format("%.2f", number)).collect(Collectors.toList()));
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         endMap.put("time",list4.stream()
-                .map(date -> formatter.format(date))
+                .map(formatter::format)
                 .collect(Collectors.toList()));
         endMap.put("act",list5);
         endMap.put("bat",list6);

huimv-eartag2-platform/pom.xml

@@ -16,8 +16,8 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.2</version>
-<!--        <version>2.3.1.RELEASE</version>-->
+<!--        <version>2.6.2</version>-->
+        <version>2.3.1.RELEASE</version>
     </parent>
     <groupId>com.huimv</groupId>
     <artifactId>huimv-eartag2-platform</artifactId>