diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendOne.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendOne.java deleted file mode 100644 index c626996c8..000000000 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendOne.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.zhgd.xmgl.base.entity.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * 单列图表y轴 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class MultiTrendOne { - @ApiModelProperty("名称") - private String name; - @ApiModelProperty("数值") - private List data; - - -} diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendVo.java deleted file mode 100644 index b3775e9f2..000000000 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendVo.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.zhgd.xmgl.base.entity.vo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * 多列图表带总数 - */ -@Data -public class MultiTrendVo { - @ApiModelProperty("x轴") - private List x; - @ApiModelProperty("y轴数据") - List data; - @ApiModelProperty("总数") - @JsonInclude(JsonInclude.Include.NON_NULL) - private String count; - - /** - * @param dataList 数据list - * @param allList x的list - * @return - */ - public static List fillData(List dataList, List allList) { - ArrayList list = new ArrayList<>(); - Map map = dataList.stream().collect(Collectors.toMap(trendVo -> trendVo.getX(), Function.identity(), (o, o2) -> o)); - for (String s : allList) { - TrendVo vo = map.get(s); - if (vo != null) { - list.add(vo.getY()); - } else { - list.add("0"); - } - } - return list; - } -} diff --git a/src/main/java/com/zhgd/xmgl/modules/ammeter/service/impl/AmmeterRecordDetailServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/ammeter/service/impl/AmmeterRecordDetailServiceImpl.java index 04d69653c..bad014a6e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/ammeter/service/impl/AmmeterRecordDetailServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/ammeter/service/impl/AmmeterRecordDetailServiceImpl.java @@ -148,7 +148,7 @@ public class AmmeterRecordDetailServiceImpl extends ServiceImpl ammeterRecordDetails = baseMapper.queryUseRecord(map); - List days = DateUtils.getDateStrList(60, "yyyy-MM-dd"); + List days = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); List list = ammeterRecordDetails.stream().map(detail -> { TrendVo vo = new TrendVo(); vo.setY(detail.getDegree() + ""); @@ -174,7 +174,7 @@ public class AmmeterRecordDetailServiceImpl extends ServiceImpl ammeterMonthRecords = ammeterMonthRecordMapper.selectList(new LambdaQueryWrapper() .eq(AmmeterMonthRecord::getAmmeterNo, ammeterNo) .eq(AmmeterMonthRecord::getProjectSn, projectSn)); - List dateStrList = DateUtils.getDateStrList(90, "yyyy-MM"); + List dateStrList = DateUtils.getDateTimeStrList(90, "yyyy-MM"); List list = ammeterMonthRecords.stream().map(detail -> { TrendVo vo = new TrendVo(); vo.setY(detail.getUseDegree() + ""); @@ -188,7 +188,7 @@ public class AmmeterRecordDetailServiceImpl extends ServiceImpl ammeterMonthRecords = ammeterMonthRecordMapper.selectList(new LambdaQueryWrapper() .eq(AmmeterMonthRecord::getAmmeterNo, ammeterNo) .eq(AmmeterMonthRecord::getProjectSn, projectSn)); - List dateStrList = DateUtils.getDateStrList(93, "yyyy-MM"); + List dateStrList = DateUtils.getDateTimeStrList(93, "yyyy-MM"); List list = ammeterMonthRecords.stream().map(detail -> { TrendVo vo = new TrendVo(); vo.setY(detail.getUseDegree() + ""); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneAlarmServiceImpl.java index 60d1fde9f..b553e4795 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneAlarmServiceImpl.java @@ -99,7 +99,7 @@ public class GantryCraneAlarmServiceImpl extends ServiceImpl list = baseMapper.countGantryCraneAlarmWindSpeed(map); - List days = DateUtils.getDateStrList(60, "yyyy-MM-dd"); + List days = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); return TrendVo.fillTrendVos(list, days, "MM-dd"); } return null; diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneWorkCycleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneWorkCycleServiceImpl.java index 0b3726852..3a1179afd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneWorkCycleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/GantryCraneWorkCycleServiceImpl.java @@ -12,7 +12,6 @@ import com.zhgd.xmgl.modules.bigdevice.entity.GantryCraneWorkCycle; import com.zhgd.xmgl.modules.bigdevice.entity.vo.CountGantryCraneWorkCycleVo; import com.zhgd.xmgl.modules.bigdevice.mapper.GantryCraneMapper; import com.zhgd.xmgl.modules.bigdevice.mapper.GantryCraneWorkCycleMapper; -import com.zhgd.xmgl.modules.bigdevice.service.IBigDeviceDiscloseRecordService; import com.zhgd.xmgl.modules.bigdevice.service.IGantryCraneWorkCycleService; import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.MessageUtil; @@ -69,7 +68,7 @@ public class GantryCraneWorkCycleServiceImpl extends ServiceImpl trendVos = gantryCraneWorkCycleMapper.countGantryCraneWorkCycleNumEveryday(map); List days; if (Objects.equals(MapUtils.getInteger(map, "type"), 1)) { - days = DateUtils.getDateStrList(72, "yyyy-MM-dd"); + days = DateUtils.getDateTimeStrList(72, "yyyy-MM-dd"); } else if (Objects.equals(MapUtils.getInteger(map, "type"), 2)) { days = DateUtils.getDaysBefore(50); } else { @@ -88,9 +87,9 @@ public class GantryCraneWorkCycleServiceImpl extends ServiceImpl trendVos = gantryCraneWorkCycleMapper.workTimeAnalysis(paramMap); List days; if (Objects.equals(MapUtils.getInteger(paramMap, "type"), 1)) { - days = DateUtils.getDateStrList(60, "yyyy-MM-dd"); + days = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); } else if (Objects.equals(MapUtils.getInteger(paramMap, "type"), 2)) { - days = DateUtils.getDateStrList(400, "yyyy-MM-dd"); + days = DateUtils.getDateTimeStrList(400, "yyyy-MM-dd"); } else { return null; } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java index 94121ad89..fd8952fe5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java @@ -386,7 +386,7 @@ public class CarPassRecordServiceImpl extends ServiceImpl todayOutInNumbers) { Map map = todayOutInNumbers.stream().collect(Collectors.toMap(TodayOutInNumber::getPassTime, Function.identity())); todayOutInNumbers.clear(); - for (String h : DateUtils.getDateStrList(100, "HH:mm")) { + for (String h : DateUtils.getDateTimeStrList(100, "HH:mm")) { TodayOutInNumber toi = map.get(h); if (toi == null) { toi = new TodayOutInNumber(); diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java index 7f98735ac..a1d379d6b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java @@ -527,7 +527,7 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl fillData(List monthStatics) { List rtVos = new ArrayList<>(); Map map = monthStatics.stream().collect(Collectors.toMap(e -> e.getDay(), e -> e, (o, o2) -> o)); - for (String orderDay : DateUtils.getDateStrList(80, "yyyy-MM-dd")) { + for (String orderDay : DateUtils.getDateTimeStrList(80, "yyyy-MM-dd")) { DangerInspectionPassMonthStaticsVo vo = map.get(orderDay); if (vo == null) { vo = new DangerInspectionPassMonthStaticsVo(); diff --git a/src/main/java/com/zhgd/xmgl/modules/electrical/service/impl/ElectricalDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/electrical/service/impl/ElectricalDataServiceImpl.java index 0275c3b66..0dbbc724a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/electrical/service/impl/ElectricalDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/electrical/service/impl/ElectricalDataServiceImpl.java @@ -100,7 +100,7 @@ public class ElectricalDataServiceImpl extends ServiceImpl electricalDataList) { Map dataMap = electricalDataList.stream().collect(Collectors.toMap(ElectricalData::getTime, Function.identity())); electricalDataList.clear(); - for (String hour : DateUtils.getDateStrList(20, "HH:00")) { + for (String hour : DateUtils.getDateTimeStrList(20, "HH:00")) { ElectricalData ed = dataMap.get(hour); if (ed == null) { ed = new ElectricalData(); diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java index 225bf9d5c..0bc3a8a86 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java @@ -205,7 +205,7 @@ public class DustNoiseDataServiceImpl extends ServiceImpl dustNoiseDatas) { Map dataMap = dustNoiseDatas.stream().collect(Collectors.toMap(DustNoiseData::getTime, Function.identity())); dustNoiseDatas.clear(); - for (String hour : DateUtils.getDateStrList(100, "HH:mm")) { + for (String hour : DateUtils.getDateTimeStrList(100, "HH:mm")) { DustNoiseData dnd = dataMap.get(hour); if (dnd == null) { dnd = new DustNoiseData(); diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java index 9498814fe..e7dd4dc18 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java @@ -759,10 +759,10 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl dayList = new ArrayList<>(); if (dateType == 2) { //查询近一月所有天数 - dayList = DateUtils.getDateStrList(80, "yyyy-MM-dd"); + dayList = DateUtils.getDateTimeStrList(80, "yyyy-MM-dd"); } else { //查询近一周所有天数 - dayList = DateUtils.getDateStrList(60, "yyyy-MM-dd"); + dayList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); } List> list = companyService.selectComapnyOrProjectList(map); if (list != null && list.size() > 0) { diff --git a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTagLowVoltageAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTagLowVoltageAlarmServiceImpl.java index 60bc9a1a2..7051c61c5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTagLowVoltageAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTagLowVoltageAlarmServiceImpl.java @@ -40,7 +40,7 @@ public class LocationTagLowVoltageAlarmServiceImpl extends ServiceImpl countLocationTagLowVoltageAlarmEveryDay(HashMap paramMap) { List list = baseMapper.countLocationTagLowVoltageAlarmEveryDay(paramMap); - List days = DateUtils.getDateStrList(60, "yyyy-MM-dd"); + List days = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); List trendVos = TrendVo.fillTrendVos(list, days, "MM-dd"); return trendVos; } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java index 426fe1655..5995abec7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java @@ -120,7 +120,7 @@ public class RtToolServiceImpl extends ServiceImpl impleme dimensions.add("当日出库量"); flexibleBigScreenVo.setDimensions(dimensions); flexibleBigScreenVo.setSource(source); - List strList = DateUtils.getDateStrList(60, "yyyy-MM-dd"); + List strList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); FlexibleBigScreenVo.fillTrendVos(flexibleBigScreenVo, strList, "MM-dd"); return flexibleBigScreenVo; } diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldMaintainDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldMaintainDataServiceImpl.java index 9dbe11ded..c53d3e4ab 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldMaintainDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldMaintainDataServiceImpl.java @@ -92,7 +92,7 @@ public class SmartBeamFieldMaintainDataServiceImpl extends ServiceImpl strList = DateUtils.getDateStrList(100, "HH:00"); + List strList = DateUtils.getDateTimeStrList(100, "HH:00"); FlexibleBigScreenVo.fillTrendVos(flexibleBigScreenVo, strList, "HH:00"); return flexibleBigScreenVo; } diff --git a/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java index c29b6598e..82cb3013a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutDataServiceImpl.java @@ -100,7 +100,7 @@ public class SmartGroutDataServiceImpl extends ServiceImpl strList = DateUtils.getDateStrList(500, "yyyy-MM"); + List strList = DateUtils.getDateTimeStrList(500, "yyyy-MM"); FlexibleBigScreenVo.fillTrendVos(flexibleBigScreenVo, strList, "月份M"); return flexibleBigScreenVo; } diff --git a/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutSteelBeamDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutSteelBeamDataServiceImpl.java index a6157549b..4724b879d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutSteelBeamDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutSteelBeamDataServiceImpl.java @@ -3,11 +3,9 @@ package com.zhgd.xmgl.modules.smartgrout.service.impl; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.TypeReference; import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; -import com.zhgd.xmgl.modules.smartgrout.entity.SmartGroutData; import com.zhgd.xmgl.modules.smartgrout.entity.SmartGroutSteelBeamData; import com.zhgd.xmgl.modules.smartgrout.mapper.SmartGroutSteelBeamDataMapper; import com.zhgd.xmgl.modules.smartgrout.service.ISmartGroutSteelBeamDataService; -import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionSteelBeamData; import com.zhgd.xmgl.util.DateUtils; import org.apache.commons.collections.MapUtils; import org.springframework.stereotype.Service; @@ -62,7 +60,7 @@ public class SmartGroutSteelBeamDataServiceImpl extends ServiceImpl strList = DateUtils.getDateStrList(500, "yyyy-MM"); + List strList = DateUtils.getDateTimeStrList(500, "yyyy-MM"); FlexibleBigScreenVo.fillTrendVos(flexibleBigScreenVo, strList, "月份M"); return flexibleBigScreenVo; } diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java index a1e656919..0761311fa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java @@ -108,7 +108,7 @@ public class SmartTensionDataServiceImpl extends ServiceImpl strList = DateUtils.getDateStrList(500, "yyyy-MM"); + List strList = DateUtils.getDateTimeStrList(500, "yyyy-MM"); FlexibleBigScreenVo.fillTrendVos(flexibleBigScreenVo, strList, "月份M"); return flexibleBigScreenVo; } diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionSteelBeamDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionSteelBeamDataServiceImpl.java index b3f9030b3..5b389912e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionSteelBeamDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionSteelBeamDataServiceImpl.java @@ -60,7 +60,7 @@ public class SmartTensionSteelBeamDataServiceImpl extends ServiceImpl strList = DateUtils.getDateStrList(500, "yyyy-MM"); + List strList = DateUtils.getDateTimeStrList(500, "yyyy-MM"); FlexibleBigScreenVo.fillTrendVos(flexibleBigScreenVo, strList, "月份M"); return flexibleBigScreenVo; } diff --git a/src/main/java/com/zhgd/xmgl/modules/standard/controller/StandardCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/standard/controller/StandardCurrentDataController.java index cacc417e8..1ebcfb65e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/standard/controller/StandardCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/standard/controller/StandardCurrentDataController.java @@ -6,8 +6,8 @@ import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.standard.entity.StandardCurrentData; +import com.zhgd.xmgl.modules.standard.entity.StandardCurrentDataExt; import com.zhgd.xmgl.modules.standard.service.IStandardCurrentDataService; -import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -133,7 +133,7 @@ public class StandardCurrentDataController { @ApiImplicitParam(name = "devSn", value = "标养室设备唯一标识", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/selectNewCurrentData") - public Result selectNewCurrentData(@RequestBody Map map) { + public Result selectNewCurrentData(@RequestBody @ApiIgnore Map map) { return Result.success(standardCurrentDataService.selectNewCurrentData(map)); } @@ -143,7 +143,7 @@ public class StandardCurrentDataController { @ApiImplicitParam(name = "devSn", value = "标养室设备唯一标识", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/selectDayCurrentDataList") - public Result> selectDayCurrentDataList(@RequestBody Map map) { + public Result> selectDayCurrentDataList(@RequestBody @ApiIgnore Map map) { return Result.success(standardCurrentDataService.selectDayCurrentDataList(map)); } @@ -154,7 +154,7 @@ public class StandardCurrentDataController { @ApiImplicitParam(name = "devSn", value = "标养室设备唯一标识", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/selectStandardCurrentDataList") - public Result> selectStandardCurrentDataList(@RequestBody Map map) { + public Result> selectStandardCurrentDataList(@RequestBody @ApiIgnore Map map) { return Result.success(standardCurrentDataService.selectStandardCurrentDataList(map)); } @@ -185,8 +185,20 @@ public class StandardCurrentDataController { @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/selectStandardAnalysisReport") - public Result> selectStandardAnalysisReport(@RequestBody Map map) { + public Result> selectStandardAnalysisReport(@RequestBody @ApiIgnore Map map) { return Result.success(standardCurrentDataService.selectStandardAnalysisReport(map)); } + @ApiOperation(value = "统计实时数据", notes = "统计实时数据", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "标养室设备唯一标识", dataType = "String", paramType = "body", required = false), + @ApiImplicitParam(name = "type", value = "查询类型，1过去24小时 ", dataType = "Integer", paramType = "body", required = true), + }) + @PostMapping(value = "/countStandardCurrentData") + public Result> countStandardCurrentData(@RequestBody @ApiIgnore Map map) { + return Result.success(standardCurrentDataService.countStandardCurrentData(map)); + } + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardCurrentData.java index 99f289238..67c652d54 100644 --- a/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardCurrentData.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.standard.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -22,7 +23,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(value="StandardCurrentData实体类",description="StandardCurrentData") public class StandardCurrentData implements Serializable { private static final long serialVersionUID = 1L; - + /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="id") diff --git a/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardCurrentDataExt.java b/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardCurrentDataExt.java new file mode 100644 index 000000000..d20731736 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/standard/entity/StandardCurrentDataExt.java @@ -0,0 +1,12 @@ +package com.zhgd.xmgl.modules.standard.entity; + +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@JsonInclude(value = JsonInclude.Include.NON_NULL) +public class StandardCurrentDataExt extends StandardCurrentData { + @ApiModelProperty("时间") + private String time; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/standard/mapper/StandardCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/standard/mapper/StandardCurrentDataMapper.java index 0e47f47b3..837472055 100644 --- a/src/main/java/com/zhgd/xmgl/modules/standard/mapper/StandardCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/standard/mapper/StandardCurrentDataMapper.java @@ -5,6 +5,7 @@ import java.util.Map; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.standard.entity.StandardCurrentDataExt; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.standard.entity.StandardCurrentData; @@ -29,11 +30,13 @@ public interface StandardCurrentDataMapper extends BaseMapper map); - List queryStandardCurrentDataPageList(Page page, @Param("param")Map map); + List queryStandardCurrentDataPageList(Page page, @Param("param") Map map); List selectDownloadStandardCurrentDataList(Map map); List selectStandardCurrentDataTotalAlarmStateList(); List selectStandardAnalysisReport(Map map); + + List countStandardCurrentData(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/standard/mapper/xml/StandardCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/standard/mapper/xml/StandardCurrentDataMapper.xml index 6d74ca4bf..efdb2fd33 100644 --- a/src/main/java/com/zhgd/xmgl/modules/standard/mapper/xml/StandardCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/standard/mapper/xml/StandardCurrentDataMapper.xml @@ -100,15 +100,31 @@ and receive_time>=CONCAT(DATE_ADD(curdate(),interval -day(curdate())+1 day),' 00:00:00') - + AND receive_time >=CONCAT(DATE_FORMAT(#{startTime},'%Y-%m-%d'),' 00:00:00') - + AND receive_time <=CONCAT(DATE_FORMAT(#{endTime},'%Y-%m-%d'),' 23:59:59') GROUP BY day_title ORDER BY day_title - - \ No newline at end of file + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/standard/service/IStandardCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/standard/service/IStandardCurrentDataService.java index 6d07798ae..b9cce567e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/standard/service/IStandardCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/standard/service/IStandardCurrentDataService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.standard.entity.StandardCurrentData; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.standard.entity.StandardCurrentDataExt; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -33,4 +34,6 @@ public interface IStandardCurrentDataService extends IService selectStandardAnalysisReport(Map map); void saveStandardCurrentData(JSONObject json); + + List countStandardCurrentData(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/standard/service/impl/StandardCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/standard/service/impl/StandardCurrentDataServiceImpl.java index 3114286ac..e43d8443d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/standard/service/impl/StandardCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/standard/service/impl/StandardCurrentDataServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.standard.service.impl; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,11 +10,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.standard.entity.StandardCurrentData; +import com.zhgd.xmgl.modules.standard.entity.StandardCurrentDataExt; import com.zhgd.xmgl.modules.standard.entity.StandardDev; import com.zhgd.xmgl.modules.standard.mapper.StandardCurrentDataMapper; import com.zhgd.xmgl.modules.standard.mapper.StandardDevMapper; import com.zhgd.xmgl.modules.standard.service.IStandardAlarmService; import com.zhgd.xmgl.modules.standard.service.IStandardCurrentDataService; +import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.JxlExcelUtils; import com.zhgd.xmgl.util.MessageUtil; import org.apache.commons.lang3.StringUtils; @@ -24,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -145,7 +149,7 @@ public class StandardCurrentDataServiceImpl extends ServiceImpl countStandardCurrentData(Map map) { + List standardCurrentDataExts = baseMapper.countStandardCurrentData(map); + List dateStrList = DateUtils.getDateTimeStrList(20, "yyyy-MM-dd HH:00:00"); + List rtList = new ArrayList<>(); + Map m = standardCurrentDataExts.stream().collect(Collectors.toMap(StandardCurrentDataExt::getTime, Function.identity())); + for (String date : dateStrList) { + StandardCurrentDataExt e = m.get(date); + if (e == null) { + e = new StandardCurrentDataExt(); + e.setTime(date); + e.setHumidity("0"); + e.setTemperature("0"); + } + e.setTime(DateUtil.format(DateUtil.parse(e.getTime()), "HH:00")); + rtList.add(e); + } + return rtList; + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java index 3957f7342..02cf1f320 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.async.AsyncAiAnalyse; import com.zhgd.xmgl.base.entity.vo.SectorOneVo; import com.zhgd.xmgl.base.entity.vo.SectorVo; @@ -145,9 +144,9 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl> dataList = new ArrayList<>(); Map data = aiAnalyseHardWareAlarmRecordMapper.selectAiAnalyseHardWareAlarmTrendList(map); diff --git a/src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterMonthRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterMonthRecordServiceImpl.java index 8cc561389..adc119e9a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterMonthRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterMonthRecordServiceImpl.java @@ -98,7 +98,7 @@ public class WaterMeterMonthRecordServiceImpl extends ServiceImpl alarmList) { Map map = alarmList.stream().collect(Collectors.toMap(e -> e.getTitleTime(), Function.identity())); alarmList.clear(); - for (String date : DateUtils.getDateStrList(80, "yyyy-MM-dd")) { + for (String date : DateUtils.getDateTimeStrList(80, "yyyy-MM-dd")) { WaterMeterStatisticsVo.Alarm alarm = map.get(date); if (alarm == null) { alarm = new WaterMeterStatisticsVo.Alarm(); diff --git a/src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterRecordDetailServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterRecordDetailServiceImpl.java index e6fee906a..e788c6986 100644 --- a/src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterRecordDetailServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/water/service/impl/WaterMeterRecordDetailServiceImpl.java @@ -95,7 +95,7 @@ public class WaterMeterRecordDetailServiceImpl extends ServiceImpl list = baseMapper.queryUseRecordTrend(map); - List days = DateUtils.getDateStrList(60, "yyyy-MM-dd"); + List days = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); return TrendVo.fillTrendVos(list, days, "MM-dd"); } else if (Objects.equals(type, 2)) { //本月 @@ -107,13 +107,13 @@ public class WaterMeterRecordDetailServiceImpl extends ServiceImpl list = waterMeterMonthRecordMapper.queryUseRecord(map); - List dateStrList = DateUtils.getDateStrList(90, "yyyy-MM"); + List dateStrList = DateUtils.getDateTimeStrList(90, "yyyy-MM"); return TrendVo.fillTrendVos(list, dateStrList, "yyyy-MM"); } else if (Objects.equals(type, 4)) { //近一年 map.put("addTime_begin", DateUtils.offsetDayStr(DateUtil.now(), -12)); List list = waterMeterMonthRecordMapper.queryUseRecord(map); - List dateStrList = DateUtils.getDateStrList(93, "yyyy-MM"); + List dateStrList = DateUtils.getDateTimeStrList(93, "yyyy-MM"); return TrendVo.fillTrendVos(list, dateStrList, "yyyy-MM"); } return trendVos; diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java index 7c93ac4e8..a3969d8e8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java @@ -1012,7 +1012,7 @@ status 状态码 String 1表示成功；其余表示失败 return workerAttendance; }).collect(Collectors.groupingBy(WorkerAttendance::getCreateTimeHour)); ArrayList rtList = new ArrayList<>(); - List allHourInDay = DateUtils.getDateStrList(100, "HH:mm"); + List allHourInDay = DateUtils.getDateTimeStrList(100, "HH:mm"); int lastNum = 0; for (String hour : allHourInDay) { List workerAttendances = timeDateListMap.get(hour); diff --git a/src/main/java/com/zhgd/xmgl/util/DateUtils.java b/src/main/java/com/zhgd/xmgl/util/DateUtils.java index 07471148c..ce9b2ee2a 100644 --- a/src/main/java/com/zhgd/xmgl/util/DateUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/DateUtils.java @@ -328,7 +328,7 @@ public class DateUtils { } return list; } else if (type == 2) { - return getDateStrList(60, "yyyy-MM-dd"); + return getDateTimeStrList(60, "yyyy-MM-dd"); } else if (type == 3) { return getNowMonthAllDayList(); } @@ -441,7 +441,7 @@ public class DateUtils { } /** - * 获取所有日期列表 + * 获取所有日期时间列表 * * @param type 类型： * 10.近12小时,20.近24小时（每小时）,30.近半天,40.近一天,50.近两天,60.近一周（每天）,70.近两周,72.近15天（每天）,80.近一个月（每天）,90.近半年（每月）,93.近一年（每月） @@ -449,7 +449,7 @@ public class DateUtils { * @param pattern 格式 如：yyyy-MM-dd HH:mm:ss * @return */ - public static List getDateStrList(int type, String pattern) { + public static List getDateTimeStrList(int type, String pattern) { if (type == 20) { //近24小时（每小时），eg：HH:00 ArrayList rtList = new ArrayList<>(); @@ -559,6 +559,6 @@ public class DateUtils { public static void main(String[] args) { System.out.println(getNowWeekAllDayList()); - System.out.println(getDateStrList(100, "HH:mm")); + System.out.println(getDateTimeStrList(100, "HH:mm")); } }