refactor(ticket): 将产量字段类型从BigDecimal改为String
- 修改GongfuTicket实体类中throughput字段类型为String - 修改TicketAddRequest请求类中throughput字段类型为String - 修改TicketInfoVO视图对象中throughput字段类型为String - 修改TicketUpdateRequest请求类中throughput字段类型为String - 移除相关类中BigDecimal和DecimalFormat的导入 - 更新控制器中产量相关的逻辑处理，使用字符串格式化 - 添加多个API接口文档注释中的空行格式化
This commit is contained in:
曹鹏飞
parent
76e8235d75
commit
c35c972a09
|
|
@ -5,7 +5,6 @@ import lombok.Data;
|
|||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Size;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
|
|
@ -75,5 +74,5 @@ public class TicketAddRequest {
|
|||
/**
|
||||
* 产量
|
||||
*/
|
||||
private BigDecimal throughput;
|
||||
private String throughput;
|
||||
}
|
||||
|
|
@ -5,7 +5,6 @@ import lombok.Data;
|
|||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Size;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class TicketUpdateRequest {
|
||||
|
|
@ -59,5 +58,5 @@ public class TicketUpdateRequest {
|
|||
/**
|
||||
* 产量
|
||||
*/
|
||||
private BigDecimal throughput;
|
||||
private String throughput;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
|
|||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
|
@ -176,5 +175,5 @@ public class TicketInfoVO {
|
|||
/**
|
||||
* 产量
|
||||
*/
|
||||
private BigDecimal throughput;
|
||||
private String throughput;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ import java.io.OutputStream;
|
|||
import java.net.URL;
|
||||
import java.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.text.DecimalFormat;
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
|
|
@ -141,6 +140,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取问题类型
|
||||
*
|
||||
* @return 问题类型列表
|
||||
*/
|
||||
@GetMapping("getQuestions")
|
||||
|
|
@ -151,6 +151,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取收藏夹
|
||||
*
|
||||
* @param id 收藏夹id，0为根节点
|
||||
* @return 收藏夹信息
|
||||
*/
|
||||
|
|
@ -162,6 +163,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取收藏夹树结构
|
||||
*
|
||||
* @param id 父级id，0为根节点
|
||||
* @return 树结构
|
||||
*/
|
||||
|
|
@ -172,6 +174,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 添加收藏夹
|
||||
*
|
||||
* @param request 请求信息
|
||||
* @return 无
|
||||
*/
|
||||
|
|
@ -184,6 +187,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 更新收藏夹名称
|
||||
*
|
||||
* @param request 请求信息
|
||||
*/
|
||||
@PostMapping("updateFavorites")
|
||||
|
|
@ -194,6 +198,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 删除收藏夹
|
||||
*
|
||||
* @param favoritesId 收藏夹id
|
||||
* @return 无
|
||||
*/
|
||||
|
|
@ -206,6 +211,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 移动收藏夹
|
||||
*
|
||||
* @param request 请求信息
|
||||
*/
|
||||
@PostMapping("moveFavorites")
|
||||
|
|
@ -216,6 +222,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 移动收藏夹工单
|
||||
*
|
||||
* @param request 请求信息
|
||||
*/
|
||||
@PostMapping("moveFavoritesTicket")
|
||||
|
|
@ -226,6 +233,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 关注工单
|
||||
*
|
||||
* @param request 请求信息
|
||||
**/
|
||||
@PostMapping("followTiket")
|
||||
|
|
@ -238,6 +246,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 取消关注工单
|
||||
*
|
||||
* @param ticketId 工单id
|
||||
**/
|
||||
@PostMapping("unfollowTicket")
|
||||
|
|
@ -248,6 +257,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取所有设备部件
|
||||
*
|
||||
* @param name 部件名称，模糊查询
|
||||
* @return 部件列表
|
||||
*/
|
||||
|
|
@ -267,6 +277,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 搜索工单
|
||||
*
|
||||
* @param request 请求参数
|
||||
* @return 工单列表
|
||||
*/
|
||||
|
|
@ -329,6 +340,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取工单根本原因分析
|
||||
*
|
||||
* @param ticketId 工单id
|
||||
* @return 根本原因分析
|
||||
*/
|
||||
|
|
@ -342,6 +354,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 导出搜索工单
|
||||
*
|
||||
* @param request 请求参数
|
||||
*/
|
||||
@PostMapping("exportSearchTicket")
|
||||
|
|
@ -354,6 +367,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 分派工单
|
||||
*
|
||||
* @param request 请求参数
|
||||
*/
|
||||
@PostMapping("assignmentTicket")
|
||||
|
|
@ -383,6 +397,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取工单处理人
|
||||
*
|
||||
* @param id 工单id
|
||||
* @return 工单处理人列表
|
||||
*/
|
||||
|
|
@ -394,6 +409,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 添加/删除工单处理人
|
||||
*
|
||||
* @param request 请求参数
|
||||
*/
|
||||
@PostMapping("addTicketHandle")
|
||||
|
|
@ -415,6 +431,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 完成工单
|
||||
*
|
||||
* @param ids 工单id列表
|
||||
*/
|
||||
@PostMapping("completeTicket")
|
||||
|
|
@ -446,6 +463,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 驳回工单
|
||||
*
|
||||
* @param ids 工单id列表
|
||||
*/
|
||||
@PostMapping("rejectTicket")
|
||||
|
|
@ -477,6 +495,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 撤销工单
|
||||
*
|
||||
* @param id 工单编号
|
||||
**/
|
||||
@GetMapping("revokedTicket")
|
||||
|
|
@ -487,6 +506,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 导出工单为pdf
|
||||
*
|
||||
* @param id 工单id
|
||||
*/
|
||||
@GetMapping("exportPdf")
|
||||
|
|
@ -561,8 +581,8 @@ public class TicketController extends ControllerBase {
|
|||
Map<String, Object> variables = new HashMap<>();
|
||||
variables.put("ticket", vo);
|
||||
Map<String, Object> base = new HashMap<>();
|
||||
base.put("t1", Objects.isNull(ticket.getThroughput()) ? "设备运行时间" : "产量");
|
||||
base.put("v1", Objects.isNull(ticket.getThroughput()) ? ticket.getUseTime() + "小时" : new DecimalFormat("0.#").format(ticket.getThroughput()) + "（吨或方）");
|
||||
base.put("t1", StrUtil.isBlank(ticket.getThroughput()) ? "设备运行时间" : "产量");
|
||||
base.put("v1", StrUtil.isBlank(ticket.getThroughput()) ? ticket.getUseTime() + "小时" : ticket.getThroughput());
|
||||
variables.put("base", base);
|
||||
// 渲染HTML
|
||||
TemplateEngine templateEngine = new TemplateEngine();
|
||||
|
|
@ -595,6 +615,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取工单详情
|
||||
*
|
||||
* @param id 工单编号
|
||||
* @return 工单详情
|
||||
**/
|
||||
|
|
@ -757,6 +778,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取工单聊天记录
|
||||
*
|
||||
* @param ticketId 工单编号
|
||||
* @return 聊天记录
|
||||
**/
|
||||
|
|
@ -798,6 +820,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 设置聊天记录已读
|
||||
*
|
||||
* @param ticketId 工单编号
|
||||
**/
|
||||
@PostMapping("setChatMessageReaded")
|
||||
|
|
@ -808,6 +831,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 添加聊天记录
|
||||
*
|
||||
* @param request 请求信息
|
||||
**/
|
||||
@PostMapping("addChatMessage")
|
||||
|
|
@ -871,6 +895,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 撤回聊天记录
|
||||
*
|
||||
* @param request 请求信息
|
||||
**/
|
||||
@PostMapping("withdrawChatMessage")
|
||||
|
|
@ -885,6 +910,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取工单解决方案措施
|
||||
*
|
||||
* @param ticketId 工单编号
|
||||
* @return 解决方案措施
|
||||
**/
|
||||
|
|
@ -896,6 +922,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取工单解决方案评审部门
|
||||
*
|
||||
* @param ticketId 工单编号
|
||||
* @return 评审部门
|
||||
**/
|
||||
|
|
@ -907,6 +934,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 保存工单解决方案措施
|
||||
*
|
||||
* @param request 请求信息
|
||||
**/
|
||||
@PostMapping("saveSolutionMeasures")
|
||||
|
|
@ -920,6 +948,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 驳回工单解决方案
|
||||
*
|
||||
* @param request 请求信息
|
||||
**/
|
||||
@PostMapping("rejectSolution")
|
||||
|
|
@ -948,6 +977,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 通过工单解决方案
|
||||
*
|
||||
* @param ticketId 工单编号
|
||||
**/
|
||||
@GetMapping("passSolution")
|
||||
|
|
@ -977,6 +1007,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 导出工单报表
|
||||
*
|
||||
* @param request 请求参数
|
||||
*/
|
||||
@PostMapping("exportTicketReport")
|
||||
|
|
@ -989,6 +1020,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 导出工单详情为excel
|
||||
*
|
||||
* @param ticketId 工单编号
|
||||
*/
|
||||
@GetMapping("/exportTicketExcel")
|
||||
|
|
@ -1297,6 +1329,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取工单处理人
|
||||
*
|
||||
* @param ticketId 工单编号
|
||||
*/
|
||||
@GetMapping("/getHandlers")
|
||||
|
|
@ -1307,6 +1340,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 请求通话
|
||||
*
|
||||
* @param ticketId 工单编号
|
||||
*/
|
||||
@GetMapping("call")
|
||||
|
|
@ -1370,6 +1404,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 添加通话用户
|
||||
*
|
||||
* @param request 请求参数
|
||||
*/
|
||||
@Transactional
|
||||
|
|
@ -1480,6 +1515,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取声网频道用户列表
|
||||
*
|
||||
* @param ticketId 工单ID
|
||||
* @return 用户列表
|
||||
*/
|
||||
|
|
@ -1490,6 +1526,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取处理人列表
|
||||
*
|
||||
* @return 处理人列表
|
||||
*/
|
||||
@GetMapping("getHandlerForSelect")
|
||||
|
|
@ -1499,6 +1536,7 @@ public class TicketController extends ControllerBase {
|
|||
|
||||
/**
|
||||
* 获取工单案例图片
|
||||
*
|
||||
* @param id 工单ID
|
||||
* @return 工单案例图片
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import lombok.Setter;
|
|||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
|
|
@ -167,5 +166,5 @@ public class GongfuTicket implements Serializable {
|
|||
/**
|
||||
* 产量
|
||||
*/
|
||||
private BigDecimal throughput;
|
||||
private String throughput;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue