#lsh

18516761980

2022-10-16 3e92e0756704a97537e730627de4ecfe99c0c034

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

@@ -205,10 +205,11 @@

    /*...........................赣州新增..............以下.............赣州新增...........................*/
    @PostMapping("/rpc/watchDog/auth/v1")
    @AppAuth(memo = "心跳接口调用")
//    @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);
@@ -221,12 +222,11 @@
        return R.ok();
    }

    @PostMapping("/rcp/pakIn/auth/v1")
    @AppAuth(memo = "入库通知单接口调用")
    @PostMapping("/rpc/pakIn/auth/v1")
//    @AppAuth(memo = "入库通知单接口调用")
    public synchronized R combPack(@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);
@@ -238,8 +238,8 @@
        map.put("isComplete",true);
        return R.ok(map);
    }
    @PostMapping("/rcp/pakOut/auth/v1")
    @AppAuth(memo = "出库通知单接口调用")
    @PostMapping("/rpc/pakOut/auth/v1")
//    @AppAuth(memo = "出库通知单接口调用")
    public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) CombParam param,
                                   HttpServletRequest request){
@@ -257,50 +257,43 @@
    }

    @PostMapping("/rpv/infoReview/auth/v1")
    @AppAuth(memo = "测试条码信息复核请求")
//    @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);
        }
        openService.infoReview(param);

        return R.ok();
        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 = "测试完成")
//    @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")){
        if (param.getTestResult().equals("OK")){
            map.put("isComplete",openService.testFinish(param));
        }else {
        }else if(param.getTestResult().equals("NG")){
            openService.testNG(param);
            map.put("isComplete",false);
        }else{
            map.put("isComplete",false);
        }
        return R.ok(map);
    }
    @PostMapping("/rpv/test/open/auth")
    @AppAuth(memo = "模拟测试接口")
    public synchronized R test1(@RequestHeader(required = false) String appkey,
                                     @RequestBody(required = false) Object param,
                                     HttpServletRequest request){

        auth(appkey, param, request);

        System.out.println(param);

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