大屏接口

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BaseBuildingController.java

@@ -92,4 +92,22 @@ public class BaseBuildingController {
 //        }
 //        return baseBuildingService.list(farmCode,buildName,stageCode);
 //    }
+    @PostMapping("/getUnitEnvironment")
+    public Result getUnitEnvironment(@RequestBody Map<String, String> map){
+        return baseBuildingService.getUnitEnvironment(map);
+    }
+    @PostMapping("/getScreenEnvironment")
+    public Result getScreenEnvironment(@RequestBody Map<String, String> map){
+        return baseBuildingService.getScreenEnvironment(map);
+    }
+
+    @PostMapping("/listScreenEnergy")
+    public Result listScreenEnergy(){
+        return baseBuildingService.listScreenEnergy();
+    }
+
+    @PostMapping("/listScreenFeed")
+    public Result listScreenFeed(){
+        return baseBuildingService.listScreenFeed();
+    }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BaseOverviewController.java

@@ -1,9 +1,17 @@
 package com.huimv.guowei.admin.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.druid.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.common.utils.ResultCode;
+import com.huimv.guowei.admin.entity.BaseOverview;
+import com.huimv.guowei.admin.service.IBaseOverviewService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +23,38 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/base-overview")
+@CrossOrigin
 public class BaseOverviewController {
+    @Resource
+    private IBaseOverviewService baseOverviewService;
 
+    @PostMapping("/getOverview")
+    public Result getOverview(@RequestBody Map<String, String> paramsMap){
+        String farmId = paramsMap.get("farmId");
+        BaseOverview baseOverview = baseOverviewService.getOne(new QueryWrapper<BaseOverview>().eq("farm_id", farmId));
+        if (ObjectUtil.isEmpty(baseOverview)){
+            baseOverview = new BaseOverview();
+            baseOverview.setFarmId(Integer.parseInt(farmId));
+            baseOverview.setStock("0");
+            baseOverview.setSale("0");
+            baseOverview.setProduction("0");
+        }
+        if (StringUtils.isEmpty(baseOverview.getStock())){
+            baseOverview.setStock("0");
+        }
+        if (StringUtils.isEmpty(baseOverview.getSale())){
+            baseOverview.setSale("0");
+        }
+        if (StringUtils.isEmpty(baseOverview.getProduction())){
+            baseOverview.setProduction("0");
+        }
+        baseOverviewService.saveOrUpdate(baseOverview);
+        return new Result(ResultCode.SUCCESS,baseOverview);
+    }
+
+    @PostMapping("/saveOverview")
+    public Result saveOverview(@RequestBody BaseOverview baseOverview){
+        baseOverviewService.saveOrUpdate(baseOverview);
+        return Result.SUCCESS();
+    }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnergyElectricityController.java

@@ -33,13 +33,13 @@ public class EnergyElectricityController {
         return energyElectricityService.listElectricity(paramsMap);
     }
 
-    @PostMapping("/getScrrenElectricity")
-    public Result getScrrenElectricity(@RequestBody Map<String ,String> paramsMap){
-        return energyElectricityService.getScrrenElectricity(paramsMap);
+    @PostMapping("/getScreenElectricity")
+    public Result getScreenElectricity(@RequestBody Map<String ,String> paramsMap){
+        return energyElectricityService.getScreenElectricity(paramsMap);
     }
 
-    @PostMapping("/listScrrenElectricity")
-    public Result listScrrenElectricity(@RequestBody Map<String ,String> paramsMap){
-        return energyElectricityService.listScrrenElectricity(paramsMap);
+    @PostMapping("/listScreenElectricity")
+    public Result listScreenElectricity(@RequestBody Map<String ,String> paramsMap){
+        return energyElectricityService.listScreenElectricity(paramsMap);
     }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnergyWaterController.java

@@ -38,4 +38,14 @@ public class EnergyWaterController {
         return energyWaterService.listWaterLine(paramsMap);
     }
 
+    @PostMapping("/getScreenWaterLine")
+    public Result getScreenWaterLine(@RequestBody Map<String ,String> paramsMap){
+        return energyWaterService.getScreenWaterLine(paramsMap);
+    }
+
+    @PostMapping("/listScreenWaterLine")
+    public Result listScreenWaterLine(@RequestBody Map<String ,String> paramsMap){
+        return energyWaterService.listScreenWaterLine(paramsMap);
+    }
+
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnergyWaterPressureController.java

@@ -1,9 +1,12 @@
 package com.huimv.guowei.admin.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.service.IEnergyWaterPressureService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +18,15 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/energy-water-pressure")
+@CrossOrigin
 public class EnergyWaterPressureController {
+    @Resource
+    private IEnergyWaterPressureService energyWaterPressureService;
+
+    @PostMapping("/getWaterPressure")
+    public Result getWaterPressure(@RequestBody Map<String, String> paramsMap){
+        return energyWaterPressureService.getWaterPressure(paramsMap);
+    }
+
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvRegularCallFeedingController.java

@@ -46,14 +46,14 @@ public class EnvRegularCallFeedingController {
         return feedingService.listSeven(httpServletRequest, paramsMap);
     }
 
-    @PostMapping("/getScrrenFeed")
-    public Result getScrrenFeed(@RequestBody Map<String, String> paramsMap){
-        return feedingService.getScrrenFeed(paramsMap);
+    @PostMapping("/getScreenFeed")
+    public Result getScreenFeed(@RequestBody Map<String, String> paramsMap){
+        return feedingService.getScreenFeed(paramsMap);
     }
 
-    @PostMapping("/listScrrenFeed")
-    public Result listScrrenFeed(@RequestBody Map<String, String> paramsMap){
-        return feedingService.listScrrenFeed(paramsMap);
+    @PostMapping("/listScreenFeed")
+    public Result listScreenFeed(@RequestBody Map<String, String> paramsMap){
+        return feedingService.listScreenFeed(paramsMap);
     }
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/EnvDataScreenVo.java

@@ -0,0 +1,9 @@
+package com.huimv.guowei.admin.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class EnvDataScreenVo extends EnvDataVo{
+    private Integer fanStatus;
+    private Integer sprayStatus;
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/ScreenEnergyVo.java

@@ -0,0 +1,13 @@
+package com.huimv.guowei.admin.entity.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ScreenEnergyVo {
+    private String quarter;
+    private BigDecimal waterValue;
+    private BigDecimal electricityValue;
+    private BigDecimal feedValue;
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/ScreenFeedVo.java

@@ -0,0 +1,12 @@
+package com.huimv.guowei.admin.entity.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ScreenFeedVo {
+    private Integer month;
+    private Integer eggNum;
+    private BigDecimal feedValue;
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/WaterLinePressureVo.java

@@ -0,0 +1,11 @@
+package com.huimv.guowei.admin.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class WaterLinePressureVo {
+    private String value1;
+    private String value2;
+    private String value3;
+    private String value4;
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/BaseBuildingMapper.java

@@ -2,10 +2,13 @@ package com.huimv.guowei.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.guowei.admin.entity.BaseBuilding;
+import com.huimv.guowei.admin.entity.vo.ScreenEnergyVo;
+import com.huimv.guowei.admin.entity.vo.ScreenFeedVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,4 +22,8 @@ import java.util.List;
 public interface BaseBuildingMapper extends BaseMapper<BaseBuilding> {
 
     List<Integer> getCageById(@Param("id") Integer id);
+
+    List<ScreenEnergyVo> listScreenEnergy();
+
+    List<ScreenFeedVo> listScreenFeed();
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnergyElectricityMapper.java

@@ -36,4 +36,6 @@ public interface EnergyElectricityMapper extends BaseMapper<EnergyElectricity> {
     List<EnergyElectricity> listSixMonthElectricity(String farmId,String unitId);
 
     List<EnergyElectricity> listSevenDayElectricity(String farmId,String unitId);
+
+    BigDecimal getLastFlowByUnitId(String farmId, String unitId);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnergyWaterMapper.java

@@ -1,5 +1,8 @@
 package com.huimv.guowei.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.guowei.admin.entity.EnergyElectricity;
 import com.huimv.guowei.admin.entity.EnergyWater;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.guowei.admin.entity.vo.WaterLineVo;
@@ -30,11 +33,19 @@ public interface EnergyWaterMapper extends BaseMapper<EnergyWater> {
 
     BigDecimal getMonthWater(String farmId);
 
-    List<WaterLineVo> listWaterLineDayDetail(String farmId);
+    BigDecimal getWater(@Param(Constants.WRAPPER) QueryWrapper<EnergyWater> queryWrapper);
 
-    List<WaterLineVo> listWaterLineWeekDetail(String farmId);
+    List<WaterLineVo> listWaterLineDayDetail(String farmId, List<String> chipCodeList, String chipCodes);
 
-    List<WaterLineVo> listWaterLineMonthDetail(String farmId);
+    List<WaterLineVo> listWaterLineWeekDetail(String farmId, List<String> chipCodeList, String chipCodes);
 
-    List<WaterLineVo> listWaterLineCustomDetail(String farmId, String startDate, String endDate);
+    List<WaterLineVo> listWaterLineMonthDetail(String farmId, List<String> chipCodeList, String chipCodes);
+
+    List<WaterLineVo> listWaterLineCustomDetail(String farmId, List<String> chipCodeList, String chipCodes ,String startDate, String endDate);
+
+    List<WaterLineVo> listSixMonthWaterLine(String farmId, List<String> chipCodeList, String chipCodes);
+
+    List<WaterLineVo> listSevenDayWaterLine(String farmId, List<String> chipCodeList, String chipCodes);
+
+    BigDecimal getLastFlowByUnitId(String farmId, String unitId);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnergyWaterPressureMapper.java

@@ -2,6 +2,10 @@ package com.huimv.guowei.admin.mapper;
 
 import com.huimv.guowei.admin.entity.EnergyWaterPressure;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.guowei.admin.entity.vo.WaterLinePressureVo;
+import com.huimv.guowei.admin.entity.vo.WaterLineVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnergyWaterPressureMapper extends BaseMapper<EnergyWaterPressure> {
 
+    WaterLinePressureVo getWaterPressure(String farmId, List<String> chipCodeList, String chipCodes);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvDataMapper.java

@@ -2,6 +2,7 @@ package com.huimv.guowei.admin.mapper;
 
 import com.huimv.guowei.admin.entity.EnvData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.guowei.admin.entity.vo.EnvDataScreenVo;
 import com.huimv.guowei.admin.entity.vo.EnvDataVo;
 
 import java.util.List;
@@ -25,4 +26,8 @@ public interface EnvDataMapper extends BaseMapper<EnvData> {
     List<EnvData> listMonthDetail(String farmId, String unitId);
 
     List<EnvData> listCustomDetail(String farmId, String unitId, String startDate, String endDate);
+
+    EnvDataVo getLastFlowByUnitId(String farmId, String unitId);
+
+    List<EnvDataScreenVo> getLastFlowScreen(String farmId);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IBaseBuildingService.java

@@ -29,4 +29,12 @@ public interface IBaseBuildingService extends IService<BaseBuilding> {
     Result listTreeBuilding(Map<String, String> map);
 
     Result addSubBuilding(Map<String, String> map);
+
+    Result getUnitEnvironment(Map<String, String> map);
+
+    Result getScreenEnvironment(Map<String, String> map);
+
+    Result listScreenEnergy();
+
+    Result listScreenFeed();
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnergyElectricityService.java

@@ -20,7 +20,7 @@ public interface IEnergyElectricityService extends IService<EnergyElectricity> {
 
     Result listElectricity(Map<String, String> paramsMap);
 
-    Result getScrrenElectricity(Map<String, String> paramsMap);
+    Result getScreenElectricity(Map<String, String> paramsMap);
 
-    Result listScrrenElectricity(Map<String, String> paramsMap);
+    Result listScreenElectricity(Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnergyWaterPressureService.java

@@ -1,8 +1,11 @@
 package com.huimv.guowei.admin.service;
 
+import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.entity.EnergyWaterPressure;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IEnergyWaterPressureService extends IService<EnergyWaterPressure> {
 
+    Result getWaterPressure(Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnergyWaterService.java

@@ -21,4 +21,8 @@ public interface IEnergyWaterService extends IService<EnergyWater> {
     Result getWater(Map<String, String> paramsMap);
 
     Result listWaterLine(Map<String, String> paramsMap);
+
+    Result getScreenWaterLine(Map<String, String> paramsMap);
+
+    Result listScreenWaterLine(Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvRegularCallFeedingService.java

@@ -25,7 +25,7 @@ public interface IEnvRegularCallFeedingService extends IService<EnvRegularCallFe
 
     Result listSeven(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
-    Result getScrrenFeed(Map<String, String> paramsMap);
+    Result getScreenFeed(Map<String, String> paramsMap);
 
-    Result listScrrenFeed(Map<String, String> paramsMap);
+    Result listScreenFeed(Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseBuildingServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.guowei.admin.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -11,21 +12,19 @@ import com.huimv.guowei.admin.common.utils.ResultUtil;
 import com.huimv.guowei.admin.entity.BaseBuilding;
 import com.huimv.guowei.admin.entity.BaseDuckInfo;
 import com.huimv.guowei.admin.entity.EnvDevice;
-import com.huimv.guowei.admin.entity.vo.TreeBaseBuilding;
-import com.huimv.guowei.admin.mapper.BaseBuildingMapper;
-import com.huimv.guowei.admin.mapper.BaseDuckInfoMapper;
-import com.huimv.guowei.admin.mapper.EnvDeviceMapper;
+import com.huimv.guowei.admin.entity.EnvDeviceEquipment;
+import com.huimv.guowei.admin.entity.vo.*;
+import com.huimv.guowei.admin.mapper.*;
 import com.huimv.guowei.admin.service.IBaseBuildingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -43,6 +42,14 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
     @Resource
     private EnvDeviceMapper envDeviceMapper;
     @Resource
+    private EnvDataMapper envDataMapper;
+    @Resource
+    private EnergyElectricityMapper energyElectricityMapper;
+    @Resource
+    private EnergyWaterMapper energyWaterMapper;
+    @Resource
+    private EnvDeviceEquipmentMapper envDeviceEquipmentMapper;
+    @Resource
     private BaseDuckInfoMapper baseDuckInfoMapper;
 
     @Override
@@ -177,6 +184,60 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
         return Result.SUCCESS();
     }
 
+    @Override
+    public Result getUnitEnvironment(Map<String, String> map) {
+        String farmId = map.get("farmId");
+        String unitId = map.get("unitId");
+        EnvDataVo envDataVo = envDataMapper.getLastFlowByUnitId(farmId,unitId);
+        Map resultMap = new HashMap();
+        if (ObjectUtil.isNotEmpty(envDataVo)){
+            resultMap.put("envTemp",envDataVo.getEnvTemp());
+            resultMap.put("envHum",envDataVo.getEnvHum());
+        }
+        resultMap.put("energyWater",energyWaterMapper.getLastFlowByUnitId(farmId, unitId));
+        resultMap.put("energyElectricity",energyElectricityMapper.getLastFlowByUnitId(farmId, unitId));
+        List<EnvDeviceEquipment> fanList = envDeviceEquipmentMapper.selectList(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id",unitId).eq("equipment_type", 1));
+        resultMap.put("fanList",fanList);
+        List<EnvDeviceEquipment> tpList = envDeviceEquipmentMapper.selectList(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id",unitId).eq("equipment_type", 2));
+        resultMap.put("fanList",tpList);
+        List<EnvDeviceEquipment> sprayList = envDeviceEquipmentMapper.selectList(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id",unitId).eq("equipment_type", 3));
+        resultMap.put("fanList",sprayList);
+        return new Result(ResultCode.SUCCESS,resultMap);
+    }
+
+    @Override
+    public Result getScreenEnvironment(Map<String, String> map) {
+        String farmId = map.get("farmId");
+        List<EnvDataScreenVo> envDataScreenVos = envDataMapper.getLastFlowScreen(farmId);
+        for (EnvDataScreenVo envDataScreenVo : envDataScreenVos) {
+            if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>()
+                    .eq("unit_id",envDataScreenVo.getId()).eq("equipment_type",1).eq("open_start",1)) > 0) {
+                envDataScreenVo.setFanStatus(1);
+            }else {
+                envDataScreenVo.setFanStatus(0);
+            }
+            if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>()
+                    .eq("unit_id",envDataScreenVo.getId()).eq("equipment_type",3).eq("open_start",1)) > 0) {
+                envDataScreenVo.setSprayStatus(1);
+            }else {
+                envDataScreenVo.setSprayStatus(0);
+            }
+        }
+        return new Result(ResultCode.SUCCESS,envDataScreenVos);
+    }
+
+    @Override
+    public Result listScreenEnergy() {
+         List<ScreenEnergyVo> screenEnergyVos = baseBuildingMapper.listScreenEnergy();
+        return new Result(ResultCode.SUCCESS,screenEnergyVos);
+    }
+
+    @Override
+    public Result listScreenFeed() {
+        List<ScreenFeedVo> screenEnergyVos = baseBuildingMapper.listScreenFeed();
+        return new Result(ResultCode.SUCCESS,screenEnergyVos);
+    }
+
 
 //    @Override
 //    public Result list(String farmCode, String buildName, String stageCode) {

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnergyElectricityServiceImpl.java

@@ -76,7 +76,7 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
     }
 
     @Override
-    public Result getScrrenElectricity(Map<String, String> paramsMap) {
+    public Result getScreenElectricity(Map<String, String> paramsMap) {
         String unitId = paramsMap.get("unitId");
         String farmId = paramsMap.get("farmId");
         Date timesmorning = DataUill.getTimesmorning();
@@ -118,7 +118,7 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
     }
 
     @Override
-    public Result listScrrenElectricity(Map<String, String> paramsMap) {
+    public Result listScreenElectricity(Map<String, String> paramsMap) {
         String unitId = paramsMap.get("unitId");
         String farmId = paramsMap.get("farmId");
         String type = paramsMap.get("type");

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnergyWaterPressureServiceImpl.java

@@ -1,11 +1,24 @@
 package com.huimv.guowei.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.EnergyWaterPressure;
+import com.huimv.guowei.admin.entity.EnvDeviceChip;
+import com.huimv.guowei.admin.entity.vo.WaterLinePressureVo;
+import com.huimv.guowei.admin.entity.vo.WaterLineVo;
+import com.huimv.guowei.admin.mapper.EnergyWaterMapper;
 import com.huimv.guowei.admin.mapper.EnergyWaterPressureMapper;
+import com.huimv.guowei.admin.mapper.EnvDeviceChipMapper;
 import com.huimv.guowei.admin.service.IEnergyWaterPressureService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +30,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnergyWaterPressureServiceImpl extends ServiceImpl<EnergyWaterPressureMapper, EnergyWaterPressure> implements IEnergyWaterPressureService {
 
+    @Resource
+    private EnergyWaterPressureMapper energyWaterPressureMapper;
+    @Resource
+    private EnvDeviceChipMapper envDeviceChipMapper;
+
+    @Override
+    public Result getWaterPressure(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+
+        List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("chip_type", 3));
+        List<String> chipCodeList = new ArrayList<>();
+        for (EnvDeviceChip envDeviceChip : deviceChipList) {
+            chipCodeList.add(envDeviceChip.getChipCode());
+        }
+        String chipCodes = String.join(",", chipCodeList);
+        WaterLinePressureVo waterLinePressureVo = new WaterLinePressureVo();
+        chipCodes = "("+chipCodes+")";
+        waterLinePressureVo = energyWaterPressureMapper.getWaterPressure(farmId,chipCodeList,chipCodes);
+        return new Result(ResultCode.SUCCESS,waterLinePressureVo);
+    }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnergyWaterServiceImpl.java

@@ -1,20 +1,26 @@
 package com.huimv.guowei.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.guowei.admin.common.utils.DataUill;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
+import com.huimv.guowei.admin.entity.EnergyElectricity;
 import com.huimv.guowei.admin.entity.EnergyWater;
+import com.huimv.guowei.admin.entity.EnvDeviceChip;
 import com.huimv.guowei.admin.entity.vo.WaterLineVo;
 import com.huimv.guowei.admin.mapper.EnergyWaterMapper;
+import com.huimv.guowei.admin.mapper.EnvDeviceChipMapper;
 import com.huimv.guowei.admin.service.IEnergyWaterService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.*;
 
 /**
  * <p>
@@ -28,6 +34,8 @@ import java.util.Map;
 public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, EnergyWater> implements IEnergyWaterService {
     @Resource
     private EnergyWaterMapper energyWaterMapper;
+    @Resource
+    private EnvDeviceChipMapper envDeviceChipMapper;
 
     @Override
     public Result listWater(Map<String, String> paramsMap) {
@@ -70,27 +78,100 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
     }
 
     @Override
-    //TODO 目前先写死 水线芯片号
     public Result listWaterLine(Map<String, String> paramsMap) {
         String type = paramsMap.get("type");
         String farmId = paramsMap.get("farmId");
         String startDate = paramsMap.get("startDate");
         String endDate = paramsMap.get("endDate")+" 23:59:59";
+        List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("chip_type", 3));
 
+        List<String> chipCodeList = new ArrayList<>();
+        for (EnvDeviceChip envDeviceChip : deviceChipList) {
+            chipCodeList.add(envDeviceChip.getChipCode());
+        }
+        String chipCodes = String.join(",", chipCodeList);
         List<WaterLineVo> waterLineList = new ArrayList<>();
+        chipCodes = "("+chipCodes+")";
         if ("1".equals(type)){
-            waterLineList = energyWaterMapper.listWaterLineDayDetail(farmId);
+            waterLineList = energyWaterMapper.listWaterLineDayDetail(farmId,chipCodeList,chipCodes);
         }
         if ("2".equals(type)){
-            waterLineList = energyWaterMapper.listWaterLineWeekDetail(farmId);
+            waterLineList = energyWaterMapper.listWaterLineWeekDetail(farmId,chipCodeList,chipCodes);
         }
         if ("3".equals(type)){
-            waterLineList = energyWaterMapper.listWaterLineMonthDetail(farmId);
+            waterLineList = energyWaterMapper.listWaterLineMonthDetail(farmId,chipCodeList,chipCodes);
         }
         if ("4".equals(type)){
-            waterLineList = energyWaterMapper.listWaterLineCustomDetail(farmId,startDate,endDate);
+            waterLineList = energyWaterMapper.listWaterLineCustomDetail(farmId,chipCodeList,chipCodes,startDate,endDate);
         }
 
         return new Result(ResultCode.SUCCESS,waterLineList);
     }
+
+    @Override
+    public Result getScreenWaterLine(Map<String, String> paramsMap) {
+        String unitId = paramsMap.get("unitId");
+        String farmId = paramsMap.get("farmId");
+        Date timesmorning = DataUill.getTimesmorning();
+        Date timesMonthmorning = DataUill.getTimesMonthmorning();
+
+        Map resultMap = new HashMap();
+        //今日
+        QueryWrapper<EnergyWater> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("unit_id",unitId).eq("farm_id",farmId).ge("create_date",timesmorning);
+        BigDecimal dayWater = energyWaterMapper.getWater(queryWrapper1);
+        //昨日
+        LocalDate yesterday = LocalDate.now().minusDays(1);
+        LocalDateTime startOfDay = yesterday.atStartOfDay();
+        LocalDateTime endOfDay = yesterday.atTime(LocalTime.MAX);
+        QueryWrapper<EnergyWater> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("unit_id",unitId).eq("farm_id",farmId).between("create_date",startOfDay,endOfDay);
+        BigDecimal lastDayWater = energyWaterMapper.getWater(queryWrapper2);
+        //日环比
+        BigDecimal dayGap = dayWater.subtract(lastDayWater).divide(lastDayWater).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.UP);
+
+        //本月
+        QueryWrapper<EnergyWater> queryWrapper3 = new QueryWrapper<>();
+        queryWrapper3.eq("unit_id",unitId).eq("farm_id",farmId).ge("create_date",timesMonthmorning);
+        BigDecimal monthWater = energyWaterMapper.getWater(queryWrapper3);
+        //上月
+        Date lastMonthStartMorning = DataUill.getLastMonthStartMorning();
+        Date lastMonthEndNight = DataUill.getLastMonthEndNight();
+        QueryWrapper<EnergyWater> queryWrapper4 = new QueryWrapper<>();
+        queryWrapper4.eq("unit_id",unitId).eq("farm_id",farmId).between("create_date",lastMonthStartMorning,lastMonthEndNight);
+        BigDecimal lastMonthWater = energyWaterMapper.getWater(queryWrapper4);
+        //月环比
+        BigDecimal monthGap = monthWater.subtract(lastMonthWater).divide(lastMonthWater).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.UP);
+
+        resultMap.put("dayWater",dayWater);
+        resultMap.put("dayWaterGap",dayGap+"%");
+        resultMap.put("monthWater",monthWater);
+        resultMap.put("monthWaterGap",monthGap+"%");
+        return new Result(ResultCode.SUCCESS,resultMap);
+    }
+
+    @Override
+    public Result listScreenWaterLine(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+
+        List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("chip_type", 3));
+
+        List<String> chipCodeList = new ArrayList<>();
+        for (EnvDeviceChip envDeviceChip : deviceChipList) {
+            chipCodeList.add(envDeviceChip.getChipCode());
+        }
+        String chipCodes = String.join(",", chipCodeList);
+        List<WaterLineVo> waterLineList;
+        chipCodes = "("+chipCodes+")";
+        //六个月
+        if ("1".equals(type)){
+            waterLineList = energyWaterMapper.listSixMonthWaterLine(farmId, chipCodeList,chipCodes);
+        }
+        //七天
+        else {
+            waterLineList = energyWaterMapper.listSevenDayWaterLine(farmId, chipCodeList,chipCodes);
+        }
+        return new Result(ResultCode.SUCCESS,waterLineList);
+    }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallFeedingServiceImpl.java

@@ -120,7 +120,7 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
     }
 
     @Override
-    public Result getScrrenFeed(Map<String, String> paramsMap) {
+    public Result getScreenFeed(Map<String, String> paramsMap) {
         String unitId = paramsMap.get("unitId");
         String farmId = paramsMap.get("farmId");
         Date timesmorning = DataUill.getTimesmorning();
@@ -163,7 +163,7 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
     }
 
     @Override
-    public Result listScrrenFeed(Map<String, String> paramsMap) {
+    public Result listScreenFeed(Map<String, String> paramsMap) {
         String unitId = paramsMap.get("unitId");
         String farmId = paramsMap.get("farmId");
         String type = paramsMap.get("type");

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/BaseBuildingMapper.xml

@@ -6,4 +6,39 @@
    select id from `base_building` where parent_id = #{id}
 </select>
 
+   <select id="listScreenEnergy" resultType="com.huimv.guowei.admin.entity.vo.ScreenEnergyVo">
+      SELECT
+    q.quarter,
+    COALESCE(ROUND(SUM(DISTINCT(w.water_value)),2),0) AS waterValue,
+    COALESCE(ROUND(SUM(DISTINCT(e.electricity_value)),2),0) AS electricityValue,
+    COALESCE(ROUND(SUM(DISTINCT(f.duck_weight)),2),0) AS feedValue
+FROM quarters q
+LEFT JOIN
+    `energy_water` w ON YEAR(w.create_date) = YEAR(CURDATE()) AND q.quarter = QUARTER(w.create_date)
+LEFT JOIN
+    `energy_electricity` e ON YEAR(e.create_date) = YEAR(CURDATE()) AND q.quarter = QUARTER(e.create_date)
+LEFT JOIN
+    `env_regular_call_feeding` f ON YEAR(f.call_date) = YEAR(CURDATE()) AND q.quarter = QUARTER(f.call_date)
+GROUP BY
+    q.quarter
+ORDER BY
+    q.quarter
+   </select>
+
+    <select id="listScreenFeed" resultType="com.huimv.guowei.admin.entity.vo.ScreenFeedVo">
+      SELECT
+    m.month,
+    COALESCE(SUM(DISTINCT(e.egg_num)),0) AS eggNum,
+    COALESCE(ROUND(SUM(DISTINCT(f.duck_weight)),2),0) AS feedValue
+FROM months m
+LEFT JOIN
+    `env_regular_call_egg` e ON YEAR(e.call_date) = YEAR(CURDATE()) AND m.month = MONTH(e.call_date)
+LEFT JOIN
+    `env_regular_call_feeding` f ON YEAR(f.call_date) = YEAR(CURDATE()) AND m.month = MONTH(f.call_date)
+GROUP BY
+    m.month
+ORDER BY
+   m.month
+   </select>
+
 </mapper>

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyElectricityMapper.xml

@@ -73,4 +73,9 @@
         AND create_date >= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
         GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
     </select>
+
+    <select id="getLastFlowByUnitId" resultType="java.math.BigDecimal">
+        SELECT ROUND(electricity_value,2) 'electricityValue' FROM `energy_electricity`
+        WHERE id = ( SELECT MAX(id) FROM `energy_electricity` WHERE unit_id = #{unitId}) AND farm_id = #{farmId}
+    </select>
 </mapper>

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyWaterMapper.xml

@@ -57,50 +57,76 @@
         AND create_date BETWEEN (SELECT DATE_ADD(CURDATE(),INTERVAL -DAY(CURDATE())+1 DAY)) AND NOW()
     </select>
 
+    <select id="getWater" resultType="java.math.BigDecimal">
+        SELECT ROUND(SUM(water_value),2) 'waterValue' FROM `energy_water`
+        ${ew.customSqlSegment}
+    </select>
+
     <select id="listWaterLineDayDetail" resultType="com.huimv.guowei.admin.entity.vo.WaterLineVo">
     SELECT create_date,
-        ROUND(MAX(CASE WHEN chip_code = 1001 THEN water_value END),2) AS 'value1',
-        ROUND(MAX(CASE WHEN chip_code = 1002 THEN water_value END),2) AS 'value2',
-        ROUND(MAX(CASE WHEN chip_code = 1003 THEN water_value END),2) AS 'value3',
-        ROUND(MAX(CASE WHEN chip_code = 1004 THEN water_value END),2) AS 'value4'
+    <foreach collection="chipCodeList" item="code" index="index" separator=",">
+        ROUND(MAX(CASE WHEN chip_code = ${code} THEN water_value END),2) AS 'value${index+1}'
+    </foreach>
     FROM `energy_water`
-    WHERE chip_code IN (1001, 1002, 1003, 1004) AND TO_DAYS(create_date) = TO_DAYS(NOW()) AND farm_id = #{farmId}
+    WHERE chip_code IN ${chipCodes} AND TO_DAYS(create_date) = TO_DAYS(NOW()) AND farm_id = #{farmId}
     GROUP BY create_date
     </select>
 
     <select id="listWaterLineWeekDetail" resultType="com.huimv.guowei.admin.entity.vo.WaterLineVo">
     SELECT create_date,
-        ROUND(SUM(CASE WHEN chip_code = 1001 THEN water_value END),2)AS 'value1',
-        ROUND(SUM(CASE WHEN chip_code = 1002 THEN water_value END),2)AS 'value2',
-        ROUND(SUM(CASE WHEN chip_code = 1003 THEN water_value END),2)AS 'value3',
-        ROUND(SUM(CASE WHEN chip_code = 1004 THEN water_value END),2)AS 'value4'
+        <foreach collection="chipCodeList" item="code" index="index" separator=",">
+            ROUND(MAX(CASE WHEN chip_code = ${code} THEN water_value END),2) AS 'value${index+1}'
+        </foreach>
     FROM `energy_water`
-    WHERE chip_code IN (1001, 1002, 1003, 1004) AND farm_id = #{farmId} AND create_date BETWEEN (SELECT DATE_SUB(CURDATE(),INTERVAL WEEKDAY(CURDATE()) DAY)) AND NOW()
+    WHERE chip_code IN ${chipCodes} AND farm_id = #{farmId} AND create_date BETWEEN (SELECT DATE_SUB(CURDATE(),INTERVAL WEEKDAY(CURDATE()) DAY)) AND NOW()
     GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
     </select>
 
     <select id="listWaterLineMonthDetail" resultType="com.huimv.guowei.admin.entity.vo.WaterLineVo">
     SELECT create_date,
-        ROUND(SUM(CASE WHEN chip_code = 1001 THEN water_value END),2)AS 'value1',
-        ROUND(SUM(CASE WHEN chip_code = 1002 THEN water_value END),2)AS 'value2',
-        ROUND(SUM(CASE WHEN chip_code = 1003 THEN water_value END),2)AS 'value3',
-        ROUND(SUM(CASE WHEN chip_code = 1004 THEN water_value END),2)AS 'value4'
+        <foreach collection="chipCodeList" item="code" index="index" separator=",">
+            ROUND(MAX(CASE WHEN chip_code = ${code} THEN water_value END),2) AS 'value${index+1}'
+        </foreach>
     FROM `energy_water`
-    WHERE chip_code IN (1001, 1002, 1003, 1004) AND farm_id = #{farmId} AND create_date BETWEEN (SELECT DATE_ADD(CURDATE(),INTERVAL -DAY(CURDATE())+1 DAY)) AND NOW()
+    WHERE chip_code IN ${chipCodes} AND farm_id = #{farmId} AND create_date BETWEEN (SELECT DATE_ADD(CURDATE(),INTERVAL -DAY(CURDATE())+1 DAY)) AND NOW()
     GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
     </select>
 
     <select id="listWaterLineCustomDetail" resultType="com.huimv.guowei.admin.entity.vo.WaterLineVo">
     SELECT create_date,
-        ROUND(SUM(CASE WHEN chip_code = 1001 THEN water_value END),2)AS 'value1',
-        ROUND(SUM(CASE WHEN chip_code = 1002 THEN water_value END),2)AS 'value2',
-        ROUND(SUM(CASE WHEN chip_code = 1003 THEN water_value END),2)AS 'value3',
-        ROUND(SUM(CASE WHEN chip_code = 1004 THEN water_value END),2)AS 'value4'
+        <foreach collection="chipCodeList" item="code" index="index" separator=",">
+            ROUND(MAX(CASE WHEN chip_code = ${code} THEN water_value END),2) AS 'value${index+1}'
+        </foreach>
     FROM `energy_water`
-    WHERE chip_code IN (1001, 1002, 1003, 1004) AND farm_id = #{farmId} AND create_date BETWEEN '${startDate}' AND '${endDate}'
+    WHERE chip_code IN ${chipCodes} AND farm_id = #{farmId} AND create_date BETWEEN '${startDate}' AND '${endDate}'
     GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
     </select>
     
-    <select id="listWaterLineSixMonth"
+    <select id="listSixMonthWaterLine" resultType="com.huimv.guowei.admin.entity.vo.WaterLineVo">
+        SELECT create_date,
+        <foreach collection="chipCodeList" item="code" index="index" separator=",">
+            ROUND(MAX(CASE WHEN chip_code = ${code} THEN water_value END),2) AS 'value${index+1}'
+        </foreach>
+    FROM `energy_water`
+    WHERE chip_code IN ${chipCodes} AND farm_id = #{farmId} AND create_date &gt;= DATE_SUB(NOW(), INTERVAL 6 MONTH)
+    GROUP BY DATE_FORMAT(create_date,"%Y-%m")
+    </select>
+
+    <select id="listSevenDayWaterLine" resultType="com.huimv.guowei.admin.entity.vo.WaterLineVo">
+        SELECT create_date,
+        <foreach collection="chipCodeList" item="code" index="index" separator=",">
+            ROUND(MAX(CASE WHEN chip_code = ${code} THEN water_value END),2) AS 'value${index+1}'
+        </foreach>
+    FROM `energy_water`
+    WHERE chip_code IN ${chipCodes} AND farm_id = #{farmId} AND create_date &gt;= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+    GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
+    </select>
+
+
+    <select id="getLastFlowByUnitId" resultType="java.math.BigDecimal">
+        SELECT ROUND(SUM(water_value),2) 'waterValue' FROM `energy_water`
+        WHERE farm_id = #{farmId}
+        AND create_date = ( SELECT MAX(create_date) FROM `env_data` WHERE unit_id = #{unitId})
+    </select>
 
 </mapper>

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvDataMapper.xml

@@ -60,4 +60,19 @@
         GROUP BY DATE_FORMAT(create_time,"%Y-%m-%d")
     </select>
 
+    <select id="getLastFlowByUnitId" resultType="com.huimv.guowei.admin.entity.vo.EnvDataVo">
+    SELECT env_temp,env_hum FROM `env_data`
+    WHERE id = ( SELECT MAX(id) FROM `env_data` WHERE unit_id = #{unitId}) AND farm_id = #{farmId}
+    </select>
+
+    <select id="getLastFlowScreen" resultType="com.huimv.guowei.admin.entity.vo.EnvDataScreenVo">
+        SELECT b.id,b.build_name,d.env_temp,d.env_hum FROM `env_data` d LEFT JOIN `base_building`  b
+    ON b.id = d.unit_id
+    WHERE d.id IN (
+        SELECT MAX(id)
+        FROM `env_data`
+        GROUP BY unit_id
+    )AND d.farm_id = #{farmId}
+    ORDER BY b.id ASC
+    </select>
 </mapper>

huimv-admin/src/main/resources/mapper/EnergyWaterPressureMapper.xml

@@ -15,4 +15,13 @@
         <result column="chip_name" property="chipName" />
     </resultMap>
 
+
+    <select id="getWaterPressure" resultType="com.huimv.guowei.admin.entity.vo.WaterLinePressureVo">
+        SELECT
+        <foreach collection="chipCodeList" item="code" index="index" separator=",">
+            COALESCE(ROUND(MAX(CASE WHEN chip_code = ${code} THEN water_value END),2),0) AS 'value${index+1}'
+        </foreach>
+        FROM `energy_water_pressure`
+        WHERE chip_code IN ${chipCodes} AND farm_id = #{farmId} AND create_date = ( SELECT MAX(create_date) FROM `energy_water_pressure`)
+    </select>
 </mapper>