From 2b59de22fbd48ad356b79499722e948d7817c9c3 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期一, 22 四月 2024 15:05:17 +0800
Subject: [PATCH] add 写入opc
---
jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java | 1 +
jcdm-main/src/main/resources/mapper/bs/technologyRouteChild/BsTechnologyRouteChildInfoMapper.xml | 10 ++++++----
jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/controller/BsTechnologyRouteChildInfoController.java | 8 ++++++++
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 10 ++++++----
jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml | 1 +
5 files changed, 22 insertions(+), 8 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 f7c1c83..8210e0f 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
@@ -115,6 +115,7 @@
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+ .antMatchers("/bs/technologyRouteChild/ttest").permitAll()
.antMatchers("/websocket/**").anonymous()
// 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
.anyRequest().authenticated()
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/controller/BsTechnologyRouteChildInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/controller/BsTechnologyRouteChildInfoController.java
index 5fd06fd..2c8872f 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/controller/BsTechnologyRouteChildInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRouteChild/controller/BsTechnologyRouteChildInfoController.java
@@ -3,6 +3,7 @@
import com.jcdm.common.annotation.Log;
import com.jcdm.common.core.controller.BaseController;
import com.jcdm.common.core.domain.AjaxResult;
+import com.jcdm.common.core.domain.R;
import com.jcdm.common.core.page.TableDataInfo;
import com.jcdm.common.enums.BusinessType;
import com.jcdm.common.utils.poi.ExcelUtil;
@@ -95,4 +96,11 @@
{
return toAjax(bsTechnologyRouteChildInfoService.deleteBsTechnologyRouteChildInfoByIds(ids));
}
+
+ @GetMapping("/ttest")
+ public R Test(){
+ String code = "191S";
+ List<BsTechnologyRouteChildInfo> bsTechnologyRouteChildInfos = bsTechnologyRouteChildInfoService.selectAllTechnologyRouteByProductCode(code);
+ return R.ok(bsTechnologyRouteChildInfos);
+ }
}
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 d8cd55b..1fb88ee 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
@@ -155,8 +155,8 @@
Object SNCodeObject = miloService.readFromOpcUa(parts[0] + "." + parts[1] + ".Code").getValue();
if(null != SNCodeObject) {
String SNCode=SNCodeObject.toString();
- String a=passingStationCollectionServiceImpl.SelectSN(SNCode,parts[1]);
-// String a="1";
+// String a=passingStationCollectionServiceImpl.SelectSN(SNCode,parts[1]);
+ String a="1";
// 1:OK鍙敓浜� 2:NG涓嶅彲鐢熶骇 3:NG鍙繑宸� 4:PC妫�绱㈠け璐ワ紙鏃犺褰曪級5:PC妫�绱㈠け璐ワ紙杞欢锛�
if (StrUtil.isNotBlank(a)){
int input = Integer.parseInt(a);
@@ -175,7 +175,7 @@
}
ReadWriteEntity entity2 = new ReadWriteEntity(parts[0]+"."+parts[1]+".OrderNumber", orderNum);
- miloService.writeToOpcByte(entity2);
+ miloService.writeToOpcUa(entity2);
}
//濡傛灉鏄繑淇伐浣嶉渶瑕佷紶杈撹繑淇伐浣嶅彿
if (OPCElement.OP465_ZZ_CODE_CHECK.equals(Node) || OPCElement.OP355_ZZ_CODE_CHECK.equals(Node)){
@@ -245,6 +245,7 @@
List<DaCollectionParamConf> list;
DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
daCollectionParamConf.setGatherAddress(parts[0] + "." + parts[1]);
+ daCollectionParamConf.setRemarks("1");
list = collectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf);
List<String> nodeIdList = list.stream().map(info -> {
@@ -256,8 +257,8 @@
List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(nodeIdList);
List<DaParamCollection> daParamCollectionlist = new ArrayList<>();
for(int i=0;i<nodeIdList.size();i++){
- DaParamCollection ParamCollection = new DaParamCollection();
if(!readWriteEntityList.get(i).getValue().toString().equals("0.0")){
+ DaParamCollection ParamCollection = new DaParamCollection();
ParamCollection.setParamCode(readWriteEntityList.get(i).getIdentifier().toString().split("[.]")[2]);
ParamCollection.setLocationCode(parts[1]);
ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
@@ -272,6 +273,7 @@
daParamCollectionlist.add(ParamCollection);
}
}
+ System.out.println("11111111111111");
daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist);
}
diff --git a/jcdm-main/src/main/resources/mapper/bs/technologyRouteChild/BsTechnologyRouteChildInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/technologyRouteChild/BsTechnologyRouteChildInfoMapper.xml
index 4fff471..71785c8 100644
--- a/jcdm-main/src/main/resources/mapper/bs/technologyRouteChild/BsTechnologyRouteChildInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/technologyRouteChild/BsTechnologyRouteChildInfoMapper.xml
@@ -164,12 +164,14 @@
<select id="selectAllTechnologyRouteByProductCode" parameterType="String" resultMap="BsTechnologyRouteChildInfoResult">
- <include refid="selectBsTechnologyRouteChildInfoVo"/>
- left join bs_technology_route_info
- on bs_technology_route_info.route_code = bs_technology_route_child_info.route_code
+ SELECT
+ c.*
+ FROM
+ bs_technology_route_child_info c
+ LEFT JOIN bs_technology_route_info i ON i.route_code = c.route_code
<where>
<if test="productCode != null and productCode != ''">
- and bs_technology_route_info.product_code = #{productCode}
+ and i.product_code = #{productCode}
</if>
</where>
</select>
diff --git a/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml b/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
index 28bbb7b..fb1e17f 100644
--- a/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
@@ -48,6 +48,7 @@
<if test="collectParameterType != null and collectParameterType != ''"> and collect_parameter_type like concat('%', #{collectParameterType}, '%')</if>
<if test="productCode != null and productCode != ''"> and product_code like concat('%', #{productCode}, '%')</if>
<if test="gatherAddress != null and gatherAddress != ''"> and gather_address like concat('%', #{gatherAddress}, '%')</if>
+ <if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
</select>
--
Gitblit v1.9.3