agv 入库接口调整

zyx

2023-07-19 4665167843394f4586db8198d5d1c5852ede3bf7

agv 入库接口调整

 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java

@@ -12,7 +12,9 @@
import com.zy.asrs.service.AgvWrkMastService;
import com.zy.asrs.service.ApiLogService;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import java.io.IOException;
@@ -23,11 +25,17 @@
import java.util.stream.Collectors;

@Service
@Slf4j
public class AgvWrkMastServiceImp extends ServiceImpl<AgvWrkMastMapper, AgvWrkMast> implements AgvWrkMastService {

    @Value("${agv.url}")
    private String url;

    private String path;
    @Value("${agv.taskCreatePath}")
    private String taskCreatePath;

    @Value("${agv.containerMoveInPath}")
    private String containerMoveInPath;

    @Autowired
    AgvWrkMastMapper agvWrkMastMapper;
@@ -50,6 +58,20 @@
        List<Map<String,String>> positionCodeMapList = new ArrayList<>();
        containerMoveParam.put("containerMoveIns",positionCodeMapList);

        getRequestParam(agvTaskCreateParam,agvWrkMastList,positionCodeMapList);

        doHttpRequest(agvTaskCreateParam,"上架任务下发",url, taskCreatePath,null,"127.0.0.1");

        return containerMoveParam;
    }

    public int containerMove(Map<String, List<Map<String, String>>> containerMoveParam) throws IOException {

        return doHttpRequest(containerMoveParam,"容器入场任务下发",url, containerMoveInPath,null,"127.0.0.1");

    }

    private void getRequestParam(AgvTaskCreateParam agvTaskCreateParam,List<AgvWrkMast> agvWrkMastList,List<Map<String,String>> positionCodeMapList){
        List<AgvTaskParam> agvTaskParamList = agvWrkMastList.stream().map(agvWrkMast -> {
            AgvTaskParam agvTaskParam = new AgvTaskParam();
            AgvTaskkDescribeParam agvTaskkDescribeParam = new AgvTaskkDescribeParam();
@@ -71,50 +93,42 @@
        }).collect(Collectors.toList());

        agvTaskCreateParam.setTasks(agvTaskParamList);
    }

    private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
        String response = "";
        boolean success = false;

        try {
            response = new HttpHandler.Builder()
                    .setUri("localhost:8080")
                    .setPath("test/task/create")
                    .setJson(JSONObject.toJSONString(agvTaskCreateParam))
                    .setUri(url)
                    .setPath(path)
                    .setJson(JSONObject.toJSONString(requestParam))
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);

            int code = (int) jsonObject.get("code");
            if(code != 0){
                throw new CoolException("调用AGV响应错误");
            }
            success = true;
            return code;
        }catch (Exception e){

            log.error(e.getMessage());
            throw new CoolException("调用AGV响应错误");
        }finally {
//            apiLogService.save(
//                    "上架任务下发",
//                    url + path,
//                    null,
//                    "127.0.0.1",
//                    JSON.toJSONString(requestMap),
//                    response,
//                    success
//            );
            apiLogService.save(
                    namespace,
                    url + path,
                    appkey,
                    ip,
                    JSON.toJSONString(JSONObject.toJSONString(requestParam)),
                    response,
                    success
            );
        }

        JSONObject jsonObject = JSON.parseObject(response);
        //save log api
        int code = (int) jsonObject.get("code");
        if(code != 0){
            throw new CoolException("调用AGV接口失败");
        }

        return containerMoveParam;
    }

    public int containerMove(Map<String, List<Map<String, String>>> containerMoveParam) throws IOException {
        String response = new HttpHandler.Builder()
                .setUri("localhost:8080")
                .setPath("test/container/moveIn")
                .setJson(JSONObject.toJSONString(containerMoveParam))
                .build()
                .doPost();

        JSONObject jsonObject = JSON.parseObject(response);
        return (int) jsonObject.get("code");
    }

}

 src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java

@@ -1,6 +1,7 @@
package com.zy.asrs.task;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.service.AgvWrkMastService;
@@ -40,10 +41,12 @@

    @Scheduled(cron = "0/5 * * * * ? ")
    public void startPutwayWrk(){
        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()

        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
                ,new EntityWrapper<AgvWrkMast>()
                .eq("wrk_sts", 201)
                .eq("io_type",1)
                .last("limit 0,50"));
                .eq("io_type", 1)).getRecords();

        if(!Cools.isEmpty(agvWrkMastList)){
            try {
                ReturnT<String> returnT = agvWrkMastHandler.startPutWayWrk(agvWrkMastList);

 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java

@@ -75,8 +75,9 @@
                agvWrkMast.setWrkSts((long)202);
                //修改AGV入库通知档状态入出状态为Y
                agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
                agvWrkMastService.updateById(agvWrkMast);
            });
            agvWrkMastService.updateBatchById(agvWrkMastList);
            //agvWrkMastService.updateBatchById(agvWrkMastList);

            return SUCCESS;
        }

 src/main/resources/application.yml

@@ -61,3 +61,7 @@
    username: poy-asrs
    password: Poy@2022

agv:
  url: localhost:8080
  taskCreatePath: /test/task/create
  containerMoveInPath: /test/container/moveIn