diff --git a/sql/dm_start.sql b/sql/dm_start.sql index 8abe664..393d93f 100644 --- a/sql/dm_start.sql +++ b/sql/dm_start.sql @@ -10,11 +10,13 @@ CREATE TABLE "FXKH_TXL"."ADDRESS_BOOK" "COMMENTS" VARCHAR(200), "URL" VARCHAR(200), "ADCD" VARCHAR(50), + "RESPONSIBILITY" VARCHAR(50), "SORT" INTEGER DEFAULT 0, "V" INTEGER DEFAULT 0, NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ; COMMENT ON TABLE "FXKH_TXL"."ADDRESS_BOOK" IS '通讯录'; +comment on column "FXKH_TXL"."ADDRESS_BOOK"."RESPONSIBILITY" is '职责'; COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."COMMENTS" IS '备注'; COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."FAXES" IS '传真'; COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."NAME" IS '姓名'; diff --git a/src/main/java/com/whdc/controller/LoginInfoController.java b/src/main/java/com/whdc/controller/LoginInfoController.java index e0b27b1..f767a63 100644 --- a/src/main/java/com/whdc/controller/LoginInfoController.java +++ b/src/main/java/com/whdc/controller/LoginInfoController.java @@ -1,7 +1,9 @@ package com.whdc.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.whdc.model.dto.FindPageDto; +import com.whdc.model.dto.LoginInfoDto; import com.whdc.model.entity.LoginInfo; import com.whdc.model.group.Insert; import com.whdc.model.group.Update; @@ -43,9 +45,10 @@ public class LoginInfoController { @ApiOperation(value = "分页查询") @PostMapping(value = "page") - public ResultJson page(@RequestBody FindPageDto dto) { + public ResultJson page(@RequestBody LoginInfoDto dto) { - return ResultJson.ok(service.page(dto)); + IPage page = service.page(dto); + return ResultJson.ok(page); } diff --git a/src/main/java/com/whdc/mapper/LoginInfoMapper.java b/src/main/java/com/whdc/mapper/LoginInfoMapper.java index 6943dd5..06fe464 100644 --- a/src/main/java/com/whdc/mapper/LoginInfoMapper.java +++ b/src/main/java/com/whdc/mapper/LoginInfoMapper.java @@ -3,6 +3,7 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.whdc.model.dto.FindPageDto; +import com.whdc.model.dto.LoginInfoDto; import org.apache.ibatis.annotations.Param; import com.whdc.model.entity.LoginInfo; @@ -14,7 +15,7 @@ import java.util.List; */ public interface LoginInfoMapper extends BaseMapper { - IPage page(@Param("page") IPage page, @Param("dto") FindPageDto dto); + IPage page(@Param("page") IPage page, @Param("dto") LoginInfoDto dto); List find(@Param("dto") LoginInfo dto); diff --git a/src/main/java/com/whdc/model/dto/LoginInfoDto.java b/src/main/java/com/whdc/model/dto/LoginInfoDto.java new file mode 100644 index 0000000..3c5546f --- /dev/null +++ b/src/main/java/com/whdc/model/dto/LoginInfoDto.java @@ -0,0 +1,21 @@ +package com.whdc.model.dto; + +import com.whdc.model.group.Find; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author xusan + * @date 2023年3月20日08:57:22 + */ +@Data +public class LoginInfoDto extends FindPageDto { + + @ApiModelProperty(value = "用户id") + private String createId; + + @ApiModelProperty(value = "0:密码登录 1:验证码登录") + private String type; +} diff --git a/src/main/java/com/whdc/service/ILoginInfoService.java b/src/main/java/com/whdc/service/ILoginInfoService.java index 55425e7..8cac399 100644 --- a/src/main/java/com/whdc/service/ILoginInfoService.java +++ b/src/main/java/com/whdc/service/ILoginInfoService.java @@ -3,6 +3,7 @@ package com.whdc.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.whdc.model.dto.FindPageDto; +import com.whdc.model.dto.LoginInfoDto; import com.whdc.model.entity.LoginInfo; import java.util.List; @@ -17,7 +18,7 @@ import java.util.List; public interface ILoginInfoService extends IService { // 获取所有规则分页 - IPage page(FindPageDto dto); + IPage page(LoginInfoDto dto); // 获取所有规则 List find(LoginInfo dto); diff --git a/src/main/java/com/whdc/service/impl/LoginInfoServiceImpl.java b/src/main/java/com/whdc/service/impl/LoginInfoServiceImpl.java index 68b958c..546778a 100644 --- a/src/main/java/com/whdc/service/impl/LoginInfoServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/LoginInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.whdc.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.whdc.mapper.LoginInfoMapper; import com.whdc.model.dto.FindPageDto; +import com.whdc.model.dto.LoginInfoDto; import com.whdc.model.entity.LoginInfo; import com.whdc.service.ILoginInfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -22,7 +23,7 @@ public class LoginInfoServiceImpl extends ServiceImpl page(FindPageDto dto) { + public IPage page(LoginInfoDto dto) { return baseMapper.page(dto.getPage(), dto); }