From 71609e40ba719ff40c27bb00d7f5f4af521a80e2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 26 四月 2024 08:52:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java | 4 +-
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java | 6 +-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaRole.java | 4 +-
pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml | 12 ++++-
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml | 13 ++++--
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/QueryVo.java | 2 +
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java | 2
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java | 2 +
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java | 5 +-
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java | 9 ++--
pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 13 +++---
11 files changed, 41 insertions(+), 31 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaRole.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaRole.java
index eb0a905..963d429 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaRole.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaRole.java
@@ -60,9 +60,9 @@
/**
* 鍒涘缓鏃堕棿
*/
- @TableField(value = "create_dt", fill = FieldFill.INSERT)
+ @TableField(value = "dt", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date createDt;
+ public Date dt;
/**
* 鍓嶇web鐣岄潰鎻愪氦鐨勮鑹叉墍灞炴潈闄愮殑id锛屽叾鏄竴涓瓧绗︿覆鏁扮粍
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java
index e843aa4..38751b5 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java
@@ -83,9 +83,9 @@
/**
* 鍒涘缓鏃堕棿
*/
- @TableField(value = "create_dt", fill = FieldFill.INSERT)
+ @TableField(value = "dt", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date createDt;
+ public Date dt;
//////////////////////////////////////
// 浠ヤ笅涓嶆槸鏁版嵁搴撳疄浣撳睘鎬�
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
index b722404..f83630f 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -8,7 +8,7 @@
<result column="name" property="name" />
<result column="disabled" property="disabled" />
<result column="deleted" property="deleted" />
- <result column="create_dt" property="createDt" />
+ <result column="dt" property="dt" />
</resultMap>
<resultMap id="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaRole">
<result column="id" property="id" />
@@ -21,12 +21,12 @@
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, `name`, disabled, deleted,create_dt
+ id, `name`, disabled, deleted,dt
</sql>
<sql id="Part_Column_List">
<!--@mbg.generated-->
- id, `name`, disabled,create_dt
+ id, `name`, disabled,dt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="someResultMap">
@@ -147,6 +147,12 @@
<if test="name != null and name != ''">
r.name like concat('%', #{name}, '%') and
</if>
+ <if test="disable != null and disable != ''">
+ r.disable =#{disabled,jdbcType=BOOLEAN} and
+ </if>
+ <if test="dt != null and dt != ''">
+ DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
+ </if>
</trim>
order by id DESC
<trim prefix="limit " >
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
index 59beadf..199414c 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -11,7 +11,7 @@
<result column="supper_admin" property="supperAdmin" />
<result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
<result column="deleted" property="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
- <result column="create_dt" property="createDt" />
+ <result column="dt" property="dt" />
</resultMap>
<resultMap id="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaUser">
<!--@mbg.generated-->
@@ -37,10 +37,10 @@
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, `name`, phone, `password`, supper_admin, disabled, deleted,create_dt
+ id, `name`, phone, `password`, supper_admin, disabled, deleted,dt
</sql>
<sql id="part_Column_List">
- ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled,${alias}.create_dt
+ ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled,${alias}.dt
</sql>
<sql id="Login_Column_List">
id, name, phone, supper_admin
@@ -99,10 +99,13 @@
bu.name like concat('%', #{name}, '%') and
</if>
<if test="phone != null and phone !=''">
- bu.phone = #{phone,jdbcType=VARCHAR}
+ bu.phone = #{phone,jdbcType=VARCHAR} and
</if>
<if test="roleId != null">
- ur.role_id=#{roleId,jdbcType=BIGINT}
+ ur.role_id=#{roleId,jdbcType=BIGINT} and
+ </if>
+ <if test="disabled != null">
+ bu.disabled=#{disabled,jdbcType=BOOLEAN}
</if>
</trim>
order by id DESC
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
index 7747f30..215218d 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
@@ -42,18 +42,18 @@
}
/**
- * 鍒嗛〉鏌ヨ鏃ュ織
+ * 鏌ヨ鏃ュ織
* @return
*/
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
- @Log("鍒嗛〉鏌ヨ鏃ュ織")
+ @Log("鏌ヨ鏃ュ織")
public BaseResponse<QueryResultVo<List<BaLog>>> some(@RequestBody QueryVo vo){
try {
QueryResultVo<List<BaLog>> res = sv.selectSome(vo);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
- log.error("鍒嗛〉鏌ヨ鏃ュ織寮傚父", e);
+ log.error("鏌ヨ鏃ュ織寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java
index 8fab024..e44f76c 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java
@@ -10,5 +10,5 @@
@AllArgsConstructor
@Builder
public class QueryVo extends QueryConditionVo {
- public String name;
+ public String userName;
}
\ No newline at end of file
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java
index 53d38a0..1a707e1 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java
@@ -11,4 +11,6 @@
@Builder
public class QueryVo extends QueryConditionVo {
public String name;
+ public boolean disable;
+ public String dt;
}
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java
index cb14cc5..5ead477 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleCtrl.java
@@ -71,13 +71,12 @@
/**
* 鍒犻櫎瑙掕壊淇℃伅
* @param id
- * @param bindingResult
* @return
*/
@PostMapping(path="delete")
@SsoPowerAop(power = "10100011")
@Log("鍒犻櫎瑙掕壊淇℃伅")
- public BaseResponse<BaRole> delete(String id,BindingResult bindingResult){
+ public BaseResponse<BaRole> delete(String id){
try {
return BaseResponseUtils.buildSuccess(roleSv.delete(Long.parseLong(id)));
}catch (Exception e){
@@ -105,19 +104,19 @@
}
/**
- * 鍒嗛〉鏌ヨ瑙掕壊淇℃伅
+ * 鏌ヨ瑙掕壊淇℃伅
* @param vo
* @return
*/
@PostMapping(path="some")
@SsoPowerAop(power = "10100010")
- @Log("鍒嗛〉鏌ヨ瑙掕壊淇℃伅")
+ @Log("鏌ヨ瑙掕壊淇℃伅")
public BaseResponse<QueryResultVo<List<BaRole>>> some(@RequestBody QueryVo vo){
try {
QueryResultVo<List<BaRole>> list = roleSv.selectSome(vo) ;
return BaseResponseUtils.buildSuccess(list);
}catch (Exception e){
- log.error("鍒嗛〉鏌ヨ瑙掕壊寮傚父", e);
+ log.error("鏌ヨ瑙掕壊寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/QueryVo.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/QueryVo.java
index f66b8e9..8e3a4ec 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/QueryVo.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/QueryVo.java
@@ -16,5 +16,7 @@
public String phone;
public Long roleId;
+
+ public Long disabled;
}
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
index 5cc283c..88000f3 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
@@ -45,7 +45,6 @@
* @return 榛樿瀵嗙爜
*/
@GetMapping(path = "defaultPassword")
- @Log("瀹㈡埛绔姹傚緱鍒伴粯璁ゅ瘑鐮�")
public BaseResponse<String> defaultPassword(){
if(defaultTrueRandomFalsePassword){
return BaseResponseUtils.buildSuccess(defaultPassword) ;
@@ -62,7 +61,7 @@
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
//@SsoAop() //鍙湁鐧诲綍楠岃瘉锛屾病鏈夋潈闄愰獙璇�
@SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
- @Log("鍒嗛〉鏌ヨ鐢ㄦ埛")
+ @Log("鏌ヨ鐢ㄦ埛")
public BaseResponse<QueryResultVo<List<BaUser>>> some(@RequestBody QueryVo vo) {
try {
QueryResultVo<List<BaUser>> res = this.sv.selectSome(vo);
@@ -208,7 +207,7 @@
}
}
} catch (Exception e) {
- log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
+ log.error("淇敼瀵嗙爜寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
if (count <= 0) {
diff --git a/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 35026d1..8e93c9c 100644
--- a/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -54,9 +54,8 @@
*/
@PostMapping(path = "login", consumes = MediaType.APPLICATION_JSON_VALUE)//鍓嶇鎻愪氦json鏁版嵁
@Log("鐢ㄦ埛鐧诲綍(json)")
- public BaseResponse<UserVo> login(@RequestBody @Valid LoginVo vo,
- HttpSession session,
- BindingResult bindingResult) {
+ public BaseResponse<UserVo> login(@RequestBody @Valid LoginVo vo,BindingResult bindingResult,
+ HttpSession session) {
try {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -80,12 +79,12 @@
/**
* 瀹㈡埛绔姹傜敤鎴风櫥褰曪紝瀹㈡埛绔彁浜orm琛ㄥ崟
- * @param vo 鐧诲綍鐢ㄦ埛form琛ㄥ崟瀵硅薄
+ * @param loginVo 鐧诲綍鐢ㄦ埛form琛ㄥ崟瀵硅薄
* @return 鐧诲綍鐢ㄦ埛鍊煎璞�
*/
@PostMapping(path = "loginForm", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)//鍓嶇鎻愪氦form琛ㄥ崟鏁版嵁
@Log("鐢ㄦ埛鐧诲綍(form)")
- public BaseResponse<UserVo> loginForm(@RequestBody @Valid LoginVo vo, HttpSession session,BindingResult bindingResult){
+ public BaseResponse<UserVo> loginForm(@Valid LoginVo loginVo, BindingResult bindingResult,HttpSession session){
try{
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -93,9 +92,9 @@
// 浠嶴ession涓幏鍙栦繚瀛樼殑楠岃瘉鐮�
String sessionCaptcha = (String) session.getAttribute("captcha");
// 棣栧厛楠岃瘉楠岃瘉鐮�
- if (vo.captcha != null && vo.captcha.equalsIgnoreCase(sessionCaptcha)) {
+ if (loginVo.captcha != null && loginVo.captcha.equalsIgnoreCase(sessionCaptcha)) {
session.removeAttribute("captcha");
- return this.doLogin(vo) ;
+ return this.doLogin(loginVo) ;
} else {
// 楠岃瘉鐮侀敊璇紝杩斿洖鐧诲綍椤甸潰骞舵樉绀洪敊璇俊鎭�
return BaseResponseUtils.buildFail("楠岃瘉鐮侀敊璇�");
--
Gitblit v1.8.0