报告模板配置

pqs-system/system-api/src/main/java/com/njcn/system/pojo/constant/DicState.java

@@ -0,0 +1,18 @@
+package com.njcn.system.pojo.constant;
+
+public interface DicState {
+
+    /**
+     * 状态 0-正常；1-停用；2-删除 默认正常
+     */
+    int ENABLE = 0;
+
+    int PAUSE = 1;
+
+    int DELETE = 2;
+
+    /**
+     * 顶层父类的pid
+     */
+    String FATHER_PID = "0";
+}

pqs-system/system-api/src/main/java/com/njcn/system/pojo/dto/DicDTO.java

@@ -0,0 +1,32 @@
+package com.njcn.system.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class DicDTO implements Serializable {
+
+    @ApiModelProperty("Id")
+    private String id;
+
+    @ApiModelProperty("父节点")
+    private String pid;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("编码")
+    private String code;
+
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    @ApiModelProperty("描述")
+    private String remark;
+
+    @ApiModelProperty("子级")
+    List<DicDTO> children;
+}

pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DicParam.java

@@ -0,0 +1,52 @@
+package com.njcn.system.pojo.param;
+
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.web.constant.ValidMessage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+@Data
+public class DicParam {
+
+    @ApiModelProperty("节点")
+    @NotBlank(message = ValidMessage.PID_NOT_BLANK)
+    private String pid;
+
+    @ApiModelProperty("名称")
+    @NotBlank(message = ValidMessage.NAME_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.DIC_REGEX, message = ValidMessage.NAME_FORMAT_ERROR)
+    private String name;
+
+    @ApiModelProperty("编号")
+    @NotBlank(message = ValidMessage.CODE_NOT_BLANK)
+    private String code;
+
+    @ApiModelProperty("排序")
+    @NotNull(message = ValidMessage.SORT_NOT_NULL)
+    @Range(min = 0, max = 999, message = ValidMessage.PARAM_FORMAT_ERROR)
+    private Integer sort;
+
+    @ApiModelProperty("描述")
+    private String remark;
+
+
+    /**
+     * 更新操作实体
+     * 需要填写的参数：id
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdateParam extends DicParam {
+
+        @ApiModelProperty("Id")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String id;
+    }
+}

pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java

@@ -26,7 +26,7 @@ public class EventTemplateParam {
     @ApiModelProperty("模板描述")
     @NotBlank(message = ValidMessage.CODE_NOT_BLANK)
     @Pattern(regexp = PatternRegex.DES64_REGEX, message = ValidMessage.CODE_FORMAT_ERROR)
-    private String mark;
+    private String code;
 
     @ApiModelProperty("类型")
     private Integer type;
@@ -56,7 +56,7 @@ public class EventTemplateParam {
         /**
          * 区分监测点与区域报告
          */
-        private String type;
+        private Integer type;
     }
 
     /**

pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Dic.java

@@ -0,0 +1,30 @@
+package com.njcn.system.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_dic_tree")
+public class Dic extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String pid;
+
+    private String pids;
+
+    private String name;
+
+    private String code;
+
+    private Integer sort;
+
+    private String remark;
+
+    private Integer status;
+}

pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventTemplate.java

@@ -37,7 +37,7 @@ public class EventTemplate extends BaseEntity {
     /**
      * 模板名称
      */
-    private String mark;
+    private String code;
 
     /**
      * 状态：0-删除 1-正常

pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DicVO.java

@@ -0,0 +1,35 @@
+package com.njcn.system.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class DicVO implements Serializable {
+
+    @ApiModelProperty("Id")
+    private String id;
+
+    @ApiModelProperty("父节点")
+    private String pid;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("编码")
+    private String code;
+
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    @ApiModelProperty("描述")
+    private String remark;
+
+    @ApiModelProperty("状态")
+    private Integer status;
+
+    @ApiModelProperty("子级")
+    List<DicVO> children;
+}

pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateVO.java

@@ -32,7 +32,7 @@ public class EventTemplateVO implements Serializable {
     /**
      * 模板描述
      */
-    private String mark;
+    private String code;
 
     /**
      * 状态：0-删除 1-正常