From 3a7ef03cb683da9ea61525caf7001e515040b393 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 六月 2024 16:39:35 +0800
Subject: [PATCH] 班级字段调整，相应类调整
---
src/main/resources/mapper/ClassesMapper.xml | 9 ++++
src/main/java/com/ycl/jxkg/domain/form/ClassesForm.java | 25 ++++--------
src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java | 2
src/main/java/com/ycl/jxkg/domain/entity/Classes.java | 12 ++++++
src/main/java/com/ycl/jxkg/base/Result.java | 35 ++++++++++-------
src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java | 9 ++++
6 files changed, 60 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/base/Result.java b/src/main/java/com/ycl/jxkg/base/Result.java
index acdfb06..32ede1a 100644
--- a/src/main/java/com/ycl/jxkg/base/Result.java
+++ b/src/main/java/com/ycl/jxkg/base/Result.java
@@ -9,9 +9,6 @@
* @date 2021/5/25 10:45
*/
public class Result<T> extends HashMap<String, Object> {
- private int code;
- private String message;
- private T data;
public Result() {
}
@@ -23,8 +20,8 @@
* @param message the message
*/
public Result(int code, String message) {
- this.code = code;
- this.message = message;
+ this.put("code", code);
+ this.put("message", message);
}
/**
@@ -50,7 +47,10 @@
* @return the rest response
*/
public static Result fail(Integer code, String msg) {
- return new Result<>(code, msg);
+ Result restResponse = new Result();
+ restResponse.put("code", code);
+ restResponse.put("message", msg);
+ return restResponse;
}
/**
@@ -60,7 +60,10 @@
*/
public static Result ok() {
SystemCode systemCode = SystemCode.OK;
- return new Result<>(systemCode.getCode(), systemCode.getMessage());
+ Result restResponse = new Result();
+ restResponse.put("code", systemCode.getCode());
+ restResponse.put("message", systemCode.getMessage());
+ return restResponse;
}
/**
@@ -72,7 +75,11 @@
*/
public static <F> Result<F> ok(F response) {
SystemCode systemCode = SystemCode.OK;
- return Result.response(systemCode.getCode(), systemCode.getMessage(), response);
+ Result restResponse = new Result();
+ restResponse.put("code", systemCode.getCode());
+ restResponse.put("message", systemCode.getMessage());
+ restResponse.put("data", response);
+ return restResponse;
}
/**
@@ -81,7 +88,7 @@
* @return the code
*/
public int getCode() {
- return code;
+ return (int) this.get("code");
}
/**
@@ -90,7 +97,7 @@
* @param code the code
*/
public void setCode(int code) {
- this.code = code;
+ this.put("code", code);
}
/**
@@ -99,7 +106,7 @@
* @return the message
*/
public String getMessage() {
- return message;
+ return (String) this.get("message");
}
/**
@@ -108,7 +115,7 @@
* @param message the message
*/
public void setMessage(String message) {
- this.message = message;
+ this.put("message", message);
}
/**
@@ -117,7 +124,7 @@
* @return the response
*/
public T getResponse() {
- return data;
+ return (T) this.get("data");
}
/**
@@ -126,7 +133,7 @@
* @param response the response
*/
public void setResponse(T response) {
- this.data = response;
+ this.put("data", response);
}
@Override
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java b/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
index e039f5c..bf98774 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
@@ -25,7 +25,7 @@
@RequiredArgsConstructor
@Api(value = "鐝骇", tags = "鐝骇绠＄悊")
@RestController
-@RequestMapping("/classes")
+@RequestMapping("/api/classes")
public class ClassesController {
private final ClassesService classesService;
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Classes.java b/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
index 45c39a2..bdb9f0c 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
@@ -38,5 +38,17 @@
/** 楠岃瘉鐘舵�� */
private String verifyStatus;
+ @TableField("start_time")
+ /** 寮�濮嬫椂闂� */
+ private String startTime;
+
+ @TableField("end_time")
+ /** 缁撴潫鏃堕棿 */
+ private String endTime;
+
+ @TableField("remark")
+ /** 澶囨敞 */
+ private String remark;
+
}
diff --git a/src/main/java/com/ycl/jxkg/domain/form/ClassesForm.java b/src/main/java/com/ycl/jxkg/domain/form/ClassesForm.java
index 497b556..27fbde5 100644
--- a/src/main/java/com/ycl/jxkg/domain/form/ClassesForm.java
+++ b/src/main/java/com/ycl/jxkg/domain/form/ClassesForm.java
@@ -28,25 +28,16 @@
@ApiModelProperty("鐝骇鍚嶇О")
private String className;
- @NotNull(message = "鍒涘缓浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒涘缓浜�")
- private Integer createUser;
+ @NotNull(message = "璇烽�夋嫨鐝骇寮�濮嬫椂闂�", groups = {Add.class, Update.class})
+ @ApiModelProperty("寮�濮嬫椂闂�")
+ private Date startTime;
- @NotNull(message = "鍒涘缓鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date createTime;
+ @NotNull(message = "璇烽�夋嫨鐝骇缁撴潫鏃堕棿", groups = {Add.class, Update.class})
+ @ApiModelProperty("缁撴潫鏃堕棿")
+ private Date endTime;
- @NotNull(message = "鐝骇浜烘暟涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鐝骇浜烘暟")
- private Integer classesNumber;
-
- @NotBlank(message = "鐝骇鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("鐝骇鐘舵��")
- private String status;
-
- @NotBlank(message = "楠岃瘉鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("楠岃瘉鐘舵��")
- private String verifyStatus;
+ @ApiModelProperty("澶囨敞")
+ private String remark;
public static Classes getEntityByForm(@NonNull ClassesForm form, Classes entity) {
if(entity == null) {
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java b/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java
index 8d51133..f855e9c 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java
@@ -39,6 +39,15 @@
/** 楠岃瘉鐘舵�� */
private String verifyStatus;
+ /** 寮�濮嬫椂闂� */
+ private Date startTime;
+
+ /** 缁撴潫鏃堕棿 */
+ private Date endTime;
+
+ /** 澶囨敞 */
+ private String remark;
+
public static ClassesVO getVoByEntity(@NonNull Classes entity, ClassesVO vo) {
if(vo == null) {
vo = new ClassesVO();
diff --git a/src/main/resources/mapper/ClassesMapper.xml b/src/main/resources/mapper/ClassesMapper.xml
index 9ab8cd1..8c8ea9c 100644
--- a/src/main/resources/mapper/ClassesMapper.xml
+++ b/src/main/resources/mapper/ClassesMapper.xml
@@ -10,6 +10,9 @@
<result column="classes_number" property="classesNumber" />
<result column="status" property="status" />
<result column="verify_status" property="verifyStatus" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="remark" property="remark" />
</resultMap>
@@ -26,6 +29,9 @@
TC.classes_number,
TC.status,
TC.verify_status,
+ TC.start_time,
+ TC.end_time,
+ TC.remark,
TC.id
FROM
t_classes TC
@@ -42,6 +48,9 @@
TC.classes_number,
TC.status,
TC.verify_status,
+ TC.start_time,
+ TC.end_time,
+ TC.remark,
TC.id
FROM
t_classes TC
--
Gitblit v1.8.0