|
@@ -1,5 +1,7 @@
|
|
package com.huimv.guowei.admin.service.impl;
|
|
package com.huimv.guowei.admin.service.impl;
|
|
|
|
|
|
|
|
+import cn.hutool.core.date.DateTime;
|
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import com.alibaba.druid.util.StringUtils;
|
|
import com.alibaba.druid.util.StringUtils;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
@@ -9,14 +11,18 @@ import com.huimv.guowei.admin.common.utils.ResultCode;
|
|
import com.huimv.guowei.admin.entity.EnergyElectricity;
|
|
import com.huimv.guowei.admin.entity.EnergyElectricity;
|
|
import com.huimv.guowei.admin.entity.EnergyWater;
|
|
import com.huimv.guowei.admin.entity.EnergyWater;
|
|
import com.huimv.guowei.admin.entity.EnvDeviceChip;
|
|
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.entity.vo.WaterLineVo;
|
|
import com.huimv.guowei.admin.mapper.EnergyWaterMapper;
|
|
import com.huimv.guowei.admin.mapper.EnergyWaterMapper;
|
|
import com.huimv.guowei.admin.mapper.EnvDeviceChipMapper;
|
|
import com.huimv.guowei.admin.mapper.EnvDeviceChipMapper;
|
|
import com.huimv.guowei.admin.service.IEnergyWaterService;
|
|
import com.huimv.guowei.admin.service.IEnergyWaterService;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
+import com.huimv.guowei.admin.utils.Print;
|
|
|
|
+import org.apache.commons.lang.time.DateUtils;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.math.RoundingMode;
|
|
import java.math.RoundingMode;
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
@@ -26,7 +32,7 @@ import java.util.*;
|
|
|
|
|
|
/**
|
|
/**
|
|
* <p>
|
|
* <p>
|
|
- * 服务实现类
|
|
|
|
|
|
+ * 服务实现类
|
|
* </p>
|
|
* </p>
|
|
*
|
|
*
|
|
* @author author
|
|
* @author author
|
|
@@ -44,22 +50,22 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
|
|
String type = paramsMap.get("type");
|
|
String type = paramsMap.get("type");
|
|
String farmId = paramsMap.get("farmId");
|
|
String farmId = paramsMap.get("farmId");
|
|
String startDate = paramsMap.get("startDate");
|
|
String startDate = paramsMap.get("startDate");
|
|
- String endDate = paramsMap.get("endDate")+" 23:59:59";
|
|
|
|
|
|
+ String endDate = paramsMap.get("endDate") + " 23:59:59";
|
|
|
|
|
|
List<EnergyWater> energyWaterList = null;
|
|
List<EnergyWater> energyWaterList = null;
|
|
- if ("1".equals(type)){
|
|
|
|
|
|
+ if ("1".equals(type)) {
|
|
energyWaterList = energyWaterMapper.listDayDetail(farmId);
|
|
energyWaterList = energyWaterMapper.listDayDetail(farmId);
|
|
}
|
|
}
|
|
- if ("2".equals(type)){
|
|
|
|
|
|
+ if ("2".equals(type)) {
|
|
energyWaterList = energyWaterMapper.listWeekDetail(farmId);
|
|
energyWaterList = energyWaterMapper.listWeekDetail(farmId);
|
|
}
|
|
}
|
|
- if ("3".equals(type)){
|
|
|
|
|
|
+ if ("3".equals(type)) {
|
|
energyWaterList = energyWaterMapper.listMonthDetail(farmId);
|
|
energyWaterList = energyWaterMapper.listMonthDetail(farmId);
|
|
}
|
|
}
|
|
- if ("4".equals(type)){
|
|
|
|
- energyWaterList = energyWaterMapper.listCustomDetail(farmId,startDate,endDate);
|
|
|
|
|
|
+ if ("4".equals(type)) {
|
|
|
|
+ energyWaterList = energyWaterMapper.listCustomDetail(farmId, startDate, endDate);
|
|
}
|
|
}
|
|
- return new Result(ResultCode.SUCCESS,energyWaterList);
|
|
|
|
|
|
+ return new Result(ResultCode.SUCCESS, energyWaterList);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -67,16 +73,16 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
|
|
String farmId = paramsMap.get("farmId");
|
|
String farmId = paramsMap.get("farmId");
|
|
Map resultMap = new HashMap();
|
|
Map resultMap = new HashMap();
|
|
BigDecimal dayWater = energyWaterMapper.getDayWater(farmId);
|
|
BigDecimal dayWater = energyWaterMapper.getDayWater(farmId);
|
|
- if (dayWater == null){
|
|
|
|
|
|
+ if (dayWater == null) {
|
|
dayWater = BigDecimal.ZERO;
|
|
dayWater = BigDecimal.ZERO;
|
|
}
|
|
}
|
|
BigDecimal monthWater = energyWaterMapper.getMonthWater(farmId);
|
|
BigDecimal monthWater = energyWaterMapper.getMonthWater(farmId);
|
|
- if (monthWater == null){
|
|
|
|
|
|
+ if (monthWater == null) {
|
|
monthWater = BigDecimal.ZERO;
|
|
monthWater = BigDecimal.ZERO;
|
|
}
|
|
}
|
|
- resultMap.put("dayWater",dayWater);
|
|
|
|
- resultMap.put("MonthWater",monthWater);
|
|
|
|
- return new Result(ResultCode.SUCCESS,resultMap);
|
|
|
|
|
|
+ resultMap.put("dayWater", dayWater);
|
|
|
|
+ resultMap.put("MonthWater", monthWater);
|
|
|
|
+ return new Result(ResultCode.SUCCESS, resultMap);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -84,15 +90,15 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
|
|
String type = paramsMap.get("type");
|
|
String type = paramsMap.get("type");
|
|
String farmId = paramsMap.get("farmId");
|
|
String farmId = paramsMap.get("farmId");
|
|
String unitId = paramsMap.get("unitId");
|
|
String unitId = paramsMap.get("unitId");
|
|
- if (StringUtils.isEmpty(unitId)){
|
|
|
|
|
|
+ if (StringUtils.isEmpty(unitId)) {
|
|
unitId = "232";
|
|
unitId = "232";
|
|
}
|
|
}
|
|
String startDate = paramsMap.get("startDate");
|
|
String startDate = paramsMap.get("startDate");
|
|
- String endDate = paramsMap.get("endDate")+" 23:59:59";
|
|
|
|
|
|
+ String endDate = paramsMap.get("endDate") + " 23:59:59";
|
|
List<WaterLineVo> waterLineList = new ArrayList<>();
|
|
List<WaterLineVo> waterLineList = new ArrayList<>();
|
|
- List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("unit_id",unitId).eq("chip_type", 3));
|
|
|
|
- if (ObjectUtil.isEmpty(deviceChipList)){
|
|
|
|
- return new Result(ResultCode.SUCCESS,waterLineList);
|
|
|
|
|
|
+ List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("unit_id", unitId).eq("chip_type", 3));
|
|
|
|
+ if (ObjectUtil.isEmpty(deviceChipList)) {
|
|
|
|
+ return new Result(ResultCode.SUCCESS, waterLineList);
|
|
}
|
|
}
|
|
List<String> chipCodeList = new ArrayList<>();
|
|
List<String> chipCodeList = new ArrayList<>();
|
|
for (EnvDeviceChip envDeviceChip : deviceChipList) {
|
|
for (EnvDeviceChip envDeviceChip : deviceChipList) {
|
|
@@ -100,21 +106,21 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
|
|
}
|
|
}
|
|
String chipCodes = String.join(",", chipCodeList);
|
|
String chipCodes = String.join(",", chipCodeList);
|
|
|
|
|
|
- chipCodes = "("+chipCodes+")";
|
|
|
|
- if ("1".equals(type)){
|
|
|
|
- waterLineList = energyWaterMapper.listWaterLineDayDetail(farmId,chipCodeList,chipCodes);
|
|
|
|
|
|
+ chipCodes = "(" + chipCodes + ")";
|
|
|
|
+ if ("1".equals(type)) {
|
|
|
|
+ waterLineList = energyWaterMapper.listWaterLineDayDetail(farmId, chipCodeList, chipCodes);
|
|
}
|
|
}
|
|
- if ("2".equals(type)){
|
|
|
|
- waterLineList = energyWaterMapper.listWaterLineWeekDetail(farmId,chipCodeList,chipCodes);
|
|
|
|
|
|
+ if ("2".equals(type)) {
|
|
|
|
+ waterLineList = energyWaterMapper.listWaterLineWeekDetail(farmId, chipCodeList, chipCodes);
|
|
}
|
|
}
|
|
- if ("3".equals(type)){
|
|
|
|
- waterLineList = energyWaterMapper.listWaterLineMonthDetail(farmId,chipCodeList,chipCodes);
|
|
|
|
|
|
+ if ("3".equals(type)) {
|
|
|
|
+ waterLineList = energyWaterMapper.listWaterLineMonthDetail(farmId, chipCodeList, chipCodes);
|
|
}
|
|
}
|
|
- if ("4".equals(type)){
|
|
|
|
- waterLineList = energyWaterMapper.listWaterLineCustomDetail(farmId,chipCodeList,chipCodes,startDate,endDate);
|
|
|
|
|
|
+ if ("4".equals(type)) {
|
|
|
|
+ waterLineList = energyWaterMapper.listWaterLineCustomDetail(farmId, chipCodeList, chipCodes, startDate, endDate);
|
|
}
|
|
}
|
|
|
|
|
|
- return new Result(ResultCode.SUCCESS,waterLineList);
|
|
|
|
|
|
+ return new Result(ResultCode.SUCCESS, waterLineList);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -123,58 +129,58 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
|
|
String farmId = paramsMap.get("farmId");
|
|
String farmId = paramsMap.get("farmId");
|
|
Date timesmorning = DataUill.getTimesmorning();
|
|
Date timesmorning = DataUill.getTimesmorning();
|
|
Date timesMonthmorning = DataUill.getTimesMonthmorning();
|
|
Date timesMonthmorning = DataUill.getTimesMonthmorning();
|
|
- BigDecimal dayGap,monthGap;
|
|
|
|
|
|
+ BigDecimal dayGap, monthGap;
|
|
Map resultMap = new HashMap();
|
|
Map resultMap = new HashMap();
|
|
//今日
|
|
//今日
|
|
QueryWrapper<EnergyWater> queryWrapper1 = new QueryWrapper<>();
|
|
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).ge("create_date", timesmorning);
|
|
BigDecimal dayWater = energyWaterMapper.getWater(queryWrapper1);
|
|
BigDecimal dayWater = energyWaterMapper.getWater(queryWrapper1);
|
|
//昨日
|
|
//昨日
|
|
LocalDate yesterday = LocalDate.now().minusDays(1);
|
|
LocalDate yesterday = LocalDate.now().minusDays(1);
|
|
LocalDateTime startOfDay = yesterday.atStartOfDay();
|
|
LocalDateTime startOfDay = yesterday.atStartOfDay();
|
|
LocalDateTime endOfDay = yesterday.atTime(LocalTime.MAX);
|
|
LocalDateTime endOfDay = yesterday.atTime(LocalTime.MAX);
|
|
QueryWrapper<EnergyWater> queryWrapper2 = new QueryWrapper<>();
|
|
QueryWrapper<EnergyWater> queryWrapper2 = new QueryWrapper<>();
|
|
- queryWrapper2.eq("unit_id",unitId).eq("farm_id",farmId).between("create_date",startOfDay,endOfDay);
|
|
|
|
|
|
+ queryWrapper2.eq("unit_id", unitId).eq("farm_id", farmId).between("create_date", startOfDay, endOfDay);
|
|
BigDecimal lastDayWater = energyWaterMapper.getWater(queryWrapper2);
|
|
BigDecimal lastDayWater = energyWaterMapper.getWater(queryWrapper2);
|
|
|
|
|
|
System.out.println(lastDayWater);
|
|
System.out.println(lastDayWater);
|
|
//日环比
|
|
//日环比
|
|
- if (lastDayWater.toString().equals("0.0")){
|
|
|
|
|
|
+ if (lastDayWater.toString().equals("0.0")) {
|
|
dayGap = BigDecimal.valueOf(100);
|
|
dayGap = BigDecimal.valueOf(100);
|
|
- if (dayWater.toString().equals("0.0")){
|
|
|
|
|
|
+ if (dayWater.toString().equals("0.0")) {
|
|
dayGap = BigDecimal.valueOf(0);
|
|
dayGap = BigDecimal.valueOf(0);
|
|
}
|
|
}
|
|
- }else {
|
|
|
|
|
|
+ } else {
|
|
dayGap = dayWater.subtract(lastDayWater).divide(lastDayWater).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.UP);
|
|
dayGap = dayWater.subtract(lastDayWater).divide(lastDayWater).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.UP);
|
|
}
|
|
}
|
|
//本月
|
|
//本月
|
|
QueryWrapper<EnergyWater> queryWrapper3 = new QueryWrapper<>();
|
|
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).ge("create_date", timesMonthmorning);
|
|
BigDecimal monthWater = energyWaterMapper.getWater(queryWrapper3);
|
|
BigDecimal monthWater = energyWaterMapper.getWater(queryWrapper3);
|
|
//上月
|
|
//上月
|
|
Date lastMonthStartMorning = DataUill.getLastMonthStartMorning();
|
|
Date lastMonthStartMorning = DataUill.getLastMonthStartMorning();
|
|
Date lastMonthEndNight = DataUill.getLastMonthEndNight();
|
|
Date lastMonthEndNight = DataUill.getLastMonthEndNight();
|
|
QueryWrapper<EnergyWater> queryWrapper4 = new QueryWrapper<>();
|
|
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).between("create_date", lastMonthStartMorning, lastMonthEndNight);
|
|
BigDecimal lastMonthWater = energyWaterMapper.getWater(queryWrapper4);
|
|
BigDecimal lastMonthWater = energyWaterMapper.getWater(queryWrapper4);
|
|
//月环比
|
|
//月环比
|
|
- if (lastMonthWater.toString().equals("0.0")){
|
|
|
|
|
|
+ if (lastMonthWater.toString().equals("0.0")) {
|
|
monthGap = BigDecimal.valueOf(100);
|
|
monthGap = BigDecimal.valueOf(100);
|
|
- if (monthWater.toString().equals("0.0")){
|
|
|
|
|
|
+ if (monthWater.toString().equals("0.0")) {
|
|
monthGap = BigDecimal.valueOf(0);
|
|
monthGap = BigDecimal.valueOf(0);
|
|
}
|
|
}
|
|
- }else {
|
|
|
|
- monthGap = monthWater.subtract(lastMonthWater).divide(lastMonthWater,BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.UP);
|
|
|
|
- }
|
|
|
|
- int dayTrend =dayWater.compareTo(lastDayWater);
|
|
|
|
- int monthTrend =monthWater.compareTo(lastMonthWater);
|
|
|
|
- resultMap.put("dayWater",dayWater);
|
|
|
|
- resultMap.put("dayTrend",dayTrend);
|
|
|
|
- resultMap.put("dayWaterGap",dayGap+"%");
|
|
|
|
- resultMap.put("monthWater",monthWater);
|
|
|
|
- resultMap.put("monthTrend",monthTrend);
|
|
|
|
- resultMap.put("monthWaterGap",monthGap+"%");
|
|
|
|
- return new Result(ResultCode.SUCCESS,resultMap);
|
|
|
|
|
|
+ } else {
|
|
|
|
+ monthGap = monthWater.subtract(lastMonthWater).divide(lastMonthWater, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.UP);
|
|
|
|
+ }
|
|
|
|
+ int dayTrend = dayWater.compareTo(lastDayWater);
|
|
|
|
+ int monthTrend = monthWater.compareTo(lastMonthWater);
|
|
|
|
+ resultMap.put("dayWater", dayWater);
|
|
|
|
+ resultMap.put("dayTrend", dayTrend);
|
|
|
|
+ resultMap.put("dayWaterGap", dayGap + "%");
|
|
|
|
+ resultMap.put("monthWater", monthWater);
|
|
|
|
+ resultMap.put("monthTrend", monthTrend);
|
|
|
|
+ resultMap.put("monthWaterGap", monthGap + "%");
|
|
|
|
+ return new Result(ResultCode.SUCCESS, resultMap);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -183,9 +189,9 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
|
|
String type = paramsMap.get("type");
|
|
String type = paramsMap.get("type");
|
|
String unitId = paramsMap.get("unitId");
|
|
String unitId = paramsMap.get("unitId");
|
|
List<WaterLineVo> waterLineList = new ArrayList<>();
|
|
List<WaterLineVo> waterLineList = new ArrayList<>();
|
|
- List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("unit_id",unitId).eq("chip_type", 3));
|
|
|
|
- if (ObjectUtil.isEmpty(deviceChipList)){
|
|
|
|
- return new Result(ResultCode.SUCCESS,waterLineList);
|
|
|
|
|
|
+ List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("unit_id", unitId).eq("chip_type", 3));
|
|
|
|
+ if (ObjectUtil.isEmpty(deviceChipList)) {
|
|
|
|
+ return new Result(ResultCode.SUCCESS, waterLineList);
|
|
}
|
|
}
|
|
List<String> chipCodeList = new ArrayList<>();
|
|
List<String> chipCodeList = new ArrayList<>();
|
|
for (EnvDeviceChip envDeviceChip : deviceChipList) {
|
|
for (EnvDeviceChip envDeviceChip : deviceChipList) {
|
|
@@ -193,16 +199,16 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
|
|
}
|
|
}
|
|
String chipCodes = String.join(",", chipCodeList);
|
|
String chipCodes = String.join(",", chipCodeList);
|
|
|
|
|
|
- chipCodes = "("+chipCodes+")";
|
|
|
|
|
|
+ chipCodes = "(" + chipCodes + ")";
|
|
//六个月
|
|
//六个月
|
|
- if ("1".equals(type)){
|
|
|
|
- waterLineList = energyWaterMapper.listSixMonthWaterLine(farmId, chipCodeList,chipCodes);
|
|
|
|
|
|
+ if ("1".equals(type)) {
|
|
|
|
+ waterLineList = energyWaterMapper.listSixMonthWaterLine(farmId, chipCodeList, chipCodes);
|
|
}
|
|
}
|
|
//七天
|
|
//七天
|
|
else {
|
|
else {
|
|
- waterLineList = energyWaterMapper.listSevenDayWaterLine(farmId, chipCodeList,chipCodes);
|
|
|
|
|
|
+ waterLineList = energyWaterMapper.listSevenDayWaterLine(farmId, chipCodeList, chipCodes);
|
|
}
|
|
}
|
|
- return new Result(ResultCode.SUCCESS,waterLineList);
|
|
|
|
|
|
+ return new Result(ResultCode.SUCCESS, waterLineList);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -211,11 +217,51 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
|
|
String unitId = paramsMap.get("unitId");
|
|
String unitId = paramsMap.get("unitId");
|
|
String farmId = paramsMap.get("farmId");
|
|
String farmId = paramsMap.get("farmId");
|
|
List<EnergyWater> energyWaterList = new ArrayList<>();
|
|
List<EnergyWater> energyWaterList = new ArrayList<>();
|
|
- if ("1".equals(type)){
|
|
|
|
- energyWaterList = energyWaterMapper.listUnitDayDetail(farmId,unitId);
|
|
|
|
- }else {
|
|
|
|
- energyWaterList = energyWaterMapper.listUnitMonthDetail(farmId,unitId);
|
|
|
|
|
|
+ if ("1".equals(type)) {
|
|
|
|
+ energyWaterList = energyWaterMapper.listUnitDayDetail(farmId, unitId);
|
|
|
|
+ } else {
|
|
|
|
+ energyWaterList = energyWaterMapper.listUnitMonthDetail(farmId, unitId);
|
|
|
|
+ }
|
|
|
|
+ return new Result(ResultCode.SUCCESS, energyWaterList);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void printWater(HttpServletResponse response, Map<String, String> paramsMap) throws Exception {
|
|
|
|
+ String farmId = paramsMap.get("farmId");
|
|
|
|
+ String type = paramsMap.get("type");//选择要导出的类型
|
|
|
|
+ String startTime = paramsMap.get("startTime");
|
|
|
|
+ String endTime = paramsMap.get("endTime");
|
|
|
|
+
|
|
|
|
+ List<EnergyWaterVo> waterVos = new ArrayList<>();
|
|
|
|
+ //今日
|
|
|
|
+ QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ queryWrapper.eq("farm_id", farmId);
|
|
|
|
+ if (type.equals("1")) {
|
|
|
|
+ Date timesmorning = DataUill.getTimesmorning();
|
|
|
|
+ queryWrapper.ge("create_date", timesmorning);
|
|
|
|
+ waterVos = energyWaterMapper.printWater(queryWrapper);
|
|
|
|
+ }
|
|
|
|
+ //本周
|
|
|
|
+
|
|
|
|
+ if (type.equals("2")) {
|
|
|
|
+ DateTime dateTime = DateUtil.beginOfWeek(new Date());
|
|
|
|
+ queryWrapper.ge("create_date", dateTime);
|
|
|
|
+ waterVos = energyWaterMapper.printWater(queryWrapper);
|
|
|
|
+ }
|
|
|
|
+ //本月
|
|
|
|
+
|
|
|
|
+ if (type.equals("3")) {
|
|
|
|
+ Date timesMonthmorning = DataUill.getTimesMonthmorning();
|
|
|
|
+ queryWrapper.ge("create_date", timesMonthmorning);
|
|
|
|
+ waterVos = energyWaterMapper.printWater(queryWrapper);
|
|
|
|
+ }
|
|
|
|
+ //自定义
|
|
|
|
+
|
|
|
|
+ if (type.equals("4")) {
|
|
|
|
+ endTime = endTime + " 23:59:59";
|
|
|
|
+ queryWrapper.between("create_date", startTime, endTime);
|
|
|
|
+ waterVos = energyWaterMapper.printWater(queryWrapper);
|
|
}
|
|
}
|
|
- return new Result(ResultCode.SUCCESS,energyWaterList);
|
|
|
|
|
|
+ Print.printWater(waterVos);
|
|
}
|
|
}
|
|
}
|
|
}
|