-bug修改

admin

2024-07-30 c1da6d36b8133744017a4f1c5e97821b591f02fc

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java

@@ -505,8 +505,8 @@
    public void pushGeelycvMesFeedback(String packID, String stationCode) {
        logger.info("进入人工工位推送工厂MES数据方法-pushGeelycvMesFeedback-工位{}-pack码{}",stationCode,packID);
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
//        String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
//        String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
        String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
        String totalResult = "0";
        List<DaParamCollectionTemp> paramList = daParamCollectionTempService.list(new LambdaQueryWrapper<DaParamCollectionTemp>().eq(DaParamCollectionTemp::getSfcCode, packID).eq(DaParamCollectionTemp::getLocationCode, stationCode));
        if(paramList.size() > 0){
@@ -521,7 +521,10 @@
            for (DaParamCollectionTemp daParamCollection : paramList) {
                ChildVO childVO = new ChildVO();
                childVO.setItemCode(daParamCollection.getParamCode());
                List<DaCollectionParamConf> paramConfOneList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>().eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode()));
                List<DaCollectionParamConf> paramConfOneList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
                        .eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode())
                        .eq(DaCollectionParamConf::getProductModel, "PE01B")
                );
                DaCollectionParamConf paramConfOne = paramConfOneList.get(0);
                if(paramConfOne!=null){
                    childVO.setItemType(paramConfOne.getSpareField1());
@@ -572,8 +575,8 @@
    public void automaticWorkstationPushGeelycvMesFeedback(String packID, String stationCode,List<DaParamCollection> paramList) {
        logger.info("进入工位{}-工厂MES推送数据方法automaticWorkstationPushGeelycvMesFeedback",stationCode);
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
//        String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
//        String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
        String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
        String totalResult = "0";
        if(paramList.size() > 0){
            logger.info("进入工位{}-拼数据",stationCode);
@@ -590,7 +593,10 @@
                childVO.setItemCode(daParamCollection.getParamCode());
//                BsFormulaChildInfo childOne = bsFormulaChildInfoService.getOne(new LambdaQueryWrapper<BsFormulaChildInfo>().eq(BsFormulaChildInfo::getParamCode, daParamCollection.getParamCode()));
//                DaCollectionParamConf paramConfOne = daCollectionParamConfService.getOne(new LambdaQueryWrapper<DaCollectionParamConf>().eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode()));
                List<DaCollectionParamConf> paramConfOneList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>().eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode()));
                List<DaCollectionParamConf> paramConfOneList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
                        .eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode())
                        .eq(DaCollectionParamConf::getProductModel, "PE01B")
                );
                DaCollectionParamConf paramConfOne = paramConfOneList.get(0);
                if(paramConfOne!=null){
                    childVO.setItemType(paramConfOne.getSpareField1());
@@ -659,6 +665,7 @@
    @Override
    public void enterWeighing(DaParamCollection daParamCollection) {
        String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
//        String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
        long timestampMillis = Instant.now().toEpochMilli();
        ParentVO parentVO = new ParentVO();
        ChildVO childVO = new ChildVO();
@@ -677,17 +684,6 @@
        parentVO.setTotalResult("1");
        parentVO.setCheckList(childVOList);
        HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
//        try{
//            CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
//                logger.info("开始执行异步方法");
//                HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
//                System.out.println(execute.body());
//                logger.info("异步方法执行结束");
//                logger.info("称重异步方法{}",execute.body());
//            });
//        }catch (Exception e){
//            System.out.println(e.getMessage());
//        }
        RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"POP430",format.format(new Date()));
    }

@@ -758,4 +754,105 @@
        }
    }

    @Override
    public AjaxResult addRepairTighteningData(DaParamCollection daParamCollection) {
        try {
        String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
//            String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
            String processesCode =  daParamCollection.getLocationCode();

            long timestampMillis = Instant.now().toEpochMilli();
            ParentVO parentVO = new ParentVO();
            List<ChildVO> childVOList = new ArrayList<>();
            parentVO.setSiteCode("3983");
            parentVO.setRecordId(""+timestampMillis);
            parentVO.setStationCode(processesCode);
            parentVO.setProductNum(daParamCollection.getSfcCode());
            parentVO.setTotalResult("1");
            parentVO.setCheckList(childVOList);

            String screwNumber = daParamCollection.getScrewNumber();
            String torque = daParamCollection.getTorque();
            String angle = daParamCollection.getAngle();
            String torqueResult = daParamCollection.getTorqueResult();
            String angleResult = daParamCollection.getAngleResult();

            Map<String, String> map = new HashMap<>();
            map.put("POP320","模组");
            map.put("POP400","箱盖");

            List<String> nameLikeString = new ArrayList<>();
            nameLikeString.add(map.get(processesCode)+"拧紧最终扭矩");
            nameLikeString.add(map.get(processesCode)+"拧紧最终角度");
            nameLikeString.add(map.get(processesCode)+"拧紧最终扭矩是否在范围内");
            nameLikeString.add(map.get(processesCode)+"拧紧最终角度是否在范围内");

            if(screwNumber.contains("，")){
                String[] screwNumberSplit = screwNumber.split("，");
                String[] torqueSplit = torque.split("，");
                String[] angleSplit = angle.split("，");
                String[] torqueResultSplit = torqueResult.split("，");
                String[] angleResultSplit = angleResult.split("，");

                List<String[]> dataList = new ArrayList<String[]>();
                dataList.add(torqueSplit);
                dataList.add(angleSplit);
                dataList.add(torqueResultSplit);
                dataList.add(angleResultSplit);

                for (int k = 0; k < nameLikeString.size(); k++) {
                    for (int i = 0; i < screwNumberSplit.length; i++) {
                        String s1 = nameLikeString.get(k)+screwNumberSplit[i];
                        List<DaCollectionParamConf> confList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
                                .eq(DaCollectionParamConf::getProcessesCode, processesCode)
                                .eq(DaCollectionParamConf::getCollectParameterName, s1)
                        );
                        DaCollectionParamConf daCollectionParamConf = confList.get(0);
                        ChildVO childVO = new ChildVO();
                        childVO.setItemCode(daCollectionParamConf.getCollectParameterId());
                        childVO.setItemType(daCollectionParamConf.getSpareField1());
                        childVO.setItemText(daCollectionParamConf.getCollectParameterName());
                        String itemValue = dataList.get(k)[i];
                        childVO.setItemValue(itemValue);
                        childVO.setCheckTime(format.format(new Date()));
                        childVO.setCheckResult("1");
                        childVOList.add(childVO);
                    }
                }
            }else {
                List<String> dataList = new ArrayList<>();
                dataList.add(torque);
                dataList.add(angle);
                dataList.add(torqueResult);
                dataList.add(angleResult);
                for (int k = 0; k < nameLikeString.size(); k++) {
                    String collectParameterName = nameLikeString.get(k)+screwNumber;
                    List<DaCollectionParamConf> confList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
                            .eq(DaCollectionParamConf::getProcessesCode, processesCode)
                            .eq(DaCollectionParamConf::getCollectParameterName, collectParameterName)
                    );
                    DaCollectionParamConf daCollectionParamConf = confList.get(0);
                    ChildVO childVO = new ChildVO();
                    childVO.setItemCode(daCollectionParamConf.getCollectParameterId());
                    childVO.setItemType(daCollectionParamConf.getSpareField1());
                    childVO.setItemText(daCollectionParamConf.getCollectParameterName());
                    String itemValue = dataList.get(k);
                    childVO.setItemValue(itemValue);
                    childVO.setCheckTime(format.format(new Date()));
                    childVO.setCheckResult("1");
                    childVOList.add(childVO);
                }
            }

            System.out.println(childVOList);
            logger.info("工位{}-----------返修数据上传入参vo：{}",processesCode,new Gson().toJson(parentVO));
            HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
            logger.info("工位{}-----------返修数据上传结果：{}",processesCode,execute.body());
            return AjaxResult.success("上传成功");
        }catch (Exception e){
            return AjaxResult.error("上传失败，参数不对请检查！");
        }
    }


}