#lsh

18516761980

2022-10-10 a07704c2fb0f7cd2a67b38f469c079062c92e6f9

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

@@ -623,21 +623,26 @@
    @Transactional
    public void startUpTestPACK(TestMast testMast) {

        //启动测试请求
//        ReturnT<String> result=startUpTestPACK1(testMast);
//        if (!result.isSuccess()) {
//            log.error("测试申请失败", testMast.getBarcode());
//            throw new CoolException("测试申请失败");
//        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()));
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                .eq("loc_no", testMast.getLocNo())
                .eq("loc_sts","F")
        );
        if (Cools.isEmpty(locMast)) {
            throw new CoolException(BaseRes.PARAM);
        }

        Date now = new Date();
        testMast.setStatus(1);
        testMast.setChannel(locMast.getChannel());
        testMast.setModiTime(now);
        testMast.setAppeTime(now);

//        启动测试请求
        ReturnT<String> result=startUpTestPACK1(testMast);
        if (!result.isSuccess()) {
            log.error("测试申请失败", testMast.getBarcode());
            throw new CoolException("测试申请失败");
        }

        if (!testMastService.insert(testMast)){
            throw new CoolException("添加testMast失败");
        }
@@ -657,8 +662,8 @@
    }
    @Override
    @Transactional
    public void suspendTestPACK() {
        ReturnT<String> result=suspendTestPACK1();
    public void suspendTestPACK(String channel) {
        ReturnT<String> result=suspendTestPACK1(channel);
        if (!result.isSuccess()) {
            log.error("暂停测试失败");
        }
@@ -666,12 +671,13 @@
    @Transactional
    public ReturnT<String> startUpTestPACK1(TestMast testMast){
        try {
            CombParam combParam = new CombParam();
            combParam.setPackNo(testMast.getLocNo());
            combParam.setPackName(testMast.getUserId());
            combParam.setLocNo(testMast.getBarcode());
            combParam.setRequestTime(DateUtils.convert(new Date()));
            return postMesData(renUrl,startUpTestPACK,combParam);
            Review review=new Review();
            review.setLocNo(testMast.getLocNo());
            review.setUserId(testMast.getUserId());
            review.setBarcode(testMast.getBarcode());
            review.setChannel(testMast.getChannel().toString());
            review.setRequestTime(DateUtils.convert(new Date()));
            return postMesData(renUrl,startUpTestPACK,review);
        }catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
@@ -680,10 +686,11 @@
        }
    }
    @Transactional
    public ReturnT<String> suspendTestPACK1(){
    public ReturnT<String> suspendTestPACK1(String channel){
        try {
            Review review=new Review();
            review.setPause(true);
            review.setPause("true");
            review.setChannel(channel);
            review.setRequestTime(DateUtils.convert(new Date()));
            return postMesData(renUrl,suspendTestPACK,review);
        }catch (Exception e) {
@@ -695,6 +702,12 @@
    }

    private ReturnT<String> postMesData(String URL,String Path,Object combParam){
        String name="";
        if (URL.equals(mesUrl)){
            name="mes系统";
        }else if (URL.equals(renUrl)){
            name="测试系统";
        }
        if(combParam != null){
            String response = "";
            boolean success = false;
@@ -710,16 +723,16 @@
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getInteger("code").equals(200)) {
                    if (jsonObject.getDate("isComplete").equals(true)){
//                    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 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);
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", URL+"/"+Path, JSON.toJSONString(combParam), response);
                    throw new CoolException("上报mes系统失败");
                }
            } catch (Exception e) {
@@ -730,8 +743,8 @@
                try {
                    // 保存接口日志
                    apiLogService.save(
                            "成品库入库上报",
                            URL + Path,
                            "上报"+name,
                            URL +"/"+ Path,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(combParam),