Procházet zdrojové kódy

20230916~20230917-添加ITSM接口

iaun před 3 roky
rodič
revize
8172caf536

+ 130 - 2
src/main/java/cn/iaun/it/controller/ItItsmController.java

@@ -1,17 +1,25 @@
 package cn.iaun.it.controller;
 
+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.controller.AdminGetOrderVo;
 import cn.iaun.it.model.vo.itsm.controller.CreateOrderReqVo;
+import cn.iaun.it.model.vo.itsm.controller.GetOrderVo;
+import cn.iaun.it.model.vo.itsm.controller.SubmitOrderReqVo;
 import cn.iaun.it.model.vo.user.ItUserVo;
 import cn.iaun.it.service.ItItsmService;
+import cn.iaun.it.util.MyPage;
 import cn.iaun.it.util.Result;
 import cn.iaun.it.util.ResultCode;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @RestController
 @RequestMapping("/itsm")
@@ -111,8 +119,128 @@ public class ItItsmController {
     }
 
     @PostMapping("/order/submit")
-    public Result<?> submitOrder() {
-        return null;
+    public Result<?> submitOrder(@RequestBody SubmitOrderReqVo submitOrderReqVo, @RequestAttribute("userId") Long userId, @RequestAttribute("roleId") Long roleId) {
+        submitOrderReqVo.setTemplateId(null);
+        submitOrderReqVo.setCurrentUserId(null);
+        submitOrderReqVo.setOrderStatus(null);
+        if (submitOrderReqVo.getOrderId() == null) {
+            return new Result<>(ResultCode.FAILED_PARAM_INVALID);
+        }
+        ItItsmOrder dbData = itItsmService.getOrderByOrderId(submitOrderReqVo.getOrderId());
+        if (dbData == null) {
+            return new Result<>(ResultCode.FAILED_PARAM_INVALID);
+        }
+        if (!Objects.equals(dbData.getCurrentUserId(), userId)) {
+            return new Result<>(ResultCode.PERM_NO_PERMISSION); // 非当前用户不允许提交
+        }
+
+        ItItsmOrder updateData = new ItItsmOrder();
+        updateData.setOrderId(submitOrderReqVo.getOrderId());
+
+        ItItsmLog log = new ItItsmLog();
+        log.setOrderId(submitOrderReqVo.getOrderId());
+        log.setUserId(userId);
+        log.setTime(new Date());
+
+        switch (submitOrderReqVo.getSubmitType()) {
+            case 0:
+            case 1:
+                if (roleId == 1) {
+                    return new Result<>(ResultCode.PERM_NO_PERMISSION);
+                }
+                break;
+            case 2:
+            case 3:
+                if (roleId != 1) {
+                    return new Result<>(ResultCode.PERM_NO_PERMISSION);
+                }
+                break;
+        }
+
+        switch (submitOrderReqVo.getSubmitType()) {
+            case 0:  // 通过
+                if (submitOrderReqVo.getReply() == null || submitOrderReqVo.getRemark() == null) {
+                    return new Result<>(ResultCode.FAILED_PARAM_INVALID);
+                } else {
+                    updateData.setOrderStatus(1);
+                    updateData.setCurrentUserId(dbData.getUserId()); // 流转到发起人
+                    updateData.setReply(submitOrderReqVo.getReply());
+
+                    if (submitOrderReqVo.getRemark().isEmpty()) {
+                        log.setLog("已通过");
+                    } else {
+                        log.setLog("已通过,备注:" + submitOrderReqVo.getRemark());
+                    }
+                }
+                break;
+            case 1:  // 退回
+                if (submitOrderReqVo.getRemark() == null) {
+                    return new Result<>(ResultCode.FAILED_PARAM_INVALID);
+                } else {
+                    updateData.setOrderStatus(2);
+                    updateData.setCurrentUserId(dbData.getUserId()); // 流转到发起人
+
+                    if (submitOrderReqVo.getRemark().isEmpty()) {
+                        log.setLog("已退回");
+                    } else {
+                        log.setLog("已退回,备注:" + submitOrderReqVo.getRemark());
+                    }
+                }
+                break;
+            case 2:  // 评价
+                if (submitOrderReqVo.getEvaluate() == null || submitOrderReqVo.getComment() == null) {
+                    return new Result<>(ResultCode.FAILED_PARAM_INVALID);
+                } else {
+                    updateData.setEvaluate(submitOrderReqVo.getEvaluate());
+                    updateData.setComment(submitOrderReqVo.getComment());
+                    updateData.setOrderStatus(3);
+                    log.setLog("已评价");
+                }
+                break;
+            case 3:  // 重新提交
+                if (submitOrderReqVo.getData() == null) {
+                    return new Result<>(ResultCode.FAILED_PARAM_INVALID);
+                } else {
+                    ItItsmTemplate template = itItsmService.getItsmTemplateByTemplateId(dbData.getTemplateId());
+                    updateData.setCurrentUserId(template.getTemplateUser());
+                    updateData.setData(submitOrderReqVo.getData());
+                    log.setLog("重新提交");
+                }
+                break;
+        }
+        itItsmService.addItsmLog(log);
+        int result = itItsmService.setItsmOrder(updateData);
+        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED);
+    }
+
+    @PostMapping("/order/get")
+    public Result<MyPage<ItItsmOrder>> getMyOrders(@RequestBody @Validated GetOrderVo getOrderVo, @RequestAttribute("userId") Long userId) {
+        if (getOrderVo.getPageNo() == null) {
+            getOrderVo.setPageNo(1);
+        }
+        if (getOrderVo.getPageSize() == null) {
+            getOrderVo.setPageSize(20);
+        }
+        IPage<ItItsmOrder> page = itItsmService.getItsmOrderByIds(getOrderVo.getPageNo(), getOrderVo.getPageSize(), userId, getOrderVo.getOrderStatus());
+        return new Result<>(ResultCode.SUCCESS, new MyPage<>(page));
+    }
+
+    @PostMapping("/admin/order/get")
+    public Result<MyPage<ItItsmOrder>> adminGetOrders(@RequestBody @Validated AdminGetOrderVo vo, @RequestAttribute("userId") Long userId) {
+        if (vo.getPageNo() == null) {
+            vo.setPageNo(1);
+        }
+        if (vo.getPageSize() == null) {
+            vo.setPageSize(20);
+        }
+        IPage<ItItsmOrder> page = itItsmService.adminGetItsmOrder(vo.getPageNo(), vo.getPageSize(), userId, vo.getProcessed());
+        return new Result<>(ResultCode.SUCCESS, new MyPage<>(page));
+    }
+
+    @PostMapping("/log/get/by-order/{i}")
+    public Result<List<ItItsmLog>> 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/mapper/ItItsmOrderMapper.java

@@ -2,6 +2,12 @@ package cn.iaun.it.mapper;
 
 import cn.iaun.it.model.ItItsmOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
 
 public interface ItItsmOrderMapper extends BaseMapper<ItItsmOrder> {
+    ItItsmOrder getOrderById(Long orderId);
+
+    IPage<ItItsmOrder> adminGetOrder(IPage<ItItsmOrder> page, Long userId, Boolean processed);
 }

+ 44 - 0
src/main/java/cn/iaun/it/model/vo/itsm/controller/AdminGetOrderVo.java

@@ -0,0 +1,44 @@
+package cn.iaun.it.model.vo.itsm.controller;
+
+import javax.validation.constraints.NotNull;
+
+public class AdminGetOrderVo {
+    private Integer pageNo;
+    private Integer pageSize;
+    @NotNull
+    private Boolean processed; // 是否已处理,0 未处理,1 已处理
+
+
+    @Override
+    public String toString() {
+        return "AdminGetOrderVo{" +
+                "pageNo=" + pageNo +
+                ", pageSize=" + pageSize +
+                ", processed=" + processed +
+                '}';
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Boolean getProcessed() {
+        return processed;
+    }
+
+    public void setProcessed(Boolean processed) {
+        this.processed = processed;
+    }
+}

+ 43 - 0
src/main/java/cn/iaun/it/model/vo/itsm/controller/GetOrderVo.java

@@ -0,0 +1,43 @@
+package cn.iaun.it.model.vo.itsm.controller;
+
+import javax.validation.constraints.NotNull;
+
+public class GetOrderVo {
+    private Integer pageNo;
+    private Integer pageSize;
+    @NotNull
+    private Integer orderStatus;
+
+    @Override
+    public String toString() {
+        return "getOrderVo{" +
+                "pageNo=" + pageNo +
+                ", pageSize=" + pageSize +
+                ", orderStatus=" + orderStatus +
+                '}';
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(Integer orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+}

+ 32 - 0
src/main/java/cn/iaun/it/model/vo/itsm/controller/SubmitOrderReqVo.java

@@ -0,0 +1,32 @@
+package cn.iaun.it.model.vo.itsm.controller;
+
+import cn.iaun.it.model.ItItsmOrder;
+
+public class SubmitOrderReqVo extends ItItsmOrder {
+    private Integer submitType; // 0 通过,1 退回,2 评价,3 退回重新提交
+    private String remark; // 备注,用于记录日志
+
+    @Override
+    public String toString() {
+        return "SubmitOrderReqVo{" +
+                "submitType=" + submitType +
+                ", remark='" + remark + '\'' +
+                "} " + super.toString();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getSubmitType() {
+        return submitType;
+    }
+
+    public void setSubmitType(Integer submitType) {
+        this.submitType = submitType;
+    }
+}

+ 4 - 0
src/main/java/cn/iaun/it/service/ItItsmService.java

@@ -45,6 +45,10 @@ public interface ItItsmService {
 
     int delItsmOrder(Long orderId);
 
+    ItItsmOrder getOrderByOrderId(Long orderId);
+
+    IPage<ItItsmOrder> adminGetItsmOrder(Integer pageNo, Integer pageSize, Long userId, Boolean processed);
+
     // 流程日志
     List<ItItsmLog> getItsmLogByOrderId(Long orderId);
 

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

@@ -121,10 +121,22 @@ public class ItItsmServiceImpl implements ItItsmService {
         return itItsmOrderMapper.deleteById(orderId);
     }
 
+    @Override
+    public ItItsmOrder getOrderByOrderId(Long orderId) {
+        return itItsmOrderMapper.getOrderById(orderId);
+    }
+
+    @Override
+    public IPage<ItItsmOrder> adminGetItsmOrder(Integer pageNo, Integer pageSize, Long userId, Boolean processed) {
+        Page<ItItsmOrder> page = new Page<>(pageNo, pageSize);
+        return itItsmOrderMapper.adminGetOrder(page, userId, processed);
+    }
+
     @Override
     public List<ItItsmLog> getItsmLogByOrderId(Long orderId) {
         QueryWrapper<ItItsmLog> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("order_id", orderId);
+        queryWrapper.orderByDesc("time");
         return itItsmLogMapper.selectList(queryWrapper);
     }
 

+ 38 - 0
src/main/resources/mapper/ItItsmOrderMapper.xml

@@ -0,0 +1,38 @@
+<?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.ItItsmOrderMapper">
+
+    <select id="getOrderById" resultType="cn.iaun.it.model.ItItsmOrder">
+        select `order_id`,
+               `template_id`,
+               `user_id`,
+               `current_user_id`,
+               `data`,
+               `order_status`,
+               `reply`,
+               `evaluate`,
+               `comment`
+        from it_itsm_order
+        where order_id = #{orderId};
+    </select>
+    <select id="adminGetOrder" resultType="cn.iaun.it.model.ItItsmOrder">
+        select `order_id`,
+        `template_id`,
+        `user_id`,
+        `current_user_id`,
+        `data`,
+        `order_status`,
+        `reply`,
+        `evaluate`,
+        `comment`
+        from it_itsm_order where
+        <if test="processed">
+            `order_status` = 0
+            and `order_id` IN (select distinct `il`.`order_id` from `it_itsm_log` `il` where `il`.`user_id` = #{user_id})
+        </if>
+        <if test="!processed">
+            `current_user_id` = #{userId}
+        </if>
+        order by `order_id` desc
+    </select>
+</mapper>