#

LSH

2023-02-13 fcc407a26c3565d3ff5feae683dbc04e71b6e3ca

#

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -17,6 +17,7 @@
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.CodeRes;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
@@ -689,7 +690,7 @@
        combParam.setLocNo(locMast.getLocNo());
        combParam.setPackSts(1);
        combParam.setRequestTime(DateUtils.convert(new Date()));
        postMesData(mesUrl,inpath,combParam);
        new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);

        if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
            throw new CoolException("申请测试失败");
@@ -730,7 +731,7 @@
            }else if (testMast.getChannel()<=48){
                renUrl=renUrl6;
            }
            return postMesData(renUrl,startUpTestPACK,review);
            return new PostMesDataUtils().postMesData("测试系统",renUrl,startUpTestPACK,review);
        }catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
@@ -810,81 +811,13 @@
                default:
                    log.error("通道有误，请查看！");
            }
            return postMesData(renUrl,suspendTestPACK,review);
            return new PostMesDataUtils().postMesData("测试系统",renUrl,suspendTestPACK,review);
        }catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
        }
    }

    private ReturnT<String> postMesData(String URL,String Path,Object combParam){
        String name="";
        if (URL.equals(mesUrl)){
            name="mes系统";
        }else if (URL.equals(renUrl1)){
            name="测试系统";
        }else if (URL.equals(renUrl2)){
            name="测试系统";
        }else if (URL.equals(renUrl3)){
            name="测试系统";
        }else if (URL.equals(renUrl4)){
            name="测试系统";
        }else if (URL.equals(renUrl5)){
            name="测试系统";
        }else if (URL.equals(renUrl6)){
            name="测试系统";
        }else {
            log.error("查询连接失败，请查看！");
        }
        if(combParam != null){
            String response = "";
            boolean success = false;
            try {
//                Map<String, Object> map = new HashMap<>();
//                map.put("appkey","ea1f0459efc02a79f046f982767939ae");
                response = new HttpHandler.Builder()
//                        .setHeaders(map)
                        .setUri(URL)
                        .setPath(Path)
                        .setJson(JSON.toJSONString(combParam))
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getInteger("code").equals(200)) {
//                    if (jsonObject.getDate("isComplete").equals(true)){
                        success = true;
//                    }else if (jsonObject.getDate("isComplete").equals(false)){
//                        success = false;
//                    }else {
//                        log.error("返回值出错!!!url：{}；request：{}；response：{}", URL+Path, JSON.toJSONString(combParam), response);
//                        throw new CoolException("返回值出错");
//                    }
                } else {
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", URL+"/"+Path, JSON.toJSONString(combParam), response);
                    throw new CoolException("上报mes系统失败");
                }
            } catch (Exception e) {
                log.error("fail", e);
//                      TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return FAIL.setMsg(e.getMessage());
            } finally {
                try {
                    // 保存接口日志
                    apiLogService.save(
                            "上报"+name,
                            URL +"/"+ Path,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(combParam),
                            response,
                            success
                    );
                } catch (Exception e) { log.error("", e); }
            }
        }
        return SUCCESS;
    }
    /*...........................赣州新增..............以上.............赣州新增...........................*/
}

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -67,6 +67,8 @@

    @Value("${mes.inPath}")
    private String inpath;
    @Value("${mes.url}")
    private String mesUrl;

    @Override
    @Transactional
@@ -713,7 +715,7 @@
                    combParam.setLocNo(locMast.getLocNo());
                    combParam.setPackSts(7);
                    combParam.setRequestTime(DateUtils.convert(new Date()));
                    new PostMesDataUtils().postMesData(inpath,combParam);
                    new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);

                    if (!locMastService.updateById(locMast)) {
                        throw new CoolException("预约库位状态失败，库位号："+locMast.getLocNo());
@@ -764,7 +766,7 @@
                combParam.setLocNo(locMast.getLocNo());
                combParam.setPackSts(2);
                combParam.setRequestTime(DateUtils.convert(new Date()));
                new PostMesDataUtils().postMesData(inpath,combParam);
                new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);

                if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
                    throw new CoolException("更新产品状态失败");
@@ -806,7 +808,7 @@
                combParam.setLocNo(locMast.getLocNo());
                combParam.setPackSts(3);
                combParam.setRequestTime(DateUtils.convert(new Date()));
                new PostMesDataUtils().postMesData(inpath,combParam);
                new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);

                if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
                    throw new CoolException("更改产品状态失败");
@@ -847,7 +849,7 @@
                combParam.setLocNo(locMast.getLocNo());
                combParam.setPackSts(4);
                combParam.setRequestTime(DateUtils.convert(new Date()));
                new PostMesDataUtils().postMesData(inpath,combParam);
                new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);

                if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
                    throw new CoolException("更改产品状态失败");

 src/main/java/com/zy/asrs/utils/PostMesDataUtils.java

@@ -16,10 +16,7 @@
    @Autowired
    private ApiLogService apiLogService;

    @Value("${mes.url}")
    private String mesUrl;

    public ReturnT<String> postMesData(String mesPath, Object combParam){
    public ReturnT<String> postMesData(String name,String URL,String mesPath, Object combParam){
        if (true){
            return SUCCESS;
        }
@@ -31,24 +28,17 @@
//                map.put("appkey","ea1f0459efc02a79f046f982767939ae");
                response = new HttpHandler.Builder()
//                        .setHeaders(map)
                        .setUri(mesUrl)
                        .setUri(URL)
                        .setPath(mesPath)
                        .setJson(JSON.toJSONString(combParam))
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getInteger("code").equals(200)) {
//                    if (jsonObject.getDate("isComplete").equals(true)){
                    success = true;
//                    }else if (jsonObject.getDate("isComplete").equals(false)){
//                        success = false;
//                    }else {
//                        log.error("返回值出错!!!url：{}；request：{}；response：{}", mesUrl+"/"+mesPath, JSON.toJSONString(combParam), response);
//                        throw new CoolException("返回值出错");
//                    }
                } else {
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", mesUrl+"/"+mesPath, JSON.toJSONString(combParam), response);
                    throw new CoolException("上报mes系统失败");
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
                    throw new CoolException("上报"+name);
                }
            } catch (Exception e) {
                log.error("fail", e);
@@ -58,8 +48,8 @@
                try {
                    // 保存接口日志
                    apiLogService.save(
                            "上报mes系统",
                            mesUrl +"/"+ mesPath,
                            "上报"+name,
                            URL +"/"+ mesPath,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(combParam),