设备台账完善-添加保存图片及文件接口

@@ -442,8 +442,6 @@ CREATE TABLE "public"."qg_brain_device" (
  "service_dep" varchar(36),
  "contact_info" varchar(50),
  "enable_time" timestamp(6),
- "pictures" varchar(500),
- "files" varchar(500),
  "tenant_id" varchar(36),
  "create_time" timestamp(6),
  "creator" varchar(36),
@@ -464,6 +462,27 @@ COMMENT ON COLUMN "public"."qg_brain_device"."use_dep" IS '使用部门id';
 COMMENT ON COLUMN "public"."qg_brain_device"."service_dep" IS '维保部门id';
 COMMENT ON COLUMN "public"."qg_brain_device"."contact_info" IS '联系方式';
 COMMENT ON COLUMN "public"."qg_brain_device"."enable_time" IS '启用日期';
-COMMENT ON COLUMN "public"."qg_brain_device"."pictures" IS '图片ids';
-COMMENT ON COLUMN "public"."qg_brain_device"."files" IS '文件ids';
+
+--图片或者文件资源
+CREATE TABLE "public"."qg_brain_device_source" (
+ "id" varchar(36)  NOT NULL,
+ "source_id" varchar(36),
+ "type" varchar(10),
+ "name" varchar(100),
+ "uid" varchar(100),
+ "url" varchar(100),
+ "tenant_id" varchar(36),
+ "create_time" timestamp(6),
+ "creator" varchar(36),
+ "updater" varchar(36),
+ "update_time" timestamp(6),
+ CONSTRAINT "qg_brain_device_source_pkey" PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "public"."qg_brain_device_source" IS '设备管理资源表';
+COMMENT ON COLUMN "public"."qg_brain_device_source"."source_id" IS '资源id';
+COMMENT ON COLUMN "public"."qg_brain_device_source"."type" IS '类型-图片/文件（picture/file）';
+COMMENT ON COLUMN "public"."qg_brain_device_source"."name" IS '文件名';
+COMMENT ON COLUMN "public"."qg_brain_device_source"."uid" IS 'uid';
+COMMENT ON COLUMN "public"."qg_brain_device_source"."url" IS '地址';
 

@@ -11,7 +11,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
-import org.thingsboard.server.common.data.yunteng.dto.BrainDeviceCategoryDTO;
 import org.thingsboard.server.common.data.yunteng.dto.BrainDevicePositionDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;

@@ -11,6 +11,7 @@ import org.thingsboard.server.common.data.yunteng.enums.BrainDeviceStatusEnum;
 
 import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Set;
 
 @EqualsAndHashCode(callSuper = true)
@@ -50,9 +51,9 @@ public class BrainDeviceDTO extends TenantDTO {
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     private LocalDateTime enableTime;
     @ApiModelProperty(value = "图片")
-    private String pictures;
+    private List<BrainDeviceSourceDTO> pictures;
     @ApiModelProperty(value = "文件")
-    private String files;
+    private List<BrainDeviceSourceDTO> files;
     @ApiModelProperty(value = "创建人")
     private String creatorName;
 

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+
+import javax.validation.constraints.Size;
+import java.util.Set;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class BrainDeviceSourceDTO extends TenantDTO {
+
+    @ApiModelProperty(value = "资源id")
+    private String sourceId;
+    @ApiModelProperty(value = "资源类型-图片/文件（picture/file）")
+    private String type;
+    @ApiModelProperty(value = "文件名称")
+    private String name;
+    @ApiModelProperty(value = "uid")
+    private String uid;
+    @ApiModelProperty(value = "url地址")
+    private String url;
+
+    @Size(
+            min = 1,
+            message = "删除至少需要一个id",
+            groups = {DeleteGroup.class})
+    @ApiModelProperty(value = "删除ID列表", required = true)
+    private Set<String> ids;
+}

@@ -701,6 +701,7 @@ public class ModelConstants {
     public static final String BRAINDEVICECAGEGORY_TABLE_NAME = "qg_brain_device_category";//设备类型
     public static final String BRAINDEVICEPOSITION_TABLE_NAME = "qg_brain_device_position";//存放位置
     public static final String BRAINDEVICE_TABLE_NAME = "qg_brain_device";//设备台账
+    public static final String BRAINDEVICESOURCE_TABLE_NAME = "qg_brain_device_source";//设备资源表
 
     protected static final String[] NONE_AGGREGATION_COLUMNS = new String[]{LONG_VALUE_COLUMN, DOUBLE_VALUE_COLUMN, BOOLEAN_VALUE_COLUMN, STRING_VALUE_COLUMN, JSON_VALUE_COLUMN, KEY_COLUMN, TS_COLUMN};
 

@@ -69,16 +69,4 @@ public class BrainDeviceEntity extends TenantBaseEntity {
      * 启用日期
      */
     private LocalDateTime enableTime;
-
-    /**
-     * 设备图片
-     */
-    private String pictures;
-
-    /**
-     * 关联文档
-     */
-    private String files;
-
-
 }

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+/**
+ * 设备资源图片/文件
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.BRAINDEVICESOURCE_TABLE_NAME, autoResultMap = true)
+public class BrainDeviceSourceEntity extends TenantBaseEntity {
+
+    /**
+     * 资源id
+     */
+    private String sourceId;
+    /**
+     * 资源类型-图片/文件（picture/file）
+     */
+    private String type;
+
+    /**
+     * 文件名称
+     */
+    private String name;
+    /**
+     * uid
+     */
+    private String uid;
+    /**
+     * url地址
+     */
+    private String url;
+}

@@ -13,6 +13,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.dto.BrainDeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.BrainDeviceSourceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
@@ -20,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.entities.BrainDeviceEntity;
 import org.thingsboard.server.dao.yunteng.mapper.BrainDeviceMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.BrainDeviceService;
+import org.thingsboard.server.dao.yunteng.service.BrainDeviceSourceService;
 import org.thingsboard.server.dao.yunteng.service.TkUserService;
 
 import javax.annotation.Resource;
@@ -36,6 +38,8 @@ public class BrainDeviceServiceImpl extends AbstractBaseService<BrainDeviceMappe
 
     @Resource
     private TkUserService tkUserService;
+    @Resource
+    private BrainDeviceSourceService brainDeviceSourceService;
 
     @Override
     public TkPageData<BrainDeviceDTO> page(Map<String, Object> params) throws ThingsboardException {
@@ -66,19 +70,22 @@ public class BrainDeviceServiceImpl extends AbstractBaseService<BrainDeviceMappe
             throw new TkDataValidationException("设备编号重复！");
         }
         BrainDeviceEntity entity = new BrainDeviceEntity();
+        String id = "";
         if (StringUtils.isBlank(brainDeviceDTO.getId())) {
             brainDeviceDTO.copyToEntity(entity);
-            String id = UUID.randomUUID().toString();
+            id = UUID.randomUUID().toString();
             entity.setId(id);
             baseMapper.insert(entity);
         } else {
+            id = brainDeviceDTO.getId();
             LambdaQueryWrapper<BrainDeviceEntity> filter = new QueryWrapper<BrainDeviceEntity>().lambda()
-                    .eq(BrainDeviceEntity::getId, brainDeviceDTO.getId());
+                    .eq(BrainDeviceEntity::getId, id);
             entity = brainDeviceDTO.getEntity(BrainDeviceEntity.class);
             baseMapper.update(entity, filter);
         }
-
-
+        //保存文件与图片
+        brainDeviceSourceService.batchSave(brainDeviceDTO.getPictures(),id);
+        brainDeviceSourceService.batchSave(brainDeviceDTO.getFiles(),id);
         entity.copyToDTO(brainDeviceDTO);
         return brainDeviceDTO;
     }
@@ -122,6 +129,10 @@ public class BrainDeviceServiceImpl extends AbstractBaseService<BrainDeviceMappe
             UserDTO userInfo = tkUserService.findUserInfoById(creatorId);
             result.setCreatorName(userInfo.getRealName());
         }
+        List<BrainDeviceSourceDTO> files = brainDeviceSourceService.findDeviceSourceBySourceId(id, "file");
+        List<BrainDeviceSourceDTO> pictures = brainDeviceSourceService.findDeviceSourceBySourceId(id, "picture");
+        result.setFiles(files);
+        result.setPictures(pictures);
         return result;
     }
 

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.dto.BrainDeviceSourceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
+import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.BrainDeviceSourceEntity;
+import org.thingsboard.server.dao.yunteng.mapper.BrainDeviceSourceMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.BrainDeviceSourceService;
+import org.thingsboard.server.dao.yunteng.service.TkUserService;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class BrainDeviceSourceServiceImpl extends AbstractBaseService<BrainDeviceSourceMapper, BrainDeviceSourceEntity>
+        implements BrainDeviceSourceService {
+
+
+    @Override
+    public void batchSave(List<BrainDeviceSourceDTO> list,String sourceId) throws ThingsboardException {
+        if (CollectionUtils.isEmpty(list) || StringUtils.isBlank(sourceId)) {
+            return;
+        }
+        List<BrainDeviceSourceDTO> resultList = findDeviceSourceBySourceId(sourceId,list.get(0).getType());
+        if (CollectionUtils.isNotEmpty(resultList)) {
+            List<String> ids = resultList.stream().map(item -> item.getId()).collect(Collectors.toList());
+            baseMapper.deleteBatchIds(ids);
+        }
+        list.forEach(item -> {
+            BrainDeviceSourceEntity entity = new BrainDeviceSourceEntity();
+            item.setSourceId(sourceId);
+            try {
+                item.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
+            } catch (ThingsboardException e) {
+                throw new RuntimeException(e);
+            }
+            item.copyToEntity(entity);
+            String id = UUID.randomUUID().toString();
+            entity.setId(id);
+            baseMapper.insert(entity);
+        });
+    }
+
+    @Override
+    public BrainDeviceSourceDTO save(BrainDeviceSourceDTO brainDeviceSourceDTO) throws ThingsboardException {
+        checkDto(brainDeviceSourceDTO);
+        BrainDeviceSourceEntity entity = new BrainDeviceSourceEntity();
+        if (StringUtils.isBlank(brainDeviceSourceDTO.getId())) {
+            brainDeviceSourceDTO.copyToEntity(entity);
+            String id = UUID.randomUUID().toString();
+            entity.setId(id);
+            baseMapper.insert(entity);
+        } else {
+            LambdaQueryWrapper<BrainDeviceSourceEntity> filter = new QueryWrapper<BrainDeviceSourceEntity>().lambda()
+                    .eq(BrainDeviceSourceEntity::getId, brainDeviceSourceDTO.getId());
+            entity = brainDeviceSourceDTO.getEntity(BrainDeviceSourceEntity.class);
+            baseMapper.update(entity, filter);
+        }
+        entity.copyToDTO(brainDeviceSourceDTO);
+        return brainDeviceSourceDTO;
+    }
+
+    private void checkDto(BrainDeviceSourceDTO dto) throws ThingsboardException {
+        if (StringUtils.isBlank(dto.getSourceId())) {
+            throw new TkDataValidationException("资源id不能为空！");
+        }
+
+        if (StringUtils.isBlank(dto.getUrl())) {
+            throw new TkDataValidationException("文件地址不能为空！");
+        }
+
+        if (StringUtils.isBlank(dto.getType())) {
+            throw new TkDataValidationException("文件按类型不能为空！");
+        }
+
+        if (StringUtils.isBlank(dto.getTenantId())) {
+            dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
+        }
+    }
+
+    @Override
+    public BrainDeviceSourceDTO detail(String id) throws ThingsboardException {
+        BrainDeviceSourceDTO result = null;
+        BrainDeviceSourceEntity entity = baseMapper.selectById(id);
+        if (entity != null) {
+            result = new BrainDeviceSourceDTO();
+            entity.copyToDTO(result);
+        }
+        return result;
+    }
+
+    @Override
+    public boolean delete(String id) throws ThingsboardException {
+        int count = baseMapper.deleteById(id);
+        return count > 0;
+    }
+
+    @Override
+    public List<BrainDeviceSourceDTO> findDeviceSourceBySourceId(String sourceId,String type) throws ThingsboardException {
+        QueryWrapper<BrainDeviceSourceEntity> queryWrapper = new QueryWrapper();
+        LambdaQueryWrapper<BrainDeviceSourceEntity> lambda = queryWrapper.lambda();
+        lambda.eq(BrainDeviceSourceEntity::getTenantId, SpringBeanUtils.getTenantId().getId().toString());
+        if (StringUtils.isEmpty(sourceId)) {
+            return new ArrayList<>();
+        }
+        lambda.eq(BrainDeviceSourceEntity::getSourceId, sourceId);
+        if (StringUtils.isNotEmpty(type)) {
+            lambda.eq(BrainDeviceSourceEntity::getType, type);
+        }
+        List<BrainDeviceSourceEntity> entityList = baseMapper.selectList(queryWrapper);
+        if (CollectionUtils.isEmpty(entityList)) {
+            return new ArrayList<>();
+        }
+        return entityList.stream().map(item -> {
+            BrainDeviceSourceDTO dto = new BrainDeviceSourceDTO();
+            item.copyToDTO(dto);
+            return dto;
+        }).collect(Collectors.toList());
+    }
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.BrainDeviceSourceEntity;
+
+import java.util.Map;
+
+@Mapper
+public interface BrainDeviceSourceMapper extends BaseMapper<BrainDeviceSourceEntity> {
+    
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.BrainDeviceSourceDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.BrainDeviceSourceEntity;
+
+import java.util.List;
+import java.util.Map;
+
+public interface BrainDeviceSourceService extends BaseService<BrainDeviceSourceEntity> {
+
+    void batchSave(List<BrainDeviceSourceDTO> list, String sourceId) throws ThingsboardException;
+
+    BrainDeviceSourceDTO save(BrainDeviceSourceDTO BrainDeviceSourceDTO) throws ThingsboardException;
+
+    BrainDeviceSourceDTO detail(String id) throws ThingsboardException;
+
+    boolean delete(String id) throws ThingsboardException;
+
+    List<BrainDeviceSourceDTO> findDeviceSourceBySourceId(String sourceId,String type) throws ThingsboardException;
+}