From 1b17a81eeb1ac1e70aec5e7e6a8f023571bfe836 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 11 Nov 2025 18:10:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/system/SysUserMapper.xml | 46 +++++----- .../controller/water/DeviceController.java | 11 ++- .../bonus/waterdesign/domain/DeviceDto.java | 4 + .../waterdesign/mapper/DeviceMapper.java | 4 +- .../waterdesign/service/DeviceService.java | 4 +- .../service/impl/DeviceServiceImpl.java | 9 +- .../main/resources/mapper/DeviceMapper.xml | 84 +++++++++++-------- 7 files changed, 95 insertions(+), 67 deletions(-) diff --git a/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index 9f40e22..b797a0f 100644 --- a/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -45,9 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u @@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id - + - + - + - + - + - + - + - + - + insert into sys_user( user_id, @@ -173,7 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - + update sys_user @@ -193,28 +191,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where user_id = #{userId} - + update sys_user set status = #{status} where user_id = #{userId} - + update sys_user set avatar = #{avatar} where user_name = #{userName} - + update sys_user set password = #{password} where user_name = #{userName} - + update sys_user set del_flag = '2' where user_id = #{userId} - + update sys_user set del_flag = '2' where user_id in #{userId} - + - - \ No newline at end of file + + diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/DeviceController.java b/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/DeviceController.java index 66e0644..aefe322 100644 --- a/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/DeviceController.java +++ b/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/DeviceController.java @@ -2,7 +2,9 @@ package com.bonus.waterdesign.controller.water; import com.bonus.common.core.controller.BaseController; import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.domain.entity.SysUser; import com.bonus.common.core.page.TableDataInfo; +import com.bonus.system.service.ISysUserService; import com.bonus.waterdesign.domain.DeviceDto; import com.bonus.waterdesign.domain.DeviceRecord; import com.bonus.waterdesign.domain.SelectDto; @@ -36,6 +38,11 @@ public class DeviceController extends BaseController { List list = deviceService.getDeviceType(); return AjaxResult.success(list); } + @GetMapping("/getDeviceKeepUser") + public AjaxResult getDeviceKeepUser() { + List list = deviceService.getDeviceKeepUser(); + return AjaxResult.success(list); + } @PreAuthorize("@ss.hasPermi('device:add')") @PostMapping("/add") @@ -77,8 +84,8 @@ public class DeviceController extends BaseController { // 领用状态下 查询最后一次领用人和领用日期 @GetMapping("/getLastUse") - public AjaxResult getLastUse() { - return AjaxResult.success(deviceService.getLastUse()); + public AjaxResult getLastUse(DeviceRecord dto) { + return AjaxResult.success(deviceService.getLastUse(dto)); } // 领用记录 diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/domain/DeviceDto.java b/water-design-const/src/main/java/com/bonus/waterdesign/domain/DeviceDto.java index 5fe6109..1b6ca43 100644 --- a/water-design-const/src/main/java/com/bonus/waterdesign/domain/DeviceDto.java +++ b/water-design-const/src/main/java/com/bonus/waterdesign/domain/DeviceDto.java @@ -14,10 +14,14 @@ public class DeviceDto { private String deviceName; // 设备类型 private String deviceType; + // 设备类型名称 + private String deviceTypeName; // 设备编码 private String deviceCode; // 设备管理人 private Integer userId; + // 设备管理人 + private String userName; //设备状态0：闲置，1：在用 private String status; // 删除状态，0正常1删除 diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/mapper/DeviceMapper.java b/water-design-const/src/main/java/com/bonus/waterdesign/mapper/DeviceMapper.java index bcd0527..4e0d77d 100644 --- a/water-design-const/src/main/java/com/bonus/waterdesign/mapper/DeviceMapper.java +++ b/water-design-const/src/main/java/com/bonus/waterdesign/mapper/DeviceMapper.java @@ -21,9 +21,11 @@ public interface DeviceMapper { int updateReturnRecord(DeviceRecord dto); - DeviceRecord getLastUse(); + DeviceRecord getLastUse(DeviceRecord dto); List getRecordList(); int getCount(DeviceDto model); + + List getDeviceKeepUser(); } diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/service/DeviceService.java b/water-design-const/src/main/java/com/bonus/waterdesign/service/DeviceService.java index 5b4b005..d226cf9 100644 --- a/water-design-const/src/main/java/com/bonus/waterdesign/service/DeviceService.java +++ b/water-design-const/src/main/java/com/bonus/waterdesign/service/DeviceService.java @@ -24,7 +24,9 @@ public interface DeviceService { AjaxResult returnDevice(DeviceRecord dto); - DeviceRecord getLastUse(); + DeviceRecord getLastUse(DeviceRecord dto); List getRecordList(); + + List getDeviceKeepUser(); } diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/service/impl/DeviceServiceImpl.java b/water-design-const/src/main/java/com/bonus/waterdesign/service/impl/DeviceServiceImpl.java index 1f2e15e..96eec2d 100644 --- a/water-design-const/src/main/java/com/bonus/waterdesign/service/impl/DeviceServiceImpl.java +++ b/water-design-const/src/main/java/com/bonus/waterdesign/service/impl/DeviceServiceImpl.java @@ -98,12 +98,17 @@ public class DeviceServiceImpl implements DeviceService { } @Override - public DeviceRecord getLastUse() { - return deviceMapper.getLastUse(); + public DeviceRecord getLastUse(DeviceRecord dto) { + return deviceMapper.getLastUse(dto); } @Override public List getRecordList() { return deviceMapper.getRecordList(); } + + @Override + public List getDeviceKeepUser() { + return deviceMapper.getDeviceKeepUser(); + } } diff --git a/water-design-const/src/main/resources/mapper/DeviceMapper.xml b/water-design-const/src/main/resources/mapper/DeviceMapper.xml index 642d199..e11cd26 100644 --- a/water-design-const/src/main/resources/mapper/DeviceMapper.xml +++ b/water-design-const/src/main/resources/mapper/DeviceMapper.xml @@ -13,30 +13,28 @@ - UPDATE tb_device - - - - device_name = #{deviceName}, - - - device_type = #{deviceType}, - - - device_code = #{deviceCode}, - - - user_id = #{userId}, - - - status = #{status}, - - - remark = #{remark}, - - - - WHERE id = #{id} + UPDATE tb_device + + + device_name = #{deviceName}, + + + device_type = #{deviceType}, + + + device_code = #{deviceCode}, + + + user_id = #{userId}, + + + status = #{status}, + + + remark = #{remark}, + + + WHERE id = #{id} update tb_device set status = #{status} where id = #{deviceId} @@ -63,22 +61,27 @@ @@ -93,7 +96,7 @@ tdr.start_time as startTime from tb_device_record tdr left join sys_user su on tdr.user_id = su.user_id - where tdr.device_id = #{deviceId} and start_time is not null + where tdr.device_id = #{deviceId} and start_time is not null and end_time is null order by id desc limit 1 +