创建项目

musk/src/main/java/com/huimv/farm/musk/entity/DevEnergy.java

@@ -31,7 +31,7 @@ public class DevEnergy implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date dateTime;
 
     private String water;

musk/src/main/java/com/huimv/farm/musk/entity/DevEnv.java

@@ -34,7 +34,7 @@ public class DevEnv implements Serializable {
     /**
      * 时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date dateTime;
 
     /**

musk/src/main/java/com/huimv/farm/musk/mapper/DevEnergyMapper.java

@@ -1,9 +1,11 @@
 package com.huimv.farm.musk.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.farm.musk.entity.DevEnergy;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.farm.musk.entity.DevEnv;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,8 +19,8 @@ import java.util.List;
  */
 public interface DevEnergyMapper extends BaseMapper<DevEnergy> {
 
-    List<DevEnergy> listDataDay(QueryWrapper<DevEnv> queryWrapper);
+    List<DevEnergy> listDataDay(@Param(Constants.WRAPPER)QueryWrapper<DevEnergy> queryWrapper);
 
 
-    List<DevEnergy> listData(QueryWrapper<DevEnv> queryWrapper);
+    List<DevEnergy> listData(@Param(Constants.WRAPPER)QueryWrapper<DevEnergy> queryWrapper);
 }

musk/src/main/java/com/huimv/farm/musk/service/impl/DevEnergyServiceImpl.java

@@ -77,32 +77,32 @@ public class DevEnergyServiceImpl extends ServiceImpl<DevEnergyMapper, DevEnergy
         if ("".equals(timeType) || null == timeType) {
             timeType = "1";
         }
-        QueryWrapper<DevEnv> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<DevEnergy> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId);
         //今日
         List<DevEnergy> protEnvData =null ;
         if ("1".equals(timeType)) {
             Date timesmorning = DataUill.getTimesmorning();
-            queryWrapper.ge("create_time", timesmorning);
-            protEnvData = energyMapper.listDataDay(queryWrapper);
+            queryWrapper.ge("date_time", timesmorning);
+            protEnvData = energyMapper.selectList(queryWrapper);
         }
         //本周
         else if ("2".equals(timeType)) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
-            queryWrapper.ge("create_time", dateTime);
+            queryWrapper.ge("date_time", dateTime);
             protEnvData = energyMapper.listData(queryWrapper);
         }
         //本月
         else if ("3".equals(timeType)) {
             Date monthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("create_time", monthmorning);
+            queryWrapper.ge("date_time", monthmorning);
             protEnvData = energyMapper.listData(queryWrapper);
         }
         //自定义
         else if ("4".equals(timeType)) {
             String startDate = paramsMap.get("startDate");
             String endDate = paramsMap.get("endDate");
-            queryWrapper.between("create_time", startDate, endDate);
+            queryWrapper.between("date_time", startDate, endDate);
             protEnvData = energyMapper.listData(queryWrapper);
         }
         return new Result(ResultCode.SUCCESS, protEnvData);
@@ -112,7 +112,7 @@ public class DevEnergyServiceImpl extends ServiceImpl<DevEnergyMapper, DevEnergy
     public Result listScreen(Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         QueryWrapper<BaseBuilding> buildingQueryWrapper = new QueryWrapper<>();
-        buildingQueryWrapper.eq("farm_id", farmId).eq("f_type", 1);
+        buildingQueryWrapper.eq("farm_id", farmId).eq("f_type", 2);
         List<BaseBuilding> buildings = baseBuildingMapper.selectList(buildingQueryWrapper);
         JSONArray jsonArray = new JSONArray();
         if (buildings.size() != 0) {

musk/src/main/java/com/huimv/farm/musk/service/impl/DevEnvServiceImpl.java

@@ -82,26 +82,26 @@ public class DevEnvServiceImpl extends ServiceImpl<DevEnvMapper, DevEnv> impleme
         List<DevEnv> protEnvData =null ;
         if ("1".equals(timeType)) {
             Date timesmorning = DataUill.getTimesmorning();
-            queryWrapper.ge("create_time", timesmorning);
-            protEnvData = devEnvMapper.listDataDay(queryWrapper);
+            queryWrapper.ge("date_time", timesmorning);
+            protEnvData = devEnvMapper.selectList(queryWrapper);
         }
         //本周
         else if ("2".equals(timeType)) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
-            queryWrapper.ge("create_time", dateTime);
+            queryWrapper.ge("date_time", dateTime);
             protEnvData = devEnvMapper.listData(queryWrapper);
         }
         //本月
         else if ("3".equals(timeType)) {
             Date monthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("create_time", monthmorning);
+            queryWrapper.ge("date_time", monthmorning);
             protEnvData = devEnvMapper.listData(queryWrapper);
         }
         //自定义
         else if ("4".equals(timeType)) {
             String startDate = paramsMap.get("startDate");
             String endDate = paramsMap.get("endDate");
-            queryWrapper.between("create_time", startDate, endDate);
+            queryWrapper.between("date_time", startDate, endDate);
             protEnvData = devEnvMapper.listData(queryWrapper);
         }
         return new Result(ResultCode.SUCCESS, protEnvData);
@@ -111,7 +111,7 @@ public class DevEnvServiceImpl extends ServiceImpl<DevEnvMapper, DevEnv> impleme
     public Result listScreen(Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         QueryWrapper<BaseBuilding> buildingQueryWrapper = new QueryWrapper<>();
-        buildingQueryWrapper.eq("farm_id", farmId).eq("f_type", 1);
+        buildingQueryWrapper.eq("farm_id", farmId).eq("f_type", 2);
         List<BaseBuilding> buildings = baseBuildingMapper.selectList(buildingQueryWrapper);
         JSONArray jsonArray = new JSONArray();
         if (buildings.size() != 0) {

musk/src/main/java/com/huimv/farm/musk/service/impl/DevWarningServiceImpl.java

@@ -2,6 +2,7 @@ package com.huimv.farm.musk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.musk.common.utils.Result;
@@ -32,7 +33,13 @@ public class DevWarningServiceImpl extends ServiceImpl<DevWarningMapper, DevWarn
         Integer size = (Integer) map.get("size");
         String farmId = (String) map.get("farmId");
         String unitId = (String) map.get("unitId");
-        IPage<DevWarning> list = page(new Page<>(current, size), new QueryWrapper<DevWarning>().eq(StringUtils.isNotBlank(unitId),"unit_id",unitId).eq("farm_id", farmId));
+        if (current == null || size <1){
+            current = 1;
+        }
+        if (size == null || size<1){
+            size = 10;
+        }
+        IPage<DevWarning> list = page(new Page<>(current, size), new QueryWrapper<DevWarning>().eq(ObjectUtils.isNotEmpty(unitId),"unit_id",unitId).eq("farm_id", farmId));
 
         return new Result(ResultCode.SUCCESS, list);
     }

musk/src/main/java/com/huimv/farm/musk/timer/DevTimer.java

@@ -101,12 +101,12 @@ public class DevTimer {
             warningService.save(devWarning);
         }
 
-        if (Integer.parseInt(tem )< Integer.parseInt(tempDown)){
+        if (Double.parseDouble(tem )< Double.parseDouble(tempDown)){
             devWarning.setWarningType(1);
             devWarning.setContent(baseBuilding.getBuildName() +"出现低温预警");
             warningService.save(devWarning);
         }
-        if (Integer.parseInt(tem )> Integer.parseInt(tempUpper)){
+        if (Double.parseDouble(tem )> Double.parseDouble(tempUpper)){
             devWarning.setWarningType(0);
             devWarning.setContent(baseBuilding.getBuildName() +"出现高温预警");
             warningService.save(devWarning);
@@ -123,12 +123,12 @@ public class DevTimer {
             warningService.save(devWarning);
         }
 
-        if (Integer.parseInt(water )< Integer.parseInt(waterDown)){
+        if (Double.parseDouble(water )< Double.parseDouble(waterDown)){
             devWarning.setWarningType(7);
             devWarning.setContent(baseBuilding.getBuildName() +"出现低水量预警");
             warningService.save(devWarning);
         }
-        if (Integer.parseInt(water )> Integer.parseInt(waterUpper)){
+        if (Double.parseDouble(water )> Double.parseDouble(waterUpper)){
             devWarning.setWarningType(6);
             devWarning.setContent(baseBuilding.getBuildName() +"出现高水量预警");
             warningService.save(devWarning);
@@ -137,11 +137,6 @@ public class DevTimer {
 
     }
 
-    public static void main(String[] args) {
-        String str = "1.5";
-        System.out.println(NumberUtils.getNum(8000, 20001, 1));
-
-    }
 
 
 

musk/src/main/resources/com/huimv/farm/musk/mapper/DevEnvMapper.xml

@@ -22,7 +22,7 @@
         date_time ,unit_id,unit_name,farm_id
         from dev_env
         ${ew.customSqlSegment}
-        GROUP BY DATE_FORMAT(date_time,'%Y-%m-%d %H')
+        GROUP BY DATE_FORMAT(date_time,'%Y-%m-%d %H ')
         ORDER BY date_time ASC
     </select>