From fa417ea81d76125b71d106195c2defacd5ca3cd9 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 12 Mar 2026 10:39:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BA=E5=9F=9F=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nu/dto/ElderInfoMQDto.java | 4 +- .../java/com/nu/entity/ElderInfoEntity.java | 4 +- .../controller/CameraInfoController.java | 12 +++++ .../tplink/camera/entity/CameraInfo.java | 8 ++- .../camera/mapper/CameraInfoMapper.java | 2 + .../camera/mapper/xml/CameraInfoMapper.xml | 24 +++++++++ .../camera/service/ICameraInfoService.java | 2 + .../service/impl/CameraInfoServiceImpl.java | 5 ++ .../controller/NuBaseInfoController.java | 26 ++++++++++ .../modules/nubaseinfo/entity/NuBaseInfo.java | 1 + .../nubaseinfo/mapper/NuBaseInfoMapper.java | 8 +++ .../mapper/xml/NuBaseInfoMapper.xml | 25 ++++++++++ .../service/INuBaseInfoService.java | 4 ++ .../service/impl/NuBaseInfoServiceImpl.java | 50 +++++++++++++++++++ 14 files changed, 170 insertions(+), 5 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java index 09f3edcb..b2d14bd3 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java @@ -297,8 +297,8 @@ public class ElderInfoMQDto implements Serializable { /** * 长者入住时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date checkinTime; } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java index 666e17de..ac9691cb 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java @@ -254,8 +254,8 @@ public class ElderInfoEntity implements Serializable { /** * 长者入住时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date checkinTime; /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java index 4a35ecb0..30fbdb59 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java @@ -517,4 +517,16 @@ public class CameraInfoController extends JeecgController> previewList(CameraInfo CameraInfo, + @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.previewList(page, CameraInfo); + return Result.OK(pageList); + } + } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java index a5f5a37b..4af1f07b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java @@ -48,6 +48,7 @@ public class CameraInfo implements Serializable { /**设备类型*/ @Excel(name = "设备类型", width = 15) @ApiModelProperty(value = "设备类型") + @Dict(dicCode = "tplink_device_type") private String deviceType; /**设备状态 0 离线 1 在线 2 重启中 3 升级中 4 配置中 5 同步中*/ @Excel(name = "设备状态 0 离线 1 在线 2 重启中 3 升级中 4 配置中 5 同步中", width = 15, dicCode = "tplink_status") @@ -139,9 +140,14 @@ public class CameraInfo implements Serializable { @ApiModelProperty(value = "护理单元编码") @Dict(dictTable ="nu_base_info",dicText = "nu_name",dicCode = "nu_id") private String nuId; + + /**设备维度*/ + @Excel(name = "设备维度", width = 15) + @ApiModelProperty(value = "设备维度") + @Dict(dicCode = "dimension") + private String dimension; /**护理单元*/ @ApiModelProperty(value = "护理单元") - @TableField(exist = false) private String nuName; @ApiModelProperty(value = "码流类型 0 代表主码流，1 代码子码流") @TableField(exist = false) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java index f660b561..be522c07 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java @@ -28,4 +28,6 @@ public interface CameraInfoMapper extends BaseMapper { void updateCapabilityById(CameraInfo cameraInfo); void updateDeviceStatusByDevId(CameraInfo cameraInfo); void updatePlanByDevId(CameraInfo cameraInfo); + + IPage previewList(Page page, @Param("params") CameraInfo cameraInfo); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml index e65fb655..40d6a5f0 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml @@ -272,4 +272,28 @@ where device_index = #{deviceIndex} + + diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java index d88894d7..741f2e89 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/ICameraInfoService.java @@ -86,4 +86,6 @@ public interface ICameraInfoService extends IService { * @return */ String zdyTplinkVideo(String nuId, String startTime, String endTime); + + IPage previewList(Page page, CameraInfo cameraInfo); } 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 b2be1ed9..7a0fae9a 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 @@ -2942,6 +2942,11 @@ public class CameraInfoServiceImpl extends ServiceImpl previewList(Page page, CameraInfo cameraInfo) { + return baseMapper.previewList(page, cameraInfo); + } + /** * 回放视频转mp4上传 * diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java index a32a608d..15abb9c6 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java @@ -237,4 +237,30 @@ public class NuBaseInfoController extends JeecgController> getNuId() { + String nuId = service.getNuId(); + Map map = new HashMap<>(); + map.put("nuId",nuId); + return Result.OK(map); + } + + + @AutoLog(value = "护理单元-启用停用") + @RequiresPermissions("nuBaseInfo:nu_base_info:edit") + @RequestMapping(value = "/hldyQyty", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result hldyQyty(@RequestBody NuBaseInfo nuBaseInfo) { + nuBaseInfoService.updateById(nuBaseInfo); + NuBaseInfoMQDto nuBaseInfoMQDto = new NuBaseInfoMQDto(); + BeanUtils.copyProperties(nuBaseInfo, nuBaseInfoMQDto); + rabbitMQUtil.sendToExchange("hldy.hldy", "hldy.async.updateBase", nuBaseInfoMQDto); + if(StringUtils.equals("5",nuBaseInfo.getStatus())){ + nuBaseInfoService.updateSbsf(nuBaseInfo); + } + + return Result.OK("操作成功!"); + } + } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java index 5dd69fd5..f9cb76ad 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java @@ -130,6 +130,7 @@ public class NuBaseInfo implements Serializable { private java.lang.String izSync; @ApiModelProperty(value = "负责人") + @Dict(dictTable = "nu_biz_employees_info",dicCode = "id",dicText = "name") private java.lang.String fzr; @ApiModelProperty(value = "负责人电话") diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/NuBaseInfoMapper.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/NuBaseInfoMapper.java index 7ffab7ed..d59d3ca2 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/NuBaseInfoMapper.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/NuBaseInfoMapper.java @@ -34,4 +34,12 @@ public interface NuBaseInfoMapper extends BaseMapper { List getPermissionList(@Param("employeesId") String employeesId); List queryReadList(@Param("employeesId") String employeesId,@Param("username") String username); + + void updateSbsfTplink(@Param("nuId") String nuId); + + void updateSbsfElectricity(@Param("nuId") String nuId); + + void updateSbsfWater(@Param("nuId") String nuId); + + void updateSbsfHumid(@Param("nuId") String nuId); } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml index 19d71393..41651dbb 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml @@ -91,4 +91,29 @@ + + + + + + update nu_iot_tplink_camera + set nu_id = null + where nu_id = #{nuId} + + + update nu_iot_tq_electricity_meter + set nu_id = null + where nu_id = #{nuId} + + + update nu_iot_tq_water_meter + set nu_id = null + where nu_id = #{nuId} + + + update nu_iot_yiweilian_humid_device + set nu_id = null + where nu_id = #{nuId} + + diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/INuBaseInfoService.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/INuBaseInfoService.java index 42112f34..84dfab3c 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/INuBaseInfoService.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/INuBaseInfoService.java @@ -25,4 +25,8 @@ public interface INuBaseInfoService extends IService { IPage qyList(Page page, QueryWrapper queryWrapper); IPage qyPemissionList(Page page, QueryWrapper queryWrapper,String employeesId); + + String getNuId(); + + void updateSbsf(NuBaseInfo nuBaseInfo); } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java index fd657b62..00866ad9 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.dto.IotNuBaseInfoMQDto; import com.nu.entity.*; import com.nu.modules.appConfig.entity.NuAppPermission; import com.nu.modules.camerainfo.api.CameraInfoApi; @@ -20,6 +21,7 @@ import com.nu.modules.nubaseinfo.service.INuBaseInfoService; import com.nu.modules.nubaseinfo.api.INuBaseInfoApi; import com.nu.modules.nuidPermission.entity.NuAppNuidPermission; import com.nu.modules.nuidPermission.service.INuAppNuidPermissionService; +import com.nu.utils.RabbitMQUtil; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.api.ISysBaseAPI; @@ -61,6 +63,9 @@ public class NuBaseInfoServiceImpl extends ServiceImpl