From 1c0ac830ea2835bad033137a9154ef1c3e587dcb Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 12 三月 2024 09:15:58 +0800
Subject: [PATCH] 第一次登录修改密码、报警阈值分数
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java | 15 +++++++++++++++
ycl-pojo/src/main/java/com/ycl/system/entity/BaseEntity.java | 4 ++++
ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml | 7 ++++++-
ycl-server/src/main/java/com/ycl/system/controller/SysProfileController.java | 14 +++++++-------
ycl-server/src/main/java/com/ycl/plus/CustomMetaObjectHandler.java | 7 +++++++
ycl-server/src/main/resources/mapper/system/SysUserMapper.xml | 1 -
6 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java
index 76751b6..5462466 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TCheckPublish.java
@@ -5,6 +5,8 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
+import java.math.BigDecimal;
+
/**
* 鑰冩牳鍙戝竷瀵硅薄 t_check_publish
*
@@ -38,6 +40,10 @@
@Excel(name = "鑰冩牳鐘舵�� 0/1 鍚敤 / 鍋滅敤")
private Long state;
+ /** 鎶ヨ鍒嗘暟闃堝�� */
+ @Excel(name = "鎶ヨ鍒嗘暟闃堝��")
+ private BigDecimal alarmScore;
+
private Long createUser;
@Excel(name = "鍒涘缓浜�")
private String createUserName;
@@ -56,6 +62,14 @@
public void setExamineName(String examineName) {
this.examineName = examineName;
+ }
+
+ public BigDecimal getAlarmScore() {
+ return alarmScore;
+ }
+
+ public void setAlarmScore(BigDecimal alarmScore) {
+ this.alarmScore = alarmScore;
}
public void setId(Long id)
@@ -156,6 +170,7 @@
", examineRange=" + examineRange +
", frequency=" + frequency +
", state=" + state +
+ ", alarmScore=" + alarmScore +
", createUser=" + createUser +
", createUserName='" + createUserName + '\'' +
", updateUserName='" + updateUserName + '\'' +
diff --git a/ycl-pojo/src/main/java/com/ycl/system/entity/BaseEntity.java b/ycl-pojo/src/main/java/com/ycl/system/entity/BaseEntity.java
index a8865c8..3fb5b2a 100644
--- a/ycl-pojo/src/main/java/com/ycl/system/entity/BaseEntity.java
+++ b/ycl-pojo/src/main/java/com/ycl/system/entity/BaseEntity.java
@@ -1,5 +1,7 @@
package com.ycl.system.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -30,10 +32,12 @@
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.UPDATE)
private Date updateTime;
/** 澶囨敞 */
diff --git a/ycl-server/src/main/java/com/ycl/plus/CustomMetaObjectHandler.java b/ycl-server/src/main/java/com/ycl/plus/CustomMetaObjectHandler.java
index 77a574c..139cda2 100644
--- a/ycl-server/src/main/java/com/ycl/plus/CustomMetaObjectHandler.java
+++ b/ycl-server/src/main/java/com/ycl/plus/CustomMetaObjectHandler.java
@@ -1,6 +1,7 @@
package com.ycl.plus;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ycl.utils.SecurityUtils;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
@@ -22,8 +23,11 @@
*/
@Override
public void insertFill(MetaObject metaObject) {
+ String username = SecurityUtils.getLoginUser().getUsername();
this.setFieldValByName("updateTime", new Date(), metaObject);
this.setFieldValByName("createTime", new Date(), metaObject);
+ this.setFieldValByName("createUser", username, metaObject);
+ this.setFieldValByName("createBy", username, metaObject);
this.setFieldValByName("deleted", "0", metaObject);
}
@@ -34,6 +38,9 @@
*/
@Override
public void updateFill(MetaObject metaObject) {
+ String username = SecurityUtils.getLoginUser().getUsername();
this.setFieldValByName("updateTime", new Date(), metaObject);
+ this.setFieldValByName("updateBy",username,metaObject);
+ this.setFieldValByName("updateUser",username,metaObject);
}
}
diff --git a/ycl-server/src/main/java/com/ycl/system/controller/SysProfileController.java b/ycl-server/src/main/java/com/ycl/system/controller/SysProfileController.java
index 588c7bb..253a7ca 100644
--- a/ycl-server/src/main/java/com/ycl/system/controller/SysProfileController.java
+++ b/ycl-server/src/main/java/com/ycl/system/controller/SysProfileController.java
@@ -95,14 +95,14 @@
// 鏇存柊缂撳瓨鐢ㄦ埛瀵嗙爜
loginUser.getUser().setPassword(newPassword);
tokenService.setLoginUser(loginUser);
+ //灏嗙姸鎬佹敼涓哄凡淇敼杩囧瘑鐮�
+ if (firstLogin == 0) {
+ SysUser user = new SysUser();
+ user.setUserId(loginUser.getUserId());
+ user.setFirstLogin((short) 1);
+ userMapper.updateUser(user);
+ }
return success();
- }
- //灏嗙姸鎬佹敼涓哄凡淇敼杩囧瘑鐮�
- if (firstLogin == 0) {
- SysUser user = new SysUser();
- user.setUserId(loginUser.getUserId());
- user.setFirstLogin((short) 1);
- userMapper.updateUser(user);
}
return error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
diff --git a/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml b/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml
index 2991de9..b61b865 100644
--- a/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml
@@ -192,7 +192,6 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="firstLogin !=null ">first_login = #{firstLogin}</if>
- update_time = sysdate()
</set>
where user_id = #{userId}
</update>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml
index c068482..77d56b4 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml
@@ -18,10 +18,11 @@
<result property="updateUser" column="update_user" />
<result property="updateUserName" column="update_user_name" />
<result property="description" column="description" />
+ <result property="alarmScore" column="alarm_score" />
</resultMap>
<sql id="selectTCheckPublishVo">
- select id , examine_name, template_id , examine_range , frequency , state , create_time , create_user , update_time , update_user , description,create_user_name,update_user_name from t_check_publish
+ select id , examine_name, template_id , examine_range , frequency , state , create_time , create_user , update_time , update_user , description,create_user_name,update_user_name,alarm_score from t_check_publish
</sql>
<select id="selectTCheckPublishList" parameterType="com.ycl.platform.domain.entity.TCheckPublish" resultMap="TCheckPublishResult">
@@ -35,6 +36,7 @@
<if test="createUser != null "> and create_user = #{createUser}</if>
<if test="updateUser != null "> and update_user = #{updateUser}</if>
<if test="description != null and description != ''"> and description = #{description}</if>
+ <if test="alarmScore != null"> and alarm_score = #{alarmScore}</if>
</where>
</select>
@@ -59,6 +61,7 @@
<if test="updateUser != null">update_user,</if>
<if test="updateUserName != null and updateUserName!= ''">update_user_name,</if>
<if test="description != null">description,</if>
+ <if test="alarmScore != null">alarm_score,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -74,6 +77,7 @@
<if test="updateUser != null">#{updateUser},</if>
<if test="updateUserName != null and updateUserName!= ''">#{updateUserName},</if>
<if test="description != null">#{description},</if>
+ <if test="alarmScore != null">#{alarmScore},</if>
</trim>
</insert>
@@ -92,6 +96,7 @@
<if test="updateUser != null">update_user = #{updateUser},</if>
<if test="updateUserName != null and updateUserName!= ''">update_user_name = #{updateUserName},</if>
<if test="description != null">description = #{description},</if>
+ <if test="alarmScore != null">alarm_score = #{alarmScore},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.8.0