大屏首页储量数量展示，仅展示散粮；抓拍跟踪图片展示业务逻辑调整

sgj

2026-03-27 0d59d664b3b81e9264df6ad513d06b1b2c84c931

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

@@ -4,10 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.mapper.InoutConfMapper;
import com.fzzy.igds.mapper.InoutSysConfMapper;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.InoutConf;
import com.fzzy.igds.domain.InoutSysConf;
import com.fzzy.igds.mapper.InoutConfMapper;
import com.fzzy.igds.mapper.InoutSysConfMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -31,6 +32,8 @@
public class InoutConfService {
    @Resource
    private ISysDeptService iSysDeptService;
    @Resource
    private CoreDeptService deptService;
    @Resource
    private InoutConfMapper inoutConfMapper;
    @Resource
@@ -181,16 +184,18 @@
     * @return
     */
    public List<InoutConf> getInoutConfList(String companyId, String deptId) {
        QueryWrapper<InoutConf> queryWrapper = new QueryWrapper<>();

        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        if (StringUtils.isEmpty(deptId)) {
            deptId = ContextUtil.subDeptId(null);
        }
        QueryWrapper<InoutConf> queryWrapper = new QueryWrapper<>();

        queryWrapper.eq("dept_id", deptId);
        queryWrapper.eq("company_id", companyId);

        if (StringUtils.isNotEmpty(deptId)) {
            queryWrapper.eq("dept_id", deptId);
        }else {
            queryWrapper.likeRight("dept_id", ContextUtil.subDeptId(null));
        }

        return inoutConfMapper.selectList(queryWrapper);
    }
@@ -244,12 +249,21 @@
     * 设置缓存
     *
     * @param companyId
     * @param deptId
     */
    public void flushInoutConfCache(String companyId, String deptId) {
        List<InoutConf> list = this.getInoutConfList(companyId, deptId);
        String key = RedisConst.buildKey(companyId, Constant.CACHE_INOUT_CONF_LIST, deptId);
        redisCache.setCacheObject(key, list);
    public void flushInoutConfCache(String companyId) {
        List<Dept> depts = deptService.listDept(null, companyId, null);
        if(null == depts || depts.isEmpty()){
            return;
        }
        List<InoutConf> inoutConfList;
        for (Dept dept : depts) {
            inoutConfList = this.getInoutConfList(companyId, dept.getId());
            if(null == inoutConfList || inoutConfList.isEmpty()){
                continue;
            }
            String key = RedisConst.buildKey(companyId, Constant.CACHE_INOUT_CONF_LIST, dept.getId());
            redisCache.setCacheObject(key, inoutConfList);
        }
    }

    /**