设备管理类型功能

@@ -386,3 +386,24 @@ CREATE TABLE "public"."qg_preserve_detail_status" (
 );
 
 COMMENT ON TABLE "public"."qg_preserve_detail_status" IS '保养记录明细状态';
+
+--智能设备管理
+--设备类型
+CREATE TABLE "public"."qg_brain_device_category" (
+"id" varchar(36)  NOT NULL,
+"name" varchar(100),
+"code" varchar(100),
+"status" varchar(50),
+"notes" varchar(500),
+"create_time" timestamp(6),
+"creator" varchar(36),
+"updater" varchar(36),
+"update_time" timestamp(6),
+CONSTRAINT "qg_brain_device_category_pkey" PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "public"."qg_brain_device_category" IS '设备类型';
+COMMENT ON COLUMN "public"."qg_brain_device_category"."name" IS '设备类型名称';
+COMMENT ON COLUMN "public"."qg_brain_device_category"."code" IS '设备类型编码';
+COMMENT ON COLUMN "public"."qg_brain_device_category"."status" IS '状态';
+COMMENT ON COLUMN "public"."qg_brain_device_category"."notes" IS '备注';

+package org.thingsboard.server.controller.yunteng;
+
+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.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.BrainDeviceCategoryDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.BrainDeviceCategoryService;
+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/category")
+@Api(tags = {"巡检记录"})
+@Slf4j
+public class BrainDeviceCategoryController extends BaseController {
+    private final BrainDeviceCategoryService brainDeviceCategoryService;
+
+    @PostMapping("/pageData")
+    @ApiOperation("分页查询")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public TkPageData<BrainDeviceCategoryDTO> page(
+            @RequestParam(PAGE_SIZE) int pageSize,
+            @RequestParam(PAGE) int page,
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "code", required = false) String code,
+            @RequestParam(value = "status", required = false) String status
+    ) throws ThingsboardException {
+        Map<String, Object> queryMap = new HashMap<>();
+        queryMap.put(PAGE_SIZE, pageSize);
+        queryMap.put(PAGE, page);
+        if (StringUtils.isNotBlank(name)) {
+            queryMap.put("name", name);
+        }
+
+        if (StringUtils.isNotBlank(code)) {
+            queryMap.put("code", code);
+        }
+
+        if (StringUtils.isNotBlank(status)) {
+            queryMap.put("status", status);
+        }
+        return brainDeviceCategoryService.page(queryMap);
+    }
+
+    @PostMapping("/save")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<BrainDeviceCategoryDTO> save(@RequestBody BrainDeviceCategoryDTO brainDeviceCategoryDTO) throws ThingsboardException {
+        BrainDeviceCategoryDTO dto = brainDeviceCategoryService.save(brainDeviceCategoryDTO);
+        return ResponseEntity.ok(dto);
+    }
+
+    @GetMapping("/detail")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<BrainDeviceCategoryDTO> detail(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(brainDeviceCategoryService.detail(id));
+    }
+
+    @GetMapping("/delete")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    public ResponseEntity<Boolean> delete(@RequestParam("id") String id) throws ThingsboardException {
+        return ResponseEntity.ok(brainDeviceCategoryService.delete(id));
+    }
+
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class BrainDeviceCategoryDTO extends BaseDTO {
+
+    @ApiModelProperty(value = "设备类型名称")
+    private String name;
+    @ApiModelProperty(value = "设备类型编码")
+    private String code;
+    @ApiModelProperty(value = "状态")
+    private String status;
+    @ApiModelProperty(value = "备注")
+    private String notes;
+}

 /**
  * Copyright © 2016-2024 The Thingsboard Authors
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,7 +45,7 @@ public class ModelConstants {
      */
     public static final String ID_PROPERTY = "id";
     public static final String CREATED_TIME_PROPERTY = "created_time";
-	//thingskit
+    //thingskit
     public static final String STATUS_PROPERTY = "status";
     public static final String USER_ID_PROPERTY = "user_id";
     public static final String TENANT_ID_PROPERTY = "tenant_id";
@@ -71,7 +71,7 @@ public class ModelConstants {
     public static final String EVENT_TIME_COLUMN = "event_time";
     public static final String EVENT_TYPE_COLUMN = "event_type";
     public static final String EVENT_VALUE_COLUMN = "event_value";
-    public static final String  DATA_COMBINATION_IS_DEFAULT_PROPERTY= "is_data_combination";
+    public static final String DATA_COMBINATION_IS_DEFAULT_PROPERTY = "is_data_combination";
 
     /**
      * User constants.
@@ -689,11 +689,16 @@ public class ModelConstants {
     public static final String TKINSTALLLOCATION_TABLE_NAME = "qg_install_location";//设备台账
     public static final String TKSUPPLIER_TABLE_NAME = "qg_supplier";//供应商
 
-    public static final String TKINSPECTIONPLAN_TABLE_NAME= "qg_inspection_plan"; // 巡检计划
-    public static final String TKCHECKPLAN_TABLE_NAME= "qg_check_plan"; // 巡检/保养方案
-    public static final String TKCHECKDETAILS_TABLE_NAME= "qg_check_details"; // 巡检明细
-    public static final String TKINSPECTIONRECORD_TABLE_NAME= "qg_inspection_record"; // 巡检记录
-    public static final String TKINSPECTIONDETAILS_TABLE_NAME= "qg_inspection_details"; // 巡检记录明细
+    public static final String TKINSPECTIONPLAN_TABLE_NAME = "qg_inspection_plan"; // 巡检计划
+    public static final String TKCHECKPLAN_TABLE_NAME = "qg_check_plan"; // 巡检/保养方案
+    public static final String TKCHECKDETAILS_TABLE_NAME = "qg_check_details"; // 巡检明细
+    public static final String TKINSPECTIONRECORD_TABLE_NAME = "qg_inspection_record"; // 巡检记录
+    public static final String TKINSPECTIONDETAILS_TABLE_NAME = "qg_inspection_details"; // 巡检记录明细
+
+    /**
+     * 智能设备管理模块
+     */
+    public static final String BRAINDEVICECAGEGORY_TABLE_NAME = "qg_brain_device_category";//设备类型
 
     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.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+public class BrainBaseEntity extends BaseEntity {
+
+    private static final long serialVersionUID = -4315734960161684909L;
+
+    @TableField(fill = FieldFill.INSERT)
+    private String creator;
+
+    @TableField(fill = FieldFill.UPDATE)
+    private String updater;
+
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+
+}

+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.BRAINDEVICECAGEGORY_TABLE_NAME, autoResultMap = true)
+public class BrainDeviceCategoryEntity extends BrainBaseEntity {
+    /**
+     * 设备类型名称
+     */
+    private String name;
+
+    /**
+     * 设备类型编码
+     */
+    private String code;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 备注
+     */
+    private String notes;
+}

+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.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.dto.BrainDeviceCategoryDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.BrainDeviceCategoryEntity;
+import org.thingsboard.server.dao.yunteng.mapper.BrainDeviceCategoryMapper;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.BrainDeviceCategoryService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class BrainDeviceCategoryServiceImpl extends AbstractBaseService<BrainDeviceCategoryMapper, BrainDeviceCategoryEntity>
+        implements BrainDeviceCategoryService {
+
+    @Override
+    public TkPageData<BrainDeviceCategoryDTO> page(Map<String, Object> params) throws ThingsboardException {
+        TkPageData<BrainDeviceCategoryDTO> result = new TkPageData<>();
+        IPage<BrainDeviceCategoryEntity> page =
+                getPage(params, "create_time", false);
+        IPage<BrainDeviceCategoryDTO> pageData = baseMapper.getDataPage(page, params);
+        if (pageData != null) {
+            result.setItems(pageData.getRecords());
+        }
+        result.setTotal(Long.valueOf(pageData.getTotal()).intValue());
+        return result;
+    }
+
+    @Override
+    public BrainDeviceCategoryDTO save(BrainDeviceCategoryDTO brainDeviceCategoryDTO) throws ThingsboardException {
+        checkDto(brainDeviceCategoryDTO);
+        if (StringUtils.isBlank(brainDeviceCategoryDTO.getId()) && checkDuplicateData(brainDeviceCategoryDTO)) {
+            throw new TkDataValidationException("设备类型编码重复！");
+        }
+        BrainDeviceCategoryEntity entity = new BrainDeviceCategoryEntity();
+        if (StringUtils.isBlank(brainDeviceCategoryDTO.getId())) {
+            brainDeviceCategoryDTO.copyToEntity(entity);
+            String id = UUID.randomUUID().toString();
+            entity.setId(id);
+            baseMapper.insert(entity);
+        } else {
+            LambdaQueryWrapper<BrainDeviceCategoryEntity> filter = new QueryWrapper<BrainDeviceCategoryEntity>().lambda()
+                    .eq(BrainDeviceCategoryEntity::getId, brainDeviceCategoryDTO.getId());
+            entity = brainDeviceCategoryDTO.getEntity(BrainDeviceCategoryEntity.class);
+            baseMapper.update(entity, filter);
+        }
+
+
+        entity.copyToDTO(brainDeviceCategoryDTO);
+        return brainDeviceCategoryDTO;
+    }
+
+    private void checkDto(BrainDeviceCategoryDTO dto) throws ThingsboardException {
+        if (StringUtils.isBlank(dto.getName())) {
+            throw new TkDataValidationException("设备类型名称不能为空！");
+        }
+
+        if (StringUtils.isBlank(dto.getCode())) {
+            throw new TkDataValidationException("设备类型编码不能为空！");
+        }
+
+        if (StringUtils.isBlank(dto.getStatus())) {
+            throw new TkDataValidationException("设备类型状态不能为空！");
+        }
+    }
+
+    private boolean checkDuplicateData(BrainDeviceCategoryDTO BrainDeviceCategoryDTO) throws ThingsboardException {
+        Boolean result = false;
+        QueryWrapper<BrainDeviceCategoryEntity> queryWrapper = new QueryWrapper();
+        LambdaQueryWrapper<BrainDeviceCategoryEntity> lambda = queryWrapper.lambda();
+        lambda.eq(BrainDeviceCategoryEntity::getCode, BrainDeviceCategoryDTO.getCode());
+        List<BrainDeviceCategoryEntity> entityList = baseMapper.selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(entityList)) {
+            return true;
+        }
+
+        return result;
+    }
+
+    @Override
+    public BrainDeviceCategoryDTO detail(String id) throws ThingsboardException {
+        BrainDeviceCategoryDTO result = null;
+        BrainDeviceCategoryEntity entity = baseMapper.selectById(id);
+        if (entity != null) {
+            result = new BrainDeviceCategoryDTO();
+            entity.copyToDTO(result);
+        }
+        return result;
+    }
+
+    @Override
+    public boolean delete(String id) throws ThingsboardException {
+        int count = baseMapper.deleteById(id);
+        return count > 0;
+    }
+}

+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.BrainDeviceCategoryDTO;
+import org.thingsboard.server.dao.yunteng.entities.BrainDeviceCategoryEntity;
+
+import java.util.Map;
+
+@Mapper
+public interface BrainDeviceCategoryMapper extends BaseMapper<BrainDeviceCategoryEntity> {
+
+    IPage<BrainDeviceCategoryDTO> 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.BrainDeviceCategoryDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.BrainDeviceCategoryEntity;
+
+import java.util.Map;
+
+public interface BrainDeviceCategoryService extends BaseService<BrainDeviceCategoryEntity> {
+
+    TkPageData<BrainDeviceCategoryDTO> page(Map<String, Object> params) throws ThingsboardException;
+
+    BrainDeviceCategoryDTO save(BrainDeviceCategoryDTO BrainDeviceCategoryDTO) throws ThingsboardException;
+
+    BrainDeviceCategoryDTO detail(String id) throws ThingsboardException;
+
+    boolean delete(String id) 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.BrainDeviceCategoryMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.BrainDeviceCategoryDTO" id="brainDeviceCategoryMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="code" column="code"/>
+        <result property="status" column="status"/>
+        <result property="notes" column="notes"/>
+        <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="brainDeviceCategoryMap">
+        SELECT
+        o.id,o.name,o.code,o.status,o.notes,o.create_time,o.updater,o.update_time,o.creator
+        from qg_brain_device_category o
+        <where>
+            <if test="queryMap.code !=null and queryMap.code !=''">
+                AND o.code ILIKE concat('%',#{queryMap.code}::TEXT,'%')
+            </if>
+            <if test="queryMap.name !=null and queryMap.name !=''">
+                AND o.name 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