设备台账初步编写

@@ -427,3 +427,43 @@ COMMENT ON TABLE "public"."qg_brain_device_position" IS '存放位置表';
 COMMENT ON COLUMN "public"."qg_brain_device_position"."position" IS '存放位置';
 COMMENT ON COLUMN "public"."qg_brain_device_position"."status" IS '状态';
 COMMENT ON COLUMN "public"."qg_brain_device_position"."notes" IS '备注';
+
+--设备台账
+CREATE TABLE "public"."qg_brain_device" (
+ "id" varchar(36)  NOT NULL,
+ "name" varchar(100),
+ "code" varchar(100),
+ "model" varchar(100),
+ "category_id" varchar(36),
+ "position_id" varchar(36),
+ "notes" varchar(1000),
+ "status" varchar(20),
+ "use_dep" varchar(36),
+ "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),
+ "updater" varchar(36),
+ "update_time" timestamp(6),
+ CONSTRAINT "qg_brain_device_pkey" PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "public"."qg_brain_device" IS '设备台账';
+COMMENT ON COLUMN "public"."qg_brain_device"."name" IS '设备名称';
+COMMENT ON COLUMN "public"."qg_brain_device"."code" IS '设备编码';
+COMMENT ON COLUMN "public"."qg_brain_device"."model" IS '规格型号';
+COMMENT ON COLUMN "public"."qg_brain_device"."category_id" IS '设备类型id';
+COMMENT ON COLUMN "public"."qg_brain_device"."position_id" IS '存放位置id';
+COMMENT ON COLUMN "public"."qg_brain_device"."notes" IS '备注';
+COMMENT ON COLUMN "public"."qg_brain_device"."status" IS '当前状态';
+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"."pictures" IS '文件ids';
+

+package org.thingsboard.server.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.BrainDeviceDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.service.BrainDeviceService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
+
+@RestController
+@TbCoreComponent
+@RequiredArgsConstructor
+@RequestMapping("api/yt/brain/device")
+@Api(tags = {"设备台账"})
+@Slf4j
+public class BrainDeviceController extends BaseController {
+    private final BrainDeviceService brainDeviceService;
+
+    @PostMapping("/pageData")
+    @ApiOperation("分页查询")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public TkPageData<BrainDeviceDTO> page(
+            @RequestParam(PAGE_SIZE) int pageSize,
+            @RequestParam(PAGE) int page,
+            @RequestBody  BrainDeviceDTO dto
+    ) throws ThingsboardException {
+        Map<String, Object> queryMap = new HashMap<>();
+        queryMap.put(PAGE_SIZE, pageSize);
+        queryMap.put(PAGE, page);
+        if (StringUtils.isNotBlank(dto.getName())) {
+            queryMap.put("name", dto.getName());
+        }
+        return brainDeviceService.page(queryMap);
+    }
+
+    @PostMapping("/save")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<BrainDeviceDTO> save(@RequestBody BrainDeviceDTO brainDeviceDTO) throws ThingsboardException {
+        BrainDeviceDTO dto = brainDeviceService.save(brainDeviceDTO);
+        return ResponseEntity.ok(dto);
+    }
+
+    @GetMapping("/detail")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<BrainDeviceDTO> detail(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(brainDeviceService.detail(id));
+    }
+
+    @GetMapping("/delete")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<Boolean> delete(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(brainDeviceService.delete(id));
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param brainDeviceDTO
+     * @return
+     */
+    @DeleteMapping
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN')")
+    public ResponseResult<Boolean> deleteBath(
+            @Validated({DeleteGroup.class}) @RequestBody BrainDeviceDTO brainDeviceDTO) throws ThingsboardException {
+        brainDeviceDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+        return ResponseResult.success(brainDeviceService.deleteBath(brainDeviceDTO));
+    }
+
+    @PostMapping("/updateStatus")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    @ApiOperation("批量启用停用作废")
+    public ResponseResult<Boolean> updateStatus(@RequestBody BrainDeviceDTO brainDeviceDTO) throws ThingsboardException {
+        brainDeviceService.updateStatus(brainDeviceDTO);
+        return ResponseResult.success(true);
+    }
+
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.enums.BrainDeviceStatusEnum;
+
+import javax.validation.constraints.Size;
+import java.util.Set;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class BrainDeviceDTO extends TenantDTO {
+
+    @ApiModelProperty(value = "状态")
+    private BrainDeviceStatusEnum status;
+    @ApiModelProperty(value = "设备编号")
+    private String code;
+    @ApiModelProperty(value = "设备名称")
+    private String name;
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+    @ApiModelProperty(value = "备注")
+    private String notes;
+    @ApiModelProperty(value = "设备类型")
+    private String categoryName;
+    @ApiModelProperty(value = "存放位置")
+    private String positionName;
+    @ApiModelProperty(value = "使用部门")
+    private String useDepName;
+    @ApiModelProperty(value = "维保部门")
+    private String serviceDepName;
+    @ApiModelProperty(value = "联系方式")
+    private String contactInfo;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "启用时间")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private String enableTime;
+    @ApiModelProperty(value = "创建人")
+    private String creatorName;
+
+    @Size(
+            min = 1,
+            message = "删除至少需要一个id",
+            groups = {DeleteGroup.class})
+    @ApiModelProperty(value = "删除ID列表", required = true)
+    private Set<String> ids;
+}

@@ -700,6 +700,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_position";//设备台账
 
     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};
 

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.BrainDeviceStatusEnum;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+import java.time.LocalDateTime;
+
+/**
+ * 设备台账
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.BRAINDEVICE_TABLE_NAME, autoResultMap = true)
+public class BrainDeviceEntity extends TenantBaseEntity {
+    /**
+     * 设备名称
+     */
+    private String name;
+
+    /**
+     * 设备编码
+     */
+    private String code;
+
+    /**
+     * 规格型号
+     */
+    private String model;
+
+    /**
+     * 设备类型id
+     */
+    private String categoryId;
+
+    /**
+     * 存放位置id
+     */
+    private String positionId;
+
+    /**
+     * 备注
+     */
+    private String notes;
+
+    /**
+     * 当前状态
+     */
+    private BrainDeviceStatusEnum status;
+
+    /**
+     * 使用部门
+     */
+    private String useDep;
+
+    /**
+     * 维保部门
+     */
+    private String serviceDep;
+
+    /**
+     * 联系方式
+     */
+    private String contactInfo;
+
+    /**
+     * 启用日期
+     */
+    private LocalDateTime enableTime;
+
+    /**
+     * 设备图片
+     */
+    private String pictures;
+
+    /**
+     * 关联文档
+     */
+    private String files;
+
+
+}

+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.BrainDeviceDTO;
+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.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.TkUserService;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class BrainDeviceServiceImpl extends AbstractBaseService<BrainDeviceMapper, BrainDeviceEntity>
+        implements BrainDeviceService {
+
+    @Resource
+    private TkUserService tkUserService;
+
+    @Override
+    public TkPageData<BrainDeviceDTO> page(Map<String, Object> params) throws ThingsboardException {
+        params.put("tenantId", SpringBeanUtils.getTenantId().getId().toString());
+        TkPageData<BrainDeviceDTO> result = new TkPageData<>();
+        IPage<BrainDeviceEntity> page =
+                getPage(params, "create_time", false);
+        IPage<BrainDeviceDTO> pageData = baseMapper.getDataPage(page, params);
+        if (pageData != null) {
+            List<String> creatorIds = pageData.getRecords().stream().map(BrainDeviceDTO::getCreator).collect(Collectors.toList());
+            Map<String, UserDTO> userMap = tkUserService.findUserByUserIdListMap(creatorIds);
+            pageData.getRecords().forEach(item -> {
+                UserDTO userInfo = userMap.get(item.getCreator());
+                if (userInfo != null) {
+                    item.setCreatorName(userInfo.getRealName());
+                }
+            });
+            result.setItems(pageData.getRecords());
+        }
+        result.setTotal(Long.valueOf(pageData.getTotal()).intValue());
+        return result;
+    }
+
+    @Override
+    public BrainDeviceDTO save(BrainDeviceDTO brainDeviceDTO) throws ThingsboardException {
+        checkDto(brainDeviceDTO);
+        if (StringUtils.isBlank(brainDeviceDTO.getId()) && checkDuplicateData(brainDeviceDTO)) {
+            throw new TkDataValidationException("设备编号重复！");
+        }
+        BrainDeviceEntity entity = new BrainDeviceEntity();
+        if (StringUtils.isBlank(brainDeviceDTO.getId())) {
+            brainDeviceDTO.copyToEntity(entity);
+            String id = UUID.randomUUID().toString();
+            entity.setId(id);
+            baseMapper.insert(entity);
+        } else {
+            LambdaQueryWrapper<BrainDeviceEntity> filter = new QueryWrapper<BrainDeviceEntity>().lambda()
+                    .eq(BrainDeviceEntity::getId, brainDeviceDTO.getId());
+            entity = brainDeviceDTO.getEntity(BrainDeviceEntity.class);
+            baseMapper.update(entity, filter);
+        }
+
+
+        entity.copyToDTO(brainDeviceDTO);
+        return brainDeviceDTO;
+    }
+
+    private void checkDto(BrainDeviceDTO dto) throws ThingsboardException {
+        if (StringUtils.isBlank(dto.getName())) {
+            throw new TkDataValidationException("设备名称不能为空！");
+        }
+
+        if (StringUtils.isBlank(dto.getCode())) {
+            throw new TkDataValidationException("设备编码不能为空！");
+        }
+        if (StringUtils.isBlank(dto.getTenantId())) {
+            dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
+        }
+    }
+
+    private boolean checkDuplicateData(BrainDeviceDTO BrainDeviceDTO) throws ThingsboardException {
+        Boolean result = false;
+        QueryWrapper<BrainDeviceEntity> queryWrapper = new QueryWrapper();
+        LambdaQueryWrapper<BrainDeviceEntity> lambda = queryWrapper.lambda();
+        lambda.eq(BrainDeviceEntity::getCode, BrainDeviceDTO.getCode());
+        List<BrainDeviceEntity> entityList = baseMapper.selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(entityList)) {
+            return true;
+        }
+
+        return result;
+    }
+
+    @Override
+    public BrainDeviceDTO detail(String id) throws ThingsboardException {
+        BrainDeviceDTO result = null;
+        BrainDeviceEntity entity = baseMapper.selectById(id);
+        if (entity != null) {
+            result = new BrainDeviceDTO();
+            entity.copyToDTO(result);
+        }
+        String creatorId = entity.getCreator();
+        if (StringUtils.isNotBlank(creatorId)) {
+            UserDTO userInfo = tkUserService.findUserInfoById(creatorId);
+            result.setCreatorName(userInfo.getRealName());
+        }
+        return result;
+    }
+
+    @Override
+    public boolean delete(String id) throws ThingsboardException {
+        int count = baseMapper.deleteById(id);
+        return count > 0;
+    }
+
+    @Override
+    @Transactional
+    public boolean deleteBath(BrainDeviceDTO brainDeviceDTO) {
+        return baseMapper.delete(
+                new LambdaQueryWrapper<BrainDeviceEntity>()
+                        .eq(BrainDeviceEntity::getTenantId, brainDeviceDTO.getTenantId())
+                        .in(BrainDeviceEntity::getId, brainDeviceDTO.getIds()))
+                > FastIotConstants.MagicNumber.ZERO;
+    }
+
+    @Override
+    public void updateStatus(BrainDeviceDTO brainDeviceDTO) throws ThingsboardException {
+        if (CollectionUtils.isEmpty(brainDeviceDTO.getIds())) {
+            return;
+        }
+        for (String id : brainDeviceDTO.getIds()) {
+            BrainDeviceEntity entity = baseMapper.selectById(id);
+            if (entity == null) {
+                continue;
+            }
+            entity.setStatus(brainDeviceDTO.getStatus());
+            LambdaQueryWrapper<BrainDeviceEntity> filter = new QueryWrapper<BrainDeviceEntity>().lambda()
+                    .eq(BrainDeviceEntity::getId, entity.getId());
+            baseMapper.update(entity, filter);
+        }
+    }
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.yunteng.dto.BrainDeviceDTO;
+import org.thingsboard.server.dao.yunteng.entities.BrainDeviceEntity;
+
+import java.util.Map;
+
+@Mapper
+public interface BrainDeviceMapper extends BaseMapper<BrainDeviceEntity> {
+
+    IPage<BrainDeviceDTO> getDataPage(IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.BrainDeviceDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.BrainDeviceEntity;
+
+import java.util.Map;
+
+public interface BrainDeviceService extends BaseService<BrainDeviceEntity> {
+
+    TkPageData<BrainDeviceDTO> page(Map<String, Object> params) throws ThingsboardException;
+
+    BrainDeviceDTO save(BrainDeviceDTO BrainDeviceDTO) throws ThingsboardException;
+
+    BrainDeviceDTO detail(String id) throws ThingsboardException;
+
+    boolean delete(String id) throws ThingsboardException;
+
+
+    /**
+     * 批量删除
+     *
+     * @param BrainDeviceDTO 删除IDS
+     */
+    boolean deleteBath(BrainDeviceDTO BrainDeviceDTO) throws ThingsboardException;
+
+    /**
+     * 批量更新状态
+     *
+     * @param BrainDeviceDTO 更新状态
+     */
+    void updateStatus(BrainDeviceDTO BrainDeviceDTO) throws ThingsboardException;
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.thingsboard.server.dao.yunteng.mapper.BrainDeviceMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.BrainDeviceDTO" id="brainDeviceMap">
+        <result property="id" column="id"/>
+        <result property="status" column="status"/>
+        <result property="name" column="name"/>
+        <result property="code" column="code"/>
+        <result property="model" column="model"/>
+        <result property="notes" column="notes"/>
+        <result property="categoryName" column="categoryName"/>
+        <result property="positionName" column="positionName"/>
+        <result property="useDepName" column="useDepName"/>
+        <result property="serviceDepName" column="serviceDepName"/>
+        <result property="contactInfo" column="contact_info"/>
+        <result property="enableTime" column="enable_time"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updater" column="updater"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="creator" column="creator"/>
+    </resultMap>
+    <select id="getDataPage" resultMap="brainDeviceMap">
+        SELECT
+        o.id,o.name,o.code,o.model,o.status,o.notes,o.contact_info,o.enable_time,o.create_time,o.updater,o.update_time,o.creator,c.name as categoryName,p.name as positionName,u.name as useDepName,s.name as serviceDepName
+        from qg_brain_device o
+        left join qg_barin_device_category c on o.category_id = c.id
+        left join qg_brain_device_position p on o.position_id = p.id
+        left join tk_organization u on o.use_dep = t.id
+        left join tk_organization s on o.service_dep = s.id
+        <where>
+            <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
+                AND o.tenant_id = #{queryMap.tenantId}
+            </if>
+            <if test="queryMap.name !=null and queryMap.name !=''">
+                AND (o.name ILIKE concat('%',#{queryMap.name}::TEXT,'%') OR o.code ILIKE concat('%',#{queryMap.name}::TEXT,'%'))
+            </if>
+            <if test="queryMap.status !=null and queryMap.status !=''">
+                AND o.status = #{queryMap.status}
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file