From dacc88c6d2255514835d280f2f2edb244a2aaa1d Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 30 Jun 2025 14:54:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../electricity/controller/ElectricityMeterController.java | 6 +++++- .../nu/modules/tq/electricity/entity/ElectricityMeter.java | 2 ++ .../modules/tq/water/controller/WaterMeterController.java | 6 +++++- .../java/com/nu/modules/tq/water/entity/WaterMeter.java | 6 ++---- .../com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml | 6 +++--- .../yiweilian/humid/controller/HumidDeviceController.java | 6 +++++- .../com/nu/modules/yiweilian/humid/entity/HumidDevice.java | 2 ++ 7 files changed, 24 insertions(+), 10 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java index 4badd1a..fa5d769 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java @@ -1,14 +1,17 @@ package com.nu.modules.tq.electricity.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.electricity.service.IElectricityMeterService; +import com.nu.modules.tq.water.entity.WaterMeter; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,7 +40,8 @@ public class ElectricityMeterController extends JeecgController page = new Page(pageNo, pageSize); - IPage pageList = service.findPage(page, electricityMeter); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(electricityMeter, req.getParameterMap()); + IPage pageList = service.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java index f9d6eb7..4576d60 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -67,6 +68,7 @@ public class ElectricityMeter implements Serializable { @ApiModelProperty(value = "描述") private String remark; + @Dict(dicCode = "nu_id", dicText = "nu_name", dictTable = "nu_base_info") private String nuId;//护理单元ID private String nuName;//护理单元 private String departId;//机构ID diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java index 831ef38..01d6b1c 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java @@ -1,12 +1,15 @@ package com.nu.modules.tq.water.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.tq.water.entity.WaterMeter; import com.nu.modules.tq.water.service.IWaterMeterService; +import com.nu.modules.yiweilian.humid.entity.HumidDevice; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -37,7 +40,8 @@ public class WaterMeterController extends JeecgController page = new Page(pageNo, pageSize); - IPage pageList = service.findPage(page, waterMeter); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(waterMeter, req.getParameterMap()); + IPage pageList = service.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java index 70a4995..3a74eb8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -70,12 +71,9 @@ public class WaterMeter implements Serializable { @ApiModelProperty(value = "描述") private String remark; - @TableField(exist = false) + @Dict(dicCode = "nu_id", dicText = "nu_name", dictTable = "nu_base_info") private String nuId;//护理单元ID - @TableField(exist = false) private String nuName;//护理单元 - @TableField(exist = false) private String departId;//机构ID - @TableField(exist = false) private String departName;//机构名称 } \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml index 394ba3f..5b7f4c8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml @@ -24,13 +24,13 @@ left join nu_iot_tq_collector b on a.cid = b.cid - AND a.address = #{params.address} + AND a.address like concat('%',#{params.address},'%') - AND a.nuId = #{params.nuId} + AND a.nu_id = #{params.nuId} - AND a.departId = #{params.departId} + AND a.depart_id = #{params.departId} AND a.relay_state = #{params.relayState} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java index 3bbd004..a349f72 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java @@ -1,7 +1,9 @@ package com.nu.modules.yiweilian.humid.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog; import com.nu.modules.tq.water.entity.WaterMeter; import com.nu.modules.yiweilian.humid.entity.HumidDevice; import com.nu.modules.yiweilian.humid.service.IHumidDeviceService; @@ -9,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -36,7 +39,8 @@ public class HumidDeviceController extends JeecgController page = new Page(pageNo, pageSize); - IPage pageList = service.findPage(page, humidDevice); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(humidDevice, req.getParameterMap()); + IPage pageList = service.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java index 04b06ab..8af0d59 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; @@ -105,6 +106,7 @@ public class HumidDevice implements Serializable { @TableField(exist = false) private Integer alarmCn; //告警数量 + @Dict(dicCode = "nu_id", dicText = "nu_name", dictTable = "nu_base_info") private String nuId;//护理单元ID private String nuName;//护理单元 private String departId;//机构ID