接口修改

huimv-env-admin/src/main/java/com/huimv/env/admin/controller/EnergyDataController.java

@@ -54,4 +54,13 @@ public class EnergyDataController {
     public Result listRankScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return iEnergyDataService.listRankScreen(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/listAll")
+    public Result listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return iEnergyDataService.listAll(httpServletRequest, paramsMap);
+    }
+    @RequestMapping("/countEnergy")
+    public Result countEnergy(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return iEnergyDataService.countEnergy(httpServletRequest, paramsMap);
+    }
 }

huimv-env-common/src/main/java/com/huimv/env/common/mapper/EnergyElectricityMapper.java

@@ -25,6 +25,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 @Repository
 public interface EnergyElectricityMapper extends BaseMapper<EnergyElectricity> {
-    List<EnergyDto> listCount(@Param(Constants.WRAPPER) QueryWrapper<EnergyElectricity> queryWrapper);
-public interface EnergyElectricityMapper extends BaseMapper<EnergyElectricity> {
-}}
+    EnergyDto listCount(@Param(Constants.WRAPPER) QueryWrapper<EnergyElectricity> queryWrapper);
+}

huimv-env-common/src/main/java/com/huimv/env/common/mapper/EnergyWaterMapper.java

@@ -22,5 +22,5 @@ import java.util.List;
  */
 @Repository
 public interface EnergyWaterMapper extends BaseMapper<EnergyWater> {
-    List<EnergyDto> listCount(@Param(Constants.WRAPPER) QueryWrapper<EnergyWater> queryWrapper);
+    EnergyDto listCount(@Param(Constants.WRAPPER) QueryWrapper<EnergyWater> queryWrapper);
 }

huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnergyDataServiceImpl.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.DataUill;
 import com.huimv.env.common.entity.BasePigpen;
@@ -436,6 +437,14 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         String farmId = paramsMap.get("farmId");
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+        }
+        if ("".equals(pageSize) || null == pageSize) {
+            pageSize = "10";
+        }
         String id = paramsMap.get("id");
         String type = paramsMap.get("type");//1 为水 2为电
 
@@ -443,14 +452,14 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
             QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(id), "unit_id", id);
             queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
-            List<EnergyWater> energyWaters = waterMapper.selectList(queryWrapper);
-            return new Result(ResultCode.SUCCESS,energyWaters);
+            Page<EnergyWater> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            return new Result(ResultCode.SUCCESS, waterMapper.selectPage(page, queryWrapper));
         } else {
             QueryWrapper<EnergyElectricity> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(id), "unit_id", id);
             queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
-            List<EnergyElectricity> energyWaters = electricityMapper.selectList(queryWrapper);
-            return new Result(ResultCode.SUCCESS,energyWaters);
+            Page<EnergyElectricity> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            return new Result(ResultCode.SUCCESS, electricityMapper.selectPage(page, queryWrapper));
         }
 
     }
@@ -461,11 +470,75 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
         String id = paramsMap.get("id");
-        QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
-        queryWrapper.eq(StringUtils.isNotBlank(id), "unit_id", id);
-        List<EnergyDto> energyDtos = waterMapper.listCount(queryWrapper);
-        return new Result(ResultCode.SUCCESS, energyDtos);
+
+        JSONArray jsonArray = new JSONArray();
+        if (("".equals(id) || null == id)) {
+            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId);
+            queryWrapper1.eq("f_type", 3);
+            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper1);
+            if (basePigpens.size() != 0) {
+                for (BasePigpen basePigpen : basePigpens) {
+                    QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("farm_id", farmId);
+                    queryWrapper.eq("unit_id", basePigpen.getId());
+                    if ("".equals(startTime) || null == startTime) {
+                        queryWrapper.ge("create_date", DataUill.getTimesmorning());
+                    } else {
+                        queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
+                    }
+                    List<EnergyWater> waters = waterMapper.selectList(queryWrapper);
+                    Double waterCount = 0.00;
+                    if (waters.size() > 0) {
+                        for (EnergyWater water : waters) {
+                            waterCount = waterCount + Double.parseDouble(water.getWaterValue());
+                        }
+                    }
+                    QueryWrapper<EnergyElectricity> queryWrapper2 = new QueryWrapper<>();
+                    queryWrapper2.eq("farm_id", farmId);
+                    queryWrapper2.eq("unit_id", basePigpen.getId());
+                    queryWrapper2.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
+                    List<EnergyElectricity> electricities = electricityMapper.selectList(queryWrapper2);
+                    Double electricityCount = 0.00;
+                    if (waters.size() > 0) {
+                        for (EnergyElectricity electriciti : electricities) {
+                            electricityCount = electricityCount + Double.parseDouble(electriciti.getElectricityValue());
+                        }
+                    }
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("waterCount", waterCount);
+                    jsonObject.put("electricityCount", electricityCount);
+                    jsonObject.put("unitName", basePigpen.getBuildName());
+                    jsonArray.add(jsonObject);
+                }
+            }
+        } else {
+
+            QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId);
+            queryWrapper.eq("unit_id", id);
+            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
+            EnergyDto energyDto = waterMapper.listCount(queryWrapper);
+
+            QueryWrapper<EnergyElectricity> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId);
+            queryWrapper1.eq("unit_id", id);
+            queryWrapper1.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
+            EnergyDto energyDto1 = electricityMapper.listCount(queryWrapper1);
+
+            QueryWrapper<BasePigpen> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.eq("farm_id", farmId);
+            queryWrapper2.eq("id", id);
+            BasePigpen basePigpen = basePigpenMapper.selectOne(queryWrapper2);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("waterCount", energyDto.getWaterCount());
+            jsonObject.put("electricityCount", energyDto1.getElectricityCount());
+            jsonObject.put("unitName", basePigpen.getBuildName());
+            jsonArray.add(jsonObject);
+
+        }
+
+        return new Result(ResultCode.SUCCESS, jsonArray);
     }
 
 

huimv-env-common/src/main/java/resources/com/huimv/env/admin/mapper/EnergyElectricityMapper.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.env.common.mapper.EnergyElectricityMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.env.common.entity.EnergyElectricity">
-        <id column="id" property="id" />
-        <result column="electricity_value" property="electricityValue" />
-        <result column="original_value" property="originalValue" />
-        <result column="original_date" property="originalDate" />
-        <result column="unit_id" property="unitId" />
-        <result column="farm_id" property="farmId" />
-        <result column="other1" property="other1" />
-        <result column="other2" property="other2" />
-        <result column="other3" property="other3" />
-        <result column="create_date" property="createDate"/>
-    </resultMap>
-
-    <select id="listCount" resultType="com.huimv.env.common.entity.dto.EnergyDto">
-        select Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'count',create_date 'createDate',unit_id 'unitId',farm_id 'farmId'
-        from energy_electricity
-        ${ew.customSqlSegment}
-        GROUP BY unit_id
-        ORDER BY unit_id ASC
-    </select>
-</mapper>

huimv-env-common/src/main/java/resources/com/huimv/env/admin/mapper/EnergyWaterMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.env.common.mapper.EnergyWaterMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.env.common.entity.EnergyWater">
-        <id column="id" property="id" />
-        <result column="water_value" property="waterValue" />
-        <result column="original_value" property="originalValue" />
-        <result column="original_date" property="originalDate" />
-        <result column="unit_id" property="unitId" />
-        <result column="farm_id" property="farmId" />
-        <result column="other1" property="other1" />
-        <result column="other2" property="other2" />
-        <result column="other3" property="other3" />
-        <result column="create_date" property="createDate"/>
-    </resultMap>
-
-    <select id="listCount" resultType="com.huimv.env.common.entity.dto.EnergyDto">
-        select Convert((IFNUll(sum(w.water_value),'0')),DECIMAL(10,2)) 'waterCount',Convert((IFNUll(sum(e.electricity_value),'0')),DECIMAL(10,2)) 'electricityCount',
-        w.create_date 'createDate',w.unit_id 'unitId',w.farm_id 'farmId'
-        from energy_water w inner join energy_electricity e on w.unit_id=e.unit_id
-        ${ew.customSqlSegment}
-        GROUP BY w.unit_id
-        ORDER BY w.unit_id ASC
-    </select>
-</mapper>

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

@@ -13,7 +13,13 @@
         <result column="other1" property="other1" />
         <result column="other2" property="other2" />
         <result column="other3" property="other3" />
-        <result column="create_date" property="createDate" />
+        <result column="create_date" property="createDate"/>
     </resultMap>
 
+    <select id="listCount" resultType="com.huimv.env.common.entity.dto.EnergyDto">
+        select Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'electricityCount'
+        from energy_electricity
+        ${ew.customSqlSegment}
+
+    </select>
 </mapper>

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

@@ -13,7 +13,12 @@
         <result column="other1" property="other1" />
         <result column="other2" property="other2" />
         <result column="other3" property="other3" />
-        <result column="create_date" property="createDate" />
+        <result column="create_date" property="createDate"/>
     </resultMap>
-
+<!--    &#45;&#45;         w.create_date 'createDate',-->
+    <select id="listCount" resultType="com.huimv.env.common.entity.dto.EnergyDto">
+        select Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'waterCount'
+        from energy_water
+        ${ew.customSqlSegment}
+    </select>
 </mapper>