From 794f864959f3ca2f3e2a705ae6ef1b26e97ff2c0 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期五, 26 四月 2024 09:19:21 +0800
Subject: [PATCH] 日志功能修改;添加删除用户方法
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaLog.java | 4 ++++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogAspect.java | 3 +--
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogService.java | 3 ++-
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java | 26 ++++++++++++++++++++++++++
pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml | 19 ++++++++++++++++---
5 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogAspect.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogAspect.java
index 1086ddc..71605a8 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogAspect.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogAspect.java
@@ -50,7 +50,6 @@
// 鑾峰彇鐢ㄦ埛淇℃伅
BaUser user = (BaUser)getCurUser(result);
if(user!=null && user.id !=null && !StringUtils.isNullOrEmpty(user.name)){
- Long operator = user.id;
// 鑾峰彇鏂规硶鐨勪腑鏂囨弿杩�
MethodSignature sign = (MethodSignature) joinPoint.getSignature();
Log logDesc = sign.getMethod().getAnnotation(Log.class);
@@ -58,7 +57,7 @@
// 鑾峰彇IP鍦板潃
String ip = getRemoteHost();
// 璁板綍鏃ュ織
- logSv.save(operator, operationName,ip,result.getCode(),result.getMsg());
+ logSv.save(user.id,user.name, operationName,ip,result.getCode(),result.getMsg());
}
}catch (Exception e){
log.error("璁板綍鏃ュ織寮傚父:"+e.getMessage());
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogService.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogService.java
index 5ca8a39..3465a1d 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogService.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogService.java
@@ -13,9 +13,10 @@
@Autowired
private BaLogMapper dao;
- public void save(long operator, String operation,String ip,String code,String msg) {
+ public void save(long operator,String operatorName, String operation,String ip,String code,String msg) {
BaLog log = new BaLog();
log.userId=operator;
+ log.userName=operatorName;
log.content = operation;
log.dt = new Date();
log.ip = ip;
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaLog.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaLog.java
index 4ab5877..ada9610 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaLog.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaLog.java
@@ -25,6 +25,10 @@
* 鐢ㄦ埛ID
*/
public Long userId;
+ /**
+ * 鐢ㄦ埛濮撳悕
+ */
+ public String userName;
/**
* 鏃ュ織鍐呭
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
index 7a2bcf7..5c0e8fb 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
@@ -6,6 +6,7 @@
<!--@Table ba_log-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="user_id" jdbcType="BIGINT" property="userId" />
+ <result column="user_name" jdbcType="VARCHAR" property="userName" />
<result column="content" jdbcType="VARCHAR" property="content" />
<result column="ip" jdbcType="VARCHAR" property="ip" />
<result column="code" jdbcType="VARCHAR" property="code" />
@@ -14,7 +15,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, user_id, content, dt,ip,code,msg
+ id, user_id,user_name, content, dt,ip,code,msg
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -25,9 +26,9 @@
</select>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoBa.BaLog" useGeneratedKeys="true">
<!--@mbg.generated-->
- insert into ba_log (user_id, content, ip,code,msg
+ insert into ba_log (user_id,user_name, content, ip,code,msg
)
- values (#{userId,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},
+ values (#{userId,jdbcType=BIGINT},#{userName,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},
#{code,jdbcType=VARCHAR},#{msg,jdbcType=VARCHAR}
)
</insert>
@@ -37,6 +38,9 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="userId != null">
user_id,
+ </if>
+ <if test="userName != null">
+ user_name,
</if>
<if test="content != null">
content,
@@ -54,6 +58,9 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">
#{userId,jdbcType=BIGINT},
+ </if>
+ <if test="userName != null">
+ #{userName,jdbcType=VARCHAR},
</if>
<if test="content != null">
#{content,jdbcType=VARCHAR},
@@ -80,6 +87,9 @@
<if test="userId != null and userId != ''">
user_id = #{userId,jdbcType=BIGINT} and
</if>
+ <if test="userName != null and userName != ''">
+ user_name = #{userName,jdbcType=VARCHAR} and
+ </if>
<if test="content != null and content != '' ">
content like concat('%', #{content}, '%') and
</if>
@@ -105,6 +115,9 @@
<if test="userId != null and userId != ''">
user_id = #{userId,jdbcType=BIGINT} and
</if>
+ <if test="userName != null and userName != ''">
+ user_name = #{userName,jdbcType=VARCHAR} and
+ </if>
<if test="content != null and content != '' ">
content like concat('%', #{content}, '%') and
</if>
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 88000f3..ce93d75 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
@@ -166,6 +166,32 @@
}
/**
+ * 鍒犻櫎鐢ㄦ埛淇℃伅
+ * @param id
+ * @return
+ */
+ @GetMapping(path = "delete")
+ @SsoPowerAop(power = "10100011") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @Log("鍒犻櫎鐢ㄦ埛")
+ public BaseResponse<Boolean> delete(Long id) {
+ int count;
+ try {
+ BaUser po = new BaUser();
+ po.id = id;
+ po.deleted = true;
+ count = this.sv.update(po);
+ } catch (Exception e) {
+ log.error("鍒犻櫎鐢ㄦ埛寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+
+ /**
* 淇敼瀵嗙爜
* @param id 鐢ㄦ埛ID
* @return 鏄惁鎴愬姛
--
Gitblit v1.8.0