123

ZY

4 天以前 364b9ccc44bc6863280c5cc00aa8512cfff548d4

 src/main/java/com/zy/asrs/controller/TaskWrkLogController.java

@@ -1,6 +1,5 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -10,15 +9,12 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.TaskWrkLog;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.TaskWrkLogService;
import com.zy.common.utils.HttpHandler;
import com.zy.asrs.service.ToWmsService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

import java.util.*;
@@ -27,15 +23,12 @@
@RestController
public class TaskWrkLogController extends BaseController {

    @Value("${wms.url}")
    private String wmsUrl;
    @Value("${wms.taskExecCallback}")
    private String TaskExecCallback;
    @Autowired
    private ApiLogService apiLogService;

    @Autowired
    private TaskWrkLogService taskWrkLogService;

    @Autowired
    private ToWmsService toWmsService;

    @RequestMapping(value = "/taskWrkLog/{id}/auth")
    @ManagerAuth
@@ -141,41 +134,7 @@
    public R resubmitTheTask(@RequestParam String taskNo) {
        TaskWrkLog taskWrk = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("task_no", taskNo));
        if (!Cools.isEmpty(taskWrk)) {
            HashMap<String, Object> headParam = new HashMap<>();
            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {//完成
                headParam.put("Result", 1);
            } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
                headParam.put("Result", 2);
            }
            String response = "";
            Boolean bool = false;
            try {
                headParam.put("TaskNo", taskWrk.getTaskNo());
                log.info("重新上报任务完结={}", taskWrk);
                response = new HttpHandler.Builder()
                        // .setHeaders(headParam)
                        .setUri(wmsUrl)
                        .setPath(TaskExecCallback)
                        .setJson(JSON.toJSONString(headParam))
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);

                if (jsonObject.get("ReturnStatus").equals(0)) {
                    bool = true;
                }
            } catch (Exception e) {
                log.error("重新上报任务完结失败{},返回值={}", taskWrk, response);
            } finally {
                apiLogService.save("重新上报任务完结"
                        , wmsUrl + TaskExecCallback
                        , null
                        , "127.0.0.1"
                        , JSON.toJSONString(headParam)
                        , response
                        , bool
                );
            }
            toWmsService.addReportLog(taskWrk);
        }
        return R.ok();
    }