From 01beb5de6b270341bf1ffd7a4319035ebbff31a0 Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期二, 23 七月 2024 20:27:18 +0800 Subject: [PATCH] -拧紧返修功能 --- jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java index 68de0e9..3b51f16 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java +++ b/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("涓婁紶澶辫触锛屽弬鏁颁笉瀵硅妫�鏌ワ紒"); + } + } + + } -- Gitblit v1.9.3