From a6bcf9902e3301deeff27673ab6b92d3982d6bde Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 02 Mar 2021 23:12:02 +0800
Subject: [PATCH] 警情分发新增接口修改，体温数据实体类修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyUdpServer/handle/UdpServerHandler.java | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyUdpServer/entity/BladeAnimalHeat.java | 2 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java | 3 ++-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml | 17 ++++++++++-------
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/Server.java | 3 ++-
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
index d2e08e4..ba58c48 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
@@ -120,7 +120,8 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入jingdan")
public R submit(@Valid @RequestBody Jingdan jingdan) {
- return R.status(jingdanService.saveOrUpdate(jingdan));
+ //return R.status(jingdanService.saveOrUpdate(jingdan));
+ return R.status(jingdanService.save(jingdan));
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml
index ff573d5..8332563 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml
@@ -94,13 +94,13 @@
</if>
</select>
- <!-- <insert id="insert">
- insert into sys_jingdan(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,
- handleP,handleTime,handName,level,coordinate,jd,wd,addvcd)
- values (#{galarmPeople},#{phoneNumber},#{place},#{content},#{galarmTime}
- ,#{waringType},#{deviceNumber},#{type},#{handleP},#{handleTime},
- #{handName},#{level},POINT(#{jd},#{wd}),#{jd},#{wd},#{addvcd})
- </insert>-->
+<!-- <insert id="insert">-->
+<!-- insert into sys_jingdan(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,-->
+<!-- handleP,handleTime,handName,level,coordinate,jd,wd,addvcd)-->
+<!-- values (#{galarmPeople},#{phoneNumber},#{place},#{content},#{galarmTime}-->
+<!-- ,#{waringType},#{deviceNumber},#{type},#{handleP},#{handleTime},-->
+<!-- #{handName},#{level},POINT(#{jd},#{wd}),#{jd},#{wd},#{addvcd})-->
+<!-- </insert>-->
<sql id="key">
@@ -202,6 +202,9 @@
<if test="level!=null and level!=''">
#{level},
</if>
+ <if test="coordinate=null and coordinate=''">
+ coordinate,
+ </if>
<if test="jd!=null and wd!=null">
POINT(#{jd},#{wd}),
</if>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/Server.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/Server.java
index 1d2dab0..323d23a 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/Server.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/Server.java
@@ -6,6 +6,7 @@
import io.netty.channel.socket.ServerSocketChannel;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
public class Server {
@@ -30,7 +31,7 @@
// 绑定处理group
bootstrap.group(boss, worker).channel(NioServerSocketChannel.class)
//保持连接数
- .option(ChannelOption.SO_BACKLOG, 300)
+ .option(ChannelOption.SO_BACKLOG, 1024)
//有数据立即发送
.option(ChannelOption.TCP_NODELAY, true)
//保持连接
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyUdpServer/entity/BladeAnimalHeat.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyUdpServer/entity/BladeAnimalHeat.java
index 413cb86..4fe43d1 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyUdpServer/entity/BladeAnimalHeat.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyUdpServer/entity/BladeAnimalHeat.java
@@ -24,7 +24,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;// bigint(20) NOT NULL COMMENT '主键',
- private Integer method;// int(1) NOT NULL COMMENT '方法名: 0 表示 infrared_aiom_picture 图片数据, 1 表示 engine_echo 心跳包 ',
+ //private Integer method;// int(1) NOT NULL COMMENT '方法名: 0 表示 infrared_aiom_picture 图片数据, 1 表示 engine_echo 心跳包 ',
private String ip;// varchar(63) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '设备IP地址',
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyUdpServer/handle/UdpServerHandler.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyUdpServer/handle/UdpServerHandler.java
index d68e948..c460e61 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyUdpServer/handle/UdpServerHandler.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyUdpServer/handle/UdpServerHandler.java
@@ -23,7 +23,7 @@
byte[] req = new byte[buf.readableBytes()];
buf.readBytes(req);
String body = new String(req, CharsetUtil.UTF_8);
- System.out.println("【NOTE】>>>>>> 收到客户端的数据："+body);
+ System.out.println("【UDP】>>>>>> 收到客户端的数据："+body);
// 回复一条信息给客户端
// channelHandlerContext.writeAndFlush(new DatagramPacket(
--
Gitblit v1.9.3