From fb6f332a6eb11777332fbbef0b1ead2881ddf083 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Tue, 4 Nov 2025 15:33:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ems):=20=E7=A7=BB=E9=99=A4=E6=8C=AF?= =?UTF-8?q?=E5=8A=A8=E6=95=B0=E6=8D=AE=E8=A1=A8=E4=B8=AD=E7=9A=84=20remark?= =?UTF-8?q?=20=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除 EmsVibrationInstantMapper.xml 中对 remark 字段的映射与操作- 更新振动数据查询逻辑，移除 remark 相关字段处理 -修正 TWTempertureDataMapper.xml 中时间字段查询别名问题 - 调整温度数据查询排序字段为 recodeTime - 注释掉 TWTempertureDataController 中的权限校验注解- 在振动数据服务中增加监测点名称关联查询支持 --- .../controller/TWTempertureDataController.java | 12 ++++++------ .../service/impl/EmsVibrationInstantServiceImpl.java | 3 +++ .../mapper/ems/record/EmsVibrationInstantMapper.xml | 5 ----- .../mapper/ems/record/TWTempertureDataMapper.xml | 6 +++--- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java index 971805b5..644478f2 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/TWTempertureDataController.java @@ -45,7 +45,7 @@ public class TWTempertureDataController extends BaseController /** * 查询物联网实时数据列表 */ - @SaCheckPermission("ems/record:recordIOTInstant:list") + //@SaCheckPermission("ems/record:recordIOTInstant:list") @GetMapping("/list") public TableDataInfo list(TWTempertureData tWTempertureData, PageQuery pageQuery) { @@ -122,7 +122,7 @@ public class TWTempertureDataController extends BaseController /** * 导出物联网实时数据列表 */ - @SaCheckPermission("ems/record:recordIOTInstant:export") + //@SaCheckPermission("ems/record:recordIOTInstant:export") //@Log(title = "物联网实时数据", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TWTempertureData tWTempertureData) @@ -135,7 +135,7 @@ public class TWTempertureDataController extends BaseController /** * 获取物联网实时数据详细信息 */ - @SaCheckPermission("ems/record:recordIOTInstant:query") + //@SaCheckPermission("ems/record:recordIOTInstant:query") @GetMapping(value = "/{objid}") public R getInfo(@PathVariable("objid") Long objid) { @@ -145,7 +145,7 @@ public class TWTempertureDataController extends BaseController /** * 新增物联网实时数据 */ - @SaCheckPermission("ems/record:recordIOTInstant:add") + //@SaCheckPermission("ems/record:recordIOTInstant:add") //@Log(title = "物联网实时数据", businessType = BusinessType.INSERT) @PostMapping public R add(@RequestBody TWTempertureData tWTempertureData) @@ -157,7 +157,7 @@ public class TWTempertureDataController extends BaseController /** * 修改物联网实时数据 */ - @SaCheckPermission("ems/record:recordIOTInstant:edit") + //@SaCheckPermission("ems/record:recordIOTInstant:edit") //@Log(title = "物联网实时数据", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody TWTempertureData tWTempertureData) @@ -169,7 +169,7 @@ public class TWTempertureDataController extends BaseController /** * 删除物联网实时数据 */ - @SaCheckPermission("ems/record:recordIOTInstant:remove") + //@SaCheckPermission("ems/record:recordIOTInstant:remove") //@Log(title = "物联网实时数据", businessType = BusinessType.DELETE) @DeleteMapping("/{objids}") public R remove(@PathVariable Long[] objids) diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsVibrationInstantServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsVibrationInstantServiceImpl.java index c9a3aa47..94593d1a 100644 --- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsVibrationInstantServiceImpl.java +++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/service/impl/EmsVibrationInstantServiceImpl.java @@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.ems.base.domain.EmsBaseMonitorInfo; import org.dromara.ems.record.domain.EmsVibrationInstant; import org.dromara.ems.record.mapper.EmsVibrationInstantMapper; import org.dromara.ems.record.service.IEmsVibrationInstantService; @@ -47,6 +48,8 @@ public class EmsVibrationInstantServiceImpl implements IEmsVibrationInstantServi Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(EmsVibrationInstant.class) .selectAll(EmsVibrationInstant.class) + .select(EmsBaseMonitorInfo::getMonitorName) + .leftJoin(EmsBaseMonitorInfo.class, EmsBaseMonitorInfo::getMonitorCode, EmsVibrationInstant::getSensorId) .eq(bo.getObjId() != null, EmsVibrationInstant::getObjId, bo.getObjId()) .eq(bo.getCollectTime() != null, EmsVibrationInstant::getCollectTime, bo.getCollectTime()) .eq(StringUtils.isNotBlank(bo.getSensorId()), EmsVibrationInstant::getSensorId, bo.getSensorId()) diff --git a/ruoyi-modules/hwmom-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml b/ruoyi-modules/hwmom-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml index fccdc514..16930dff 100644 --- a/ruoyi-modules/hwmom-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml +++ b/ruoyi-modules/hwmom-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml @@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -26,7 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rdi.acceleration, rdi.temperature, rdi.recodeTime, - rdi.remark, bmi.monitor_name from T_VibrationSensor_Data rdi left join ems_base_monitor_info bmi on rdi.sensor_id = bmi.monitor_code @@ -75,7 +73,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" acceleration, temperature, recodeTime, - remark, #{collectTime}, @@ -85,7 +82,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{acceleration}, #{temperature}, #{recodeTime}, - #{remark}, @@ -99,7 +95,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" acceleration = #{acceleration}, temperature = #{temperature}, recodeTime = #{recodeTime}, - remark = #{remark}, where objId = #{objId} diff --git a/ruoyi-modules/hwmom-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml b/ruoyi-modules/hwmom-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml index eb158d03..41dfd614 100644 --- a/ruoyi-modules/hwmom-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml +++ b/ruoyi-modules/hwmom-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml @@ -72,9 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and twtd.monitorId = #{monitorId} - and collectTime between #{params.beginCollectTime} and #{params.endCollectTime} + and twtd.collectTime between #{params.beginCollectTime} and #{params.endCollectTime} - and recodeTime between #{params.beginRecordTime} and #{params.endRecordTime} + and twtd.recodeTime between #{params.beginRecordTime} and #{params.endRecordTime} order by twtd.collectTime @@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and twtd.monitorId = #{monitorId} - order by twtd.recordTime desc + order by twtd.recodeTime desc