接受数据修改7

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

@@ -8,11 +8,13 @@ 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.BaseBuilding;
 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.EnergyWaterVo;
 import com.huimv.guowei.admin.entity.vo.WaterLineVo;
+import com.huimv.guowei.admin.mapper.BaseBuildingMapper;
 import com.huimv.guowei.admin.mapper.EnergyWaterMapper;
 import com.huimv.guowei.admin.mapper.EnvDeviceChipMapper;
 import com.huimv.guowei.admin.service.IEnergyWaterService;
@@ -45,7 +47,8 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
     private EnergyWaterMapper energyWaterMapper;
     @Resource
     private EnvDeviceChipMapper envDeviceChipMapper;
-
+    @Resource
+    private BaseBuildingMapper buildingMapper;
     @Override
     public Result listWater(Map<String, String> paramsMap) {
         String type = paramsMap.get("type");
@@ -240,28 +243,34 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
         if (type.equals("1")) {
             Date timesmorning = DataUill.getTimesmorning();
             queryWrapper.ge("create_date", timesmorning).ne("chip_code",1005);
-            waterVos = energyWaterMapper.selectList(queryWrapper);
+            waterVos = energyWaterMapper.printWater(queryWrapper);
         }
         //本周
 
         if (type.equals("2")) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
             queryWrapper.ge("create_date", dateTime).ne("chip_code",1005);
-            waterVos = energyWaterMapper.selectList(queryWrapper);
+            waterVos = energyWaterMapper.printWater(queryWrapper);
         }
         //本月
 
         if (type.equals("3")) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
             queryWrapper.ge("create_date", timesMonthmorning).ne("chip_code",1005);
-            waterVos = energyWaterMapper.selectList(queryWrapper);
+            waterVos = energyWaterMapper.printWater(queryWrapper);
         }
         //自定义
 
         if (type.equals("4")) {
             endTime = endTime + " 23:59:59";
             queryWrapper.between("create_date", startTime, endTime).ne("chip_code",1005);
-            waterVos = energyWaterMapper.selectList(queryWrapper);
+            waterVos = energyWaterMapper.printWater(queryWrapper);
+        }
+        for (EnergyWater waterVo : waterVos) {
+            QueryWrapper<BaseBuilding> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId).eq("id", waterVo.getChipCode());
+            BaseBuilding baseBuilding = buildingMapper.selectOne(queryWrapper1);
+            waterVo.setChipName(baseBuilding.getBuildName());
         }
         EnergyWater water = energyWaterMapper.printWaterCount(queryWrapper);//总吨数
         Print.printWater(waterVos, water);

huimv-admin/src/main/java/com/huimv/guowei/admin/utils/Print.java

@@ -3,6 +3,7 @@ package com.huimv.guowei.admin.utils;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.guowei.admin.entity.*;
 import com.huimv.guowei.admin.entity.vo.EnergyWaterVo;
 import com.huimv.guowei.admin.entity.vo.EnvRegularCallEggVo;
@@ -43,7 +44,7 @@ public class Print {
         for (PrintEntrty printEntrty : printEntrties) {
             PrintEntrtyVo printEntrtyVo = new PrintEntrtyVo();
             BaseDuckInfo duckInfo = printEntrty.getBaseDuckInfo();
-            printEntrtyVo.setDuckCode(duckInfo.getChiNum()+"、"+duckInfo.getJiaoNum());
+            printEntrtyVo.setDuckCode(duckInfo.getChiNum() + "、" + duckInfo.getJiaoNum());
 
             if (duckInfo.getDuckBreed() == 1) {
                 printEntrtyVo.setDuckType("北京鸭");
@@ -163,7 +164,7 @@ public class Print {
         JxlsHelper.getInstance().processTemplate(is, os, context);
     }
 
-    public static void printWater(List<EnergyWater> waterVos,EnergyWater water) throws Exception {
+    public static void printWater(List<EnergyWater> waterVos, EnergyWater water) throws Exception {
 
         //准备数据
         String path = "/opt/guowei/water.xls";
@@ -177,27 +178,16 @@ public class Print {
         int i = 0;
         BigDecimal count = BigDecimal.ZERO;
         for (EnergyWater waterVo : waterVos) {
-            i=i+1;
+            i = i + 1;
             WaterVo waterVo1 = new WaterVo();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             String format = sdf.format(waterVo.getCreateDate());
-            if (!"0".equals(waterVo.getWaterValue())) {
-                waterVo1.setWater(waterVo.getWaterValue());
-                waterVo1.setDate(format);
-                waterVo1.setLocation(waterVo.getChipCode());
-            }
-                BigDecimal bd = new BigDecimal(waterVo.getWaterValue());
-                BigDecimal result = bd.setScale(2, BigDecimal.ROUND_HALF_UP);
-                count = count.add(result);
-                list.add(waterVo1);
-                if (i == 4) {
-                    WaterVo one = new WaterVo();
-                    one.setDate(format);
-                    one.setLocation("合计：");
-                    one.setWater(count.toString());
-                    list.add(one);
-                    i = 0;
-                }
+
+            waterVo1.setWater(waterVo.getWaterValue());
+            waterVo1.setDate(format);
+            waterVo1.setLocation(waterVo.getChipName());
+            list.add(waterVo1);
+
 
         }
         context.putVar("list", list);
@@ -229,6 +219,7 @@ public class Print {
         //生成
         JxlsHelper.getInstance().processTemplate(is, os, context);
     }
+
     public static void printChi(List<BaseDuckInfo> baseDuckInfos) throws Exception {
 
         //准备数据

huimv-admin/src/main/resources/application-prod.yml

@@ -24,7 +24,7 @@ mybatis-plus:
 img:
   url: https://img.ifarmcloud.com/images/
   basePath: /home/huimv/img/
-  ip: 139.9.167.178
+  ip: 119.3.44.183
   user:  huimv
   password: "!hm123@1"
   port: 22

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

@@ -172,7 +172,7 @@
     </select>
 
     <select id="printWater" resultType="com.huimv.guowei.admin.entity.EnergyWater">
-        SELECT water_value 'waterValue',unit_id 'chipCode',create_date 'createDate' FROM `energy_water`
+        SELECT IFNULL(sum(water_value),0) 'waterValue',unit_id 'chipCode',create_date 'createDate' FROM `energy_water`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
         ORDER BY create_date ASC