diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java index 41d0e21d0..89bfe175d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java @@ -8,6 +8,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.car.entity.CarPassRecord; import com.zhgd.xmgl.modules.car.entity.vo.EntryAndExitRecordsTodayVo; +import com.zhgd.xmgl.modules.car.entity.vo.TodayOutInNumber; import com.zhgd.xmgl.modules.car.service.ICarCameraService; import com.zhgd.xmgl.modules.car.service.ICarPassRecordService; import com.zhgd.xmgl.util.yunboCarUtils; @@ -89,7 +90,7 @@ public class CarPassRecordController { @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String") }) @PostMapping(value = "selectCarPassRecordInOutCount") - public Result>> selectCarPassRecordInOutCount(@RequestBody Map map) { + public Result> selectCarPassRecordInOutCount(@RequestBody Map map) { return Result.success(carPassRecordService.selectCarPassRecordInOutCount(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/TodayOutInNumber.java b/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/TodayOutInNumber.java new file mode 100644 index 000000000..ab1c7cb72 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/TodayOutInNumber.java @@ -0,0 +1,12 @@ +package com.zhgd.xmgl.modules.car.entity.vo; + +import lombok.Data; + +@Data +public class TodayOutInNumber { + + private String passTime; + private Integer outnum; + private Integer innum; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java index e72668789..ade08e25b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java @@ -6,6 +6,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.car.entity.vo.EntryAndExitRecordsTodayVo; +import com.zhgd.xmgl.modules.car.entity.vo.TodayOutInNumber; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.car.entity.CarPassRecord; @@ -29,7 +30,7 @@ public interface CarPassRecordMapper extends BaseMapper { int getLsCarNumTotalByCameraId(Map map); - List> selectCarPassRecordInOutCount(Map map); + List selectCarPassRecordInOutCount(Map map); Map selectCarStatistics(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml index 58dcff158..817796575 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml @@ -60,13 +60,14 @@ and a.pass_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00') and b.id is null - + SELECT CONCAT(DATE_FORMAT( pass_time, "%H" ),':00') passTime, + IFNULL(SUM((CASE WHEN type = 1 THEN 1 ELSE 0 END)), 0) outnum, + IFNULL(SUM((CASE WHEN type = 0 THEN 1 ELSE 0 END)), 0) innum FROM car_pass_record WHERE project_sn = #{projectSn} - AND pass_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00') + AND pass_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00') GROUP BY DATE_FORMAT(pass_time, "%H") - select *,(case when round((UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(real_time))/60) <=10 then 1 else 2 end) is_closed + select *,(case when round((UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(real_time))/60) <=10 then 1 else 2 end) + is_closed from environment_dev where project_sn=#{projectSn} - - + select *,(case when round((UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(real_time))/60) <=10 then 1 else 0 end) + devOnline from environment_dev where project_sn=#{projectSn} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentDevService.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentDevService.java index dffaca4e1..7437419cd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentDevService.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.environment.service; import com.zhgd.xmgl.modules.environment.entity.EnvironmentDev; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentDevAlaramCountListVo; import java.util.List; import java.util.Map; @@ -32,5 +33,5 @@ public interface IEnvironmentDevService extends IService { Map selectProjectEnvironmentDevAndAlarmCount(Map map); - Map selectEnvironmentDevAlaramCountList(Map map); + EnvironmentDevAlaramCountListVo selectEnvironmentDevAlaramCountList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentDevServiceImpl.java index e24a142e7..b50aba410 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentDevServiceImpl.java @@ -3,12 +3,12 @@ package com.zhgd.xmgl.modules.environment.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.AsyncEnvironment; import com.zhgd.xmgl.modules.basicdata.service.ICompanyService; import com.zhgd.xmgl.modules.bigdevice.entity.BigDeviceVideo; import com.zhgd.xmgl.modules.bigdevice.mapper.BigDeviceVideoMapper; import com.zhgd.xmgl.modules.environment.entity.*; +import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentDevAlaramCountListVo; import com.zhgd.xmgl.modules.environment.mapper.*; import com.zhgd.xmgl.modules.environment.service.IEnvironmentDevService; import com.zhgd.xmgl.util.MessageUtil; @@ -24,7 +24,7 @@ import java.util.*; /** * @Description: 绿色扬尘设备 * @author： pds - * @date： 2020-09-27 + * @date： 2020-09-27 * @version： V1.0 */ @Service @@ -51,32 +51,32 @@ public class EnvironmentDevServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(EnvironmentDev::getDeviceId,environmentDev.getDeviceId()); - int count=environmentDevMapper.selectCount(queryWrapper); - if(count>0){ + } else { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(EnvironmentDev::getDeviceId, environmentDev.getDeviceId()); + int count = environmentDevMapper.selectCount(queryWrapper); + if (count > 0) { throw new OpenAlertException(MessageUtil.get("EquipmentNumExistErr")); } } environmentDev.setRealTime(new Date()); environmentDevMapper.insert(environmentDev); //设置项目扬尘设备报警阀值 - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(EnvironmentWarning::getProjectSn,"-1"); - List list=environmentWarningMapper.selectList(queryWrapper); - if(list!=null&&list.size()>0){ - for(EnvironmentWarning environmentWarning:list){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(EnvironmentWarning::getProjectSn, "-1"); + List list = environmentWarningMapper.selectList(queryWrapper); + if (list != null && list.size() > 0) { + for (EnvironmentWarning environmentWarning : list) { environmentWarning.setId(null); environmentWarning.setDeviceId(environmentDev.getDeviceId()); environmentWarning.setProjectSn(environmentDev.getProjectSn()); environmentWarningMapper.insert(environmentWarning); } } - if(environmentDev.getVideoList()!=null&&environmentDev.getVideoList().size()>0){ - for (BigDeviceVideo deviceVideo:environmentDev.getVideoList()){ + if (environmentDev.getVideoList() != null && environmentDev.getVideoList().size() > 0) { + for (BigDeviceVideo deviceVideo : environmentDev.getVideoList()) { deviceVideo.setProjectSn(environmentDev.getProjectSn()); deviceVideo.setType(5); deviceVideo.setDevSn(environmentDev.getDeviceId()); @@ -94,13 +94,13 @@ public class EnvironmentDevServiceImpl extends ServiceImpl queryWrapper2=new QueryWrapper<>(); - queryWrapper2.lambda().eq(BigDeviceVideo::getDevSn,environmentDev.getDeviceId()) - .eq(BigDeviceVideo::getProjectSn,environmentDev.getProjectSn()) - .eq(BigDeviceVideo::getType,5); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.lambda().eq(BigDeviceVideo::getDevSn, environmentDev.getDeviceId()) + .eq(BigDeviceVideo::getProjectSn, environmentDev.getProjectSn()) + .eq(BigDeviceVideo::getType, 5); bigDeviceVideoMapper.delete(queryWrapper2); - if(environmentDev.getVideoList()!=null&&environmentDev.getVideoList().size()>0){ - for (BigDeviceVideo deviceVideo:environmentDev.getVideoList()){ + if (environmentDev.getVideoList() != null && environmentDev.getVideoList().size() > 0) { + for (BigDeviceVideo deviceVideo : environmentDev.getVideoList()) { deviceVideo.setProjectSn(environmentDev.getProjectSn()); deviceVideo.setType(5); deviceVideo.setDevSn(environmentDev.getDeviceId()); @@ -111,10 +111,10 @@ public class EnvironmentDevServiceImpl extends ServiceImpl selectEnvironmentDevList(Map map) { - List list=environmentDevMapper.selectEnvironmentDevList(map); - if(list!=null&&list.size()>0){ - for (EnvironmentDev dev:list){ - List videoList=bigDeviceVideoMapper.selectBigDeviceVideoByTypeList(dev.getDeviceId(),5); + List list = environmentDevMapper.selectEnvironmentDevList(map); + if (list != null && list.size() > 0) { + for (EnvironmentDev dev : list) { + List videoList = bigDeviceVideoMapper.selectBigDeviceVideoByTypeList(dev.getDeviceId(), 5); dev.setVideoList(videoList); } } @@ -123,48 +123,48 @@ public class EnvironmentDevServiceImpl extends ServiceImpl selectEnvironmentDevStatistics(Map param) { - Map data=new HashMap<>(); - Map map=companyService.getCompanyType(param); - List> devList=environmentDevMapper.selectCompanyDevCountStatistics(map); - Map alarmTotal=environmentAlarmMapper.selectEnvironmentAlarmCountTotal(map); - List> alarmList=environmentAlarmMapper.selectCompanyEnvironmentAlarmList(map); - data.put("devList",devList); - data.put("alarmTotal",alarmTotal); - data.put("alarmList",alarmList); + Map data = new HashMap<>(); + Map map = companyService.getCompanyType(param); + List> devList = environmentDevMapper.selectCompanyDevCountStatistics(map); + Map alarmTotal = environmentAlarmMapper.selectEnvironmentAlarmCountTotal(map); + List> alarmList = environmentAlarmMapper.selectCompanyEnvironmentAlarmList(map); + data.put("devList", devList); + data.put("alarmTotal", alarmTotal); + data.put("alarmList", alarmList); return data; } @Override public Map selectCurrentDayEnvironmentDevStatistics(Map param) { - Map data=new HashMap<>(); - Map map=companyService.getCompanyType(param); - List> devList=environmentDevMapper.selectCompanyDevCountStatistics(map); - Map alarmTotal=environmentAlarmMapper.selectCurrentDayEnvironmentAlarmCountTotal(map); - data.put("devList",devList); - data.put("alarmTotal",alarmTotal); + Map data = new HashMap<>(); + Map map = companyService.getCompanyType(param); + List> devList = environmentDevMapper.selectCompanyDevCountStatistics(map); + Map alarmTotal = environmentAlarmMapper.selectCurrentDayEnvironmentAlarmCountTotal(map); + data.put("devList", devList); + data.put("alarmTotal", alarmTotal); return data; } @Override public void deleteProjectEnvironmentData(String projectSn) { //删除设备 - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(EnvironmentDev::getProjectSn,projectSn); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(EnvironmentDev::getProjectSn, projectSn); environmentDevMapper.delete(queryWrapper); //删除阀值 - QueryWrapper queryWrapper2=new QueryWrapper<>(); - queryWrapper2.lambda().eq(EnvironmentWarning::getProjectSn,projectSn); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.lambda().eq(EnvironmentWarning::getProjectSn, projectSn); environmentWarningMapper.delete(queryWrapper2); //删除报警记录 - QueryWrapper queryWrapper3=new QueryWrapper<>(); - queryWrapper3.lambda().eq(EnvironmentAlarm::getProjectSn,projectSn); + QueryWrapper queryWrapper3 = new QueryWrapper<>(); + queryWrapper3.lambda().eq(EnvironmentAlarm::getProjectSn, projectSn); environmentAlarmMapper.delete(queryWrapper3); //删除环境实时数据 - QueryWrapper queryWrapper4=new QueryWrapper<>(); - queryWrapper4.lambda().eq(DustNoiseData::getProjectSn,projectSn); + QueryWrapper queryWrapper4 = new QueryWrapper<>(); + queryWrapper4.lambda().eq(DustNoiseData::getProjectSn, projectSn); dustNoiseDataMapper.delete(queryWrapper4); - QueryWrapper queryWrapper5=new QueryWrapper<>(); - queryWrapper5.lambda().eq(DustNoiseHistoryData::getProjectSn,projectSn); + QueryWrapper queryWrapper5 = new QueryWrapper<>(); + queryWrapper5.lambda().eq(DustNoiseHistoryData::getProjectSn, projectSn); dustNoiseHistoryDataMapper.delete(queryWrapper5); } @@ -176,56 +176,57 @@ public class EnvironmentDevServiceImpl extends ServiceImpl selectTotalEnvironmentCountStatistics(Map param) { - Map data=new HashMap<>(); - Map map=companyService.getCompanyType(param); + Map data = new HashMap<>(); + Map map = companyService.getCompanyType(param); //统计扬尘设备 - Map environmentDevCount=environmentDevMapper.selectEnvironmentDevCount(map); - param.put("selectType","1"); - Map alarmTotal=environmentAlarmMapper.selectEnvironmentAlarmCountTotal(map); - data.put("devTotal",environmentDevCount); - data.put("alarmTotal",alarmTotal); + Map environmentDevCount = environmentDevMapper.selectEnvironmentDevCount(map); + param.put("selectType", "1"); + Map alarmTotal = environmentAlarmMapper.selectEnvironmentAlarmCountTotal(map); + data.put("devTotal", environmentDevCount); + data.put("alarmTotal", alarmTotal); return data; } @Override public Map selectProjectEnvironmentDevAndAlarmCount(Map map) { - Map data=new HashMap<>(); - Map devCount=environmentDevMapper.selectProjectEnvironmentDevCount(map); - Map alarmCount=environmentAlarmMapper.selectTodayEnvironmentAlarmCount(map); - data.put("devTotal",devCount); - data.put("alarmTotal",alarmCount); + Map data = new HashMap<>(); + Map devCount = environmentDevMapper.selectProjectEnvironmentDevCount(map); + Map alarmCount = environmentAlarmMapper.selectTodayEnvironmentAlarmCount(map); + data.put("devTotal", devCount); + data.put("alarmTotal", alarmCount); return data; } @Override - public Map selectEnvironmentDevAlaramCountList(Map map) { - Map data=new HashMap<>(); - List devList=environmentDevMapper.selectProjectEnvironmentDevList(map); - int totalDevOnlineNum=0; - int totalAlarmNum=0; - if(devList!=null&&devList.size()>0){ + public EnvironmentDevAlaramCountListVo selectEnvironmentDevAlaramCountList(Map map) { + List devList = environmentDevMapper.selectProjectEnvironmentDevList(map); + int totalDevOnlineNum = 0; + int totalAlarmNum = 0; + if (devList != null && devList.size() > 0) { //查询报警数 - List> alarmList=environmentAlarmMapper.selectEnvironmentDevTodayAlarmCount(map); - for(EntityMap dev:devList){ - if("1".equals(MapUtils.getString(dev,"devonline"))){ + List> alarmList = environmentAlarmMapper.selectEnvironmentDevTodayAlarmCount(map); + for (EnvironmentDev dev : devList) { + if ("1".equals(dev.getDevOnline())) { totalDevOnlineNum++; } //取出报警次数 - Integer alarmNum=0; - if(alarmList!=null&&alarmList.size()>0){ - for(Map count:alarmList){ - if(MapUtils.getString(dev,"deviceId").equals(MapUtils.getString(count,"deviceId"))){ - alarmNum=MapUtils.getInteger(dev,"totalAlarm"); + Integer alarmNum = 0; + if (alarmList != null && alarmList.size() > 0) { + for (Map count : alarmList) { + if (dev.getDeviceId().equals(MapUtils.getString(count, "deviceId"))) { + alarmNum = MapUtils.getInteger(count, "totalAlarm"); } } } - dev.put("alarm_num",alarmNum); + dev.setAlarmNum(alarmNum); } } - data.put("totalDevNum",devList.size()); - data.put("totalDevOnlineNum",totalDevOnlineNum); - data.put("totalAlarmNum",totalAlarmNum); - data.put("devList",devList); - return data; + + EnvironmentDevAlaramCountListVo vo = new EnvironmentDevAlaramCountListVo(); + vo.setTotalDevOnlineNum(totalDevOnlineNum); + vo.setTotalDevNum(devList.size()); + vo.setDevList(devList); + vo.setTotalAlarmNum(totalAlarmNum); + return vo; } } diff --git a/src/main/java/com/zhgd/xmgl/util/DateUtil.java b/src/main/java/com/zhgd/xmgl/util/DateUtil.java index 00cfaa711..e94eb79fa 100644 --- a/src/main/java/com/zhgd/xmgl/util/DateUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/DateUtil.java @@ -100,70 +100,6 @@ public class DateUtil extends cn.hutool.core.date.DateUtil { return findDates(cal.getTime(), new Date()); } - /** - * 查询本月所有天数Fix，如：2023-06-01到2023-06-30 - * - * @return - */ - public static List getNowMonthAllDayListFix() { - ArrayList rtList = new ArrayList<>(); - Date now = new Date(); - DateTime beginDate = cn.hutool.core.date.DateUtil.beginOfMonth(now); - DateTime endDate = cn.hutool.core.date.DateUtil.endOfMonth(now); - long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); - for (int i = 0; i < offset + 1; i++) { - rtList.add(cn.hutool.core.date.DateUtil.formatDate(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i))); - } - return rtList; - } - - /** - * 查询一个月前内所有天数，如：2023-06-10到2023-07-10 - * - * @return - */ - public static List getDaysBetweenLastMonth() { - ArrayList rtList = new ArrayList<>(); - DateTime beginDate = cn.hutool.core.date.DateUtil.lastMonth(); - DateTime endDate = DateTime.now(); - long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); - for (int i = 0; i < offset + 1; i++) { - rtList.add(cn.hutool.core.date.DateUtil.formatDate(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i))); - } - return rtList; - } - - /** - * 查询一个周前内所有天数，如：2023-06-10到2023-06-17 - * - * @return - */ - public static List getDaysBetweenLastWeek() { - ArrayList rtList = new ArrayList<>(); - DateTime beginDate = cn.hutool.core.date.DateUtil.lastWeek(); - DateTime endDate = DateTime.now(); - long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); - for (int i = 0; i < offset + 1; i++) { - rtList.add(cn.hutool.core.date.DateUtil.formatDate(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i))); - } - return rtList; - } - - /** - * 查询一个周前内所有天数，如：06-10到06-17 - * - * @return - */ - public static List getDaysBetweenLastWeekWithoutYear() { - ArrayList rtList = new ArrayList<>(); - DateTime beginDate = cn.hutool.core.date.DateUtil.lastWeek(); - DateTime endDate = DateTime.now(); - long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); - for (int i = 0; i < offset + 1; i++) { - rtList.add(cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i), "MM-dd")); - } - return rtList; - } /** * 查询现在时间几天前到现在之间的所有日期 @@ -500,4 +436,70 @@ public class DateUtil extends cn.hutool.core.date.DateUtil { dateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); return dateFormat.format(date); } + + + /** + * 查询本月所有天数Fix，如：2023-06-01到2023-06-30 + * + * @return + */ + public static List getCurrentMonthAllDayList() { + ArrayList rtList = new ArrayList<>(); + Date now = new Date(); + DateTime beginDate = cn.hutool.core.date.DateUtil.beginOfMonth(now); + DateTime endDate = cn.hutool.core.date.DateUtil.endOfMonth(now); + long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); + for (int i = 0; i < offset + 1; i++) { + rtList.add(cn.hutool.core.date.DateUtil.formatDate(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i))); + } + return rtList; + } + + /** + * 查询一个月前内所有天数，如：2023-06-10到2023-07-10 + * + * @return + */ + public static List getDaysBetweenLastMonth() { + ArrayList rtList = new ArrayList<>(); + DateTime beginDate = cn.hutool.core.date.DateUtil.lastMonth(); + DateTime endDate = DateTime.now(); + long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); + for (int i = 0; i < offset + 1; i++) { + rtList.add(cn.hutool.core.date.DateUtil.formatDate(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i))); + } + return rtList; + } + + /** + * 查询一个周前内所有天数，如：2023-06-10到2023-06-17 + * + * @return + */ + public static List getDaysBetweenLastWeek() { + ArrayList rtList = new ArrayList<>(); + DateTime beginDate = cn.hutool.core.date.DateUtil.lastWeek(); + DateTime endDate = DateTime.now(); + long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); + for (int i = 0; i < offset + 1; i++) { + rtList.add(cn.hutool.core.date.DateUtil.formatDate(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i))); + } + return rtList; + } + + /** + * 查询一个周前内所有天数，如：06-10到06-17 + * + * @return + */ + public static List getDaysBetweenLastWeekWithoutYear() { + ArrayList rtList = new ArrayList<>(); + DateTime beginDate = cn.hutool.core.date.DateUtil.lastWeek(); + DateTime endDate = DateTime.now(); + long offset = cn.hutool.core.date.DateUtil.betweenDay(beginDate, endDate, true); + for (int i = 0; i < offset + 1; i++) { + rtList.add(cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.offsetDay(beginDate, i), "MM-dd")); + } + return rtList; + } }