大屏修改

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

@@ -33,6 +33,8 @@ public class BaseDuckInfoVo implements Serializable {
 
     private String duckNum;
 
+    private String chiNum;
+
     /**
      * 1北京鸭、2连城白鸭、3山麻鸭、4攸县麻鸭、5白改鸭、6缙云麻鸭、7绍兴鸭(带圈白翼梢)、8绍兴鸭(红毛绿翼梢)、9绍兴鸭(白羽绍鸭)
      */

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

@@ -4,6 +4,7 @@ import lombok.Data;
 
 @Data
 public class ScreenDuckVo {
+    private String chiNum;
     private String duckNum;
     private Integer eggNum;
     private String nowWeight;

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

@@ -540,7 +540,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         List<EnvRegularCallFeeding> feedings = feedingMapper.listDayDesc(queryWrapper1);
         JSONArray jsonArray = new JSONArray();
         for (EnvRegularCallFeeding feeding : feedings) {
-            String s = feeding.getDuckNum() + "号鸭进食" + feeding.getDuckWeight() + "g,";
+            String s = feeding.getChiNum() + "翅号鸭进食" + feeding.getDuckWeight() + "g,";
             Date callDate = feeding.getCallDate();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             String s1 = sdf.format(callDate);

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

@@ -136,14 +136,14 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
         Map resultMap = new HashMap();
         //今日
         QueryWrapper<EnergyWater> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("unit_id", unitId).eq("farm_id", farmId).ge("create_date", timesmorning);
+        queryWrapper1.eq("unit_id", unitId).eq("farm_id", farmId).ne("chip_code",1005).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);
+        queryWrapper2.eq("unit_id", unitId).ne("chip_code",1005).eq("farm_id", farmId).between("create_date", startOfDay, endOfDay);
         BigDecimal lastDayWater = energyWaterMapper.getWater(queryWrapper2);
 
         System.out.println(lastDayWater);
@@ -157,13 +157,13 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
         }
         //本月
         QueryWrapper<EnergyWater> queryWrapper3 = new QueryWrapper<>();
-        queryWrapper3.eq("unit_id", unitId).eq("farm_id", farmId).ge("create_date", timesMonthmorning);
+        queryWrapper3.eq("unit_id", unitId).eq("farm_id", farmId).ne("chip_code",1005).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);
+        queryWrapper4.eq("unit_id", unitId).eq("farm_id", farmId).ne("chip_code",1005).between("create_date", lastMonthStartMorning, lastMonthEndNight);
         BigDecimal lastMonthWater = energyWaterMapper.getWater(queryWrapper4);
         //月环比
         if (lastMonthWater.compareTo(BigDecimal.ZERO)==0) {

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

@@ -276,6 +276,7 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
                     jsonObject.put("feed", envRegularCallFeeding.getDuckWeight());
                 }
                 jsonObject.put("duckNum", baseDuckInfo.getDuckNum());
+                jsonObject.put("chiNum", baseDuckInfo.getChiNum());
                 jsonObject.put("location", baseDuckInfo.getUnitName());
                 jsonArray.add(jsonObject);
             }

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

@@ -18,7 +18,7 @@ LEFT JOIN (
         MONTH(create_date) AS MONTH,
         SUM(water_value) AS waterValue
     FROM energy_water
-    WHERE YEAR(create_date) = YEAR(CURDATE())
+    WHERE YEAR(create_date) = YEAR(CURDATE()) AND chip_code != 1005
     GROUP BY MONTH(create_date)
 ) w ON m.month = w.month
 LEFT JOIN (
@@ -69,6 +69,7 @@ ORDER BY m.month
     <select id="listScreenDuck" resultType="com.huimv.guowei.admin.entity.vo.ScreenDuckVo">
         SELECT
     d.duck_num,
+    d.chi_num,
     COALESCE(e.eggNum, 0) AS eggNum,
     COALESCE(ROUND(d.now_weight, 2), 0) AS nowWeight,
     COALESCE(ROUND(f.duckWeight, 1), 0) AS feedWeight,
@@ -76,6 +77,7 @@ ORDER BY m.month
 FROM base_duck_info d
 LEFT JOIN (
     SELECT
+        chi_num,
         duck_num,
         SUM(egg_num) AS eggNum
     FROM env_regular_call_egg
@@ -83,12 +85,13 @@ LEFT JOIN (
 ) e ON d.duck_num = e.duck_num
 LEFT JOIN (
     SELECT
+        chi_num,
         duck_num,
         ROUND(SUM(duck_weight)/1000,1) AS duckWeight
     FROM env_regular_call_feeding
     WHERE DATE(call_date) = CURDATE()
     And event_type = 0
-    GROUP BY duck_num
+    GROUP BY chi_num
 ) f ON d.duck_num = f.duck_num
 WHERE d.farm_id = #{farmId}
 AND d.is_cage = 0

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

@@ -18,7 +18,7 @@
 
     <select id="listDayDetail" resultType="com.huimv.guowei.admin.entity.EnergyWater">
         SELECT COALESCE(ROUND(SUM(water_value),2),0) 'waterValue', create_date FROM `energy_water`
-        WHERE farm_id = #{farmId}
+        WHERE farm_id = #{farmId} AND chip_code != 1005
         AND TO_DAYS(create_date) = TO_DAYS(NOW())
         group by create_date
         ORDER BY create_date ASC
@@ -26,34 +26,34 @@
 
     <select id="listWeekDetail" resultType="com.huimv.guowei.admin.entity.EnergyWater">
         SELECT COALESCE(ROUND(SUM(water_value),2),0) 'waterValue', create_date FROM `energy_water`
-        WHERE farm_id = #{farmId}
+        WHERE farm_id = #{farmId} AND chip_code != 1005
         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="listMonthDetail" resultType="com.huimv.guowei.admin.entity.EnergyWater">
         SELECT COALESCE(ROUND(SUM(water_value),2),0) 'waterValue', create_date FROM `energy_water`
-        WHERE farm_id = #{farmId}
+        WHERE farm_id = #{farmId} AND chip_code != 1005
         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="listCustomDetail" resultType="com.huimv.guowei.admin.entity.EnergyWater">
         SELECT ROUND(SUM(water_value),2) 'waterValue', create_date FROM `energy_water`
-        WHERE farm_id = #{farmId}
+        WHERE farm_id = #{farmId} AND chip_code != 1005
         AND create_date BETWEEN '${startDate}' AND '${endDate}'
         GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
     </select>
 
     <select id="getDayWater" resultType="java.math.BigDecimal">
         SELECT COALESCE(ROUND(SUM(water_value),2),0) 'waterValue' FROM `energy_water`
-        WHERE farm_id = #{farmId}
+        WHERE farm_id = #{farmId} AND chip_code != 1005
         AND TO_DAYS(create_date) = TO_DAYS(NOW())
     </select>
 
     <select id="getMonthWater" resultType="java.math.BigDecimal">
         SELECT COALESCE(ROUND(SUM(water_value),2),0) 'waterValue' FROM `energy_water`
-        WHERE farm_id = #{farmId}
+        WHERE farm_id = #{farmId} AND chip_code != 1005
         AND create_date BETWEEN (SELECT DATE_ADD(CURDATE(),INTERVAL -DAY(CURDATE())+1 DAY)) AND NOW()
     </select>
 

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

@@ -23,7 +23,7 @@
         ORDER BY call_date ASC
     </select>
     <select id="listDayDesc" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
-        SELECT (IFNUll(sum(duck_weight),'0')) 'duckWeight',duck_num 'duckNum',call_date 'callDate' FROM `env_regular_call_feeding`
+        SELECT (IFNUll(sum(duck_weight),'0')) 'duckWeight',duck_num 'duckNum',chi_num 'chiNum',call_date 'callDate' FROM `env_regular_call_feeding`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
         ORDER BY call_date DESC