From 84641dabd454b06bcf2a618747929e9992f69e17 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 21 Jul 2025 15:20:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E4=BF=A1=E6=81=AFsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NuBaseInfoController.java | 16 ++++++++++++++- .../modules/nuBaseInfo/entity/NuBaseInfo.java | 20 +++++++++++++++---- .../nuBaseInfo/mapper/NuBaseInfoMapper.java | 2 ++ .../mapper/xml/NuBaseInfoMapper.xml | 8 ++++++++ .../service/INuBaseInfoService.java | 5 +++++ .../service/impl/NuBaseInfoServiceImpl.java | 5 +++++ 6 files changed, 51 insertions(+), 5 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java index 28efe63..2243dd7 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java @@ -63,6 +63,20 @@ public class NuBaseInfoController extends JeecgController> qyList(NuBaseInfo nuBaseInfo, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Map customeRuleMap = new HashMap<>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuBaseInfo, req.getParameterMap(), customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuBaseInfoService.qyList(page, queryWrapper); + return Result.OK(pageList); + } + /** * 添加 * @@ -91,7 +105,7 @@ public class NuBaseInfoController extends JeecgController edit(@RequestBody NuBaseInfo nuBaseInfo) { nuBaseInfoService.updateById(nuBaseInfo); - return Result.OK("编辑成功!"); + return Result.OK("操作成功!"); } /** diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/entity/NuBaseInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/entity/NuBaseInfo.java index 4599497..7be241f 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/entity/NuBaseInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/entity/NuBaseInfo.java @@ -1,9 +1,6 @@ package com.nu.modules.nuBaseInfo.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -83,4 +80,19 @@ public class NuBaseInfo implements Serializable { /**是否已同步0已同步 1未同步*/ @ApiModelProperty(value = "是否已同步0已同步 1未同步") private java.lang.String izSync; + + @TableField(exist = false) + private String deviceId;//摄像头 ID + @TableField(exist = false) + private String deviceName;//摄像头名称 + @TableField(exist = false) + private String deviceStatus;//摄像头状态 + @TableField(exist = false) + private String deviceMac;//摄像头状态 + + @TableField(exist = false) + private int streamType; + @TableField(exist = false) + private String deviceIndex; + } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/NuBaseInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/NuBaseInfoMapper.java index 92b214e..447fbac 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/NuBaseInfoMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/NuBaseInfoMapper.java @@ -22,4 +22,6 @@ public interface NuBaseInfoMapper extends BaseMapper { String getNuId(); IPage queryPadPageList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage qyList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/xml/NuBaseInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/xml/NuBaseInfoMapper.xml index 0123d45..4e99d2b 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/xml/NuBaseInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/mapper/xml/NuBaseInfoMapper.xml @@ -12,4 +12,12 @@ select * from nu_base_info ${ew.customSqlSegment} + + + diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/INuBaseInfoService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/INuBaseInfoService.java index e9d2f0e..023b01f 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/INuBaseInfoService.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/INuBaseInfoService.java @@ -1,5 +1,8 @@ package com.nu.modules.nuBaseInfo.service; +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.baomidou.mybatisplus.extension.service.IService; import com.nu.modules.nuBaseInfo.entity.NuBaseInfo; @@ -18,4 +21,6 @@ public interface INuBaseInfoService extends IService { List getSynchronized(String dataSourceCode,String orgCode); void batchInsert(List syncList); + + IPage qyList(Page page, QueryWrapper queryWrapper); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java index 95dd92f..191b1f7 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java @@ -84,6 +84,11 @@ public class NuBaseInfoServiceImpl extends ServiceImpl qyList(Page page, QueryWrapper queryWrapper) { + return baseMapper.qyList(page,queryWrapper); + } + @Override public void save(NuBaseInfoApiDto dto) { NuBaseInfo nuBaseInfo = new NuBaseInfo();