设备、采食数据

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

@@ -15,6 +15,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -40,10 +41,18 @@ public class EnvDeviceController {
         String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         Page<EnvDevice> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
-
-        return new Result(ResultCode.SUCCESS,envDeviceService.page(page, new QueryWrapper<EnvDevice>()
-                        .eq(!StringUtils.isEmpty(deviceType),"device_type",deviceType)
-                        .eq("farm_id",farmId)));
+        if (deviceType.equals("1")){
+            return new Result(ResultCode.SUCCESS,envDeviceService.page(page, new QueryWrapper<EnvDevice>()
+                    .eq(!StringUtils.isEmpty(deviceType),"device_type",deviceType)
+                    .eq("farm_id",farmId)));
+        }else if (deviceType.equals("2")){
+            return new Result(ResultCode.SUCCESS,envDeviceService.page(page, new QueryWrapper<EnvDevice>()
+                    .in("device_type",2,3)
+                    .eq("farm_id",farmId)));
+        }else {
+            return new Result(ResultCode.SUCCESS,envDeviceService.page(page, new QueryWrapper<EnvDevice>()
+                    .eq("farm_id",farmId)));
+        }
     }
 
     @PostMapping("/listScale")
@@ -56,9 +65,10 @@ public class EnvDeviceController {
     @Transactional(rollbackFor = RuntimeException.class)
     public Result addDevice(@RequestBody Map<String ,Object> paramsMap){
         String deviceCode = (String) paramsMap.get("deviceCode");
-        Integer unitId = (Integer) paramsMap.get("unitId");
+        String unitId = (String) paramsMap.get("unitId");
         String unitName = (String) paramsMap.get("unitName");
-        Integer farmId = (Integer) paramsMap.get("farmId");
+        String buildLocation = (String) paramsMap.get("buildLocation");
+        String farmId = (String) paramsMap.get("farmId");
         Integer deviceType = (Integer) paramsMap.get("deviceType");
         String deviceName = unitName;
         switch (deviceType){
@@ -73,36 +83,40 @@ public class EnvDeviceController {
         envDevice.setDeviceCode(deviceCode);
         envDevice.setDeviceName(deviceName);
         envDevice.setDeviceType(deviceType);
-        if (deviceType != 3){
+        envDevice.setBuildLocation(buildLocation);
+//        if (deviceType != 3){
             envDevice.setUnitName(unitName);
-            envDevice.setUnitId(unitId);
-        }
-        envDevice.setFarmId(farmId);
+            envDevice.setUnitId(Integer.parseInt(unitId));
+//        }
+        envDevice.setFarmId(Integer.parseInt(farmId));
         envDeviceService.save(envDevice);
         //环控设备
         if (deviceType == 1){
-            String device = (String) paramsMap.get("device");
+            List<Integer> list = (List<Integer>) paramsMap.get("device");
             int fan = 1;
             int tp = 1;
             int spray = 1;
-            for (int i = 0; i < device.length() ; i++) {
+            for (int i = 0; i <list.size() ; i++) {
                 EnvDeviceEquipment envDeviceEquipment = new EnvDeviceEquipment();
                 envDeviceEquipment.setEquipmentPort(i+1);
-                envDeviceEquipment.setUnitId(unitId);
+                envDeviceEquipment.setUnitId(Integer.parseInt(unitId));
                 envDeviceEquipment.setDeviceCode(deviceCode);
-                switch (Character.getNumericValue(device.charAt(i))){
+                switch (list.get(i)){
                     case 1:
                         envDeviceEquipment.setEquipmentName("风机"+fan);
+                        envDeviceEquipment.setEquipmentType(1);
                         envDeviceEquipment.setDeviceAlias(unitName+"风机");
                         fan++;
                     break;
                     case 2:
                         envDeviceEquipment.setEquipmentName("传送带"+tp);
+                        envDeviceEquipment.setEquipmentType(2);
                         envDeviceEquipment.setDeviceAlias(unitName+"传送带");
                         tp++;
                     break;
                     case 3:
                         envDeviceEquipment.setEquipmentName("喷雾"+spray);
+                        envDeviceEquipment.setEquipmentType(3);
                         envDeviceEquipment.setDeviceAlias(unitName+"喷雾");
                         spray++;
                     break;

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/EnvDeviceEquipment.java

@@ -63,5 +63,7 @@ public class EnvDeviceEquipment implements Serializable {
      */
     private String chipId;
 
+    private Integer equipmentType;
+
 
 }

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

@@ -51,7 +51,7 @@ public interface EnergyWaterMapper extends BaseMapper<EnergyWater> {
 
     BigDecimal getUnitDayWater(String farmId, String unitId);
 
-    List<EnergyWater> listUnitDayDetail(String farmId);
+    List<EnergyWater> listUnitDayDetail(String farmId, String unitId);
 
-    List<EnergyWater> listUnitMonthDetail(String farmId);
+    List<EnergyWater> listUnitMonthDetail(String farmId, String unitId);
 }

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

@@ -200,24 +200,21 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
         int fanStatus = 0,tpStatus = 0,sprayStatus = 0;
         resultMap.put("energyWater", energyWaterMapper.getUnitDayWater(farmId, unitId));
         resultMap.put("energyElectricity",energyElectricityMapper.getDayUnitElectricity(farmId, unitId));
-        if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>().eq("open_start",1).eq("equipment_type",1).eq("unit_id",unitId).eq("farm_id",farmId)) >= 1) {
+        if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>().eq("open_start",1).eq("equipment_type",1).eq("unit_id",unitId)) >= 1) {
             fanStatus = 1;
         }
-        if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>().eq("open_start",1).eq("equipment_type",2).eq("unit_id",unitId).eq("farm_id",farmId)) >= 1) {
+        if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>().eq("open_start",1).eq("equipment_type",2).eq("unit_id",unitId)) >= 1) {
             tpStatus = 1;
         }
-        if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>().eq("open_start",1).eq("equipment_type",3).eq("unit_id",unitId).eq("farm_id",farmId)) >= 1) {
+        if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>().eq("open_start",1).eq("equipment_type",3).eq("unit_id",unitId)) >= 1) {
             sprayStatus = 1;
         }
         resultMap.put("fanStatus",fanStatus);
         resultMap.put("tpStatus",tpStatus);
         resultMap.put("sprayStatus",sprayStatus);
-        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("tpList",tpList);
-        List<EnvDeviceEquipment> sprayList = envDeviceEquipmentMapper.selectList(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id",unitId).eq("equipment_type", 3));
-        resultMap.put("sprayList",sprayList);
+
+        List<EnvDeviceEquipment> deviceList =envDeviceEquipmentMapper.selectList(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id",unitId).orderByAsc("equipment_port"));
+        resultMap.put("deviceList",deviceList);
         return new Result(ResultCode.SUCCESS,resultMap);
     }
 

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

@@ -1,6 +1,7 @@
 package com.huimv.guowei.admin.service.impl;
 
 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.DataUill;
 import com.huimv.guowei.admin.common.utils.Result;
@@ -83,6 +84,9 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
         String type = paramsMap.get("type");
         String farmId = paramsMap.get("farmId");
         String unitId = paramsMap.get("unitId");
+        if (StringUtils.isEmpty(unitId)){
+            unitId = "232";
+        }
         String startDate = paramsMap.get("startDate");
         String endDate = paramsMap.get("endDate")+" 23:59:59";
         List<WaterLineVo> waterLineList = new ArrayList<>();
@@ -194,12 +198,13 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
     @Override
     public Result listScreenUnitWater(Map<String, String> paramsMap) {
         String type = paramsMap.get("type");
+        String unitId = paramsMap.get("unitId");
         String farmId = paramsMap.get("farmId");
         List<EnergyWater> energyWaterList = new ArrayList<>();
         if ("1".equals(type)){
-            energyWaterList = energyWaterMapper.listUnitDayDetail(farmId);
+            energyWaterList = energyWaterMapper.listUnitDayDetail(farmId,unitId);
         }else {
-            energyWaterList = energyWaterMapper.listUnitMonthDetail(farmId);
+            energyWaterList = energyWaterMapper.listUnitMonthDetail(farmId,unitId);
         }
         return new Result(ResultCode.SUCCESS,energyWaterList);
     }

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

@@ -131,14 +131,14 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         Map resultMap = new HashMap();
         //今日
         QueryWrapper<EnvRegularCallFeeding> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("d.unit_id",unitId).eq("f.farm_id",farmId).ge("f.call_date",timesmorning);
+        queryWrapper1.eq("d.unit_id",unitId).eq("f.farm_id",farmId).eq("f.event_type",0).ge("f.call_date",timesmorning);
         BigDecimal dayFeed = feedingMapper.getFeed(queryWrapper1);
         //昨日
         LocalDate yesterday = LocalDate.now().minusDays(1);
         LocalDateTime startOfDay = yesterday.atStartOfDay();
         LocalDateTime endOfDay = yesterday.atTime(LocalTime.MAX);
         QueryWrapper<EnvRegularCallFeeding> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("d.unit_id",unitId).eq("f.farm_id",farmId).between("f.call_date",startOfDay,endOfDay);
+        queryWrapper2.eq("d.unit_id",unitId).eq("f.farm_id",farmId).eq("f.event_type",0).between("f.call_date",startOfDay,endOfDay);
         BigDecimal lastDayFeed = feedingMapper.getFeed(queryWrapper2);
         //日环比
         if (lastDayFeed.toString().equals("0.0")){
@@ -148,13 +148,13 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         }
         //本月
         QueryWrapper<EnvRegularCallFeeding> queryWrapper3 = new QueryWrapper<>();
-        queryWrapper3.eq("d.unit_id",unitId).eq("f.farm_id",farmId).ge("f.call_date",timesMonthmorning);
+        queryWrapper3.eq("d.unit_id",unitId).eq("f.farm_id",farmId).eq("f.event_type",0).ge("f.call_date",timesMonthmorning);
         BigDecimal monthFeed = feedingMapper.getFeed(queryWrapper3);
         //上月
         Date lastMonthStartMorning = DataUill.getLastMonthStartMorning();
         Date lastMonthEndNight = DataUill.getLastMonthEndNight();
         QueryWrapper<EnvRegularCallFeeding> queryWrapper4 = new QueryWrapper<>();
-        queryWrapper4.eq("d.unit_id",unitId).eq("f.farm_id",farmId).between("f.call_date",lastMonthStartMorning,lastMonthEndNight);
+        queryWrapper4.eq("d.unit_id",unitId).eq("f.farm_id",farmId).eq("f.event_type",0).between("f.call_date",lastMonthStartMorning,lastMonthEndNight);
         BigDecimal lastMonthFeed = feedingMapper.getFeed(queryWrapper4);
         //月环比
         if (lastMonthFeed.toString().equals("0.0")){

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

@@ -60,6 +60,7 @@ LEFT JOIN (
         SUM(duck_weight) AS feedValue
     FROM env_regular_call_feeding
     WHERE YEAR(call_date) = YEAR(CURDATE())
+    And event_type = 0
     GROUP BY MONTH(call_date)
 ) f ON m.month = f.month
 ORDER BY m.month
@@ -86,6 +87,7 @@ LEFT JOIN (
         SUM(duck_weight) AS duckWeight
     FROM env_regular_call_feeding
     WHERE DATE(call_date) = CURDATE()
+    And event_type = 0
     GROUP BY duck_num
 ) f ON d.duck_num = f.duck_num
 WHERE d.farm_id = #{farmId}

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

@@ -86,14 +86,14 @@
     </select>
 
     <select id="listUnitDayElectricity" resultType="com.huimv.guowei.admin.entity.EnergyElectricity">
-        SELECT ROUND(electricity_value,2) 'electricityValue', create_date FROM `energy_electricity`
+        SELECT  COALESCE(ROUND(electricity_value,2),0) 'electricityValue', create_date FROM `energy_electricity`
         WHERE farm_id = #{farmId} and unit_id = #{unitId}
         AND TO_DAYS(create_date) = TO_DAYS(NOW())
     </select>
 
 
     <select id="listUnitMonthElectricity" resultType="com.huimv.guowei.admin.entity.EnergyElectricity">
-        SELECT ROUND(SUM(electricity_value),2) 'electricityValue', create_date FROM `energy_electricity`
+        SELECT  COALESCE(ROUND(SUM(electricity_value),2),0) 'electricityValue', create_date FROM `energy_electricity`
         WHERE farm_id = #{farmId} and unit_id = #{unitId}
         AND create_date BETWEEN (SELECT DATE_ADD(CURDATE(),INTERVAL -DAY(CURDATE())+1 DAY)) AND NOW()
         GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")

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

@@ -33,6 +33,7 @@
     <select id="getFeed" resultType="java.math.BigDecimal">
         SELECT ROUND(SUM(f.duck_weight),2) 'duckWeight' FROM `env_regular_call_feeding` f
         LEFT JOIN `base_duck_info` d ON f.duck_id = d.id
+        And f.event_type = 0
         ${ew.customSqlSegment}
     </select>
 
@@ -41,6 +42,7 @@
         LEFT JOIN `base_duck_info` d ON f.duck_id = d.id
         WHERE f.farm_id = #{farmId} and d.unit_id = #{unitId}
         AND f.call_date &gt;= DATE_SUB(NOW(), INTERVAL 6 MONTH)
+        And f.event_type = 0
         GROUP BY DATE_FORMAT(f.call_date,"%Y-%m")
     </select>
 
@@ -49,6 +51,7 @@
         LEFT JOIN `base_duck_info` d ON f.duck_id = d.id
         WHERE f.farm_id = #{farmId} and d.unit_id = #{unitId}
         AND f.call_date &gt;= DATE_SUB(CURDATE(), INTERVAL 6 DAY)
+        And f.event_type = 0
         GROUP BY DATE_FORMAT(f.call_date,"%Y-%m-%d")
     </select>
 
@@ -56,6 +59,7 @@
         SELECT (IFNUll(sum(duck_weight),'0')) 'duckWeight',duck_num 'duckNum',call_date 'callDate',Round(avg(duck_weight),2) avgWeight  FROM `env_regular_call_feeding`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
+        And event_type = 0
         ORDER BY call_date ASC
     </select>
 </mapper>