Merge branches 'dev_sys_dict_upgrade', 'develop' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java

@@ -50,8 +50,8 @@ public class SysDictDataDTO implements Serializable {
 	private Integer sort;
 
 	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
-	private Date createDate;
+	private Date createdDate;
 
 	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
-	private Date updateDate;
+	private Date updatedDate;
 }

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java

@@ -47,8 +47,8 @@ public class SysDictTypeDTO implements Serializable {
 	private Integer sort;
 
 	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
-	private Date createDate;
+	private Date createdDate;
 
 	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
-	private Date updateDate;
+	private Date updatedDate;
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/SysDictDataEntity.java

@@ -8,15 +8,13 @@
 
 package com.epmet.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
+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 com.epmet.commons.mybatis.entity.BaseEntity;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 数据字典
  *
@@ -25,8 +23,10 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("sys_dict_data")
-public class SysDictDataEntity extends BaseEntity {
+public class SysDictDataEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
+	@TableId(type = IdType.ID_WORKER_STR)
+	private String id;
 	/**
 	 * 字典类型ID
 	 */
@@ -51,14 +51,4 @@ public class SysDictDataEntity extends BaseEntity {
 	 * 排序
 	 */
 	private Integer sort;
-	/**
-	 * 更新者
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Long updater;
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Date updateDate;
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/SysDictTypeEntity.java

@@ -8,15 +8,13 @@
 
 package com.epmet.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
+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 com.epmet.commons.mybatis.entity.BaseEntity;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 字典类型
  *
@@ -25,8 +23,11 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("sys_dict_type")
-public class SysDictTypeEntity extends BaseEntity {
+public class SysDictTypeEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
+
+	@TableId(type = IdType.ID_WORKER_STR)
+	private String id;
 	/**
 	 * 字典类型
 	 */
@@ -43,14 +44,4 @@ public class SysDictTypeEntity extends BaseEntity {
 	 * 排序
 	 */
 	private Integer sort;
-	/**
-	 * 更新者
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Long updater;
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Date updateDate;
 }

epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.195
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.196
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-report/data-report-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <version>0.3.195</version>
+    <version>0.3.196</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>