From 4f818cbde19c2c72c3aa81dfb3e2ebec6e29ba44 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 13:45:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20JobGroupControl?= =?UTF-8?q?ler.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/JobGroupController.java | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobGroupController.java index f1d1168a..0d6c0269 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobGroupController.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobGroupController.java @@ -33,6 +33,8 @@ public class JobGroupController { @Resource private XxlJobRegistryDao xxlJobRegistryDao; + private String systemPleaseInput= "system_please_input"; + @RequestMapping public String index(Model model) { return "jobgroup/jobgroup.index"; @@ -47,12 +49,12 @@ public class JobGroupController { // page query List list = xxlJobGroupDao.pageList(start, length, appname, title); - int list_count = xxlJobGroupDao.pageListCount(start, length, appname, title); + int listCount = xxlJobGroupDao.pageListCount(start, length, appname, title); // package result - Map maps = new HashMap(); - maps.put("recordsTotal", list_count); // 总记录数 - maps.put("recordsFiltered", list_count); // 过滤后的总记录数 + Map maps = new HashMap<>(); + maps.put("recordsTotal", listCount); // 总记录数 + maps.put("recordsFiltered", listCount); // 过滤后的总记录数 maps.put("data", list); // 分页列表 return maps; } @@ -63,22 +65,22 @@ public class JobGroupController { // valid if (xxlJobGroup.getAppname()==null || xxlJobGroup.getAppname().trim().length()==0) { - return new ReturnT(500, (I18nUtil.getString("system_please_input")+"AppName") ); + return new ReturnT<>(500, (I18nUtil.getString(systemPleaseInput)+"AppName") ); } if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) { - return new ReturnT(500, I18nUtil.getString("jobgroup_field_appname_length") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_field_appname_length") ); } if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) { - return new ReturnT(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) ); + return new ReturnT<>(500, (I18nUtil.getString(systemPleaseInput) + I18nUtil.getString("jobgroup_field_title")) ); } if (xxlJobGroup.getAddressType()!=0) { if (xxlJobGroup.getAddressList()==null || xxlJobGroup.getAddressList().trim().length()==0) { - return new ReturnT(500, I18nUtil.getString("jobgroup_field_addressType_limit") ); + return new ReturnT<>(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(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") ); } } } @@ -92,36 +94,36 @@ public class JobGroupController { public ReturnT update(XxlJobGroup xxlJobGroup){ // valid if (xxlJobGroup.getAppname()==null || xxlJobGroup.getAppname().trim().length()==0) { - return new ReturnT(500, (I18nUtil.getString("system_please_input")+"AppName") ); + return new ReturnT<>(500, (I18nUtil.getString(systemPleaseInput)+"AppName") ); } if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) { - return new ReturnT(500, I18nUtil.getString("jobgroup_field_appname_length") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_field_appname_length") ); } if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) { - return new ReturnT(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) ); + return new ReturnT<>(500, (I18nUtil.getString(systemPleaseInput) + I18nUtil.getString("jobgroup_field_title")) ); } if (xxlJobGroup.getAddressType() == 0) { // 0=自动注册 List registryList = findRegistryByAppName(xxlJobGroup.getAppname()); - String addressListStr = null; + StringBuilder addressListStr = new StringBuilder(); if (registryList!=null && !registryList.isEmpty()) { Collections.sort(registryList); - addressListStr = ""; + addressListStr = new StringBuilder(); for (String item:registryList) { - addressListStr += item + ","; + addressListStr.append(item).append(","); } - addressListStr = addressListStr.substring(0, addressListStr.length()-1); + addressListStr = new StringBuilder(addressListStr.substring(0, addressListStr.length() - 1)); } - xxlJobGroup.setAddressList(addressListStr); + xxlJobGroup.setAddressList(addressListStr.toString()); } else { // 1=手动录入 if (xxlJobGroup.getAddressList()==null || xxlJobGroup.getAddressList().trim().length()==0) { - return new ReturnT(500, I18nUtil.getString("jobgroup_field_addressType_limit") ); + return new ReturnT<>(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(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") ); } } } @@ -131,7 +133,7 @@ public class JobGroupController { } private List findRegistryByAppName(String appnameParam){ - HashMap> appAddressMap = new HashMap>(); + HashMap> appAddressMap = new HashMap<>(); List list = xxlJobRegistryDao.findAll(RegistryConfig.DEAD_TIMEOUT, new Date()); if (list != null) { for (XxlJobRegistry item: list) { @@ -139,7 +141,7 @@ public class JobGroupController { String appname = item.getRegistryKey(); List registryList = appAddressMap.get(appname); if (registryList == null) { - registryList = new ArrayList(); + registryList = new ArrayList<>(); } if (!registryList.contains(item.getRegistryValue())) { @@ -159,12 +161,12 @@ public class JobGroupController { // valid int count = xxlJobInfoDao.pageListCount(0, 10, id, -1, null, null, null); if (count > 0) { - return new ReturnT(500, I18nUtil.getString("jobgroup_del_limit_0") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_del_limit_0") ); } List allList = xxlJobGroupDao.findAll(); if (allList.size() == 1) { - return new ReturnT(500, I18nUtil.getString("jobgroup_del_limit_1") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_del_limit_1") ); } int ret = xxlJobGroupDao.remove(id); @@ -175,7 +177,7 @@ public class JobGroupController { @ResponseBody public ReturnT loadById(int id){ XxlJobGroup jobGroup = xxlJobGroupDao.load(id); - return jobGroup!=null?new ReturnT(jobGroup):new ReturnT(ReturnT.FAIL_CODE, null); + return jobGroup!=null?new ReturnT<>(jobGroup):new ReturnT<>(ReturnT.FAIL_CODE, null); } }