523096025 3 лет назад
Родитель
Сommit
da81a5c4b3

+ 2 - 2
smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/controller/EartagDataController.java

@@ -103,8 +103,8 @@ public class EartagDataController {
     /*
     * 获取每日数据统计
     */
-    @Scheduled(cron = "1 1 * * * ?")
-//    @RequestMapping("/test")
+//    @Scheduled(cron = "1 1 * * * ?")
+    @RequestMapping("/test")
     private void updateDailyData(){
         eartagDataService.updateDailyData();
     }

+ 1 - 0
smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/entity/vo/CollectorRegisterVo.java

@@ -59,6 +59,7 @@ public class CollectorRegisterVo implements Serializable {
      * 单元id
      */
     private Integer unitId;
+
     /**
      * 上传服务器地址
      */

+ 4 - 4
smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/impl/EartagDataServiceImpl.java

@@ -211,19 +211,19 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             for (EartagDataEntity eartagDataEntity : eartagDataEntities) {
                 Integer dayAge = eartagDataEntity.getDayAge2();
                 if (dayAge != null) {
-                    if (dayAge > 250 && dayAge < 1000) {
+                    if (dayAge > 240 && dayAge < 600) {
                         ratio1++;
                     }
 
-                    if (dayAge >= 1000 && dayAge < 1700) {
+                    if (dayAge >= 600 && dayAge < 960) {
                         ratio2++;
                     }
 
-                    if (dayAge >= 1700 && dayAge < 2400) {
+                    if (dayAge >= 960 && dayAge < 1320) {
                         ratio3++;
                     }
 
-                    if (dayAge >= 2400) {
+                    if (dayAge >= 1320) {
                         ratio4++;
                     }