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/JobGroupController.java | 297 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 149 insertions(+), 148 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
index 4bb4b90..4a46200 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
@@ -20,178 +20,179 @@
/**
* job group controller
+ *
* @author xuxueli 2016-10-02 20:52:56
*/
@Controller
@RequestMapping("/jobgroup")
public class JobGroupController {
- @Resource
- public XxlJobInfoDao xxlJobInfoDao;
- @Resource
- public XxlJobGroupDao xxlJobGroupDao;
- @Resource
- private XxlJobRegistryDao xxlJobRegistryDao;
+ @Resource
+ public XxlJobInfoDao xxlJobInfoDao;
+ @Resource
+ public XxlJobGroupDao xxlJobGroupDao;
+ @Resource
+ private XxlJobRegistryDao xxlJobRegistryDao;
- @RequestMapping
- public String index(Model model) {
- return "jobgroup/jobgroup.index";
- }
+ @RequestMapping
+ public String index(Model model) {
+ return "jobgroup/jobgroup.index";
+ }
- @RequestMapping("/pageList")
- @ResponseBody
- public Map<String, Object> pageList(HttpServletRequest request,
- @RequestParam(required = false, defaultValue = "0") int start,
- @RequestParam(required = false, defaultValue = "10") int length,
- String appname, String title) {
+ @RequestMapping("/pageList")
+ @ResponseBody
+ public Map<String, Object> pageList(HttpServletRequest request,
+ @RequestParam(required = false, defaultValue = "0") int start,
+ @RequestParam(required = false, defaultValue = "10") int length,
+ String appname, String title) {
- // page query
- List<XxlJobGroup> list = xxlJobGroupDao.pageList(start, length, appname, title);
- int list_count = xxlJobGroupDao.pageListCount(start, length, appname, title);
+ // page query
+ List<XxlJobGroup> list = xxlJobGroupDao.pageList(start, length, appname, title);
+ int list_count = xxlJobGroupDao.pageListCount(start, length, appname, title);
- // package result
- Map<String, Object> maps = new HashMap<String, Object>();
- maps.put("recordsTotal", list_count); // 鎬昏褰曟暟
- maps.put("recordsFiltered", list_count); // 杩囨护鍚庣殑鎬昏褰曟暟
- maps.put("data", list); // 鍒嗛〉鍒楄〃
- return maps;
- }
+ // package result
+ Map<String, Object> maps = new HashMap<String, Object>();
+ maps.put("recordsTotal" , list_count); // 鎬昏褰曟暟
+ maps.put("recordsFiltered" , list_count); // 杩囨护鍚庣殑鎬昏褰曟暟
+ maps.put("data" , list); // 鍒嗛〉鍒楄〃
+ return maps;
+ }
- @RequestMapping("/save")
- @ResponseBody
- public ReturnT<String> save(XxlJobGroup xxlJobGroup){
+ @RequestMapping("/save")
+ @ResponseBody
+ public ReturnT<String> save(XxlJobGroup xxlJobGroup) {
- // valid
- if (xxlJobGroup.getAppname()==null || xxlJobGroup.getAppname().trim().length()==0) {
- return new ReturnT<String>(500, (I18nUtil.getString("system_please_input")+"AppName") );
- }
- if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) {
- return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appname_length") );
- }
- if (xxlJobGroup.getAppname().contains(">") || xxlJobGroup.getAppname().contains("<")) {
- return new ReturnT<String>(500, "AppName"+I18nUtil.getString("system_unvalid") );
- }
- if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) {
- return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) );
- }
- if (xxlJobGroup.getTitle().contains(">") || xxlJobGroup.getTitle().contains("<")) {
- return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_title")+I18nUtil.getString("system_unvalid") );
- }
- if (xxlJobGroup.getAddressType()!=0) {
- if (xxlJobGroup.getAddressList()==null || xxlJobGroup.getAddressList().trim().length()==0) {
- return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_addressType_limit") );
- }
- if (xxlJobGroup.getAddressList().contains(">") || xxlJobGroup.getAddressList().contains("<")) {
- return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList")+I18nUtil.getString("system_unvalid") );
- }
+ // valid
+ if (xxlJobGroup.getAppname() == null || xxlJobGroup.getAppname().trim().length() == 0) {
+ return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + "AppName"));
+ }
+ if (xxlJobGroup.getAppname().length() < 4 || xxlJobGroup.getAppname().length() > 64) {
+ return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appname_length"));
+ }
+ if (xxlJobGroup.getAppname().contains(">") || xxlJobGroup.getAppname().contains("<")) {
+ return new ReturnT<String>(500, "AppName" + I18nUtil.getString("system_unvalid"));
+ }
+ if (xxlJobGroup.getTitle() == null || xxlJobGroup.getTitle().trim().length() == 0) {
+ return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")));
+ }
+ if (xxlJobGroup.getTitle().contains(">") || xxlJobGroup.getTitle().contains("<")) {
+ return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_title") + I18nUtil.getString("system_unvalid"));
+ }
+ if (xxlJobGroup.getAddressType() != 0) {
+ if (xxlJobGroup.getAddressList() == null || xxlJobGroup.getAddressList().trim().length() == 0) {
+ return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_addressType_limit"));
+ }
+ if (xxlJobGroup.getAddressList().contains(">") || xxlJobGroup.getAddressList().contains("<")) {
+ return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList") + I18nUtil.getString("system_unvalid"));
+ }
- String[] addresss = xxlJobGroup.getAddressList().split(",");
- for (String item: addresss) {
- if (item==null || item.trim().length()==0) {
- return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") );
- }
- }
- }
+ String[] addresss = xxlJobGroup.getAddressList().split(",");
+ for (String item : addresss) {
+ if (item == null || item.trim().length() == 0) {
+ return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid"));
+ }
+ }
+ }
- // process
- xxlJobGroup.setUpdateTime(new Date());
+ // process
+ xxlJobGroup.setUpdateTime(new Date());
- int ret = xxlJobGroupDao.save(xxlJobGroup);
- return (ret>0)?ReturnT.SUCCESS:ReturnT.FAIL;
- }
+ int ret = xxlJobGroupDao.save(xxlJobGroup);
+ return (ret > 0) ? ReturnT.SUCCESS : ReturnT.FAIL;
+ }
- @RequestMapping("/update")
- @ResponseBody
- public ReturnT<String> update(XxlJobGroup xxlJobGroup){
- // valid
- if (xxlJobGroup.getAppname()==null || xxlJobGroup.getAppname().trim().length()==0) {
- return new ReturnT<String>(500, (I18nUtil.getString("system_please_input")+"AppName") );
- }
- if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) {
- return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appname_length") );
- }
- if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) {
- return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) );
- }
- if (xxlJobGroup.getAddressType() == 0) {
- // 0=鑷姩娉ㄥ唽
- List<String> registryList = findRegistryByAppName(xxlJobGroup.getAppname());
- String addressListStr = null;
- if (registryList!=null && !registryList.isEmpty()) {
- Collections.sort(registryList);
- addressListStr = "";
- for (String item:registryList) {
- addressListStr += item + ",";
- }
- addressListStr = addressListStr.substring(0, addressListStr.length()-1);
- }
- xxlJobGroup.setAddressList(addressListStr);
- } else {
- // 1=鎵嬪姩褰曞叆
- if (xxlJobGroup.getAddressList()==null || xxlJobGroup.getAddressList().trim().length()==0) {
- return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_addressType_limit") );
- }
- String[] addresss = xxlJobGroup.getAddressList().split(",");
- for (String item: addresss) {
- if (item==null || item.trim().length()==0) {
- return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") );
- }
- }
- }
+ @RequestMapping("/update")
+ @ResponseBody
+ public ReturnT<String> update(XxlJobGroup xxlJobGroup) {
+ // valid
+ if (xxlJobGroup.getAppname() == null || xxlJobGroup.getAppname().trim().length() == 0) {
+ return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + "AppName"));
+ }
+ if (xxlJobGroup.getAppname().length() < 4 || xxlJobGroup.getAppname().length() > 64) {
+ return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appname_length"));
+ }
+ if (xxlJobGroup.getTitle() == null || xxlJobGroup.getTitle().trim().length() == 0) {
+ return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")));
+ }
+ if (xxlJobGroup.getAddressType() == 0) {
+ // 0=鑷姩娉ㄥ唽
+ List<String> registryList = findRegistryByAppName(xxlJobGroup.getAppname());
+ String addressListStr = null;
+ if (registryList != null && !registryList.isEmpty()) {
+ Collections.sort(registryList);
+ addressListStr = "";
+ for (String item : registryList) {
+ addressListStr += item + ",";
+ }
+ addressListStr = addressListStr.substring(0, addressListStr.length() - 1);
+ }
+ xxlJobGroup.setAddressList(addressListStr);
+ } else {
+ // 1=鎵嬪姩褰曞叆
+ if (xxlJobGroup.getAddressList() == null || xxlJobGroup.getAddressList().trim().length() == 0) {
+ return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_addressType_limit"));
+ }
+ String[] addresss = xxlJobGroup.getAddressList().split(",");
+ for (String item : addresss) {
+ if (item == null || item.trim().length() == 0) {
+ return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid"));
+ }
+ }
+ }
- // process
- xxlJobGroup.setUpdateTime(new Date());
+ // process
+ xxlJobGroup.setUpdateTime(new Date());
- int ret = xxlJobGroupDao.update(xxlJobGroup);
- return (ret>0)?ReturnT.SUCCESS:ReturnT.FAIL;
- }
+ int ret = xxlJobGroupDao.update(xxlJobGroup);
+ return (ret > 0) ? ReturnT.SUCCESS : ReturnT.FAIL;
+ }
- private List<String> findRegistryByAppName(String appnameParam){
- HashMap<String, List<String>> appAddressMap = new HashMap<String, List<String>>();
- List<XxlJobRegistry> list = xxlJobRegistryDao.findAll(RegistryConfig.DEAD_TIMEOUT, new Date());
- if (list != null) {
- for (XxlJobRegistry item: list) {
- if (RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) {
- String appname = item.getRegistryKey();
- List<String> registryList = appAddressMap.get(appname);
- if (registryList == null) {
- registryList = new ArrayList<String>();
- }
+ private List<String> findRegistryByAppName(String appnameParam) {
+ HashMap<String, List<String>> appAddressMap = new HashMap<String, List<String>>();
+ List<XxlJobRegistry> list = xxlJobRegistryDao.findAll(RegistryConfig.DEAD_TIMEOUT, new Date());
+ if (list != null) {
+ for (XxlJobRegistry item : list) {
+ if (RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) {
+ String appname = item.getRegistryKey();
+ List<String> registryList = appAddressMap.get(appname);
+ if (registryList == null) {
+ registryList = new ArrayList<String>();
+ }
- if (!registryList.contains(item.getRegistryValue())) {
- registryList.add(item.getRegistryValue());
- }
- appAddressMap.put(appname, registryList);
- }
- }
- }
- return appAddressMap.get(appnameParam);
- }
+ if (!registryList.contains(item.getRegistryValue())) {
+ registryList.add(item.getRegistryValue());
+ }
+ appAddressMap.put(appname, registryList);
+ }
+ }
+ }
+ return appAddressMap.get(appnameParam);
+ }
- @RequestMapping("/remove")
- @ResponseBody
- public ReturnT<String> remove(int id){
+ @RequestMapping("/remove")
+ @ResponseBody
+ public ReturnT<String> remove(int id) {
- // valid
- int count = xxlJobInfoDao.pageListCount(0, 10, id, -1, null, null, null);
- if (count > 0) {
- return new ReturnT<String>(500, I18nUtil.getString("jobgroup_del_limit_0") );
- }
+ // valid
+ int count = xxlJobInfoDao.pageListCount(0, 10, id, -1, null, null, null);
+ if (count > 0) {
+ return new ReturnT<String>(500, I18nUtil.getString("jobgroup_del_limit_0"));
+ }
- List<XxlJobGroup> allList = xxlJobGroupDao.findAll();
- if (allList.size() == 1) {
- return new ReturnT<String>(500, I18nUtil.getString("jobgroup_del_limit_1") );
- }
+ List<XxlJobGroup> allList = xxlJobGroupDao.findAll();
+ if (allList.size() == 1) {
+ return new ReturnT<String>(500, I18nUtil.getString("jobgroup_del_limit_1"));
+ }
- int ret = xxlJobGroupDao.remove(id);
- return (ret>0)?ReturnT.SUCCESS:ReturnT.FAIL;
- }
+ int ret = xxlJobGroupDao.remove(id);
+ return (ret > 0) ? ReturnT.SUCCESS : ReturnT.FAIL;
+ }
- @RequestMapping("/loadById")
- @ResponseBody
- public ReturnT<XxlJobGroup> loadById(int id){
- XxlJobGroup jobGroup = xxlJobGroupDao.load(id);
- return jobGroup!=null?new ReturnT<XxlJobGroup>(jobGroup):new ReturnT<XxlJobGroup>(ReturnT.FAIL_CODE, null);
- }
+ @RequestMapping("/loadById")
+ @ResponseBody
+ public ReturnT<XxlJobGroup> loadById(int id) {
+ XxlJobGroup jobGroup = xxlJobGroupDao.load(id);
+ return jobGroup != null ? new ReturnT<XxlJobGroup>(jobGroup) : new ReturnT<XxlJobGroup>(ReturnT.FAIL_CODE, null);
+ }
}
--
Gitblit v1.9.3