timer 模块

huimv-farm-v2/huimv-produce-warning/pom.xml

@@ -42,6 +42,10 @@
             <artifactId>poi-ooxml</artifactId>
             <version>4.1.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
         <!--ICC-->
         <dependency>
             <groupId>com.dahuatech.icc</groupId>

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/controller/SysDayWaterController.java

@@ -25,4 +25,9 @@ public class SysDayWaterController {
         return dayWaterService.listAllWater(map);
     }
 
+    @GetMapping("/listAllWaterAndPower")
+    public Result listAllWaterAndPower( @RequestParam(name = "farmId") Integer farmId){
+        return dayWaterService.listAllWaterAndPower(farmId);
+    }
+
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/entity/dto/WaterAndPower.java

@@ -0,0 +1,12 @@
+package com.huimv.produce.entity.dto;
+
+
+import lombok.Data;
+
+@Data
+public class WaterAndPower {
+    private Double water;
+
+    private Double power;
+
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/mapper/SysMonthWaterMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.produce.entity.SysMonthWater;
+import com.huimv.produce.entity.dto.WaterAndPower;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -21,4 +22,6 @@ import java.util.List;
 public interface SysMonthWaterMapper extends BaseMapper<SysMonthWater> {
 
     List<SysMonthWater> selecAllMonthWater(@Param(Constants.WRAPPER)QueryWrapper<SysMonthWater> monthWaterWrapper);
+
+    WaterAndPower listAllWaterAndPower(@Param("farmId") Integer farmId);
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/ISysDayWaterService.java

@@ -19,4 +19,6 @@ public interface ISysDayWaterService extends IService<SysDayWater> {
     Result listWater(Map<String,String>  map);
 
     Result listAllWater(Map<String, String> map);
+
+    Result listAllWaterAndPower(Integer farmId);
 }

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

@@ -12,6 +12,7 @@ import com.huimv.produce.entity.BaseRoom;
 import com.huimv.produce.entity.SysMonthWater;
 import com.huimv.produce.entity.dto.DayWaterDto;
 import com.huimv.produce.entity.dto.ProdSalesDto;
+import com.huimv.produce.entity.dto.WaterAndPower;
 import com.huimv.produce.mapper.BaseRoomMapper;
 import com.huimv.produce.mapper.SysDayWaterMapper;
 import com.huimv.produce.mapper.SysMonthWaterMapper;
@@ -218,4 +219,10 @@ public class SysDayWaterServiceImpl extends ServiceImpl<SysDayWaterMapper, SysDa
 
         return new Result(ResultCode.SUCCESS,endMap);
     }
+
+    @Override
+    public Result listAllWaterAndPower(Integer farmId) {
+        WaterAndPower waterAndPower = monthWaterMapper.listAllWaterAndPower(farmId);
+        return new Result(ResultCode.SUCCESS,waterAndPower);
+    }
 }

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

@@ -6,6 +6,7 @@ import com.huimv.produce.repo.ProdDayWeightEntity;
 import com.huimv.produce.repo.ProdDayWeightRepo;
 import com.huimv.produce.service.IWeight;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -17,6 +18,7 @@ import java.util.List;
  * @Author : ZhuoNing
  * @Create : 2020-12-25
  **/
+@Service
 public class WeightImpl implements IWeight {
     @Autowired
     private ProdDayWeightRepo dayWeightRepo;

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/timer/SgdTimer.java

@@ -1,3 +1,4 @@
+/*
 package com.huimv.produce.timer;
 
 import cn.hutool.core.util.ObjectUtil;
@@ -66,7 +67,8 @@ public class SgdTimer {
 
     private Integer hyFarmId = 1;
 
-  /*  //更新盒子,房间信息
+  */
+/*  //更新盒子,房间信息
     @Scheduled(cron = "0 0 0 1/7 * ?")
 //    @Scheduled(cron = "0 0/6 * * * ?")
     private void updateBox(){
@@ -118,7 +120,8 @@ public class SgdTimer {
             e.printStackTrace();
         }
 
-    }*/
+    }*//*
+
 
     //更新环境数据
     @Scheduled(cron = "0 0/30 * * * ?")
@@ -721,3 +724,4 @@ public class SgdTimer {
 }
 
 
+*/

huimv-farm-v2/huimv-produce-warning/src/main/resources/com/huimv/produce/mapper/SysDayWaterMapper.xml

@@ -3,15 +3,15 @@
 <mapper namespace="com.huimv.produce.mapper.SysDayWaterMapper">
 
     <select id="countWater" resultType="java.lang.Double">
-        SELECT  ROUND(SUM(`value`),2)
-        FROM   `sys_day_water`
+        SELECT  ROUND(SUM(`increase_value`),2)
+        FROM   `sys_month_water`
         ${ew.customSqlSegment}
 
     </select>
     <select id="listAllWater" resultType="com.huimv.produce.entity.SysDayWater">
 
         SELECT
-        id,ROUND(SUM(`value`),2)'value' , create_time, room_id,day_water_id FROM `sys_day_water`
+        id,ROUND(SUM(`increase_value`),2) 'value' , create_time, room_id,month_water_id FROM `sys_month_water`
 
             ${ew.customSqlSegment}
 
@@ -20,7 +20,7 @@
     </select>
     <select id="listDay" resultType="com.huimv.produce.entity.SysDayWater">
 
-          SELECT * FROM `sys_day_water`
+          SELECT id, ROUND(SUM(`increase_value`),2) 'value' ,create_time ,room_id,farm_id FROM `sys_month_water`
         ${ew.customSqlSegment}
 
        GROUP BY DATE_FORMAT( `create_time`, '%m%d' )
@@ -30,26 +30,26 @@
     <select id="countMonthAndWeek" resultType="com.huimv.produce.entity.dto.DayWaterDto">
                     SELECT
              (SELECT
-             ROUND( IFNULL(SUM(`value`),0),2) monthQuantity
-            FROM `sys_day_water`
+             IFNULL(ROUND(SUM(`increase_value`),2) ,0)
+            FROM  `sys_month_water`
                 ${ew.customSqlSegment} AND PERIOD_DIFF( DATE_FORMAT( NOW( ) , '%Y%m' ) , DATE_FORMAT( create_time, '%Y%m' ) ) =1 ) lastMonth,
 
 
             (SELECT
-            IFNULL(SUM(`value`),0) monthQuantity
-            FROM `sys_day_water`
+           IFNULL(ROUND(SUM(`increase_value`),2) ,0)
+            FROM  `sys_month_water`
               ${ew.customSqlSegment} AND PERIOD_DIFF( DATE_FORMAT( NOW( ) , '%Y%m' ) , DATE_FORMAT( create_time, '%Y%m' ) ) =2) lastTwoMonth,
 
 
             (SELECT
-           ROUND( IFNULL(SUM(`value`),0) ,2)monthQuantity
-            FROM `sys_day_water`
+         IFNULL(ROUND(SUM(`increase_value`),2) ,0)
+            FROM  `sys_month_water`
                ${ew.customSqlSegment} AND YEARWEEK(DATE_FORMAT(create_time,'%Y-%m-%d')) =YEARWEEK(NOW())-1 ) lastWeek,
 
 
             (SELECT
-            IFNULL(SUM(`value`),0) monthQuantity
-            FROM `sys_day_water`
+           IFNULL(ROUND(SUM(`increase_value`),2) ,0)
+            FROM  `sys_month_water`
                ${ew.customSqlSegment} AND YEARWEEK(DATE_FORMAT(create_time,'%Y-%m-%d')) =YEARWEEK(NOW())-2 )lastTwoWeek
 
 

huimv-farm-v2/huimv-produce-warning/src/main/resources/com/huimv/produce/mapper/SysMonthWaterMapper.xml

@@ -11,7 +11,15 @@
                 ORDER BY create_time ASC
 
     </select>
+    <select id="listAllWaterAndPower" resultType="com.huimv.produce.entity.dto.WaterAndPower">
 
+          SELECT  ROUND(SUM(`increase_value`),2) water
+        FROM   `sys_month_water`
+        WHERE farm_id = #{farmId}
+        AND  TO_DAYS(create_time) = TO_DAYS(NOW())
+
+
+    </select>
 
 
 </mapper>