From c3436cf5963f23c83cd9233f2839c30d541109e9 Mon Sep 17 00:00:00 2001 From: guo Date: Fri, 12 Jan 2024 11:16:17 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/netty/udp/UDPServerHandler.java | 8 +++++- .../com/zhgd/xmgl/constant/DictConstant.java | 5 ---- .../constant/DictionaryConstant.java | 7 ++++++ .../constant/DictionaryItemConstant.java | 5 ---- .../mapper/DictionaryItemMapper.java | 2 ++ .../mapper/xml/DictionaryItemMapper.xml | 7 ++++++ .../service/IDictionaryItemService.java | 8 +++++- .../impl/DictionaryItemServiceImpl.java | 5 ++-- .../modules/location/entity/LocationData.java | 6 ++--- .../mapper/xml/LocationDataMapper.xml | 16 +++++++++--- .../service/impl/LocationDataServiceImpl.java | 25 ++++++++++++++++++- .../service/impl/ProjectServiceImpl.java | 5 ++-- ...AnalyseHardWareAlarmRecordServiceImpl.java | 4 +-- 13 files changed, 78 insertions(+), 25 deletions(-) delete mode 100644 src/main/java/com/zhgd/xmgl/constant/DictConstant.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/basicdata/constant/DictionaryConstant.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/basicdata/constant/DictionaryItemConstant.java diff --git a/src/main/java/com/zhgd/netty/udp/UDPServerHandler.java b/src/main/java/com/zhgd/netty/udp/UDPServerHandler.java index 35c41d648..3cb8a3430 100644 --- a/src/main/java/com/zhgd/netty/udp/UDPServerHandler.java +++ b/src/main/java/com/zhgd/netty/udp/UDPServerHandler.java @@ -2,6 +2,7 @@ package com.zhgd.netty.udp; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.zhgd.xmgl.modules.location.entity.LocationData; @@ -73,7 +74,12 @@ public class UDPServerHandler extends SimpleChannelInboundHandler { + DictionaryItem getLocationDataDisappearTimeByProjectSn(@Param("projectSn") String projectSn, @Param("dictionaryEncoding") String dictionaryEncoding); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/DictionaryItemMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/DictionaryItemMapper.xml index 318d6b7bb..7f345395f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/DictionaryItemMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/DictionaryItemMapper.xml @@ -1,4 +1,11 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java index 8ba288c83..e9758b5d6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java @@ -9,7 +9,13 @@ import java.util.List; public interface IDictionaryItemService extends IService { - public List getDictList(String dictionaryEncoding); + /** + * 查询基础字典信息列表（查启用的） + * + * @param dictionaryEncoding + * @return + */ + List getDictList(String dictionaryEncoding); void add(DictionaryItem dictionaryItem); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java index 0f2d4281f..7dd94b56c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java @@ -5,7 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.basicdata.constant.DictionaryItemConstant; +import com.zhgd.xmgl.enums.ParamEnum; +import com.zhgd.xmgl.modules.basicdata.constant.DictionaryConstant; import com.zhgd.xmgl.modules.basicdata.entity.Dictionary; import com.zhgd.xmgl.modules.basicdata.entity.DictionaryItem; import com.zhgd.xmgl.modules.basicdata.mapper.DictionaryItemMapper; @@ -55,7 +56,7 @@ public class DictionaryItemServiceImpl extends ServiceImpl listEnableByConstructionStage(String projectConstructionStage) { return dictionaryItemMapper.selectList(new LambdaQueryWrapper() - .eq(DictionaryItem::getDictionaryEncoding, DictionaryItemConstant.PROJECT_CONSTRUCTION_STAGE) + .eq(DictionaryItem::getDictionaryEncoding, DictionaryConstant.PROJECT_CONSTRUCTION_STAGE) .eq(DictionaryItem::getIsEnable, 1) ); } diff --git a/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationData.java b/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationData.java index afac56d43..a91321e89 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationData.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationData.java @@ -93,10 +93,10 @@ public class LocationData implements Serializable { @ApiModelProperty(value = "标签X位置(单位像素) 相对12000*12000位置坐标") private Double pX; /** - * 标签Y位置（单位像素） + * 标签Y位置（单位像素）用这个 */ - @Excel(name = "标签Y位置（单位像素）", width = 15) - @ApiModelProperty(value = "标签Y位置（单位像素）") + @Excel(name = "标签Y位置（单位像素）用这个", width = 15) + @ApiModelProperty(value = "标签Y位置（单位像素）用这个") private Double pY; /** * 标签距离洞口（米）用这个 diff --git a/src/main/java/com/zhgd/xmgl/modules/location/mapper/xml/LocationDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/location/mapper/xml/LocationDataMapper.xml index 7ae612362..fd484e4b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/mapper/xml/LocationDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/location/mapper/xml/LocationDataMapper.xml @@ -5,11 +5,17 @@ resultType="com.zhgd.xmgl.modules.location.entity.vo.RealTimeLocationWorkerVo"> select ei.enterprise_name, i.team_name, count(*) count from location_data d + join (select max(id) id from location_data where project_sn = #{projectSn} + + and create_time >= date_sub(now(),interval #{disappearTime} second ) + + group by cardno)t on t.id=d.id + join location_tunnel lt on lt.realtime_id=d.realtime_id join worker_info wi on d.cardno = wi.location_cardno join team_info i on i.id = wi.team_id join enterprise_info ei on ei.id = wi.enterprise_id where 1 = 1 - and d.realtime_id = (select location_tunnel.realtime_id from location_tunnel where id = #{locationTunnelId}) + and lt.id = #{locationTunnelId} and d.project_sn = #{projectSn} @@ -23,9 +29,13 @@