设备台账

@@ -7,7 +7,7 @@ CREATE TABLE "public"."qg_malfunction_reason" (
      "create_time" timestamp(6),
      "creator" varchar(36),
      "updater" varchar(36),
-     "update_time" timestamp(6)
+     "update_time" timestamp(6),
      CONSTRAINT "qg_malfunction_reason_pkey" PRIMARY KEY ("id")
 );
 
@@ -24,13 +24,13 @@ COMMENT ON COLUMN "public"."qg_malfunction_reason"."update_time" IS 'æ›´æ–°æ—¶é—
 COMMENT ON COLUMN "public"."qg_malfunction_reason"."creator" IS '创建用户';
 
 
-ALTER TABLE device
-    ADD COLUMN IF NOT EXISTS director_id varchar(36);
-ALTER TABLE device
-    ADD COLUMN IF NOT EXISTS category_id varchar(36);
-
-COMMENT ON COLUMN "public"."device"."director_id" IS '负责人id';
-COMMENT ON COLUMN "public"."device"."category_id" IS '设备类别id';
+-- ALTER TABLE device
+--     ADD COLUMN IF NOT EXISTS director_id varchar(36);
+-- ALTER TABLE device
+--     ADD COLUMN IF NOT EXISTS category_id varchar(36);
+--
+-- COMMENT ON COLUMN "public"."device"."director_id" IS '负责人id';
+-- COMMENT ON COLUMN "public"."device"."category_id" IS '设备类别id';
 
 
 CREATE TABLE "public"."qg_repair_order" (
@@ -47,7 +47,7 @@ CREATE TABLE "public"."qg_repair_order" (
     "create_time" timestamp(6),
     "creator" varchar(36),
     "updater" varchar(36),
-    "update_time" timestamp(6)
+    "update_time" timestamp(6),
     CONSTRAINT "qg_repair_order_pkey" PRIMARY KEY ("id")
 );
 
@@ -78,7 +78,7 @@ CREATE TABLE "public"."qg_repair_record" (
     "create_time" timestamp(6),
     "creator" varchar(36),
     "updater" varchar(36),
-    "update_time" timestamp(6)
+    "update_time" timestamp(6),
     CONSTRAINT "qg_repair_record_pkey" PRIMARY KEY ("id")
 );
 
@@ -280,7 +280,7 @@ CREATE TABLE "public"."qg_device_cagegory" (
   "create_time" timestamp(6),
   "creator" varchar(36),
   "updater" varchar(36),
-  "update_time" timestamp(6)
+  "update_time" timestamp(6),
 CONSTRAINT "qg_device_cagegory_pkey" PRIMARY KEY ("id")
 );
 
@@ -288,3 +288,67 @@ COMMENT ON TABLE "public"."qg_device_cagegory" IS '设备分类';
 COMMENT ON COLUMN "public"."qg_device_cagegory"."name" IS '保养记录编码';
 COMMENT ON COLUMN "public"."qg_device_cagegory"."parent_id" IS '保养计划id';
 COMMENT ON COLUMN "public"."qg_device_cagegory"."order" IS '排序';
+
+CREATE TABLE "public"."qg_device_account" (
+    "id" varchar(36)  NOT NULL,
+    "name" varchar(50),
+    "code" varchar(50),
+    "category_id" varchar(36),
+    "status" varchar(50),
+    "director_id" varchar(36),
+    "installLocation_id" varchar(36),
+    "is_online" bool,
+    "brand" varchar(50),
+    "model_num" varchar(50),
+    "specifications" varchar(50),
+    "manufacturer" varchar(50),
+    "buy_date" timestamp(6),
+    "price" float8,
+    "product_date" timestamp(6),
+    "receive_date" timestamp(6),
+    "registe_date" timestamp(6),
+    "supplier_id" varchar(36),
+    "device_img" varchar(100),
+    "description" varchar(200),
+    "tenant_id" varchar(36),
+    "create_time" timestamp(6),
+    "creator" varchar(36),
+    "updater" varchar(36),
+    "update_time" timestamp(6),
+    CONSTRAINT "qg_device_account_pkey" PRIMARY KEY ("id")
+);
+
+COMMENT ON TABLE "public"."qg_device_account" IS '设备台账';
+COMMENT ON COLUMN "public"."qg_device_account"."name" IS '设备名称';
+COMMENT ON COLUMN "public"."qg_device_account"."code" IS '设备名称';
+COMMENT ON COLUMN "public"."qg_device_account"."category_id" IS '设备名称';
+COMMENT ON COLUMN "public"."qg_device_account"."status" IS '状态';
+COMMENT ON COLUMN "public"."qg_device_account"."director_id" IS '负责人id';
+COMMENT ON COLUMN "public"."qg_device_account"."installLocation_id" IS '安装地点id';
+COMMENT ON COLUMN "public"."qg_device_account"."is_online" IS '是否连网';
+COMMENT ON COLUMN "public"."qg_device_account"."brand" IS '品牌';
+COMMENT ON COLUMN "public"."qg_device_account"."model_num" IS '型号';
+COMMENT ON COLUMN "public"."qg_device_account"."specifications" IS '规格';
+COMMENT ON COLUMN "public"."qg_device_account"."manufacturer" IS '生产厂家';
+COMMENT ON COLUMN "public"."qg_device_account"."buy_date" IS '购买时间';
+COMMENT ON COLUMN "public"."qg_device_account"."price" IS '价格';
+COMMENT ON COLUMN "public"."qg_device_account"."product_date" IS '出厂日期';
+COMMENT ON COLUMN "public"."qg_device_account"."receive_date" IS '验收日期';
+COMMENT ON COLUMN "public"."qg_device_account"."registe_date" IS '登记日期';
+COMMENT ON COLUMN "public"."qg_device_account"."supplier_id" IS '供应商id';
+COMMENT ON COLUMN "public"."qg_device_account"."device_img" IS '图片';
+COMMENT ON COLUMN "public"."qg_device_account"."description" IS '备注';
+
+CREATE TABLE "public"."qg_supplier" (
+   "id" varchar(36)  NOT NULL,
+   "name" varchar(50),
+   "code" varchar(50),
+   "contacts" varchar(50),
+   "contacts_mobile" varchar(50),
+   "tenant_id" varchar(36),
+   "create_time" timestamp(6),
+   "creator" varchar(36),
+   "updater" varchar(36),
+   "update_time" timestamp(6),
+   CONSTRAINT "qg_supplier_pkey" PRIMARY KEY ("id")
+);

@@ -892,3 +892,219 @@ CREATE TABLE IF NOT EXISTS alarm_types (
     CONSTRAINT tenant_id_type_unq_key UNIQUE (tenant_id, type),
     CONSTRAINT fk_entity_tenant_id FOREIGN KEY (tenant_id) REFERENCES tenant(id) ON DELETE CASCADE
 );
+
+CREATE TABLE IF NOT EXISTS qg_malfunction_reason (
+    "id" varchar(36)  NOT NULL,
+    "code" varchar(50),
+    "reason" varchar(200),
+    "status" varchar(50),
+    "tenant_id" varchar(36),
+    "create_time" timestamp(6),
+    "creator" varchar(36),
+    "updater" varchar(36),
+    "update_time" timestamp(6),
+    CONSTRAINT "qg_malfunction_reason_pkey" PRIMARY KEY ("id")
+);
+
+CREATE TABLE IF NOT EXISTS qg_repair_order (
+   "id" varchar(36)  NOT NULL,
+   "device_id" varchar(36),
+   "order_code" varchar(50),
+   "report_date" timestamp(6),
+   "report_by" varchar(36),
+   "status" varchar(50),
+   "emergency" bool,
+   "situation_img" varchar(200),
+   "description" varchar(500),
+   "tenant_id" varchar(36),
+   "create_time" timestamp(6),
+   "creator" varchar(36),
+   "updater" varchar(36),
+   "update_time" timestamp(6),
+   CONSTRAINT "qg_repair_order_pkey" PRIMARY KEY ("id")
+);
+
+
+CREATE TABLE IF NOT EXISTS qg_repair_record (
+     "id" varchar(36)  NOT NULL,
+     "order_id" varchar(36),
+     "repair_date" timestamp(6),
+     "repair_by" varchar(36),
+     "description" varchar(500),
+     "tenant_id" varchar(36),
+     "create_time" timestamp(6),
+     "creator" varchar(36),
+     "updater" varchar(36),
+     "update_time" timestamp(6),
+     CONSTRAINT "qg_repair_record_pkey" PRIMARY KEY ("id")
+);
+
+CREATE TABLE IF NOT EXISTS  qg_inspection_plan (
+    "id"          varchar(36) PRIMARY KEY,
+    "code"        varchar(50) NOT NULL,
+    "name"        varchar(50) NOT NULL,
+    "status"      varchar(50) NOT NULL,
+    "start_time"  timestamp(6),
+    "end_time"    timestamp(6),
+    "create_time" timestamp(6),
+    "creator"     varchar(36),
+    "updater"     varchar(36),
+    "update_time" timestamp(6),
+    "remark"      varchar(255)
+);
+
+CREATE TABLE IF NOT EXISTS qg_check_plan
+(
+    "id"           varchar(36) PRIMARY KEY,
+    "code"         varchar(50) NOT NULL,
+    "name"         varchar(50) NOT NULL,
+    "type"         varchar(50),
+    "status"       varchar(50),
+    "plan_details" varchar(255),
+    "create_time"  timestamp(6),
+    "creator"      varchar(36),
+    "updater"      varchar(36),
+    "update_time"  timestamp(6)
+);
+
+CREATE TABLE IF NOT EXISTS qg_check_details
+(
+    "id"                 varchar(36) PRIMARY KEY,
+    "code"               varchar(50) NOT NULL,
+    "check_device_id"    varchar(36) NOT NULL,
+    "check_plan_id"      varchar(36),
+    "inspection_plan_id" varchar(36),
+    "plan_details"       varchar(255),
+    "create_time"        timestamp(6),
+    "creator"            varchar(36),
+    "updater"            varchar(36),
+    "update_time"        timestamp(6)
+);
+
+CREATE TABLE IF NOT EXISTS qg_inspection_record
+(
+    "id"                 varchar(36) PRIMARY KEY,
+    "code"               varchar(50) NOT NULL,
+    "inspection_plan_id" varchar(36),
+    "tenant_id"          varchar(36),
+    "check_date"         timestamp(6),
+    "record_result"      bool,
+    "create_time"        timestamp(6),
+    "creator"            varchar(36),
+    "updater"            varchar(36),
+    "update_time"        timestamp(6)
+);
+
+CREATE TABLE IF NOT EXISTS  qg_inspection_details
+(
+    "id"              varchar(36) PRIMARY KEY,
+    "check_device_id" varchar(36),
+    "plan_details"    varchar(255),
+    "record_result"   bool,
+    "create_time"     timestamp(6),
+    "creator"         varchar(36),
+    "updater"         varchar(36),
+    "update_time"     timestamp(6)
+);
+
+CREATE TABLE IF NOT EXISTS  qg_preserve_detail (
+    "id" varchar(36)  NOT NULL,
+    "detail_code" varchar(50),
+    "preserve_detail" varchar(200),
+    "preserve_plan_id" varchar(36),
+    "device_id" varchar(36),
+    "check_plan_id" varchar(36),
+    "detail_status" varchar(50),
+    "tenant_id" varchar(36),
+    "create_time" timestamp(6),
+    "creator" varchar(36),
+    "updater" varchar(36),
+    "update_time" timestamp(6),
+    CONSTRAINT "qg_preserve_detail_pkey" PRIMARY KEY ("id")
+);
+
+CREATE TABLE IF NOT EXISTS qg_preserve_plan (
+   "id" varchar(36)  NOT NULL,
+   "preserve_code" varchar(50),
+   "preserve_name" varchar(200),
+   "status" varchar(50),
+   "times" int4,
+   "frequency" varchar(50),
+   "tenant_id" varchar(36),
+   "create_time" timestamp(6),
+   "creator" varchar(36),
+   "updater" varchar(36),
+   "update_time" timestamp(6),
+   CONSTRAINT "qg_preserve_plan_pkey" PRIMARY KEY ("id")
+);
+
+CREATE TABLE IF NOT EXISTS qg_preserve_record (
+    "id" varchar(36)  NOT NULL,
+    "record_code" varchar(50),
+    "preserve_plan_id" varchar(36),
+    "preserve_date" timestamp(6),
+    "preserve_by" varchar(36),
+    "preserve_status" varchar(50),
+    "tenant_id" varchar(36),
+    "create_time" timestamp(6),
+    "creator" varchar(36),
+    "updater" varchar(36),
+    "update_time" timestamp(6),
+    CONSTRAINT "qg_preserve_record_pkey" PRIMARY KEY ("id")
+);
+
+CREATE TABLE IF NOT EXISTS  qg_device_cagegory (
+  "id" varchar(36)  NOT NULL,
+  "name" varchar(50),
+  "parent_id" varchar(36),
+  "cagegory_order" int4,
+  "tenant_id" varchar(36),
+  "create_time" timestamp(6),
+  "creator" varchar(36),
+  "updater" varchar(36),
+  "update_time" timestamp(6),
+  CONSTRAINT "qg_device_cagegory_pkey" PRIMARY KEY ("id")
+);
+
+CREATE TABLE IF NOT EXISTS  qg_device_account (
+     "id" varchar(36)  NOT NULL,
+     "name" varchar(50),
+     "code" varchar(50),
+     "category_id" varchar(36),
+     "status" varchar(50),
+     "director_id" varchar(36),
+     "installLocation_id" varchar(36),
+     "is_online" bool,
+     "brand" varchar(50),
+     "model_num" varchar(50),
+     "specifications" varchar(50),
+     "manufacturer" varchar(50),
+     "buy_date" timestamp(6),
+     "price" float8,
+     "product_date" timestamp(6),
+     "receive_date" timestamp(6),
+     "registe_date" timestamp(6),
+     "supplier_id" varchar(36),
+     "device_img" varchar(100),
+     "description" varchar(200),
+     "tenant_id" varchar(36),
+     "create_time" timestamp(6),
+     "creator" varchar(36),
+     "updater" varchar(36),
+     "update_time" timestamp(6),
+     CONSTRAINT "qg_device_account_pkey" PRIMARY KEY ("id")
+);
+
+CREATE TABLE IF NOT EXISTS qg_supplier (
+  "id" varchar(36)  NOT NULL,
+  "name" varchar(50),
+  "code" varchar(50),
+  "contacts" varchar(50),
+  "contacts_mobile" varchar(50),
+  "tenant_id" varchar(36),
+  "create_time" timestamp(6),
+  "creator" varchar(36),
+  "updater" varchar(36),
+  "update_time" timestamp(6),
+  CONSTRAINT "qg_supplier_pkey" PRIMARY KEY ("id")
+);

@@ -58,10 +58,10 @@ public class TkMalfunctionReasonController extends BaseController {
         return ResponseEntity.ok(deviceDTO);
     }
 
-    @GetMapping("/delete")
+    @PostMapping("/delete")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
-    public ResponseEntity<Boolean> delete(@RequestParam("id") String id) throws ThingsboardException {
-        return ResponseEntity.ok(tkMalfunctionReasonService.delete(id));
+    public ResponseEntity<Boolean> delete(@RequestBody TkMalfunctionReasonDTO tkMalfunctionReasonDTO) throws ThingsboardException {
+        return ResponseEntity.ok(tkMalfunctionReasonService.delete(tkMalfunctionReasonDTO.getIds()));
     }
 
     @GetMapping("/detail")

@@ -141,12 +141,4 @@ public class DeviceDTO extends TenantDTO {
   private String organizationName;
   @ApiModelProperty(value = "是否来自边端")
   private Integer isEdge;
-  @ApiModelProperty(value = "设备负责人id")
-  private String directorId;
-  @ApiModelProperty(value = "设备负责人名称")
-  private String directorName;
-  @ApiModelProperty(value = "类别id")
-  private String categoryId;
-  @ApiModelProperty(value = "类别名称")
-  private String categoryName;
 }

+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 java.time.LocalDateTime;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TkDeviceAccountEntityDTO extends TenantDTO {
+    @ApiModelProperty(value = "设备名称")
+    private String name;
+
+    @ApiModelProperty(value = "编码")
+    private String code;
+
+    @ApiModelProperty(value = "类别id")
+    private String categoryId;
+
+    @ApiModelProperty(value = "状态(FAULT故障,NORMAL正常,SCRAP报废)")
+    private String status;
+
+    @ApiModelProperty(value = "负责人id")
+    private String directorId;
+
+    @ApiModelProperty(value = "是否联网")
+    private Boolean isOnline;
+
+    @ApiModelProperty(value = "品牌")
+    private String brand;
+
+    @ApiModelProperty(value = "型号")
+    private String modelNum;
+
+    @ApiModelProperty(value = "规格")
+    private String specifications;
+
+    @ApiModelProperty(value = "生产厂家")
+    private String manufacturer;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "购买时间")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime buyDate;
+
+    @ApiModelProperty(value = "价格")
+    private Double price;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "出厂日期")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime productDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "验收日期")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime receiveDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "登记日期")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime registeDate;
+
+    @ApiModelProperty(value = "供应商id")
+    private String supplierId;
+
+    @ApiModelProperty(value = "图片")
+    private String deviceImg;
+
+    @ApiModelProperty(value = "备注")
+    private String description;
+
+    @ApiModelProperty(value = "设备负责人名称")
+    private String directorName;
+
+    @ApiModelProperty(value = "类别名称")
+    private String categoryName;
+}

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class TkMalfunctionReasonDTO extends TenantDTO {
@@ -22,4 +24,6 @@ public class TkMalfunctionReasonDTO extends TenantDTO {
 
     @ApiModelProperty(value = "页码")
     private Integer pageSize;
+
+    private List<String> ids;
 }

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum TkDeviceAccountEnum {
+    //故障
+    FAULT,
+    //正常
+    NORMAL,
+    //报废
+    SCRAP
+
+}

@@ -683,7 +683,10 @@ public class ModelConstants {
     public static final String TKPRESERVEPLAN_TABLE_NAME = "qg_preserve_plan";//保养计划
     public static final String TKPRESERVEDETAIL_TABLE_NAME = "qg_preserve_detail";//保养详情
     public static final String TKPRESERVERECORD_TABLE_NAME = "qg_preserve_record";//保养记录
-    public static final String TKDEVICECAGEGORY_TABLE_NAME = "qg_device_cagegory";//保养记录
+    public static final String TKDEVICECAGEGORY_TABLE_NAME = "qg_device_cagegory";//设备类别
+    public static final String TKDEVICEACCOUNT_TABLE_NAME = "qg_device_account";//设备台账
+    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"; // 巡检/保养方案

+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;
+
+import java.time.LocalDateTime;
+
+/**
+ * 设备台账
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.TKDEVICEACCOUNT_TABLE_NAME, autoResultMap = true)
+public class TkDeviceAccountEntity extends TenantBaseEntity {
+    private String name;
+    private String code;
+    private String categoryId;
+    private String status;
+    private String directorId;
+    private Boolean isOnline;
+    private String brand;
+    private String modelNum;
+    private String specifications;
+    private String manufacturer;
+    private LocalDateTime buyDate;
+    private Double price;
+    private LocalDateTime productDate;
+    private LocalDateTime receiveDate;
+    private LocalDateTime registeDate;
+    private String supplierId;
+    private String deviceImg;
+    private String description;
+}

@@ -88,8 +88,4 @@ public class TkDeviceEntity extends TbTenantBaseEntity {
   @TableField(exist = false)
   private Integer isEdge;
 
-  private String directorId;
-
-  private String categoryId;
-
 }

+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.TKSUPPLIER_TABLE_NAME, autoResultMap = true)
+public class TkSupplierEntity extends TenantBaseEntity {
+    private String name;
+    private String code;
+    private String contacts;
+    private String contactsMobile;
+
+}

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
@@ -135,4 +136,13 @@ public class TkMalfunctionReasonServiceImpl extends AbstractBaseService<TkMalfun
         int count = baseMapper.deleteById(id);
         return count > 0;
     }
+
+    @Override
+    public boolean delete(List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            throw new TkDataValidationException("id 不能为空！");
+        }
+        int count = baseMapper.deleteBatchIds(ids);
+        return count > 0;
+    }
 }

@@ -22,6 +22,8 @@ public interface TkMalfunctionReasonService extends BaseService<TkMalfunctionRea
 
     boolean delete(String id);
 
+    boolean delete(List<String> ids);
+
 
 
 }