#

LSH

2023-02-11 6d7aa57dc2769a36a4f00241f7b0014be79bb54f

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

@@ -4,7 +4,9 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.TestMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -13,9 +15,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * Created by vincent on 2022/4/8
@@ -32,12 +32,14 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private ApiLogService apiLogService;

    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) MatSyncParam param,
                                      HttpServletRequest request){
                                      HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -197,11 +199,121 @@
            orderDetails.add(detlDto);
        }
        System.out.println(JSON.toJSONString(param));
        // 2
        System.out.println("======================================");
        OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
        param1.setOrderNo("963001846497017856");
        System.out.println(JSON.toJSONString(param1));
    }

    /*...........................赣州新增..............以下.............赣州新增...........................*/
    @PostMapping("/rpc/watchDog/auth/v1")
    @AppAuth(memo = "心跳接口调用")
    public synchronized R hostName(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) HeartBeat param,
                                   HttpServletRequest request) {
        appkey = "ea1f0459efc02a79f046f982767939ae";
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

        //........
        System.out.println(String.format("id:%s,hostName:%s,requestTime:%s",
                param.getId(), param.getHostName(), param.getRequestTime()));

        return R.ok();
    }

    @PostMapping("/rpc/pakIn/auth/v1")
    @AppAuth(memo = "入库通知单接口调用")
    public synchronized R combPack(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) CombParam param,
                                   HttpServletRequest request) {
        appkey = "ea1f0459efc02a79f046f982767939ae";
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        //生成入库通知档
        openService.combPACK(param);

        Map<String, Boolean> map = new HashMap<>();
        apiLogService.save(
                "mes申请入库",
                "172.28.15.251",
                null,
                "127.0.0.1",
                JSON.toJSONString("PackNo:" + param.getPackNo()
                        + " PackName:" + param.getPackName()
                        + " RequestTime:" + param.getRequestTime()
                        + " SettingTimes:" + param.getSettingTimes()),
                "172.28.15.251",
                true
        );
        map.put("isComplete", true);
        return R.ok(map);
    }

    @PostMapping("/rpc/pakOut/auth/v1")
    @AppAuth(memo = "出库通知单接口调用")
    public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
                                     @RequestBody(required = false) CombParam param,
                                     HttpServletRequest request) {

        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        //出库开始
        openService.combPackOut(param);

        Map<String, Boolean> map = new HashMap<>();
        map.put("isComplete", true);
        return R.ok(map);
    }

    @PostMapping("/rpv/infoReview/auth/v1")
    @AppAuth(memo = "测试条码信息复核请求")
    public synchronized R infoReview(@RequestHeader(required = false) String appkey,
                                     @RequestBody(required = false) Review param,
                                     HttpServletRequest request) {
        appkey = "ea1f0459efc02a79f046f982767939ae";
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        TestMast testMast = openService.infoReview(param);
        if (testMast.getStatus() == 3) {
            return R.ok();
        } else if (testMast.getStatus() == 2) {
            return R.error("等待员工操作");
        }
        return R.error();
    }

    @PostMapping("/rpv/testFinish/auth/v1")
    @AppAuth(memo = "测试完成")
    public synchronized R testFinish(@RequestHeader(required = false) String appkey,
                                     @RequestBody(required = false) Review param,
                                     HttpServletRequest request) {
        appkey = "ea1f0459efc02a79f046f982767939ae";
        auth(appkey, param, request);
        Map<String, Boolean> map = new HashMap<>();

        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (param.getTestResult().equals("OK")) {
            map.put("isComplete", openService.testFinish(param));
        } else if (param.getTestResult().equals("NG")) {
            openService.testNG(param);
            map.put("isComplete", false);
        } else {
            map.put("isComplete", false);
        }
        return R.ok(map);
    }

    /*...........................赣州新增..............以上.............赣州新增...........................*/

}