jiazx0107@163.com
2023-06-24 6f45f4a29ce38525f3f9e3931bcedfc77bde765e
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;
    /**
     * 获取入库作业中,仓库下拉框,值获取状态=非满仓的粮库
@@ -481,18 +484,6 @@
        return new PageResponse<>(RespCodeEnum.CODE_0000, data);
    }
    public PageResponse<Page<DicFoodOrigin>> pageFoodLocation(InoutParam param) {
        Page<DicFoodOrigin> result = coreDicService.pageFoodLocation(param);
        if (null == result.getRecords() || result.getRecords().isEmpty()) {
            return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
                    "获取到数据信息为空");
        }
        return new PageResponse<Page<DicFoodOrigin>>(RespCodeEnum.CODE_0000,
                result);
    }
    public DepotConf getDepotConf(String companyId, String depotId) {
        return coreCommonService.getCacheDepotConf(companyId, depotId);
@@ -617,5 +608,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;
    }
}