feiyu02
2025-10-30 9cb8d7e0f4ffca386b14a15f8a0aca4d1db23252
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 @@
                    //新赋值guid
                    toptask.tguid = UUIDGenerator.generate16ShortUUID()
                    //日期变化
                    toptask.starttime = DateUtil().StringToDate(starttimestr)
                    toptask.endtime = DateUtil().StringToDate(starttimestr)
                    toptask.starttime = DateUtil.StringToDate(starttimestr)
                    toptask.endtime = DateUtil.StringToDate(starttimestr)
                    //新建任务发布为null
                    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)
            }