删除无用内容

This commit is contained in:
2025-04-30 18:28:24 +08:00
parent 7771f85618
commit f8f49891a5
11 changed files with 37 additions and 761 deletions

View File

@@ -1,5 +1,7 @@
package com.ycwl.basic.service.mobile.impl;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import com.ycwl.basic.enums.StatisticEnum;
import com.ycwl.basic.mapper.StatisticsMapper;
import com.ycwl.basic.model.jwt.JwtInfo;
@@ -11,7 +13,6 @@ import com.ycwl.basic.model.mobile.statistic.resp.AppSta3VO;
import com.ycwl.basic.model.mobile.statistic.resp.AppStatisticsFunnelVO;
import com.ycwl.basic.service.mobile.AppStatisticsService;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.DateUtils;
import com.ycwl.basic.utils.JwtTokenUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -395,26 +396,25 @@ public class AppStatisticsServiceImpl implements AppStatisticsService {
*/
private void standardToNewSpecificTime(CommonQueryReq query) {
Integer standard = query.getStandard();
Date newDate = new Date();
Date newDate = DateUtil.beginOfDay(new Date());
Date startDate = new Date();
Date endDate = new Date();
switch (standard) {
case 4://年
startDate = DateUtils.addDateYears(newDate, -1);
startDate = DateUtil.offset(newDate, DateField.YEAR, -1);
break;
case 3://月
startDate = DateUtils.addDateMonths(newDate, -1);
startDate = DateUtil.offset(newDate, DateField.MONTH, -1);
break;
case 2://周
startDate = DateUtils.addDateWeeks(newDate, -1);
startDate = DateUtil.offsetWeek(newDate, -1);
break;
case 1://昨天
Date yesterday = DateUtils.addDateDays(newDate, -1);
startDate = DateUtils.getStartOfDay(yesterday);
endDate = DateUtils.getEndOfDay(yesterday);
startDate = DateUtil.offsetDay(newDate, -1);
endDate = DateUtil.endOfDay(startDate);
break;
case 0://今天
startDate = DateUtils.getStartOfDay(newDate);
startDate = DateUtil.beginOfDay(newDate);
break;
case 9://历史累计
startDate = null;
@@ -433,31 +433,29 @@ public class AppStatisticsServiceImpl implements AppStatisticsService {
*/
private void standardToPreviousSpecificTime(CommonQueryReq query) {
Integer standard = query.getStandard();
Date newDate = new Date();
Date newDate = DateUtil.beginOfDay(new Date());
Date startDate = new Date();
Date endDate = new Date();
switch (standard) {
case 4://年,近一年的前一年
startDate = DateUtils.addDateYears(newDate, -2);
endDate = DateUtils.addDateYears(newDate, -1);
startDate = DateUtil.offset(newDate, DateField.YEAR, -2);
endDate = DateUtil.offset(newDate, DateField.YEAR, -1);
break;
case 3://月,近一月的前一个月
startDate = DateUtils.addDateMonths(newDate, -2);
endDate = DateUtils.addDateMonths(newDate, -1);
startDate = DateUtil.offset(newDate, DateField.MONTH, -2);
endDate = DateUtil.offset(newDate, DateField.MONTH, -1);
break;
case 2://周,近一周的前一周
startDate = DateUtils.addDateWeeks(newDate, -2);
endDate = DateUtils.addDateWeeks(newDate, -1);
startDate = DateUtil.offsetWeek(newDate, -2);
endDate = DateUtil.offsetWeek(newDate, -1);
break;
case 1://昨天,昨天的前一天
Date theDayBeforeYesterday = DateUtils.addDateDays(newDate, -2);
startDate = DateUtils.getStartOfDay(theDayBeforeYesterday);
endDate = DateUtils.getEndOfDay(theDayBeforeYesterday);
startDate = DateUtil.offsetDay(newDate, -2);
endDate = DateUtil.offsetDay(newDate, -1);
break;
case 0://今天,今天的前一天
Date yesterday = DateUtils.addDateDays(newDate, -1);
startDate = DateUtils.getStartOfDay(yesterday);
endDate = DateUtils.getEndOfDay(yesterday);
startDate = DateUtil.offsetDay(newDate, -1);
endDate = DateUtil.endOfDay(startDate);
break;
case 9://历史累计
startDate = null;

View File

@@ -1,5 +1,6 @@
package com.ycwl.basic.service.mobile.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
@@ -40,14 +41,11 @@ import com.ycwl.basic.storage.StorageFactory;
import com.ycwl.basic.storage.adapters.IStorageAdapter;
import com.ycwl.basic.storage.enums.StorageAcl;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.DateUtils;
import com.ycwl.basic.utils.WxMpUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import java.io.File;
import java.net.MalformedURLException;
@@ -190,7 +188,7 @@ public class GoodsServiceImpl implements GoodsService {
for (SourceRespVO sourceRespVO : list) {
GoodsDetailVO goodsDetailVO = new GoodsDetailVO();
goodsDetailVO.setGoodsId(sourceRespVO.getId());
String shootingTime = DateUtils.format(sourceRespVO.getCreateTime(), "yyyy.MM.dd HH:mm:ss");
String shootingTime = DateUtil.format(sourceRespVO.getCreateTime(), "yyyy.MM.dd HH:mm:ss");
if (i < 10) {
goodsDetailVO.setGoodsName(goodsNamePrefix + "0" + i + " " + shootingTime);
} else {