ソースを参照

优化创建时间时区

gy b 2 年 前
コミット
a4c1cad581

+ 4
- 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java ファイルの表示

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.wisdomarbitrate;
3 3
 import com.ruoyi.common.core.controller.BaseController;
4 4
 import com.ruoyi.common.core.domain.AjaxResult;
5 5
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
6
+import com.ruoyi.wisdomarbitrate.domain.vo.BookSendVO;
6 7
 import com.ruoyi.wisdomarbitrate.service.IAdjudicationService;
7 8
 import org.springframework.beans.factory.annotation.Autowired;
8 9
 import org.springframework.validation.annotation.Validated;
@@ -71,16 +72,11 @@ public class AdjudicationController extends BaseController {
71 72
 
72 73
     /**
73 74
      * 送达(不包含发送电子邮件)
74
-     * @param id
75
-     * @param appEmail
76
-     * @param resEmail
77
-     * @param apptrackingNum
78
-     * @param restrackingNum
75
+     * @param bookSendVO
79 76
      * @return
80 77
      */
81 78
     @PostMapping("/service")
82
-    public AjaxResult service(Long id,String appEmail,String resEmail
83
-            ,String apptrackingNum,String restrackingNum){
84
-        return adjudicationService.service(id,appEmail,resEmail,apptrackingNum,restrackingNum);
79
+    public AjaxResult service(@RequestBody BookSendVO bookSendVO){
80
+        return adjudicationService.service(bookSendVO.getId(),bookSendVO.getAppEmail(),bookSendVO.getResEmail(),bookSendVO.getApptrackingNum(),bookSendVO.getRestrackingNum());
85 81
     }
86 82
 }

+ 44
- 45
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java ファイルの表示

@@ -1,118 +1,117 @@
1 1
 package com.ruoyi.common.core.domain;
2 2
 
3
+import com.fasterxml.jackson.annotation.JsonFormat;
4
+import com.fasterxml.jackson.annotation.JsonIgnore;
5
+import com.fasterxml.jackson.annotation.JsonInclude;
6
+
3 7
 import java.io.Serializable;
4 8
 import java.util.Date;
5 9
 import java.util.HashMap;
6 10
 import java.util.Map;
7
-import com.fasterxml.jackson.annotation.JsonFormat;
8
-import com.fasterxml.jackson.annotation.JsonIgnore;
9
-import com.fasterxml.jackson.annotation.JsonInclude;
10 11
 
11 12
 /**
12 13
  * Entity基类
13
- * 
14
+ *
14 15
  * @author ruoyi
15 16
  */
16
-public class BaseEntity implements Serializable
17
-{
17
+public class BaseEntity implements Serializable {
18 18
     private static final long serialVersionUID = 1L;
19 19
 
20
-    /** 搜索值 */
20
+    /**
21
+     * 搜索值
22
+     */
21 23
     @JsonIgnore
22 24
     private String searchValue;
23 25
 
24
-    /** 创建者 */
26
+    /**
27
+     * 创建者
28
+     */
25 29
     private String createBy;
26 30
 
27
-    /** 创建时间 */
28
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
31
+    /**
32
+     * 创建时间
33
+     */
34
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
29 35
     private Date createTime;
30 36
 
31
-    /** 更新者 */
37
+    /**
38
+     * 更新者
39
+     */
32 40
     private String updateBy;
33 41
 
34
-    /** 更新时间 */
35
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
42
+    /**
43
+     * 更新时间
44
+     */
45
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
36 46
     private Date updateTime;
37 47
 
38
-    /** 备注 */
48
+    /**
49
+     * 备注
50
+     */
39 51
     private String remark;
40 52
 
41
-    /** 请求参数 */
53
+    /**
54
+     * 请求参数
55
+     */
42 56
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
43 57
     private Map<String, Object> params;
44 58
 
45
-    public String getSearchValue()
46
-    {
59
+    public String getSearchValue() {
47 60
         return searchValue;
48 61
     }
49 62
 
50
-    public void setSearchValue(String searchValue)
51
-    {
63
+    public void setSearchValue(String searchValue) {
52 64
         this.searchValue = searchValue;
53 65
     }
54 66
 
55
-    public String getCreateBy()
56
-    {
67
+    public String getCreateBy() {
57 68
         return createBy;
58 69
     }
59 70
 
60
-    public void setCreateBy(String createBy)
61
-    {
71
+    public void setCreateBy(String createBy) {
62 72
         this.createBy = createBy;
63 73
     }
64 74
 
65
-    public Date getCreateTime()
66
-    {
75
+    public Date getCreateTime() {
67 76
         return createTime;
68 77
     }
69 78
 
70
-    public void setCreateTime(Date createTime)
71
-    {
79
+    public void setCreateTime(Date createTime) {
72 80
         this.createTime = createTime;
73 81
     }
74 82
 
75
-    public String getUpdateBy()
76
-    {
83
+    public String getUpdateBy() {
77 84
         return updateBy;
78 85
     }
79 86
 
80
-    public void setUpdateBy(String updateBy)
81
-    {
87
+    public void setUpdateBy(String updateBy) {
82 88
         this.updateBy = updateBy;
83 89
     }
84 90
 
85
-    public Date getUpdateTime()
86
-    {
91
+    public Date getUpdateTime() {
87 92
         return updateTime;
88 93
     }
89 94
 
90
-    public void setUpdateTime(Date updateTime)
91
-    {
95
+    public void setUpdateTime(Date updateTime) {
92 96
         this.updateTime = updateTime;
93 97
     }
94 98
 
95
-    public String getRemark()
96
-    {
99
+    public String getRemark() {
97 100
         return remark;
98 101
     }
99 102
 
100
-    public void setRemark(String remark)
101
-    {
103
+    public void setRemark(String remark) {
102 104
         this.remark = remark;
103 105
     }
104 106
 
105
-    public Map<String, Object> getParams()
106
-    {
107
-        if (params == null)
108
-        {
107
+    public Map<String, Object> getParams() {
108
+        if (params == null) {
109 109
             params = new HashMap<>();
110 110
         }
111 111
         return params;
112 112
     }
113 113
 
114
-    public void setParams(Map<String, Object> params)
115
-    {
114
+    public void setParams(Map<String, Object> params) {
116 115
         this.params = params;
117 116
     }
118 117
 }

+ 26
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/BookSendVO.java ファイルの表示

@@ -0,0 +1,26 @@
1
+package com.ruoyi.wisdomarbitrate.domain.vo;
2
+
3
+import lombok.AllArgsConstructor;
4
+import lombok.Builder;
5
+import lombok.Data;
6
+import lombok.NoArgsConstructor;
7
+
8
+@Data
9
+@Builder
10
+@NoArgsConstructor
11
+@AllArgsConstructor
12
+public class BookSendVO {
13
+    /**
14
+     * 案件id
15
+     * 申请人邮箱
16
+     * 被申请人邮箱
17
+     * 申请人快递编号
18
+     * 被申请人快递编号
19
+     */
20
+    private Long id;
21
+    private String appEmail;
22
+    private String resEmail;
23
+    private String apptrackingNum;
24
+    private String restrackingNum;
25
+
26
+}