"src/main/git@gitlab.ruzhoukj.com:wujipeng/relation.git" did not exist on "d8846085ba9d6f5f2fec4b175179940bfc9c0632"
Commit e9db104a authored by 王蔡翾's avatar 王蔡翾
Browse files

优化

parent aa7286f0
package com.example.operation_platform.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.example.operation_platform.mapper.BsWorkTypeMapper;
import com.example.operation_platform.model.entity.BsWorkTypeEntity;
import com.example.operation_platform.model.vo.BsWorkTypeVO;
import com.example.operation_platform.service.BsWorkTypeService;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class BsWorkTypeServiceImpl extends ServiceImpl<BsWorkTypeMapper, BsWorkTypeEntity> implements BsWorkTypeService {
@Override
public List<BsWorkTypeVO> queryWorkTypeList(){
return baseMapper.queryWorkTypeList();
}
}
package com.example.operation_platform.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.example.operation_platform.mapper.UserMapper;
import com.example.operation_platform.model.dto.UserDTO;
import com.example.operation_platform.model.entity.LoginEntity;
import com.example.operation_platform.model.entity.UserEntity;
import com.example.operation_platform.model.vo.UserVO;
import com.example.operation_platform.service.UserService;
import com.example.operation_platform.util.JwtUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> implements UserService {
@Resource
private JwtUtil jwtUtil;
@Override
public LoginEntity login(LoginEntity login){
String name = login.getName();
String password = login.getPassword(); // ⚠️ 这是用户登录时输入的明文密码
// 1. 查询用户
QueryWrapper<UserEntity> query = new QueryWrapper<>();
query.eq("name", name);
UserEntity user = getOne(query);
if (user == null) {
throw new RuntimeException("用户不存在");
}
//验证密码
if (!password.equals(user.getPassword())) {
throw new RuntimeException("密码错误");
}
// 4. 生成 JWT Token
String token = jwtUtil.generateToken(String.valueOf(user.getId()), user.getName());
// 5. 构造返回对象,并告知是否初始密码
LoginEntity response = new LoginEntity();
response.setToken(token);
response.setUserId(user.getId());
response.setName(user.getName());
return response;
}
@Override
public List<UserVO> queryUserList(UserDTO userDTO) {
return baseMapper.queryUserList(userDTO);
}
}
...@@ -7,13 +7,16 @@ import com.example.operation_platform.model.entity.WorkerEntity; ...@@ -7,13 +7,16 @@ import com.example.operation_platform.model.entity.WorkerEntity;
import com.example.operation_platform.model.vo.TermAndImgVO; import com.example.operation_platform.model.vo.TermAndImgVO;
import com.example.operation_platform.model.vo.WorkerVO; import com.example.operation_platform.model.vo.WorkerVO;
import com.example.operation_platform.service.WorkerService; import com.example.operation_platform.service.WorkerService;
import com.example.operation_platform.util.JwtUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List; import java.util.List;
@Service @Service
public class WorkerServiceImpl extends ServiceImpl<WorkerMapper, WorkerEntity> implements WorkerService { public class WorkerServiceImpl extends ServiceImpl<WorkerMapper, WorkerEntity> implements WorkerService {
@Resource
private JwtUtil jwtUtil;
@Override @Override
public List<WorkerVO> queryList(WorkerDTO workerDTO) { public List<WorkerVO> queryList(WorkerDTO workerDTO) {
...@@ -25,7 +28,10 @@ public class WorkerServiceImpl extends ServiceImpl<WorkerMapper, WorkerEntity> i ...@@ -25,7 +28,10 @@ public class WorkerServiceImpl extends ServiceImpl<WorkerMapper, WorkerEntity> i
} }
@Override @Override
public WorkerVO queryByUsername(WorkerDTO WorkerDTO) { public WorkerVO queryByUsername(WorkerDTO WorkerDTO) {
return this.baseMapper.queryByUsername(WorkerDTO); WorkerVO workerVO = baseMapper.queryByUsername(WorkerDTO);
String token = jwtUtil.generateToken(String.valueOf(workerVO.getId()), workerVO.getWorkerName());
workerVO.setToken(token);
return workerVO;
} }
@Override @Override
public void resetPassword(WorkerDTO workerDTO) { public void resetPassword(WorkerDTO workerDTO) {
......
package com.example.operation_platform.util;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import io.jsonwebtoken.security.Keys;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.crypto.SecretKey;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@Component
public class JwtUtil {
@Value("${jwt.secret:7xK9p2Rz4nQvTxoLmYwEfD1cAq6sNjBvXyZtH3uFcW0iJm5LoRgUdSeP2iKq}") // 请使用安全的密钥,至少32字符!
private String secret;
@Value("${jwt.expiration:86400}") // Token有效期(秒),比如 24小时
private Long expiration;
// 生成 JWT Token
public String generateToken(String userId, String name) {
Map<String, Object> claims = new HashMap<>();
claims.put("userId", userId);
claims.put("name", name);
Date now = new Date();
Date expiryDate = new Date(now.getTime() + expiration * 1000L);
SecretKey key = Keys.hmacShaKeyFor(secret.getBytes());
return Jwts.builder()
.setClaims(claims)
.setSubject(userId) // 主题,通常放用户ID
.setIssuedAt(now)
.setExpiration(expiryDate)
.signWith(key, SignatureAlgorithm.HS256)
.compact();
}
// 从 Token 中解析数据(比如用于网关校验)
public Claims parseToken(String token) {
SecretKey key = Keys.hmacShaKeyFor(secret.getBytes());
return Jwts.parserBuilder()
.setSigningKey(key)
.build()
.parseClaimsJws(token)
.getBody();
}
/**
* 解析 Token 并直接返回 userName
* @param token JWT Token(可以是原始token或带"Bearer "前缀的token)
* @return 用户名
* @throws RuntimeException 当 Token 无效或解析失败时抛出
*/
public String getUserNameFromToken(String token) {
try {
// 预处理token,去除可能的空格和Bearer前缀
if (token != null) {
token = token.trim();
if (token.startsWith("Bearer ")) {
token = token.substring(7).trim();
}
}
// 检查token是否为空
if (token == null || token.isEmpty()) {
throw new RuntimeException("Token 不能为空");
}
// 修改后代码:
SecretKey key = Keys.hmacShaKeyFor(secret.getBytes());
Claims claims = Jwts.parserBuilder()
.setSigningKey(key)
.build()
.parseClaimsJws(token)
.getBody();
// 优先从subject获取,如果没有则从userName字段获取
String name = claims.get("name", String.class);
if (name == null || name.isEmpty()) {
throw new RuntimeException("Token 中缺少用户信息");
}
return name;
} catch (io.jsonwebtoken.ExpiredJwtException e) {
throw new RuntimeException("Token 已过期");
} catch (io.jsonwebtoken.MalformedJwtException e) {
throw new RuntimeException("Token 格式错误");
} catch (io.jsonwebtoken.UnsupportedJwtException e) {
throw new RuntimeException("不支持的 Token 格式");
} catch (IllegalArgumentException e) {
throw new RuntimeException("Token 参数异常");
} catch (Exception e) {
throw new RuntimeException("Token 解析失败: " + e.getMessage());
}
}
/**
* 安全版本的解析方法,返回 null 而不是抛出异常
* @param token JWT Token
* @return 用户名,解析失败返回 null
*/
public String getUserNameFromTokenSafe(String token) {
try {
return getUserNameFromToken(token);
} catch (Exception e) {
// 记录日志但不抛出异常
System.err.println("解析 Token 失败: " + e.getMessage());
return null;
}
}
/**
* 从 Authorization Header 中提取并解析 userName
* @param authHeader Authorization Header 值(格式:Bearer <token>)
* @return 用户名
* @throws RuntimeException 当 Header 格式错误或 Token 解析失败时抛出
*/
public String getUserNameFromAuthHeader(String authHeader) {
if (authHeader == null || !authHeader.startsWith("Bearer ")) {
throw new RuntimeException("Authorization Header 格式错误,应为: Bearer <token>");
}
String token = authHeader.substring(7).trim();
return getUserNameFromToken(token);
}
/**
* 验证 Token 是否有效且包含 name
* @param token JWT Token
* @return 是否有效
*/
public boolean validateTokenAndHasUserName(String token) {
try {
Claims claims = parseToken(token);
String userName = claims.get("name", String.class);
return userName != null && !userName.trim().isEmpty();
} catch (Exception e) {
return false;
}
}
}
package com.example.operation_platform.util;
import com.example.operation_platform.model.dto.BsWorkDTO;
import com.example.operation_platform.model.vo.BsWorkVO;
import com.platform.utils.AliSmsUtil;
import org.json.JSONObject;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@Component
public class SmsSendUtils {
@Resource
private AliSmsUtil aliSmsUtil;
/**
* 发送工单处理提醒
* @param phone
* @param bsWorkDTO
*/
public void sendSms(String phone, BsWorkDTO bsWorkDTO){
// 构建短信模板参数
JSONObject jsonObject = new JSONObject();
jsonObject.put("code", bsWorkDTO.getCode());
jsonObject.put("endTime", bsWorkDTO.getEndTime());
aliSmsUtil.sendSms(phone, jsonObject, "SMS_500580249");
}
}
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.example.operation_platform.mapper.BsProjectMapper">
<select id="queryProjectList" resultType="com.example.operation_platform.model.entity.BsProjectEntity">
select
bp.id id,
bp.project_name projectName,
bp.description description
from
bs_project bp
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.example.operation_platform.mapper.BsWorkLevelMapper">
<select id="queryWorkLevelList" resultType="com.example.operation_platform.model.vo.BsWorkLevelVO">
select
bwl.id id,
bwl.level level,
bwl.color color,
bwl.handle_time handleTime,
bwl.description description
from
bs_work_level bwl
</select>
<select id="queryByLevel" resultType="com.example.operation_platform.model.vo.BsWorkLevelVO">
select
bwl.id id,
bwl.level level,
bwl.color color,
bwl.description description
from
bs_work_level bwl
where
bwl.level = #{level}
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.example.operation_platform.mapper.BsWorkMapper">
<select id="queryWorkList" resultType="com.example.operation_platform.model.vo.BsWorkVO">
select
bw.id id,
bw.code code,
bw.level level,
bw.type type,
bw.project_id projectId,
bw.detail detail,
bw.status status,
bw.create_time createTime,
u.name createByName,
ur.name handleByName,
bwl.color color,
bp.project_name projectName,
bw.file_path filePath
from
bs_work bw
left join
bs_project bp
on
bw.project_id = bp.id
left join
user u
on
bw.create_by = u.id
left join
user ur
on
bw.handle_by = ur.id
left join
bs_work_level bwl
on
bw.level = bwl.level
<where>
<if test="handleBy != null and handleBy != ''">
bw.handle_by = #{handleBy}
</if>
<if test="level != null and level != ''">
bw.level = #{level}
</if>
<if test="type != null and type != ''">
bw.type = #{type}
</if>
</where>
order by
bw.create_time desc
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.example.operation_platform.mapper.BsWorkOperationMapper">
<select id="queryOperationByWorkId" resultType="com.example.operation_platform.model.entity.BsWorkOperationEntity">
select
id,
work_id,
handle_time,
handler,
remark,
file_path
from bs_work_operation
where work_id = #{workId}
order by handle_time desc
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.example.operation_platform.mapper.BsWorkTypeMapper">
<select id="queryWorkTypeList" resultType="com.example.operation_platform.model.vo.BsWorkTypeVO">
select
bwt.id id,
bwt.type_name typeName,
bwt.description description
from
bs_work_type bwt
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.example.operation_platform.mapper.UserMapper">
<select id="queryUserList" resultType="com.example.operation_platform.model.vo.UserVO">
SELECT
u.id,
u.name,
DATE_FORMAT(u.create_time, '%Y-%m-%d') as createTime,
u.phone,
u.id_card as idCard,
u.fn,
u.work_no as workNo,
u.sex,
u.birth_date as birthDate,
u.birth,
u.age,
u.nation,
u.company_name as companyName,
u.post,
u.post_rank as postRank,
u.sequence,
DATE_FORMAT(u.join_date, '%Y-%m-%d') as joinDate,
u.second_dept as secondDept,
u.third_dept as thirdDept,
u.password,
u.email,
u.user_role as userRole
FROM `user` u
<where>
<if test="name != null and name != ''">
u.name =#{name}
</if>
<if test="roleId != null and roleId != ''">
and u.role_id =#{roleId}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment