From 2a81385554517077da0d2d115355335147e5d8db Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Wed, 2 Jul 2025 15:29:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/domain/form/DeviceForm.java | 2 +- .../domain/query/DeviceTypeQueryCriteria.java | 3 +++ .../service/impl/DeviceServiceImpl.java | 23 +++++++++++-------- .../mapper/equipment/DeviceMapper.xml | 23 ++++--------------- .../mapper/equipment/DeviceTypeMapper.xml | 3 +++ 5 files changed, 26 insertions(+), 28 deletions(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java index 77713ed..d1c7187 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java @@ -21,7 +21,7 @@ public class DeviceForm { private Long assignId; @Schema(title = "设备类型") - private Long deviceType; + private Long deviceTypeId; @Schema(title = "客户号") private Long customerId; diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java index 67b6049..9d2010e 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java @@ -15,6 +15,9 @@ import java.util.Set; @Data public class DeviceTypeQueryCriteria extends BaseEntity implements Serializable { + @Schema(name = "设备类型id") + private Long deviceTypeId; + @Schema(name = "型号名称") private String typeName; diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java index 08b6e5e..8f8453a 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java @@ -9,10 +9,13 @@ import com.fuyuanshen.common.core.utils.PageUtil; import com.fuyuanshen.common.satoken.utils.LoginHelper; import com.fuyuanshen.equipment.constants.DeviceConstants; import com.fuyuanshen.equipment.domain.Device; +import com.fuyuanshen.equipment.domain.DeviceType; import com.fuyuanshen.equipment.domain.form.DeviceForm; import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria; +import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria; import com.fuyuanshen.equipment.domain.vo.CustomerVo; import com.fuyuanshen.equipment.mapper.DeviceMapper; +import com.fuyuanshen.equipment.mapper.DeviceTypeMapper; import com.fuyuanshen.equipment.service.DeviceService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -43,6 +46,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme private final DeviceMapper deviceMapper; + private final DeviceTypeMapper deviceTypeMapper; /** @@ -56,7 +60,8 @@ public class DeviceServiceImpl extends ServiceImpl impleme @Override public PageResult queryAll(DeviceQueryCriteria criteria, Page page) throws IOException { - criteria.setCustomerId(LoginHelper.getUserId()); + // criteria.setCustomerId(LoginHelper.getUserId()); + criteria.setCurrentOwnerId(LoginHelper.getUserId()); IPage devices = deviceMapper.findAll(criteria, page); List records = devices.getRecords(); @@ -91,10 +96,13 @@ public class DeviceServiceImpl extends ServiceImpl impleme @Override @Transactional(rollbackFor = Exception.class) public void addDevice(DeviceForm deviceForm) throws Exception { - - // 获取当前登录用户信息 - // LoginUser user = LoginHelper.getLoginUser(); - + DeviceTypeQueryCriteria queryCriteria = new DeviceTypeQueryCriteria(); + queryCriteria.setDeviceTypeId(deviceForm.getId()); + queryCriteria.setCustomerId(LoginHelper.getUserId()); + List deviceTypes = deviceTypeMapper.findAll(queryCriteria); + if (deviceTypes.isEmpty()) { + throw new Exception("设备类型不存在!!!"); + } // 保存图片并获取URL String imageUrl = saveDeviceImage(deviceForm.getFile(), deviceForm.getDeviceName()); @@ -103,6 +111,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme // 转换对象并插入数据库 Device device = new Device(); + device.setCurrentOwnerId(LoginHelper.getUserId()); BeanUtil.copyProperties(deviceForm, device, true); deviceMapper.insert(device); @@ -110,8 +119,6 @@ public class DeviceServiceImpl extends ServiceImpl impleme } - - /** * 更新设备信息 * @@ -216,6 +223,4 @@ public class DeviceServiceImpl extends ServiceImpl impleme } - - } diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml index 82c5ace..469bc9c 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml @@ -42,11 +42,8 @@ d.id,d.device_name, d.device_pic, d.device_mac, d.device_sn, d.update_by,d.device_imei, d.update_time, d.device_type, d.remark, d.binding_status,t.type_name --- da.assignee_id AS customerId, da.assignee_name AS customerName, da.active AS deviceStatus, --- da.assigned_at AS create_time , da.assigner_name AS create_by , da.id AS assignId - from device d + FROM device d LEFT JOIN device_type t ON d.device_type = t.id --- LEFT JOIN device_assignments da ON da.device_id = d.id @@ -62,28 +59,18 @@ and d.device_type = #{criteria.deviceType} --- and da.active = #{criteria.deviceStatus} + -- and da.active = #{criteria.deviceStatus} + + + d.current_owner_id = #{criteria.currentOwnerId} and d.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]} - AND tenant_id = #{criteria.tenantId} - - - - - - - - - - - --- ORDER BY create_time DESC