修改门卫室通道

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EggDataServiceImpl.java

@@ -56,18 +56,18 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
         }
         //今日
         else {
-            wrapper.ge("upload_time", DateUtil.beginOfDay(now));
+            wrapper.ge("upload_time", DateUtil.offsetHour(DateUtil.beginOfDay(now),1));
            List<EggVo> list =  eggDataMapper.getAllDay(wrapper);
            double maxFood = 0.0;
            double maxWater = 0.0;
 
             for (EggVo eggVo : list) {
-                maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
-
-                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
+//                maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
+//                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
+                maxFood += eggVo.getFtDoTalTdy();
+                maxWater += eggVo.getWtrTdy();
             }
 
-
             Map endMap = new HashMap();
             endMap.put("list" ,list);
             endMap.put("maxFood" ,maxFood);
@@ -123,7 +123,7 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
         }
         //今日
         else {
-            wrapper.ge("upload_time", DateUtil.beginOfDay(now));
+            wrapper.ge("upload_time", DateUtil.offsetHour( DateUtil.beginOfDay(now),1));
             List<EggVo> list =  eggDataMapper.getAllDay(wrapper);
 
             double maxFood = 0.0;
@@ -168,15 +168,10 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
         String type = map.get("type");
         Date now = new Date();
         DecimalFormat df = new DecimalFormat("0.00");
-
-
-
         QueryWrapper<EggData> wrapper = new QueryWrapper<>();
-
         //周
         if (type.equals("1")){
             wrapper.ge("upload_time", DateUtil.beginOfWeek(now));
-
         }
         //月
         else if (type.equals("2")){
@@ -184,23 +179,21 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
         }
         //自定义
         else if (type.equals("3")){
-
             wrapper.between("upload_time",startDate,endDate);
         }
         //今日
         else {
-            wrapper.ge("upload_time", DateUtil.beginOfDay(now));
+            wrapper.ge("upload_time",  DateUtil.offsetHour(DateUtil.beginOfDay(now),1));
             List<EggVo> list =  eggDataMapper.getAllDayFood(wrapper);
             double maxFood = 0.0;
             double maxWater = 0.0;
-
             for (EggVo eggVo : list) {
-                maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
-
-                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
+//                maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
+//                maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
+                maxFood += eggVo.getFtDoTalTdy();
+                maxWater += eggVo.getWtrTdy();
             }
 
-
             Map endMap = new HashMap();
             endMap.put("list" ,list);
             endMap.put("maxFood" ,df.format(maxFood));
@@ -208,41 +201,35 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
             return new Result(ResultCode.SUCCESS,endMap);
         }
 
-
+        System.out.println("test");
         List<EggVo> list =  eggDataMapper.getAllWeekFood(wrapper);
         double maxFood = 0.0;
         double maxWater = 0.0;
 
+//        Set<String> set = new HashSet<>();
+        LinkedHashSet<String> objects = new LinkedHashSet<>();
         for (EggVo eggVo : list) {
             maxFood += eggVo.getFtDoTalTdy();
             maxWater += eggVo.getWtrTdy();
-        }
-        Set<String> set = new HashSet<>();
-        for (EggVo eggVo : list) {
-            set.add(eggVo.getUploadTime());
+            objects.add(eggVo.getUploadTime());
         }
         List endList = new ArrayList();
-        List<String> list2 = new ArrayList<String>();
-        for (String s : set) {
-            list2.add(s);
-        }
-        for(int i = list2.size() ; i >0 ;i --){
-            String o = list2.get(i-1);
-
+        for (String object : objects) {
             Map map1 = new HashMap();
-
             for (EggVo eggVo : list) {
-                if (eggVo.getUploadTime().equals(o)){
+                if (eggVo.getUploadTime().equals(object)){
                     map1.put("value"+eggVo.getI(),eggVo.getFtDoTalTdy());
                 }
             }
-            map1.put("updateTime",o);
+            map1.put("updateTime",object);
             endList.add(map1);
         }
-
-//        for (String o : set) {
+//        for (String s : set) {
+//            list2.add(s);
+//        }
+//        for(int i = list2.size() ; i >0 ;i --){
+//            String o = list2.get(i-1);
 //            Map map1 = new HashMap();
-//
 //            for (EggVo eggVo : list) {
 //                if (eggVo.getUploadTime().equals(o)){
 //                    map1.put("value"+eggVo.getI(),eggVo.getFtDoTalTdy());
@@ -251,14 +238,10 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
 //            map1.put("updateTime",o);
 //            endList.add(map1);
 //        }
-
         Map endMap = new HashMap();
         endMap.put("list" ,endList);
-
         endMap.put("maxFood" ,df.format(maxFood));
         endMap.put("maxWater" ,df.format(maxWater));
-
-
         return new Result(ResultCode.SUCCESS,endMap);
     }
 
@@ -278,7 +261,6 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
         //周
         if (type.equals("1")){
             wrapper.ge("upload_time", DateUtil.beginOfWeek(now));
-
         }
         //月
         else if (type.equals("2")){
@@ -291,18 +273,14 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
         }
         //今日
         else {
-            wrapper.ge("upload_time", DateUtil.beginOfDay(now));
+            wrapper.ge("upload_time",  DateUtil.offsetHour(DateUtil.beginOfDay(now),1));
             List<EggVo> list =  eggDataMapper.getAllDayFood(wrapper);
             double maxFood = 0.0;
             double maxWater = 0.0;
-
             for (EggVo eggVo : list) {
                 maxFood = Math.max(eggVo.getFtDoTalTdy(), maxFood);
-
                 maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
             }
-
-
             Map endMap = new HashMap();
             endMap.put("list" ,list);
             endMap.put("maxFood" ,df.format(maxFood));
@@ -318,13 +296,10 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
             maxFood += eggVo.getFtDoTalTdy();
             maxWater += eggVo.getWtrTdy();
         }
-
         Map endMap = new HashMap();
         endMap.put("list" ,list);
         endMap.put("maxFood" ,df.format(maxFood));
         endMap.put("maxWater" ,df.format(maxWater));
-
-
         return new Result(ResultCode.SUCCESS,endMap);
     }
 
@@ -354,8 +329,7 @@ public class EggDataServiceImpl extends ServiceImpl<EggDataMapper, EggData> impl
         }
         //今日
         else {
-            wrapper.ge("upload_time", DateUtil.beginOfDay(now));
-
+            wrapper.ge("upload_time",  DateUtil.offsetHour(DateUtil.beginOfDay(now),1));
         }
 
         List<EggVo> list =  eggDataMapper.getAllWater(wrapper);

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/resources/application.properties

@@ -1,6 +1,6 @@
-#spring.profiles.active=dev
+spring.profiles.active=dev
 #spring.profiles.active=prod3
 #spring.profiles.active=demo
-spring.profiles.active=prod
+#spring.profiles.active=prod
 #spring.profiles.active=prod2
 

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/resources/config/com.huimv.environ.eco.mapper/EggDataMapper.xml

@@ -31,16 +31,14 @@
 
         FROM `egg_data`
    ${ew.customSqlSegment}
- GROUP BY DATE_FORMAT(upload_time,'%Y-%m-%d %H')  ,i   ORDER BY upload_time ASC
+ GROUP BY DATE_FORMAT(upload_time,'%Y-%m-%d %H')  ,i   ORDER BY upload_time DESC
     </select>
     <select id="getAllWeekFood" resultType="com.huimv.environ.eco.entity.eggvo.EggVo">
           SELECT
         i , DATE_FORMAT(upload_time,'%Y-%m-%d')  uploadTime,ROUND(MAX(wtr_tdy),2) wtrTdy,ROUND(MAX(ft_do_tal_tdy),2) ftDoTalTdy
-
         FROM `egg_data`
-
           ${ew.customSqlSegment}
-         GROUP BY DATE_FORMAT(upload_time,'%Y-%m-%d')  ,i ORDER BY id DESC
+         GROUP BY DATE_FORMAT(upload_time,'%Y-%m-%d')  ,i ORDER BY upload_time ASC
     </select>
 
     <select id="getAllWater" resultType="com.huimv.environ.eco.entity.eggvo.EggVo">

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/resources/config/com.huimv.environ.eco.mapper/SysFodderMapper.xml

@@ -33,12 +33,12 @@
     </select>
     <select id="fodderMapper" resultType="com.huimv.environ.eco.entity.dto.ScreenDto">
       SELECT
-         (SELECT MIN(`value`) FROM `sys_humidity`  WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW()) AND farm_id  = #{farmId} AND `value` &gt;= 0  )minHum ,
-         (SELECT MAX(`value`) FROM `sys_humidity`  WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW()) AND farm_id  = #{farmId}  AND `value` &lt;= 100  )maxHum,
-        (SELECT MAX(`value`) FROM `sys_temperature` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW())  AND farm_id  = #{farmId} AND `value` &lt;= 50 )maxTem,
-         (SELECT MIN(`value`) FROM `sys_temperature` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW())  AND farm_id  = #{farmId}  AND `value` &gt;= -50 )minTem,
-         (SELECT ROUND(SUM(`increase_value`),2) FROM`sys_month_water` WHERE TO_DAYS(`create_time`) = TO_DAYS(NOW()) AND farm_id  = #{farmId}  ) dayWater,
-         (SELECT ROUND(SUM(`increase_value`),2) FROM `sys_month_water` WHERE DATE_FORMAT( `create_time`, '%Y%m' ) =DATE_FORMAT( CURDATE( ) , '%Y%m' )  AND farm_id  = #{farmId}   ) monthWater
+         (SELECT MIN(`h_r`)  FROM `egg_data`  WHERE TO_DAYS(`upload_time`) = TO_DAYS(NOW())  AND `t_cur` &gt;= 0  )minHum ,
+         (SELECT MAX(`h_r`) FROM `egg_data`  WHERE TO_DAYS(`upload_time`) = TO_DAYS(NOW())   AND `t_cur` &lt;= 100  )maxHum,
+        (SELECT MAX(`t_cur`)  FROM `egg_data` WHERE TO_DAYS(`upload_time`) = TO_DAYS(NOW())    )maxTem,
+         (SELECT MIN(`t_cur`) FROM `egg_data` WHERE TO_DAYS(`upload_time`) = TO_DAYS(NOW())    AND `h_r` &gt;= -50 )minTem,
+         (SELECT ROUND(SUM(`wtr_tdy`),2) FROM`egg_data` WHERE TO_DAYS(`upload_time`) = TO_DAYS(NOW()) ) dayWater,
+         (SELECT ROUND(SUM(`wtr_tdy`),2) FROM `egg_data` WHERE DATE_FORMAT( `upload_time`, '%Y%m' ) =DATE_FORMAT( CURDATE( ) , '%Y%m' )    ) monthWater
     </select>