From aed297a5fbc8df9dab01b28da21f872ee546b43c Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 13 十月 2025 16:15:11 +0800
Subject: [PATCH] 2025.10.13 1. 统一调整controller层的返回类型，通过添加全局响应增强器GlobalResponseAdvice来管理返回结果； 2. 新增mybatis-generator自定义插件，实现给数据库实体entity自动添加swagger注解@ApiModel和@ApiModelProperty
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/MenuController.kt | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/MenuController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/MenuController.kt
index f0400fa..1d54801 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/MenuController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/MenuController.kt
@@ -3,6 +3,7 @@
import cn.flightfeather.supervision.domain.ds1.entity.*
import cn.flightfeather.supervision.common.utils.DateUtil
import cn.flightfeather.supervision.common.utils.UUIDGenerator
+import cn.flightfeather.supervision.config.IgnoreResponseAdvice
import cn.flightfeather.supervision.lightshare.service.*
import cn.flightfeather.supervision.lightshare.vo.*
import org.springframework.beans.BeanUtils
@@ -21,6 +22,7 @@
@ApiIgnore
@Controller
+@IgnoreResponseAdvice
@RequestMapping("menu")
class MenuController {
@Autowired
@@ -247,10 +249,10 @@
val planstarttime = subtaskVo.planstarttime
val planendtime = subtaskVo.planendtime
if (planstarttime != null) {
- subtaskVo.planstarttimestr = DateUtil().DateToString(planstarttime, "yyyy-MM-dd")
+ subtaskVo.planstarttimestr = DateUtil.DateToString(planstarttime, "yyyy-MM-dd")
}
if (planendtime != null) {
- subtaskVo.planendtimestr = DateUtil().DateToString(planendtime, "yyyy-MM-dd")
+ subtaskVo.planendtimestr = DateUtil.DateToString(planendtime, "yyyy-MM-dd")
}
}
val taskdayVolist = taskService.getDayTaskByTaskID(taskId)
@@ -272,7 +274,7 @@
BeanUtils.copyProperties(subtaskVo, subtask)
//濡傛灉guid涓嶄负绌�,閭ｅ氨鏇存柊
if (!StringUtils.isEmpty(subtask.stguid)) {
- subtaskService.update(subtask)
+ subtaskService.changeStatus(subtask)
} else {
//鑾峰彇鏃ヤ换鍔�
val daytask = taskService.findByID(subtaskVo.tsguid!!)
@@ -308,10 +310,10 @@
val starttime = taskVo.starttime
val endtime = taskVo.endtime
if (starttime != null) {
- taskVo.starttimestr = DateUtil().DateToString(starttime, "yyyy-MM-dd")
+ taskVo.starttimestr = DateUtil.DateToString(starttime, "yyyy-MM-dd")
}
if (endtime != null) {
- taskVo.endtimestr = DateUtil().DateToString(endtime, "yyyy-MM-dd")
+ taskVo.endtimestr = DateUtil.DateToString(endtime, "yyyy-MM-dd")
}
}
@@ -349,10 +351,10 @@
val starttime = taskVo.starttime
val endtime = taskVo.endtime
if (starttime != null) {
- taskVo.starttimestr = DateUtil().DateToString(starttime, "yyyy-MM-dd")
+ taskVo.starttimestr = DateUtil.DateToString(starttime, "yyyy-MM-dd")
}
if (endtime != null) {
- taskVo.endtimestr = DateUtil().DateToString(endtime, "yyyy-MM-dd")
+ taskVo.endtimestr = DateUtil.DateToString(endtime, "yyyy-MM-dd")
}
}
val taskVolist = taskService.findTopTask()
@@ -398,8 +400,8 @@
//鏂拌祴鍊糶uid
toptask.tguid = UUIDGenerator.generate16ShortUUID()
//鏃ユ湡鍙樺寲
- toptask.starttime = DateUtil().StringToDate(starttimestr)
- toptask.endtime = DateUtil().StringToDate(starttimestr)
+ toptask.starttime = DateUtil.StringToDate(starttimestr)
+ toptask.endtime = DateUtil.StringToDate(starttimestr)
//鏂板缓浠诲姟鍙戝竷涓簄ull
toptask.deploytime = null
}
@@ -437,8 +439,8 @@
// }
task.tguid = UUIDGenerator.generate16ShortUUID()
task.name = taskname
- task.starttime = DateUtil().StringToDate(taskVo.starttimestr!!)
- task.endtime = DateUtil().StringToDate(taskVo.endtimestr!!)
+ task.starttime = DateUtil.StringToDate(taskVo.starttimestr!!)
+ task.endtime = DateUtil.StringToDate(taskVo.endtimestr!!)
task.settime = Date()
taskService.save(task)
}
--
Gitblit v1.9.3