From 43349914d7ce3526e7b8af7ac3092673876406ed Mon Sep 17 00:00:00 2001 From: liuzhenlei Date: Thu, 17 Oct 2024 13:13:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E6=8A=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../puyang/config/netty/BootNettyChannelInitializer.java | 7 +++++-- .../java/com/hxl/puyang/location/entity/LocationUser.java | 6 ++++++ .../java/com/hxl/puyang/location/model/PersonnelModel.java | 5 +++++ .../location/service/impl/LocationUserServiceImpl.java | 4 ++++ src/main/resources/application-dev.yml | 6 +++--- .../resources/mybatis/location/LocationRealdataMapper.xml | 2 +- src/main/resources/mybatis/location/LocationUserMapper.xml | 3 ++- 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/hxl/puyang/config/netty/BootNettyChannelInitializer.java b/src/main/java/com/hxl/puyang/config/netty/BootNettyChannelInitializer.java index 5702b81..bd7c656 100644 --- a/src/main/java/com/hxl/puyang/config/netty/BootNettyChannelInitializer.java +++ b/src/main/java/com/hxl/puyang/config/netty/BootNettyChannelInitializer.java @@ -5,6 +5,9 @@ import io.netty.channel.ChannelInitializer; import io.netty.handler.codec.string.StringDecoder; import io.netty.handler.codec.string.StringEncoder; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; + /** * @author: 刘振雷 * @time: 2024/10/15 @@ -14,10 +17,10 @@ public class BootNettyChannelInitializer extends ChannelInitializ @Override protected void initChannel(Channel ch) throws Exception { // ChannelOutboundHandler，依照逆序执行 - ch.pipeline().addLast("encoder", new StringEncoder()); + ch.pipeline().addLast("encoder", new StringEncoder(StandardCharsets.UTF_8)); // 属于ChannelInboundHandler，依照顺序执行 - ch.pipeline().addLast("decoder", new StringDecoder()); + ch.pipeline().addLast("decoder", new StringDecoder(StandardCharsets.UTF_8)); /* * * 自定义ChannelInboundHandlerAdapter diff --git a/src/main/java/com/hxl/puyang/location/entity/LocationUser.java b/src/main/java/com/hxl/puyang/location/entity/LocationUser.java index 468f93c..a66042d 100644 --- a/src/main/java/com/hxl/puyang/location/entity/LocationUser.java +++ b/src/main/java/com/hxl/puyang/location/entity/LocationUser.java @@ -234,6 +234,12 @@ public class LocationUser implements Serializable { @TableField(value = "rid") private String rid; + /** + * 卡ID + */ + @TableField(value = "cid") + private String cid; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/hxl/puyang/location/model/PersonnelModel.java b/src/main/java/com/hxl/puyang/location/model/PersonnelModel.java index 16168c9..cb3409b 100644 --- a/src/main/java/com/hxl/puyang/location/model/PersonnelModel.java +++ b/src/main/java/com/hxl/puyang/location/model/PersonnelModel.java @@ -78,4 +78,9 @@ public class PersonnelModel { * 数据的源ID */ private long oid; + + /** + * 卡ID + */ + private String cid; } diff --git a/src/main/java/com/hxl/puyang/location/service/impl/LocationUserServiceImpl.java b/src/main/java/com/hxl/puyang/location/service/impl/LocationUserServiceImpl.java index b45debc..e6cd7d8 100644 --- a/src/main/java/com/hxl/puyang/location/service/impl/LocationUserServiceImpl.java +++ b/src/main/java/com/hxl/puyang/location/service/impl/LocationUserServiceImpl.java @@ -71,10 +71,14 @@ public class LocationUserServiceImpl extends ServiceImpl SELECT CAST(s.longitude as DECIMAL(9, 6)) AS longitude, CAST(s.latitude as DECIMAL(9, 6)) AS latitude, - d.card_id AS locaterCode, + u.cid AS locaterCode, u.rid AS staffCode, 0 AS deleted, DATE_FORMAT(IF(d.update_time IS NOT NULL, d.update_time, d.create_time), '%Y%m%d%H%i%s') AS createDate, diff --git a/src/main/resources/mybatis/location/LocationUserMapper.xml b/src/main/resources/mybatis/location/LocationUserMapper.xml index 47c0deb..3ad1ef3 100644 --- a/src/main/resources/mybatis/location/LocationUserMapper.xml +++ b/src/main/resources/mybatis/location/LocationUserMapper.xml @@ -71,7 +71,8 @@ CASE USER_SEX WHEN '1' THEN '0' ELSE '1' END AS staffGender, USER_CARD_NO AS idCard, USER_PHONE AS telephone, - ID AS oid + ID AS oid, + cid AS cid FROM hxl_location_user WHERE