no commit message

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/service/SysConfigService.java

@@ -32,10 +32,13 @@ public class SysConfigService extends AbstractBaseService<SysConfigDao, SysConfi
 	@Autowired
 	private RedisUtils redisUtils;
 
+	@Override
 	public SysConfig get(String id) {
 		//获取缓存数据
 		SysConfig sysConfig=(SysConfig)redisUtils.get(RedisUtils.getIdKey(SysConfigService.class.getName(),id));
-		if( sysConfig!=null) return  sysConfig;
+		if( sysConfig!=null) {
+            return sysConfig;
+        }
 		//获取数据库数据
 		sysConfig=super.get(id);
 		//设置缓存数据
@@ -46,7 +49,9 @@ public class SysConfigService extends AbstractBaseService<SysConfigDao, SysConfi
 	public SysConfig findListFirst(SysConfig sysConfig) {;
 		//获取数据库数据
 		List<SysConfig> sysConfigList=super.findList(sysConfig);
-		if(sysConfigList.size()>0) sysConfig=sysConfigList.get(0);
+		if(sysConfigList.size()>0) {
+            sysConfig = sysConfigList.get(0);
+        }
 		return sysConfig;
 	}
 
@@ -54,21 +59,29 @@ public class SysConfigService extends AbstractBaseService<SysConfigDao, SysConfi
 		//获取缓存数据
 		String findListFirstKey = RedisUtils.getFindListFirstKey(SysConfigService.class.getName(),JSON.toJSONString(sysConfig));
 		SysConfig sysConfigRedis=(SysConfig)redisUtils.get(findListFirstKey);
-		if(sysConfigRedis!=null) return sysConfigRedis;
+		if(sysConfigRedis!=null) {
+            return sysConfigRedis;
+        }
 		//获取数据库数据
 		List<SysConfig> tfTicketList=super.findList(sysConfig);
-		if(tfTicketList.size()>0) sysConfig=tfTicketList.get(0);
-		else sysConfig=new SysConfig();
+		if(tfTicketList.size()>0) {
+            sysConfig = tfTicketList.get(0);
+        } else {
+            sysConfig = new SysConfig();
+        }
 		//设置缓存数据
 		redisUtils.set(findListFirstKey,sysConfig);
 		return sysConfig;
 	}
 
+	@Override
 	public List<SysConfig> findList(SysConfig sysConfig) {
 		//获取缓存数据
 		String findListKey = RedisUtils.getFindListKey(SysConfigService.class.getName(),JSON.toJSONString(sysConfig));
 		List<SysConfig> sysConfigList=(List<SysConfig>)redisUtils.get(findListKey);
-		if(sysConfigList!=null) return sysConfigList;
+		if(sysConfigList!=null) {
+            return sysConfigList;
+        }
 		//获取数据库数据
 		sysConfigList=super.findList(sysConfig);
 		//设置缓存数据
@@ -76,11 +89,14 @@ public class SysConfigService extends AbstractBaseService<SysConfigDao, SysConfi
 		return sysConfigList;
 	}
 	
+	@Override
 	public Page<SysConfig> findPage(Page<SysConfig> page, SysConfig sysConfig) {
 		//获取缓存数据
 		String findPageKey =  RedisUtils.getFindPageKey(SysConfigService.class.getName(),JSON.toJSONString(page)+JSON.toJSONString(sysConfig));
 		Page<SysConfig> pageReuslt=(Page<SysConfig>)redisUtils.get(findPageKey);
-		if(pageReuslt!=null) return pageReuslt;
+		if(pageReuslt!=null) {
+            return pageReuslt;
+        }
 		//获取数据库数据
 		pageReuslt=super.findPage(page, sysConfig);
 		//设置缓存数据
@@ -88,6 +104,7 @@ public class SysConfigService extends AbstractBaseService<SysConfigDao, SysConfi
 		return pageReuslt;
 	}
 	
+	@Override
 	@Transactional(readOnly = false)
 	public void save(SysConfig sysConfig) {
 		//保存数据库记录
@@ -99,6 +116,7 @@ public class SysConfigService extends AbstractBaseService<SysConfigDao, SysConfi
 		redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(SysConfigService.class.getName()));
 	}
 	
+	@Override
 	@Transactional(readOnly = false)
 	public void delete(SysConfig sysConfig) {
 		//清除记录缓存数据
@@ -110,6 +128,7 @@ public class SysConfigService extends AbstractBaseService<SysConfigDao, SysConfi
 		redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(SysConfigService.class.getName()));
 	}
 
+	@Override
 	@Transactional(readOnly = false)
 	public void deleteByLogic(SysConfig sysConfig) {
 		//清除记录缓存数据
@@ -128,8 +147,9 @@ public class SysConfigService extends AbstractBaseService<SysConfigDao, SysConfi
 		SysConfig sysConfig=new SysConfig();
 		sysConfig.setType("demoMode");
 		sysConfig=this.findListFirstCache(sysConfig);
-		if(sysConfig.getValue().equals("true") && Global.isDemoMode())
-			return true;
+		if("true".equals(sysConfig.getValue()) && Global.isDemoMode()) {
+            return true;
+        }
 		return false;
 	}
 
@@ -137,12 +157,15 @@ public class SysConfigService extends AbstractBaseService<SysConfigDao, SysConfi
 		SysConfig sysConfig=new SysConfig();
 		sysConfig.setType("demoMode");
 		sysConfig=this.findListFirstCache(sysConfig);
-		if(sysConfig==null) return Global.isDemoModeDescription();
+		if(sysConfig==null) {
+            return Global.isDemoModeDescription();
+        }
 		return sysConfig.getDescription();
 	}
 	public  String systemMode(){
-		if(this.isDemoMode())
-			return "演示版";
+		if(this.isDemoMode()) {
+            return "演示版";
+        }
 		return "正式版";
 	}
 }
\ No newline at end of file

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/service/SysConfigTreeService.java

@@ -22,23 +22,27 @@ import com.jeespring.modules.sys.dao.SysConfigTreeDao;
 @Transactional(readOnly = true)
 public class SysConfigTreeService extends TreeService<SysConfigTreeDao, SysConfigTree> {
 
-	public SysConfigTree get(String id) {
+	@Override
+    public SysConfigTree get(String id) {
 		return super.get(id);
 	}
 	
-	public List<SysConfigTree> findList(SysConfigTree sysConfig) {
+	@Override
+    public List<SysConfigTree> findList(SysConfigTree sysConfig) {
 		if (StringUtils.isNotBlank(sysConfig.getParentIds())){
 			sysConfig.setParentIds(","+sysConfig.getParentIds()+",");
 		}
 		return super.findList(sysConfig);
 	}
 	
-	@Transactional(readOnly = false)
+	@Override
+    @Transactional(readOnly = false)
 	public void save(SysConfigTree sysConfig) {
 		super.save(sysConfig);
 	}
 	
-	@Transactional(readOnly = false)
+	@Override
+    @Transactional(readOnly = false)
 	public void delete(SysConfigTree sysConfig) {
 		super.delete(sysConfig);
 	}

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/service/SysDictTreeService.java

@@ -22,23 +22,27 @@ import com.jeespring.modules.sys.dao.SysDictTreeDao;
 @Transactional(readOnly = true)
 public class SysDictTreeService extends TreeService<SysDictTreeDao, SysDictTree> {
 
-	public SysDictTree get(String id) {
+	@Override
+    public SysDictTree get(String id) {
 		return super.get(id);
 	}
 	
-	public List<SysDictTree> findList(SysDictTree sysDict) {
+	@Override
+    public List<SysDictTree> findList(SysDictTree sysDict) {
 		if (StringUtils.isNotBlank(sysDict.getParentIds())){
 			sysDict.setParentIds(","+sysDict.getParentIds()+",");
 		}
 		return super.findList(sysDict);
 	}
 	
-	@Transactional(readOnly = false)
+	@Override
+    @Transactional(readOnly = false)
 	public void save(SysDictTree sysDict) {
 		super.save(sysDict);
 	}
 	
-	@Transactional(readOnly = false)
+	@Override
+    @Transactional(readOnly = false)
 	public void delete(SysDictTree sysDict) {
 		super.delete(sysDict);
 	}

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/service/SysUserOnlineService.java

@@ -50,7 +50,8 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 	 */
 	private static final String LAST_SYNC_DB_TIMESTAMP = SysUserOnlineService.class.getName() + "LAST_SYNC_DB_TIMESTAMP";
 
-	public SysUserOnline get(String id) {
+	@Override
+    public SysUserOnline get(String id) {
 		//获取数据库数据
 		SysUserOnline  sysUserOnline=super.get(id);
 		return sysUserOnline;
@@ -59,7 +60,9 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 	public SysUserOnline getCache(String id) {
 		//获取缓存数据
 		SysUserOnline sysUserOnline=(SysUserOnline)redisUtils.get(RedisUtils.getIdKey(SysUserOnlineService.class.getName(),id));
-		if( sysUserOnline!=null) return  sysUserOnline;
+		if( sysUserOnline!=null) {
+            return sysUserOnline;
+        }
 		//获取数据库数据
 		sysUserOnline=super.get(id);
 		//设置缓存数据
@@ -67,7 +70,8 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 		return sysUserOnline;
 	}
 
-	public List<SysUserOnline> total(SysUserOnline sysUserOnline) {
+	@Override
+    public List<SysUserOnline> total(SysUserOnline sysUserOnline) {
 		//获取数据库数据
 		List<SysUserOnline> sysUserOnlineList=super.total(sysUserOnline);
 		return sysUserOnlineList;
@@ -77,7 +81,9 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 		//获取缓存数据
 		String totalKey = RedisUtils.getTotalKey(SysUserOnlineService.class.getName(),JSON.toJSONString(sysUserOnline));
 		List<SysUserOnline> sysUserOnlineList=(List<SysUserOnline>)redisUtils.get(totalKey);
-		if(sysUserOnlineList!=null) return sysUserOnlineList;
+		if(sysUserOnlineList!=null) {
+            return sysUserOnlineList;
+        }
 		//获取数据库数据
 		sysUserOnlineList=super.total(sysUserOnline);
 		//设置缓存数据
@@ -85,7 +91,8 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 		return sysUserOnlineList;
 	}
 
-	public List<SysUserOnline> findList(SysUserOnline sysUserOnline) {
+	@Override
+    public List<SysUserOnline> findList(SysUserOnline sysUserOnline) {
 		//获取数据库数据
 		List<SysUserOnline> sysUserOnlineList=super.findList(sysUserOnline);
 		//设置缓存数据
@@ -96,7 +103,9 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 		//获取缓存数据
 		String findListKey = RedisUtils.getFindListKey(SysUserOnlineService.class.getName(),JSON.toJSONString(sysUserOnline));
 		List<SysUserOnline> sysUserOnlineList=(List<SysUserOnline>)redisUtils.get(findListKey);
-		if(sysUserOnlineList!=null) return sysUserOnlineList;
+		if(sysUserOnlineList!=null) {
+            return sysUserOnlineList;
+        }
 		//获取数据库数据
 		sysUserOnlineList=super.findList(sysUserOnline);
 		//设置缓存数据
@@ -107,7 +116,9 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 	public SysUserOnline findListFirst(SysUserOnline sysUserOnline) {;
 		//获取数据库数据
 		List<SysUserOnline> sysUserOnlineList=super.findList(sysUserOnline);
-		if(sysUserOnlineList.size()>0) sysUserOnline=sysUserOnlineList.get(0);
+		if(sysUserOnlineList.size()>0) {
+            sysUserOnline = sysUserOnlineList.get(0);
+        }
 		return sysUserOnline;
 	}
 
@@ -115,17 +126,23 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 		//获取缓存数据
 		String findListFirstKey = RedisUtils.getFindListFirstKey(SysUserOnlineService.class.getName(),JSON.toJSONString(sysUserOnline));
 		SysUserOnline sysUserOnlineRedis=(SysUserOnline)redisUtils.get(findListFirstKey);
-		if(sysUserOnlineRedis!=null) return sysUserOnlineRedis;
+		if(sysUserOnlineRedis!=null) {
+            return sysUserOnlineRedis;
+        }
 		//获取数据库数据
 		List<SysUserOnline> sysUserOnlineList=super.findList(sysUserOnline);
-		if(sysUserOnlineList.size()>0) sysUserOnline=sysUserOnlineList.get(0);
-		else sysUserOnline=new SysUserOnline();
+		if(sysUserOnlineList.size()>0) {
+            sysUserOnline = sysUserOnlineList.get(0);
+        } else {
+            sysUserOnline = new SysUserOnline();
+        }
 		//设置缓存数据
 		redisUtils.set(findListFirstKey,sysUserOnline);
 		return sysUserOnline;
 	}
 
-	public Page<SysUserOnline> findPage(Page<SysUserOnline> page, SysUserOnline sysUserOnline) {
+	@Override
+    public Page<SysUserOnline> findPage(Page<SysUserOnline> page, SysUserOnline sysUserOnline) {
 		//获取数据库数据
 		Page<SysUserOnline> pageReuslt=super.findPage(page, sysUserOnline);
 		return pageReuslt;
@@ -136,12 +153,14 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 		//获取缓存数据
 		String findPageKey =  RedisUtils.getFindPageKey(SysUserOnlineService.class.getName(),JSON.toJSONString(page)+JSON.toJSONString(sysUserOnline));
 		Page<SysUserOnline> pageReuslt=(Page<SysUserOnline>)redisUtils.get(findPageKey);
-		if(pageReuslt!=null) return pageReuslt;
+		if(pageReuslt!=null) {
+            return pageReuslt;
+        }
 		//获取数据库数据
 		pageReuslt=super.findPage(page, sysUserOnline);
 
 		for (SysUserOnline item: pageReuslt.getList()) {
-			if(redisRun.equals("true")){
+			if("true".equals(redisRun)){
 				try{
 					if(!redisUtils.exists(RedisUtils.SHIRO_REDIS+":"+item.getId())){
 						item.setStatus(OnlineSession.OnlineStatus.off_line.toString());
@@ -155,7 +174,8 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 		return pageReuslt;
 	}
 
-	@Transactional(readOnly = false)
+	@Override
+    @Transactional(readOnly = false)
 	public void save(SysUserOnline sysUserOnline) {
 		//保存数据库记录
 		super.save(sysUserOnline);
@@ -166,7 +186,8 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 		redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(SysUserOnlineService.class.getName()));
 	}
 
-	@Transactional(readOnly = false)
+	@Override
+    @Transactional(readOnly = false)
 	public void delete(SysUserOnline sysUserOnline) {
 		//清除记录缓存数据
 		redisUtils.remove(RedisUtils.getIdKey(SysUserOnlineService.class.getName(),sysUserOnline.getId()));
@@ -177,7 +198,8 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 		redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(SysUserOnlineService.class.getName()));
 	}
 
-	@Transactional(readOnly = false)
+	@Override
+    @Transactional(readOnly = false)
 	public void deleteByLogic(SysUserOnline sysUserOnline) {
 		//清除记录缓存数据
 		redisUtils.remove(RedisUtils.getIdKey(SysUserOnlineService.class.getName(),sysUserOnline.getId()));
@@ -233,12 +255,13 @@ public class SysUserOnlineService extends AbstractBaseService<SysUserOnlineDao,
 			}
 			if(StringUtils.isEmpty(sysUserOnline.getDeptName())){
 				User user=UserUtils.getByLoginName(sysUserOnline.getLoginName());
-				if(user.getCompany()!=null && user.getOffice()!=null)
-					sysUserOnline.setDeptName(user.getCompany().getName()+"-"+user.getOffice().getName());
-				else if(user.getCompany()!=null)
-					sysUserOnline.setDeptName(user.getCompany().getName());
-				else if(user.getOffice()!=null)
-					sysUserOnline.setDeptName(user.getOffice().getName());
+				if(user.getCompany()!=null && user.getOffice()!=null) {
+                    sysUserOnline.setDeptName(user.getCompany().getName() + "-" + user.getOffice().getName());
+                } else if(user.getCompany()!=null) {
+                    sysUserOnline.setDeptName(user.getCompany().getName());
+                } else if(user.getOffice()!=null) {
+                    sysUserOnline.setDeptName(user.getOffice().getName());
+                }
 			}
 			this.save(sysUserOnline);
 		} catch (Exception e){

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/service/SystemConfigService.java

@@ -22,24 +22,29 @@ import com.jeespring.modules.sys.dao.SystemConfigDao;
 @Transactional(readOnly = true)
 public class SystemConfigService extends AbstractBaseService<SystemConfigDao, SystemConfig> {
 
-	public SystemConfig get(String id) {
+	@Override
+    public SystemConfig get(String id) {
 		return super.get(id);
 	}
 	
-	public List<SystemConfig> findList(SystemConfig systemConfig) {
+	@Override
+    public List<SystemConfig> findList(SystemConfig systemConfig) {
 		return super.findList(systemConfig);
 	}
 	
-	public Page<SystemConfig> findPage(Page<SystemConfig> page, SystemConfig systemConfig) {
+	@Override
+    public Page<SystemConfig> findPage(Page<SystemConfig> page, SystemConfig systemConfig) {
 		return super.findPage(page, systemConfig);
 	}
 	
-	@Transactional(readOnly = false)
+	@Override
+    @Transactional(readOnly = false)
 	public void save(SystemConfig systemConfig) {
 		super.save(systemConfig);
 	}
 	
-	@Transactional(readOnly = false)
+	@Override
+    @Transactional(readOnly = false)
 	public void delete(SystemConfig systemConfig) {
 		super.delete(systemConfig);
 	}

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/utils/DictUtils.java

@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Lists;
@@ -40,7 +41,16 @@ public class DictUtils {
 	}
 
 	public static String getDictLabel(Long value, String type, String defaultValue){
-		if(value==null) return "";
+		if(value==null) {
+            return "";
+        }
+		return getDictLabel(value.toString(),type,defaultValue);
+	}
+
+	public static String getDictLabel(Integer value, String type, String defaultValue){
+		if(value==null) {
+            return "";
+        }
 		return getDictLabel(value.toString(),type,defaultValue);
 	}
 
@@ -56,7 +66,16 @@ public class DictUtils {
 	}
 
 	public static String getDictPicture(Long value, String type, String defaultValue){
-		if(value==null) return "";
+		if(value==null) {
+            return "";
+        }
+		return getDictPicture(value.toString(),type,defaultValue);
+	}
+
+	public static String getDictPicture(Integer value, String type, String defaultValue){
+		if(value==null) {
+            return "";
+        }
 		return getDictPicture(value.toString(),type,defaultValue);
 	}
 

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/web/DictController.java

@@ -107,7 +107,7 @@ public class DictController extends AbstractBaseController {
 			addMessage(redirectAttributes, sysConfigService.isDemoModeDescription());
 			return "redirect:" + adminPath + "/sys/dict/?repage";
 		}
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			Dict dict = dictService.get(id);
 			dictService.delete(dict);

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/web/LogController.java

@@ -45,7 +45,7 @@ public class LogController extends AbstractBaseController {
 	//RequiresPermissions("sys:log:del")
 	@RequestMapping(value = "deleteAll")
 	public String deleteAll(String ids, RedirectAttributes redirectAttributes) {
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			logService.delete(logService.get(id));
 		}

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/web/MenuController.java

@@ -131,7 +131,7 @@ public class MenuController extends AbstractBaseController {
 //		if (Menu.isRoot(id)){
 //			addMessage(redirectAttributes, "删除菜单失败, 不允许删除顶级菜单或编号为空");
 //		}else{
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			Menu menu = systemService.getMenu(id);
 			if(menu != null){
@@ -191,7 +191,7 @@ public class MenuController extends AbstractBaseController {
 		for (int i=0; i<list.size(); i++){
 			Menu e = list.get(i);
 			if (StringUtils.isBlank(extId) || (extId!=null && !extId.equals(e.getId()) && e.getParentIds().indexOf(","+extId+",")==-1)){
-				if(isShowHide != null && isShowHide.equals("0") && e.getIsShow().equals("0")){
+				if(isShowHide != null && "0".equals(isShowHide) && "0".equals(e.getIsShow())){
 					continue;
 				}
 				Map<String, Object> map = Maps.newHashMap();

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/web/OfficeController.java

@@ -163,7 +163,7 @@ public class OfficeController extends AbstractBaseController {
 		for (int i=0; i<list.size(); i++){
 			Office e = list.get(i);
 			if ((StringUtils.isBlank(extId) || (extId!=null && !extId.equals(e.getId()) && e.getParentIds().indexOf(","+extId+",")==-1))
-					&& (type == null || (type != null && (type.equals("1") ? type.equals(e.getType()) : true)))
+					&& (type == null || (type != null && ("1".equals(type) ? type.equals(e.getType()) : true)))
 					&& (grade == null || (grade != null && Integer.parseInt(e.getGrade()) <= grade.intValue()))
 					&& Global.YES.equals(e.getUseable())){
 				Map<String, Object> map = Maps.newHashMap();

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/web/RegisterController.java

@@ -127,7 +127,7 @@ public class RegisterController extends AbstractBaseController {
 		// 修正引用赋值问题，不知道为何，Company和Office引用的一个实例地址，修改了一个，另外一个跟着修改。
 		Role role = systemService.getRoleByEnname(roleName);
 		String officeCode = "1000";
-		if(roleName.equals("patient")){
+		if("patient".equals(roleName)){
 			officeCode = "1001";
 		}
 		Office office = officeService.getByCode(officeCode);
@@ -204,7 +204,7 @@ public class RegisterController extends AbstractBaseController {
 		String randomCode = String.valueOf((int) (Math.random() * 9000 + 1000));
 		try {
 			String result =UserUtils.sendRandomCode(mobile, randomCode, mobile, randomCode);
-			if (!result.equals("100")) {
+			if (!"100".equals(result)) {
 				j.setSuccess(false);
 				j.setErrorCode("2");
 				j.setMsg("短信发送失败，错误代码："+result+"，请联系管理员。");

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/web/RoleController.java

@@ -150,7 +150,7 @@ public class RoleController extends AbstractBaseController {
 			addMessage(redirectAttributes,sysConfigService.isDemoModeDescription());
 			return "redirect:" + adminPath + "/sys/role/?repage";
 		}
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		StringBuffer msg = new StringBuffer();
 		for(String id : idArray){
 			Role role = systemService.getRole(id);

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/web/SysConfigController.java

@@ -146,7 +146,7 @@ public class SysConfigController extends AbstractBaseController {
 			return "redirect:" + adminPath + "/sys/sysConfig/?repage";
 		}
 
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			sysConfigService.delete(sysConfigService.get(id));
 		}
@@ -165,7 +165,7 @@ public class SysConfigController extends AbstractBaseController {
 			return "redirect:" + adminPath + "/sys/sysConfig/?repage";
 		}
 
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			sysConfigService.deleteByLogic(sysConfigService.get(id));
 		}

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/web/SysConfigTreeController.java

@@ -63,9 +63,12 @@ public class SysConfigTreeController extends AbstractBaseController {
 	public String list(SysConfigTree sysConfig, HttpServletRequest request, HttpServletResponse response, Model model) {
 		List<SysConfigTree> list = sysConfigTreeService.findList(sysConfig);
 		for(SysConfigTree item:list){
-			if(item.getDescription()==null) item.setDescription("");
-			if(item.getDescription().length()>20)
-				item.setDescription(item.getDescription().substring(0,20));
+			if(item.getDescription()==null) {
+                item.setDescription("");
+            }
+			if(item.getDescription().length()>20) {
+                item.setDescription(item.getDescription().substring(0, 20));
+            }
 		}
 		model.addAttribute("list", list);
 		return "modules/sys/sysConfigTreeList";

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/web/SysUserOnlineController.java

@@ -159,8 +159,9 @@ public class SysUserOnlineController extends AbstractBaseController {
 	public String form(SysUserOnline sysUserOnline, Model model, HttpServletRequest request, HttpServletResponse response) {
 		model.addAttribute("action", request.getParameter("action"));
 		model.addAttribute("sysUserOnline", sysUserOnline);
-		if(request.getParameter("ViewFormType")!=null && request.getParameter("ViewFormType").equals("FormTwo"))
-			return "modules/sys/sysUserOnlineFormTwo";
+		if(request.getParameter("ViewFormType")!=null && "FormTwo".equals(request.getParameter("ViewFormType"))) {
+            return "modules/sys/sysUserOnlineFormTwo";
+        }
 		return "modules/sys/sysUserOnlineForm";
 	}
 
@@ -206,7 +207,7 @@ public class SysUserOnlineController extends AbstractBaseController {
 	@RequiresPermissions("sys:sysUserOnline:del")
 	@RequestMapping(value = "deleteAll")
 	public String deleteAll(String ids, RedirectAttributes redirectAttributes) {
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			sysUserOnlineService.delete(sysUserOnlineService.get(id));
 		}
@@ -220,7 +221,7 @@ public class SysUserOnlineController extends AbstractBaseController {
 	@RequiresPermissions(value={"sys:sysUserOnline:del","sys:sysUserOnline:delByLogic"},logical=Logical.OR)
 	@RequestMapping(value = "deleteAllByLogic")
 	public String deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) {
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			sysUserOnlineService.deleteByLogic(sysUserOnlineService.get(id));
 		}

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/web/SystemConfigController.java

@@ -108,7 +108,7 @@ public class SystemConfigController extends AbstractBaseController {
 	@RequiresPermissions("sys:systemConfig:del")
 	@RequestMapping(value = "deleteAll")
 	public String deleteAll(String ids, RedirectAttributes redirectAttributes) {
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			systemConfigService.delete(systemConfigService.get(id));
 		}

JeeSpringCloud/src/main/java/com/jeespring/modules/sys/web/UserController.java

@@ -181,7 +181,7 @@ public class UserController extends AbstractBaseController {
 	@RequiresPermissions("sys:user:del")
 	@RequestMapping(value = "deleteAll")
 	public String deleteAll(String ids, RedirectAttributes redirectAttributes) {
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			User user = systemService.getUser(id);
 			if(sysConfigService.isDemoMode()){
@@ -341,16 +341,21 @@ public class UserController extends AbstractBaseController {
 				model.addAttribute("message", sysConfigService.isDemoModeDescription());
 				return "modules/sys/userInfo";
 			}
-			if(user.getName() !=null )
-				currentUser.setName(user.getName());
-			if(user.getEmail() !=null )
-				currentUser.setEmail(user.getEmail());
-			if(user.getPhone() !=null )
-				currentUser.setPhone(user.getPhone());
-			if(user.getMobile() !=null )
-				currentUser.setMobile(user.getMobile());
-			if(user.getRemarks() !=null )
-				currentUser.setRemarks(user.getRemarks());
+			if(user.getName() !=null ) {
+                currentUser.setName(user.getName());
+            }
+			if(user.getEmail() !=null ) {
+                currentUser.setEmail(user.getEmail());
+            }
+			if(user.getPhone() !=null ) {
+                currentUser.setPhone(user.getPhone());
+            }
+			if(user.getMobile() !=null ) {
+                currentUser.setMobile(user.getMobile());
+            }
+			if(user.getRemarks() !=null ) {
+                currentUser.setRemarks(user.getRemarks());
+            }
 //			if(user.getPhoto() !=null )
 //				currentUser.setPhoto(user.getPhoto());
 			systemService.updateUserInfo(currentUser);
@@ -386,8 +391,9 @@ public class UserController extends AbstractBaseController {
 				model.addAttribute("message", sysConfigService.isDemoModeDescription());
 				return "modules/sys/userInfo";
 			}
-			if(user.getPhoto() !=null )
-				currentUser.setPhoto(user.getPhoto());
+			if(user.getPhoto() !=null ) {
+                currentUser.setPhoto(user.getPhoto());
+            }
 			systemService.updateUserInfo(currentUser);
 			if(__ajax){//手机访问
 				AjaxJson j = new AjaxJson();
@@ -558,7 +564,7 @@ public class UserController extends AbstractBaseController {
 			//SystemConfig config = systemConfigService.get("1");//获取短信配置的用户名和密码
 			//UserUtils.sendPass(config.getSmsName(), config.getSmsPassword(), mobile, newPassword);
 			String result = SMSUtils.sendPass(mobile, newPassword);
-			if (!result.equals("100")) {
+			if (!"100".equals(result)) {
 				j.setSuccess(false);
 				j.setErrorCode("2");
 				j.setMsg("短信发送失败，密码重置失败，错误代码："+result+"，请联系管理员。");

JeeSpringCloud/src/main/java/com/jeespring/modules/test/entity/tree/TestTree.java

@@ -30,44 +30,53 @@ public class TestTree extends TreeEntity<TestTree> {
 		super(id);
 	}
 
-	@Length(min=1, max=100, message="名称长度必须介于 1 和 100 之间")
+	@Override
+    @Length(min=1, max=100, message="名称长度必须介于 1 和 100 之间")
 	public String getName() {
 		return name;
 	}
 
-	public void setName(String name) {
+	@Override
+    public void setName(String name) {
 		this.name = name;
 	}
 	
-	@NotNull(message="排序不能为空")
+	@Override
+    @NotNull(message="排序不能为空")
 	public Integer getSort() {
 		return sort;
 	}
 
-	public void setSort(Integer sort) {
+	@Override
+    public void setSort(Integer sort) {
 		this.sort = sort;
 	}
 	
-	@JsonBackReference
+	@Override
+    @JsonBackReference
 	@NotNull(message="父级编号不能为空")
 	public TestTree getParent() {
 		return parent;
 	}
 
-	public void setParent(TestTree parent) {
+	@Override
+    public void setParent(TestTree parent) {
 		this.parent = parent;
 	}
 	
-	@Length(min=1, max=2000, message="所有父级编号长度必须介于 1 和 2000 之间")
+	@Override
+    @Length(min=1, max=2000, message="所有父级编号长度必须介于 1 和 2000 之间")
 	public String getParentIds() {
 		return parentIds;
 	}
 
-	public void setParentIds(String parentIds) {
+	@Override
+    public void setParentIds(String parentIds) {
 		this.parentIds = parentIds;
 	}
 	
-	public String getParentId() {
+	@Override
+    public String getParentId() {
 		return parent != null && parent.getId() != null ? parent.getId() : "0";
 	}
 }
\ No newline at end of file

JeeSpringCloud/src/main/java/com/jeespring/modules/test/rest/one/FormLeaveRestController.java

@@ -261,7 +261,7 @@ public class FormLeaveRestController extends AbstractBaseController {
 	}
 
 	private Result deleteAll(String ids, RedirectAttributes redirectAttributes) {
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			formLeaveService.delete(formLeaveService.get(id));
 		}
@@ -290,7 +290,7 @@ public class FormLeaveRestController extends AbstractBaseController {
 	}
 
 	private Result deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) {
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			formLeaveService.deleteByLogic(formLeaveService.get(id));
 		}

JeeSpringCloud/src/main/java/com/jeespring/modules/test/rest/onetomany/TestDataMainRestController.java

@@ -261,7 +261,7 @@ public class TestDataMainRestController extends AbstractBaseController {
 	}
 
 	private Result deleteAll(String ids, RedirectAttributes redirectAttributes) {
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			testDataMainService.delete(testDataMainService.get(id));
 		}
@@ -290,7 +290,7 @@ public class TestDataMainRestController extends AbstractBaseController {
 	}
 
 	private Result deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) {
-		String idArray[] =ids.split(",");
+        String[] idArray = ids.split(",");
 		for(String id : idArray){
 			testDataMainService.deleteByLogic(testDataMainService.get(id));
 		}