还没有写完

ZY

5 天以前 4e0da368106385d208157b9d565374733b7c4a87

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

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

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
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.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.service.TaskWrkReportService;
import com.zy.asrs.service.ToWmsService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -24,19 +24,17 @@
import org.springframework.web.bind.annotation.*;

import java.util.*;

@Slf4j
@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
@@ -46,23 +44,25 @@

    @RequestMapping(value = "/taskWrkLog/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<TaskWrkLog> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        wrapper.orderDesc(Collections.singleton("create_time"));
        return R.ok(taskWrkLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -79,10 +79,10 @@
        return R.ok();
    }

   @RequestMapping(value = "/taskWrkLog/update/auth")
   @ManagerAuth
    public R update(TaskWrkLog taskWrkLog){
        if (Cools.isEmpty(taskWrkLog)){
    @RequestMapping(value = "/taskWrkLog/update/auth")
    @ManagerAuth
    public R update(TaskWrkLog taskWrkLog) {
        if (Cools.isEmpty(taskWrkLog)) {
            return R.error();
        }
        taskWrkLogService.updateById(taskWrkLog);
@@ -91,8 +91,8 @@

    @RequestMapping(value = "/taskWrkLog/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
    public R delete(@RequestParam(value = "ids[]") Long[] ids) {
        for (Long id : ids) {
            taskWrkLogService.deleteById(id);
        }
        return R.ok();
@@ -100,7 +100,7 @@

    @RequestMapping(value = "/taskWrkLog/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<TaskWrkLog> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("taskWrkLog"));
@@ -116,7 +116,7 @@
        wrapper.like("id", condition);
        Page<TaskWrkLog> page = taskWrkLogService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (TaskWrkLog taskWrkLog : page.getRecords()){
        for (TaskWrkLog taskWrkLog : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", taskWrkLog.getTaskNo());
            map.put("value", taskWrkLog.getTaskNo());
@@ -129,7 +129,7 @@
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<TaskWrkLog> wrapper = new EntityWrapper<TaskWrkLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != taskWrkLogService.selectOne(wrapper)){
        if (null != taskWrkLogService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(TaskWrkLog.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
@@ -137,44 +137,10 @@

    @RequestMapping(value = "/taskWrkLog/resubmitTheTask/auth")
    @ManagerAuth(memo = "重新上报任务完结")
    public R resubmitTheTask(@RequestParam String taskNo){
    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
                );
            }
        if (!Cools.isEmpty(taskWrk)) {
            toWmsService.addReportLog(taskWrk);
        }
        return R.ok();
    }