From 7ff5e9edadf446d0d033574a7b0ae802f5ac2233 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期六, 17 二月 2024 15:36:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java | 64 ++++++++++++++++++++++++++++++++
jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/OpcusConfigInit.java | 3 +
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java | 8 ++++
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java | 16 ++++++++
jcdm-admin/src/main/resources/application-druid.yml | 14 +++++-
5 files changed, 101 insertions(+), 4 deletions(-)
diff --git a/jcdm-admin/src/main/resources/application-druid.yml b/jcdm-admin/src/main/resources/application-druid.yml
index 038e666..2a15f1f 100644
--- a/jcdm-admin/src/main/resources/application-druid.yml
+++ b/jcdm-admin/src/main/resources/application-druid.yml
@@ -15,10 +15,18 @@
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
druid:
# 涓诲簱鏁版嵁婧�
+# master:
+# url: jdbc:sqlserver://192.168.0.189:1433;DataBaseName=Jcdm041-Mes
+# username: sa
+# password: JCDM@2023
master:
- url: jdbc:sqlserver://192.168.0.189:1433;DataBaseName=Jcdm041-Mes
- username: sa
- password: JCDM@2023
+ url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm041-Mes
+ username: sa
+ password: sam@123456
+# master:
+# url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm041-Mes
+# username: dt
+# password: dtroot
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java
index f044527..1d5f7ab 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java
@@ -88,4 +88,68 @@
break;
}
}
+
+ public void SNRetrieval(String Node, String value) throws Exception {
+ String[] parts = Node.split("[.]");
+ if(value=="1") {
+ //SN鍙锋绱�
+ ClientHandler clientHandler=new ClientHandler();
+ NodeEntity SN_node= NodeEntity.builder().index(2).identifier(parts[0]+"."+parts[1]+".SNCode").value("").type("").build();
+ String SNCode=clientHandler.read(SN_node);
+
+ String a=daPassingStationCollectionService.SelectSN(SNCode);
+
+ // 1:OK鍙敓浜� 2:NG涓嶅彲鐢熶骇 3:NG鍙繑宸� 4:PC妫�绱㈠け璐ワ紙鏃犺褰曪級5:PC妫�绱㈠け璐ワ紙杞欢锛�
+ NodeEntity node1= NodeEntity.builder().index(2).identifier(parts[0]+"."+parts[1]+".CodeCheckFeed").value(a).type("short").build();
+ Boolean out1=clientHandler.write(node1);
+ DaPassingStationCollection PassingStationCollection=new DaPassingStationCollection();
+ PassingStationCollection.setSfcCode(SNCode);
+ PassingStationCollection.setLocationCode(parts[1]);
+ PassingStationCollection.setInboundTime(new Date());
+ daPassingStationCollectionService.insertDaPassingStationCollection(PassingStationCollection);
+ }
+ }
+ public void SaveData(String Node, String value) throws Exception {
+ String[] parts = Node.split("[.]");
+ if(value=="1") {
+ //閲囬泦鏁版嵁鏈�缁堜繚瀛�
+ ClientHandler clientHandler=new ClientHandler();
+ NodeEntity SN_node= NodeEntity.builder().index(2).identifier(parts[0]+"."+parts[1]+".SNCode").value("").type("").build();
+ String SNCode=clientHandler.read(SN_node);
+ List<DaCollectionParamConf> b;
+ DaCollectionParamConf daCollectionParamConf=new DaCollectionParamConf();
+ daCollectionParamConf.setGatherAddress(parts[0]+"."+parts[1]);
+ b=collectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf);
+
+ List<NodeId> nodeId = b.stream().map(info -> {
+ NodeId nodeid = new NodeId(2,info.getGatherAddress());
+ return nodeid;
+ }).collect(Collectors.toList());
+ List<DataValue> s=readValues(nodeId);
+ //淇濆瓨PLC閲囬泦鏁版嵁
+ for(int i=0;i<nodeId.size();i++)
+ {
+ DaParamCollection Config=new DaParamCollection();
+ Config.setParamCode(nodeId.get(i).getIdentifier().toString().split("[.]")[2]);
+ Config.setLocationCode(nodeId.get(i).getIdentifier().toString().split("[.]")[1]);
+ Config.setParamValue(s.get(i).getValue().getValue().toString());
+ Config.setSfcCode(SNCode);
+ Config.setParamName(b.get(i).getGatherAddress());
+ daParamCollectionService.insertDaParamCollection(Config);
+ }
+ //鏇存柊鍑虹珯鏃堕棿锛岃绠楄妭鎷嶃��
+ DaPassingStationCollection PSC=new DaPassingStationCollection();
+ PSC.setSfcCode(SNCode);
+ List<DaPassingStationCollection> LPSC=daPassingStationCollectionService.selectDaPassingStationCollectionList(PSC);
+ if(LPSC != null && LPSC.size() > 0){
+ LPSC.get(0).setOutboundTime(new Date());
+ LPSC.get(0).setCollectionTime(new Date());
+ LPSC.get(0).setBeatTime(Long.toString(Math.abs(new Date().getTime() - LPSC.get(0).getInboundTime().getTime())));
+ daPassingStationCollectionService.updateDaPassingStationCollection(LPSC.get(0));
+ }
+ //璇锋眰鏈�缁堜繚瀛樺弽棣�:1 淇濆瓨瀹屾垚 2 淇濆瓨澶辫触 3 淇濆瓨澶辫触锛屾暟鎹綅瓒呴暱
+ NodeEntity node1= NodeEntity.builder().index(2).identifier(parts[0]+"."+parts[1]+".SaveFeedLast").value("1").type("short").build();
+ Boolean out1=clientHandler.write(node1);
+ }
+ }
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/OpcusConfigInit.java b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/OpcusConfigInit.java
index af8dde3..c836a15 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/OpcusConfigInit.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/init/OpcusConfigInit.java
@@ -25,7 +25,8 @@
public void run(String... args) throws Exception {
try {
DaOpcuaConfig daOpcuaConfig=new DaOpcuaConfig();
- daOpcuaConfig.setSubscribe("Y"); //璁剧疆鏌ヨ鏉′欢锛屾槸鍚﹁闃呯姸鎬佷负Y鐨勬墍鏈夋暟鎹�.
+ daOpcuaConfig.setSubscribe("Y"); //璁剧疆鏌ヨ鏉′欢锛岃闃呯姸鎬佺殑鎵�鏈夋暟鎹�.
+ daOpcuaConfig.setState(Long.valueOf("0")); //璁剧疆鏌ヨ鏉′欢锛屾甯哥姸鎬�.
List<DaOpcuaConfig> nodeslist=daOpcuaConfigService.selectDaOpcuaConfigList(daOpcuaConfig);
clientHandler.connect();
if (nodeslist != null && nodeslist.size() > 0) {
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java
index 28ebf58..d0e0301 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java
@@ -72,4 +72,12 @@
public int deleteDaPassingStationCollectionById(Long id);
void insertRepairRecordByIds(DaPassingStationCollection daPassingStationCollection);
+
+ /**
+ * SN妫�绱�
+ *
+ * @param SNcode 浜у搧SN
+ * @return 缁撴灉
+ */
+ public String SelectSN(String SNcode);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
index 77f4c0b..fe4d082 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
@@ -222,4 +222,20 @@
rmRepairRecordMapper.insertRmRepairRecord(rmRepairRecord);
}
}
+ @Override
+ public String SelectSN(String SNcode){
+ return "1";
+
+// --璁㈠崟鎺掍骇
+// select * from bs_order_scheduling where engine_no='2V91Y-F RA182118'
+//
+// --宸ヨ壓璺嚎瀛愯〃淇℃伅
+// select * from bs_technology_route_child_info where route_code='H_191S'
+//
+// --杩斾慨鏁版嵁
+// select * from rm_repair_record where box_code='2V91Y-F RA182118'
+//
+// --杩囩珯閲囬泦
+// select * from da_passing_station_collection --where sfc_code='2V91Y-F RA182118'
+ }
}
--
Gitblit v1.9.3