Revert "#"

LSH

2022-08-18 2b0fb92e407df0c3abd0ed2f06ae7103c1569281

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

@@ -4,6 +4,7 @@
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.OpenService;
import com.zy.common.model.DetlDto;
@@ -13,9 +14,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
@@ -204,4 +203,90 @@
        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){
        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("/rcp/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);
        }
        //生成入库通知档
        openService.combPACK(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){

        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.infoReview(param);

        return R.ok();
    }
    @PostMapping("/rpv/testFinish/auth/v1")
    @AppAuth(memo = "测试完成")
    public synchronized R testFinish(@RequestHeader(required = false) String appkey,
                                @RequestBody(required = false) Review param,
                                HttpServletRequest request){

        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 {
            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);
    }

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

}