From 099f9af785a1beea00a573ea711561e90a458e79 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 13 Nov 2025 16:44:37 +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 --- .../controller/water/DeviceController.java | 21 ++++++++++++--- .../controller/water/ProjectController.java | 8 ++++-- .../waterdesign/domain/DeviceRecord.java | 1 + .../com/bonus/waterdesign/domain/Model.java | 2 +- .../com/bonus/waterdesign/domain/Project.java | 1 + .../bonus/waterdesign/domain/ProjectVo.java | 2 ++ .../waterdesign/mapper/DeviceMapper.java | 2 +- .../waterdesign/service/DeviceService.java | 2 +- .../service/impl/DeviceServiceImpl.java | 4 +-- .../main/resources/mapper/DeviceMapper.xml | 5 ++-- .../src/main/resources/mapper/ModelMapper.xml | 11 +++++++- .../src/main/resources/mapper/OwnerMapper.xml | 26 +++++-------------- .../main/resources/mapper/ProjectMapper.xml | 5 ++++ 13 files changed, 58 insertions(+), 32 deletions(-) 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 aefe322..cc243e7 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 @@ -26,6 +26,7 @@ public class DeviceController extends BaseController { @Autowired private DeviceService deviceService; + @PreAuthorize("@ss.hasPermi('device:list')") @GetMapping("/list") public TableDataInfo list(DeviceDto dto) { @@ -33,11 +34,13 @@ public class DeviceController extends BaseController { List list = deviceService.list(dto); return getDataTable(list); } + @GetMapping("/getDeviceType") public AjaxResult getDeviceType() { List list = deviceService.getDeviceType(); return AjaxResult.success(list); } + @GetMapping("/getDeviceKeepUser") public AjaxResult getDeviceKeepUser() { List list = deviceService.getDeviceKeepUser(); @@ -49,16 +52,19 @@ public class DeviceController extends BaseController { public AjaxResult add(@RequestBody DeviceDto dto) { return deviceService.add(dto); } + @PreAuthorize("@ss.hasPermi('device:update')") @PostMapping("/update") public AjaxResult update(@RequestBody DeviceDto dto) { return deviceService.update(dto); } + @PreAuthorize("@ss.hasPermi('device:del')") @PostMapping("/del") public AjaxResult del(@RequestBody DeviceDto dto) { return deviceService.delete(dto); } + @PreAuthorize("@ss.hasPermi('device:detail')") @GetMapping("/getById") public AjaxResult getById(String id) { @@ -73,6 +79,7 @@ public class DeviceController extends BaseController { public AjaxResult use(@RequestBody DeviceRecord dto) { return deviceService.use(dto); } + /** * 归还 */ @@ -85,12 +92,20 @@ public class DeviceController extends BaseController { // 领用状态下 查询最后一次领用人和领用日期 @GetMapping("/getLastUse") public AjaxResult getLastUse(DeviceRecord dto) { - return AjaxResult.success(deviceService.getLastUse(dto)); + DeviceRecord lastUse = deviceService.getLastUse(dto); + if (lastUse == null) { + return AjaxResult.success(new DeviceRecord()); + } else { + return AjaxResult.success(lastUse); + } } // 领用记录 @GetMapping("/getRecordList") - public AjaxResult getRecordList() { - return AjaxResult.success(deviceService.getRecordList()); + @PreAuthorize("@ss.hasPermi('device:details')") + public TableDataInfo getRecordList(DeviceRecord dto) { + startPage(); + List recordList = deviceService.getRecordList(dto); + return getDataTable(recordList); } } diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/ProjectController.java b/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/ProjectController.java index 678cdc1..ed547ea 100644 --- a/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/ProjectController.java +++ b/water-design-const/src/main/java/com/bonus/waterdesign/controller/water/ProjectController.java @@ -36,11 +36,15 @@ public class ProjectController extends BaseController { // @PreAuthorize("@ss.hasPermi('project:list')") @GetMapping("/list") public TableDataInfo list(Project project) { - startPage(); - project.setCreateBy(getUserId().toString()); List list = projectService.selectProjectList(project); return getDataTable(list); } + // 首页 + @GetMapping("/listMain") + public AjaxResult listMain(Project project) { + List list = projectService.selectProjectList(project); + return AjaxResult.success(list); + } @GetMapping("/listApp") public AjaxResult listApp(Project project) { // project.setCreateBy(getUserId().toString()); diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/domain/DeviceRecord.java b/water-design-const/src/main/java/com/bonus/waterdesign/domain/DeviceRecord.java index 82a7eab..b45a89b 100644 --- a/water-design-const/src/main/java/com/bonus/waterdesign/domain/DeviceRecord.java +++ b/water-design-const/src/main/java/com/bonus/waterdesign/domain/DeviceRecord.java @@ -12,6 +12,7 @@ public class DeviceRecord { private String deviceId; private String deviceType; private String deviceTypeName; + private String deviceCode; private String userId; private String userName; private String startTime; diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/domain/Model.java b/water-design-const/src/main/java/com/bonus/waterdesign/domain/Model.java index 894b144..7ec213c 100644 --- a/water-design-const/src/main/java/com/bonus/waterdesign/domain/Model.java +++ b/water-design-const/src/main/java/com/bonus/waterdesign/domain/Model.java @@ -44,7 +44,7 @@ public class Model { /** * 设计人员 */ - private int designer; + private String designer; /** * 设计人员姓名 diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/domain/Project.java b/water-design-const/src/main/java/com/bonus/waterdesign/domain/Project.java index 9d9c937..77928f2 100644 --- a/water-design-const/src/main/java/com/bonus/waterdesign/domain/Project.java +++ b/water-design-const/src/main/java/com/bonus/waterdesign/domain/Project.java @@ -38,6 +38,7 @@ public class Project extends BaseEntity /** 所属单位 */ // @Excel(name = "所属单位") private String unit; + private Integer unitId; /** 负责人 */ @Excel(name = "负责人") diff --git a/water-design-const/src/main/java/com/bonus/waterdesign/domain/ProjectVo.java b/water-design-const/src/main/java/com/bonus/waterdesign/domain/ProjectVo.java index cf3237d..5358243 100644 --- a/water-design-const/src/main/java/com/bonus/waterdesign/domain/ProjectVo.java +++ b/water-design-const/src/main/java/com/bonus/waterdesign/domain/ProjectVo.java @@ -16,6 +16,8 @@ public class ProjectVo { private String proLocation; private String lon; private String lat; + private String version; + private String designer; private String remark; private String level ="1"; // 设置默认值; private String levelName; 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 4e0d77d..b989fa7 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 @@ -23,7 +23,7 @@ public interface DeviceMapper { DeviceRecord getLastUse(DeviceRecord dto); - List getRecordList(); + List getRecordList(DeviceRecord dto); int getCount(DeviceDto model); 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 d226cf9..fe4eefd 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 @@ -26,7 +26,7 @@ public interface DeviceService { DeviceRecord getLastUse(DeviceRecord dto); - List getRecordList(); + List getRecordList(DeviceRecord dto); 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 96eec2d..3239a10 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 @@ -103,8 +103,8 @@ public class DeviceServiceImpl implements DeviceService { } @Override - public List getRecordList() { - return deviceMapper.getRecordList(); + public List getRecordList(DeviceRecord dto) { + return deviceMapper.getRecordList(dto); } @Override diff --git a/water-design-const/src/main/resources/mapper/DeviceMapper.xml b/water-design-const/src/main/resources/mapper/DeviceMapper.xml index e11cd26..950a3bb 100644 --- a/water-design-const/src/main/resources/mapper/DeviceMapper.xml +++ b/water-design-const/src/main/resources/mapper/DeviceMapper.xml @@ -105,9 +105,10 @@ su.nick_name as userName, tdr.start_time as startTime, tdr.end_time as endTime, - tdr.status as status, + td.status as status, + td.device_code as deviceCode, td.device_type as deviceType, - sd.dict_label as deviceTypeName + sd.type_name as deviceTypeName from tb_device_record tdr left join tb_device td on tdr.device_id = td.id diff --git a/water-design-const/src/main/resources/mapper/ModelMapper.xml b/water-design-const/src/main/resources/mapper/ModelMapper.xml index 87c808c..f955315 100644 --- a/water-design-const/src/main/resources/mapper/ModelMapper.xml +++ b/water-design-const/src/main/resources/mapper/ModelMapper.xml @@ -83,6 +83,9 @@ + + + @@ -118,7 +121,10 @@ n.node_name, n.level AS node_level, n.node_count AS node_count_detail, - m.model_url + m.model_url, + m.version, + m.designer, + m.remark FROM project_node n LEFT JOIN tb_project p ON p.id = n.project_id AND n.del_flag = '0' @@ -137,6 +143,9 @@ AND p.id = #{projectId} + + AND m.designer like concat('%',#{designer},'%') + order by n.create_time