调整工单内容

jiazx0107

2025-12-27 225f53573fc2383fe8eb8cabb48692061f3cb8cd

 fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java

@@ -3,8 +3,8 @@
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.MainData;
import com.fzzy.igds.data.InoutParam;
import com.fzzy.igds.data.MainData;
import com.fzzy.igds.domain.*;
import com.fzzy.igds.service.*;
import com.fzzy.igds.utils.ContextUtil;
@@ -18,11 +18,12 @@
import com.ruoyi.system.service.ISysDeptService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.*;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;

/**
 * @Description
@@ -39,7 +40,7 @@
    private DicService dicService;
    @Resource
    private CoreDeptService coreDeptService;
    @Autowired
    @Resource
    private SecCameraService secCameraService;
    @Resource
    private ISysDeptService iSysDeptService;
@@ -112,14 +113,14 @@
     * @return
     */
    public List<Depot> listDepotByDeptId(String deptId) {
        try{
        try {
            if (StringUtils.isEmpty(deptId)) {
                deptId = ContextUtil.subDeptId(null);
            }

            return depotService.getCacheDepotList(ContextUtil.getCompanyId(), deptId);

        }catch (Exception e){
        } catch (Exception e) {
            return null;
        }
    }
@@ -221,7 +222,7 @@
        for (int i = -29; i <= 0; i++) {
            mapMonthInNum.put(DateFormatUtils.format(DateUtil.getNewByDay(new Date(), i), "MM-dd"), 0);
            mapMonthOutNum.put(DateFormatUtils.format(DateUtil.getNewByDay(new Date(), i), "MM-dd"), 0);
            if(i >=-6){
            if (i >= -6) {
                mapWeekInNum.put(DateFormatUtils.format(DateUtil.getNewByDay(new Date(), i), "MM-dd"), 0);
                mapWeekOutNum.put(DateFormatUtils.format(DateUtil.getNewByDay(new Date(), i), "MM-dd"), 0);
                mapWeekAiNum.put(DateFormatUtils.format(DateUtil.getNewByDay(new Date(), i), "MM-dd"), 0);
@@ -238,8 +239,8 @@
        if (null != listEvent && !listEvent.isEmpty()) {
            mainData.setAiNum(listEvent.size());
            for (EventInfo event : listEvent) {
                key = DateFormatUtils.format(event.getTime(),"MM-dd");
                if(null != mapWeekAiNum.get(key)){
                key = DateFormatUtils.format(event.getTime(), "MM-dd");
                if (null != mapWeekAiNum.get(key)) {
                    mapWeekAiNum.put(key, mapWeekAiNum.get(key) + 1);
                }
            }
@@ -253,8 +254,8 @@
        List<SnapRecord> listSnap = snapRecordService.getListByParam(param);
        if (null != listSnap && !listSnap.isEmpty()) {
            for (SnapRecord snap : listSnap) {
                key = DateFormatUtils.format(snap.getSnapTime(),"MM-dd");
                if(null != mapWeekSnapNum.get(key)){
                key = DateFormatUtils.format(snap.getSnapTime(), "MM-dd");
                if (null != mapWeekSnapNum.get(key)) {
                    mapWeekSnapNum.put(key, mapWeekSnapNum.get(key) + 1);
                }
            }
@@ -272,27 +273,27 @@
        List<InoutRecord> inoutRecords = inoutRecordService.listInout(inoutParam);
        if (null != inoutRecords && !inoutRecords.isEmpty()) {
            for (InoutRecord record : inoutRecords) {
                key = DateFormatUtils.format(record.getRegisterTime(),"MM-dd");
                if(Constant.TYPE_IN.equals(record.getType())){
                    if(null != mapWeekInNum.get(key)){
                key = DateFormatUtils.format(record.getRegisterTime(), "MM-dd");
                if (Constant.TYPE_IN.equals(record.getType())) {
                    if (null != mapWeekInNum.get(key)) {
                        mapWeekInNum.put(key, mapWeekInNum.get(key) + 1);
                    }
                    if(null != mapMonthInNum.get(key)){
                    if (null != mapMonthInNum.get(key)) {
                        mapMonthInNum.put(key, mapMonthInNum.get(key) + 1);
                    }
                    if(key.equals(DateFormatUtils.format(new Date(),"MM-dd"))){
                    if (key.equals(DateFormatUtils.format(new Date(), "MM-dd"))) {
                        mainData.setInNumDay(mainData.getInNumDay() + 1);
                        inSum += record.getRecordWeight();
                    }
                }
                if(Constant.TYPE_OUT.equals(record.getType())){
                    if(null != mapWeekOutNum.get(key)){
                if (Constant.TYPE_OUT.equals(record.getType())) {
                    if (null != mapWeekOutNum.get(key)) {
                        mapWeekOutNum.put(key, mapWeekOutNum.get(key) + 1);
                    }
                    if(null != mapMonthOutNum.get(key)){
                    if (null != mapMonthOutNum.get(key)) {
                        mapMonthOutNum.put(key, mapMonthOutNum.get(key) + 1);
                    }
                    if(key.equals(DateFormatUtils.format(new Date(),"MM-dd"))){
                    if (key.equals(DateFormatUtils.format(new Date(), "MM-dd"))) {
                        mainData.setOutNumDay(mainData.getOutNumDay() + 1);
                        outSum += record.getRecordWeight();
                    }