From ea589042c2282d30c5c3704a9ba8dead98fa1aa1 Mon Sep 17 00:00:00 2001 From: hupeng <664288600@qq.com> Date: Sun, 7 Jan 2024 01:50:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80mybatis=20plus=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=EF=BC=8C=E8=B0=83=E9=80=9A=E7=94=A8=E6=88=B7=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=EF=BC=8C=20=20=E7=BC=96=E5=86=99?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=9F=BA=E7=A1=80=E6=A1=86=E6=9E=B6=20=20100?= =?UTF-8?q?%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/pom.xml | 31 ++++++ common/src/main/java/com/common/entity/Base.java | 29 ++++++ common/src/main/java/com/common/entity/Role.java | 30 ++++++ common/src/main/java/com/common/entity/Scene.java | 62 ++++++++++++ common/src/main/java/com/common/entity/User.java | 60 ++++++++++++ common/src/main/resources/sql | 104 +++++++++++++++++++++ zbsz/pom.xml | 30 ------ zbsz/src/main/java/com/zbsz/aop/LogAop.java | 47 ++++++++++ .../main/java/com/zbsz/config/Swagger2Config.java | 14 ++- ...{AuthController.java => OpenApiController.java} | 18 ++-- zbsz/src/main/java/com/zbsz/entity/User.java | 18 ---- .../main/java/com/zbsz/filter/JwtInterceptor.java | 21 ++--- zbsz/src/main/java/com/zbsz/info/LoginInfo.java | 4 +- zbsz/src/main/java/com/zbsz/info/Result.java | 4 +- zbsz/src/main/java/com/zbsz/mapper/UserMapper.java | 2 +- .../main/java/com/zbsz/service/UserService.java | 7 +- .../com/zbsz/service/impl/UserServiceImpl.java | 11 +++ 17 files changed, 411 insertions(+), 81 deletions(-) create mode 100644 common/src/main/java/com/common/entity/Base.java create mode 100644 common/src/main/java/com/common/entity/Role.java create mode 100644 common/src/main/java/com/common/entity/Scene.java create mode 100644 common/src/main/java/com/common/entity/User.java create mode 100644 common/src/main/resources/sql create mode 100644 zbsz/src/main/java/com/zbsz/aop/LogAop.java rename zbsz/src/main/java/com/zbsz/controller/{AuthController.java => OpenApiController.java} (71%) delete mode 100644 zbsz/src/main/java/com/zbsz/entity/User.java create mode 100644 zbsz/src/main/java/com/zbsz/service/impl/UserServiceImpl.java diff --git a/common/pom.xml b/common/pom.xml index 5471e24..98124c8 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -14,6 +14,37 @@ 1.0 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-validation + + + com.github.xiaoymin + knife4j-openapi2-spring-boot-starter + ${knife4j.version} + + + io.springfox + springfox-swagger-ui + ${swagger.ui.version} + + + + com.mchange + c3p0 + ${c3p0.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis.plus.version} + + org.projectlombok lombok diff --git a/common/src/main/java/com/common/entity/Base.java b/common/src/main/java/com/common/entity/Base.java new file mode 100644 index 0000000..e03799f --- /dev/null +++ b/common/src/main/java/com/common/entity/Base.java @@ -0,0 +1,29 @@ +package com.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +public class Base { + @TableId + @ApiModelProperty(value = "用户主键") + private Integer id; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00") + @TableField("create_at") + @ApiModelProperty(value = "创建时间") + private Date createAt; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00") + @TableField("update_at") + @ApiModelProperty(value = "创建时间") + private Date updateAt; +} diff --git a/common/src/main/java/com/common/entity/Role.java b/common/src/main/java/com/common/entity/Role.java new file mode 100644 index 0000000..43f8f2d --- /dev/null +++ b/common/src/main/java/com/common/entity/Role.java @@ -0,0 +1,30 @@ +package com.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@TableName(value = "p_role") +public class Role extends Base{ + @TableField("role_type") + @ApiModelProperty(value = "角色类型") + private String roleType; + @TableField("role_name") + @ApiModelProperty(value = "角色名称") + private String roleName; + @TableField("role_desc") + @ApiModelProperty(value = "角色描述") + private String roleDesc; + @TableField("create_by") + @ApiModelProperty(value = "角色创建人") + private String createBy; + @TableField("data_scope") + @ApiModelProperty(value="数据权限定义1-全部权限 2-本部门及以下部门 3-本部门 4-本人 5-自定义 ") + private Integer dataScope; + @ApiModelProperty(value="数据权限定义部门id集合 ") + private List dataDeptIds; +} diff --git a/common/src/main/java/com/common/entity/Scene.java b/common/src/main/java/com/common/entity/Scene.java new file mode 100644 index 0000000..e2e9c87 --- /dev/null +++ b/common/src/main/java/com/common/entity/Scene.java @@ -0,0 +1,62 @@ +package com.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@TableName(value = "p_scene") +public class Scene extends Base{ + @TableField("scene_name") + @ApiModelProperty(value = "技能名称") + private String sceneName; + @TableField("scene_remark") + @ApiModelProperty(value = "备注") + private String sceneRemark; + @ApiModelProperty(value = "角色串") + private String roles; + @TableField("model_notes") + @ApiModelProperty(value = "模型说明") + private String modelNotes; + @TableField("file_url") + @ApiModelProperty(value = "文件地址") + private String fileUrl; + @ApiModelProperty(value = "版本") + private String version; + @TableField("contribution_name") + @ApiModelProperty(value = "贡献者姓名") + private String contributionName; + @TableField("scene_type") + @ApiModelProperty(value = "技能类别 1定制 2永洪 ") + private Short sceneType; + @TableField("scene_url") + @ApiModelProperty(value = "技能URL") + private String sceneUrl; + @TableField("scene_skin") + @ApiModelProperty(value = "场景皮肤") + private String sceneSkin; + @TableField("icon_url") + @ApiModelProperty(value = "icon地址") + private String iconUrl; + @TableField("create_by") + @ApiModelProperty(value = "创建人") + private String createBy; + @TableField("update_by") + @ApiModelProperty(value = "更新人") + private String updateBy; + @ApiModelProperty(value = "删除标记：0-未删除 1-已删除") + private Short deleted; + @TableField("scene_operation") + @ApiModelProperty(value = "技能类型 智能脑，聪明口，灵活手，千里眼") + private String sceneOperation; + @TableField("scene_order") + @ApiModelProperty(value = "排序") + private Integer sceneOrder; + @TableField("scene_code") + @ApiModelProperty(value = "场景编码") + private String sceneCode; + @TableField("scene_tag") + @ApiModelProperty(value = "场景标签") + private String sceneTag; +} diff --git a/common/src/main/java/com/common/entity/User.java b/common/src/main/java/com/common/entity/User.java new file mode 100644 index 0000000..a53a980 --- /dev/null +++ b/common/src/main/java/com/common/entity/User.java @@ -0,0 +1,60 @@ +package com.common.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.OffsetDateTime; +import java.util.Set; + +@Data +@TableName(value = "p_user") +public class User { + @TableId + @ApiModelProperty(value = "用户主键") + private Integer id; + @TableField("user_id") + @ApiModelProperty(value = "用户编号") + private String userId; + @TableField("login_name") + @ApiModelProperty(value = "用户名(登录账号)") + private String loginName; + @TableField("login_password") + @ApiModelProperty(value = "用户密码(登录密码)") + private String loginPassword; + @TableField("user_name") + @ApiModelProperty(value = "用户姓名") + private String userName; + @TableField("mobile_number") + @ApiModelProperty(value = "手机号") + private String mobileNumber; + @TableField("police_number") + @ApiModelProperty(value = "警员编号(警号)") + private String policeNumber; + @TableField("id_number") + @ApiModelProperty(value = "身份证号") + private String idNumber; + @ApiModelProperty(value = "是否启用 0-未启用 1-启用") + private String effective; + @TableField("department_id") + @ApiModelProperty(value = "所属单位编号") + private String departmentId; + @TableField("job_title") + @ApiModelProperty(value="职称") + private String jobTitle; + @TableField("role_level") + @ApiModelProperty(value="等级：0 系统用户 1 派出所 2 分局") + private String roleLevel; + @ApiModelProperty(value = "用户角色，role id以逗号拼接") + private Set roles; + //与实体不一致 + @TableField("create_time") + @ApiModelProperty(value="角色列表") + private OffsetDateTime createTime; + @TableField("update_time") + @ApiModelProperty(value="角色列表") + private OffsetDateTime updateTime; + +} diff --git a/common/src/main/resources/sql b/common/src/main/resources/sql new file mode 100644 index 0000000..06a8d64 --- /dev/null +++ b/common/src/main/resources/sql @@ -0,0 +1,104 @@ +drop table if exists public.p_user; +create table public.p_user ( + user_id varchar(32) null, + login_name varchar(500) null, + login_password varchar(500) null, + user_name varchar(500) null, + mobile_number varchar(500) null, + police_number varchar(500) not null, + id_number varchar(500) null, + effective varchar(1) null default 1, + department_id varchar(500) null, + create_time timestamp(6) null default now(), + update_time timestamp(6) null, + job_title varchar(200) null, + role_level varchar(10) not null default 1, + id int8 not null generated always as identity( minvalue 0 no maxvalue start 0 no cycle), + roles varchar(255) null, + constraint p_user_pkey primary key (id) +); +create index idx_dep on public.p_user using btree (department_id); +create index idx_dep_branch on public.p_user using btree (substr((department_id)::text, 1, 6)); +create index idx_dep_station on public.p_user using btree (substr((department_id)::text, 1, 8)); +create index idx_uid on public.p_user using btree (user_id); +comment on column public.p_user.user_id is '用户编号'; +comment on column public.p_user.login_name is '用户名(登录账号)'; +comment on column public.p_user.login_password is '用户密码(登录密码)'; +comment on column public.p_user.user_name is '用户姓名'; +comment on column public.p_user.mobile_number is '手机号'; +comment on column public.p_user.police_number is '警员编号(警号)'; +comment on column public.p_user.id_number is '身份证号'; +comment on column public.p_user.effective is '是否启用:0 无效 1有效 默认 1'; +comment on column public.p_user.department_id is '所属单位编号'; +comment on column public.p_user.create_time is '创建时间'; +comment on column public.p_user.update_time is '更新时间'; +comment on column public.p_user.job_title is '职称'; +comment on column public.p_user.role_level is '等级：0运营 1派出所 2分局'; +comment on column public.p_user.roles is 'roleid以逗号拼接'; + +drop table if exists public.p_role; +create table public.p_role ( + id int4 not null generated always as identity( minvalue 0 no maxvalue start 0 no cycle), + role_type varchar(10) null, + role_name varchar(255) null, + role_desc varchar(255) null, + create_at date null, + create_by varchar(255) null, + update_at date null, + update_by varchar(255) null, + deleted int2 null, + data_scope int4 null +); +comment on column public.p_role.role_type is '角色类型-字典表jslx'; +comment on column public.p_role.role_name is '角色名'; +comment on column public.p_role.role_desc is '角色描述'; +comment on column public.p_role.create_at is '创建时间'; +comment on column public.p_role.create_by is '创建人'; +comment on column public.p_role.update_at is '修改时间'; +comment on column public.p_role.update_by is '修改人'; +comment on column public.p_role.deleted is '删除标记 0-未删除 1-已删除'; +comment on column public.p_role.data_scope is '数据权限定义1-全部权限 2-本部门及以下部门 3-本部门 4-本人 5-自定义'; + +drop table if exists public.p_scene; +create table public.p_scene ( + id int4 not null generated always as identity( minvalue 0 no maxvalue start 0 no cycle), + scene_name varchar(255) null, + scene_remark varchar(500) null, + roles varchar(100) null, + model_notes varchar(1000) null, + file_url varchar(255) null, + "version" varchar(20) null, + contribution_name varchar(255) null, + scene_type int2 null, + scene_url varchar(255) null, + scene_skin varchar(16) null, + icon_url varchar(255) null, + create_at date null, + create_by varchar(255) null, + update_at date null, + update_by varchar(255) null, + deleted int2 null, + scene_operation varchar(255) null, + scene_order int4 null, + scene_code varchar(255) null, + scene_tag varchar(200) null +); +comment on column public.p_scene.scene_name is '场景名称'; +comment on column public.p_scene.scene_remark is '场景说明'; +comment on column public.p_scene.roles is '适用角色 逗号拼接串'; +comment on column public.p_scene.model_notes is '模型逻辑说明'; +comment on column public.p_scene.file_url is '文件上传路径'; +comment on column public.p_scene."version" is '版本'; +comment on column public.p_scene.contribution_name is '贡献者姓名'; +comment on column public.p_scene.scene_type is '1：定制 2：永洪编排'; +comment on column public.p_scene.scene_url is '场景url'; +comment on column public.p_scene.icon_url is 'icon图片地址'; +comment on column public.p_scene.create_at is '创建时间'; +comment on column public.p_scene.create_by is '创建人'; +comment on column public.p_scene.update_at is '修改时间'; +comment on column public.p_scene.update_by is '更新人'; +comment on column public.p_scene.deleted is '删除标记：0-未删除 1-已删除'; +comment on column public.p_scene.scene_operation is '智能脑，聪明口，灵活手，千里眼'; +comment on column public.p_scene.scene_order is '排序'; +comment on column public.p_scene.scene_code is '场景编码'; +comment on column public.p_scene.scene_tag is '技能标签'; diff --git a/zbsz/pom.xml b/zbsz/pom.xml index a2db7e4..41456cc 100644 --- a/zbsz/pom.xml +++ b/zbsz/pom.xml @@ -19,37 +19,7 @@ com.szr common - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-validation - - - com.github.xiaoymin - knife4j-openapi2-spring-boot-starter - ${knife4j.version} - - - io.springfox - springfox-swagger-ui - ${swagger.ui.version} - - - com.mchange - c3p0 - ${c3p0.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis.plus.version} - org.postgresql postgresql diff --git a/zbsz/src/main/java/com/zbsz/aop/LogAop.java b/zbsz/src/main/java/com/zbsz/aop/LogAop.java new file mode 100644 index 0000000..d96eac7 --- /dev/null +++ b/zbsz/src/main/java/com/zbsz/aop/LogAop.java @@ -0,0 +1,47 @@ +package com.zbsz.aop; + +import com.alibaba.fastjson2.JSON; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.*; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +@Aspect +@Component +@Slf4j +public class LogAop { + @Pointcut("execution( * com.zbsz.controller..*.*(..))") + public void log() {} + + @Around("log()") + public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable { + long startTime=System.currentTimeMillis(); + Object result=joinPoint.proceed(); + log.info("Response："+ JSON.toJSON(result)); + log.info("耗时："+(System.currentTimeMillis()-startTime)); + return result; + } + + @Before("log()") + public void doBefore(JoinPoint joinPoint) { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = attributes.getRequest(); + log.info("==================Start================="); + log.info("URL：" + request.getRequestURL().toString()); + log.info("Method：" + request.getMethod().toString()); + log.info("Class Method：" + joinPoint.getSignature().getDeclaringTypeName() + "," + joinPoint.getSignature().getName()); + log.info("客户端IP：" + request.getRemoteAddr()); + log.info("请求参数：" + JSON.toJSON(joinPoint.getArgs())); + + } + + @After("log()") + public void doAfter() { + log.info("==================End================="); + } +} diff --git a/zbsz/src/main/java/com/zbsz/config/Swagger2Config.java b/zbsz/src/main/java/com/zbsz/config/Swagger2Config.java index 61b8181..dc66ae8 100644 --- a/zbsz/src/main/java/com/zbsz/config/Swagger2Config.java +++ b/zbsz/src/main/java/com/zbsz/config/Swagger2Config.java @@ -41,9 +41,17 @@ public class Swagger2Config implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { //添加拦截器 - registry.addInterceptor(new JwtInterceptor()).addPathPatterns("/api/*") - .excludePathPatterns( - "/api/login");//放掉某些特定不需要校验token的路由 + registry.addInterceptor(new JwtInterceptor()) + .addPathPatterns("/**") + .excludePathPatterns("/doc.html") + .excludePathPatterns("/swagger-resources/**") + .excludePathPatterns("/webjars/**") + .excludePathPatterns("/v2/**") + .excludePathPatterns("/favicon.ico") + .excludePathPatterns("/swagger-ui.html/**") + .excludePathPatterns("/keyPerson/callBackResult") + .excludePathPatterns("/upload/**") + .excludePathPatterns("/openapi/*");//白名单 } @Bean diff --git a/zbsz/src/main/java/com/zbsz/controller/AuthController.java b/zbsz/src/main/java/com/zbsz/controller/OpenApiController.java similarity index 71% rename from zbsz/src/main/java/com/zbsz/controller/AuthController.java rename to zbsz/src/main/java/com/zbsz/controller/OpenApiController.java index bb10a11..9f1d046 100644 --- a/zbsz/src/main/java/com/zbsz/controller/AuthController.java +++ b/zbsz/src/main/java/com/zbsz/controller/OpenApiController.java @@ -1,7 +1,7 @@ package com.zbsz.controller; import com.common.info.CodeMsg; -import com.zbsz.entity.User; +import com.common.entity.User; import com.zbsz.info.LoginInfo; import com.zbsz.info.Result; import com.zbsz.service.UserService; @@ -10,17 +10,17 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.validation.Valid; @Slf4j @RestController -@RequestMapping("/auth") +@RequestMapping("/openapi") @Api(tags = "服务接口") -public class AuthController { +public class OpenApiController { @Resource private UserService userService; @@ -31,20 +31,22 @@ public class AuthController { */ @ApiOperation(value = "登录",notes = "登录服务") @PostMapping("login") - public Result login(@Valid LoginInfo info) { + public Result login(@RequestBody LoginInfo info) { Result result = new Result(); try { - User user = userService.lambdaQuery().eq(User::getName,info.getUserName()).eq(User::getPassWord,info.getPassWord()).one(); + User user = userService.lambdaQuery().eq(User::getLoginName,info.getUserName()).eq(User::getLoginPassword,info.getPassWord()).one(); if(user!=null){ result.setCode(CodeMsg.SUCCESS.getCode()); result.setMsg(CodeMsg.SUCCESS.getMessage()); + result.setData(JwtTool.getToken(info.getUserName())); + log.error("-------- 登录成功 "); }else { result.setCode(CodeMsg.AUTH_FAILURE.getCode()); result.setMsg(CodeMsg.AUTH_FAILURE.getMessage()); - result.setData(JwtTool.getToken(info.getUserName())); + log.error("-------- 登录失败，用户名或者密码错误"); } }catch (Exception e){ - log.error("-------- AuthController login 异常 : "+e.getMessage(),e); + log.error("-------- 登录异常 : "+e.getMessage(),e); result.setCode(CodeMsg.FAILURE.getCode()); result.setMsg(e.getMessage()); } diff --git a/zbsz/src/main/java/com/zbsz/entity/User.java b/zbsz/src/main/java/com/zbsz/entity/User.java deleted file mode 100644 index e13bebc..0000000 --- a/zbsz/src/main/java/com/zbsz/entity/User.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zbsz.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -@Data -@TableName(value = "user") -public class User { - @TableId - private Long id; - private String name; - @TableField("pass_word") - private String passWord; - private Integer age; - private String email; -} diff --git a/zbsz/src/main/java/com/zbsz/filter/JwtInterceptor.java b/zbsz/src/main/java/com/zbsz/filter/JwtInterceptor.java index e7bb4dc..25c1d6f 100644 --- a/zbsz/src/main/java/com/zbsz/filter/JwtInterceptor.java +++ b/zbsz/src/main/java/com/zbsz/filter/JwtInterceptor.java @@ -1,6 +1,7 @@ package com.zbsz.filter; import com.alibaba.fastjson2.JSONObject; +import com.common.info.CodeMsg; import com.zbsz.info.Result; import com.zbsz.tool.JwtTool; import lombok.extern.slf4j.Slf4j; @@ -27,24 +28,18 @@ public class JwtInterceptor implements HandlerInterceptor { //验证token if(JwtTool.verify(token)){ - String userName = JwtTool.getUsername(token); - request.setAttribute("token.user",userName); return true; }else{ response.setCharacterEncoding("UTF-8"); response.setContentType("application/json; charset=utf-8"); Result result = new Result(); - -// if (token == null) { -// result.setCode(CodeMsg.TOKEN_NULL.getCode()); -// result.setMsg(CodeMsg.TOKEN_NULL.getMessage()); -// LogTool.Error.error("token == null ------------------- : 用户未登录"); -// }else{ -// result.setCode(CodeMsg.TOKEN_FAILED.getCode()); -// result.setMsg(CodeMsg.TOKEN_FAILED.getMessage()); -// LogTool.Error.error("JwtTool.verify(token) ------------------- : 认证token已过期"); -// } - + result.setCode(CodeMsg.AUTH_FAILURE.getCode()); + result.setMsg(CodeMsg.AUTH_FAILURE.getMessage()); + if (token == null) { + log.error("-------- 票据丢失，请重新登录"); + }else{ + log.error("-------- 票据认证失败，请重新登录"); + } PrintWriter out = null; try { out = response.getWriter(); diff --git a/zbsz/src/main/java/com/zbsz/info/LoginInfo.java b/zbsz/src/main/java/com/zbsz/info/LoginInfo.java index 9494ee5..aa66473 100644 --- a/zbsz/src/main/java/com/zbsz/info/LoginInfo.java +++ b/zbsz/src/main/java/com/zbsz/info/LoginInfo.java @@ -6,8 +6,8 @@ import javax.validation.constraints.NotBlank; @Data public class LoginInfo { - @NotBlank(message = "用户名称不能为空") + @NotBlank(message = "用户不能为空") private String userName; //操作人名称 - @NotBlank(message = "用户密码不能为空") + @NotBlank(message = "密码不能为空") private String passWord; //操作人密码 } diff --git a/zbsz/src/main/java/com/zbsz/info/Result.java b/zbsz/src/main/java/com/zbsz/info/Result.java index c3cf871..c43a240 100644 --- a/zbsz/src/main/java/com/zbsz/info/Result.java +++ b/zbsz/src/main/java/com/zbsz/info/Result.java @@ -5,11 +5,11 @@ import lombok.Data; @Data public class Result { - @ApiModelProperty(value = "返回码") + @ApiModelProperty(value = "返回码，200表示成功，其它表示失败") private Integer code; @ApiModelProperty(value = "返回成功、失败信息") private String msg; - @ApiModelProperty(value = "返回json对象信息") + @ApiModelProperty(value = "返回接口对接数据信息") private Object data; @ApiModelProperty(value = "返回总条数") private Long total; diff --git a/zbsz/src/main/java/com/zbsz/mapper/UserMapper.java b/zbsz/src/main/java/com/zbsz/mapper/UserMapper.java index 7f82249..2122c1f 100644 --- a/zbsz/src/main/java/com/zbsz/mapper/UserMapper.java +++ b/zbsz/src/main/java/com/zbsz/mapper/UserMapper.java @@ -1,7 +1,7 @@ package com.zbsz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zbsz.entity.User; +import com.common.entity.User; public interface UserMapper extends BaseMapper { } diff --git a/zbsz/src/main/java/com/zbsz/service/UserService.java b/zbsz/src/main/java/com/zbsz/service/UserService.java index 8237a1d..db52bef 100644 --- a/zbsz/src/main/java/com/zbsz/service/UserService.java +++ b/zbsz/src/main/java/com/zbsz/service/UserService.java @@ -1,8 +1,7 @@ package com.zbsz.service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zbsz.entity.User; -import com.zbsz.mapper.UserMapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.common.entity.User; -public class UserService extends ServiceImpl { +public interface UserService extends IService { } diff --git a/zbsz/src/main/java/com/zbsz/service/impl/UserServiceImpl.java b/zbsz/src/main/java/com/zbsz/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..b924c42 --- /dev/null +++ b/zbsz/src/main/java/com/zbsz/service/impl/UserServiceImpl.java @@ -0,0 +1,11 @@ +package com.zbsz.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.common.entity.User; +import com.zbsz.mapper.UserMapper; +import com.zbsz.service.UserService; +import org.springframework.stereotype.Service; + +@Service +public class UserServiceImpl extends ServiceImpl implements UserService { +}