#

LSH

2023-02-13 30155d34eade43e1713ee1022a9af4d4744acda1

 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;
@@ -102,7 +103,7 @@
    @Value("${ren.startUpTestPACK}")
    private String startUpTestPACK;

    @Value("${ren.startUpTestPACK}")
    @Value("${ren.suspendTestPACK}")
    private String suspendTestPACK;

    @Value("${mes.inPath}")
@@ -675,8 +676,7 @@
                    .eq("loc_no", testMast.getLocNo())
                    .eq("barcode", testMast.getBarcode())
                    .eq("user_id",testMast.getUserId())
                    .eq("channel",locMast.getChannel().toString())
                    .lt("status",4))){
                    .eq("channel",locMast.getChannel().toString()))){
                throw new CoolException("更新testMast失败");
            }
        }
@@ -689,7 +689,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("申请测试失败");
@@ -715,20 +715,22 @@
            review.setBarcode(testMast.getBarcode());
            review.setChannel(testMast.getChannel().toString());
            review.setRequestTime(DateUtils.convert(new Date()));
            if (testMast.getChannel()>=1 && testMast.getChannel()<=8){
            if (testMast.getChannel()<1 || testMast.getChannel()>48){
                log.error("通道有误，请查看！");
            } else if (testMast.getChannel()<=8){
                renUrl=renUrl1;
            }else if (testMast.getChannel()>=9 && testMast.getChannel()<=16){
            }else if (testMast.getChannel()<=16){
                renUrl=renUrl2;
            }else if (testMast.getChannel()>=17 && testMast.getChannel()<=24){
            }else if (testMast.getChannel()<=24){
                renUrl=renUrl3;
            }else if (testMast.getChannel()>=25 && testMast.getChannel()<=32){
            }else if (testMast.getChannel()<=32){
                renUrl=renUrl4;
            }else if (testMast.getChannel()>=33 && testMast.getChannel()<=40){
            }else if (testMast.getChannel()<=40){
                renUrl=renUrl5;
            }else if (testMast.getChannel()>=41 && testMast.getChannel()<=48){
            }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();
@@ -805,80 +807,16 @@
                case "48":
                    renUrl=renUrl6;
                    break;
                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="测试系统";
        }
        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;
    }
    /*...........................赣州新增..............以上.............赣州新增...........................*/
}