修改12

huimv-admin/src/main/java/com/huimv/admin/entity/vo/EnergyDataScreenVo.java

@@ -9,20 +9,27 @@ import java.util.Date;
 public class EnergyDataScreenVo {
     private String waterValueToday;
     private String electricityValueToday;
+    private String feedValueToday;
 
     private String waterValueTodayUsage;
     private String electricityValueTodayUsage;
+    private String feedValueTodayUsage;
     private String waterValueYesterdayUsage;
     private String electricityValueYesterdayUsage;
+    private String feedValueYesterdayUsage;
 
     private String waterValueThisWeekUsage;
     private String electricityValueThisWeekUsage;
+    private String feedValueThisWeekUsage;
     private String waterValueLastWeekUsage;
     private String electricityValueLastWeekUsage;
+    private String feedValueLastWeekUsage;
 
     private String waterValueThisMonthUsage;
     private String electricityValueThisMonthUsage;
+    private String feedValueThisMonthUsage;
     private String waterValueLastMonthUsage;
     private String electricityValueLastMonthUsage;
+    private String feedValueLastMonthUsage;
 
 }

huimv-admin/src/main/java/com/huimv/admin/timer/WaterAndElcTimer.java

@@ -2701,7 +2701,31 @@ public class WaterAndElcTimer {
                   energyScreen.setDayDifference(day4);
                   energyScreen.setWeekDifference(week3);
                   energyScreen.setMonthDifference(month3);
+              } else if ("3".equals(envDevice.getRemark())) {
+                  //用料
+                  energyScreen.setCreateDate(new Date());
+                  energyScreen.setTodayRead(dataScreenVo.getFeedValueToday());
+                  energyScreen.setTodayConsume(dataScreenVo.getFeedValueTodayUsage());
+                  energyScreen.setYesterdayConsume(dataScreenVo.getFeedValueYesterdayUsage());
+                  energyScreen.setWeekConsume(dataScreenVo.getFeedValueThisWeekUsage());
+                  energyScreen.setLastWeekConsume(dataScreenVo.getFeedValueLastWeekUsage());
+                  energyScreen.setMonthConsume(dataScreenVo.getFeedValueThisMonthUsage());
+                  energyScreen.setLastMonthConsume(dataScreenVo.getFeedValueLastMonthUsage());
+                  double day2 = Double.parseDouble(dataScreenVo.getFeedValueTodayUsage());
+                  double day3 = Double.parseDouble(dataScreenVo.getFeedValueYesterdayUsage());
+                  double week1 = Double.parseDouble(dataScreenVo.getFeedValueThisWeekUsage());
+                  double week2 = Double.parseDouble(dataScreenVo.getFeedValueLastWeekUsage());
+                  double month1 = Double.parseDouble(dataScreenVo.getFeedValueThisMonthUsage());
+                  double month2 = Double.parseDouble(dataScreenVo.getFeedValueLastMonthUsage());
+                  DecimalFormat def = new DecimalFormat("0.00");
+                  String day4 = def.format(day2 - day3);
+                  String week3 = def.format(week1 - week2);
+                  String month3 = def.format(month1 - month2);
+                  energyScreen.setDayDifference(day4);
+                  energyScreen.setWeekDifference(week3);
+                  energyScreen.setMonthDifference(month3);
               } else {
+
                   //用电
                   energyScreen.setCreateDate(new Date());
                   energyScreen.setTodayRead(dataScreenVo.getElectricityValueToday());
@@ -2757,6 +2781,33 @@ public class WaterAndElcTimer {
                   screen.setDeviceCode(envDevice.getDeviceCode());
                   screen.setType(1);
                   screen.setFarmName("芙江养殖基地");
+              } else if ("3".equals(envDevice.getRemark())) {
+                  screen.setCreateDate(new Date());
+                  screen.setTodayRead(dataScreenVo.getFeedValueToday());
+                  screen.setTodayConsume(dataScreenVo.getFeedValueTodayUsage());
+                  screen.setYesterdayConsume(dataScreenVo.getFeedValueYesterdayUsage());
+                  screen.setWeekConsume(dataScreenVo.getFeedValueThisWeekUsage());
+                  screen.setLastWeekConsume(dataScreenVo.getFeedValueLastWeekUsage());
+                  screen.setMonthConsume(dataScreenVo.getFeedValueThisMonthUsage());
+                  screen.setLastMonthConsume(dataScreenVo.getFeedValueLastMonthUsage());
+                  double day2 = Double.parseDouble(dataScreenVo.getFeedValueTodayUsage());
+                  double day3 = Double.parseDouble(dataScreenVo.getFeedValueYesterdayUsage());
+                  double week1 = Double.parseDouble(dataScreenVo.getFeedValueThisWeekUsage());
+                  double week2 = Double.parseDouble(dataScreenVo.getFeedValueLastWeekUsage());
+                  double month1 = Double.parseDouble(dataScreenVo.getFeedValueThisMonthUsage());
+                  double month2 = Double.parseDouble(dataScreenVo.getFeedValueLastMonthUsage());
+                  DecimalFormat def = new DecimalFormat("0.00");
+                  String day4 = def.format(day2 - day3);
+                  String week3 = def.format(week1 - week2);
+                  String month3 = def.format(month1 - month2);
+                  screen.setDayDifference(day4);
+                  screen.setWeekDifference(week3);
+                  screen.setMonthDifference(month3);
+                  screen.setFarmId(28);
+                  screen.setBuildName(envDevice.getUnitName());
+                  screen.setDeviceCode(envDevice.getDeviceCode());
+                  screen.setType(3);
+                  screen.setFarmName("芙江养殖基地");
               } else {
                   screen.setCreateDate(new Date());
                   screen.setTodayRead(dataScreenVo.getElectricityValueToday());
@@ -2846,6 +2897,29 @@ public class WaterAndElcTimer {
                     energyScreen.setDayDifference(day4);
                     energyScreen.setWeekDifference(week3);
                     energyScreen.setMonthDifference(month3);
+                } else if ("3".equals(envDevice.getRemark())) {
+                    //用料
+                    energyScreen.setCreateDate(new Date());
+                    energyScreen.setTodayRead(dataScreenVo.getFeedValueToday());
+                    energyScreen.setTodayConsume(dataScreenVo.getFeedValueTodayUsage());
+                    energyScreen.setYesterdayConsume(dataScreenVo.getFeedValueYesterdayUsage());
+                    energyScreen.setWeekConsume(dataScreenVo.getFeedValueThisWeekUsage());
+                    energyScreen.setLastWeekConsume(dataScreenVo.getFeedValueLastWeekUsage());
+                    energyScreen.setMonthConsume(dataScreenVo.getFeedValueThisMonthUsage());
+                    energyScreen.setLastMonthConsume(dataScreenVo.getFeedValueLastMonthUsage());
+                    double day2 = Double.parseDouble(dataScreenVo.getFeedValueTodayUsage());
+                    double day3 = Double.parseDouble(dataScreenVo.getFeedValueYesterdayUsage());
+                    double week1 = Double.parseDouble(dataScreenVo.getFeedValueThisWeekUsage());
+                    double week2 = Double.parseDouble(dataScreenVo.getFeedValueLastWeekUsage());
+                    double month1 = Double.parseDouble(dataScreenVo.getFeedValueThisMonthUsage());
+                    double month2 = Double.parseDouble(dataScreenVo.getFeedValueLastMonthUsage());
+                    DecimalFormat def = new DecimalFormat("0.00");
+                    String day4 = def.format(day2 - day3);
+                    String week3 = def.format(week1 - week2);
+                    String month3 = def.format(month1 - month2);
+                    energyScreen.setDayDifference(day4);
+                    energyScreen.setWeekDifference(week3);
+                    energyScreen.setMonthDifference(month3);
                 } else {
                     //用电
                     energyScreen.setCreateDate(new Date());
@@ -2902,7 +2976,34 @@ public class WaterAndElcTimer {
                     screen.setDeviceCode(envDevice.getDeviceCode());
                     screen.setType(1);
                     screen.setFarmName("庙贝养殖基地");
-                } else {
+                }else if ("3".equals(envDevice.getRemark())) {
+                    screen.setCreateDate(new Date());
+                    screen.setTodayRead(dataScreenVo.getFeedValueToday());
+                    screen.setTodayConsume(dataScreenVo.getFeedValueTodayUsage());
+                    screen.setYesterdayConsume(dataScreenVo.getFeedValueYesterdayUsage());
+                    screen.setWeekConsume(dataScreenVo.getFeedValueThisWeekUsage());
+                    screen.setLastWeekConsume(dataScreenVo.getFeedValueLastWeekUsage());
+                    screen.setMonthConsume(dataScreenVo.getFeedValueThisMonthUsage());
+                    screen.setLastMonthConsume(dataScreenVo.getFeedValueLastMonthUsage());
+                    double day2 = Double.parseDouble(dataScreenVo.getFeedValueTodayUsage());
+                    double day3 = Double.parseDouble(dataScreenVo.getFeedValueYesterdayUsage());
+                    double week1 = Double.parseDouble(dataScreenVo.getFeedValueThisWeekUsage());
+                    double week2 = Double.parseDouble(dataScreenVo.getFeedValueLastWeekUsage());
+                    double month1 = Double.parseDouble(dataScreenVo.getFeedValueThisMonthUsage());
+                    double month2 = Double.parseDouble(dataScreenVo.getFeedValueLastMonthUsage());
+                    DecimalFormat def = new DecimalFormat("0.00");
+                    String day4 = def.format(day2 - day3);
+                    String week3 = def.format(week1 - week2);
+                    String month3 = def.format(month1 - month2);
+                    screen.setDayDifference(day4);
+                    screen.setWeekDifference(week3);
+                    screen.setMonthDifference(month3);
+                    screen.setFarmId(29);
+                    screen.setBuildName(envDevice.getUnitName());
+                    screen.setDeviceCode(envDevice.getDeviceCode());
+                    screen.setType(3);
+                    screen.setFarmName("庙贝养殖基地");
+                }  else {
                     screen.setCreateDate(new Date());
                     screen.setTodayRead(dataScreenVo.getElectricityValueToday());
                     screen.setTodayConsume(dataScreenVo.getElectricityValueTodayUsage());
@@ -2991,6 +3092,29 @@ public class WaterAndElcTimer {
                     energyScreen.setDayDifference(day4);
                     energyScreen.setWeekDifference(week3);
                     energyScreen.setMonthDifference(month3);
+                } else if ("3".equals(envDevice.getRemark())) {
+                    //用料
+                    energyScreen.setCreateDate(new Date());
+                    energyScreen.setTodayRead(dataScreenVo.getFeedValueToday());
+                    energyScreen.setTodayConsume(dataScreenVo.getFeedValueTodayUsage());
+                    energyScreen.setYesterdayConsume(dataScreenVo.getFeedValueYesterdayUsage());
+                    energyScreen.setWeekConsume(dataScreenVo.getFeedValueThisWeekUsage());
+                    energyScreen.setLastWeekConsume(dataScreenVo.getFeedValueLastWeekUsage());
+                    energyScreen.setMonthConsume(dataScreenVo.getFeedValueThisMonthUsage());
+                    energyScreen.setLastMonthConsume(dataScreenVo.getFeedValueLastMonthUsage());
+                    double day2 = Double.parseDouble(dataScreenVo.getFeedValueTodayUsage());
+                    double day3 = Double.parseDouble(dataScreenVo.getFeedValueYesterdayUsage());
+                    double week1 = Double.parseDouble(dataScreenVo.getFeedValueThisWeekUsage());
+                    double week2 = Double.parseDouble(dataScreenVo.getFeedValueLastWeekUsage());
+                    double month1 = Double.parseDouble(dataScreenVo.getFeedValueThisMonthUsage());
+                    double month2 = Double.parseDouble(dataScreenVo.getFeedValueLastMonthUsage());
+                    DecimalFormat def = new DecimalFormat("0.00");
+                    String day4 = def.format(day2 - day3);
+                    String week3 = def.format(week1 - week2);
+                    String month3 = def.format(month1 - month2);
+                    energyScreen.setDayDifference(day4);
+                    energyScreen.setWeekDifference(week3);
+                    energyScreen.setMonthDifference(month3);
                 } else {
                     //用电
                     energyScreen.setCreateDate(new Date());
@@ -3047,6 +3171,33 @@ public class WaterAndElcTimer {
                     screen.setDeviceCode(envDevice.getDeviceCode());
                     screen.setType(1);
                     screen.setFarmName("潞水养殖基地");
+                } else if ("3".equals(envDevice.getRemark())) {
+                    screen.setCreateDate(new Date());
+                    screen.setTodayRead(dataScreenVo.getFeedValueToday());
+                    screen.setTodayConsume(dataScreenVo.getFeedValueTodayUsage());
+                    screen.setYesterdayConsume(dataScreenVo.getFeedValueYesterdayUsage());
+                    screen.setWeekConsume(dataScreenVo.getFeedValueThisWeekUsage());
+                    screen.setLastWeekConsume(dataScreenVo.getFeedValueLastWeekUsage());
+                    screen.setMonthConsume(dataScreenVo.getFeedValueThisMonthUsage());
+                    screen.setLastMonthConsume(dataScreenVo.getFeedValueLastMonthUsage());
+                    double day2 = Double.parseDouble(dataScreenVo.getFeedValueTodayUsage());
+                    double day3 = Double.parseDouble(dataScreenVo.getFeedValueYesterdayUsage());
+                    double week1 = Double.parseDouble(dataScreenVo.getFeedValueThisWeekUsage());
+                    double week2 = Double.parseDouble(dataScreenVo.getFeedValueLastWeekUsage());
+                    double month1 = Double.parseDouble(dataScreenVo.getFeedValueThisMonthUsage());
+                    double month2 = Double.parseDouble(dataScreenVo.getFeedValueLastMonthUsage());
+                    DecimalFormat def = new DecimalFormat("0.00");
+                    String day4 = def.format(day2 - day3);
+                    String week3 = def.format(week1 - week2);
+                    String month3 = def.format(month1 - month2);
+                    screen.setDayDifference(day4);
+                    screen.setWeekDifference(week3);
+                    screen.setMonthDifference(month3);
+                    screen.setFarmId(30);
+                    screen.setBuildName(envDevice.getUnitName());
+                    screen.setDeviceCode(envDevice.getDeviceCode());
+                    screen.setType(3);
+                    screen.setFarmName("潞水养殖基地");
                 } else {
                     screen.setCreateDate(new Date());
                     screen.setTodayRead(dataScreenVo.getElectricityValueToday());
@@ -3136,6 +3287,29 @@ public class WaterAndElcTimer {
                     energyScreen.setDayDifference(day4);
                     energyScreen.setWeekDifference(week3);
                     energyScreen.setMonthDifference(month3);
+                } else if ("3".equals(envDevice.getRemark())) {
+                    //用料
+                    energyScreen.setCreateDate(new Date());
+                    energyScreen.setTodayRead(dataScreenVo.getFeedValueToday());
+                    energyScreen.setTodayConsume(dataScreenVo.getFeedValueTodayUsage());
+                    energyScreen.setYesterdayConsume(dataScreenVo.getFeedValueYesterdayUsage());
+                    energyScreen.setWeekConsume(dataScreenVo.getFeedValueThisWeekUsage());
+                    energyScreen.setLastWeekConsume(dataScreenVo.getFeedValueLastWeekUsage());
+                    energyScreen.setMonthConsume(dataScreenVo.getFeedValueThisMonthUsage());
+                    energyScreen.setLastMonthConsume(dataScreenVo.getFeedValueLastMonthUsage());
+                    double day2 = Double.parseDouble(dataScreenVo.getFeedValueTodayUsage());
+                    double day3 = Double.parseDouble(dataScreenVo.getFeedValueYesterdayUsage());
+                    double week1 = Double.parseDouble(dataScreenVo.getFeedValueThisWeekUsage());
+                    double week2 = Double.parseDouble(dataScreenVo.getFeedValueLastWeekUsage());
+                    double month1 = Double.parseDouble(dataScreenVo.getFeedValueThisMonthUsage());
+                    double month2 = Double.parseDouble(dataScreenVo.getFeedValueLastMonthUsage());
+                    DecimalFormat def = new DecimalFormat("0.00");
+                    String day4 = def.format(day2 - day3);
+                    String week3 = def.format(week1 - week2);
+                    String month3 = def.format(month1 - month2);
+                    energyScreen.setDayDifference(day4);
+                    energyScreen.setWeekDifference(week3);
+                    energyScreen.setMonthDifference(month3);
                 } else {
                     //用电
                     energyScreen.setCreateDate(new Date());
@@ -3192,6 +3366,33 @@ public class WaterAndElcTimer {
                     screen.setDeviceCode(envDevice.getDeviceCode());
                     screen.setType(1);
                     screen.setFarmName("凤形养殖基地");
+                } else if ("3".equals(envDevice.getRemark())) {
+                    screen.setCreateDate(new Date());
+                    screen.setTodayRead(dataScreenVo.getFeedValueToday());
+                    screen.setTodayConsume(dataScreenVo.getFeedValueTodayUsage());
+                    screen.setYesterdayConsume(dataScreenVo.getFeedValueYesterdayUsage());
+                    screen.setWeekConsume(dataScreenVo.getFeedValueThisWeekUsage());
+                    screen.setLastWeekConsume(dataScreenVo.getFeedValueLastWeekUsage());
+                    screen.setMonthConsume(dataScreenVo.getFeedValueThisMonthUsage());
+                    screen.setLastMonthConsume(dataScreenVo.getFeedValueLastMonthUsage());
+                    double day2 = Double.parseDouble(dataScreenVo.getFeedValueTodayUsage());
+                    double day3 = Double.parseDouble(dataScreenVo.getFeedValueYesterdayUsage());
+                    double week1 = Double.parseDouble(dataScreenVo.getFeedValueThisWeekUsage());
+                    double week2 = Double.parseDouble(dataScreenVo.getFeedValueLastWeekUsage());
+                    double month1 = Double.parseDouble(dataScreenVo.getFeedValueThisMonthUsage());
+                    double month2 = Double.parseDouble(dataScreenVo.getFeedValueLastMonthUsage());
+                    DecimalFormat def = new DecimalFormat("0.00");
+                    String day4 = def.format(day2 - day3);
+                    String week3 = def.format(week1 - week2);
+                    String month3 = def.format(month1 - month2);
+                    screen.setDayDifference(day4);
+                    screen.setWeekDifference(week3);
+                    screen.setMonthDifference(month3);
+                    screen.setFarmId(31);
+                    screen.setBuildName(envDevice.getUnitName());
+                    screen.setDeviceCode(envDevice.getDeviceCode());
+                    screen.setType(3);
+                    screen.setFarmName("凤形养殖基地");
                 } else {
                     screen.setCreateDate(new Date());
                     screen.setTodayRead(dataScreenVo.getElectricityValueToday());

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnergyDataMapper.xml

@@ -174,30 +174,36 @@ SELECT
     -- 当日读数
     CONVERT(IFNULL(SUM(CASE WHEN 1 = 1 THEN water_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS waterValueToday,
     CONVERT(IFNULL(SUM(CASE WHEN 1 = 1 THEN electricity_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS electricityValueToday,
+    CONVERT(IFNULL(SUM(CASE WHEN 1 = 1 THEN feed_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS feedValueToday,
 
     -- 当日用量
     CONVERT(IFNULL(SUM(CASE WHEN create_date >= #{today} THEN water_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS waterValueTodayUsage,
     CONVERT(IFNULL(SUM(CASE WHEN create_date >= #{today} THEN electricity_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS electricityValueTodayUsage,
+    CONVERT(IFNULL(SUM(CASE WHEN create_date >= #{today} THEN feed_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS feedValueTodayUsage,
 
     -- 昨日用量
     CONVERT(IFNULL(SUM(CASE WHEN create_date BETWEEN #{yesterdayStart} AND #{yesterdayEnd} THEN water_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS waterValueYesterdayUsage,
     CONVERT(IFNULL(SUM(CASE WHEN create_date BETWEEN #{yesterdayStart} AND #{yesterdayEnd} THEN electricity_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS electricityValueYesterdayUsage,
-
+    CONVERT(IFNULL(SUM(CASE WHEN create_date BETWEEN #{yesterdayStart} AND #{yesterdayEnd} THEN feed_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS feedValueYesterdayUsage,
     -- 本周用量
     CONVERT(IFNULL(SUM(CASE WHEN create_date >= #{week} THEN water_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS waterValueThisWeekUsage,
     CONVERT(IFNULL(SUM(CASE WHEN create_date >= #{week} THEN electricity_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS electricityValueThisWeekUsage,
+    CONVERT(IFNULL(SUM(CASE WHEN create_date >= #{week} THEN feed_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS feedValueThisWeekUsage,
 
     -- 上周用量
     CONVERT(IFNULL(SUM(CASE WHEN create_date BETWEEN #{weekStart} AND #{weekEnd} THEN water_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS waterValueLastWeekUsage,
     CONVERT(IFNULL(SUM(CASE WHEN create_date BETWEEN #{weekStart} AND #{weekEnd} THEN electricity_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS electricityValueLastWeekUsage,
+    CONVERT(IFNULL(SUM(CASE WHEN create_date BETWEEN #{weekStart} AND #{weekEnd} THEN feed_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS feedValueLastWeekUsage,
 
     -- 本月用量
     CONVERT(IFNULL(SUM(CASE WHEN create_date >= #{month} THEN water_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS waterValueThisMonthUsage,
     CONVERT(IFNULL(SUM(CASE WHEN create_date >= #{month} THEN electricity_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS electricityValueThisMonthUsage,
+    CONVERT(IFNULL(SUM(CASE WHEN create_date >= #{month} THEN feed_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS feedValueThisMonthUsage,
 
     -- 上月用量
     CONVERT(IFNULL(SUM(CASE WHEN create_date BETWEEN #{monthStart} AND #{monthEnd} THEN water_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS waterValueLastMonthUsage,
-    CONVERT(IFNULL(SUM(CASE WHEN create_date BETWEEN #{monthStart} AND #{monthEnd} THEN electricity_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS electricityValueLastMonthUsage
+    CONVERT(IFNULL(SUM(CASE WHEN create_date BETWEEN #{monthStart} AND #{monthEnd} THEN electricity_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS electricityValueLastMonthUsage,
+    CONVERT(IFNULL(SUM(CASE WHEN create_date BETWEEN #{monthStart} AND #{monthEnd} THEN feed_value ELSE 0 END), '0'), DECIMAL(10, 2)) AS feedValueLastMonthUsage
 FROM `energy_data` WHERE unit_id = ${unitId} AND farm_id =${farmId}
  </select>