diff --git a/sql/dm_start.sql b/sql/dm_start.sql index c58210f..f80ce2a 100644 --- a/sql/dm_start.sql +++ b/sql/dm_start.sql @@ -132,7 +132,7 @@ COMMENT ON COLUMN "FXKH_TXL"."USERS"."LAST_DATE" IS '最后登录时间'; COMMENT ON COLUMN "FXKH_TXL"."USERS"."SALT" IS '盐值'; -CREATE TABLE "FXKH_TXL"."VERSIONS" +CREATE TABLE "FXKH_TXL"."AB_INFO" ( "ID" INTEGER IDENTITY(1, 1) NOT NULL, "JSON" VARCHAR(2000), @@ -143,12 +143,12 @@ CREATE TABLE "FXKH_TXL"."VERSIONS" "TYPE" CHAR(1) DEFAULT 0, NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ; -COMMENT ON TABLE "FXKH_TXL"."VERSIONS" IS '通讯录日志'; -COMMENT ON COLUMN "FXKH_TXL"."VERSIONS"."AB_ID" IS '通讯录编号'; -COMMENT ON COLUMN "FXKH_TXL"."VERSIONS"."CREATE_ID" IS '新增人id'; -COMMENT ON COLUMN "FXKH_TXL"."VERSIONS"."CREATE_TIME" IS '新增时间'; -COMMENT ON COLUMN "FXKH_TXL"."VERSIONS"."JSON" IS '数据'; -COMMENT ON COLUMN "FXKH_TXL"."VERSIONS"."TYPE" IS '0:添加用户,1:修改用户,2:修改权限,3:删除用户'; -COMMENT ON COLUMN "FXKH_TXL"."VERSIONS"."VERSION" IS '版本号'; +COMMENT ON TABLE "FXKH_TXL"."AB_INFO" IS '通讯录日志'; +COMMENT ON COLUMN "FXKH_TXL"."AB_INFO"."AB_ID" IS '通讯录编号'; +COMMENT ON COLUMN "FXKH_TXL"."AB_INFO"."CREATE_ID" IS '新增人id'; +COMMENT ON COLUMN "FXKH_TXL"."AB_INFO"."CREATE_TIME" IS '新增时间'; +COMMENT ON COLUMN "FXKH_TXL"."AB_INFO"."JSON" IS '数据'; +COMMENT ON COLUMN "FXKH_TXL"."AB_INFO"."TYPE" IS '0:添加用户,1:修改用户,2:修改权限,3:删除用户'; +COMMENT ON COLUMN "FXKH_TXL"."AB_INFO"."VERSION" IS '版本号'; diff --git a/src/main/java/com/whdc/controller/VersionsController.java b/src/main/java/com/whdc/controller/VersionsController.java index 127fbc3..2579522 100644 --- a/src/main/java/com/whdc/controller/VersionsController.java +++ b/src/main/java/com/whdc/controller/VersionsController.java @@ -1,6 +1,7 @@ package com.whdc.controller; +import com.whdc.model.dto.CommDto; import com.whdc.model.entity.Versions; import com.whdc.service.IVersionsService; import com.whdc.utils.ResultJson; @@ -28,8 +29,8 @@ public class VersionsController { - @ApiOperation(value = "查询所有") - @PostMapping(value = "find") +// @ApiOperation(value = "查询所有") +// @PostMapping(value = "find") public ResultJson find(@RequestBody Versions dto) { return ResultJson.ok(service.find(dto)); @@ -38,7 +39,7 @@ public class VersionsController { @ApiOperation(value = "分页查询") @PostMapping(value = "page") - public ResultJson page(@RequestBody Versions dto) { + public ResultJson page(@RequestBody CommDto dto) { return ResultJson.ok(service.page(dto)); diff --git a/src/main/java/com/whdc/mapper/VersionsMapper.java b/src/main/java/com/whdc/mapper/VersionsMapper.java index 8ad76fd..840d208 100644 --- a/src/main/java/com/whdc/mapper/VersionsMapper.java +++ b/src/main/java/com/whdc/mapper/VersionsMapper.java @@ -2,6 +2,7 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.whdc.model.dto.CommDto; import org.apache.ibatis.annotations.Param; import com.whdc.model.entity.Versions; @@ -13,7 +14,7 @@ import java.util.List; */ public interface VersionsMapper extends BaseMapper { - IPage page(@Param("page") IPage page, @Param("dto") Versions dto); + IPage page(@Param("page") IPage page, @Param("dto") CommDto dto); List find(@Param("dto") Versions dto); diff --git a/src/main/java/com/whdc/model/dto/AddressBootDto.java b/src/main/java/com/whdc/model/dto/AddressBootDto.java index 4bddf38..6db0bb6 100644 --- a/src/main/java/com/whdc/model/dto/AddressBootDto.java +++ b/src/main/java/com/whdc/model/dto/AddressBootDto.java @@ -8,17 +8,11 @@ import lombok.Data; * @date 2023年3月20日08:57:22 */ @Data -public class AddressBootDto extends FindPageDto { +public class AddressBootDto extends CommDto{ @ApiModelProperty(value = "用户单位id 或 组织id") private String dictId; - @ApiModelProperty(value = "用户名称") - private String name; - - @ApiModelProperty(value = "用户手机号") - private String phone; - @ApiModelProperty(value = "0:组织,1:单位") private String type; diff --git a/src/main/java/com/whdc/model/dto/CommDto.java b/src/main/java/com/whdc/model/dto/CommDto.java new file mode 100644 index 0000000..e0fcb6b --- /dev/null +++ b/src/main/java/com/whdc/model/dto/CommDto.java @@ -0,0 +1,19 @@ +package com.whdc.model.dto; + +import io.swagger.annotations.ApiModelProperty; + +/** + * @Author xusan + * @Date 2024/5/14 15:17 + * @Notes + **/ +public class CommDto extends FindPageDto { + + + @ApiModelProperty(value = "用户名称") + private String name; + + @ApiModelProperty(value = "用户手机号") + private String phone; + +} diff --git a/src/main/java/com/whdc/model/entity/Versions.java b/src/main/java/com/whdc/model/entity/Versions.java index b9fbe0f..26b4fe2 100644 --- a/src/main/java/com/whdc/model/entity/Versions.java +++ b/src/main/java/com/whdc/model/entity/Versions.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.whdc.model.group.Insert; import com.whdc.model.group.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -14,6 +15,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; @@ -29,7 +31,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(description = "通讯录操作日志") -@TableName("FXKH_TXL.VERSIONS") +@TableName("FXKH_TXL.AB_INFO") public class Versions extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -62,4 +64,13 @@ public class Versions extends Model implements Serializable { @TableField("TYPE") @ApiModelProperty(value = "0:添加用户,1:修改用户,2:修改权限,3:删除用户") private String type; + + @TableField(exist = false) + @ApiModelProperty(value = "姓名") + private String name; + + @TableField(exist = false) + @ApiModelProperty(value = "手机号") + private String phone; + } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/IVersionsService.java b/src/main/java/com/whdc/service/IVersionsService.java index 007c4e8..57df741 100644 --- a/src/main/java/com/whdc/service/IVersionsService.java +++ b/src/main/java/com/whdc/service/IVersionsService.java @@ -2,6 +2,7 @@ package com.whdc.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.dto.CommDto; import com.whdc.model.entity.AddressBook; import com.whdc.model.entity.Versions; import com.whdc.model.enums.VersionsType; @@ -18,7 +19,7 @@ import java.util.List; public interface IVersionsService extends IService { // 获取所有规则分页 - IPage page(Versions dto); + IPage page(CommDto dto); // 获取所有规则 List find(Versions dto); diff --git a/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java b/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java index a949796..2026887 100644 --- a/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.whdc.mapper.VersionsMapper; +import com.whdc.model.dto.CommDto; import com.whdc.model.entity.AddressBook; import com.whdc.model.entity.Versions; import com.whdc.model.enums.VersionsType; @@ -31,8 +32,8 @@ public class VersionsServiceImpl extends ServiceImpl i @Override - public IPage page(Versions dto) { - return baseMapper.page(new Page<>(), dto); + public IPage page(CommDto dto) { + return baseMapper.page(dto.getPage(), dto); } @@ -61,7 +62,10 @@ public class VersionsServiceImpl extends ServiceImpl i } // 添加日志 - Versions entity = new Versions(null, JSON.toJSONString(model), model.getId(), ++version, model.getCreateId(), new Date(),versionsType.getName()); + Versions entity = new Versions(null, + JSON.toJSONString(model), model.getId(), ++version, model.getCreateId(), new Date(),versionsType.getName(), + null, null + ); return this.save(entity); diff --git a/src/main/resources/mapper/VersionsMapper.xml b/src/main/resources/mapper/VersionsMapper.xml index cd401c7..a472801 100644 --- a/src/main/resources/mapper/VersionsMapper.xml +++ b/src/main/resources/mapper/VersionsMapper.xml @@ -4,6 +4,17 @@