From c3fb8667774e20494a2e59cc5a3300d0056863d8 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 24 五月 2024 09:16:03 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 284 --------------------------------------------------------
1 files changed, 0 insertions(+), 284 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index a27e8e1..df30e1e 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -583,288 +583,4 @@
daParamCollectionService.insertBatch(collectionList);
}
}
-
-
- /**
- * 鑾峰彇SNCode
- */
- public String getSNCode(){
- String SNCode = "";
- return SNCode;
- }
-
- /**
- * 鍑虹珯淇濆瓨鏁版嵁
- */
- public String outSaveDate(String thoroughfare,String device) {
- String snCode = "";
- String result = "";
- String read = thoroughfare + "." + device + ".";
-
- try {
- if(nullList.stream().noneMatch(s -> s.equals(device))){
- if(moduleCodeList.stream().anyMatch(s -> s.equals(device))){
- read = read + "ModuleCode";
- }else {
- read = read + "PACKCode";
- }
- }
- snCode = miloService.readFromOpcUa(read).getValue().toString();
-
- if(null == snCode || "".equals(snCode)){
- result = "22";
- }else{
-
- String workOrderNo = "";
- String productCode = "";
- //2銆佷繚瀛樿繃绔欓噰闆嗘暟鎹�
- Object orderNumberObject = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "WorkOrderNumber").getValue();
- if(orderNumberObject!=null){
- workOrderNo = orderNumberObject.toString();
- }
-
- Object productCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "ProductType").getValue();
- if(productCodeObject!=null){
- productCode = productCodeObject.toString();
- }
-
- saveStationInfo(snCode,thoroughfare,device,workOrderNo,productCode);
- //3銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
- SaveParamData(snCode,thoroughfare,device,workOrderNo,productCode);
-
- //濡傛灉鏄湯灏惧伐绔欒鎶ュ伐
- if(device.equals("OP500")){
- RestfulService.getWorkReportResultFeedback(snCode,device,format.format(new Date()));
- //1銆佹洿鏂板伐鍗曚俊鎭�
- updateOrderInfo(snCode);
- }
-
- result = "21";
-
- }
-
- }catch (Exception e) {
- System.out.println(e.getMessage());
- }
- return result;
- }
-
-
-// /**
-// * 鍑虹珯淇濆瓨鏁版嵁
-// */
-// public String outSaveDate(String thoroughfare,String device) {
-// String result = "";
-// try {
-// //璇诲彇SNCode
-// String PACKCode = thoroughfare + "." + device + ".PACKCode";
-// Object PACKCodeObject = miloService.readFromOpcUa(PACKCode).getValue();
-// if(null == PACKCodeObject || "".equals(PACKCodeObject)){
-// result = "22";
-// }else{
-// String PACKCodeParam = PACKCodeObject.toString();
-// //1銆佹洿鏂板伐鍗曚俊鎭�
-// //updateOrderInfo();
-// //2銆佷繚瀛樿繃绔欓噰闆嗘暟鎹�
-// saveStationInfo(PACKCodeParam,thoroughfare,device);
-// //3銆佷繚瀛樺弬鏁伴噰闆嗘暟鎹�
-// SaveParamData(PACKCodeParam,thoroughfare,device,"","");
-//
-// result = "21";
-//
-// }
-//
-// }catch (Exception e) {
-//
-// }
-// return result;
-// }
-
- /**
- * 淇濆瓨杩囩珯閲囬泦
- */
- public void saveStationInfo(String packCode,String thoroughfare,String device,String workOrderNo,String productCode) throws Exception {
- SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
- sdf.setTimeZone(TimeZone.getTimeZone("GMT+8")); // CST閫氬父琛ㄧず涓浗鏍囧噯鏃堕棿锛屽嵆涓滃叓鍖�
- String prefix = thoroughfare+"."+device+".";
- String startTime = miloService.readFromOpcUa(prefix + "StartTime").getValue().toString();
- String stopTime = miloService.readFromOpcUa(prefix + "StopTime").getValue().toString();
- String stationStatus = miloService.readFromOpcUa(prefix + "StationStatus").getValue().toString();
-
- DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
- daPassingStationCollection.setSfcCode(packCode);
- daPassingStationCollection.setWorkOrderNo(workOrderNo);
- daPassingStationCollection.setProductCode(productCode);
- daPassingStationCollection.setLocationCode(device);
- String strt = TimeUtil.stringProcessing(startTime);
- String end = TimeUtil.stringProcessing(stopTime);
- daPassingStationCollection.setInboundTime(sdf.parse(strt));//鍏ョ珯鏃堕棿
- daPassingStationCollection.setOutboundTime(sdf.parse(end));//鍑虹珯鏃堕棿
- daPassingStationCollection.setOutRsSign(stationStatus);//鍑虹珯鏄惁鍚堟牸
- daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection);
- }
-
- public static void SaveParamData(String packCode,String thoroughfare,String device,String workOrderNo,String productType) throws Exception {
- List<DaCollectionParamConf> list;
- DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
- daCollectionParamConf.setGatherAddress(thoroughfare+ "." + device);
- list = collectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf);
-
- List<String> nodeIdList = list.stream().map(info -> {
- String nodeid = info.getGatherAddress();
- return nodeid;
- }).collect(Collectors.toList());
-
- if(!nodeIdList.isEmpty()){
- List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(nodeIdList);
- for (int i = 0; i < readWriteEntityList.size(); i++) {
- if(readWriteEntityList.get(i).getValue() == null){
- readWriteEntityList.get(i).setValue(" ");
- }
- }
- List<DaParamCollection> daParamCollectionlist = new ArrayList<>();
- for(int i=0;i<nodeIdList.size();i++){
- if(!readWriteEntityList.get(i).getValue().toString().equals("0.0")){
- String tt = readWriteEntityList.get(i).getValue().toString();
- DaParamCollection ParamCollection = new DaParamCollection();
- ParamCollection.setParamCode(list.get(i).getCollectParameterId());
- ParamCollection.setLocationCode(device);
- if(tt.contains("Time")){
-// String str = TimeUtil.getTimestamp(TimeUtil.stringProcessing(tt));
-// ParamCollection.setParamValue(str);
- ParamCollection.setParamValue(TimeUtil.getYyyyDdMm(TimeUtil.stringProcessing(tt)));
- }else {
- ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
- }
- ParamCollection.setSfcCode(packCode);
- if(device.contains("OP360")){
- String node = nodeIdList.get(i);
- Object value = miloService.readFromOpcUa("PACK.OP360.ModuleSNCode"+node.charAt(node.length()-1)).getValue();
- if(value!=null){
- ParamCollection.setModuleCode(value.toString());
- }
- }
- ParamCollection.setParamName(list.get(i).getCollectParameterName());
- ParamCollection.setParamUpper(list.get(i).getParamUpper());
- ParamCollection.setParamLower(list.get(i).getParamLower());
- ParamCollection.setUnit(list.get(i).getCollectParameterUnit());
- //ParamCollection.setState("鍚堟牸");
- ParamCollection.setType(list.get(i).getCollectParameterType());
- ParamCollection.setCollectionTime(new Date());
- ParamCollection.setWorkOrderNo(workOrderNo);
- ParamCollection.setProductCode(productType);
- daParamCollectionlist.add(ParamCollection);
-// daParamCollectionService.insertDaParamCollection(ParamCollection);
- }
- }
- daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
- }
- addBaseData(workOrderNo,productType,device,packCode);
-
- }
-
- public static void addBaseData(String workOrderNo,String productCode,String locationCode,String packCode){
- Map<String, String> map = new HashMap<>();
- map.put("GC", "鍗楁禂宸ュ巶");
- map.put("CXBH", "Pack绾�");
- map.put("SBBH", "璁惧001");
- map.put("YGBH", "鍛樺伐001");
- List<DaParamCollection> confList = new ArrayList<>();
- map.forEach((key, value) -> {
- List<DaCollectionParamConf> daCollectionParamConfs = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
- .eq(DaCollectionParamConf::getProcessesCode,locationCode)
- .like(DaCollectionParamConf::getCollectParameterId,key)
- .eq(DaCollectionParamConf::getRemarks,Constants.ONE));
- DaParamCollection saveData = new DaParamCollection();
- saveData.setWorkOrderNo(workOrderNo);
- saveData.setProductCode(productCode);
- saveData.setLocationCode(locationCode);
- saveData.setSfcCode(packCode);
- saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
- saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
- saveData.setCollectionTime(new Date());
- saveData.setParamValue(value);
- confList.add(saveData);
- });
- daParamCollectionService.insertBatch(confList);
- }
-
- public static void getFactoryOrder(String locationCode){
- String productionWorkOrder = RestfulService.getProductionWorkOrderRequest("", locationCode);
- JSONObject jsonObject = new JSONObject(productionWorkOrder);
- JSONObject dataObject = jsonObject.getJSONObject("data");
-
- String productNum = dataObject.getStr("productNum");
- String stationCode = dataObject.getStr("stationCode");
- String materialCode = dataObject.getStr("materialCode");
- String productionOrderNum = dataObject.getStr("productionOrderNum");
-
- OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
- omProductionOrdeInfo.setProductNum(productNum);
- omProductionOrdeInfo.setWorkOrderNo(productionOrderNum);
- omProductionOrdeInfo.setStationCode(stationCode);
- omProductionOrdeInfo.setProductCode(materialCode);
- omProductionOrdeInfoService.save(omProductionOrdeInfo);
- }
-
- public static void updateOrderInfo(String packCode){
- OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, packCode));
- one.setOrderStatus("5");
- omProductionOrdeInfoService.saveOrUpdate(one);
- }
-
- public static void avgFunction(){
-
- }
-
- public static String TightenTheConversionOkNg(String param){
- // 鍘婚櫎棣栧熬鐨勬柟鎷彿锛岀劧鍚庢寜鐓ч�楀彿鍒嗗壊瀛楃涓�
- String[] parts = param.substring(1, param.length() - 1).split(",");
-
- // 鍒涘缓涓�涓柊鐨凷tringBuilder鏉ユ瀯寤烘浛鎹㈠悗鐨勫瓧绗︿覆
- StringBuilder sb = new StringBuilder();
- sb.append('['); // 娣诲姞宸︽柟鎷彿
-
- for (int i = 0; i < parts.length; i++) {
- String part = parts[i].trim(); // 鍘婚櫎鍙兘鐨勭┖鏍�
- float value;
- try {
- value = Float.parseFloat(part); // 灏濊瘯灏嗗瓧绗︿覆杞崲涓烘诞鐐规暟
- String replacement;
- if (value == 1f) {
- replacement = "OK";
- } else if (value == 2f) {
- replacement = "NG";
- } else {
- replacement = part; // 濡傛灉涓嶆槸1鎴�2锛屽垯淇濇寔涓嶅彉
- }
- sb.append(replacement);
- if (i < parts.length - 1) {
- sb.append(','); // 娣诲姞閫楀彿锛堥櫎浜嗘渶鍚庝竴涓厓绱狅級
- }
- } catch (NumberFormatException e) {
- // 濡傛灉杞崲澶辫触锛屽垯淇濇寔鍘熸牱锛堟垨杩涜鍏朵粬閿欒澶勭悊锛�
- sb.append(part);
- if (i < parts.length - 1) {
- sb.append(',');
- }
- }
- }
- sb.append(']'); // 娣诲姞鍙虫柟鎷彿
- return sb.toString();
- }
-
-
- /**
- * 鏍￠獙鏄惁瀛樺湪NG
- * @param packCode sfcCode
- * @return boolean
- */
- public boolean checkIsNG(String packCode,String modelCode){
- List<DaPassingStationCollection> list = daPassingStationCollectionService.list(new LambdaQueryWrapper<DaPassingStationCollection>()
- .eq(StrUtil.isNotBlank(packCode),DaPassingStationCollection::getSfcCode, packCode)
- .eq(DaPassingStationCollection::getOutRsSign, Constants.UN_PASS));
- return CollUtil.isEmpty(list);
- }
-
}
--
Gitblit v1.9.3