From 34d189e3753ccad63506d7a8306716e744e2a738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 10 Jun 2025 16:21:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E7=94=B5=E8=A1=A8=E6=B0=B4?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/shiro/ShiroConfig.java | 2 + .../service/impl/CameraInfoServiceImpl.java | 7 ++- .../ElectricityMeterController.java | 23 +++++++++ .../electricity/entity/ElectricityMeter.java | 11 ++++- .../mapper/ElectricityMeterMapper.java | 4 ++ .../mapper/xml/ElectricityMeterMapper.xml | 47 ++++++++++++++++++ .../service/IElectricityMeterService.java | 5 +- .../impl/ElectricityMeterServiceImpl.java | 21 +++++--- .../java/com/nu/modules/tq/utils/TqApi.java | 4 +- .../controller/WaterMeterController.java | 23 +++++++++ .../modules/tq/water/entity/WaterMeter.java | 13 ++++- .../tq/water/mapper/WaterMeterMapper.java | 4 ++ .../tq/water/mapper/xml/WaterMeterMapper.xml | 49 +++++++++++++++++++ .../tq/water/service/IWaterMeterService.java | 4 +- .../service/impl/WaterMeterServiceImpl.java | 42 ++++++++++------ 15 files changed, 227 insertions(+), 32 deletions(-) diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 3b5c843..d87d51c 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -83,6 +83,8 @@ public class ShiroConfig { } // 配置不会被拦截的链接 顺序判断 + filterChainDefinitionMap.put("/iot/tq/api/electricityMeter/**", "anon"); //电表回调 + filterChainDefinitionMap.put("/iot/tq/api/waterMeter/**", "anon"); //水表回调 filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录 filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除 filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除 diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java index cebe578..4232b46 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java @@ -2354,8 +2354,11 @@ public class CameraInfoServiceImpl extends ServiceImpl> queryPageList(ElectricityMeter electricityMeter, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = service.findPage(page, electricityMeter); + return Result.OK(pageList); + } + /** * 获取设备信息 * @param electricityMeter 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 c7b193d..c69a16d 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 @@ -37,7 +37,7 @@ public class ElectricityMeter implements Serializable { @Excel(name = "操作类型", width = 15) @ApiModelProperty(value = "操作类型") @TableField(exist = false) - private Integer type;//9清零 3抄表 10电表拉闸 11电表合闸 43水表开闸 53水表关闸 + private Integer type;//9清零 3抄表 10电表拉闸 11电表合闸 @Excel(name = "电表值", width = 15) @ApiModelProperty(value = "电表值") private String eleValue; //电表-电量值 @@ -66,4 +66,13 @@ public class ElectricityMeter implements Serializable { @Excel(name = "描述", width = 15) @ApiModelProperty(value = "描述") private String remark; + + @TableField(exist = false) + 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/electricity/mapper/ElectricityMeterMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java index f0899de..18cf663 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java @@ -1,9 +1,13 @@ package com.nu.modules.tq.electricity.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.tq.electricity.entity.ElectricityMeter; +import org.apache.ibatis.annotations.Param; public interface ElectricityMeterMapper extends BaseMapper { + IPage findPage(Page page, @Param("params") ElectricityMeter electricityMeter); ElectricityMeter getElectricityMeter(ElectricityMeter electricityMeter); int insert(ElectricityMeter electricityMeter); int update(ElectricityMeter electricityMeter); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml index 2c566d8..287019a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml @@ -2,6 +2,53 @@ + + + select + a.id, + a.cid, + a.address, + a.water_value as waterValue, + a.relay_state as relayState, + a.battery_state as batteryState, + a.read_time as readTime, + a.remark, + b.online, + b.csq, + b.disconnect_time as disconnectTime, + b.connect_time as connectTime, + a.nu_id as nuId, + a.nu_name as nuName, + a.depart_id as departId, + a.depart_name as departName + from nu_iot_tq_water_meter a + left join nu_iot_tq_collector b on a.cid = b.cid + + + AND a.address = #{params.address} + + + AND a.nuId = #{params.nuId} + + + AND a.departId = #{params.departId} + + + AND a.relay_state = #{params.relayState} + + + AND b.online = #{params.online} + + + AND b.csq > 20 + + + AND b.csq >= 10 AND b.csq <=20 + + + AND b.csq < 10 + + + +