修改数据库字段

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/controller/DangerCheckFormController.java

@@ -39,10 +39,10 @@ import com.customs.cq.datacenter.business.entity.search.SearchDangerCheckForm;
 import com.customs.cq.datacenter.business.domain.vo.DangerCheckFormVO;
 
 /**
- * 1050.隐患检查表
+ * 9000.隐患检查表
  * @author lin.liu
- * @description 1050.隐患检查表
- * @order 1050
+ * @description 9000.隐患检查表
+ * @order 9000
  */
 @RestController
 @RequestMapping(value = "dangerCheckForm")

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/DangerCategoryPO.java

@@ -44,14 +44,14 @@ public class DangerCategoryPO {
 	 * 类别名称
 	 */
 	private String categoryName;
-	/**
-	 * 描述
-	 */
-	private String description;
 	/**
 	 * 检查频率 ECheckCycle
 	 */
 	private Integer checkCycle;
+	/**
+	 * 描述
+	 */
+	private String description;
 	/**
 	 * 状态 EState
 	 */

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/request/dangercategory/ReqCreateDangerCategory.java

@@ -36,6 +36,10 @@ public class ReqCreateDangerCategory {
 	 * 类别名称
 	 */
 	private String categoryName;
+	/**
+	 * 检查频率 ECheckCycle
+	 */
+	private Integer checkCycle;
 	/**
 	 * 描述
 	 */

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/request/dangercategory/ReqModifyDangerCategory.java

@@ -40,6 +40,10 @@ public class ReqModifyDangerCategory {
 	 * 类别名称
 	 */
 	private String categoryName;
+	/**
+	 * 检查频率 ECheckCycle
+	 */
+	private Integer checkCycle;
 	/**
 	 * 描述
 	 */

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/request/dangercheckform/ReqCreateDangerCheckForm.java

@@ -36,14 +36,6 @@ public class ReqCreateDangerCheckForm {
 	 * 检查表名称
 	 */
 	private String name;
-	/**
-	 * 所属部门
-	 */
-	private String department;
-	/**
-	 * 部门名称
-	 */
-	private String departmentName;
 	/**
 	 * 隐患分类
 	 */

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/request/dangercheckform/ReqModifyDangerCheckForm.java

@@ -40,14 +40,6 @@ public class ReqModifyDangerCheckForm {
 	 * 检查表名称
 	 */
 	private String name;
-	/**
-	 * 所属部门
-	 */
-	private String department;
-	/**
-	 * 部门名称
-	 */
-	private String departmentName;
 	/**
 	 * 隐患分类
 	 */

secure-producting-common/src/main/java/com/customs/cq/datacenter/common/enums/ECheckCycle.java

@@ -0,0 +1,79 @@
+package com.customs.cq.datacenter.common.enums;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+public enum ECheckCycle {
+    /**
+     * 每天=1,
+     */
+    DAY("每天", 1),
+    /**
+     * 每周=2,
+     */
+    WEEK("每周", 2),
+    /**
+     * 每月=3,
+     */
+    MONTH("每月", 3),
+    /**
+     * 每季度=4,
+     */
+    QUARTER("每季度", 4),
+    /**
+     * 每半年=5,
+     */
+    HALF_YEAR("每半年", 5),
+    /**
+     * 每年=6,
+     */
+    YEAR("每年", 6),
+    ;
+
+    /**
+     * 枚举描述
+     */
+    private String desc;
+    /**
+     * 枚举值
+     */
+    private Integer value;
+
+    public Integer getValue() {
+        return value;
+    }
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * 构造方法
+     * @param desc 枚举描述
+     * @param value 枚举值
+     */
+    ECheckCycle(String desc, Integer value) {
+        this.desc = desc;
+        this.value = value;
+    }
+
+    /**
+     * 根据值获取枚举
+     *
+     * @param value 枚举值
+     * @return
+     */
+    public static ECheckCycle getByValue(Integer value) {
+        return Arrays.stream(ECheckCycle.values())
+                .filter(e -> Objects.equals(e.getValue(), value))
+                .findAny()
+                .orElse(null);
+    }
+
+    @Override
+    public String toString() {
+        return "ECheckCycle{" +
+                "desc='" + desc + '\'' +
+                ", value=" + value +
+                '}';
+    }
+}

sql/20240814.sql

@@ -47,6 +47,7 @@ COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_GRID_CATEGORY"."IS_DELETE" IS '是否
 CREATE TABLE "SECURE_PRODUCTING"."SP_DANGER_CATEGORY"(
   "ID" BIGINT NOT NULL,
   "CATEGORY_NAME" VARCHAR(50) NOT NULL DEFAULT '',
+  "CHECK_CYCLE" TINYINT NOT NULL DEFAULT 0,
   "DESCRIPTION" VARCHAR(50) NOT NULL DEFAULT '',
   "STATUS" TINYINT NOT NULL DEFAULT 0,
   "CREATE_TIME" BIGINT NOT NULL DEFAULT 0,
@@ -73,6 +74,7 @@ END;
 COMMENT ON TABLE "SECURE_PRODUCTING"."SP_DANGER_CATEGORY" IS '隐患类别';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CATEGORY"."ID" IS '主键';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CATEGORY"."CATEGORY_NAME" IS '类别名称';
+COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CATEGORY"."CHECK_CYCLE" IS '检查频率 ECheckCycle';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CATEGORY"."DESCRIPTION" IS '描述';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CATEGORY"."STATUS" IS '状态 EState';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CATEGORY"."CREATE_TIME" IS '数据创建时间';
@@ -142,7 +144,7 @@ COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_GRID_INFO"."IS_DELETE" IS '是否删
 
 
 
--- SP_GRID_PERSON "SECURE_PRODUCTING".- 网格人员
+-- SP_GRID_PERSON - 网格人员
 CREATE TABLE "SECURE_PRODUCTING"."SP_GRID_PERSON"(
   "ID" BIGINT NOT NULL,
   "DEPARTMENT" VARCHAR(50) NOT NULL DEFAULT '',
@@ -202,8 +204,6 @@ COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_GRID_PERSON"."IS_DELETE" IS '是否
 CREATE TABLE "SECURE_PRODUCTING"."SP_DANGER_CHECK_FORM"(
   "ID" BIGINT NOT NULL,
   "NAME" VARCHAR(200) NOT NULL DEFAULT '',
-  "DEPARTMENT" VARCHAR(50) NOT NULL DEFAULT '',
-  "DEPARTMENT_NAME" VARCHAR(200) NOT NULL DEFAULT '',
   "DANGER_CATEGORY" BIGINT NOT NULL DEFAULT 0,
   "CHECK_CYCLE" TINYINT NOT NULL DEFAULT 0,
   "CHECK_TIMES" TINYINT NOT NULL DEFAULT 0,
@@ -220,7 +220,6 @@ CREATE TABLE "SECURE_PRODUCTING"."SP_DANGER_CHECK_FORM"(
   PRIMARY KEY("ID")
 );
 -- 索引
-CREATE INDEX IDX_SP_DANGER_CHECK_FORM_DEPARTMENT ON "SECURE_PRODUCTING"."SP_DANGER_CHECK_FORM"("DEPARTMENT");
 CREATE INDEX IDX_SP_DANGER_CHECK_FORM_DANGER_CATEGORY ON "SECURE_PRODUCTING"."SP_DANGER_CHECK_FORM"("DANGER_CATEGORY");
 CREATE INDEX IDX_SP_DANGER_CHECK_FORM_CHECK_CYCLE ON "SECURE_PRODUCTING"."SP_DANGER_CHECK_FORM"("CHECK_CYCLE");
 CREATE INDEX IDX_SP_DANGER_CHECK_FORM_STATUS ON "SECURE_PRODUCTING"."SP_DANGER_CHECK_FORM"("STATUS");
@@ -236,8 +235,6 @@ END;
 COMMENT ON TABLE "SECURE_PRODUCTING"."SP_DANGER_CHECK_FORM" IS '隐患检查表';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CHECK_FORM"."ID" IS '主键';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CHECK_FORM"."NAME" IS '检查表名称';
-COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CHECK_FORM"."DEPARTMENT" IS '所属部门';
-COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CHECK_FORM"."DEPARTMENT_NAME" IS '部门名称';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CHECK_FORM"."DANGER_CATEGORY" IS '隐患分类';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CHECK_FORM"."CHECK_CYCLE" IS '检查频率 ECheckCycle';
 COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CHECK_FORM"."CHECK_TIMES" IS '检查次数(周期内)';
@@ -259,7 +256,7 @@ COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CHECK_FORM"."IS_DELETE" IS '
 CREATE TABLE "SECURE_PRODUCTING"."SP_DANGER_CHECK_ITEM"(
   "ID" BIGINT NOT NULL,
   "CHECK_FORM_ID" BIGINT NOT NULL DEFAULT 0,
-  "ITEM_NAME" VARCHAR(50) NOT NULL DEFAULT '',
+  "ITEM_NAME" VARCHAR(200) NOT NULL DEFAULT '',
   "DESCRIPTION" VARCHAR(500) NOT NULL DEFAULT '',
   "CREATE_TIME" BIGINT NOT NULL DEFAULT 0,
   "UPDATE_TIME" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(),
@@ -290,6 +287,44 @@ COMMENT ON COLUMN "SECURE_PRODUCTING". "SP_DANGER_CHECK_ITEM"."IS_DELETE" IS '
 
 
 
+-- SP_CHECK_FORM_GRID_CYCLE - 检查表-网格-频率设置
+CREATE TABLE "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"(
+  "ID" BIGINT NOT NULL,
+  "CHECK_FORM_ID" BIGINT NOT NULL DEFAULT 0,
+  "CHECK_FORM_NAME" VARCHAR(200) NOT NULL DEFAULT '',
+  "GRID_ID" BIGINT NOT NULL DEFAULT 0,
+  "GRID_NAME" VARCHAR(50) NOT NULL DEFAULT '',
+  "CHECK_CYCLE" TINYINT NOT NULL DEFAULT 0,
+  "CREATE_TIME" BIGINT NOT NULL DEFAULT 0,
+  "UPDATE_TIME" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(),
+  "IS_DELETE" TINYINT NOT NULL DEFAULT 0,
+  -- 主键
+  PRIMARY KEY("ID")
+);
+-- 索引
+CREATE INDEX IDX_SP_CHECK_FORM_GRID_CYCLE_CHECK_FORM_ID ON "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"("CHECK_FORM_ID");
+CREATE INDEX IDX_SP_CHECK_FORM_GRID_CYCLE_GRID_ID ON "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"("GRID_ID");
+CREATE INDEX IDX_SP_CHECK_FORM_GRID_CYCLE_CREATE_TIME ON "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"("CREATE_TIME");
+-- 触发器：自动赋值最后修改时间
+CREATE OR REPLACE TRIGGER "SECURE_PRODUCTING"."TG_SP_CHECK_FORM_GRID_CYCLE"
+BEFORE INSERT OR UPDATE ON "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE" FOR EACH ROW
+BEGIN
+  :new.UPDATE_TIME=CURRENT_TIMESTAMP();
+END;
+
+-- 字段描述
+COMMENT ON TABLE "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE" IS '检查表-网格-频率设置';
+COMMENT ON COLUMN "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"."ID" IS '主键';
+COMMENT ON COLUMN "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"."CHECK_FORM_ID" IS '关联检查表';
+COMMENT ON COLUMN "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"."CHECK_FORM_NAME" IS '检查表名称';
+COMMENT ON COLUMN "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"."GRID_ID" IS '关联网格';
+COMMENT ON COLUMN "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"."GRID_NAME" IS '网格名称';
+COMMENT ON COLUMN "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"."CHECK_CYCLE" IS '检查频率 ECheckCycle';
+COMMENT ON COLUMN "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"."CREATE_TIME" IS '数据创建时间';
+COMMENT ON COLUMN "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"."UPDATE_TIME" IS '最后更新时间';
+COMMENT ON COLUMN "SECURE_PRODUCTING"."SP_CHECK_FORM_GRID_CYCLE"."IS_DELETE" IS '是否删除(逻辑删除)';
+
+
 
 
 -- SP_CHECK_RECORD - 隐患检查记录