Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 6a0992d8 由 zshaohui
选项

出入库统计报表修改

1 个父辈 a12a00a6
内嵌 并排
正在显示 4 个修改的文件 包含 58 行增加 和 25 行删除
src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java
...@@ -1015,6 +1015,7 @@ public class BaseDeviceHandler implements IDeviceHandler { ...@@ -1015,6 +1015,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
Storage storage = dataCache.getStorageById(storagePos.getStorageId()); Storage storage = dataCache.getStorageById(storagePos.getStorageId());
InOutData inOutData = dataCache.getLastSaveInOutData(storage.getCid(), storage.getId()); InOutData inOutData = dataCache.getLastSaveInOutData(storage.getCid(), storage.getId());
inOutData.setExecuteTime(inOutData.getExecuteTime() + executeTime); inOutData.setExecuteTime(inOutData.getExecuteTime() + executeTime);
inOutData.setUpdateDate(new Date());
inOutDataManager.save(inOutData); inOutDataManager.save(inOutData);
} }
} }
......
src/main/java/com/neotel/smfcore/core/inout/service/manager/impl/InOutDataManagerImpl.java
...@@ -54,7 +54,7 @@ public class InOutDataManagerImpl implements IInOutDataManager { ...@@ -54,7 +54,7 @@ public class InOutDataManagerImpl implements IInOutDataManager {
if (storageIdList != null && !storageIdList.isEmpty()) { if (storageIdList != null && !storageIdList.isEmpty()) {
c.and("storageId").in(storageIdList); c.and("storageId").in(storageIdList);
} }
Sort s = Sort.by(Sort.Direction.DESC, "createDate"); Sort s = Sort.by(Sort.Direction.ASC, "createDate");
return inOutDataDao.findByQuery(q.addCriteria(c).with(s)); return inOutDataDao.findByQuery(q.addCriteria(c).with(s));
} }
......
src/main/java/com/neotel/smfcore/core/report/ReportController.java
package com.neotel.smfcore.core.report; package com.neotel.smfcore.core.report;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.neotel.smfcore.common.bean.BetweenData; import com.neotel.smfcore.common.bean.BetweenData;
import com.neotel.smfcore.common.utils.DateUtil;
import com.neotel.smfcore.core.device.util.DataCache; import com.neotel.smfcore.core.device.util.DataCache;
import com.neotel.smfcore.core.inout.service.manager.IInOutDataManager; import com.neotel.smfcore.core.inout.service.manager.IInOutDataManager;
import com.neotel.smfcore.core.inout.service.po.InOutData; import com.neotel.smfcore.core.inout.service.po.InOutData;
...@@ -11,6 +12,7 @@ import com.neotel.smfcore.core.report.bean.ChartItem; ...@@ -11,6 +12,7 @@ import com.neotel.smfcore.core.report.bean.ChartItem;
import com.neotel.smfcore.core.report.rest.dto.InoutDataDto; import com.neotel.smfcore.core.report.rest.dto.InoutDataDto;
import com.neotel.smfcore.core.report.rest.dto.InventoryBoxDto; import com.neotel.smfcore.core.report.rest.dto.InventoryBoxDto;
import com.neotel.smfcore.core.report.rest.dto.InventoryGroupDto; import com.neotel.smfcore.core.report.rest.dto.InventoryGroupDto;
import com.neotel.smfcore.core.report.rest.query.ReportExtQuery;
import com.neotel.smfcore.core.report.rest.query.ReportQuery; import com.neotel.smfcore.core.report.rest.query.ReportQuery;
import com.neotel.smfcore.core.storage.bean.UsageItem; import com.neotel.smfcore.core.storage.bean.UsageItem;
import com.neotel.smfcore.core.storage.service.manager.IStorageManager; import com.neotel.smfcore.core.storage.service.manager.IStorageManager;
...@@ -32,6 +34,7 @@ import org.springframework.web.bind.annotation.ResponseBody; ...@@ -32,6 +34,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
@Slf4j @Slf4j
@RestController @RestController
...@@ -138,41 +141,57 @@ public class ReportController { ...@@ -138,41 +141,57 @@ public class ReportController {
@ApiOperation("出入库统计") @ApiOperation("出入库统计")
@RequestMapping("/api/report/getInOutData") @RequestMapping("/api/report/getInOutData")
@AnonymousAccess @AnonymousAccess
public InOutDataDto getServenInOutData(ReportQuery query) { public InOutDataDto getInOutData(ReportExtQuery query) {
InOutDataDto dto = new InOutDataDto(); InOutDataDto dto = new InOutDataDto();
List<String> dateStrList = new ArrayList<>(); List<String> dateStrList = new ArrayList<>();
List<Integer> inDataList = new ArrayList<>(); List<Integer> inDataList = new ArrayList<>();
List<Integer> outDataList = new ArrayList<>(); List<Integer> outDataList = new ArrayList<>();
int days = 7;
//1.获取当前日期 //开始时间与结束时间赋值
String currentDateStr = DateUtil.toDateString(new Date(), "yyyy-MM-dd"); String currentDateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH");
Date currentDate = DateUtil.toDate(currentDateStr, "yyyy-MM-dd"); Date startDate = DateUtil.parse(currentDateStr, "yyyy-MM-dd HH");
//判断日期是否为空 Date endDate = DateUtil.parse(currentDateStr, "yyyy-MM-dd HH");
BetweenData<Date> updateDate = query.getUpdateDate(); BetweenData<Date> updateDate = query.getUpdateDate();
if (updateDate != null) { if (updateDate != null) {
Date from = updateDate.getFrom(); Date from = updateDate.getFrom();
Date to = updateDate.getTo(); Date to = updateDate.getTo();
if (to != null) {
currentDate = to;
}
if (from != null) { if (from != null) {
days = (int) cn.hutool.core.date.DateUtil.between(from, to, DateUnit.DAY) + 1; startDate = from;
} }
if (to != null) {
endDate = to;
}
} else {
endDate = DateUtil.parse(currentDateStr, "yyyy-MM-dd");
startDate = DateUtil.offsetDay(endDate, -7);
} }
//2.开始处理 7天数据 //判断相差小时数,是否超过48小时
for (int day = 1; day <= days; day++) { long between = DateUtil.between(startDate, endDate, DateUnit.HOUR);
Date startDate = DateUtil.addDays(currentDate, day - days); List<InOutData> inOutDataList = inOutDataManager.findByDate(startDate, endDate, query.getStorageIdList());
Date endDate = DateUtil.addDays(currentDate, day - days + 1); while (startDate.getTime() < endDate.getTime()) {
List<InOutData> inOutDataList = inOutDataManager.findByDate(startDate, endDate, query.getStorageIdList()); DateTime nextDayTime;
int inData = 0; if (between > 48) {
int outData = 0; dateStrList.add(DateUtil.format(startDate, "MM/dd"));
if (inOutDataList != null && !inOutDataList.isEmpty()) { nextDayTime = DateUtil.offsetDay(startDate, 1);
inData = inOutDataList.stream().mapToInt(InOutData::getInCount).sum(); } else {
outData = inOutDataList.stream().mapToInt(InOutData::getOutCount).sum(); dateStrList.add(DateUtil.format(startDate, "MM/dd HH"));
nextDayTime = DateUtil.offsetHour(startDate, 1);
}
int inCount = 0, outCount = 0;
for (InOutData inOutData : inOutDataList) {
if (inOutData.getCreateDate().getTime() >= startDate.getTime() && inOutData.getCreateDate().getTime() < nextDayTime.getTime()) {
inCount = inCount + inOutData.getInCount();
outCount = outCount + inOutData.getOutCount();
}
}
inDataList.add(inCount);
outDataList.add(outCount);
if (between > 48) {
startDate = DateUtil.offsetDay(startDate, 1);
} else {
startDate = DateUtil.offsetHour(startDate, 1);
} }
dateStrList.add(DateUtil.toDateString(startDate, "MM/dd"));
inDataList.add(inData);
outDataList.add(outData);
} }
dto.setDateStrList(dateStrList); dto.setDateStrList(dateStrList);
dto.setInDataList(inDataList); dto.setInDataList(inDataList);
......
src/main/java/com/neotel/smfcore/core/report/rest/query/ReportExtQuery.java 0 → 100644
package com.neotel.smfcore.core.report.rest.query;
import com.neotel.smfcore.common.bean.BetweenData;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class ReportExtQuery extends ReportQuery{
@DateTimeFormat(pattern = "yyyy-MM-dd HH")
private BetweenData<Date> updateDate;
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!