新增设备管理相关实体类与字段

src/main/java/com/glxp/api/config/HdSchemaExecutor.java

@@ -74,8 +74,8 @@ public class HdSchemaExecutor implements ApplicationRunner {
     }
 
     public void buildSchemas() {
-        schema.add(new SchemaData("v2.1", "schema_v2.1.sql"));
-//        schema.add(new SchemaData("v2.2", "schema_v2.2.sql"));
+//        schema.add(new SchemaData("v2.1", "schema_v2.1.sql"));
+        schema.add(new SchemaData("v2.2", "schema_v2.2.sql"));
 //        schema.add(new SchemaData("v2.3", "schema_v2.3.sql"));
     }
-}
+}

src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java

@@ -101,6 +101,7 @@ public class DeviceRepairOrderController {
 
     /**
      * 删除报修单
+     *
      * @param deleteRequest
      * @return
      */

src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskDetailMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inv;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inv.DeviceInspectTaskDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DeviceInspectTaskDetailMapper extends BaseMapper<DeviceInspectTaskDetail> {
+}

src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inv;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inv.DeviceInspectTask;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DeviceInspectTaskMapper extends BaseMapper<DeviceInspectTask> {
+}

src/main/java/com/glxp/api/dao/inv/DeviceProjectSetMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inv;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inv.DeviceProjectSet;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DeviceProjectSetMapper extends BaseMapper<DeviceProjectSet> {
+}

src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java

@@ -90,4 +90,40 @@ public class DeviceInspectPlanEntity {
     @TableField(value = "remark")
     private String remark;
 
-}
+
+    //--------------------------新增字段--------------------------------
+    /**
+     * 计划开始时间
+     */
+    private Date startTime;
+    /**
+     * 计划结束时间
+     */
+    private Date endTime;
+    /**
+     * 时间频率
+     */
+    private String frequency;
+    /**
+     * 时间频率单位（1：年；2：月：3：日；4：小时；5：分钟： 6：秒）
+     */
+    private Integer frequencyUnit;
+    /**
+     * 计划状态(1:未启用；2：运行中；3：已结束；4：已过期
+     */
+    private Integer planStatus;
+    /**
+     * 巡检人
+     */
+    private String inspectUser;
+    /**
+     * 上次巡检时间
+     */
+    private Date lastTime;
+    /**
+     * 下一次巡检时间
+     */
+    private Date nextTime;
+
+
+}

src/main/java/com/glxp/api/entity/inv/DeviceInspectTask.java

@@ -0,0 +1,96 @@
+package com.glxp.api.entity.inv;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+@TableName(value = "device_inspect_task")
+public class DeviceInspectTask implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Integer id;
+
+    /**
+     * 任务单号
+     */
+    @TableField(value = "orderId")
+    private String orderId;
+
+    /**
+     * 巡检计划单号（外键）
+     */
+    @TableField(value = "planOrderIdFk")
+    private String planOrderIdFk;
+
+    /**
+     * 部门
+     */
+    @TableField(value = "deptCode")
+    private String deptCode;
+
+    /**
+     * 仓库
+     */
+    @TableField(value = "invCode")
+    private String invCode;
+
+    /**
+     * 资产编码
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 状态
+     */
+    @TableField(value = "`status`")
+    private String status;
+
+    /**
+     * 巡检人
+     */
+    @TableField(value = "inspectUser")
+    private String inspectUser;
+
+    /**
+     * 提醒时间
+     */
+    @TableField(value = "remindTime")
+    private Date remindTime;
+
+    /**
+     * 巡检备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 任务开始时间
+     */
+    @TableField(value = "strartTime")
+    private Date strartTime;
+
+    /**
+     * 任务结束时间
+     */
+    @TableField(value = "endTime")
+    private Date endTime;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskDetail.java

@@ -0,0 +1,66 @@
+package com.glxp.api.entity.inv;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+@TableName(value = "device_inspect_task_detail")
+public class DeviceInspectTaskDetail implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Integer id;
+
+    /**
+     * 巡检项目编码
+     */
+    @TableField(value = "projectCode")
+    private String projectCode;
+
+    /**
+     * 巡检内容
+     */
+    @TableField(value = "projectContent")
+    private String projectContent;
+
+    /**
+     * 状态（1：未开始；2：已检查；3：异常；4：不巡检
+     */
+    @TableField(value = "`status`")
+    private String status;
+
+    /**
+     * 巡检结果备注
+     */
+    @TableField(value = "`result`")
+    private String result;
+
+    /**
+     * 巡检图片
+     */
+    @TableField(value = "inspectImage")
+    private String inspectImage;
+
+    /**
+     * 巡检人
+     */
+    @TableField(value = "inspectUser")
+    private String inspectUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    /**
+     * 巡检任务ID外键
+     */
+    @TableField(value = "taskOrderIdFk")
+    private String taskOrderIdFk;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/entity/inv/DeviceProjectSet.java

@@ -0,0 +1,66 @@
+package com.glxp.api.entity.inv;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+@TableName(value = "device_project_set")
+public class DeviceProjectSet implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Integer id;
+
+    /**
+     * 项目编号
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 项目内容
+     */
+    @TableField(value = "content")
+    private String content;
+
+    /**
+     * 项目类型：1：巡检；2：养护
+     */
+    @TableField(value = "`type`")
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remak")
+    private String remak;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "udpateTime")
+    private Date udpateTime;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    private String updateUser;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "`createUser`")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java

@@ -43,7 +43,7 @@ public class DeviceRepairOrderEntity {
     private String code;
 
     /**
-     * 状态（0：新增；1：未审核；2：已审核）
+     * 状态（0：新增；1：未审核；2：已审核；3。已处理）
      */
     @TableField(value = "`status`")
     private Integer status;
@@ -90,4 +90,46 @@ public class DeviceRepairOrderEntity {
     @TableField(value = "remark")
     private String remark;
 
-}
+
+//    ----------------------新增字段=-------------------------------
+    /**
+     * 维修类型 1:自行维修；2：外部维修
+     */
+    private String repairType;
+    /**
+     * 紧急类型  1,正常；2,较急；3,特急
+     */
+    private Integer urgencyType;
+    /**
+     * 计划完成日期
+     */
+    private Date planTime;
+    /**
+     * 报修图片
+     */
+    private String uploadImage;
+
+
+    /**
+     * 维修人
+     */
+    private String repariName;
+    /**
+     * 维修开始时间
+     */
+    private String repariStartTime;
+    /**
+     * 维修结束时间
+     */
+    private String repariEndTime;
+    /**
+     * 维修说明
+     */
+    private String repariRemark;
+    /**
+     * 维修图片
+     */
+    private String repariImage;
+
+
+}

src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java

@@ -0,0 +1,12 @@
+package com.glxp.api.service.inv;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.entity.inv.DeviceInspectTaskDetail;
+import com.glxp.api.dao.inv.DeviceInspectTaskDetailMapper;
+@Service
+public class DeviceInspectTaskDetailService extends ServiceImpl<DeviceInspectTaskDetailMapper, DeviceInspectTaskDetail> {
+
+}

src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java

@@ -0,0 +1,12 @@
+package com.glxp.api.service.inv;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.inv.DeviceInspectTaskMapper;
+import com.glxp.api.entity.inv.DeviceInspectTask;
+@Service
+public class DeviceInspectTaskService extends ServiceImpl<DeviceInspectTaskMapper, DeviceInspectTask> {
+
+}

src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java

@@ -0,0 +1,12 @@
+package com.glxp.api.service.inv;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.entity.inv.DeviceProjectSet;
+import com.glxp.api.dao.inv.DeviceProjectSetMapper;
+@Service
+public class DeviceProjectSetService extends ServiceImpl<DeviceProjectSetMapper, DeviceProjectSet> {
+
+}

src/main/resources/mybatis/mapper/inv/DeviceInspectTaskDetailMapper.xml

@@ -0,0 +1,22 @@
+<?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="com.glxp.api.dao.inv.DeviceInspectTaskDetailMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceInspectTaskDetail">
+    <!--@mbg.generated-->
+    <!--@Table device_inspect_task_detail-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="projectCode" jdbcType="VARCHAR" property="projectCode" />
+    <result column="projectContent" jdbcType="VARCHAR" property="projectContent" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="result" jdbcType="VARCHAR" property="result" />
+    <result column="inspectImage" jdbcType="VARCHAR" property="inspectImage" />
+    <result column="inspectUser" jdbcType="VARCHAR" property="inspectUser" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="taskOrderIdFk" jdbcType="VARCHAR" property="taskOrderIdFk" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, projectCode, projectContent, `status`, `result`, inspectImage, inspectUser, updateTime, 
+    taskOrderIdFk
+  </sql>
+</mapper>

src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml

@@ -0,0 +1,27 @@
+<?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="com.glxp.api.dao.inv.DeviceInspectTaskMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceInspectTask">
+    <!--@mbg.generated-->
+    <!--@Table device_inspect_task-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="orderId" jdbcType="VARCHAR" property="orderId" />
+    <result column="planOrderIdFk" jdbcType="VARCHAR" property="planOrderIdFk" />
+    <result column="deptCode" jdbcType="VARCHAR" property="deptCode" />
+    <result column="invCode" jdbcType="VARCHAR" property="invCode" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="inspectUser" jdbcType="VARCHAR" property="inspectUser" />
+    <result column="remindTime" jdbcType="TIMESTAMP" property="remindTime" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="strartTime" jdbcType="TIMESTAMP" property="strartTime" />
+    <result column="endTime" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, orderId, planOrderIdFk, deptCode, invCode, code, `status`, inspectUser, remindTime, 
+    remark, strartTime, endTime, createTime, updateTime
+  </sql>
+</mapper>

src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml

@@ -0,0 +1,21 @@
+<?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="com.glxp.api.dao.inv.DeviceProjectSetMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceProjectSet">
+    <!--@mbg.generated-->
+    <!--@Table device_project_set-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="remak" jdbcType="VARCHAR" property="remak" />
+    <result column="udpateTime" jdbcType="TIMESTAMP" property="udpateTime" />
+    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
+    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, code, content, `type`, remak, udpateTime, updateUser, `createUser`, createTime
+  </sql>
+</mapper>

src/main/resources/schemas/schema_v2.2.sql

@@ -0,0 +1,65 @@
+#   字段新增   （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
+
+CREATE TABLE IF NOT EXISTS `device_inspect_task`
+(
+    `id`            int                                                           NOT NULL AUTO_INCREMENT,
+    `orderId`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '任务单号',
+    `planOrderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检计划单号（外键）',
+    `deptCode`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门',
+    `invCode`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库',
+    `code`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '资产编码',
+    `status`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '状态',
+    `inspectUser`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检人',
+    `remindTime`    datetime(0)                                                   NULL DEFAULT NULL COMMENT '提醒时间',
+    `remark`        varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检备注',
+    `strartTime`    datetime(0)                                                   NULL DEFAULT NULL COMMENT '任务开始时间',
+    `endTime`       datetime(0)                                                   NULL DEFAULT NULL COMMENT '任务结束时间',
+    `createTime`    datetime(0)                                                   NULL DEFAULT NULL COMMENT '创建时间',
+    `updateTime`    datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for device_inspect_task_detail
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `device_inspect_task_detail`
+(
+    `id`             int                                                           NOT NULL AUTO_INCREMENT,
+    `projectCode`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检项目编码',
+    `projectContent` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检内容',
+    `status`         varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '状态（1：未开始；2：已检查；3：异常；4：不巡检',
+    `result`         varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检结果备注',
+    `inspectImage`   varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检图片',
+    `inspectUser`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检人',
+    `updateTime`     datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
+    `taskOrderIdFk`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检任务ID外键',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for device_project_set
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `device_project_set`
+(
+    `id`         int                                                           NOT NULL AUTO_INCREMENT,
+    `code`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目编号',
+    `content`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目内容',
+    `type`       int                                                           NULL DEFAULT NULL COMMENT '项目类型：1：巡检；2：养护',
+    `remak`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+    `udpateTime` datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
+    `updateUser` varchar(0) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci   NULL DEFAULT NULL COMMENT '更新人',
+    `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+    `createTime` datetime(0)                                                   NULL DEFAULT NULL COMMENT '创建时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;