告警批复实体类，service

sgj

8 天以前 71fe4f1f6a75c86640a726b9c230e8aaae2a28e7

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java

@@ -1,17 +1,24 @@
package com.fzzy.igds.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.DepotStore;
import com.fzzy.igds.repository.DepotRepository;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.mapper.DepotMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.TimeUnit;

/**
 * @Description
@@ -23,41 +30,105 @@
public class DepotService {

    @Resource
    private DepotRepository depotRepository;
    private DepotMapper depotMapper;
    @Resource
    private RedisCache redisCache;
    @Resource
    private DepotStoreService depotStoreService;

    @Resource
    private CoreDeptService coreDeptService;

    /**
     * jpa查询仓库列表
     * 查询库区下仓库列表
     *
     * @param companyId
     * @param deptId
     * @param idDesc    是否ID倒序排列
     * @return
     */
    public List<Depot> getData(String companyId, String deptId) {

    public List<Depot> getData(String companyId, String deptId, boolean idDesc) {
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        if (StringUtils.isEmpty(deptId)) {
            deptId = ContextUtil.subDeptId(null);

        QueryWrapper<Depot> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("company_id", companyId);
        if (StringUtils.isNotBlank(deptId)) {
            queryWrapper.likeRight("dept_id", deptId);
        }
        return depotRepository.getDepot(companyId, deptId);

        if (idDesc) {
            //ID倒序
            queryWrapper.orderByDesc("id");
        } else {
            //序号正序
            queryWrapper.orderByAsc("order_num");
        }

        return depotMapper.selectList(queryWrapper);
    }

    /**
     * jpa查询仓库列表
     * @param ids
     * @return
     * 根据用户类型查询所有仓库，作为dorado的map回显使用
     *
     * @param deptId
     * @author sgj
     * @since 2026/03/24
     */
    public List<Depot> getDepotByIds(List<String> ids) {
        if (null == ids ||ids.isEmpty()) {
            return null;
    public List<Depot> getDepotByUserType(String deptId) {
        List<Depot> result = new ArrayList<>();

        if (StringUtils.isNotBlank(deptId)) {
            //查公司下所有库区
            result = this.getData(null, deptId, false);
            return result;
        }
        return depotRepository.getDepotByIds(ids);
        //获取当前登录人
        SysUser user = ContextUtil.getLoginUser();

        if (Constant.USER_TYPE_10.equals(user.getUserType())) {
            //监管用户，直接查询组织下所有库区
            result = this.getData(user.getCompanyId(), null, false);
            return result;
        }
        if (Constant.USER_TYPE_20.equals(user.getUserType())) {
            //银行用户，根据合同查询银行下所有库区
            List<Dept> deptByBank = coreDeptService.getDeptByBank(user.getUserData());
            for (Dept dept : deptByBank) {
                result.addAll(this.getData(null, dept.getId(), false));
            }
            return result;
        }
        if (Constant.USER_TYPE_30.equals(user.getUserType())) {
            //库区用户
            if (ContextUtil.isDepotUser(user.getDeptId() + "")) {
                //查询用户所属库区
                result = this.getData(null, user.getDeptId() + "", false);
            } else {
                //查询用户所属公司下所有库区
                result = this.getData(user.getCompanyId(), null, false);
            }
            return result;
        }
        return result;
    }

    /**
     * jpa保存更新仓库信息
     * 根据库存表信息，更新仓库库存
     *
     * @param data
     */
    public void updateByDepotStore(DepotStore data) {
        UpdateWrapper<Depot> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("id", data.getDepotId()).set("storage_real", data.getStorageReal());

        depotMapper.update(null, updateWrapper);
    }

    /**
     * 保存更新仓库信息
     *
     * @param depot
     */
    public void saveDepot(Depot depot) {
@@ -67,38 +138,84 @@
        if (StringUtils.isEmpty(depot.getDeptId())) {
            depot.setDeptId(ContextUtil.subDeptId(null));
        }
        //默认顺序号
        if (null == depot.getOrderNum()) {
            depot.setOrderNum(1);
        }
        //主键ID
        if (StringUtils.isEmpty(depot.getId())) {
            depot.setId(getStrId(depot.getDeptId()));
            depot.setCreateBy(ContextUtil.getLoginUserName());
            depot.setCreateTime(new Date());
            depotMapper.insert(depot);
        } else {
            depot.setUpdateBy(ContextUtil.getLoginUserName());
            depot.setUpdateTime(new Date());
            depotMapper.updateById(depot);
        }
        //默认顺序号
        if(null == depot.getOrderNum()){
            depot.setOrderNum(1);
        }
        flushCache(depot.getCompanyId());
    }

    /**
     * 更新库存信息
     *
     * @param depot
     */
    public void updateStorageReal(Depot depot) {

        Depot cacheDepot = this.getCacheDepot(depot.getCompanyId(), depot.getId());

        depot.setUpdateBy(ContextUtil.getLoginUserName());
        depot.setUpdateTime(new Date());
        depotRepository.save(depot);
        depot.setRemark("【" + ContextUtil.getLoginUserName() + "】于[" + DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss") + "]修改库存：" + cacheDepot.getStorageReal() + "-->" + depot.getStorageReal());
        depotMapper.updateById(depot);

        DepotStore lastData = new DepotStore();

        //主键ID规则：yyyyMMddHHmm_仓库编码
        lastData.setId(DateFormatUtils.format(new Date(), "yyyyMMddHHmm") + "_" + depot.getId() + "_HAND");
        lastData.setCompanyId(depot.getCompanyId());
        lastData.setDeptId(depot.getDeptId());
        lastData.setDepotId(depot.getId());
        lastData.setStorageReal(0.0);
        lastData.setUpdateTime(new Date());
        lastData.setUpdateBy("系统定时统计");

        lastData.setDepotStatus(depot.getDepotStatus());
        lastData.setFoodVariety(depot.getFoodVariety());
        lastData.setFoodLevel(depot.getFoodLevel());
        lastData.setFoodLocation(depot.getFoodLocation());
        lastData.setFoodLocationId(depot.getFoodLocationId());
        lastData.setFoodType(depot.getFoodType());
        lastData.setFoodYear(depot.getFoodYear());

        lastData.setStorageReal(depot.getStorageReal());
        lastData.setCreateTime(new Date()); //设置为最新时间，其他系统可以通过此时间查询数据是否有更新修改，同步到省平台接口。
        lastData.setCreateBy(ContextUtil.getLoginUserName());
        lastData.setRemark("【" + ContextUtil.getLoginUserName() + "】于[" + DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss") + "]修改库存为：" + depot.getStorageReal());

        depotStoreService.updateAndSave(lastData);
        flushCache(depot.getCompanyId());
    }

    /**
     * 获取主键ID
     *
     * @param deptId
     * @param deptId
     */
    public String getStrId(String deptId) {
        List<Depot> depots = depotRepository.getDepotMaxId(deptId);
        List<Depot> depots = this.getData(null, deptId, true);
        String oldOrderId = null;
        if(null != depots && depots.size() > 0){
        if (null != depots && depots.size() > 0) {
            oldOrderId = depots.get(0).getId().substring(deptId.length());
        }
        return deptId + ContextUtil.getOrderId(oldOrderId, 3);
    }

    /**
     * jpa更新仓库状态
     * 更新仓库状态
     *
     * @param depotId
     * @param status
     */
@@ -106,15 +223,19 @@
        if (StringUtils.isEmpty(depotId)) {
            return;
        }
        depotRepository.updateDepotStatus(status, depotId);

        UpdateWrapper<Depot> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("id", depotId).set("depot_status", status);
        depotMapper.update(null, updateWrapper);
    }

    /**
     * jpa删除仓库货位信息
     * 删除仓库货位信息
     *
     * @param depot
     */
    public void deleteDepot(Depot depot) {
        depotRepository.delete(depot);
        depotMapper.deleteById(depot);

        //删除配置缓存
        this.delCacheDepot(depot, depot.getCompanyId());
@@ -122,6 +243,7 @@

    /**
     * 刷新仓库货位缓存
     *
     * @param companyId
     */
    public void flushCache(String companyId) {
@@ -129,13 +251,14 @@
            companyId = ContextUtil.getCompanyId();
        }

        List<Depot> list = depotRepository.getDepotByCompanyId(companyId);
        List<Depot> list = this.getData(companyId, null, false);

        this.setCacheDepotList(list, companyId);
    }

    /**
     * 设置缓存
     *
     * @param list
     * @param companyId
     */
@@ -144,12 +267,13 @@
        String key;
        for (Depot depot : list) {
            key = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT, depot.getId());
            redisCache.setCacheObject(key, depot);
            redisCache.setCacheObject(key, depot, 24, TimeUnit.HOURS);
        }
    }

    /**
     * 删除缓存信息
     *
     * @param depot
     * @param companyId
     */
@@ -157,7 +281,7 @@
        if (null == depot) {
            return;
        }
        if(StringUtils.isEmpty(companyId)){
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        String key = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT, depot.getId());
@@ -166,37 +290,49 @@

    /**
     * 获取缓存-根据组织编码获取仓库集合
     *
     * @param companyId
     * @return
     */
    public List<Depot> getCacheDepotList(String companyId) {
        if(StringUtils.isEmpty(companyId)){
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        String patten = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT) + "*";

        Collection<String> keys = redisCache.keys(patten);
        if (null == keys) {
            return null;
        }

        List<Depot> list = new ArrayList<>();
        for (String key : keys) {
            list.add((Depot) redisCache.getCacheObject(key));

        String patten = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT) + "*";
        Collection<String> keys = redisCache.keys(patten);
        if (null != keys) {
            for (String key : keys) {
                if (null == redisCache.getCacheObject(key)) {
                    list = new ArrayList<>();
                    break;
                }
                list.add((Depot) redisCache.getCacheObject(key));
            }
        }

        //缓存获取为空，则查询数据库
        if(list.size() < 1){
            list = depotRepository.getDepotByCompanyId(companyId);
        if (list.isEmpty()) {
            list = this.getData(companyId, null, false);
            setCacheDepotList(list, companyId);
        }

        //重新排序
        Collections.sort(list, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
        if (!list.isEmpty()) {
            // 检查是否有仓库的排序号为空
            for (Depot depot : list) {
                if (null == depot.getOrderNum()) {
                    //排序号为空，则默认给1
                    depot.setOrderNum(1);
                }
            }
            Collections.sort(list, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
        }
        return list;
    }

    /**
     * 获取缓存-根据组织编码和库区编码获取仓库集合
     *
     * @param companyId
     * @param deptId
     * @return
@@ -206,7 +342,7 @@
            return null;
        }
        List<Depot> list = getCacheDepotList(companyId);
        if(null == list || list.isEmpty()){
        if (null == list || list.isEmpty()) {
            return null;
        }
        List<Depot> result = new ArrayList<>();
@@ -215,13 +351,16 @@
                result.add(depot);
            }
        }
        //重新排序
        Collections.sort(result, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
        if (!result.isEmpty()) {
            //重新排序
            Collections.sort(list, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
        }
        return result;
    }

    /**
     * 获取仓库信息-根据仓库编码获取缓存信息
     *
     * @param companyId
     * @param depotId
     * @return
@@ -230,40 +369,41 @@
        if (StringUtils.isEmpty(depotId)) {
            return null;
        }
        if(StringUtils.isEmpty(companyId)){
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        String key = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT, depotId);
        Depot depot = redisCache.getCacheObject(key);
        if(null == depot){
            depot = depotRepository.getDepotById(companyId, depotId);
        if (null == depot) {
            depot = depotMapper.selectById(depotId);
            redisCache.setCacheObject(key, depot);
        }
        return depot;
    }

    /**
     * 根据库存信息更新仓库信息
     * @param data
     * 获取仓库信息-根据仓库名称获取仓库ID
     *
     * @param deptId
     * @return
     */
    public void updateByStore(DepotStore data) {

        Depot depot = this.getCacheDepot(data.getCompanyId(), data.getDepotId());
        if (null == depot) {
            return;
    public String getDepotId(String deptId, String depotName) {
        if (StringUtils.isEmpty(deptId)) {
            return null;
        }
        if (StringUtils.isEmpty(depotName)) {
            return null;
        }

        depot.setStorageReal(data.getStorageReal());
        depot.setDepotStatus(data.getDepotStatus());
        depot.setFoodLevel(data.getFoodLevel());
        depot.setFoodLocation(data.getFoodLocation());
        depot.setFoodVariety(data.getFoodVariety());
        depot.setFoodType(data.getFoodType());
        depot.setFoodYear(data.getFoodYear());
        if (null != data.getStoreDate()) {
            depot.setStoreDate(data.getStoreDate());
        List<Depot> depotList = getCacheDepotList(ContextUtil.getCompanyId(), deptId);
        if (null == depotList || depotList.isEmpty()) {
            return null;
        }

        this.saveDepot(depot);
        for (Depot depot : depotList) {
            if (depotName.equals(depot.getName())) {
                return depot.getId();
            }
        }
        return null;
    }
}