Merge pull request 'feat(equipment): 添加设备图片上传功能' (#22 ) from liwenlong/fys-Multi-tenant:jingquan into jingquan

Reviewed-on: #22
feat(equipment): 添加设备图片上传功能
2026-01-12 11:15:56 +08:00 · 2026-01-12 11:06:44 +08:00 · 2025-12-26 16:22:00 +08:00 · 2025-12-26 15:54:14 +08:00 · 2025-12-22 15:09:39 +08:00 · 2025-12-19 17:55:48 +08:00
10 changed files with 67 additions and 21 deletions
--- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java
@ -739,6 +739,7 @@ public class DeviceXinghanBizService {
        device.setCreateByName(loginUser.getNickname());
        device.setTypeName(deviceTypes.getTypeName());
        device.setDeviceType(deviceTypes.getId());
+        device.setDevicePic(deviceTypes.getDevicePic());
        if (device.getDeviceImei() != null) {
            device.setPubTopic("A/" + device.getDeviceImei());
            device.setSubTopic("B/" + device.getDeviceImei());
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java
@ -15,6 +15,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

+import java.io.IOException;
 import java.util.List;

 /**
@ -50,7 +51,7 @@ public class DeviceTypeController {
    // @Log("新增设备类型")
    @Operation(summary = "新增设备类型")
    @PostMapping(value = "/add")
-    public R<Void> createDeviceType(@Validated @RequestBody DeviceType resources) {
+    public R<Void> createDeviceType(@Validated @ModelAttribute DeviceTypeForm resources) throws IOException {
        deviceTypeService.create(resources);
        return R.ok();
    }
@ -59,7 +60,7 @@ public class DeviceTypeController {
    // @Log("修改设备类型")
    @Operation(summary = "修改设备类型")
    @PutMapping(value = "/update")
-    public  R<Void>  updateDeviceType(@Validated @RequestBody DeviceTypeForm resources) {
+    public  R<Void>  updateDeviceType(@Validated @ModelAttribute DeviceTypeForm resources) throws IOException {
        deviceTypeService.update(resources);
        return R.ok();
    }
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/TrackServiceController.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/TrackServiceController.java
@ -44,7 +44,7 @@ public class TrackServiceController extends BaseController {
    /**
     * 查询轨迹服务列表
     */
-    @SaCheckPermission("equipment:trackService:list")
+//    @SaCheckPermission("equipment:trackService:list")
    @GetMapping("/list")
    public TableDataInfo<TrackServiceVo> list(TrackServiceBo bo, PageQuery pageQuery) {
        return trackServiceService.queryPageList(bo, pageQuery);
@ -53,7 +53,7 @@ public class TrackServiceController extends BaseController {
    /**
     * 轨迹服务列表
     */
-    @SaCheckPermission("equipment:trackService:export")
+//    @SaCheckPermission("equipment:trackService:export")
    @Log(title = "轨迹服务", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(TrackServiceBo bo, HttpServletResponse response) {
@ -75,7 +75,7 @@ public class TrackServiceController extends BaseController {
    /**
     * 新增轨迹服务
     */
-    @SaCheckPermission("equipment:trackService:add")
+//    @SaCheckPermission("equipment:trackService:add")
    @Log(title = "轨迹服务", businessType = BusinessType.INSERT)
    @PostMapping(value = "/add")
    public R<Void> add(@Validated(AddGroup.class) @RequestBody TrackServiceBo bo) {
@ -85,7 +85,7 @@ public class TrackServiceController extends BaseController {
    /**
     * 修改轨迹服务
     */
-    @SaCheckPermission("equipment:trackService:edit")
+//    @SaCheckPermission("equipment:trackService:edit")
    @Log(title = "轨迹服务", businessType = BusinessType.UPDATE)
    @PostMapping(value = "/update")
    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TrackServiceBo bo) {
@ -97,7 +97,7 @@ public class TrackServiceController extends BaseController {
     *
     * @param ids 主键串
     */
-    @SaCheckPermission("equipment:trackService:remove")
+//    @SaCheckPermission("equipment:trackService:remove")
    @Log(title = "轨迹服务", businessType = BusinessType.DELETE)
    @DeleteMapping(value = "/delete")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java
@ -85,5 +85,8 @@ public class DeviceType extends TenantEntity {
    @Schema(title = "型号字典用于PC页面跳转")
    private String pcModelDictionary;

+    @Schema(title = "设备图片")
+    private String devicePic;
+

 }
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java
@ -2,6 +2,7 @@ package com.fuyuanshen.equipment.domain.form;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;

 /**
 * @Description: 设备类型
@ -48,5 +49,10 @@ public class DeviceTypeForm {
     */
    @Schema(title = "型号字典用于PC页面跳转")
    private String pcModelDictionary;
+    @Schema(title = "设备图片")
+    private String devicePic;
+
+    @Schema(title = "设备图片")
+    private MultipartFile file;

 }
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/excel/UploadDeviceDataListener.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/excel/UploadDeviceDataListener.java
@ -12,6 +12,7 @@ import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.dto.DeviceExcelImportDTO;
 import com.fuyuanshen.equipment.domain.dto.ImportResult;
 import com.fuyuanshen.equipment.domain.form.DeviceForm;
+import com.fuyuanshen.equipment.domain.form.DeviceTypeForm;
 import com.fuyuanshen.equipment.handler.ImageWriteHandler;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import lombok.extern.slf4j.Slf4j;
@ -437,8 +438,10 @@ public class UploadDeviceDataListener implements ReadListener<DeviceExcelImportD
                    newDeviceType.setAppModelDictionary(originalDto.getAppModelDictionary());
                    newDeviceType.setPcModelDictionary(originalDto.getPcModelDictionary());

+                    DeviceTypeForm deviceTypeForm = new DeviceTypeForm();
+                    BeanUtil.copyProperties(newDeviceType, deviceTypeForm, true);
                    // 创建新的设备类型
-                    params.getDeviceTypeService().create(newDeviceType);
+                    params.getDeviceTypeService().create(deviceTypeForm);

                    // 重新查询确保获取到正确的ID
                    deviceType = params.getDeviceTypeService().queryByName(device.getTypeName());
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java
@ -8,6 +8,7 @@ import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.form.DeviceTypeForm;
 import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;

+import java.io.IOException;
 import java.util.List;

 /**
@ -63,14 +64,14 @@ public interface DeviceTypeService extends IService<DeviceType> {
     *
     * @param resources /
     */
-    void create(DeviceType resources);
+    void create(DeviceTypeForm resources) throws IOException;

    /**
     * 修改设备类型
     *
     * @param resources /
     */
-    void update(DeviceTypeForm resources);
+    void update(DeviceTypeForm resources) throws IOException;

    /**
     * 多选删除
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java
@ -19,12 +19,16 @@ import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeGrantsMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
 import com.fuyuanshen.equipment.service.DeviceTypeService;
+import com.fuyuanshen.equipment.utils.FileHashUtil;
+import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.domain.vo.SysRoleVo;
+import com.fuyuanshen.system.service.ISysOssService;
 import com.fuyuanshen.system.service.ISysRoleService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@ -46,6 +50,8 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
    private final DeviceAssignmentsMapper deviceAssignmentsMapper;

    private final ISysRoleService roleService;
+    private final ISysOssService ossService;
+    private final FileHashUtil fileHashUtil;


    /**
@ -181,24 +187,38 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
-    public void create(DeviceType resources) {
+    public void create(DeviceTypeForm resources) throws IOException {

        // 校验设备类型名称
        List<DeviceType> typeName = deviceTypeMapper.selectList(new QueryWrapper<DeviceType>().eq("type_name", resources.getTypeName()));
        if (CollectionUtil.isNotEmpty(typeName)) {
            throw new RuntimeException("设备类型名称已存在，无法新增!!!");
        }
+        // 保存图片并获取URL
+        if (resources.getFile() != null) {
+            String fileHash = fileHashUtil.hash(resources.getFile());
+            SysOssVo upload = ossService.updateHash(resources.getFile(), fileHash);
+            // 强制将HTTP替换为HTTPS
+            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
+                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
+            }
+            // 设置图片路径
+            resources.setDevicePic(upload.getUrl());
+        }
+
+        DeviceType deviceType = new DeviceType();
+        BeanUtil.copyProperties(resources, deviceType, true);

        LoginUser loginUser = LoginHelper.getLoginUser();
-        resources.setCustomerId(loginUser.getUserId());
-        resources.setOwnerCustomerId(loginUser.getUserId());
-        resources.setOriginalOwnerId(loginUser.getUserId());
-        resources.setCreateByName(loginUser.getNickname());
-        deviceTypeMapper.insert(resources);
+        deviceType.setCustomerId(loginUser.getUserId());
+        deviceType.setOwnerCustomerId(loginUser.getUserId());
+        deviceType.setOriginalOwnerId(loginUser.getUserId());
+        deviceType.setCreateByName(loginUser.getNickname());
+        deviceTypeMapper.insert(deviceType);

        // 自动授权给自己
        DeviceTypeGrants deviceTypeGrants = new DeviceTypeGrants();
-        deviceTypeGrants.setDeviceTypeId(resources.getId());
+        deviceTypeGrants.setDeviceTypeId(deviceType.getId());
        deviceTypeGrants.setCustomerId(loginUser.getUserId());
        deviceTypeGrants.setGrantorCustomerId(loginUser.getUserId());
        deviceTypeGrants.setGrantedAt(new Date());
@ -213,7 +233,7 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
-    public void update(DeviceTypeForm resources) {
+    public void update(DeviceTypeForm resources) throws IOException {
        DeviceTypeGrants deviceTypeGrants = deviceTypeGrantsMapper.selectById(resources.getId());
        if (deviceTypeGrants == null) {
            throw new RuntimeException("设备类型不存在");
@ -244,6 +264,17 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
                throw new RuntimeException("无权修改该设备类型");
            }
        }
+        // 保存图片并获取URL
+        if (resources.getFile() != null) {
+            String fileHash = fileHashUtil.hash(resources.getFile());
+            SysOssVo upload = ossService.updateHash(resources.getFile(), fileHash);
+            // 强制将HTTP替换为HTTPS
+            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
+                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
+            }
+            // 设置图片路径
+            resources.setDevicePic(upload.getUrl());
+        }

        BeanUtil.copyProperties(resources, deviceType);
        deviceTypeMapper.updateById(deviceType);
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceLogMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceLogMapper.xml
@ -13,8 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        a.content,
        a.create_time AS createTime
        FROM
-        device_log a left join device b on a.device_id = b.id
-        left join device_type c on b.device_type = c.id
+        device_log a inner join device b on a.device_id = b.id
+        inner join device_type c on b.device_type = c.id
        WHERE 1 = 1
        <if test="bo.deviceType != null">
            AND c.id = #{bo.deviceType}
Author	SHA1	Message	Date
dyf	ca11ef0e35	Merge pull request 'feat(equipment): 添加设备图片上传功能' (#22 ) from liwenlong/fys-Multi-tenant:jingquan into jingquan Reviewed-on: #22	2026-01-12 11:15:56 +08:00
DragonWenLong	ef2dc6a6f6	feat(equipment): 添加设备图片上传功能 - 在DeviceType实体类中新增devicePic字段用于存储设备图片 - 修改控制器方法参数从RequestBody改为ModelAttribute以支持文件上传 - 更新DeviceTypeForm表单类添加MultipartFile类型的file字段 - 实现图片上传服务集成OSS存储和文件哈希处理 - 添加HTTP到HTTPS的URL强制转换机制 - 更新数据库操作逻辑以支持图片路径存储 - 在设备创建流程中集成设备类型图片信息传递	2026-01-12 11:06:44 +08:00
daiyongfei	dff37b245a	Merge branch 'dyf-device' into 6170	2025-12-26 16:22:00 +08:00
chenyouting	6a058318f2	设备记录列表显示问题修改	2025-12-26 15:54:14 +08:00
daiyongfei	f2d74b8f17	Merge branch 'dyf-device' into 6170	2025-12-22 15:09:39 +08:00
chenyouting	aaf142ca67	提交	2025-12-19 17:55:48 +08:00