增加单个耳标在线记录图表

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>huimv-eartag2-platform</artifactId>
+        <groupId>com.huimv</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>huimv-eartag2-device</artifactId>
+
+
+</project>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>huimv-eartag2-platform</artifactId>
+        <groupId>com.huimv</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>huimv-eartag2-eartag</artifactId>
+
+
+</project>

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

@@ -36,6 +36,25 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+
+        <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>
+
     </dependencies>
 
     <build>

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/controller/EartagController.java

@@ -164,11 +164,17 @@ public class EartagController {
      * @Time        : 18:28
      */
     @RequestMapping(value = "/listEartagOnlineCountByEarmarkAndDate",method = RequestMethod.GET)
-    public Result listEartagCountByEarmarkAndDate(@RequestParam(value = "earmark",required = true) String earmark,@RequestParam(value = "pastDays",required = true) Integer pastDays) throws ParseException {
+    public Result listEartagCountByEarmarkAndDate(@RequestParam(value = "earmark",required = true) String earmark,
+                                                  @RequestParam(value = "pastDays",required = true) Integer pastDays,
+                                                  @RequestParam(value = "showMode",required = true) Integer showMode) throws ParseException {
         log.info("<listEartagOnlineCountByEarmarkAndDate> 输入参数 earmark>>"+earmark);
         log.info("<listEartagOnlineCountByEarmarkAndDate> 输入参数 pastDays>"+pastDays);
+        log.info("<listEartagOnlineStatusByEarmarkAndDate> 输入参数 showMode>"+showMode);
+        if(showMode == null){
+            showMode = 1;
+        }
         //
-        return eartagService.listEartagOnlineCountByEarmarkAndDate(earmark,pastDays);
+        return eartagService.listEartagOnlineCountByEarmarkAndDate(earmark,pastDays,showMode);
     }
 
     /**
@@ -182,7 +188,8 @@ public class EartagController {
      * @Time        : 19:52
      */
     @RequestMapping(value = "/listEartagOnlineStatusByEarmarkAndDate",method = RequestMethod.GET)
-    public Result listEartagOnlineStatusByEarmarkAndDate(@RequestParam(value = "earmark",required = true) String earmark,@RequestParam(value = "pastDays",required = true) Integer pastDays) throws ParseException {
+    public Result listEartagOnlineStatusByEarmarkAndDate(@RequestParam(value = "earmark",required = true) String earmark,
+                                                         @RequestParam(value = "pastDays",required = true) Integer pastDays) throws ParseException {
         log.info("<listEartagOnlineStatusByEarmarkAndDate> 输入参数 earmark>>"+earmark);
         log.info("<listEartagOnlineStatusByEarmarkAndDate> 输入参数 pastDays>"+pastDays);
         //
@@ -200,7 +207,8 @@ public class EartagController {
      * @Time        : 20:43
      */
     @RequestMapping(value = "/listEartagOnlineAllStatus",method = RequestMethod.GET)
-    public Result listEartagOnlineAllStatus(@RequestParam(value = "farmId",required = true) String farmId,@RequestParam(value = "days",required = true) Integer days) throws ParseException {
+    public Result listEartagOnlineAllStatus(@RequestParam(value = "farmId",required = true) String farmId,
+                                            @RequestParam(value = "days",required = true) Integer days) throws ParseException {
         log.info("<listEartagOnlineAllStatus>输入参数 farmId>>"+farmId);
         log.info("<listEartagOnlineAllStatus>输入参数 days>>"+days);
         if(days == null){
@@ -213,7 +221,7 @@ public class EartagController {
 
     /**
      * @Method      : listEartagOnlineCount
-     * @Description : 裂变展示某一天的在线记录
+     * @Description : 列表展示某一天的在线记录
      * @Params      : [farmId, addDate, pageNo, pageSize]
      * @Return      : com.huimv.eartag2.common.utils.Result
      * 
@@ -223,7 +231,7 @@ public class EartagController {
      */
     @RequestMapping(value = "/listOnlineEartagCount",method = RequestMethod.GET)
     public Result listEartagOnlineCount(@RequestParam(value = "farmId",required = true) String farmId,
-                                        @RequestParam(value = "date",required = false) String addDate,
+                                        @RequestParam(value = "addDate",required = false) String addDate,
                                         @RequestParam(value = "pageNo",required = true) Integer pageNo,
                                         @RequestParam(value = "pageSize",required = true) Integer pageSize,
                                         @RequestParam(value = "showMode",required = true) Integer showMode) throws ParseException {
@@ -240,8 +248,8 @@ public class EartagController {
     }
 
     /**
-     * @Method      : getEartagDeviceByEarmarkAndAddDate
-     * @Description : 
+     * @Method      : listEartagDeviceByEarmarkAndAddDate
+     * @Description : 根据耳标和日期，查询关联设备记录
      * @Params      : [earmark, addDate]
      * @Return      : com.huimv.eartag2.common.utils.Result
      * 
@@ -249,16 +257,16 @@ public class EartagController {
      * @Date        : 2022/3/10       
      * @Time        : 22:33
      */
-    @RequestMapping(value = "/getEartagDeviceByEarmarkAndAddDate",method = RequestMethod.GET)
-    public Result getEartagDeviceByEarmarkAndAddDate(@RequestParam(value = "earmark",required = true) String earmark,
+    @RequestMapping(value = "/listEartagDeviceByEarmarkAndAddDate",method = RequestMethod.GET)
+    public Result listEartagDeviceByEarmarkAndAddDate(@RequestParam(value = "earmark",required = true) String earmark,
                                                 @RequestParam(value = "addDate",required = false) String addDate) throws ParseException {
-        log.info("<getEartagDeviceByEarmarkAndAddDate>输入参数 earmark>>"+earmark);
-        log.info("<getEartagDeviceByEarmarkAndAddDate>输入参数 addDate>>"+addDate);
+        log.info("<listEartagDeviceByEarmarkAndAddDate>输入参数 earmark>>"+earmark);
+        log.info("<listEartagDeviceByEarmarkAndAddDate>输入参数 addDate>>"+addDate);
         if(addDate == null){
             addDate = new DateUtil().getTodayDateText();
         }
         //
-        return eartagService.getEartagDeviceByEarmarkAndAddDate(earmark,addDate);
+        return eartagService.listEartagDeviceByEarmarkAndAddDate(earmark,addDate);
     }
 
     /**

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

@@ -14,7 +14,7 @@ public interface IEartagService {
     Result listEartagFlowByDeviceCodeAndEarmarkAndToday(String earmark, String deviceCode) throws ParseException;
 
     //显示耳标在线统计
-    Result listEartagOnlineCountByEarmarkAndDate(String earmark, Integer pastDays) throws ParseException;
+    Result listEartagOnlineCountByEarmarkAndDate(String earmark, Integer pastDays, Integer showMode) throws ParseException;
 
     //显示耳标在线统计
     Result listEartagOnlineStatusByEarmarkAndDate(String earmark, Integer pastDays) throws ParseException;
@@ -38,7 +38,7 @@ public interface IEartagService {
 //    Result getEartagOnlineCountByEarmark(String earmark, Integer days) throws ParseException;
 
     //通过耳标号和日期获取耳标关联设备信息
-    Result getEartagDeviceByEarmarkAndAddDate(String earmark, String addDate);
+    Result listEartagDeviceByEarmarkAndAddDate(String earmark, String addDate);
 
     //分页展示所有耳标注册列表
     Result listAllEartagRegister(String farmId, String earmark, Integer activeStatus, Integer liveStatus, Integer registerType, String startDate, String endDate, Integer pageNo, Integer pageSize) throws ParseException;

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

@@ -17,7 +17,6 @@ import org.springframework.stereotype.Service;
 import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Predicate;
 import java.sql.Date;
-import java.sql.Timestamp;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
@@ -184,7 +183,7 @@ public class EartagServiceImpl implements IEartagService {
      * @Time        : 22:39
      */
     @Override
-    public Result getEartagDeviceByEarmarkAndAddDate(String earmark, String addDate){
+    public Result listEartagDeviceByEarmarkAndAddDate(String earmark, String addDate){
         //
         List<EartagDeviceEartagCountEntity> deviceEartagCountEntityList = deviceEartagCountRepo.getOnlineEartagDeviceByEarmarkAndAddDate(earmark,addDate);
         if(deviceEartagCountEntityList != null){
@@ -475,7 +474,7 @@ public class EartagServiceImpl implements IEartagService {
      * @Time : 18:30
      */
     @Override
-    public Result listEartagOnlineCountByEarmarkAndDate(String earmark, Integer pastDays) throws ParseException {
+    public Result listEartagOnlineCountByEarmarkAndDate(String earmark, Integer pastDays, Integer showMode) throws ParseException {
         DateUtil du = new DateUtil();
         String todayDateText = du.getTodayDateText();
         String startDateText = du.getPastDate(pastDays);
@@ -484,15 +483,29 @@ public class EartagServiceImpl implements IEartagService {
         //读取耳标在线统计记录
         List<EartagEartagOnlineEntity> eartagOnlineEntityList = eartagOnlineRepo.getEartagOnlineByEarmarkAndDate(earmark, startDateText, todayDateText);
         if (eartagOnlineEntityList.size() > 0) {
-            JSONArray dataJa = new JSONArray();
-            for (EartagEartagOnlineEntity eartagOnlineEntity : eartagOnlineEntityList) {
-                JSONObject eartagOnlineJo = JSONUtil.convertEntityToJSONObject(eartagOnlineEntity);
-                eartagOnlineJo.put("firstTime", du.formatDatetimeText(eartagOnlineJo.getDate("firstTime")));
-                eartagOnlineJo.put("lastTime", du.formatDatetimeText(eartagOnlineJo.getDate("lastTime")));
-                eartagOnlineJo.put("addDate", du.formatDateText(eartagOnlineJo.getDate("addDate")));
-                dataJa.add(eartagOnlineJo);
+            if(showMode == 1){
+                //返回在线记录
+                JSONArray dataJa = new JSONArray();
+                for (EartagEartagOnlineEntity eartagOnlineEntity : eartagOnlineEntityList) {
+                    JSONObject eartagOnlineJo = JSONUtil.convertEntityToJSONObject(eartagOnlineEntity);
+                    eartagOnlineJo.put("firstTime", du.formatDatetimeText(eartagOnlineJo.getDate("firstTime")));
+                    eartagOnlineJo.put("lastTime", du.formatDatetimeText(eartagOnlineJo.getDate("lastTime")));
+                    eartagOnlineJo.put("addDate", du.formatDateText(eartagOnlineJo.getDate("addDate")));
+                    dataJa.add(eartagOnlineJo);
+                }
+                return new Result(ResultCode.SUCCESS, dataJa);
+            }else{
+                //返回在线图表
+                JSONArray dataJa = new JSONArray();
+                for (EartagEartagOnlineEntity eartagOnlineEntity : eartagOnlineEntityList) {
+//                    JSONObject eartagOnlineJo = JSONUtil.convertEntityToJSONObject(eartagOnlineEntity);
+                    JSONObject newJo = new JSONObject();
+                    newJo.put("time", du.formatDateText(eartagOnlineEntity.getAddDate()));
+                    newJo.put("value", eartagOnlineEntity.getTotal());
+                    dataJa.add(newJo);
+                }
+                return new Result(ResultCode.SUCCESS, dataJa);
             }
-            return new Result(ResultCode.SUCCESS, dataJa);
         } else {
             return new Result(BizConst.CODE_EARTAG_ONLINE_NO_EXIST, BizConst.MSG_EARTAG_ONLINE_NO_EXIST, false);
         }

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

@@ -4,7 +4,17 @@ spring.profiles.active=dev
 device.online.access_mode=mysql
 
 
-
+###################################################配置undertow取代tomcat
+# 是否打开 undertow 日志，默认为 false
+server.undertow.accesslog.enabled=false
+# 设置访问日志所在目录
+server.undertow.accesslog.dir=logs
+# 指定工作者线程的 I/0 线程数，默认为 2 或者 CPU 的个数
+server.undertow.io-threads=
+# 指定工作者线程个数，默认为 I/O 线程个数的 8 倍
+server.undertow.worker-threads=
+# 设置 HTTP POST 内容的最大长度，默认不做限制
+server.undertow.max-http-post-size=0
 
 
 

huimv-eartag2-platform/pom.xml

@@ -9,6 +9,8 @@
         <module>huimv-eartag2-gateway</module>
         <module>huimv-eartag2-common</module>
         <module>huimv-eartag2-process2</module>
+        <module>huimv-eartag2-device</module>
+        <module>huimv-eartag2-eartag</module>
     </modules>
     <parent>
         <groupId>org.springframework.boot</groupId>