-拧紧返修功能

admin

2024-07-23 01beb5de6b270341bf1ffd7a4319035ebbff31a0

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

@@ -754,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("上传失败，参数不对请检查！");
        }
    }


}