From 444517fa749d5a39202d60d63de8329209ea6d2a Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 22 Dec 2025 14:51:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/sysconfig/ISysConfigApi.java | 2 +- .../service/impl/NuBaseInfoServiceImpl.java | 6 +- .../service/impl/OrgApplyInfoServiceImpl.java | 2 +- .../weixin/controller/WeixinController.java | 18 ++--- .../com/nu/modules/weixin/utils/SignUtil.java | 6 +- .../weixin/utils/TemplateMessageSender.java | 2 +- .../java/org/jeecg/common/api/CommonAPI.java | 8 +- .../jeecg/common/aspect/AutoLogAspect.java | 7 +- .../org/jeecg/common/aspect/DictAspect.java | 2 +- .../org/jeecg/common/aspect/UrlMatchEnum.java | 4 +- .../jeecg/common/constant/CommonConstant.java | 8 +- .../common/constant/CommonSendStatus.java | 20 ++--- .../common/constant/DataBaseConstant.java | 76 +++++++++---------- .../common/constant/ProvinceCityArea.java | 3 +- .../enums/ClientTerminalTypeEnum.java | 4 +- .../common/constant/enums/DySmsEnum.java | 2 +- .../common/constant/enums/FileTypeEnum.java | 2 +- .../common/constant/enums/ModuleType.java | 2 +- .../desensitization/enums/SensitiveEnum.java | 2 +- .../util/SensitiveInfoUtil.java | 4 +- .../common/es/JeecgElasticsearchTemplate.java | 2 +- .../common/handler/IFillRuleHandler.java | 2 +- .../common/system/query/MatchTypeEnum.java | 4 +- .../common/system/query/QueryGenerator.java | 15 ++-- .../system/util/JeecgDataAutorUtils.java | 4 +- .../org/jeecg/common/system/util/JwtUtil.java | 19 ++--- .../common/system/util/ResourceUtil.java | 4 +- .../common/system/util/SqlConcatUtil.java | 2 +- .../jeecg/common/system/vo/ComboModel.java | 4 +- .../org/jeecg/common/util/BrowserUtils.java | 11 ++- .../org/jeecg/common/util/CommonUtils.java | 13 ++-- .../java/org/jeecg/common/util/DateUtils.java | 3 +- .../org/jeecg/common/util/DySmsLimit.java | 6 +- .../jeecg/common/util/FileDownloadUtils.java | 17 ++--- .../java/org/jeecg/common/util/IpUtils.java | 2 +- .../java/org/jeecg/common/util/Md5Util.java | 2 +- .../java/org/jeecg/common/util/MinioUtil.java | 3 +- .../org/jeecg/common/util/MyClassLoader.java | 4 +- .../org/jeecg/common/util/PasswordUtil.java | 5 +- .../org/jeecg/common/util/ReflectHelper.java | 18 ++--- .../jeecg/common/util/SqlInjectionUtil.java | 20 ++--- .../org/jeecg/common/util/UUIDGenerator.java | 6 +- .../jeecg/common/util/YouBianCodeUtil.java | 2 +- .../util/dynamic/db/DataSourceCachePool.java | 2 +- .../dynamic/db/FreemarkerParseFactory.java | 8 +- .../util/encryption/AesEncryptUtil.java | 4 +- .../util/filter/SsrfFileTypeFilter.java | 2 +- .../org/jeecg/common/util/oConvertUtils.java | 48 ++++-------- .../jeecg/common/util/oss/OssBootUtil.java | 2 +- .../AbstractQueryBlackListHandler.java | 9 +-- .../InjectionSyntaxObjectAnalyzer.java | 4 +- .../sqlInjection/SqlInjectionAnalyzer.java | 1 - .../sqlInjection/parse/ConstAnalyzer.java | 2 +- .../org/jeecg/config/AutoPoiDictConfig.java | 2 +- .../org/jeecg/config/CorsFilterCondition.java | 5 +- .../jeecg/config/DruidWallConfigRegister.java | 2 +- .../org/jeecg/config/JeecgCloudCondition.java | 5 +- .../java/org/jeecg/config/shiro/JwtToken.java | 2 +- .../BodyReaderHttpServletRequestWrapper.java | 5 +- .../org/jeecg/config/sign/util/HttpUtils.java | 23 ++---- .../org/jeecg/config/sign/util/SignUtil.java | 10 +-- .../src/main/java/com/nu/utils/DictUtils.java | 2 +- .../OpenAISSEEventSourceListener.java | 2 +- .../modules/demo/mock/MockController.java | 3 +- .../vxe/controller/VxeMockController.java | 5 +- .../demo/mock/vxe/websocket/VxeSocket.java | 4 +- .../test/controller/JoaDemoController.java | 15 ++-- .../demo/test/mapper/JeecgDemoMapper.java | 8 +- .../test/mapper/JeecgOrderCustomerMapper.java | 4 +- .../test/mapper/JeecgOrderTicketMapper.java | 4 +- .../demo/test/service/IJeecgDemoService.java | 4 +- .../service/IJeecgDynamicDataService.java | 4 +- .../service/IJeecgOrderCustomerService.java | 2 +- .../test/service/IJeecgOrderMainService.java | 10 +-- .../service/IJeecgOrderTicketService.java | 2 +- .../service/impl/JeecgDemoServiceImpl.java | 3 +- .../dlglong/controller/DlMockController.java | 5 +- .../service/IDirectiveBodyTagService.java | 4 +- .../service/IDirectiveEmotionTagService.java | 4 +- .../jeecg/common/system/api/ISysBaseAPI.java | 36 ++++----- .../impl/DictTableWhiteListHandlerImpl.java | 5 +- .../config/init/CodeTemplateInitListener.java | 2 +- .../modules/aop/TenantPackUserLogAspect.java | 38 +++++----- .../api/controller/SystemApiController.java | 3 +- .../modules/cas/util/CasServiceUtil.java | 2 +- .../controller/QuartzJobController.java | 2 +- .../quartz/mapper/QuartzJobMapper.java | 2 +- .../mapper/SysAnnouncementSendMapper.java | 2 +- .../system/mapper/SysCategoryMapper.java | 4 +- .../system/mapper/SysDataLogMapper.java | 2 +- .../system/mapper/SysDepartMapper.java | 12 +-- .../system/mapper/SysDepartRoleMapper.java | 2 +- .../system/mapper/SysDictItemMapper.java | 2 +- .../modules/system/mapper/SysDictMapper.java | 24 +++--- .../modules/system/mapper/SysLogMapper.java | 2 +- .../mapper/SysPermissionDataRuleMapper.java | 2 +- .../system/mapper/SysPermissionMapper.java | 14 ++-- .../modules/system/mapper/SysUserMapper.java | 8 +- .../system/model/SysDepartTreeModel.java | 6 +- .../modules/system/rule/CategoryCodeRule.java | 2 +- .../service/ISysAnnouncementSendService.java | 2 +- .../service/ISysAnnouncementService.java | 12 +-- .../system/service/ISysCategoryService.java | 14 ++-- .../system/service/ISysDataLogService.java | 2 +- .../service/ISysDepartPermissionService.java | 2 +- .../ISysDepartRolePermissionService.java | 2 +- .../system/service/ISysDepartService.java | 4 +- .../system/service/ISysDictItemService.java | 2 +- .../system/service/ISysDictService.java | 28 +++---- .../system/service/ISysLogService.java | 2 +- .../ISysPermissionDataRuleService.java | 4 +- .../system/service/ISysPermissionService.java | 22 +++--- .../service/ISysRolePermissionService.java | 4 +- .../system/service/ISysRoleService.java | 4 +- .../system/service/ISysUserService.java | 32 ++++---- .../system/service/impl/SysBaseApiImpl.java | 47 ++++-------- .../modules/system/util/SecurityUtil.java | 2 +- .../jeecg/modules/system/util/XssUtils.java | 4 +- .../java/org/jeecg/NUSystemApplication.java | 2 +- 119 files changed, 429 insertions(+), 503 deletions(-) diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/sysconfig/ISysConfigApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/sysconfig/ISysConfigApi.java index 5c4542c..4ea1da8 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/sysconfig/ISysConfigApi.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/sysconfig/ISysConfigApi.java @@ -9,7 +9,7 @@ public interface ISysConfigApi { * @param key * @return */ - public Object querySysConfigByKey(String key); + Object querySysConfigByKey(String key); void asyncApi(SysConfigEntity entity); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java index bbcd883..398f65e 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java @@ -50,11 +50,7 @@ public class NuBaseInfoServiceImpl extends ServiceImpl"+json.toString()); + System.out.println("json----------------------------->"+ json); OkHttpClient client = new OkHttpClient(); RequestBody body = RequestBody.create(json.toString(), MediaType.get("application/json")); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java index 3254f1a..11628f1 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java @@ -55,14 +55,14 @@ public interface CommonAPI { * @param username * @return */ - public LoginUser getUserByName(String username); + LoginUser getUserByName(String username); /** * 5根据用户账号查询用户Id * @param username * @return */ - public String getUserIdByName(String username); + String getUserIdByName(String username); /** @@ -105,14 +105,14 @@ public interface CommonAPI { * @param code * @return */ - public List queryDictItemsByCode(String code); + List queryDictItemsByCode(String code); /** * 获取有效的数据字典项 * @param code * @return */ - public List queryEnableDictItemsByCode(String code); + List queryEnableDictItemsByCode(String code); /** * 13获取表数据字典 diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java index e07c9d4..b60c0fd 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java @@ -158,10 +158,7 @@ public class AutoLogAspect { if(value!=null && value.toString().length()>length){ return false; } - if(value instanceof MultipartFile){ - return false; - } - return true; + return !(value instanceof MultipartFile); } }; params = JSONObject.toJSONString(arguments, profilter); @@ -190,7 +187,7 @@ public class AutoLogAspect { * @return */ private String getOnlineLogContent(Object obj, String content){ - if (Result.class.isInstance(obj)){ + if (obj instanceof Result){ Result res = (Result)obj; String msg = res.getMessage(); String tableName = res.getOnlTable(); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java index 1977d7b..0411ae4 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java @@ -429,7 +429,7 @@ public class DictAspect { //update-end--Author:scott -- Date:20210531 ----for： !56 优化微服务应用下存在表字段需要字典翻译时加载缓慢问题----- if (tmpValue != null) { - if (!"".equals(textValue.toString())) { + if (!"".contentEquals(textValue)) { textValue.append(","); } textValue.append(tmpValue); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java index f7a0863..a36f7d5 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java @@ -29,11 +29,11 @@ public enum UrlMatchEnum { /** * Request 请求 URL前缀 */ - private String url; + private final String url; /** * 菜单路由 URL前缀 (对应菜单路径) */ - private String matchUrl; + private final String matchUrl; /** * 根据req url 获取到菜单配置路径（前端页面路由URL） diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java index 2559a2a..ddddc6e 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java @@ -88,7 +88,7 @@ public interface CommonConstant { Integer SC_JEECG_NO_AUTHZ=510; /** 登录用户Shiro权限缓存KEY前缀 */ - public static String PREFIX_USER_SHIRO_CACHE = "shiro:cache:org.jeecg.config.shiro.ShiroRealm.authorizationCache:"; + String PREFIX_USER_SHIRO_CACHE = "shiro:cache:org.jeecg.config.shiro.ShiroRealm.authorizationCache:"; /** 登录用户Token令牌缓存KEY前缀 */ String PREFIX_USER_TOKEN = "prefix_user_token:"; // /** Token缓存时间：3600秒即一小时 */ @@ -585,17 +585,17 @@ public interface CommonConstant { /** * 报表允许设计开发的角色 */ - public static String[] allowDevRoles = new String[]{"lowdeveloper", "admin"}; + String[] allowDevRoles = new String[]{"lowdeveloper", "admin"}; /** * 【对应积木报表的常量】 * 数据隔离模式： 按照创建人隔离 */ - public static final String SAAS_MODE_CREATED = "created"; + String SAAS_MODE_CREATED = "created"; /** * 【对应积木报表的常量】 * 数据隔离模式： 按照租户隔离 */ - public static final String SAAS_MODE_TENANT = "tenant"; + String SAAS_MODE_TENANT = "tenant"; //update-end---author:scott ---date::2023-09-10 for：积木报表常量---- //update-begin---author:wangshuai---date:2024-04-07---for:修改手机号常量--- diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java index 0706b4a..3eef7ef 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java @@ -10,39 +10,39 @@ public interface CommonSendStatus { /** * 未发布 */ - public static final String UNPUBLISHED_STATUS_0 = "0"; + String UNPUBLISHED_STATUS_0 = "0"; /** * 已发布 */ - public static final String PUBLISHED_STATUS_1 = "1"; + String PUBLISHED_STATUS_1 = "1"; /** * 撤销 */ - public static final String REVOKE_STATUS_2 = "2"; + String REVOKE_STATUS_2 = "2"; /** * app端推送会话标识后缀 */ - public static final String APP_SESSION_SUFFIX = "_app"; + String APP_SESSION_SUFFIX = "_app"; /**-----【流程相关通知模板code】------------------------------------------------------------*/ /**流程催办——系统通知消息模板*/ - public static final String TZMB_BPM_CUIBAN = "bpm_cuiban"; + String TZMB_BPM_CUIBAN = "bpm_cuiban"; /**流程抄送——系统通知消息模板*/ - public static final String TZMB_BPM_CC = "bpm_cc"; + String TZMB_BPM_CC = "bpm_cc"; /**流程催办——邮件通知消息模板*/ - public static final String TZMB_BPM_CUIBAN_EMAIL = "bpm_cuiban_email"; + String TZMB_BPM_CUIBAN_EMAIL = "bpm_cuiban_email"; /**标准模板—系统消息通知*/ - public static final String TZMB_SYS_TS_NOTE = "sys_ts_note"; + String TZMB_SYS_TS_NOTE = "sys_ts_note"; /**流程超时提醒——系统通知消息模板*/ - public static final String TZMB_BPM_CHAOSHI_TIP = "bpm_chaoshi_tip"; + String TZMB_BPM_CHAOSHI_TIP = "bpm_chaoshi_tip"; /**-----【流程相关通知模板code】-----------------------------------------------------------*/ /** * 系统通知拓展参数（比如：用于流程抄送和催办通知，这里额外传递流程跳转页面所需要的路由参数） */ - public static final String MSG_ABSTRACT_JSON = "msg_abstract"; + String MSG_ABSTRACT_JSON = "msg_abstract"; } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java index b6d2be1..009c365 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java @@ -7,31 +7,31 @@ public interface DataBaseConstant { //*********数据库类型**************************************** /**MYSQL数据库*/ - public static final String DB_TYPE_MYSQL = "MYSQL"; + String DB_TYPE_MYSQL = "MYSQL"; /** ORACLE*/ - public static final String DB_TYPE_ORACLE = "ORACLE"; + String DB_TYPE_ORACLE = "ORACLE"; /**达梦数据库*/ - public static final String DB_TYPE_DM = "DM"; + String DB_TYPE_DM = "DM"; /**postgreSQL达梦数据库*/ - public static final String DB_TYPE_POSTGRESQL = "POSTGRESQL"; + String DB_TYPE_POSTGRESQL = "POSTGRESQL"; /**人大金仓数据库*/ - public static final String DB_TYPE_KINGBASEES = "KINGBASEES"; + String DB_TYPE_KINGBASEES = "KINGBASEES"; /**sqlserver数据库*/ - public static final String DB_TYPE_SQLSERVER = "SQLSERVER"; + String DB_TYPE_SQLSERVER = "SQLSERVER"; /**mariadb 数据库*/ - public static final String DB_TYPE_MARIADB = "MARIADB"; + String DB_TYPE_MARIADB = "MARIADB"; /**DB2 数据库*/ - public static final String DB_TYPE_DB2 = "DB2"; + String DB_TYPE_DB2 = "DB2"; /**HSQL 数据库*/ - public static final String DB_TYPE_HSQL = "HSQL"; + String DB_TYPE_HSQL = "HSQL"; // // 数据库类型，对应 database_type 字典 // public static final String DB_TYPE_MYSQL_NUM = "1"; @@ -45,79 +45,79 @@ public interface DataBaseConstant { /** * 数据-所属机构编码 */ - public static final String SYS_ORG_CODE = "sysOrgCode"; + String SYS_ORG_CODE = "sysOrgCode"; /** * 数据-所属机构编码 */ - public static final String SYS_ORG_CODE_TABLE = "sys_org_code"; + String SYS_ORG_CODE_TABLE = "sys_org_code"; /** * 数据-所属机构编码 */ - public static final String SYS_MULTI_ORG_CODE = "sysMultiOrgCode"; + String SYS_MULTI_ORG_CODE = "sysMultiOrgCode"; /** * 数据-所属机构编码 */ - public static final String SYS_MULTI_ORG_CODE_TABLE = "sys_multi_org_code"; + String SYS_MULTI_ORG_CODE_TABLE = "sys_multi_org_code"; /** * 数据-所属机构ID */ - public static final String SYS_ORG_ID = "sysOrgId"; + String SYS_ORG_ID = "sysOrgId"; /** * 数据-所属机构ID */ - public static final String SYS_ORG_ID_TABLE = "sys_org_id"; + String SYS_ORG_ID_TABLE = "sys_org_id"; /** * 数据-所属角色code（多个逗号分割） */ - public static final String SYS_ROLE_CODE = "sysRoleCode"; + String SYS_ROLE_CODE = "sysRoleCode"; /** * 数据-所属角色code（多个逗号分割） */ - public static final String SYS_ROLE_CODE_TABLE = "sys_role_code"; + String SYS_ROLE_CODE_TABLE = "sys_role_code"; /** * 数据-系统用户编码（对应登录用户账号） */ - public static final String SYS_USER_CODE = "sysUserCode"; + String SYS_USER_CODE = "sysUserCode"; /** * 数据-系统用户编码（对应登录用户账号） */ - public static final String SYS_USER_CODE_TABLE = "sys_user_code"; + String SYS_USER_CODE_TABLE = "sys_user_code"; /** * 登录用户ID */ - public static final String SYS_USER_ID = "sysUserId"; + String SYS_USER_ID = "sysUserId"; /** * 登录用户ID */ - public static final String SYS_USER_ID_TABLE = "sys_user_id"; + String SYS_USER_ID_TABLE = "sys_user_id"; /** * 登录用户真实姓名 */ - public static final String SYS_USER_NAME = "sysUserName"; + String SYS_USER_NAME = "sysUserName"; /** * 登录用户真实姓名 */ - public static final String SYS_USER_NAME_TABLE = "sys_user_name"; + String SYS_USER_NAME_TABLE = "sys_user_name"; /** * 系统日期"yyyy-MM-dd" */ - public static final String SYS_DATE = "sysDate"; + String SYS_DATE = "sysDate"; /** * 系统日期"yyyy-MM-dd" */ - public static final String SYS_DATE_TABLE = "sys_date"; + String SYS_DATE_TABLE = "sys_date"; /** * 系统时间"yyyy-MM-dd HH:mm" */ - public static final String SYS_TIME = "sysTime"; + String SYS_TIME = "sysTime"; /** * 系统时间"yyyy-MM-dd HH:mm" */ - public static final String SYS_TIME_TABLE = "sys_time"; + String SYS_TIME_TABLE = "sys_time"; /** * 数据-所属机构编码 */ - public static final String SYS_BASE_PATH = "sys_base_path"; + String SYS_BASE_PATH = "sys_base_path"; //*********系统上下文变量**************************************** @@ -125,44 +125,44 @@ public interface DataBaseConstant { /** * 创建者登录名称 */ - public static final String CREATE_BY_TABLE = "create_by"; + String CREATE_BY_TABLE = "create_by"; /** * 创建者登录名称 */ - public static final String CREATE_BY = "createBy"; + String CREATE_BY = "createBy"; /** * 创建日期时间 */ - public static final String CREATE_TIME_TABLE = "create_time"; + String CREATE_TIME_TABLE = "create_time"; /** * 创建日期时间 */ - public static final String CREATE_TIME = "createTime"; + String CREATE_TIME = "createTime"; /** * 更新用户登录名称 */ - public static final String UPDATE_BY_TABLE = "update_by"; + String UPDATE_BY_TABLE = "update_by"; /** * 更新用户登录名称 */ - public static final String UPDATE_BY = "updateBy"; + String UPDATE_BY = "updateBy"; /** * 更新日期时间 */ - public static final String UPDATE_TIME = "updateTime"; + String UPDATE_TIME = "updateTime"; /** * 更新日期时间 */ - public static final String UPDATE_TIME_TABLE = "update_time"; + String UPDATE_TIME_TABLE = "update_time"; /** * 业务流程状态 */ - public static final String BPM_STATUS = "bpmStatus"; + String BPM_STATUS = "bpmStatus"; /** * 业务流程状态 */ - public static final String BPM_STATUS_TABLE = "bpm_status"; + String BPM_STATUS_TABLE = "bpm_status"; //*********系统建表标准字段**************************************** /** diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java index 2758940..39f7025 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Component; import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Scanner; import java.util.Set; @@ -174,7 +175,7 @@ public class ProvinceCityArea { Scanner scanner = null; StringBuilder buffer = new StringBuilder(); try { - scanner = new Scanner(file, "utf-8"); + scanner = new Scanner(file, StandardCharsets.UTF_8); while (scanner.hasNextLine()) { buffer.append(scanner.nextLine()); } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/ClientTerminalTypeEnum.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/ClientTerminalTypeEnum.java index 380decb..2e15b6a 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/ClientTerminalTypeEnum.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/ClientTerminalTypeEnum.java @@ -9,8 +9,8 @@ public enum ClientTerminalTypeEnum { H5("h5", "移动网页端"), APP("app", "手机app端"); - private String key; - private String text; + private final String key; + private final String text; ClientTerminalTypeEnum(String value, String text) { this.key = value; diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java index c1e6f34..b819e34 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java @@ -30,7 +30,7 @@ public enum DySmsEnum { */ private String keys; - private DySmsEnum(String templateCode,String signName,String keys) { + DySmsEnum(String templateCode, String signName, String keys) { this.templateCode = templateCode; this.signName = signName; this.keys = keys; diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java index 626a47e..a4503f1 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java @@ -32,7 +32,7 @@ public enum FileTypeEnum { private String type; private String value; private String text; - private FileTypeEnum(String type,String value,String text){ + FileTypeEnum(String type, String value, String text){ this.type = type; this.value = value; this.text = text; diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java index 5d3aa1e..c6dcc64 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java @@ -14,5 +14,5 @@ public enum ModuleType { /** * online */ - ONLINE; + ONLINE } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/desensitization/enums/SensitiveEnum.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/desensitization/enums/SensitiveEnum.java index bdffc75..76aed38 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/desensitization/enums/SensitiveEnum.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/desensitization/enums/SensitiveEnum.java @@ -49,7 +49,7 @@ public enum SensitiveEnum { /** * 公司开户银行联号 */ - CNAPS_CODE; + CNAPS_CODE } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java index 820047e..ceae67e 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java @@ -67,7 +67,7 @@ public class SensitiveInfoUtil { return obj; } long startTime=System.currentTimeMillis(); - log.debug(" obj --> "+ obj.toString()); + log.debug(" obj --> "+ obj); // 判断是不是一个对象 Field[] fields = obj.getClass().getDeclaredFields(); @@ -83,7 +83,7 @@ public class SensitiveInfoUtil { continue; } SensitiveField sf = field.getAnnotation(SensitiveField.class); - if(isEncode==true){ + if(isEncode){ //加密 String value = SensitiveInfoUtil.getEncodeData(realValue, sf.type()); field.set(obj, value); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java index 525d461..5649159 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java @@ -387,7 +387,7 @@ public class JeecgElasticsearchTemplate { data.remove("id"); bodySb.append(data.toJSONString()).append("\n"); } - System.out.println("+-+-+-: bodySb.toString(): " + bodySb.toString()); + System.out.println("+-+-+-: bodySb.toString(): " + bodySb); HttpHeaders headers = RestUtil.getHeaderApplicationJson(); RestUtil.request(url, HttpMethod.PUT, headers, null, bodySb, JSONObject.class); return true; diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java index 7c6478b..50dec03 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java @@ -16,7 +16,7 @@ public interface IFillRuleHandler { * @param formData 动态表单参数 * @return */ - public Object execute(JSONObject params, JSONObject formData); + Object execute(JSONObject params, JSONObject formData); } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java index d19342d..47b46aa 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java @@ -14,7 +14,7 @@ public enum MatchTypeEnum { /**查询链接规则 OR*/ OR("OR"); - private String value; + private final String value; MatchTypeEnum(String value) { this.value = value; @@ -36,7 +36,7 @@ public enum MatchTypeEnum { return null; } for (MatchTypeEnum val : values()) { - if (val.getValue().toLowerCase().equals(value.toLowerCase())) { + if (val.getValue().equalsIgnoreCase(value)) { return val; } } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java index 76b9d50..913ee92 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java @@ -4,6 +4,7 @@ import java.beans.PropertyDescriptor; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -170,7 +171,7 @@ public class QueryGenerator { //TODO 这种前后带逗号的支持分割后模糊查询(多选字段查询生效) 示例：,1,3, if (null != value && value.toString().startsWith(COMMA) && value.toString().endsWith(COMMA)) { String multiLikeval = value.toString().replace(",,", COMMA); - String[] vals = multiLikeval.substring(1, multiLikeval.length()).split(COMMA); + String[] vals = multiLikeval.substring(1).split(COMMA); final String field = oConvertUtils.camelToUnderline(column); if(vals.length>1) { queryWrapper.and(j -> { @@ -345,7 +346,7 @@ public class QueryGenerator { MatchTypeEnum matchType = MatchTypeEnum.getByValue(superQueryMatchType); // update-begin--Author:sunjianlei Date:20200325 for：高级查询的条件要用括号括起来，防止和用户的其他条件冲突 ------- try { - superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8"); + superQueryParams = URLDecoder.decode(superQueryParams, StandardCharsets.UTF_8); List conditions = JSON.parseArray(superQueryParams, QueryCondition.class); if (conditions == null || conditions.size() == 0) { return; @@ -369,7 +370,7 @@ public class QueryGenerator { && oConvertUtils.isNotEmpty(rule.getRule()) && oConvertUtils.isNotEmpty(rule.getVal())) { - log.debug("SuperQuery ==> " + rule.toString()); + log.debug("SuperQuery ==> " + rule); //update-begin-author:taoyan date:20201228 for: 【高级查询】 oracle 日期等于查询报错 Object queryValue = rule.getVal(); @@ -423,8 +424,6 @@ public class QueryGenerator { } //return andWrapper; }); - } catch (UnsupportedEncodingException e) { - log.error("--高级查询参数转码失败：" + superQueryParams, e); } catch (Exception e) { log.error("--高级查询拼接失败：" + e.getMessage()); e.printStackTrace(); @@ -445,7 +444,7 @@ public class QueryGenerator { if (value == null) { return QueryRuleEnum.EQ; } - String val = (value + "").toString().trim(); + String val = (value + "").trim(); if (val.length() == 0) { return QueryRuleEnum.EQ; } @@ -524,7 +523,7 @@ public class QueryGenerator { if (! (value instanceof String)){ return value; } - String val = (value + "").toString().trim(); + String val = (value + "").trim(); //update-begin-author:taoyan date:20220302 for: 查询条件的值为等号（=）bug #3443 if(QueryRuleEnum.EQ.getValue().equals(val)){ return val; @@ -930,7 +929,7 @@ public class QueryGenerator { sb.append(sqlAnd+filedSql); } } - log.info("query auth sql is:"+sb.toString()); + log.info("query auth sql is:"+ sb); return sb.toString(); } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java index 9dc53e5..d2dc377 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java @@ -33,7 +33,7 @@ public class JeecgDataAutorUtils { public static synchronized void installDataSearchConditon(HttpServletRequest request, List dataRules) { @SuppressWarnings("unchecked") // 1.先从request获取MENU_DATA_AUTHOR_RULES，如果存则获取到LIST - List list = (List)loadDataSearchConditon(); + List list = loadDataSearchConditon(); if (list==null) { // 2.如果不存在，则new一个list list = new ArrayList(); @@ -72,7 +72,7 @@ public class JeecgDataAutorUtils { * @param sql */ public static synchronized void installDataSearchConditon(HttpServletRequest request, String sql) { - String ruleSql = (String) loadDataSearchConditonSqlString(); + String ruleSql = loadDataSearchConditonSqlString(); if (!StringUtils.hasText(ruleSql)) { request.setAttribute(MENU_DATA_AUTHOR_RULE_SQL,sql); } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java index 3010b84..5679f0f 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java @@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.IOException; import java.io.OutputStream; +import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.Map; import java.util.Objects; @@ -62,7 +63,7 @@ public class JwtUtil { os = httpServletResponse.getOutputStream(); httpServletResponse.setCharacterEncoding("UTF-8"); httpServletResponse.setStatus(code); - os.write(new ObjectMapper().writeValueAsString(jsonResult).getBytes("UTF-8")); + os.write(new ObjectMapper().writeValueAsString(jsonResult).getBytes(StandardCharsets.UTF_8)); os.flush(); os.close(); } catch (IOException e) { @@ -211,15 +212,15 @@ public class JwtUtil { } //update-end---author:chenrui ---date:20250107 for：[QQYUN-10785]数据权限，查看自己拥有部门的权限中存在问题 #7288------------ //替换为当前系统时间(年月日) - if (key.equals(DataBaseConstant.SYS_DATE)|| key.toLowerCase().equals(DataBaseConstant.SYS_DATE_TABLE)) { + if (key.equals(DataBaseConstant.SYS_DATE)|| key.equalsIgnoreCase(DataBaseConstant.SYS_DATE_TABLE)) { returnValue = DateUtils.formatDate(); } //替换为当前系统时间（年月日时分秒） - else if (key.equals(DataBaseConstant.SYS_TIME)|| key.toLowerCase().equals(DataBaseConstant.SYS_TIME_TABLE)) { + else if (key.equals(DataBaseConstant.SYS_TIME)|| key.equalsIgnoreCase(DataBaseConstant.SYS_TIME_TABLE)) { returnValue = DateUtils.now(); } //流程状态默认值（默认未发起） - else if (key.equals(DataBaseConstant.BPM_STATUS)|| key.toLowerCase().equals(DataBaseConstant.BPM_STATUS_TABLE)) { + else if (key.equals(DataBaseConstant.BPM_STATUS)|| key.equalsIgnoreCase(DataBaseConstant.BPM_STATUS_TABLE)) { returnValue = "1"; } @@ -229,7 +230,7 @@ public class JwtUtil { } //替换为系统登录用户帐号 - if (key.equals(DataBaseConstant.SYS_USER_CODE)|| key.toLowerCase().equals(DataBaseConstant.SYS_USER_CODE_TABLE)) { + if (key.equals(DataBaseConstant.SYS_USER_CODE)|| key.equalsIgnoreCase(DataBaseConstant.SYS_USER_CODE_TABLE)) { if(user==null) { returnValue = sysUser.getUsername(); }else { @@ -247,7 +248,7 @@ public class JwtUtil { } //替换为系统登录用户真实名字 - else if (key.equals(DataBaseConstant.SYS_USER_NAME)|| key.toLowerCase().equals(DataBaseConstant.SYS_USER_NAME_TABLE)) { + else if (key.equals(DataBaseConstant.SYS_USER_NAME)|| key.equalsIgnoreCase(DataBaseConstant.SYS_USER_NAME_TABLE)) { if(user==null) { returnValue = sysUser.getRealname(); }else { @@ -256,7 +257,7 @@ public class JwtUtil { } //替换为系统用户登录所使用的机构编码 - else if (key.equals(DataBaseConstant.SYS_ORG_CODE)|| key.toLowerCase().equals(DataBaseConstant.SYS_ORG_CODE_TABLE)) { + else if (key.equals(DataBaseConstant.SYS_ORG_CODE)|| key.equalsIgnoreCase(DataBaseConstant.SYS_ORG_CODE_TABLE)) { if(user==null) { returnValue = sysUser.getOrgCode(); }else { @@ -274,7 +275,7 @@ public class JwtUtil { } //替换为系统用户所拥有的所有机构编码 - else if (key.equals(DataBaseConstant.SYS_MULTI_ORG_CODE)|| key.toLowerCase().equals(DataBaseConstant.SYS_MULTI_ORG_CODE_TABLE)) { + else if (key.equals(DataBaseConstant.SYS_MULTI_ORG_CODE)|| key.equalsIgnoreCase(DataBaseConstant.SYS_MULTI_ORG_CODE_TABLE)) { if(user==null){ //TODO 暂时使用用户登录部门，存在逻辑缺陷，不是用户所拥有的部门 returnValue = sysUser.getOrgCode(); @@ -316,7 +317,7 @@ public class JwtUtil { } //update-begin-author:taoyan date:20210330 for:多租户ID作为系统变量 - else if (key.equals(TenantConstant.TENANT_ID) || key.toLowerCase().equals(TenantConstant.TENANT_ID_TABLE)){ + else if (key.equals(TenantConstant.TENANT_ID) || key.equalsIgnoreCase(TenantConstant.TENANT_ID_TABLE)){ try { returnValue = SpringContextUtils.getHttpServletRequest().getHeader(CommonConstant.TENANT_ID); } catch (Exception e) { diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java index b2805df..fa77c11 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java @@ -100,11 +100,11 @@ public class ResourceUtil { } Map> map = new HashMap<>(); for (String code : enumDictData.keySet()) { - if(dictCodeList.indexOf(code)>=0){ + if(dictCodeList.contains(code)){ List dictItemList = enumDictData.get(code); for(DictModel dm: dictItemList){ String value = dm.getValue(); - if(keys.indexOf(value)>=0){ + if(keys.contains(value)){ List list = new ArrayList<>(); list.add(new DictModel(value, dm.getText())); map.put(code,list); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java index 9178144..096b072 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java @@ -157,7 +157,7 @@ public class SqlConcatUtil { } return "("+String.join("," ,res)+")"; }else { - return "("+value.toString()+")"; + return "("+ value +")"; } //update-end-author:taoyan date:20210628 for: 查询条件如果输入,导致sql报错 } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java index 663cdb9..238b99e 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java @@ -29,12 +29,12 @@ public class ComboModel implements Serializable { public ComboModel(){ - }; + } public ComboModel(String id,String title,boolean checked,String username){ this.id = id; this.title = title; this.checked = false; this.username = username; - }; + } } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java index 08b3fbc..d20d1cd 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java @@ -20,9 +20,8 @@ public class BrowserUtils { * @return */ public static boolean isIe(HttpServletRequest request) { - return (request.getHeader("USER-AGENT").toLowerCase().indexOf("msie") > 0 || request - .getHeader("USER-AGENT").toLowerCase().indexOf("rv:11.0") > 0) ? true - : false; + return request.getHeader("USER-AGENT").toLowerCase().indexOf("msie") > 0 || request + .getHeader("USER-AGENT").toLowerCase().indexOf("rv:11.0") > 0; } /** @@ -96,7 +95,7 @@ public class BrowserUtils { private static boolean getBrowserType(HttpServletRequest request, String brosertype) { return request.getHeader("USER-AGENT").toLowerCase() - .indexOf(brosertype) > 0 ? true : false; + .indexOf(brosertype) > 0; } private final static String IE11 = "rv:11.0"; @@ -170,7 +169,7 @@ public class BrowserUtils { } - private static Map langMap = new HashMap(); + private static final Map langMap = new HashMap(); private final static String ZH = "zh"; private final static String ZH_CN = "zh-cn"; @@ -187,7 +186,7 @@ public class BrowserUtils { public static String getBrowserLanguage(HttpServletRequest request) { String browserLang = request.getLocale().getLanguage(); - String browserLangCode = (String)langMap.get(browserLang); + String browserLangCode = langMap.get(browserLang); if(browserLangCode == null) { diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java index 9294a5c..0cec4a0 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java @@ -44,13 +44,13 @@ public class CommonUtils { /** * 中文正则 */ - private static Pattern ZHONGWEN_PATTERN = Pattern.compile("[\u4e00-\u9fa5]"); + private static final Pattern ZHONGWEN_PATTERN = Pattern.compile("[\u4e00-\u9fa5]"); /** * 文件名 正则字符串 * 文件名支持的字符串：字母数字中文.-_()（） 除此之外的字符将被删除 */ - private static String FILE_NAME_REGEX = "[^A-Za-z\\.\\(\\)\\-（）\\_0-9\\u4e00-\\u9fa5]"; + private static final String FILE_NAME_REGEX = "[^A-Za-z\\.\\(\\)\\-（）\\_0-9\\u4e00-\\u9fa5]"; public static String uploadOnlineImage(byte[] data,String basePath,String bizPath,String uploadType){ String dbPath = null; @@ -119,10 +119,7 @@ public class CommonUtils { return false; }else{ Matcher m = ZHONGWEN_PATTERN.matcher(str); - if (m.find()) { - return true; - } - return false; + return m.find(); } } @@ -257,7 +254,7 @@ public class CommonUtils { public static DataSourceProperty getDataSourceProperty(String sourceKey){ DynamicDataSourceProperties prop = SpringContextUtils.getApplicationContext().getBean(DynamicDataSourceProperties.class); Map map = prop.getDatasource(); - DataSourceProperty db = (DataSourceProperty)map.get(sourceKey); + DataSourceProperty db = map.get(sourceKey); return db; } @@ -273,7 +270,7 @@ public class CommonUtils { } DynamicDataSourceProperties prop = SpringContextUtils.getApplicationContext().getBean(DynamicDataSourceProperties.class); Map map = prop.getDatasource(); - DataSourceProperty db = (DataSourceProperty)map.get(sourceKey); + DataSourceProperty db = map.get(sourceKey); if(db==null){ return null; } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/DateUtils.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/DateUtils.java index cc142ba..cd2a5aa 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/DateUtils.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/DateUtils.java @@ -704,8 +704,7 @@ public class DateUtils extends PropertyEditorSupport { throw new IllegalArgumentException("Could not parse date, date format is error "); } } catch (ParseException ex) { - IllegalArgumentException iae = new IllegalArgumentException("Could not parse date: " + ex.getMessage()); - iae.initCause(ex); + IllegalArgumentException iae = new IllegalArgumentException("Could not parse date: " + ex.getMessage(), ex); throw iae; } } else { diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/DySmsLimit.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/DySmsLimit.java index b7a24c8..ff227d0 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/DySmsLimit.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/DySmsLimit.java @@ -26,9 +26,9 @@ public class DySmsLimit { // 一分钟内报警线最大短信数量，超了进黑名单（单一IP） private static final int MAX_TOTAL_MESSAGE_PER_MINUTE = 20; - private static ConcurrentHashMap ipLastRequestTime = new ConcurrentHashMap<>(); - private static ConcurrentHashMap ipRequestCount = new ConcurrentHashMap<>(); - private static ConcurrentHashMap ipBlacklist = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap ipLastRequestTime = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap ipRequestCount = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap ipBlacklist = new ConcurrentHashMap<>(); /** * @param ip 请求发短信的IP地址 diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/FileDownloadUtils.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/FileDownloadUtils.java index d9d6ff8..d9d0e80 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/FileDownloadUtils.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/FileDownloadUtils.java @@ -9,6 +9,7 @@ import java.io.*; import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.List; import java.util.zip.ZipEntry; @@ -45,16 +46,12 @@ public class FileDownloadUtils { response.setHeader("content-type", "application/octet-stream"); response.setContentType("application/octet-stream"); // 下载文件能正常显示中文 - try { - response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8")); - response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); - } catch (UnsupportedEncodingException e) { - log.error(e.getMessage(), e); - } + response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, StandardCharsets.UTF_8)); + response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); // 实现文件下载 byte[] buffer = new byte[1024]; try (FileInputStream fis = new FileInputStream(file); - BufferedInputStream bis = new BufferedInputStream(fis);) { + BufferedInputStream bis = new BufferedInputStream(fis)) { OutputStream os = response.getOutputStream(); int i = bis.read(buffer); while (i != -1) { @@ -80,13 +77,13 @@ public class FileDownloadUtils { response.setCharacterEncoding("UTF-8"); response.setHeader("content-type", "application/octet-stream"); response.setContentType("application/octet-stream"); - response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(downloadName, "UTF-8")); + response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(downloadName, StandardCharsets.UTF_8)); response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); log.info("开始压缩文件:" + filesPath); //设置压缩流：直接写入response，实现边压缩边下载 try (ZipOutputStream zipOut = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream())); - DataOutputStream os = new DataOutputStream(zipOut);) { + DataOutputStream os = new DataOutputStream(zipOut)) { //设置压缩方法 zipOut.setMethod(ZipOutputStream.DEFLATED); for (String filePath : filesPath) { @@ -133,7 +130,7 @@ public class FileDownloadUtils { // 确保目录存在 File file = ensureDestFileDir(storePath); try (InputStream inStream = conn.getInputStream(); - FileOutputStream fs = new FileOutputStream(file);) { + FileOutputStream fs = new FileOutputStream(file)) { int byteread; byte[] buffer = new byte[1204]; while ((byteread = inStream.read(buffer)) != -1) { diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/IpUtils.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/IpUtils.java index 22a9395..624ad7a 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/IpUtils.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/IpUtils.java @@ -20,7 +20,7 @@ import java.util.regex.Pattern; * @Date 2019年01月14日 */ public class IpUtils { - private static Logger logger = LoggerFactory.getLogger(IpUtils.class); + private static final Logger logger = LoggerFactory.getLogger(IpUtils.class); /** * 获取IP地址 diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/Md5Util.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/Md5Util.java index d79f3a5..dced94c 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/Md5Util.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/Md5Util.java @@ -32,7 +32,7 @@ public class Md5Util { public static String md5Encode(String origin, String charsetname) { String resultString = null; try { - resultString = new String(origin); + resultString = origin; MessageDigest md = MessageDigest.getInstance("MD5"); if (charsetname == null || "".equals(charsetname)) { resultString = byteArrayToHexString(md.digest(resultString.getBytes())); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java index d5a13c0..e376ec8 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java @@ -10,6 +10,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.InputStream; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * minio文件上传工具类 @@ -169,7 +170,7 @@ public class MinioUtil { .expiry(expires).method(Method.GET).build(); //update-begin---author:liusq Date:20220121 for：获取文件外链报错提示method不能为空，导致文件下载和预览失败---- String url = minioClient.getPresignedObjectUrl(objectArgs); - return URLDecoder.decode(url,"UTF-8"); + return URLDecoder.decode(url, StandardCharsets.UTF_8); }catch (Exception e){ log.info("文件路径获取失败" + e.getMessage()); } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java index 20289b6..29e234c 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java @@ -2,6 +2,8 @@ package org.jeecg.common.util; import org.jeecg.common.constant.SymbolConstant; +import java.nio.charset.StandardCharsets; + /** * @Author 张代浩 */ @@ -96,7 +98,7 @@ public class MyClassLoader extends ClassLoader { 中文及空格路径 -------------------------------------------------------------*/ try { - realPath = java.net.URLDecoder.decode(realPath, "utf-8"); + realPath = java.net.URLDecoder.decode(realPath, StandardCharsets.UTF_8); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java index aaae509..0bfcfa3 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java @@ -1,5 +1,6 @@ package org.jeecg.common.util; +import java.nio.charset.StandardCharsets; import java.security.Key; import java.security.SecureRandom; import javax.crypto.Cipher; @@ -100,7 +101,7 @@ public class PasswordUtil { cipher.init(Cipher.ENCRYPT_MODE, key, parameterSpec); //update-begin-author:sccott date:20180815 for:中文作为用户名时，加密的密码windows和linux会得到不同的结果 gitee/issues/IZUD7 - encipheredData = cipher.doFinal(plaintext.getBytes("utf-8")); + encipheredData = cipher.doFinal(plaintext.getBytes(StandardCharsets.UTF_8)); //update-end-author:sccott date:20180815 for:中文作为用户名时，加密的密码windows和linux会得到不同的结果 gitee/issues/IZUD7 } catch (Exception e) { } @@ -146,7 +147,7 @@ public class PasswordUtil { * @return */ public static String bytesToHexString(byte[] src) { - StringBuilder stringBuilder = new StringBuilder(""); + StringBuilder stringBuilder = new StringBuilder(); if (src == null || src.length <= 0) { return null; } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java index 832f6b9..d3c29fe 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java @@ -22,7 +22,7 @@ public class ReflectHelper { /** * 传过来的对象 */ - private Object obj; + private final Object obj; /** * 存放get方法 @@ -85,7 +85,7 @@ public class ReflectHelper { m.invoke(obj, object); return true; } catch (Exception ex) { - log.info("invoke getter on " + property + " error: " + ex.toString()); + log.info("invoke getter on " + property + " error: " + ex); return false; } } @@ -103,10 +103,10 @@ public class ReflectHelper { /* * 调用obj类的setter函数 */ - value = m.invoke(obj, new Object[]{}); + value = m.invoke(obj); } catch (Exception ex) { - log.info("invoke getter on " + property + " error: " + ex.toString()); + log.info("invoke getter on " + property + " error: " + ex); } } return value; @@ -185,8 +185,8 @@ public class ReflectHelper { try { String firstLetter = fieldName.substring(0, 1).toUpperCase(); String getter = "get" + firstLetter + fieldName.substring(1); - Method method = o.getClass().getMethod(getter, new Class[]{}); - Object value = method.invoke(o, new Object[]{}); + Method method = o.getClass().getMethod(getter); + Object value = method.invoke(o); return value; } catch (Exception e) { e.printStackTrace(); @@ -282,9 +282,7 @@ public class ReflectHelper { Field[] fields; do{ fields = clazz.getDeclaredFields(); - for(int i = 0;i FULL_MATCHING_KEYWRODS = new ArrayList<>(); + private static final List FULL_MATCHING_KEYWRODS = new ArrayList<>(); static { FULL_MATCHING_KEYWRODS.add(";"); FULL_MATCHING_KEYWRODS.add("+"); @@ -127,8 +127,7 @@ public class SqlInjectionUtil { throw new JeecgSqlInjectionException(SqlInjectionUtil.SQL_INJECTION_TIP + value); } } - return; - } + } /** * 判断是否存在SQL注入关键词字符串 @@ -181,8 +180,7 @@ public class SqlInjectionUtil { } filterContent(val, customXssString); } - return; - } + } /** * 【提醒：不通用】 @@ -218,8 +216,7 @@ public class SqlInjectionUtil { throw new JeecgSqlInjectionException(SqlInjectionUtil.SQL_INJECTION_TIP + value); } } - return; - } + } /** * 【提醒：不通用】 @@ -254,8 +251,7 @@ public class SqlInjectionUtil { throw new JeecgSqlInjectionException(SqlInjectionUtil.SQL_INJECTION_TIP + value); } } - return; - } + } /** @@ -286,7 +282,7 @@ public class SqlInjectionUtil { * * @param table */ - private static Pattern tableNamePattern = Pattern.compile("^[a-zA-Z][a-zA-Z0-9_\\$]{0,63}$"); + private static final Pattern tableNamePattern = Pattern.compile("^[a-zA-Z][a-zA-Z0-9_\\$]{0,63}$"); public static String getSqlInjectTableName(String table) { if(oConvertUtils.isEmpty(table)){ return table; diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java index 9893f25..a337ff2 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java @@ -18,9 +18,9 @@ public class UUIDGenerator { */ public static String generate() { - return new StringBuilder(32).append(format(getIp())).append( - format(getJvm())).append(format(getHiTime())).append( - format(getLoTime())).append(format(getCount())).toString(); + return format(getIp()) + + format(getJvm()) + format(getHiTime()) + + format(getLoTime()) + format(getCount()); } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java index 820329d..fd37ba4 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java @@ -38,7 +38,7 @@ public class YouBianCodeUtil { code = "A"+code; } String beforeCode = code.substring(0, code.length() - 1- NUM_LENGTH); - String afterCode = code.substring(code.length() - 1 - NUM_LENGTH,code.length()); + String afterCode = code.substring(code.length() - 1 - NUM_LENGTH); char afterCodeZimu = afterCode.substring(0, 1).charAt(0); Integer afterCodeNum = Integer.parseInt(afterCode.substring(1)); // org.jeecgframework.core.util.LogUtil.info(after_code); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java index 0199879..2b28d5b 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java @@ -16,7 +16,7 @@ import java.util.Map; */ public class DataSourceCachePool { /** 数据源连接池缓存【本地 class缓存 - 不支持分布式】 */ - private static Map dbSources = new HashMap<>(); + private static final Map dbSources = new HashMap<>(); private static RedisTemplate redisTemplate; private static RedisTemplate getRedisTemplate() { diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java index 8f49769..07fcf23 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java @@ -40,7 +40,7 @@ public class FreemarkerParseFactory { */ private static final Configuration SQL_CONFIG = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS); - private static StringTemplateLoader stringTemplateLoader = new StringTemplateLoader(); + private static final StringTemplateLoader stringTemplateLoader = new StringTemplateLoader(); /**使用内嵌的(?ms)打开单行和多行模式*/ private final static Pattern NOTES_PATTERN = Pattern @@ -78,7 +78,7 @@ public class FreemarkerParseFactory { log.error(e.getMessage(), e.fillInStackTrace()); throw new Exception(e); } - log.debug("----isExistTemplate----" + e.toString()); + log.debug("----isExistTemplate----" + e); //update-end--Author:scott Date:20180320 for：解决问题 - 错误提示sql文件不存在，实际问题是sql freemarker用法错误------ return false; } @@ -179,13 +179,13 @@ public class FreemarkerParseFactory { int index = 0; while ((index = StringUtils.indexOfIgnoreCase(sql, whereAnd, index)) != -1) { sql = sql.substring(0, index + 5) - + sql.substring(index + 9, sql.length()); + + sql.substring(index + 9); } // 去掉 , where 这样的问题 index = 0; while ((index = StringUtils.indexOfIgnoreCase(sql, commaWhere, index)) != -1) { sql = sql.substring(0, index) - + sql.substring(index + 1, sql.length()); + + sql.substring(index + 1); } // 去掉 最后是 ,这样的问题 if (sql.endsWith(SymbolConstant.COMMA) || sql.endsWith(commaSpace)) { diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java index 670f3eb..c3d5d31 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java @@ -16,8 +16,8 @@ public class AesEncryptUtil { /** * 使用AES-128-CBC加密模式 key和iv可以相同 */ - private static String KEY = EncryptedString.key; - private static String IV = EncryptedString.iv; + private static final String KEY = EncryptedString.key; + private static final String IV = EncryptedString.iv; /** * 加密方法 diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java index 1a78fc5..83042c9 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java @@ -131,7 +131,7 @@ public class SsrfFileTypeFilter { * @description 通过文件后缀名获取文件类型 */ private static String getFileTypeBySuffix(String fileName) { - return fileName.substring(fileName.lastIndexOf(".") + 1, fileName.length()); + return fileName.substring(fileName.lastIndexOf(".") + 1); } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java index a7a975a..d3005eb 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java @@ -16,7 +16,9 @@ import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; import java.math.BigDecimal; import java.math.BigInteger; +import java.math.RoundingMode; import java.net.*; +import java.nio.charset.StandardCharsets; import java.sql.Date; import java.util.*; import java.util.regex.Matcher; @@ -36,18 +38,12 @@ public class oConvertUtils { if ("".equals(object)) { return (true); } - if (CommonConstant.STRING_NULL.equals(object)) { - return (true); - } - return (false); - } + return CommonConstant.STRING_NULL.equals(object); + } public static boolean isNotEmpty(Object object) { - if (object != null && !"".equals(object) && !object.equals(CommonConstant.STRING_NULL)) { - return (true); - } - return (false); - } + return object != null && !"".equals(object) && !object.equals(CommonConstant.STRING_NULL); + } /** @@ -62,7 +58,7 @@ public class oConvertUtils { } try { - inStr = URLDecoder.decode(inStr, "UTF-8"); + inStr = URLDecoder.decode(inStr, StandardCharsets.UTF_8); } catch (Exception e) { // 解决：URLDecoder: Illegal hex characters in escape (%) pattern - For input string: "自动" //e.printStackTrace(); @@ -79,7 +75,7 @@ public class oConvertUtils { public static String StrToUTF(String strIn, String sourceCode, String targetCode) { strIn = ""; try { - strIn = new String(strIn.getBytes("ISO-8859-1"), "GBK"); + strIn = new String(strIn.getBytes(StandardCharsets.ISO_8859_1), "GBK"); } catch (UnsupportedEncodingException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -222,7 +218,7 @@ public class oConvertUtils { Integer[] result = new Integer[len]; try { for (int i = 0; i < len; i++) { - result[i] = new Integer(object[i].trim()); + result[i] = Integer.valueOf(object[i].trim()); } return result; } catch (NumberFormatException e) { @@ -287,7 +283,7 @@ public class oConvertUtils { } public static long stringToLong(String str) { - Long test = new Long(0); + Long test = Long.valueOf(0); try { test = Long.valueOf(str); } catch (Exception e) { @@ -778,11 +774,7 @@ public class oConvertUtils { } } else { - if (oldVal == null && newVal == null) { - return true; - } else { - return false; - } + return oldVal == null && newVal == null; } } @@ -824,11 +816,7 @@ public class oConvertUtils { Object[] newValArray = newVal.toArray(); return equalityOfArrays(oldValArray,newValArray); } else { - if ((oldVal == null || oldVal.size() == 0) && (newVal == null || newVal.size() == 0)) { - return true; - } else { - return false; - } + return (oldVal == null || oldVal.size() == 0) && (newVal == null || newVal.size() == 0); } } @@ -871,17 +859,13 @@ public class oConvertUtils { * @param newVal * @return */ - public static boolean equalityOfArrays(Object[] oldVal, Object newVal[]) { + public static boolean equalityOfArrays(Object[] oldVal, Object[] newVal) { if (oldVal != null && newVal != null) { Arrays.sort(oldVal); Arrays.sort(newVal); return Arrays.equals(oldVal, newVal); } else { - if ((oldVal == null || oldVal.length == 0) && (newVal == null || newVal.length == 0)) { - return true; - } else { - return false; - } + return (oldVal == null || oldVal.length == 0) && (newVal == null || newVal.length == 0); } } @@ -915,7 +899,7 @@ public class oConvertUtils { try { //换个写法，解决springboot读取jar包中文件的问题 InputStream stream = oConvertUtils.class.getClassLoader().getResourceAsStream(url.replace("classpath:", "")); - json = IOUtils.toString(stream,"UTF-8"); + json = IOUtils.toString(stream, StandardCharsets.UTF_8); } catch (IOException e) { log.error(e.getMessage(),e); } @@ -996,7 +980,7 @@ public class oConvertUtils { BigDecimal bigDecimal = new BigDecimal(uploadCount); //换算成MB BigDecimal divide = bigDecimal.divide(new BigDecimal(1048576)); - count = divide.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + count = divide.setScale(2, RoundingMode.HALF_UP).doubleValue(); return count; } return count; diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java index bafc035..83361f9 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java @@ -340,7 +340,7 @@ public class OssBootUtil { } else { filePath = "https://" + bucketName + "." + endPoint + SymbolConstant.SINGLE_SLASH + fileUrl; } - PutObjectResult result = ossClient.putObject(bucketName, fileUrl.toString(),stream); + PutObjectResult result = ossClient.putObject(bucketName, fileUrl,stream); // 设置权限(公开读) ossClient.setBucketAcl(bucketName, CannedAccessControlList.PublicRead); if (result != null) { diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java index 8b7e5e2..6202ecb 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java @@ -61,9 +61,9 @@ public abstract class AbstractQueryBlackListHandler { if(list==null){ return true; } - log.info(" 获取sql信息 ：{} ", list.toString()); + log.info(" 获取sql信息 ：{} ", list); boolean flag = checkTableAndFieldsName(list); - if(flag == false){ + if(!flag){ return false; } for (QueryTable table : list) { @@ -124,10 +124,7 @@ public abstract class AbstractQueryBlackListHandler { */ private boolean hasSpecialString(String name){ Matcher m = ILLEGAL_NAME_REG.matcher(name); - if (m.find()) { - return true; - } - return false; + return m.find(); } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionSyntaxObjectAnalyzer.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionSyntaxObjectAnalyzer.java index b31f7c3..f53f3c1 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionSyntaxObjectAnalyzer.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionSyntaxObjectAnalyzer.java @@ -31,13 +31,13 @@ public class InjectionSyntaxObjectAnalyzer extends TablesNamesFinder { private static final String DANGROUS_FUNCTIONS = "(sleep|benchmark|extractvalue|updatexml|ST_LatFromGeoHash|ST_LongFromGeoHash|GTID_SUBSET|GTID_SUBTRACT|floor|ST_Pointfromgeohash" + "|geometrycollection|multipoint|polygon|multipolygon|linestring|multilinestring)"; - private static ThreadLocal disableSubselect = new ThreadLocal() { + private static final ThreadLocal disableSubselect = new ThreadLocal() { @Override protected Boolean initialValue() { return true; } }; - private ConstAnalyzer constAnalyzer = new ConstAnalyzer(); + private final ConstAnalyzer constAnalyzer = new ConstAnalyzer(); public InjectionSyntaxObjectAnalyzer() { super(); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/sqlInjection/SqlInjectionAnalyzer.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/sqlInjection/SqlInjectionAnalyzer.java index 61f06a7..9ca1ee3 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/sqlInjection/SqlInjectionAnalyzer.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/sqlInjection/SqlInjectionAnalyzer.java @@ -2,7 +2,6 @@ package org.jeecg.common.util.sqlInjection; import org.jeecg.common.exception.JeecgSqlInjectionException; import org.jeecg.common.util.sqlInjection.parse.ParserSupport; -; /** * SQL注入攻击分析器 diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ConstAnalyzer.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ConstAnalyzer.java index 9b7345c..08c0ca8 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ConstAnalyzer.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ConstAnalyzer.java @@ -53,7 +53,7 @@ import net.sf.jsqlparser.statement.select.SubSelect; */ public class ConstAnalyzer implements ExpressionVisitor, ItemsListVisitor { - private static ThreadLocal constFlag = new ThreadLocal() { + private static final ThreadLocal constFlag = new ThreadLocal() { @Override protected Boolean initialValue() { return true; diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java index 93f571c..d15e541 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java @@ -73,7 +73,7 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI { } } if (dictReplaces != null && dictReplaces.size() != 0) { - log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces.toString()); + log.info("---AutoPoi--Get_DB_Dict------"+ dictReplaces); return dictReplaces.toArray(new String[dictReplaces.size()]); } return null; diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java index b43cc8e..e57ecf5 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java @@ -15,9 +15,6 @@ public class CorsFilterCondition implements Condition { public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { Object object = context.getEnvironment().getProperty(CommonConstant.CLOUD_SERVER_KEY); //如果没有服务注册发现的配置 说明是单体应用 则加载跨域配置 返回true - if(object==null){ - return true; - } - return false; + return object == null; } } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java index 6c3c1a1..d06b170 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java @@ -21,7 +21,7 @@ public class DruidWallConfigRegister implements SpringApplicationRunListener { public SpringApplication application; - private String[] args; + private final String[] args; /** diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java index 34b8e9a..c6e031e 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java @@ -15,9 +15,6 @@ public class JeecgCloudCondition implements Condition { public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { Object object = context.getEnvironment().getProperty(CommonConstant.CLOUD_SERVER_KEY); //如果没有服务注册发现的配置 说明是单体应用 - if(object==null){ - return false; - } - return true; + return object != null; } } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java index 0507c54..9ba990e 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java @@ -10,7 +10,7 @@ import org.apache.shiro.authc.AuthenticationToken; public class JwtToken implements AuthenticationToken { private static final long serialVersionUID = 1L; - private String token; + private final String token; public JwtToken(String token) { this.token = token; diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java index db42935..cd789d0 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import java.io.*; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; /** * 保存过滤器里面的流 @@ -22,7 +23,7 @@ public class BodyReaderHttpServletRequestWrapper extends HttpServletRequestWrapp super(request); String sessionStream = getBodyString(request); - body = sessionStream.getBytes(Charset.forName("UTF-8")); + body = sessionStream.getBytes(StandardCharsets.UTF_8); } /** @@ -35,7 +36,7 @@ public class BodyReaderHttpServletRequestWrapper extends HttpServletRequestWrapp StringBuilder sb = new StringBuilder(); try (InputStream inputStream = cloneInputStream(request.getInputStream()); - BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")))) { + BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) { String line; while ((line = reader.readLine()) != null) { sb.append(line); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java index 0f6389e..ece8f95 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; import java.util.SortedMap; @@ -42,12 +43,12 @@ public class HttpUtils { String pathVariable = request.getRequestURI().substring(request.getRequestURI().lastIndexOf("/") + 1); if (pathVariable.contains(SymbolConstant.COMMA)) { log.info(" pathVariable: {}",pathVariable); - String deString = URLDecoder.decode(pathVariable, "UTF-8"); + String deString = URLDecoder.decode(pathVariable, StandardCharsets.UTF_8); //https://www.52dianzi.com/category/article/37/565371.html if(deString.contains("%")){ try { - deString = URLDecoder.decode(deString, "UTF-8"); + deString = URLDecoder.decode(deString, StandardCharsets.UTF_8); log.info("存在%情况下，执行两次解码 — pathVariable decode: {}",deString); } catch (Exception e) { //e.printStackTrace(); @@ -92,11 +93,11 @@ public class HttpUtils { String pathVariable = url.substring(url.lastIndexOf("/") + 1); if (pathVariable.contains(SymbolConstant.COMMA)) { log.info(" pathVariable: {}",pathVariable); - String deString = URLDecoder.decode(pathVariable, "UTF-8"); + String deString = URLDecoder.decode(pathVariable, StandardCharsets.UTF_8); //https://www.52dianzi.com/category/article/37/565371.html if(deString.contains("%")){ - deString = URLDecoder.decode(deString, "UTF-8"); + deString = URLDecoder.decode(deString, StandardCharsets.UTF_8); log.info("存在%情况下，执行两次解码 — pathVariable decode: {}",deString); } log.info(" pathVariable decode: {}",deString); @@ -152,7 +153,7 @@ public class HttpUtils { } String wholeStr = new String(body); // 转化成json对象 - return JSONObject.parseObject(wholeStr.toString(), Map.class); + return JSONObject.parseObject(wholeStr, Map.class); } /** @@ -166,11 +167,7 @@ public class HttpUtils { return result; } String param = ""; - try { - param = URLDecoder.decode(request.getQueryString(), "utf-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } + param = URLDecoder.decode(request.getQueryString(), StandardCharsets.UTF_8); String[] params = param.split("&"); for (String s : params) { int index = s.indexOf("="); @@ -194,11 +191,7 @@ public class HttpUtils { return result; } String param = ""; - try { - param = URLDecoder.decode(queryString, "utf-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } + param = URLDecoder.decode(queryString, StandardCharsets.UTF_8); String[] params = param.split("&"); for (String s : params) { int index = s.indexOf("="); diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java index a85a466..0034ec3 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java @@ -11,6 +11,7 @@ import org.springframework.util.DigestUtils; import org.springframework.util.StringUtils; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.util.SortedMap; /** @@ -55,12 +56,7 @@ public class SignUtil { if(oConvertUtils.isEmpty(signatureSecret) || signatureSecret.contains(curlyBracket)){ throw new JeecgBootException("签名密钥 ${jeecg.signatureSecret} 缺少配置 ！！"); } - try { - //【issues/I484RW】2.4.6部署后，下拉搜索框提示“sign签名检验失败” - return DigestUtils.md5DigestAsHex((paramsJsonStr + signatureSecret).getBytes("UTF-8")).toUpperCase(); - } catch (UnsupportedEncodingException e) { - log.error(e.getMessage(),e); - return null; - } + //【issues/I484RW】2.4.6部署后，下拉搜索框提示“sign签名检验失败” + return DigestUtils.md5DigestAsHex((paramsJsonStr + signatureSecret).getBytes(StandardCharsets.UTF_8)).toUpperCase(); } } \ No newline at end of file diff --git a/nursing-unit-common/src/main/java/com/nu/utils/DictUtils.java b/nursing-unit-common/src/main/java/com/nu/utils/DictUtils.java index d8a07d4..b030d17 100644 --- a/nursing-unit-common/src/main/java/com/nu/utils/DictUtils.java +++ b/nursing-unit-common/src/main/java/com/nu/utils/DictUtils.java @@ -162,7 +162,7 @@ public class DictUtils { tmpValue = this.commonAPI.translateDict(code, k.trim()); } if (tmpValue != null) { - if (!"".equals(textValue.toString())) { + if (!"".contentEquals(textValue)) { textValue.append(","); } textValue.append(tmpValue); diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/gpt/listeners/OpenAISSEEventSourceListener.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/gpt/listeners/OpenAISSEEventSourceListener.java index c2d0c1e..e471f89 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/gpt/listeners/OpenAISSEEventSourceListener.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/gpt/listeners/OpenAISSEEventSourceListener.java @@ -28,7 +28,7 @@ public class OpenAISSEEventSourceListener extends EventSourceListener { private long tokens; - private SseEmitter sseEmitter; + private final SseEmitter sseEmitter; private String topicId; /** diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java index 35e9312..c2c46c9 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java @@ -12,6 +12,7 @@ import javax.swing.filechooser.FileSystemView; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -191,7 +192,7 @@ public class MockController { //json = FileUtils.re.readFileToString(jsonFile); //换个写法，解决springboot读取jar包中文件的问题 InputStream stream = getClass().getClassLoader().getResourceAsStream(jsonSrc.replace("classpath:", "")); - json = IOUtils.toString(stream,"UTF-8"); + json = IOUtils.toString(stream, StandardCharsets.UTF_8); } catch (IOException e) { log.error(e.getMessage(),e); } diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java index e51b057..412d6b0 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java @@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.InputStream; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.*; /** @@ -240,7 +241,7 @@ public class VxeMockController { } else { System.out.println("-- 高级查询模式：" + matchType.getValue()); } - superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8"); + superQueryParams = URLDecoder.decode(superQueryParams, StandardCharsets.UTF_8); List conditions = JSON.parseArray(superQueryParams, QueryCondition.class); if (conditions != null) { for (QueryCondition condition : conditions) { @@ -402,7 +403,7 @@ public class VxeMockController { try { InputStream stream = getClass().getClassLoader().getResourceAsStream(path.replace("classpath:", "")); if (stream != null) { - String json = IOUtils.toString(stream, "UTF-8"); + String json = IOUtils.toString(stream, StandardCharsets.UTF_8); return JSON.parseArray(json); } } catch (IOException e) { diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java index 24d4eb3..40eff4b 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java @@ -47,12 +47,12 @@ public class VxeSocket { * 因为一个用户可能打开多个页面，多个页面就会有多个连接； * key是userId，value是Map对象；子Map的key是pageId，value是VXESocket对象 */ - private static Map> userPool = new HashMap<>(); + private static final Map> userPool = new HashMap<>(); /** * 连接池，包含所有WebSocket连接； * key是socketId，value是VXESocket对象 */ - private static Map socketPool = new HashMap<>(); + private static final Map socketPool = new HashMap<>(); /** * 获取某个用户所有的页面 diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java index c375ebc..d95b288 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.test.controller; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -182,15 +183,11 @@ public class JoaDemoController { public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { // Step.1 组装查询条件 QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - JoaDemo joaDemo = JSON.parseObject(deString, JoaDemo.class); - queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, StandardCharsets.UTF_8); + JoaDemo joaDemo = JSON.parseObject(deString, JoaDemo.class); + queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, request.getParameterMap()); } //Step.2 AutoPoi 导出Excel diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java index ccdb2c1..8b19b64 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java @@ -22,7 +22,7 @@ public interface JeecgDemoMapper extends BaseMapper { * @param name 姓名 * @return demo集合 */ - public List getDemoByName(@Param("name") String name); + List getDemoByName(@Param("name") String name); /** * 查询列表数据 直接传数据权限的sql进行数据过滤 @@ -30,14 +30,14 @@ public interface JeecgDemoMapper extends BaseMapper { * @param permissionSql * @return */ - public IPage queryListWithPermission(Page page,@Param("permissionSql")String permissionSql); + IPage queryListWithPermission(Page page, @Param("permissionSql") String permissionSql); /** * 根据前缀获取所有有效权限 * @param permsPrefix * @return */ - public List queryAllAuth(@Param("permsPrefix")String permsPrefix); + List queryAllAuth(@Param("permsPrefix") String permsPrefix); /** * 查询用户已授权字段 @@ -45,7 +45,7 @@ public interface JeecgDemoMapper extends BaseMapper { * @param permsPrefix * @return */ - public List queryUserAuth(@Param("userId")String userId,@Param("permsPrefix")String permsPrefix); + List queryUserAuth(@Param("userId") String userId, @Param("permsPrefix") String permsPrefix); /** diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java index a1ff521..82cb1f1 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java @@ -22,7 +22,7 @@ public interface JeecgOrderCustomerMapper extends BaseMapper * @return */ @Delete("DELETE FROM JEECG_ORDER_CUSTOMER WHERE ORDER_ID = #{mainId}") - public boolean deleteCustomersByMainId(String mainId); + boolean deleteCustomersByMainId(String mainId); /** * 通过主表订单外键查询客户 @@ -30,5 +30,5 @@ public interface JeecgOrderCustomerMapper extends BaseMapper * @return 订单客户集合 */ @Select("SELECT * FROM JEECG_ORDER_CUSTOMER WHERE ORDER_ID = #{mainId}") - public List selectCustomersByMainId(String mainId); + List selectCustomersByMainId(String mainId); } diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java index 6604cc8..b62f812 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java @@ -21,7 +21,7 @@ public interface JeecgOrderTicketMapper extends BaseMapper { * @return */ @Delete("DELETE FROM JEECG_ORDER_TICKET WHERE ORDER_ID = #{mainId}") - public boolean deleteTicketsByMainId(String mainId); + boolean deleteTicketsByMainId(String mainId); /** * 通过主表订单外键查询订单机票 @@ -29,5 +29,5 @@ public interface JeecgOrderTicketMapper extends BaseMapper { * @return 返回订单机票集合 */ @Select("SELECT * FROM JEECG_ORDER_TICKET WHERE ORDER_ID = #{mainId}") - public List selectTicketsByMainId(String mainId); + List selectTicketsByMainId(String mainId); } diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java index f92dd69..de59e02 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java @@ -18,14 +18,14 @@ public interface IJeecgDemoService extends JeecgService { /** * 测试事务 */ - public void testTran(); + void testTran(); /** * 通过id过去demo数据，先读缓存，在读数据库 * @param id 数据库id * @return demo对象 */ - public JeecgDemo getByIdCacheable(String id); + JeecgDemo getByIdCacheable(String id); /** * 查询列表数据 在service中获取数据权限sql信息 diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDynamicDataService.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDynamicDataService.java index 460a33d..9a56290 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDynamicDataService.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDynamicDataService.java @@ -16,13 +16,13 @@ public interface IJeecgDynamicDataService extends JeecgService { * 测试从header获取数据源 * @return */ - public List selectSpelByHeader(); + List selectSpelByHeader(); /** * 使用spel从参数获取 * @param dsName * @return */ - public List selectSpelByKey(String dsName); + List selectSpelByKey(String dsName); } diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java index 45f0fd8..9dde1c9 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java @@ -19,5 +19,5 @@ public interface IJeecgOrderCustomerService extends IService * @param mainId 订单id * @return 订单顾客集合 */ - public List selectCustomersByMainId(String mainId); + List selectCustomersByMainId(String mainId); } diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java index a7111b7..5e55ce5 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java @@ -24,7 +24,7 @@ public interface IJeecgOrderMainService extends IService { * @param jeecgOrderCustomerList 订单客户集合 * @param jeecgOrderTicketList 订单机票集合 */ - public void saveMain(JeecgOrderMain jeecgOrderMain,List jeecgOrderCustomerList,List jeecgOrderTicketList) ; + void saveMain(JeecgOrderMain jeecgOrderMain, List jeecgOrderCustomerList, List jeecgOrderTicketList) ; /** * 修改一对多 @@ -32,19 +32,19 @@ public interface IJeecgOrderMainService extends IService { * @param jeecgOrderCustomerList 订单客户集合 * @param jeecgOrderTicketList 订单机票集合 */ - public void updateMain(JeecgOrderMain jeecgOrderMain,List jeecgOrderCustomerList,List jeecgOrderTicketList); + void updateMain(JeecgOrderMain jeecgOrderMain, List jeecgOrderCustomerList, List jeecgOrderTicketList); /** * 删除一对多 * @param id 订单id */ - public void delMain (String id); + void delMain(String id); /** * 批量删除一对多 * @param idList 订单id集合 */ - public void delBatchMain (Collection idList); + void delBatchMain(Collection idList); /** * 修改一对多 @@ -52,5 +52,5 @@ public interface IJeecgOrderMainService extends IService { * @param jeecgOrderCustomerList 订单客户集合 * @param jeecgOrderTicketList 订单机票集合 */ - public void updateCopyMain(JeecgOrderMain jeecgOrderMain, List jeecgOrderCustomerList, List jeecgOrderTicketList); + void updateCopyMain(JeecgOrderMain jeecgOrderMain, List jeecgOrderCustomerList, List jeecgOrderTicketList); } diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java index 7f2aa42..e40c889 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java @@ -19,5 +19,5 @@ public interface IJeecgOrderTicketService extends IService { * @param mainId 订单id * @return 订单机票集合 */ - public List selectTicketsByMainId(String mainId); + List selectTicketsByMainId(String mainId); } diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java index 1bcb774..641fa13 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java @@ -54,8 +54,7 @@ public class JeecgDemoServiceImpl extends ServiceImpl conditions = JSON.parseArray(superQueryParams, QueryCondition.class); if (conditions != null) { for (QueryCondition condition : conditions) { @@ -400,7 +401,7 @@ public class DlMockController { try { InputStream stream = getClass().getClassLoader().getResourceAsStream(path.replace("classpath:", "")); if (stream != null) { - String json = IOUtils.toString(stream, "UTF-8"); + String json = IOUtils.toString(stream, StandardCharsets.UTF_8); return JSON.parseArray(json); } } catch (IOException e) { diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/IDirectiveBodyTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/IDirectiveBodyTagService.java index 8165831..036dfa9 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/IDirectiveBodyTagService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/IDirectiveBodyTagService.java @@ -22,9 +22,9 @@ public interface IDirectiveBodyTagService extends IService { */ boolean isUsed(String id); - public void removeAllByDirectiveId(String directiveId); + void removeAllByDirectiveId(String directiveId); - public List selectAllRelation(String dataSourceCode, List ids, List excludeIds); + List selectAllRelation(String dataSourceCode, List ids, List excludeIds); void insertAllRelation(List relations); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/IDirectiveEmotionTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/IDirectiveEmotionTagService.java index 51ab292..49ac5ed 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/IDirectiveEmotionTagService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/IDirectiveEmotionTagService.java @@ -22,9 +22,9 @@ public interface IDirectiveEmotionTagService extends IService selectAllRelation(String dataSourceCode, List ids, List excludeIds); + List selectAllRelation(String dataSourceCode, List ids, List excludeIds); void insertAllRelation(List relations); diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java index 56e17e1..eca4504 100644 --- a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java +++ b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java @@ -148,21 +148,21 @@ public interface ISysBaseAPI extends CommonAPI { * * @return List 字典集合 */ - public List queryAllDict(); + List queryAllDict(); /** * 12查询所有分类字典 * * @return */ - public List queryAllSysCategory(); + List queryAllSysCategory(); /** * 查询子集合 * * @return */ - public List queryCategoryByPid(String pid); + List queryCategoryByPid(String pid); /** @@ -170,7 +170,7 @@ public interface ISysBaseAPI extends CommonAPI { * * @return */ - public List queryAllDepartBackDictModel(); + List queryAllDepartBackDictModel(); /** * 15根据业务类型及业务id修改消息已读 @@ -178,7 +178,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param busType * @param busId */ - public void updateSysAnnounReadFlag(String busType, String busId); + void updateSysAnnounReadFlag(String busType, String busId); /** * 16查询表字典 支持过滤数据 @@ -189,7 +189,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param filterSql * @return */ - public List queryFilterTableDictInfo(String table, String text, String code, String filterSql); + List queryFilterTableDictInfo(String table, String text, String code, String filterSql); /** * 17查询指定table的 text code 获取字典，包含text和value @@ -201,14 +201,14 @@ public interface ISysBaseAPI extends CommonAPI { * @return */ @Deprecated - public List queryTableDictByKeys(String table, String text, String code, String[] keyArray); + List queryTableDictByKeys(String table, String text, String code, String[] keyArray); /** * 18查询所有用户 返回ComboModel * * @return */ - public List queryAllUserBackCombo(); + List queryAllUserBackCombo(); /** * 19分页查询用户 返回JSONObject @@ -218,14 +218,14 @@ public interface ISysBaseAPI extends CommonAPI { * @param pageSize 每页显示条数 * @return */ - public JSONObject queryAllUser(String userIds, Integer pageNo, Integer pageSize); + JSONObject queryAllUser(String userIds, Integer pageNo, Integer pageSize); /** * 20获取所有角色 * * @return */ - public List queryAllRole(); + List queryAllRole(); /** * 21获取所有角色 带参 @@ -233,7 +233,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param roleIds 默认选中角色 * @return */ - public List queryAllRole(String[] roleIds); + List queryAllRole(String[] roleIds); /** * 22通过用户账号查询角色Id集合 @@ -241,7 +241,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param username * @return */ - public List getRoleIdsByUsername(String username); + List getRoleIdsByUsername(String username); /** * 23通过部门编号查询部门id @@ -249,14 +249,14 @@ public interface ISysBaseAPI extends CommonAPI { * @param orgCode * @return */ - public String getDepartIdsByOrgCode(String orgCode); + String getDepartIdsByOrgCode(String orgCode); /** * 24查询所有部门 * * @return */ - public List getAllSysDepart(); + List getAllSysDepart(); /** * 25查找父级部门 @@ -272,7 +272,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param deptId * @return */ - public List getDeptHeadByDepId(String deptId); + List getDeptHeadByDepId(String deptId); /** * 27给指定用户发消息 @@ -280,7 +280,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param userIds * @param cmd */ - public void sendWebSocketMsg(String[] userIds, String cmd); + void sendWebSocketMsg(String[] userIds, String cmd); /** * 28根据id获取所有参与用户 @@ -288,7 +288,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param userIds 多个用户id * @return */ - public List queryAllUserByIds(String[] userIds); + List queryAllUserByIds(String[] userIds); /** * 29将会议签到信息推动到预览 @@ -599,7 +599,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param orgCode 部门编码 * @return */ - public List getUserAccountsByDepCode(String orgCode); + List getUserAccountsByDepCode(String orgCode); /** * 检查查询sql的表和字段是否在白名单中 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java index e73dbde..3e9a2de 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.*; /** @@ -98,7 +99,7 @@ public class DictTableWhiteListHandlerImpl implements IDictTableWhiteListHandler } try { // 针对转义字符进行解码 - dictCodeString = URLDecoder.decode(dictCodeString, "UTF-8"); + dictCodeString = URLDecoder.decode(dictCodeString, StandardCharsets.UTF_8); } catch (Exception e) { log.warn(e.getMessage()); //this.throwException("字典code解码失败，可能是使用了非法字符，请检查！"); @@ -248,7 +249,7 @@ public class DictTableWhiteListHandlerImpl implements IDictTableWhiteListHandler String tableName = arr[0].trim(); //【20230814】解决使用参数tableName=sys_user t&复测，漏洞仍然存在 if (tableName.contains(".")) { - tableName = tableName.substring(tableName.indexOf(".") + 1, tableName.length()).trim(); + tableName = tableName.substring(tableName.indexOf(".") + 1).trim(); } if (tableName.contains(" ")) { tableName = tableName.substring(0, tableName.indexOf(" ")).trim(); diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/config/init/CodeTemplateInitListener.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/config/init/CodeTemplateInitListener.java index b540418..8bce544 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/config/init/CodeTemplateInitListener.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/config/init/CodeTemplateInitListener.java @@ -46,7 +46,7 @@ public class CodeTemplateInitListener implements ApplicationListener { * @param jobClassName 任务类名 * @return */ - public List findByJobClassName(@Param("jobClassName") String jobClassName); + List findByJobClassName(@Param("jobClassName") String jobClassName); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java index a18ac33..8f84cb0 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java @@ -23,7 +23,7 @@ public interface SysAnnouncementSendMapper extends BaseMapper getMyAnnouncementSendList(Page page,@Param("announcementSendModel") AnnouncementSendModel announcementSendModel); + List getMyAnnouncementSendList(Page page, @Param("announcementSendModel") AnnouncementSendModel announcementSendModel); /** * 获取一条记录 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java index 2d7cc31..1dde895 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysCategoryMapper.java @@ -26,7 +26,7 @@ public interface SysCategoryMapper extends BaseMapper { * @param query * @return */ - public List queryListByPid(@Param("pid") String pid,@Param("query") Map query); + List queryListByPid(@Param("pid") String pid, @Param("query") Map query); /** * 通过code查询分类字典表 @@ -34,7 +34,7 @@ public interface SysCategoryMapper extends BaseMapper { * @return */ @Select("SELECT ID FROM sys_category WHERE CODE = #{code,jdbcType=VARCHAR}") - public String queryIdByCode(@Param("code") String code); + String queryIdByCode(@Param("code") String code); /** * 获取分类字典最大的code diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java index 77a3f87..95722d3 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java @@ -16,6 +16,6 @@ public interface SysDataLogMapper extends BaseMapper{ * @param dataId * @return */ - public String queryMaxDataVer(@Param("tableName") String tableName,@Param("dataId") String dataId); + String queryMaxDataVer(@Param("tableName") String tableName, @Param("dataId") String dataId); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java index a8edb38..a2e8c93 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java @@ -29,7 +29,7 @@ public interface SysDepartMapper extends BaseMapper { * @param userId 用户id * @return List */ - public List queryUserDeparts(@Param("userId") String userId); + List queryUserDeparts(@Param("userId") String userId); /** * 根据用户名查询部门 @@ -37,7 +37,7 @@ public interface SysDepartMapper extends BaseMapper { * @param username * @return */ - public List queryDepartsByUsername(@Param("username") String username); + List queryDepartsByUsername(@Param("username") String username); /** * 根据用户名查询部门 @@ -45,7 +45,7 @@ public interface SysDepartMapper extends BaseMapper { * @param userId * @return */ - public List queryDepartsByUserId(@Param("userId") String userId); + List queryDepartsByUserId(@Param("userId") String userId); /** * 通过部门编码获取部门id @@ -53,14 +53,14 @@ public interface SysDepartMapper extends BaseMapper { * @return String */ @Select("select id from sys_depart where org_code=#{orgCode}") - public String queryDepartIdByOrgCode(@Param("orgCode") String orgCode); + String queryDepartIdByOrgCode(@Param("orgCode") String orgCode); /** * 通过部门id，查询部门下的用户的账号 * @param departIds 部门ID集合 * @return String */ - public List queryUserAccountByDepartIds(@Param("departIds") List departIds); + List queryUserAccountByDepartIds(@Param("departIds") List departIds); /** * 通过部门id 查询部门id,父id @@ -68,7 +68,7 @@ public interface SysDepartMapper extends BaseMapper { * @return */ @Select("select id,parent_id from sys_depart where id=#{departId}") - public SysDepart getParentDepartId(@Param("departId") String departId); + SysDepart getParentDepartId(@Param("departId") String departId); /** * 根据部门Id查询,当前和下级所有部门IDS diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java index 8ee074e..6ad53aa 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartRoleMapper.java @@ -19,5 +19,5 @@ public interface SysDepartRoleMapper extends BaseMapper { * @param userId * @return */ - public List queryDeptRoleByDeptAndUser(@Param("orgCode") String orgCode, @Param("userId") String userId); + List queryDeptRoleByDeptAndUser(@Param("orgCode") String orgCode, @Param("userId") String userId); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java index d53093e..6374053 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java @@ -22,5 +22,5 @@ public interface SysDictItemMapper extends BaseMapper { * @return */ @Select("SELECT * FROM sys_dict_item WHERE DICT_ID = #{mainId} order by sort_order asc, item_value asc") - public List selectItemsByMainId(String mainId); + List selectItemsByMainId(String mainId); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java index d31a7ce..9fa15c0 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java @@ -33,7 +33,7 @@ public interface SysDictMapper extends BaseMapper { * @return */ @Deprecated - public Long duplicateCheckCountSql(DuplicateCheckVo duplicateCheckVo); + Long duplicateCheckCountSql(DuplicateCheckVo duplicateCheckVo); /** * 重复校验 sql语句 @@ -41,14 +41,14 @@ public interface SysDictMapper extends BaseMapper { * @return */ @Deprecated - public Long duplicateCheckCountSqlNoDataId(DuplicateCheckVo duplicateCheckVo); + Long duplicateCheckCountSqlNoDataId(DuplicateCheckVo duplicateCheckVo); /** * 通过字典code获取字典数据 * @param code 字典code * @return List */ - public List queryDictItemsByCode(@Param("code") String code); + List queryDictItemsByCode(@Param("code") String code); /** * 查询有效的数据字典项 @@ -64,7 +64,7 @@ public interface SysDictMapper extends BaseMapper { * @param dictCodeList * @return */ - public List queryDictItemsByCodeList(@Param("dictCodeList") List dictCodeList); + List queryDictItemsByCodeList(@Param("dictCodeList") List dictCodeList); /** * 通过字典code获取字典数据 @@ -72,7 +72,7 @@ public interface SysDictMapper extends BaseMapper { * @param key * @return */ - public String queryDictTextByKey(@Param("code") String code,@Param("key") String key); + String queryDictTextByKey(@Param("code") String code, @Param("key") String key); /** * 可通过多个字典code查询翻译文本 @@ -86,19 +86,19 @@ public interface SysDictMapper extends BaseMapper { * 查询系统所有字典项 * @return */ - public List queryAllDictItems(List tenantIdList); + List queryAllDictItems(List tenantIdList); /** * 查询所有部门 作为字典信息 id -->value,departName -->text * @return */ - public List queryAllDepartBackDictModel(); + List queryAllDepartBackDictModel(); /** * 查询所有用户 作为字典信息 username -->value,realname -->text * @return */ - public List queryAllUserBackDictModel(); + List queryAllUserBackDictModel(); /** * 根据表名、显示字段名、存储字段名 查询树 @@ -121,14 +121,14 @@ public interface SysDictMapper extends BaseMapper { * @param id */ @Select("delete from sys_dict where id = #{id}") - public void deleteOneById(@Param("id") String id); + void deleteOneById(@Param("id") String id); /** * 查询被逻辑删除的数据 * @return */ @Select("select * from sys_dict where del_flag = 1 and tag = #{tag}") - public List queryDeleteList(@Param("tag") String tag); + List queryDeleteList(@Param("tag") String tag); /** * 修改状态值 @@ -136,7 +136,7 @@ public interface SysDictMapper extends BaseMapper { * @param id */ @Update("update sys_dict set del_flag = #{flag,jdbcType=INTEGER} where id = #{id,jdbcType=VARCHAR}") - public void updateDictDelFlag(@Param("flag") int delFlag, @Param("id") String id); + void updateDictDelFlag(@Param("flag") int delFlag, @Param("id") String id); /** @@ -146,7 +146,7 @@ public interface SysDictMapper extends BaseMapper { * @return */ @Deprecated - public Page queryDictTablePageList(Page page, @Param("query") DictQuery query); + Page queryDictTablePageList(Page page, @Param("query") DictQuery query); /** diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java index 6c757cd..c22d5d6 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java @@ -22,7 +22,7 @@ public interface SysLogMapper extends BaseMapper { /** * 清空所有日志记录 */ - public void removeAll(); + void removeAll(); /** * 获取系统总访问次数 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java index ce04e2f..a209b51 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.java @@ -23,6 +23,6 @@ public interface SysPermissionDataRuleMapper extends BaseMapper queryDataRuleIds(@Param("username") String username,@Param("permissionId") String permissionId); + List queryDataRuleIds(@Param("username") String username, @Param("permissionId") String permissionId); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java index 0575791..559fda3 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysPermissionMapper.java @@ -25,14 +25,14 @@ public interface SysPermissionMapper extends BaseMapper { * @param parentId * @return */ - public List queryListByParentId(@Param("parentId") String parentId); + List queryListByParentId(@Param("parentId") String parentId); /** * 根据用户查询用户权限 * @param userId 用户ID * @return List */ - public List queryByUser(@Param("userId") String userId); + List queryByUser(@Param("userId") String userId); /** * 修改菜单状态字段： 是否子节点 @@ -41,22 +41,22 @@ public interface SysPermissionMapper extends BaseMapper { * @return int */ @Update("update sys_permission set is_leaf=#{leaf} where id = #{id}") - public int setMenuLeaf(@Param("id") String id,@Param("leaf") int leaf); + int setMenuLeaf(@Param("id") String id, @Param("leaf") int leaf); /** * 切换vue3菜单 */ @Update("alter table sys_permission rename to sys_permission_v2") - public void backupVue2Menu(); + void backupVue2Menu(); @Update("alter table sys_permission_v3 rename to sys_permission") - public void changeVue3Menu(); + void changeVue3Menu(); /** * 获取模糊匹配规则的数据权限URL * @return List */ @Select("SELECT url FROM sys_permission WHERE del_flag = 0 and menu_type = 2 and url like '%*%'") - public List queryPermissionUrlWithStar(); + List queryPermissionUrlWithStar(); /** @@ -65,7 +65,7 @@ public interface SysPermissionMapper extends BaseMapper { * @param username * @return */ - public int queryCountByUsername(@Param("username") String username, @Param("permission") SysPermission sysPermission); + int queryCountByUsername(@Param("username") String username, @Param("permission") SysPermission sysPermission); /** diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java index 7abc671..a7057c3 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java @@ -27,14 +27,14 @@ public interface SysUserMapper extends BaseMapper { * @param username * @return */ - public SysUser getUserByName(@Param("username") String username); + SysUser getUserByName(@Param("username") String username); /** * 通过用户账号查询用户Id * @param username * @return */ - public String getUserIdByName(@Param("username") String username); + String getUserIdByName(@Param("username") String username); /** * 根据部门Id查询用户信息 @@ -90,7 +90,7 @@ public interface SysUserMapper extends BaseMapper { * @param phone * @return */ - public SysUser getUserByPhone(@Param("phone") String phone); + SysUser getUserByPhone(@Param("phone") String phone); /** @@ -98,7 +98,7 @@ public interface SysUserMapper extends BaseMapper { * @param email * @return */ - public SysUser getUserByEmail(@Param("email")String email); + SysUser getUserByEmail(@Param("email") String email); /** * 根据 orgCode 查询用户，包括子部门下的用户 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java index a8d1bbd..ce2355e 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java @@ -171,11 +171,7 @@ public class SysDepartTreeModel implements Serializable { this.directorUserIds = sysDepart.getDirectorUserIds(); this.picUrl = sysDepart.getPicUrl(); this.payableAmount = sysDepart.getPayableAmount(); - if (0 == sysDepart.getIzLeaf()) { - this.isLeaf = false; - } else { - this.isLeaf = true; - } + this.isLeaf = 0 != sysDepart.getIzLeaf(); } public boolean getIsLeaf() { diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java index 2c1b199..86dad59 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java @@ -62,7 +62,7 @@ public class CategoryCodeRule implements IFillRuleHandler { } else { //情况2 //update-begin---author:wangshuai ---date:20230424 for：【issues/4846】开启saas多租户功能后，租户管理员在添加分类字典时，报错------------ - SysCategory parent = (SysCategory) baseMapper.selectSysCategoryById(categoryPid); + SysCategory parent = baseMapper.selectSysCategoryById(categoryPid); //update-end---author:wangshuai ---date:20230424 for：【issues/4846】开启saas多租户功能后，租户管理员在添加分类字典时，报错------------ categoryCode = YouBianCodeUtil.getSubYouBianCode(parent.getCode(), null); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java index ac0c698..5ad4601 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java @@ -20,7 +20,7 @@ public interface ISysAnnouncementSendService extends IService getMyAnnouncementSendPage(Page page,AnnouncementSendModel announcementSendModel); + Page getMyAnnouncementSendPage(Page page, AnnouncementSendModel announcementSendModel); /** * 根据消息发送记录ID获取消息内容 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java index 618b28d..96bab2c 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java @@ -19,21 +19,21 @@ public interface ISysAnnouncementService extends IService { * 保存系统通告 * @param sysAnnouncement */ - public void saveAnnouncement(SysAnnouncement sysAnnouncement); + void saveAnnouncement(SysAnnouncement sysAnnouncement); /** * 修改系统通告 * @param sysAnnouncement * @return */ - public boolean upDateAnnouncement(SysAnnouncement sysAnnouncement); + boolean upDateAnnouncement(SysAnnouncement sysAnnouncement); /** * 保存系统通告 * @param title 标题 * @param msgContent 信息内容 */ - public void saveSysAnnouncement(String title, String msgContent); + void saveSysAnnouncement(String title, String msgContent); /** * 分页查询系统通告 @@ -42,7 +42,7 @@ public interface ISysAnnouncementService extends IService { * @param msgCategory 消息类型 * @return Page */ - public Page querySysCementPageByUserId(Page page, String userId, String msgCategory, Integer tenantId, Date beginDate); + Page querySysCementPageByUserId(Page page, String userId, String msgCategory, Integer tenantId, Date beginDate); /** * 获取用户未读消息数量 @@ -50,7 +50,7 @@ public interface ISysAnnouncementService extends IService { * @param userId 用户id * @return */ - public Integer getUnreadMessageCountByUserId(String userId, Date beginDate); + Integer getUnreadMessageCountByUserId(String userId, Date beginDate); /** @@ -89,5 +89,5 @@ public interface ISysAnnouncementService extends IService { * @param userId * @return */ - public List getNotSendedAnnouncementlist(String userId); + List getNotSendedAnnouncementlist(String userId); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java index 4a7f54c..2d7062f 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysCategoryService.java @@ -17,12 +17,12 @@ import java.util.Map; public interface ISysCategoryService extends IService { /**根节点父ID的值*/ - public static final String ROOT_PID_VALUE = "0"; + String ROOT_PID_VALUE = "0"; /** * 存在子节点 */ - public static final String HAS_CHILD = "1"; + String HAS_CHILD = "1"; /** * 添加分类字典 @@ -42,16 +42,16 @@ public interface ISysCategoryService extends IService { * @return * @throws JeecgBootException */ - public List queryListByCode(String pcode) throws JeecgBootException; + List queryListByCode(String pcode) throws JeecgBootException; /** * 根据pid查询子节点集合 * @param pid * @return */ - public List queryListByPid(String pid); + List queryListByPid(String pid); - public List queryAllCategories(); + List queryAllCategories(); /** * 根据pid查询子节点集合,支持查询条件 @@ -59,14 +59,14 @@ public interface ISysCategoryService extends IService { * @param condition * @return */ - public List queryListByPid(String pid, Map condition); + List queryListByPid(String pid, Map condition); /** * 根据code查询id * @param code * @return */ - public String queryIdByCode(String code); + String queryIdByCode(String code); /** * 删除节点时同时删除子节点及修改父级节点 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java index b71392e..cebd323 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataLogService.java @@ -16,6 +16,6 @@ public interface ISysDataLogService extends IService { * @param dataId * @param dataContent */ - public void addDataLog(String tableName, String dataId, String dataContent); + void addDataLog(String tableName, String dataId, String dataContent); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java index 08ff1be..b592093 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartPermissionService.java @@ -19,7 +19,7 @@ public interface ISysDepartPermissionService extends IService{ * 查询所有部门DepartId信息,并分节点进行显示 * @return */ - public List queryDepartIdTreeList(); + List queryDepartIdTreeList(); /** * 保存部门数据 @@ -92,7 +92,7 @@ public interface ISysDepartService extends IService{ * @param userId * @return */ - public List queryUserDeparts(String userId); + List queryUserDeparts(String userId); /** * 根据用户名查询部门 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java index 803b490..188c0fe 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictItemService.java @@ -20,5 +20,5 @@ public interface ISysDictItemService extends IService { * @param mainId 字典id * @return */ - public List selectItemsByMainId(String mainId); + List selectItemsByMainId(String mainId); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java index 907acbc..d3afca6 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java @@ -29,14 +29,14 @@ public interface ISysDictService extends IService { * @return */ @Deprecated - public boolean duplicateCheckData(DuplicateCheckVo duplicateCheckVo); + boolean duplicateCheckData(DuplicateCheckVo duplicateCheckVo); /** * 通过字典code获取字典数据 * @param code * @return */ - public List queryDictItemsByCode(String code); + List queryDictItemsByCode(String code); /** * 查询有效的数据字典项 @@ -57,7 +57,7 @@ public interface ISysDictService extends IService { * 登录加载系统字典 * @return */ - public Map> queryAllDictItems(); + Map> queryAllDictItems(); /** * 查通过查询指定table的 text code 获取字典 @@ -78,7 +78,7 @@ public interface ISysDictService extends IService { * @return */ @Deprecated - public List queryTableDictItemsByCodeAndFilter(String table, String text, String code, String filterSql); + List queryTableDictItemsByCodeAndFilter(String table, String text, String code, String filterSql); /** * 通过字典code及字典项的value获取字典文本 @@ -86,7 +86,7 @@ public interface ISysDictService extends IService { * @param key * @return */ - public String queryDictTextByKey(String code, String key); + String queryDictTextByKey(String code, String key); /** * 可通过多个字典code查询翻译文本 @@ -158,19 +158,19 @@ public interface ISysDictService extends IService { * @param sysDictItemList * @return Integer */ - public Integer saveMain(SysDict sysDict, List sysDictItemList); + Integer saveMain(SysDict sysDict, List sysDictItemList); /** * 查询所有部门 作为字典信息 id -->value,departName -->text * @return */ - public List queryAllDepartBackDictModel(); + List queryAllDepartBackDictModel(); /** * 查询所有用户 作为字典信息 username -->value,realname -->text * @return */ - public List queryAllUserBackDictModel(); + List queryAllUserBackDictModel(); // /** // * 通过关键字查询字典表 @@ -194,7 +194,7 @@ public interface ISysDictService extends IService { * @return */ @Deprecated - public List queryLittleTableDictItems(String table, String text, String code, String condition, String keyword, int pageNo, int pageSize); + List queryLittleTableDictItems(String table, String text, String code, String condition, String keyword, int pageNo, int pageSize); /** * 查询字典表所有数据 @@ -206,7 +206,7 @@ public interface ISysDictService extends IService { * @return */ @Deprecated - public List queryAllTableDictItems(String table, String text, String code, String condition, String keyword); + List queryAllTableDictItems(String table, String text, String code, String condition, String keyword); /** * 根据表名、显示字段名、存储字段名 查询树 * @param table @@ -225,20 +225,20 @@ public interface ISysDictService extends IService { * 真实删除 * @param id */ - public void deleteOneDictPhysically(String id); + void deleteOneDictPhysically(String id); /** * 修改delFlag * @param delFlag * @param id */ - public void updateDictDelFlag(int delFlag,String id); + void updateDictDelFlag(int delFlag, String id); /** * 查询被逻辑删除的数据 * @return */ - public List queryDeleteList(String tenantId,String tag); + List queryDeleteList(String tenantId, String tag); /** * 分页查询 @@ -248,7 +248,7 @@ public interface ISysDictService extends IService { * @return */ @Deprecated - public List queryDictTablePageList(DictQuery query,int pageSize, int pageNo); + List queryDictTablePageList(DictQuery query, int pageSize, int pageNo); /** * 获取字典数据 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java index baf8244..44c4f0f 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysLogService.java @@ -21,7 +21,7 @@ public interface ISysLogService extends IService { /** * 清空所有日志记录 */ - public void removeAll(); + void removeAll(); /** * 获取系统总访问次数 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java index 48bacfc..b917d7c 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysPermissionDataRuleService.java @@ -44,13 +44,13 @@ public interface ISysPermissionDataRuleService extends IService { /** * 切换vue3菜单 */ - public void switchVue3Menu(); + void switchVue3Menu(); /** * 通过父id查询菜单 * @param parentId 父id * @return */ - public List queryListByParentId(String parentId); + List queryListByParentId(String parentId); /** * 真实删除 * @param id 菜单id * @throws JeecgBootException */ - public void deletePermission(String id) throws JeecgBootException; + void deletePermission(String id) throws JeecgBootException; /** * 逻辑删除 * @param id 菜单id * @throws JeecgBootException */ - public void deletePermissionLogical(String id) throws JeecgBootException; + void deletePermissionLogical(String id) throws JeecgBootException; /** * 添加菜单 * @param sysPermission SysPermission对象 * @throws JeecgBootException */ - public void addPermission(SysPermission sysPermission) throws JeecgBootException; + void addPermission(SysPermission sysPermission) throws JeecgBootException; /** * 编辑菜单 * @param sysPermission SysPermission对象 * @throws JeecgBootException */ - public void editPermission(SysPermission sysPermission) throws JeecgBootException; + void editPermission(SysPermission sysPermission) throws JeecgBootException; /** * 获取登录用户拥有的权限 * @param username 用户名 * @return */ - public List queryByUser(String username); + List queryByUser(String username); /** * 根据permissionId删除其关联的SysPermissionDataRule表中的数据 @@ -69,13 +69,13 @@ public interface ISysPermissionService extends IService { * @param id * @return */ - public void deletePermRuleByPermId(String id); + void deletePermRuleByPermId(String id); /** * 查询出带有特殊符号的菜单地址的集合 * @return */ - public List queryPermissionUrlWithStar(); + List queryPermissionUrlWithStar(); /** * 判断用户否拥有权限 @@ -83,7 +83,7 @@ public interface ISysPermissionService extends IService { * @param sysPermission * @return */ - public boolean hasPermission(String username, SysPermission sysPermission); + boolean hasPermission(String username, SysPermission sysPermission); /** * 根据用户和请求地址判断是否有此权限 @@ -91,7 +91,7 @@ public interface ISysPermissionService extends IService { * @param url * @return */ - public boolean hasPermission(String username, String url); + boolean hasPermission(String username, String url); /** * 查询部门权限数据 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java index 1421ccd..ddfde3d 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRolePermissionService.java @@ -18,7 +18,7 @@ public interface ISysRolePermissionService extends IService { * @param roleId * @param permissionIds */ - public void saveRolePermission(String roleId,String permissionIds); + void saveRolePermission(String roleId, String permissionIds); /** * 保存授权 将上次的权限和这次作比较 差异处理提高效率 @@ -26,6 +26,6 @@ public interface ISysRolePermissionService extends IService { * @param permissionIds * @param lastPermissionIds */ - public void saveRolePermission(String roleId,String permissionIds,String lastPermissionIds); + void saveRolePermission(String roleId, String permissionIds, String lastPermissionIds); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java index f660478..0ef5f00 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysRoleService.java @@ -48,14 +48,14 @@ public interface ISysRoleService extends IService { * @param roleid * @return */ - public boolean deleteRole(String roleid); + boolean deleteRole(String roleid); /** * 批量删除角色 * @param roleids * @return */ - public boolean deleteBatchRole(String[] roleids); + boolean deleteBatchRole(String[] roleids); /** * 根据角色id和当前租户判断当前角色是否存在这个租户中 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java index 628c3ee..6986b6c 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java @@ -53,7 +53,7 @@ public interface ISysUserService extends IService { * @param confirmpassword * @return */ - public Result resetPassword(String username, String oldpassword, String newpassword, String confirmpassword); + Result resetPassword(String username, String oldpassword, String newpassword, String confirmpassword); /** * 修改密码 @@ -61,35 +61,35 @@ public interface ISysUserService extends IService { * @param sysUser * @return */ - public Result changePassword(SysUser sysUser); + Result changePassword(SysUser sysUser); /** * 删除用户 * @param userId * @return */ - public boolean deleteUser(String userId); + boolean deleteUser(String userId); /** * 批量删除用户 * @param userIds * @return */ - public boolean deleteBatchUsers(String userIds); + boolean deleteBatchUsers(String userIds); /** * 根据用户名查询 * @param username 用户名 * @return SysUser */ - public SysUser getUserByName(String username); + SysUser getUserByName(String username); /** * 添加用户和用户角色关系 * @param user * @param roles */ - public void addUserWithRole(SysUser user,String roles); + void addUserWithRole(SysUser user, String roles); /** @@ -97,14 +97,14 @@ public interface ISysUserService extends IService { * @param user * @param roles */ - public void editUserWithRole(SysUser user,String roles); + void editUserWithRole(SysUser user, String roles); /** * 获取用户的授权角色 * @param username * @return */ - public List getRole(String username); + List getRole(String username); /** * 获取根据登录用户的角色获取动态首页 @@ -113,7 +113,7 @@ public interface ISysUserService extends IService { * @param version 前端UI版本 * @return */ - public SysRoleIndex getDynamicIndexByUserRole(String username,String version); + SysRoleIndex getDynamicIndexByUserRole(String username, String version); /** * 查询用户信息包括 部门信息 @@ -121,7 +121,7 @@ public interface ISysUserService extends IService { * @return */ @Deprecated - public SysUserCacheInfo getCacheUser(String username); + SysUserCacheInfo getCacheUser(String username); /** * 根据部门Id查询 @@ -130,7 +130,7 @@ public interface ISysUserService extends IService { * @param username 用户账户名称 * @return */ - public IPage getUserByDepId(Page page, String departId, String username); + IPage getUserByDepId(Page page, String departId, String username); /** * 根据部门Ids查询 @@ -139,14 +139,14 @@ public interface ISysUserService extends IService { * @param username 用户账户名称 * @return */ - public IPage getUserByDepIds(Page page, List departIds, String username); + IPage getUserByDepIds(Page page, List departIds, String username); /** * 根据 userIds查询，查询用户所属部门的名称（多个部门名逗号隔开） * @param userIds * @return */ - public Map getDepNamesByUserIds(List userIds); + Map getDepNamesByUserIds(List userIds); /** * 根据部门 Id 和 QueryWrapper 查询 @@ -177,7 +177,7 @@ public interface ISysUserService extends IService { * @param username 用户账户名称 * @return */ - public IPage getUserByRoleId(Page page,String roleId, String username); + IPage getUserByRoleId(Page page, String roleId, String username); /** * 通过用户名获取用户角色集合 @@ -215,7 +215,7 @@ public interface ISysUserService extends IService { * @param phone 手机号 * @return SysUser */ - public SysUser getUserByPhone(String phone); + SysUser getUserByPhone(String phone); /** @@ -223,7 +223,7 @@ public interface ISysUserService extends IService { * @param email 邮箱 * @return SysUser */ - public SysUser getUserByEmail(String email); + SysUser getUserByEmail(String email); /** diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index dc7cff4..0b968dc 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -75,6 +75,7 @@ import javax.sql.DataSource; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.SQLException; @@ -208,7 +209,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { //update-begin-author:taoyan date:2023-2-21 for: 解决参数顺序问题 List allPossiblePaths = this.getOnlinePossiblePaths(requestPath); - log.info("获取的菜单地址= {}", allPossiblePaths.toString()); + log.info("获取的菜单地址= {}", allPossiblePaths); if (allPossiblePaths.size() == 1) { query.eq(SysPermission::getUrl, requestPath); } else { @@ -950,17 +951,13 @@ public class SysBaseApiImpl implements ISysBaseAPI { //update-begin-author:taoyan date:2023-5-19 for: QQYUN-5326【简流】获取组织人员 单/多 筛选条件 没有部门筛选 String departKey = "depart"; QueryCondition departCondition = null; - try { - String temp = URLDecoder.decode(superQuery, "UTF-8"); - List conditions = JSON.parseArray(temp, QueryCondition.class); - for (QueryCondition condition : conditions) { - if (departKey.equals(condition.getField())) { - departCondition = condition; - break; - } + String temp = URLDecoder.decode(superQuery, StandardCharsets.UTF_8); + List conditions = JSON.parseArray(temp, QueryCondition.class); + for (QueryCondition condition : conditions) { + if (departKey.equals(condition.getField())) { + departCondition = condition; + break; } - } catch (UnsupportedEncodingException e) { - log.error("查询用户信息，查询条件json转化失败", e); } for (SysUser user : list) { @@ -999,13 +996,9 @@ public class SysBaseApiImpl implements ISysBaseAPI { QueryRuleEnum rule = QueryRuleEnum.getByValue(departCondition.getRule()); String conditionVal = departCondition.getVal(); if (rule == QueryRuleEnum.EMPTY) { - if (departIds == null || departIds.size() == 0) { - return true; - } + return departIds == null || departIds.size() == 0; } else if (rule == QueryRuleEnum.NOT_EMPTY) { - if (departIds != null && departIds.size() > 0) { - return true; - } + return departIds != null && departIds.size() > 0; } else { if (oConvertUtils.isEmpty(conditionVal)) { return false; @@ -1020,21 +1013,13 @@ public class SysBaseApiImpl implements ISysBaseAPI { conditionList = new ArrayList(Arrays.asList(conditionVal.split(","))); } if (rule == QueryRuleEnum.EQ) { - if (oConvertUtils.isEqList(conditionList, departIds)) { - return true; - } + return oConvertUtils.isEqList(conditionList, departIds); } else if (rule == QueryRuleEnum.NE) { - if (!oConvertUtils.isEqList(conditionList, departIds)) { - return true; - } + return !oConvertUtils.isEqList(conditionList, departIds); } else if (rule == QueryRuleEnum.IN) { - if (oConvertUtils.isInList(departIds, conditionList)) { - return true; - } + return oConvertUtils.isInList(departIds, conditionList); } else if (rule == QueryRuleEnum.NOT_IN) { - if (!oConvertUtils.isInList(departIds, conditionList)) { - return true; - } + return !oConvertUtils.isInList(departIds, conditionList); } } return false; @@ -1223,9 +1208,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { //update-begin---author:chenrui ---date:20240123 for：[QQYUN-7992]【online】工单申请下的online表单，未配置online表单开发菜单，操作报错无权限------------ sysPermission.setUrl(onlineAuthDTO.getOnlineWorkOrderUrl()); count = sysPermissionMapper.queryCountByUsername(username, sysPermission); - if (count <= 0) { - return false; - } + return count > 0; //update-end---author:chenrui ---date:20240123 for：[QQYUN-7992]【online】工单申请下的online表单，未配置online表单开发菜单，操作报错无权限------------ } } else { diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/util/SecurityUtil.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/util/SecurityUtil.java index 4c74047..904b7b9 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/util/SecurityUtil.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/util/SecurityUtil.java @@ -12,7 +12,7 @@ import cn.hutool.crypto.symmetric.SymmetricCrypto; */ public class SecurityUtil { /**加密key*/ - private static String key = "JEECGBOOT1423670"; + private static final String key = "JEECGBOOT1423670"; //---AES加密---------begin--------- /**加密 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/util/XssUtils.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/util/XssUtils.java index 1fbb380..0e6e924 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/util/XssUtils.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/util/XssUtils.java @@ -11,11 +11,11 @@ import java.util.regex.Pattern; */ public class XssUtils { - private static Pattern[] patterns = new Pattern[]{ + private static final Pattern[] patterns = new Pattern[]{ //Script fragments Pattern.compile("", Pattern.CASE_INSENSITIVE), //src='...' - Pattern.compile("src[\r\n]*=[\r\n]*\\\'(.*?)\\\'", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), + Pattern.compile("src[\r\n]*=[\r\n]*\\'(.*?)\\'", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), Pattern.compile("src[\r\n]*=[\r\n]*\\\"(.*?)\\\"", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), //script tags Pattern.compile("", Pattern.CASE_INSENSITIVE), diff --git a/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/NUSystemApplication.java b/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/NUSystemApplication.java index 51b5374..be26e9f 100644 --- a/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/NUSystemApplication.java +++ b/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/NUSystemApplication.java @@ -37,7 +37,7 @@ public class NUSystemApplication extends SpringBootServletInitializer { app.setDefaultProperties(defaultProperties); log.info("[JEECG] Elasticsearch Health Check Enabled: false" ); - ConfigurableApplicationContext application = app.run(args);; + ConfigurableApplicationContext application = app.run(args); Environment env = application.getEnvironment(); String ip = InetAddress.getLocalHost().getHostAddress(); String port = env.getProperty("server.port");