diff --git a/src/main/java/com/glxp/api/config/HdSchemaExecutor.java b/src/main/java/com/glxp/api/config/HdSchemaExecutor.java index d4ac94ea..e9682f11 100644 --- a/src/main/java/com/glxp/api/config/HdSchemaExecutor.java +++ b/src/main/java/com/glxp/api/config/HdSchemaExecutor.java @@ -81,8 +81,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")); } -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/sync/SyncEditLogMapper.java b/src/main/java/com/glxp/api/dao/sync/SyncEditLogMapper.java new file mode 100644 index 00000000..728c03de --- /dev/null +++ b/src/main/java/com/glxp/api/dao/sync/SyncEditLogMapper.java @@ -0,0 +1,12 @@ +package com.glxp.api.dao.sync; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.sync.SyncEditLogEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SyncEditLogMapper extends BaseMapper { + int insertOrUpdate(SyncEditLogEntity record); + + int insertOrUpdateSelective(SyncEditLogEntity record); +} diff --git a/src/main/java/com/glxp/api/dao/sync/SyncEditTypeMapper.java b/src/main/java/com/glxp/api/dao/sync/SyncEditTypeMapper.java new file mode 100644 index 00000000..c7bb2977 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/sync/SyncEditTypeMapper.java @@ -0,0 +1,12 @@ +package com.glxp.api.dao.sync; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.sync.SyncEditTypeEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SyncEditTypeMapper extends BaseMapper { + int insertOrUpdate(SyncEditTypeEntity record); + + int insertOrUpdateSelective(SyncEditTypeEntity record); +} diff --git a/src/main/java/com/glxp/api/entity/sync/SyncEditLogEntity.java b/src/main/java/com/glxp/api/entity/sync/SyncEditLogEntity.java new file mode 100644 index 00000000..a38e3b0f --- /dev/null +++ b/src/main/java/com/glxp/api/entity/sync/SyncEditLogEntity.java @@ -0,0 +1,92 @@ +package com.glxp.api.entity.sync; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +@ApiModel(value="com-glxp-api-entity-sync-SyncEditLog") +@Data +@TableName(value = "sync_edit_log") +public class SyncEditLogEntity implements Serializable { + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value="") + private Integer id; + + /** + * 日志记录号 + */ + @TableField(value = "recordCode") + @ApiModelProperty(value="日志记录号") + private String recordCode; + + /** + * 操作类型(1:增;2:删,3:改,4:查) + */ + @TableField(value = "operType") + @ApiModelProperty(value="操作类型(1:增;2:删,3:改,4:查)") + private Byte operType; + + /** + * 操作数据类型 + */ + @TableField(value = "dataType") + @ApiModelProperty(value="操作数据类型") + private String dataType; + + /** + * 接口地址 + */ + @TableField(value = "url") + @ApiModelProperty(value="接口地址") + private String url; + + /** + * 请求参数 + */ + @TableField(value = "param") + @ApiModelProperty(value="请求参数") + private String param; + + /** + * 请求结果 + */ + @TableField(value = "jsonResult") + @ApiModelProperty(value="请求结果") + private String jsonResult; + + /** + * 1:本地操作;2:对方操作 + */ + @TableField(value = "directType") + @ApiModelProperty(value="1:本地操作;2:对方操作") + private Byte directType; + + /** + * 备注说明 + */ + @TableField(value = "remark") + @ApiModelProperty(value="备注说明") + private String remark; + + /** + * 操作人 + */ + @TableField(value = "operUser") + @ApiModelProperty(value="操作人") + private String operUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + @ApiModelProperty(value="更新时间") + private Date updateTime; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/entity/sync/SyncEditTypeEntity.java b/src/main/java/com/glxp/api/entity/sync/SyncEditTypeEntity.java new file mode 100644 index 00000000..e946b97d --- /dev/null +++ b/src/main/java/com/glxp/api/entity/sync/SyncEditTypeEntity.java @@ -0,0 +1,42 @@ +package com.glxp.api.entity.sync; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import lombok.Data; + +@ApiModel(value="com-glxp-api-entity-sync-SyncEditType") +@Data +@TableName(value = "sync_edit_type") +public class SyncEditTypeEntity implements Serializable { + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value="") + private Integer id; + + /** + * 操作类型 + */ + @TableField(value = "code") + @ApiModelProperty(value="操作类型") + private String code; + + /** + * 操作类型名称 + */ + @TableField(value = "`name`") + @ApiModelProperty(value="操作类型名称") + private String name; + + /** + * 备注 + */ + @TableField(value = "remark") + @ApiModelProperty(value="备注") + private String remark; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java b/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java new file mode 100644 index 00000000..58d73e5b --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java @@ -0,0 +1,18 @@ +package com.glxp.api.service.sync; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.entity.sync.SyncEditLogEntity; +import com.glxp.api.dao.sync.SyncEditLogMapper; +@Service +public class SyncEditLogService extends ServiceImpl { + + + public int insertOrUpdate(SyncEditLogEntity record) { + return baseMapper.insertOrUpdate(record); + } + + public int insertOrUpdateSelective(SyncEditLogEntity record) { + return baseMapper.insertOrUpdateSelective(record); + } +} diff --git a/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java b/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java new file mode 100644 index 00000000..f63db320 --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java @@ -0,0 +1,18 @@ +package com.glxp.api.service.sync; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.sync.SyncEditTypeMapper; +import com.glxp.api.entity.sync.SyncEditTypeEntity; +@Service +public class SyncEditTypeService extends ServiceImpl { + + + public int insertOrUpdate(SyncEditTypeEntity record) { + return baseMapper.insertOrUpdate(record); + } + + public int insertOrUpdateSelective(SyncEditTypeEntity record) { + return baseMapper.insertOrUpdateSelective(record); + } +} diff --git a/src/main/resources/mybatis/mapper/sync/SyncEditLogMapper.xml b/src/main/resources/mybatis/mapper/sync/SyncEditLogMapper.xml new file mode 100644 index 00000000..aa6e5674 --- /dev/null +++ b/src/main/resources/mybatis/mapper/sync/SyncEditLogMapper.xml @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + id, recordCode, operType, dataType, url, param, jsonResult, directType, remark, operUser, + updateTime + + + + insert into sync_edit_log + + + id, + + recordCode, + operType, + dataType, + url, + param, + jsonResult, + directType, + remark, + operUser, + updateTime, + + values + + + #{id,jdbcType=INTEGER}, + + #{recordCode,jdbcType=VARCHAR}, + #{operType,jdbcType=TINYINT}, + #{dataType,jdbcType=VARCHAR}, + #{url,jdbcType=VARCHAR}, + #{param,jdbcType=VARCHAR}, + #{jsonResult,jdbcType=VARCHAR}, + #{directType,jdbcType=TINYINT}, + #{remark,jdbcType=VARCHAR}, + #{operUser,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + recordCode = #{recordCode,jdbcType=VARCHAR}, + operType = #{operType,jdbcType=TINYINT}, + dataType = #{dataType,jdbcType=VARCHAR}, + url = #{url,jdbcType=VARCHAR}, + param = #{param,jdbcType=VARCHAR}, + jsonResult = #{jsonResult,jdbcType=VARCHAR}, + directType = #{directType,jdbcType=TINYINT}, + remark = #{remark,jdbcType=VARCHAR}, + operUser = #{operUser,jdbcType=VARCHAR}, + updateTime = #{updateTime,jdbcType=TIMESTAMP}, + + + + + insert into sync_edit_log + + + id, + + + recordCode, + + + operType, + + + dataType, + + + url, + + + param, + + + jsonResult, + + + directType, + + + remark, + + + operUser, + + + updateTime, + + + values + + + #{id,jdbcType=INTEGER}, + + + #{recordCode,jdbcType=VARCHAR}, + + + #{operType,jdbcType=TINYINT}, + + + #{dataType,jdbcType=VARCHAR}, + + + #{url,jdbcType=VARCHAR}, + + + #{param,jdbcType=VARCHAR}, + + + #{jsonResult,jdbcType=VARCHAR}, + + + #{directType,jdbcType=TINYINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{operUser,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + + recordCode = #{recordCode,jdbcType=VARCHAR}, + + + operType = #{operType,jdbcType=TINYINT}, + + + dataType = #{dataType,jdbcType=VARCHAR}, + + + url = #{url,jdbcType=VARCHAR}, + + + param = #{param,jdbcType=VARCHAR}, + + + jsonResult = #{jsonResult,jdbcType=VARCHAR}, + + + directType = #{directType,jdbcType=TINYINT}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + operUser = #{operUser,jdbcType=VARCHAR}, + + + updateTime = #{updateTime,jdbcType=TIMESTAMP}, + + + + diff --git a/src/main/resources/mybatis/mapper/sync/SyncEditTypeMapper.xml b/src/main/resources/mybatis/mapper/sync/SyncEditTypeMapper.xml new file mode 100644 index 00000000..cf2beeb1 --- /dev/null +++ b/src/main/resources/mybatis/mapper/sync/SyncEditTypeMapper.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + id, code, `name`, remark + + + + insert into sync_edit_type + + + id, + + code, + `name`, + remark, + + values + + + #{id,jdbcType=INTEGER}, + + #{code,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, + #{remark,jdbcType=VARCHAR}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + code = #{code,jdbcType=VARCHAR}, + `name` = #{name,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + + + + + insert into sync_edit_type + + + id, + + + code, + + + `name`, + + + remark, + + + values + + + #{id,jdbcType=INTEGER}, + + + #{code,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + + code = #{code,jdbcType=VARCHAR}, + + + `name` = #{name,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + + diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql new file mode 100644 index 00000000..7b34b320 --- /dev/null +++ b/src/main/resources/schemas/schema_v2.2.sql @@ -0,0 +1,34 @@ + +CREATE TABLE IF NOT EXISTS `sync_edit_log` +( + `id` int NOT NULL AUTO_INCREMENT, + `recordCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '日志记录号', + `operType` tinyint NULL DEFAULT NULL COMMENT '操作类型(1:增;2:删,3:改,4:查)', + `dataType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '操作数据类型', + `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '接口地址', + `param` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '请求参数', + `jsonResult` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '请求结果', + `directType` tinyint NULL DEFAULT NULL COMMENT '1:本地操作;2:对方操作', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注说明', + `operUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci 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; + + +CREATE TABLE IF NOT EXISTS `sync_edit_type` +( + `id` int NOT NULL AUTO_INCREMENT, + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '操作类型', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '操作类型名称', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci 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;