From a0bed51d966ab5d161d3fdd5423ba84f59fb60ff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 09:58:16 +0800
Subject: [PATCH] update 格式化代码 统一间隔符
---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java | 119 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java
index fe4a0e8..0c8384f 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java
@@ -19,78 +19,79 @@
/**
* job code controller
+ *
* @author xuxueli 2015-12-19 16:13:16
*/
@Controller
@RequestMapping("/jobcode")
public class JobCodeController {
-
- @Resource
- private XxlJobInfoDao xxlJobInfoDao;
- @Resource
- private XxlJobLogGlueDao xxlJobLogGlueDao;
- @RequestMapping
- public String index(HttpServletRequest request, Model model, int jobId) {
- XxlJobInfo jobInfo = xxlJobInfoDao.loadById(jobId);
- List<XxlJobLogGlue> jobLogGlues = xxlJobLogGlueDao.findByJobId(jobId);
+ @Resource
+ private XxlJobInfoDao xxlJobInfoDao;
+ @Resource
+ private XxlJobLogGlueDao xxlJobLogGlueDao;
- if (jobInfo == null) {
- throw new RuntimeException(I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
- }
- if (GlueTypeEnum.BEAN == GlueTypeEnum.match(jobInfo.getGlueType())) {
- throw new RuntimeException(I18nUtil.getString("jobinfo_glue_gluetype_unvalid"));
- }
+ @RequestMapping
+ public String index(HttpServletRequest request, Model model, int jobId) {
+ XxlJobInfo jobInfo = xxlJobInfoDao.loadById(jobId);
+ List<XxlJobLogGlue> jobLogGlues = xxlJobLogGlueDao.findByJobId(jobId);
- // valid permission
- JobInfoController.validPermission(request, jobInfo.getJobGroup());
+ if (jobInfo == null) {
+ throw new RuntimeException(I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
+ }
+ if (GlueTypeEnum.BEAN == GlueTypeEnum.match(jobInfo.getGlueType())) {
+ throw new RuntimeException(I18nUtil.getString("jobinfo_glue_gluetype_unvalid"));
+ }
- // Glue绫诲瀷-瀛楀吀
- model.addAttribute("GlueTypeEnum", GlueTypeEnum.values());
+ // valid permission
+ JobInfoController.validPermission(request, jobInfo.getJobGroup());
- model.addAttribute("jobInfo", jobInfo);
- model.addAttribute("jobLogGlues", jobLogGlues);
- return "jobcode/jobcode.index";
- }
-
- @RequestMapping("/save")
- @ResponseBody
- public ReturnT<String> save(Model model, int id, String glueSource, String glueRemark) {
- // valid
- if (glueRemark==null) {
- return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")) );
- }
- if (glueRemark.length()<4 || glueRemark.length()>100) {
- return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_remark_limit"));
- }
- XxlJobInfo exists_jobInfo = xxlJobInfoDao.loadById(id);
- if (exists_jobInfo == null) {
- return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
- }
-
- // update new code
- exists_jobInfo.setGlueSource(glueSource);
- exists_jobInfo.setGlueRemark(glueRemark);
- exists_jobInfo.setGlueUpdatetime(new Date());
+ // Glue绫诲瀷-瀛楀吀
+ model.addAttribute("GlueTypeEnum" , GlueTypeEnum.values());
- exists_jobInfo.setUpdateTime(new Date());
- xxlJobInfoDao.update(exists_jobInfo);
+ model.addAttribute("jobInfo" , jobInfo);
+ model.addAttribute("jobLogGlues" , jobLogGlues);
+ return "jobcode/jobcode.index";
+ }
- // log old code
- XxlJobLogGlue xxlJobLogGlue = new XxlJobLogGlue();
- xxlJobLogGlue.setJobId(exists_jobInfo.getId());
- xxlJobLogGlue.setGlueType(exists_jobInfo.getGlueType());
- xxlJobLogGlue.setGlueSource(glueSource);
- xxlJobLogGlue.setGlueRemark(glueRemark);
+ @RequestMapping("/save")
+ @ResponseBody
+ public ReturnT<String> save(Model model, int id, String glueSource, String glueRemark) {
+ // valid
+ if (glueRemark == null) {
+ return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")));
+ }
+ if (glueRemark.length() < 4 || glueRemark.length() > 100) {
+ return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_remark_limit"));
+ }
+ XxlJobInfo exists_jobInfo = xxlJobInfoDao.loadById(id);
+ if (exists_jobInfo == null) {
+ return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
+ }
- xxlJobLogGlue.setAddTime(new Date());
- xxlJobLogGlue.setUpdateTime(new Date());
- xxlJobLogGlueDao.save(xxlJobLogGlue);
+ // update new code
+ exists_jobInfo.setGlueSource(glueSource);
+ exists_jobInfo.setGlueRemark(glueRemark);
+ exists_jobInfo.setGlueUpdatetime(new Date());
- // remove code backup more than 30
- xxlJobLogGlueDao.removeOld(exists_jobInfo.getId(), 30);
+ exists_jobInfo.setUpdateTime(new Date());
+ xxlJobInfoDao.update(exists_jobInfo);
- return ReturnT.SUCCESS;
- }
-
+ // log old code
+ XxlJobLogGlue xxlJobLogGlue = new XxlJobLogGlue();
+ xxlJobLogGlue.setJobId(exists_jobInfo.getId());
+ xxlJobLogGlue.setGlueType(exists_jobInfo.getGlueType());
+ xxlJobLogGlue.setGlueSource(glueSource);
+ xxlJobLogGlue.setGlueRemark(glueRemark);
+
+ xxlJobLogGlue.setAddTime(new Date());
+ xxlJobLogGlue.setUpdateTime(new Date());
+ xxlJobLogGlueDao.save(xxlJobLogGlue);
+
+ // remove code backup more than 30
+ xxlJobLogGlueDao.removeOld(exists_jobInfo.getId(), 30);
+
+ return ReturnT.SUCCESS;
+ }
+
}
--
Gitblit v1.9.3