From 9a0334b6e46d9503246d99be0a3a79945dee7919 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 09 四月 2025 09:29:40 +0800
Subject: [PATCH] 优化
---
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/TestApiController.java | 49 ++++++++++++++++
jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java | 1
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 72 +++++++++++++++++++----
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 38 +++++++++++-
4 files changed, 142 insertions(+), 18 deletions(-)
diff --git a/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java b/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java
index 56be9bf..a3457fe 100644
--- a/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java
+++ b/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java
@@ -121,6 +121,7 @@
.antMatchers("/main/paramCollection/**").permitAll()
.antMatchers("/bs/formulaChild/**").permitAll()
.antMatchers("/bigScreen/**").permitAll()
+ .antMatchers("/testApi/**").permitAll()
// 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
.anyRequest().authenticated()
.and()
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 3b31588..cd2acb8 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jcdm.common.core.domain.entity.SysDictData;
import com.jcdm.main.constant.Constants;
import com.jcdm.main.da.cellData.service.IDaCellDataService;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
@@ -12,13 +13,16 @@
import com.jcdm.main.da.testDeviceInterfaceTemp.service.IDaTestDeviceInterfaceTempService;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
+import com.jcdm.system.service.ISysDictDataService;
import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
@Component
@@ -50,15 +54,19 @@
@Autowired
private IDaCellDataService daCellDataService;
+ @Autowired
+ private ISysDictDataService sysDictDataService;
+
@Override
public void run(ApplicationArguments args) throws Exception {
//PLC鍒癕ES鐗╂枡杞崲
- Constants.materialMap.put("1","9900200461");//寰崱鐢甸┍鍔ㄧ郴缁熸�绘垚(9999276636)//9900200461
- Constants.materialMap.put("2","9900207783");//寰潰鐢甸┍鍔ㄧ郴缁熸�绘垚(9999276639)//9900207783
-
- Constants.facMaterialMap.put("9900200461","9999276636");//鐢熶骇鐗╂枡杞伐鍘傜墿鏂欒姹傚伐鍗�
- Constants.facMaterialMap.put("9900207783","9999276639");//鐢熶骇鐗╂枡杞伐鍘傜墿鏂欒姹傚伐鍗�
+ materialInit();
+// Constants.materialMap.put("1","9900200461");//寰崱鐢甸┍鍔ㄧ郴缁熸�绘垚(9999276636)//9900200461
+// Constants.materialMap.put("2","9900207783");//寰潰鐢甸┍鍔ㄧ郴缁熸�绘垚(9999276639)//9900207783
+//
+// Constants.facMaterialMap.put("9900200461","9999276636");//鐢熶骇鐗╂枡杞伐鍘傜墿鏂欒姹傚伐鍗�
+// Constants.facMaterialMap.put("9900207783","9999276639");//鐢熶骇鐗╂枡杞伐鍘傜墿鏂欒姹傚伐鍗�
//閫氶亾
Constants.thoroughfareMap.put(Constants.OP010,"JCDM035-1");
@@ -130,5 +138,25 @@
.stream().map(DaOpcuaConfig::getNode).collect(Collectors.toList());
return lists;
}
+
+ public void materialInit(){
+ SysDictData plcMesData = new SysDictData();
+ plcMesData.setDictType("plc_mes");
+
+ SysDictData imesGeelyMesData = new SysDictData();
+ imesGeelyMesData.setDictType("imes_geely_mes");
+
+ List<SysDictData> plcMesList = sysDictDataService.selectDictDataList(plcMesData);
+ List<SysDictData> imesGeelyMesList = sysDictDataService.selectDictDataList(imesGeelyMesData);
+
+ for (SysDictData sysDictData : plcMesList) {
+ Constants.materialMap.put(sysDictData.getDictLabel(),sysDictData.getDictValue());
+ }
+
+ for (SysDictData sysDictData : imesGeelyMesList) {
+ Constants.facMaterialMap.put(sysDictData.getDictLabel(),sysDictData.getDictValue());
+ }
+ System.out.println("鐗╂枡鍒濆鍖�"+Constants.materialMap+"---"+Constants.facMaterialMap);
+ }
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
index 7abf729..a9d7902 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
@@ -8,6 +8,7 @@
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -45,6 +46,7 @@
import java.lang.reflect.Field;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.Instant;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
@@ -131,20 +133,64 @@
}
@GetMapping("/productionWorkOrderRequest")
- public AjaxResult productionWorkOrderRequest(){
- List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list();
- List<RestFulOrder> restFulOrders = new ArrayList<>();
- for (OmProductionOrdeInfo omProductionOrdeInfo : list) {
- RestFulOrder order = new RestFulOrder();
- order.setProductionOrderNum(omProductionOrdeInfo.getWorkOrderNo());
- order.setProductNum(omProductionOrdeInfo.getProductNum());
- order.setMaterialCode(omProductionOrdeInfo.getMaterialCode());
- order.setStationCode(omProductionOrdeInfo.getStationCode());
- order.setPlanQty(omProductionOrdeInfo.getPlanQty());
- order.setCreateTime(format.format(omProductionOrdeInfo.getCreateTime()));
- restFulOrders.add(order);
+ public AjaxResult productionWorkOrderRequest(@RequestParam String sfcCode){
+ List<DaParamCollection> sfcCodelist = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>()
+ .select(DaParamCollection::getSfcCode)
+ .eq(DaParamCollection::getSpareField2, "1")
+ .groupBy(DaParamCollection::getSfcCode)
+ );
+ List<String> sfcList = sfcCodelist.stream().map(DaParamCollection::getSfcCode).collect(Collectors.toList());
+// List<String> sfcList = new ArrayList<>();
+// sfcList.add(sfcCode);
+ for (Object o : sfcList) {
+ ParentVO parentVO = new ParentVO();
+ parentVO.setSiteCode("3983");
+ parentVO.setRecordId(String.valueOf(Instant.now().toEpochMilli()));
+ parentVO.setStationCode("M1OP100-2");
+ parentVO.setProductNum(o.toString());
+ parentVO.setTotalResult("1");
+ List<ChildVO> list = new ArrayList<>();
+
+ for (int i = 1; i <= 16; i++) {
+ List<DaParamCollection> list1 = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>()
+ .eq(DaParamCollection::getSfcCode, o.toString())
+ .eq(DaParamCollection::getParamCode, "Cell1Code_"+i)
+ );
+ ChildVO childVO = new ChildVO();
+ childVO.setItemType("1");
+ childVO.setItemText("Cell1Code_"+i);
+ childVO.setItemValue(list1.get(0).getParamValue());
+ childVO.setItemCode("鐢佃姱缂栫爜_"+i);
+ childVO.setCheckResult("1");
+ childVO.setCheckTime(format.format(new Date()));
+ list.add(childVO);
+ }
+ for (int j = 1; j <= 16; j++) {
+ List<DaParamCollection> list1 = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>()
+ .eq(DaParamCollection::getSfcCode, o.toString())
+ .eq(DaParamCollection::getParamCode, "Cell2Code_"+j)
+ );
+ ChildVO childVO = new ChildVO();
+ childVO.setItemType("1");
+ childVO.setItemText("Cell2Code_"+j);
+ childVO.setItemValue(list1.get(0).getParamValue());
+ childVO.setItemCode("鐢佃姱缂栫爜_"+j);
+ childVO.setCheckResult("1");
+ childVO.setCheckTime(format.format(new Date()));
+ list.add(childVO);
+ }
+ parentVO.setCheckList(list);
+ HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
+ boolean update = daParamCollectionService.update(new LambdaUpdateWrapper<DaParamCollection>()
+ .set(DaParamCollection::getSpareField2, "2")
+ .eq(DaParamCollection::getSfcCode, parentVO.getProductNum())
+ );
+ System.out.println(parentVO.getProductNum()+"---------------------------------"+execute.body());
+ System.out.println(parentVO);
+ System.out.println(parentVO.getProductNum()+"+++++++++"+update);
}
- return AjaxResult.success(restFulOrders);
+ return AjaxResult.success("execute.body()");
+
}
@GetMapping("/productionOrderComponentRequest")
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/TestApiController.java b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/TestApiController.java
new file mode 100644
index 0000000..6bda2d9
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/TestApiController.java
@@ -0,0 +1,49 @@
+package com.jcdm.main.restful.qingYan.service;
+
+import com.jcdm.common.core.domain.entity.SysDictData;
+import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
+import com.jcdm.main.constant.Constants;
+import com.jcdm.system.service.ISysDictDataService;
+import com.jcdm.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/testApi")
+public class TestApiController {
+ @Autowired
+ private ISysDictDataService sysDictDataService;
+ @Autowired
+ private ISysDictTypeService sysDictTypeService;
+
+
+ @GetMapping("/testMaterial")
+ public void testMaterial()
+ {
+ Map plcMes = new HashMap();
+ Map imesGeelyMes = new HashMap();
+ SysDictData plcMesData = new SysDictData();
+ plcMesData.setDictType("plc_mes");
+
+ SysDictData imesGeelyMesData = new SysDictData();
+ imesGeelyMesData.setDictType("imes_geely_mes");
+ List<SysDictData> plcMesList = sysDictDataService.selectDictDataList(plcMesData);
+ List<SysDictData> imesGeelyMesList = sysDictDataService.selectDictDataList(imesGeelyMesData);
+ for (SysDictData sysDictData : plcMesList) {
+ plcMes.put(sysDictData.getDictLabel(),sysDictData.getDictValue());
+ }
+
+ for (SysDictData sysDictData : imesGeelyMesList) {
+ imesGeelyMes.put(sysDictData.getDictLabel(),sysDictData.getDictValue());
+ }
+ System.out.println(plcMes+"---"+imesGeelyMes);
+ System.out.println(Constants.materialMap+"---"+Constants.facMaterialMap);
+ }
+}
--
Gitblit v1.9.3