From 4bc74cce28fd8c01433bed66b4d36da0ba9b3f79 Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期一, 30 十月 2023 10:29:29 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/impl/HelmetServiceImpl.java | 4 ++--
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/HelmetService.java | 2 +-
hd/pipe/materialsManage/src/main/java/com/thhy/MaterialsApplication.java | 6 +++++-
hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml | 2 +-
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/smoke/SmokeMessage.java | 2 +-
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/mapper/HelmetMapper.java | 2 +-
6 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/MaterialsApplication.java b/hd/pipe/materialsManage/src/main/java/com/thhy/MaterialsApplication.java
index fe1fda3..350cde0 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/MaterialsApplication.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/MaterialsApplication.java
@@ -2,6 +2,7 @@
import com.thhy.materials.modules.biz.helmet.smoke.SmokeServer;
import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -16,6 +17,9 @@
@EnableScheduling
public class MaterialsApplication implements CommandLineRunner {
+ @Value("${materialstcpport}")
+ private Integer tcpport;
+
@Resource
private SmokeServer smokeServer;
@@ -25,7 +29,7 @@
@Override
public void run(String... args) throws Exception {
- smokeServer.run(8973);
+ smokeServer.run(tcpport);
}
}
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/mapper/HelmetMapper.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/mapper/HelmetMapper.java
index 1f8cb49..9779300 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/mapper/HelmetMapper.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/mapper/HelmetMapper.java
@@ -48,7 +48,7 @@
List<THelmetReport> helmetReportUser(Map<String, Object> values);
- void smockInsert(TDataSmock tDataSmock);
+ void smockIn(TDataSmock tDataSmock);
List<TDataSmock> dataSmockList(Map<String, Object> values);
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/HelmetService.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/HelmetService.java
index 46fdb54..8f3eabb 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/HelmetService.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/HelmetService.java
@@ -42,7 +42,7 @@
BasicResult helmetReportUser(Map<String, Object> values);
- void smockInsert(TDataSmock tDataSmock);
+ void smockIn(TDataSmock tDataSmock);
BasicResult dataSmockList(Map<String, Object> values);
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/impl/HelmetServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/impl/HelmetServiceImpl.java
index 6ab68f7..5cad1aa 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/impl/HelmetServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/impl/HelmetServiceImpl.java
@@ -135,9 +135,9 @@
}
@Override
- public void smockInsert(TDataSmock tDataSmock) {
+ public void smockIn(TDataSmock tDataSmock) {
System.out.println("参数为---"+tDataSmock.toString());
- helmetMapper.smockInsert(tDataSmock);
+ helmetMapper.smockIn(tDataSmock);
}
@Override
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/smoke/SmokeMessage.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/smoke/SmokeMessage.java
index 45069df..9e6601c 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/smoke/SmokeMessage.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/smoke/SmokeMessage.java
@@ -73,7 +73,7 @@
tDataSmock.setPress(jsonObject11.get("Press").toString());
tDataSmock.setDc(jsonObject11.get("Dc").toString());
System.out.println("-------"+tDataSmock);
- getUserService().smockInsert(tDataSmock);
+ getUserService().smockIn(tDataSmock);
}
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
index 25d2255..de77fb4 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
@@ -553,7 +553,7 @@
order by sm_time desc
</select>
- <insert id="smockInsert" >
+ <insert id="smockIn" >
insert into t_data_smock
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="smokeId != null">
--
Gitblit v1.9.3