#

Junjie

1 天以前 8dc960dd9fda130ff19faaafed6b1234e622610b

 src/main/java/com/zy/core/utils/StationOperateProcessUtils.java

@@ -3,14 +3,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.domain.param.CreateInTaskParam;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
@@ -23,8 +19,6 @@
import com.zy.core.model.command.StationCommand;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.thread.StationThread;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -44,11 +38,9 @@
    @Autowired
    private RedisUtil redisUtil;
    @Autowired
    private ConfigService configService;
    @Autowired
    private HttpRequestLogService httpRequestLogService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private WmsOperateUtils wmsOperateUtils;

    //执行输送站点入库任务
    public synchronized void stationInExecute() {
@@ -220,28 +212,6 @@

    //检测输送站点是否运行堵塞
    public synchronized void checkStationRunBlock() {
        String wmsUrl = null;
        Config wmsSystemUriConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemUri"));
        if (wmsSystemUriConfig != null) {
            wmsUrl = wmsSystemUriConfig.getValue();
        }

        if(wmsUrl == null){
            News.error("未配置WMS系统URI，配置文件Code编码：wmsSystemUri");
            return;
        }

        String wmsSystemReassignInTaskUrl = null;
        Config wmsSystemReassignInTaskUrlConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemReassignInTaskUrl"));
        if (wmsSystemReassignInTaskUrlConfig != null) {
            wmsSystemReassignInTaskUrl = wmsSystemReassignInTaskUrlConfig.getValue();
        }

        if(wmsSystemReassignInTaskUrl == null){
            News.error("未配置WMS任务重新分配入库库位接口地址，配置文件Code编码：wmsSystemReassignInTaskUrl");
            return;
        }

        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
        for (BasDevp basDevp : basDevps) {
            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
@@ -276,19 +246,7 @@
                    if (runBlockReassignLocStationList.contains(stationProtocol.getStationId())) {
                        //站点处于重新分配库位区域
                        //运行堵塞，重新申请任务

                        HashMap<String, Object> requestParam = new HashMap<>();
                        String response = null;
                        try {
                            requestParam.put("taskNo", wrkMast.getWmsWrkNo());
                            requestParam.put("row", Utils.getInTaskEnableRow(new ArrayList<>(basDevp.getDevpNo())));

                            response = new HttpHandler.Builder()
                                    .setUri(wmsUrl)
                                    .setPath(wmsSystemReassignInTaskUrl)
                                    .setJson(JSON.toJSONString(requestParam))
                                    .build()
                                    .doPost();
                        String response = wmsOperateUtils.applyReassignTaskLocNo(wrkMast.getWrkNo());
                            JSONObject jsonObject = JSON.parseObject(response);
                            if (jsonObject.getInteger("code").equals(200)) {
                                StartupDto dto = jsonObject.getObject("data", StartupDto.class);
@@ -353,19 +311,8 @@
                                if (wrkMastService.updateById(wrkMast)) {
                                    MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
                                }
                                News.info("请求WMS接口成功！！！url：{}；request：{}；response：{}", wmsUrl + wmsSystemReassignInTaskUrl, JSON.toJSONString(requestParam), response);
                            } else {
                                News.error("请求WMS接口失败！！！url：{}；request：{}；response：{}", wmsUrl + wmsSystemReassignInTaskUrl, JSON.toJSONString(requestParam), response);
                            }
                        } catch (Exception e) {
                            News.error("请求WMS接口异常！！！url：{}；request：{}； response：{}", wmsUrl + wmsSystemReassignInTaskUrl, JSON.toJSONString(requestParam), response, e);
                        } finally {
                            HttpRequestLog httpRequestLog = new HttpRequestLog();
                            httpRequestLog.setName(wmsUrl + wmsSystemReassignInTaskUrl);
                            httpRequestLog.setRequest(JSON.toJSONString(requestParam));
                            httpRequestLog.setResponse(response);
                            httpRequestLog.setCreateTime(new Date());
                            httpRequestLogService.insert(httpRequestLog);
                            News.error("请求WMS接口失败！！！response：{}", response);
                        }
                    }else {
                        //运行堵塞，重新计算路线