#

LSH

2023-02-10 6f97f82cfd59eec345d44bfa3d9c3cd3574a9cb6

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

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

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
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;
@@ -32,6 +32,8 @@

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

    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
@@ -228,6 +230,7 @@
    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);
@@ -236,6 +239,18 @@
        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);
    }
@@ -287,9 +302,12 @@
        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);