Merge remote-tracking branch 'origin/master'

huimv-farm-v2/huimv-center-receiver/src/main/java/com/huimv/receiver/cloud/controller/EnvironController.java

@@ -16,7 +16,7 @@ import java.text.ParseException;
  **/
 @CrossOrigin
 @RestController
-@RequestMapping(value = "/cloud/environ")
+@RequestMapping(value = "/receiver/cloud/environ")
 public class EnvironController {
     @Autowired
     private IEnviron environ;

huimv-farm-v2/huimv-center-receiver/src/main/java/com/huimv/receiver/farm/controller/WeightController.java

@@ -0,0 +1,27 @@
+package com.huimv.receiver.farm.controller;
+
+import com.huimv.receiver.farm.service.IWeight;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@CrossOrigin
+@RestController
+@RequestMapping(value = "/receiver/farm/weight")
+public class WeightController {
+    @Autowired
+    private IWeight weight;
+
+    @RequestMapping(value = "/putDayWeight",method = RequestMethod.POST)
+    public void putDayWeight(@RequestParam(value = "data",required = true) String data){
+        //
+        weight.saveDayWeight(data);
+    }
+}

huimv-farm-v2/huimv-center-receiver/src/main/java/com/huimv/receiver/farm/dao/entity/ProdDayWeightEntity.java

@@ -0,0 +1,92 @@
+package com.huimv.receiver.farm.dao.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "prod_day_weight")
+public class ProdDayWeightEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "add_time")
+    private Timestamp addTime;
+
+    @Column(name = "farm_id")
+    private Integer farmId;
+
+    @Column(name = "gross_weight")
+    private Float grossWeight;
+
+    @Column(name = "net_weight")
+    private Float netWeight;
+
+    @Column(name = "tare_weight")
+    private Float tareWeight;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setAddTime(Timestamp addTime) {
+        this.addTime = addTime;
+    }
+
+    public Timestamp getAddTime() {
+        return addTime;
+    }
+
+    public void setFarmId(Integer farmId) {
+        this.farmId = farmId;
+    }
+
+    public Integer getFarmId() {
+        return farmId;
+    }
+
+    public void setGrossWeight(Float grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public Float getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setNetWeight(Float netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public Float getNetWeight() {
+        return netWeight;
+    }
+
+    public void setTareWeight(Float tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+    public Float getTareWeight() {
+        return tareWeight;
+    }
+
+    @Override
+    public String toString() {
+        return "ProdDayWeightEntity{" +
+                "id=" + id + '\'' +
+                "addTime=" + addTime + '\'' +
+                "farmId=" + farmId + '\'' +
+                "grossWeight=" + grossWeight + '\'' +
+                "netWeight=" + netWeight + '\'' +
+                "tareWeight=" + tareWeight + '\'' +
+                '}';
+    }
+}

huimv-farm-v2/huimv-center-receiver/src/main/java/com/huimv/receiver/farm/dao/repo/ProdDayWeightRepo.java

@@ -0,0 +1,14 @@
+package com.huimv.receiver.farm.dao.repo;
+
+import com.huimv.receiver.farm.dao.entity.ProdDayWeightEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.Date;
+
+public interface ProdDayWeightRepo extends JpaRepository<ProdDayWeightEntity, Integer>, JpaSpecificationExecutor<ProdDayWeightEntity> {
+
+    @Query(nativeQuery = true,value = "SELECT * FROM prod_day_weight WHERE DATE_FORMAT(add_time,'%Y-%m-%d') = DATE_FORMAT(?1,'%Y-%m-%d') AND farm_id=?2")
+    ProdDayWeightEntity findByDateAndFarmId(Date date, Integer farmId);
+}

huimv-farm-v2/huimv-center-receiver/src/main/java/com/huimv/receiver/farm/service/IWeight.java

@@ -0,0 +1,6 @@
+package com.huimv.receiver.farm.service;
+
+public interface IWeight {
+    //
+    void saveDayWeight(String data);
+}

huimv-farm-v2/huimv-center-receiver/src/main/java/com/huimv/receiver/farm/service/impl/WeightImpl.java

@@ -0,0 +1,51 @@
+package com.huimv.receiver.farm.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.receiver.farm.dao.entity.ProdDayWeightEntity;
+import com.huimv.receiver.farm.dao.repo.ProdDayWeightRepo;
+import com.huimv.receiver.farm.service.IWeight;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.Timestamp;
+import java.util.Date;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Service
+public class WeightImpl implements IWeight {
+    @Autowired
+    private ProdDayWeightRepo dayWeightRepo;
+
+    @Override
+    public void saveDayWeight(String data) {
+        JSONObject dayWeightJo = JSONObject.parseObject(data);
+        Long date = dayWeightJo.getLong("addTime");
+        Integer farmId = dayWeightJo.getInteger("farmId");
+        //
+        ProdDayWeightEntity existDayWeightEntity = dayWeightRepo.findByDateAndFarmId(new Date(date),farmId);
+        if(existDayWeightEntity != null){
+            existDayWeightEntity.setAddTime(new Timestamp(new Date().getTime()));
+//            existDayWeightEntity.setFarmId(dayWeightJo.getInteger("farmId"));
+            existDayWeightEntity.setGrossWeight(dayWeightJo.getFloat("grossWeight"));
+            existDayWeightEntity.setTareWeight(dayWeightJo.getFloat("tareWeight"));
+            existDayWeightEntity.setNetWeight(dayWeightJo.getFloat("netWeight"));
+            dayWeightRepo.saveAndFlush(existDayWeightEntity);
+        }else{
+            ProdDayWeightEntity newDayWeightEntity = new ProdDayWeightEntity();
+            newDayWeightEntity.setAddTime(new Timestamp(new Date().getTime()));
+            newDayWeightEntity.setFarmId(dayWeightJo.getInteger("farmId"));
+            newDayWeightEntity.setGrossWeight(dayWeightJo.getFloat("grossWeight"));
+            newDayWeightEntity.setTareWeight(dayWeightJo.getFloat("tareWeight"));
+            newDayWeightEntity.setNetWeight(dayWeightJo.getFloat("netWeight"));
+            dayWeightRepo.saveAndFlush(newDayWeightEntity);
+        }
+
+    }
+}

huimv-farm-v2/huimv-env/src/main/java/com/huimv/env/controller/AlarmController.java

@@ -81,4 +81,7 @@ public class AlarmController {
         return iAlarm.getOneWeekAlarm(farmId);
     }
 
+
+
+
 }

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

@@ -32,4 +32,9 @@ public class BaseWarningInfoController {
         return warningInfoService.listWarningInfoSewage(map);
     }
 
+
+    @PostMapping("/listWarningInfo")
+    public Result listWarningInfo(@RequestBody Map<String,String> map ) {
+        return warningInfoService.listWarningInfo(map);
+    }
 }

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

@@ -24,7 +24,6 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/telecom")
-@CrossOrigin
 public class SysTelecomEventController {
 
     @Autowired

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/newcontroller/AccidentController.java

@@ -17,7 +17,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/accident")
-@CrossOrigin
+
 public class AccidentController {
 
     /**

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/newcontroller/CarManageController.java

@@ -17,7 +17,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("car")
-@CrossOrigin
+
 public class CarManageController {
         //过车的数据
         /**

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/newcontroller/GetToken.java

@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest;
  * 事件信息的最终端口*/
 @RestController
 @RequestMapping("token")
-@CrossOrigin
+
 public class GetToken {
         @RequestMapping("/getToken")
         public R getAccidentRecordPicture(HttpServletRequest request

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/newcontroller/PersonManageController.java

@@ -14,7 +14,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("person")
-@CrossOrigin
+
 public class PersonManageController {
 
     /*

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/newcontroller/VideoRecorController.java

@@ -33,7 +33,7 @@ import com.huimv.produce.dhicc.result.R;
 //方便前端操作   传入的是  事件时间  还有通道编号就可以播放了
 @RestController
 @RequestMapping("/video")
-@CrossOrigin
+
 public class VideoRecorController {
 
     @Autowired
@@ -89,7 +89,7 @@ public class VideoRecorController {
         String token = (String) JSONObject.fromObject(data).get("token");
         // "|"  特殊字符需要加转义字符
         String[] sourceStrArray = url.split("\\|");
-        String recordUrl = sourceStrArray[1]+"?token="+token;
+        String recordUrl = sourceStrArray[1]+"?token="+token+"&trackID=701";
         return  R.ok("请求成功").put("URL",recordUrl );
     }
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/screen/ScreenAlarmCountByDay.java

@@ -19,7 +19,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/screen/alarmCount")
-@CrossOrigin
+
 public class ScreenAlarmCountByDay {
 
     @Autowired

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/screen/ScreenCarController.java

@@ -15,7 +15,7 @@ import com.huimv.produce.dhicc.result.R;
 
 @RestController
 @RequestMapping("/screen/car")
-@CrossOrigin
+
 //没有连接ICC的数据库  所以操作比较麻烦
 public class ScreenCarController {
 

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/screen/ScreenPersonController.java

@@ -16,7 +16,7 @@ import com.huimv.produce.dhicc.result.R;
 
 @RestController
 @RequestMapping("/screen/person")
-@CrossOrigin
+
 public class ScreenPersonController {
 
     @RequestMapping("/count_person_record")

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/screen/ScreenSiZhuController.java

@@ -21,7 +21,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/screen/sizhu")
-@CrossOrigin
+
 public class ScreenSiZhuController {
         /**
          * xuyao   直接都写在这里了

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

@@ -22,6 +22,7 @@ public class BaseBox extends Model {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "uid")
     private String uid;
 
     /**

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

@@ -1,5 +1,6 @@
 package com.huimv.produce.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -20,6 +21,7 @@ public class BaseTelecomRoom extends Model {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "device_id")
     private String deviceId;
 
     private String deviceName;

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

@@ -0,0 +1,11 @@
+package com.huimv.produce.entity.dto;
+
+
+import lombok.Data;
+
+
+@Data
+public class AllDayWater {
+    private String room;
+    private String water;
+}

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

@@ -0,0 +1,15 @@
+package com.huimv.produce.entity.dto;
+
+
+import lombok.Data;
+
+@Data
+public class AllRoomEnvironment {
+    private Double humidity;
+
+    private Double temperature;
+
+    private Integer roomId;
+
+    private String room;
+}

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

@@ -8,6 +8,7 @@ public class ProdScreenDto {
     private String total;
     private String money;
     private String task;
+    private String quantity;
 
 
 

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

@@ -3,7 +3,13 @@ package com.huimv.produce.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.common.utils.Result;
 import com.huimv.produce.entity.BaseRoom;
+import com.huimv.produce.entity.dto.AllDayWater;
+import com.huimv.produce.entity.dto.AllRoomEnvironment;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 /**
  * <p>
@@ -16,4 +22,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface BaseRoomMapper extends BaseMapper<BaseRoom> {
 
+    List<AllRoomEnvironment> getAllRoomEnvironment(@Param("farmId")Integer farmId);
+
+    List<AllDayWater> getAllDayWater(@Param("farmId") Integer farmId);
 }

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

@@ -19,4 +19,6 @@ public interface IBaseWarningInfoService extends IService<BaseWarningInfo> {
     Result listWarningInfoZoology(Map<String,String> map);
 
     Result listWarningInfoSewage(Map<String, String> map);
+
+    Result listWarningInfo(Map<String, String> map);
 }

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

@@ -14,6 +14,7 @@ import com.huimv.produce.entity.BaseRoom;
 import com.huimv.produce.entity.SysFodder;
 import com.huimv.produce.entity.SysHumidity;
 import com.huimv.produce.entity.SysTemperature;
+import com.huimv.produce.entity.dto.AllRoomEnvironment;
 import com.huimv.produce.entity.dto.ScreenDto;
 import com.huimv.produce.mapper.BaseRoomMapper;
 import com.huimv.produce.mapper.SysFodderMapper;
@@ -45,32 +46,16 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
     @Autowired
     private SysFodderMapper fodderMapper;
 
+    @Autowired
+    private BaseRoomMapper baseRoomMapper;
+
 
     @Override
     public Result getAllRoomEnvironment(Integer farmId) {
-        List<BaseRoom> roomList = this.list();
-        List resultList = new ArrayList();
-        for (BaseRoom baseRoom : roomList) {
-            Map map =new HashMap();
-            SysHumidity humidity = humidityMapper.selectOne(new QueryWrapper<SysHumidity>().ge("create_time",DataUill.getTimesmorning()).eq("farm_id",farmId).eq("room_id", baseRoom.getId()).last("ORDER BY hum_id  DESC limit 1"));
-            SysTemperature temperature = temperatureMapper.selectOne(new QueryWrapper<SysTemperature>().ge("create_time",DataUill.getTimesmorning()).eq("farm_id",farmId).eq("room_id", baseRoom.getId()).last("ORDER BY tem_id  DESC limit 1"));
-            if (humidity != null){
-                map.put("humidity",humidity.getValue());
-            }else {
-                map.put("humidity",null);
-            }
-            if (temperature != null){
-                map.put("temperature",temperature.getValue());
-            }else {
-                map.put("temperature",null);
-            }
-
-
-            map.put("room",baseRoom.getAlias()+baseRoom.getRoomName());
-            map.put("roomId",baseRoom.getId());
-            resultList.add(map);
-        }
-        return new Result(ResultCode.SUCCESS,resultList);
+
+       List<AllRoomEnvironment> list =  baseRoomMapper.getAllRoomEnvironment(farmId);
+
+        return new Result(ResultCode.SUCCESS,list);
     }
 
     @Override

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

@@ -133,4 +133,52 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
 
         return new Result(ResultCode.SUCCESS,page);
     }
+
+    @Override
+    public Result listWarningInfo(Map<String, String> map) {
+        String farmId = map.get("farmId");
+        String startDate = map.get("startDate");
+        String endDate = map.get("endDate");
+        String type = map.get("type");
+        String current = map.get("current");
+        String size = map.get("size");
+
+        Date now = new Date();
+
+        QueryWrapper<BaseWarningInfo> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_id",farmId);
+
+        wrapper.orderByDesc("warning_time");
+
+
+        //自定义
+        if ("4".equals(type)){
+            endDate = endDate+" 23:59:59";
+            startDate = startDate+" 00:00:00";
+            wrapper.between("warning_time",startDate,endDate);
+
+        }
+        //本月
+        else if ("3".equals(type)){
+            wrapper.ge("warning_time", DateUtil.beginOfMonth(now));
+        }
+        //本周
+        else if ("2".equals(type)){
+            wrapper.ge("warning_time", DateUtil.beginOfWeek(now));
+        }
+        //今日
+        else if ("1".equals(type)) {
+            wrapper.ge("warning_time", DateUtil.beginOfDay(now));
+        }
+
+        if (StringUtils.isBlank(current)){
+            current = "1";
+        }
+        if (StringUtils.isBlank(size)){
+            size = "20";
+        }
+        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)),wrapper);
+
+        return new Result(ResultCode.SUCCESS,page);
+    }
 }

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

@@ -155,9 +155,12 @@ public class SysDayWaterServiceImpl extends ServiceImpl<SysDayWaterMapper, SysDa
         Map endMap = new HashMap();
         //自定义
         if ("4".equals(type)){
+            endDate= endDate+" 23:59:59";
+            startDate= startDate+" 00:00:00";
             wrapper.between("create_time", startDate, endDate);
             List<SysDayWater> dayWater = dayWaterMapper.listAllWater(wrapper);
             endMap.put("data",dayWater);
+
             Double countWater = dayWaterMapper.countWater(wrapper);
             if (ObjectUtil.isNotEmpty(countWater)){
                 endMap.put("countWater",countWater);

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

@@ -6,6 +6,7 @@ import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.produce.entity.BaseRoom;
 import com.huimv.produce.entity.SysMonthWater;
+import com.huimv.produce.entity.dto.AllDayWater;
 import com.huimv.produce.mapper.BaseRoomMapper;
 import com.huimv.produce.mapper.SysMonthWaterMapper;
 import com.huimv.produce.service.ISysMonthWaterService;
@@ -34,26 +35,7 @@ public class SysMonthWaterServiceImpl extends ServiceImpl<SysMonthWaterMapper, S
 
     @Override
     public Result getAllDayWater(Integer farmId) {
-        List<BaseRoom> baseRooms = baseRoomMapper.selectList(new QueryWrapper<BaseRoom>().eq("farm_id",farmId));
-        List endList = new ArrayList();
-        for (BaseRoom baseRoom : baseRooms) {
-            Integer id = baseRoom.getId();
-
-            SysMonthWater monthWater = this.getOne(new QueryWrapper<SysMonthWater>().eq("room_id", id).orderByDesc("id").last("limit 1"));
-
-            Map map = new HashMap();
-            map.put("room",baseRoom.getAlias()+baseRoom.getRoomName());
-            if (ObjectUtil.isNotEmpty(monthWater)){
-                map.put("water",monthWater.getValue());
-            }else {
-                map.put("water",null);
-            }
-
-            endList.add(map);
-        }
-
-
-
-        return new Result(ResultCode.SUCCESS,endList);
+       List<AllDayWater> list =  baseRoomMapper.getAllDayWater(farmId);
+        return new Result(ResultCode.SUCCESS,list);
     }
 }

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

@@ -489,7 +489,7 @@ public class SgdTimer {
 
     //更新两个小时用水数据
     @Scheduled(cron = "0 59 0,2,4,6,8,10,12,14,16,18,20,22 * * ? ")
-//    @Scheduled(cron = "0 0/5 * * * ?")
+//    @Scheduled(cron = "0 0/2 * * * ?")
     private void updateMonthWater(){
         ConsoleLoggerFactory loggerFactory = new ConsoleLoggerFactory();
         // 指定连接服务器的凭据参数
@@ -534,9 +534,10 @@ public class SgdTimer {
                         Integer roomId = room.getId();
                         SysMonthWater oldWater = monthWaterService.getOne(
                                 new QueryWrapper<SysMonthWater>()
-                                        .ge("create_time", DataUill.getTimesmorning())
                                         .eq("room_id", roomId)
-                                        .last("ORDER BY create_time LIMIT 1"));
+                                        .eq("farm_id",hyFarmId)
+                                        .orderByDesc("month_water_id")
+                                        .last("LIMIT 1"));
 
                         SysMonthWater monthWater = new SysMonthWater();
                         monthWater.setFarmId(hyFarmId);
@@ -554,7 +555,7 @@ public class SgdTimer {
                             if (newValue >= oldValue){
                                 add = newValue  -oldValue;
                             }else {
-                                add = oldValue - newValue + newValue;
+                                add =  newValue;
                             }
 
                         }

huimv-farm-v2/huimv-produce-warning/src/main/resources/application-dev.yml

@@ -15,6 +15,6 @@ spring:
 #    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
 #    show-sql: true
 
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#mybatis-plus:
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

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

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.produce.mapper.BaseRoomMapper">
+
+
+    <select id="getAllRoomEnvironment" resultType="com.huimv.produce.entity.dto.AllRoomEnvironment">
+
+
+        SELECT CONCAT(br.alias ,br.room_name) room,br.id room_id  , IFNULL(tem.value,0) temperature, IFNULL(hum.value,0) humidity
+        FROM
+        `base_room` br
+        LEFT JOIN  (
+          SELECT  a.tem_id ,a.room_id , a.value `value` FROM  `sys_temperature`  a RIGHT  JOIN
+                (
+                SELECT MAX(tem_id) AS tem_id, room_id , `value` FROM `sys_temperature` WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  GROUP BY room_id
+                ) b
+                ON  a.tem_id=  b.tem_id
+
+         )  tem ON  tem.room_id = br.id
+
+
+         LEFT JOIN  (
+          SELECT  a.hum_id ,a.room_id , a.value `value` FROM  `sys_humidity`  a RIGHT  JOIN
+                (
+                SELECT MAX(hum_id) AS hum_id, room_id , `value` FROM `sys_humidity`  WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  GROUP BY room_id
+                ) b
+                ON  a.hum_id=  b.hum_id
+
+         )  hum ON  hum.room_id = br.id  WHERE br.farm_id =#{farmId}
+
+
+    </select>
+    <select id="getAllDayWater" resultType="com.huimv.produce.entity.dto.AllDayWater">
+
+           SELECT CONCAT(br.alias ,br.room_name) room,IFNULL(mw.value,0) water
+        FROM
+        `base_room` br
+        LEFT JOIN  (
+          SELECT  a.month_water_id ,a.room_id , a.value `value` FROM  `sys_month_water`  a RIGHT  JOIN
+                (
+                SELECT MAX(month_water_id) AS month_water_id, room_id , `value` FROM `sys_month_water` WHERE  TO_DAYS(create_time) = TO_DAYS(NOW())  GROUP BY room_id
+                ) b
+                ON  a.month_water_id=  b.month_water_id
+
+         )  mw ON  mw.room_id = br.id
+        WHERE br.farm_id =#{farmId}
+
+    </select>
+</mapper>

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

@@ -15,12 +15,17 @@
              (SELECT IFNULL(month_money,0)
             FROM `prod_sales`
              WHERE  farm_id = #{farmId}
-              ORDER BY id DESC LIMIT 1 )money,
+              ORDER BY id DESC LIMIT 1 ) money,
 
             IFNULL((SELECT SUM(plan_times)
             FROM `prod_work_plan`
              WHERE  farm_id = #{farmId}
-              AND TO_DAYS(add_time) = TO_DAYS(NOW()) ),0)task
+              AND TO_DAYS(add_time) = TO_DAYS(NOW()) ),0)task,
+
+           ( SELECT IFNULL(month_quantity,0)
+            FROM `prod_sales`
+             WHERE  farm_id = #{farmId}
+              ORDER BY id DESC LIMIT 1 )quantity
 
     </select>
     <select id="listScreenWorkPlan" resultType="com.huimv.produce.entity.dto.ScreenWorkPlan">

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(increase_value),2 )`value`
-        FROM   `sys_month_water`
+        SELECT  ROUND(SUM(`value`),2)
+        FROM   `sys_day_water`
         ${ew.customSqlSegment}
 
     </select>
     <select id="listAllWater" resultType="com.huimv.produce.entity.SysDayWater">
 
         SELECT
-       id , create_time ,room_id, ROUND(SUM(increase_value),2 )`value`  FROM `sys_month_water`
+        id,ROUND(SUM(`value`),2)'value' , create_time, room_id,day_water_id FROM `sys_day_water`
 
             ${ew.customSqlSegment}
 
@@ -20,7 +20,7 @@
     </select>
     <select id="listDay" resultType="com.huimv.produce.entity.SysDayWater">
 
-          SELECT  id , create_time ,room_id, ROUND(SUM(increase_value),2 )`value`  FROM `sys_month_water`
+          SELECT * FROM `sys_day_water`
         ${ew.customSqlSegment}
 
        GROUP BY DATE_FORMAT( `create_time`, '%m%d' )