Просмотр исходного кода

20230929~20231005-细节修改&bug修复

iaun 3 лет назад
Родитель
Сommit
796a456d41

+ 3 - 1
src/main/java/cn/iaun/it/controller/ItItsmController.java

@@ -4,6 +4,7 @@ import cn.iaun.it.model.ItItsmLog;
 import cn.iaun.it.model.ItItsmOrder;
 import cn.iaun.it.model.ItItsmTemplate;
 import cn.iaun.it.model.ItItsmTemplateField;
+import cn.iaun.it.model.vo.itsm.LogVo;
 import cn.iaun.it.model.vo.itsm.OrderVo;
 import cn.iaun.it.model.vo.itsm.TemplateVo;
 import cn.iaun.it.model.vo.itsm.controller.*;
@@ -231,6 +232,7 @@ public class ItItsmController {
                     updateData.setEvaluate(submitOrderReqVo.getEvaluate());
                     updateData.setComment(submitOrderReqVo.getComment());
                     updateData.setOrderStatus(3);
+                    updateData.setCurrentUserId(-1L);
                     log.setLog("已评价");
                 }
                 break;
@@ -287,7 +289,7 @@ public class ItItsmController {
     }
 
     @PostMapping("/log/get/by-order/{i}")
-    public Result<List<ItItsmLog>> getLogByOrderId(@PathVariable String i) {
+    public Result<List<LogVo>> getLogByOrderId(@PathVariable String i) {
         Long orderId = Long.parseLong(i);
         return new Result<>(ResultCode.SUCCESS, itItsmService.getItsmLogByOrderId(orderId));
     }

+ 6 - 0
src/main/java/cn/iaun/it/controller/ItUserController.java

@@ -30,4 +30,10 @@ public class ItUserController {
     public Result<ItUserInfoVo> info(@RequestAttribute("userId") Long userId) {
         return new Result<>(ResultCode.SUCCESS, itUserService.getUserInfoByUserId(userId));
     }
+
+    @PostMapping("/logout")
+    public Result<?> logout(@RequestAttribute("userId") Long userId) {
+        itUserService.logoutByUserId(userId);
+        return new Result<>(ResultCode.SUCCESS);
+    }
 }

+ 4 - 0
src/main/java/cn/iaun/it/mapper/ItItsmLogMapper.java

@@ -1,7 +1,11 @@
 package cn.iaun.it.mapper;
 
 import cn.iaun.it.model.ItItsmLog;
+import cn.iaun.it.model.vo.itsm.LogVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 public interface ItItsmLogMapper extends BaseMapper<ItItsmLog> {
+    List<LogVo> getLogByOrderId(Long orderId);
 }

+ 22 - 0
src/main/java/cn/iaun/it/model/vo/itsm/LogVo.java

@@ -0,0 +1,22 @@
+package cn.iaun.it.model.vo.itsm;
+
+import cn.iaun.it.model.ItItsmLog;
+
+public class LogVo extends ItItsmLog {
+    private String userName;
+
+    @Override
+    public String toString() {
+        return "LogVo{" +
+                "userName='" + userName + '\'' +
+                "} " + super.toString();
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

+ 10 - 0
src/main/java/cn/iaun/it/model/vo/itsm/OrderVo.java

@@ -5,15 +5,25 @@ import cn.iaun.it.model.ItItsmOrder;
 public class OrderVo extends ItItsmOrder {
     private String templateName;
     private String currentUserName;
+    private String userName;
 
     @Override
     public String toString() {
         return "OrderVo{" +
                 "templateName='" + templateName + '\'' +
                 ", currentUserName='" + currentUserName + '\'' +
+                ", userName='" + userName + '\'' +
                 "} " + super.toString();
     }
 
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
     public String getTemplateName() {
         return templateName;
     }

+ 2 - 1
src/main/java/cn/iaun/it/service/ItItsmService.java

@@ -4,6 +4,7 @@ import cn.iaun.it.model.ItItsmLog;
 import cn.iaun.it.model.ItItsmOrder;
 import cn.iaun.it.model.ItItsmTemplate;
 import cn.iaun.it.model.ItItsmTemplateField;
+import cn.iaun.it.model.vo.itsm.LogVo;
 import cn.iaun.it.model.vo.itsm.OrderVo;
 import cn.iaun.it.model.vo.itsm.TemplateVo;
 import cn.iaun.it.model.vo.user.ItUserVo;
@@ -58,7 +59,7 @@ public interface ItItsmService {
     IPage<OrderVo> adminGetItsmOrder(Integer pageNo, Integer pageSize, Long userId, Boolean processed);
 
     // 流程日志
-    List<ItItsmLog> getItsmLogByOrderId(Long orderId);
+    List<LogVo> getItsmLogByOrderId(Long orderId);
 
     int addItsmLog(ItItsmLog itItsmLog);
 

+ 2 - 0
src/main/java/cn/iaun/it/service/ItUserService.java

@@ -8,4 +8,6 @@ public interface ItUserService {
     ItUserLoginInfoVo getTokenByUserAndPassword(String user, String password);
 
     ItUserInfoVo getUserInfoByUserId(Long userId);
+
+    void logoutByUserId(Long userId);
 }

+ 3 - 5
src/main/java/cn/iaun/it/service/impl/ItItsmServiceImpl.java

@@ -5,6 +5,7 @@ import cn.iaun.it.model.ItItsmLog;
 import cn.iaun.it.model.ItItsmOrder;
 import cn.iaun.it.model.ItItsmTemplate;
 import cn.iaun.it.model.ItItsmTemplateField;
+import cn.iaun.it.model.vo.itsm.LogVo;
 import cn.iaun.it.model.vo.itsm.OrderVo;
 import cn.iaun.it.model.vo.itsm.TemplateVo;
 import cn.iaun.it.model.vo.user.ItUserVo;
@@ -148,11 +149,8 @@ public class ItItsmServiceImpl implements ItItsmService {
     }
 
     @Override
-    public List<ItItsmLog> getItsmLogByOrderId(Long orderId) {
-        QueryWrapper<ItItsmLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("order_id", orderId);
-        queryWrapper.orderByDesc("time");
-        return itItsmLogMapper.selectList(queryWrapper);
+    public List<LogVo> getItsmLogByOrderId(Long orderId) {
+        return itItsmLogMapper.getLogByOrderId(orderId);
     }
 
     @Override

+ 12 - 0
src/main/java/cn/iaun/it/service/impl/ItUserServiceImpl.java

@@ -87,4 +87,16 @@ public class ItUserServiceImpl implements ItUserService {
         return itUserInfo;
     }
 
+    @Override
+    public void logoutByUserId(Long userId) {
+        String tokenInRedis = redisUtil.hGet("user", String.valueOf(userId));
+        redisUtil.hSet("user", String.valueOf(userId), "");
+
+        if (tokenInRedis != null) {
+            redisTemplate.delete("USER_TOKEN_" + tokenInRedis);
+            redisTemplate.delete("USER_ROLE_" + tokenInRedis);
+            redisTemplate.delete("USER_PERM_" + tokenInRedis);
+        }
+
+    }
 }

+ 17 - 0
src/main/resources/mapper/ItItsmLogMapper.xml

@@ -0,0 +1,17 @@
+<?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="cn.iaun.it.mapper.ItItsmLogMapper">
+
+    <select id="getLogByOrderId" resultType="cn.iaun.it.model.vo.itsm.LogVo">
+        select `iil`.`log_id`      as `log_id`,
+               `iil`.`order_id`    as `order_id`,
+               `iil`.`user_id`     as `user_id`,
+               `iil`.`time`        as `time`,
+               `iil`.`log`         as `log`,
+               `iu`.`display_name` as `user_name`
+        from `it_itsm_log` `iil`
+                 left join `it_user` `iu` on `iu`.`user_id` = `iil`.`user_id`
+        where `iil`.`order_id` = #{orderId}
+        order by `iil`.`time` desc
+    </select>
+</mapper>

+ 12 - 6
src/main/resources/mapper/ItItsmOrderMapper.xml

@@ -27,10 +27,12 @@
         `iio`.`order_status` as `order_status`,
         `iio`.`create_time` as `create_time`,
         `iit`.`name` AS `template_name`,
-        `iu`.`display_name` AS `current_user_name`
+        `iu1`.`display_name` AS `current_user_name`,
+        `iu2`.`display_name` AS `user_name`
         from `it_itsm_order` iio
         LEFT JOIN `it_itsm_template` `iit` ON `iio`.`template_id` = `iit`.`template_id`
-        LEFT JOIN `it_user` `iu` ON `iio`.`current_user_id` = `iu`.`user_id`
+        LEFT JOIN `it_user` `iu1` ON `iio`.`current_user_id` = `iu1`.`user_id`
+        LEFT JOIN `it_user` `iu2` ON `iio`.`user_id` = `iu2`.`user_id`
         where
         <if test="processed">
             `processed_user` = #{userId}
@@ -55,10 +57,12 @@
                `iio`.`comment`         as `comment`,
                `iio`.`create_time`     as `create_time`,
                `iit`.`name`            AS `template_name`,
-               `iu`.`display_name`     AS `current_user_name`
+               `iu1`.`display_name`     AS `current_user_name`,
+               `iu2`.`display_name`     AS `user_name`
         from `it_itsm_order` iio
                  LEFT JOIN `it_itsm_template` `iit` ON `iio`.`template_id` = `iit`.`template_id`
-                 LEFT JOIN `it_user` `iu` ON `iio`.`current_user_id` = `iu`.`user_id`
+                 LEFT JOIN `it_user` `iu1` ON `iio`.`current_user_id` = `iu1`.`user_id`
+                 LEFT JOIN `it_user` `iu2` ON `iio`.`user_id` = `iu2`.`user_id`
         where (`iio`.`order_id` = #{orderId} AND
                (iio.`user_id` = #{userId} OR iio.`current_user_id` = #{userId} OR
                 iio.`order_id` IN
@@ -75,10 +79,12 @@
                `iio`.`order_status`    as `order_status`,
                `iio`.`create_time`     as `create_time`,
                `iit`.`name`            AS `template_name`,
-               `iu`.`display_name`     AS `current_user_name`
+               `iu1`.`display_name`    AS `current_user_name`,
+               `iu2`.`display_name`    AS `user_name`
         from `it_itsm_order` iio
                  LEFT JOIN `it_itsm_template` `iit` ON `iio`.`template_id` = `iit`.`template_id`
-                 LEFT JOIN `it_user` `iu` ON `iio`.`current_user_id` = `iu`.`user_id`
+                 LEFT JOIN `it_user` `iu1` ON `iio`.`current_user_id` = `iu1`.`user_id`
+                 LEFT JOIN `it_user` `iu2` ON `iio`.`user_id` = `iu2`.`user_id`
         where `iio`.`user_id` = #{userId}
           and `iio`.`order_status` = #{orderStatus}
         order by `create_time` desc