vince
2023-07-05 169e829234045a236419fdf354e1f5acaf13c6df
igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java
@@ -14,7 +14,6 @@
import com.ld.igds.data.SimpleDepot;
import com.ld.igds.grain.dto.GrainData;
import com.ld.igds.grain.service.CoreGrainService;
import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.models.*;
import com.ld.igds.sys.service.DicTriggerService;
import com.ld.igds.sys.service.SysDeptService;
@@ -26,13 +25,16 @@
import com.ld.igds.warn.data.WarnParam;
import com.ld.igds.warn.service.CoreWarnService;
import com.ld.igds.weather.CoreWeatherService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;
@@ -63,6 +65,7 @@
    private CoreWarnService coreWarnService;
    @Resource
    private RedisUtil redisUtil;
    /**
     * 获取入库作业中,仓库下拉框,值获取状态=非满仓的粮库
@@ -559,8 +562,9 @@
        log.debug("----------------根据用户IP获取选择-地磅----{}", userIp);
        String key = "INOUT:WEIGHT:" + userIp;
        return (String) redisUtil.get(key);
        String sort =  (String)redisUtil.get(key);
        if(StringUtils.isEmpty(sort))sort="1";
        return sort;
    }
    /**
@@ -605,5 +609,15 @@
        return (String) redisUtil.get(key);
    }
    public Page<DicArea> pageDicArea(BaseParam param) {
        Page<DicArea> page = new Page<>(param.getPage(), param.getLimit());
        List<DicArea> list = coreDicService.listDicArea(page, param);
        page.setRecords(list);
        return page;
    }
}