From a8935a49a04fe2384f8ad947a0ef35ef6fc337cc Mon Sep 17 00:00:00 2001 From: xuwei-fit2cloud Date: Tue, 16 Nov 2021 11:01:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/auth/api/dto/CurrentRoleDto.java | 1 - .../io/dataease/auth/config/F2CRealm.java | 17 +---- .../io/dataease/auth/entity/TokenInfo.java | 2 - .../dataease/auth/filter/F2CLinkFilter.java | 1 - .../io/dataease/auth/filter/JWTFilter.java | 2 - .../io/dataease/auth/server/AuthServer.java | 9 +-- .../auth/server/DynamicMenuServer.java | 1 - .../auth/service/impl/ShiroServiceImpl.java | 4 - .../java/io/dataease/auth/util/JWTUtils.java | 14 ---- .../java/io/dataease/auth/util/RsaUtil.java | 2 - .../base/mapper/ext/ExtAuthMapper.java | 1 - .../license/DefaultLicenseService.java | 3 - .../dataease/commons/utils/DeFileUtils.java | 8 +- .../io/dataease/commons/utils/LogUtil.java | 2 - .../XssAndSqlHttpServletRequestWrapper.java | 7 -- .../dataease/config/Knife4jConfiguration.java | 7 -- .../dataease/controller/IndexController.java | 1 - .../datasource/DatasourceController.java | 1 - .../controller/panel/server/LinkServer.java | 1 - .../controller/sys/MsgController.java | 1 - .../controller/sys/SysDeptController.java | 4 - .../main/java/io/dataease/dto/SysAuthDTO.java | 30 -------- .../job/sechedule/ScheduleManager.java | 21 ------ .../listener/LicCacheEventListener.java | 8 -- .../io/dataease/map/server/MapServer.java | 1 - .../java/io/dataease/map/utils/MapUtils.java | 8 -- .../dataease/plugins/config/PluginRunner.java | 1 - .../plugins/loader/ControllerLoader.java | 1 - .../plugins/loader/ModuleClassLoader.java | 3 - .../dataease/plugins/server/XOidcServer.java | 1 - .../plugins/server/XUserKeysServer.java | 1 - .../datasource/DatasourceProvider.java | 4 - .../provider/query/ck/CKQueryProvider.java | 16 +--- .../query/doris/DorisQueryProvider.java | 18 +---- .../provider/query/es/EsQueryProvider.java | 13 +--- .../query/hive/HiveQueryProvider.java | 18 +---- .../query/mongodb/MongoQueryProvider.java | 68 ----------------- .../query/mysql/MysqlQueryProvider.java | 14 ---- .../query/oracle/OracleQueryProvider.java | 14 ---- .../provider/query/pg/PgQueryProvider.java | 13 ---- .../query/redshift/RedshiftQueryProvider.java | 7 -- .../sqlserver/SqlserverQueryProvider.java | 12 --- .../service/chart/ChartViewService.java | 75 +------------------ .../service/dataset/DataSetTableService.java | 4 - .../dataset/DataSetTableTaskService.java | 3 - .../service/dataset/ExtractDataService.java | 31 -------- .../service/datasource/DatasourceService.java | 1 - .../service/message/SysMsgService.java | 41 ---------- .../service/panel/PanelLinkJumpService.java | 4 - .../service/panel/PanelLinkService.java | 1 - .../dataease/service/panel/ShareService.java | 9 --- .../io/dataease/service/sys/DeptService.java | 3 - .../dataease/service/system/EmailService.java | 2 - .../system/SystemParameterService.java | 19 ----- .../db/migration/V2__dataease_ddl.sql | 10 --- 55 files changed, 20 insertions(+), 544 deletions(-) diff --git a/backend/src/main/java/io/dataease/auth/api/dto/CurrentRoleDto.java b/backend/src/main/java/io/dataease/auth/api/dto/CurrentRoleDto.java index 65660c51d5..2b0635ca42 100644 --- a/backend/src/main/java/io/dataease/auth/api/dto/CurrentRoleDto.java +++ b/backend/src/main/java/io/dataease/auth/api/dto/CurrentRoleDto.java @@ -11,7 +11,6 @@ public class CurrentRoleDto implements Serializable { @ApiModelProperty("ID") private Long id; -// private String code; @ApiModelProperty("名称") private String name; } diff --git a/backend/src/main/java/io/dataease/auth/config/F2CRealm.java b/backend/src/main/java/io/dataease/auth/config/F2CRealm.java index ca9dd2f013..2c28324d83 100644 --- a/backend/src/main/java/io/dataease/auth/config/F2CRealm.java +++ b/backend/src/main/java/io/dataease/auth/config/F2CRealm.java @@ -94,14 +94,7 @@ public class F2CRealm extends AuthorizingRealm { if (username == null) { throw new AuthenticationException("token invalid"); } - // 使用缓存 - /*SysUserEntity user = authUserService.getUserById(userId); - if (user == null) { - throw new AuthenticationException("User didn't existed!"); - } - if (user.getEnabled()==0) { - throw new AuthenticationException("User is valid!"); - }*/ + SysUserEntity user = userWithId(userId); String pass = null; try { @@ -112,13 +105,7 @@ public class F2CRealm extends AuthorizingRealm { if (! JWTUtils.verify(token, tokenInfo, pass)) { throw new AuthenticationException("Username or password error"); } - /*// 使用缓存 - List currentRoleDtos = authUserService.roleInfos(user.getUserId()); - // 使用缓存 - List permissions = authUserService.permissions(user.getUserId()); - CurrentUserDto currentUserDto = BeanUtils.copyBean(new CurrentUserDto(), user); - currentUserDto.setRoles(currentRoleDtos); - currentUserDto.setPermissions(permissions);*/ + CurrentUserDto currentUserDto = queryCacheUserDto(user); return new SimpleAuthenticationInfo(currentUserDto, token, "f2cReam"); } diff --git a/backend/src/main/java/io/dataease/auth/entity/TokenInfo.java b/backend/src/main/java/io/dataease/auth/entity/TokenInfo.java index e018cca48a..ade63a71ce 100644 --- a/backend/src/main/java/io/dataease/auth/entity/TokenInfo.java +++ b/backend/src/main/java/io/dataease/auth/entity/TokenInfo.java @@ -13,8 +13,6 @@ public class TokenInfo implements Serializable { private Long userId; - /* private String idToken; */ - public String format(){ return username + "," +userId; } diff --git a/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java b/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java index c94900c4fc..47b961fc3a 100644 --- a/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java +++ b/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java @@ -39,7 +39,6 @@ public class F2CLinkFilter extends AnonymousFilter { panelLink.setPwd("dataease"); pwd = panelLink.getPwd(); }else { - /* pwd = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, panelLink.getPwd()); */ pwd = panelLink.getPwd(); } return JWTUtils.verifyLink(link_token, id, pwd); diff --git a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java index 3077a338a5..5f276d3139 100644 --- a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java +++ b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java @@ -53,11 +53,9 @@ public class JWTFilter extends BasicHttpAuthenticationFilter { if (ApiKeyHandler.isApiKeyCall(httpServletRequest)) { - // Long userId = ApiKeyHandler.getUser(httpServletRequest); ASKToken askToken = ApiKeyHandler.buildToken(httpServletRequest); - // UsernamePasswordToken usernamePasswordToken = new UsernamePasswordToken(userId.toString(), ApiKeyHandler.random); getSubject(request, response).login(askToken); return true; } diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java index 219a9c5a47..96183f4d35 100644 --- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java @@ -71,7 +71,6 @@ public class AuthServer implements AuthApi { LdapAddRequest ldapAddRequest = new LdapAddRequest(); ldapAddRequest.setUsers(new ArrayList(){{add(ldapUserEntity);}}); ldapAddRequest.setEnabled(1L); - // ldapAddRequest.setDeptId(1L); ldapAddRequest.setRoleIds(new ArrayList(){{add(2L);}}); sysUserService.validateExistUser(ldapUserEntity.getUsername(), ldapUserEntity.getNickname(), ldapUserEntity.getEmail()); sysUserService.saveLdapUsers(ldapAddRequest); @@ -191,13 +190,7 @@ public class AuthServer implements AuthApi { @Override public String getPublicKey() { return RsaProperties.publicKey; - } - - - /*@Override - public Boolean isLogin() { - return null; - }*/ + } } diff --git a/backend/src/main/java/io/dataease/auth/server/DynamicMenuServer.java b/backend/src/main/java/io/dataease/auth/server/DynamicMenuServer.java index 4ed2eb0270..6d2a02de7f 100644 --- a/backend/src/main/java/io/dataease/auth/server/DynamicMenuServer.java +++ b/backend/src/main/java/io/dataease/auth/server/DynamicMenuServer.java @@ -14,7 +14,6 @@ public class DynamicMenuServer implements DynamicMenuApi { @Override public List menus() { - //ServletUtils.getToken() return dynamicMenuService.load(null); } } diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java index 3546c799b5..547d191919 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java @@ -54,15 +54,11 @@ public class ShiroServiceImpl implements ShiroService { filterChainDefinitionMap.put("/dataset/field/fieldValues/**", ANON); filterChainDefinitionMap.put("/linkJump/queryPanelJumpInfo/**", ANON); - //未读消息数量 - // filterChainDefinitionMap.put("/api/sys_msg/unReadCount/**", ANON); - filterChainDefinitionMap.put("/**/*.json", ANON); filterChainDefinitionMap.put("/system/ui/**", ANON); filterChainDefinitionMap.put("/**/*.js", ANON); filterChainDefinitionMap.put("/**/*.css", ANON); filterChainDefinitionMap.put("/**/*.map", ANON); - // filterChainDefinitionMap.put("/axios.map", ANON); filterChainDefinitionMap.put("/api/auth/login", ANON); filterChainDefinitionMap.put("/api/auth/isPluginLoaded", ANON); diff --git a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java index 544c7a9cb8..6430011125 100644 --- a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java +++ b/backend/src/main/java/io/dataease/auth/util/JWTUtils.java @@ -39,9 +39,6 @@ public class JWTUtils { Verification verification = JWT.require(algorithm) .withClaim("username", tokenInfo.getUsername()) .withClaim("userId", tokenInfo.getUserId()); - /* if (StringUtils.isNotBlank(tokenInfo.getIdToken())) { - verification.withClaim("idToken", tokenInfo.getIdToken()); - } */ JWTVerifier verifier = verification.build(); verifier.verify(token); return true; @@ -55,22 +52,14 @@ public class JWTUtils { DecodedJWT jwt = JWT.decode(token); String username = jwt.getClaim("username").asString(); Long userId = jwt.getClaim("userId").asLong(); - // String idToken = jwt.getClaim("idToken").asString(); if (StringUtils.isEmpty(username) || ObjectUtils.isEmpty(userId) ){ DataEaseException.throwException("token格式错误！"); } TokenInfoBuilder tokenInfoBuilder = TokenInfo.builder().username(username).userId(userId); - /* if (StringUtils.isNotBlank(idToken)) { - tokenInfoBuilder.idToken(idToken); - } */ TokenInfo tokenInfo = tokenInfoBuilder.build(); return tokenInfo; } - - - - public static boolean needRefresh(String token){ Date exp = JWTUtils.getExp(token); return new Date().getTime() >= exp.getTime(); @@ -120,9 +109,6 @@ public class JWTUtils { Builder builder = JWT.create() .withClaim("username", tokenInfo.getUsername()) .withClaim("userId", tokenInfo.getUserId()); - /* if (StringUtils.isNotBlank(tokenInfo.getIdToken())) { - builder.withClaim("idToken", tokenInfo.getIdToken()); - } */ return builder.withExpiresAt(date).sign(algorithm); } catch (Exception e) { diff --git a/backend/src/main/java/io/dataease/auth/util/RsaUtil.java b/backend/src/main/java/io/dataease/auth/util/RsaUtil.java index 46c5ed282a..c810a70ab5 100644 --- a/backend/src/main/java/io/dataease/auth/util/RsaUtil.java +++ b/backend/src/main/java/io/dataease/auth/util/RsaUtil.java @@ -26,7 +26,6 @@ public class RsaUtil { PrivateKey privateKey = keyFactory.generatePrivate(pkcs8EncodedKeySpec5); Cipher cipher = Cipher.getInstance("RSA"); cipher.init(Cipher.DECRYPT_MODE, privateKey); -// byte[] result = cipher.doFinal(Base64.decodeBase64(text)); // 下面该用分段加密 byte[] result = null; byte[] b = Base64.decodeBase64(text); @@ -50,7 +49,6 @@ public class RsaUtil { PublicKey publicKey = keyFactory.generatePublic(x509EncodedKeySpec2); Cipher cipher = Cipher.getInstance("RSA"); cipher.init(Cipher.ENCRYPT_MODE, publicKey); - /*byte[] result = cipher.doFinal(text.getBytes());*/ // 下面该用分段加密 byte[] result = null; byte[] b = text.getBytes("utf-8"); diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.java index 9e987aa586..40662c1b59 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.java @@ -14,5 +14,4 @@ public interface ExtAuthMapper { List queryUserIdWithDeptIds(@Param("deptIds") List deptIds); List queryByResource(@Param("resourceId") String resourceId); - // Set queryUserIdWithRD(@Param("roleIds") List roleIds, @Param("deptIds") List deptIds); } diff --git a/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java b/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java index d57e6fc088..69113469ae 100644 --- a/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java +++ b/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java @@ -45,11 +45,8 @@ public class DefaultLicenseService { return f2CLicenseResponse; }catch (Exception e){ LogUtil.error(e.getMessage()); - // e.printStackTrace(); - // return F2CLicenseResponse.invalid(e.getMessage()); return F2CLicenseResponse.noRecord(); } - } diff --git a/backend/src/main/java/io/dataease/commons/utils/DeFileUtils.java b/backend/src/main/java/io/dataease/commons/utils/DeFileUtils.java index ad23617aa8..9106a22998 100644 --- a/backend/src/main/java/io/dataease/commons/utils/DeFileUtils.java +++ b/backend/src/main/java/io/dataease/commons/utils/DeFileUtils.java @@ -46,14 +46,8 @@ public class DeFileUtils { String path = filePath + fileName; // getCanonicalFile 可解析正确各种路径 File dest = new File(path).getCanonicalFile(); - // 检测是否存在目录 - if (!dest.getParentFile().exists()) { - if (!dest.getParentFile().mkdirs()) { -// System.out.println("was not successful."); - } - } + // 文件写入 - // file.transferTo(dest); FileOutputStream fileOutputStream = new FileOutputStream(dest); fileOutputStream.write(file.getBytes()); fileOutputStream.flush(); diff --git a/backend/src/main/java/io/dataease/commons/utils/LogUtil.java b/backend/src/main/java/io/dataease/commons/utils/LogUtil.java index 2bdaad2a8e..3ee0ebbfea 100644 --- a/backend/src/main/java/io/dataease/commons/utils/LogUtil.java +++ b/backend/src/main/java/io/dataease/commons/utils/LogUtil.java @@ -8,8 +8,6 @@ import java.io.PrintWriter; import java.io.StringWriter; public class LogUtil { - //日志工具类 -// public static final Log Logger = LogFactory.getLog(LogUtil.class); private static final String DEBUG = "DEBUG"; private static final String INFO = "INFO"; diff --git a/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java b/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java index dd0f688bbe..f8eeb778e3 100644 --- a/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java +++ b/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java @@ -124,12 +124,6 @@ public class XssAndSqlHttpServletRequestWrapper extends HttpServletRequestWrappe case '<': sb.append("＜");// 转义小于号 break; - // case '\'': - // sb.append("＇");// 转义单引号 - // break; - // case '\"': - // sb.append("＂");// 转义双引号 - // break; case '&': sb.append("＆");// 转义& break; @@ -261,7 +255,6 @@ public class XssAndSqlHttpServletRequestWrapper extends HttpServletRequestWrappe "<[\r\n| | ]*script[\r\n| | ]*>(.*?)", Pattern.CASE_INSENSITIVE); flag = scriptPattern.matcher(value).find(); if (flag) { - // threadLocal.set("包含XSS攻击脚本，请检查参数！"); return flag; } // Avoid anything in a diff --git a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java index ffd47c558f..b6e98f027c 100644 --- a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java +++ b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java @@ -62,13 +62,6 @@ public class Knife4jConfiguration implements BeanPostProcessor{ return defaultApi("系统管理", "io.dataease.controller.sys"); } - /*@Bean(value = "pluginsApi") - @Conditional(LicStatusCondition.class) - public Docket pluginsApi() { - return defaultApi("插件管理", "io.dataease.plugins.server"); - }*/ - - private ApiInfo apiInfo(){ return new ApiInfoBuilder() .title("DataEase") diff --git a/backend/src/main/java/io/dataease/controller/IndexController.java b/backend/src/main/java/io/dataease/controller/IndexController.java index c1ecfb139d..5d7ef017a7 100644 --- a/backend/src/main/java/io/dataease/controller/IndexController.java +++ b/backend/src/main/java/io/dataease/controller/IndexController.java @@ -49,7 +49,6 @@ public class IndexController { case valid: return "doc.html"; default: - // DataEaseException.throwException("Invalid License."); return "nolic.html"; } } diff --git a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java index 3c489d68f4..df0015db1d 100644 --- a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java +++ b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java @@ -68,7 +68,6 @@ public class DatasourceController { @PostMapping("/list/{goPage}/{pageSize}") public Pager> getDatasourceList(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception { Page page = PageHelper.startPage(goPage, pageSize, true); - // return PageUtils.setPageInfo(page, datasourceService.getDatasourceList(request)); return PageUtils.setPageInfo(page, datasourceService.gridQuery(request)); } diff --git a/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java b/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java index b4007adc7a..b1042ae8ec 100644 --- a/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java +++ b/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java @@ -67,7 +67,6 @@ public class LinkServer implements LinkApi { ValidateDto dto = new ValidateDto(); String resourceId = json; - /* String resourceId = request.getResourceId(); */ PanelLink one = panelLinkService.findOne(resourceId); dto.setResourceId(resourceId); if (ObjectUtils.isEmpty(one)){ diff --git a/backend/src/main/java/io/dataease/controller/sys/MsgController.java b/backend/src/main/java/io/dataease/controller/sys/MsgController.java index eddcc18bda..742c88628d 100644 --- a/backend/src/main/java/io/dataease/controller/sys/MsgController.java +++ b/backend/src/main/java/io/dataease/controller/sys/MsgController.java @@ -62,7 +62,6 @@ public class MsgController { if(null == AuthUtils.getUser() || (userId = AuthUtils.getUser().getUserId()) == null) { throw new RuntimeException("缺少用户ID"); } - // Long userId = request.get("userId"); return sysMsgService.queryCount(userId); } diff --git a/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java b/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java index 9670c6beda..4dc774c9a9 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java @@ -4,14 +4,10 @@ import io.dataease.base.domain.SysDept; import io.dataease.commons.utils.BeanUtils; import io.dataease.controller.ResultHolder; import io.dataease.controller.sys.base.BaseGridRequest; -/*import io.dataease.controller.sys.request.DeptCreateRequest; -import io.dataease.controller.sys.request.DeptDeleteRequest; -import io.dataease.controller.sys.request.DeptStatusRequest;*/ import io.dataease.controller.sys.response.DeptNodeResponse; import io.dataease.controller.sys.response.DeptTreeNode; import io.dataease.service.sys.DeptService; import io.swagger.annotations.Api; -/*import io.swagger.annotations.ApiOperation;*/ import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/backend/src/main/java/io/dataease/dto/SysAuthDTO.java b/backend/src/main/java/io/dataease/dto/SysAuthDTO.java index 26132f1b7f..73f7e135b0 100644 --- a/backend/src/main/java/io/dataease/dto/SysAuthDTO.java +++ b/backend/src/main/java/io/dataease/dto/SysAuthDTO.java @@ -15,34 +15,4 @@ import java.util.List; public class SysAuthDTO extends SysAuth { private List sysAuthDetails; - -// private List baseAuthDetails; -// -// private String authDetails; -// -// @Override -// public void setAuthDetails(String authDetails) { -// this.authDetails = authDetails; -// if(StringUtils.isNotEmpty(authDetails)){ -// try{ -// baseAuthDetails = JSON.parseArray(authDetails,BaseAuthDetail.class); -// }catch (Exception e){ -// e.printStackTrace(); -// //ignored -// } -// } -// } -// -// public List getBaseAuthDetails() { -// return baseAuthDetails; -// } -// -// public void setBaseAuthDetails(List baseAuthDetails) { -// this.baseAuthDetails = baseAuthDetails; -// } -// -// @Override -// public String getAuthDetails() { -// return authDetails; -// } } diff --git a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java index c8597498a5..21fbd3b034 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java +++ b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java @@ -75,9 +75,7 @@ public class ScheduleManager { triggerBuilder.withIdentity(triggerKey); Date nTimeByCron = getNTimeByCron(cron, startTime); -// if (startTime.before(new Date())) { triggerBuilder.startAt(nTimeByCron); -// } if (endTime != null) { if (endTime.before(nTimeByCron)) { @@ -160,9 +158,7 @@ public class ScheduleManager { triggerBuilder.withIdentity(triggerKey);// 触发器名,触发器组 Date nTimeByCron = getNTimeByCron(cron, startTime); -// if (startTime.before(new Date())) { triggerBuilder.startAt(nTimeByCron); -// } if (endTime != null) { if (endTime.before(nTimeByCron)) { @@ -179,14 +175,6 @@ public class ScheduleManager { trigger = (CronTrigger) triggerBuilder.build();// 创建Trigger对象 scheduler.rescheduleJob(triggerKey, trigger);// 修改一个任务的触发时间 - /** 方式一 ：调用 rescheduleJob 结束 */ - - /** 方式二：先删除，然后在创建一个新的Job */ - // JobDetail jobDetail = sched.getJobDetail(JobKey.jobKey(jobName, jobGroupName)); - // Class jobClass = jobDetail.getJobClass(); - // removeJob(jobName, jobGroupName, triggerName, triggerGroupName); - // addJob(jobName, jobGroupName, triggerName, triggerGroupName, jobClass, cron); - /** 方式二 ：先删除，然后在创建一个新的Job */ } catch (Exception e) { DataEaseException.throwException(e); } @@ -227,15 +215,6 @@ public class ScheduleManager { trigger = (SimpleTrigger) triggerBuilder.build();// 创建Trigger对象 scheduler.rescheduleJob(triggerKey, trigger);// 修改一个任务的触发时间 - - /** 方式一 ：调用 rescheduleJob 结束 */ - - /** 方式二：先删除，然后在创建一个新的Job */ - // JobDetail jobDetail = sched.getJobDetail(JobKey.jobKey(jobName, jobGroupName)); - // Class jobClass = jobDetail.getJobClass(); - // removeJob(jobName, jobGroupName, triggerName, triggerGroupName); - // addJob(jobName, jobGroupName, triggerName, triggerGroupName, jobClass, cron); - /** 方式二 ：先删除，然后在创建一个新的Job */ } } catch (Exception e) { diff --git a/backend/src/main/java/io/dataease/listener/LicCacheEventListener.java b/backend/src/main/java/io/dataease/listener/LicCacheEventListener.java index 94580d548d..cecc692cb2 100644 --- a/backend/src/main/java/io/dataease/listener/LicCacheEventListener.java +++ b/backend/src/main/java/io/dataease/listener/LicCacheEventListener.java @@ -21,20 +21,14 @@ public class LicCacheEventListener extends CacheEventListenerFactory implements @Override public void notifyElementRemoved(Ehcache ehcache, Element element) throws CacheException { - /*System.out.println("notifyElementRemoved");*/ } @Override public void notifyElementPut(Ehcache ehcache, Element element) throws CacheException { - - /*long expirationTime = element.getExpirationTime(); - System.out.println(expirationTime); - System.out.println("notifyElementPut");*/ } @Override public void notifyElementUpdated(Ehcache ehcache, Element element) throws CacheException { - /*System.out.println("notifyElementUpdated");*/ } /** @@ -51,12 +45,10 @@ public class LicCacheEventListener extends CacheEventListenerFactory implements @Override public void notifyElementEvicted(Ehcache ehcache, Element element) { - /*System.out.println("notifyElementEvicted");*/ } @Override public void notifyRemoveAll(Ehcache ehcache) { - /*System.out.println("notifyRemoveAll");*/ } @Override diff --git a/backend/src/main/java/io/dataease/map/server/MapServer.java b/backend/src/main/java/io/dataease/map/server/MapServer.java index ca88e64f55..d3cdc5af3e 100644 --- a/backend/src/main/java/io/dataease/map/server/MapServer.java +++ b/backend/src/main/java/io/dataease/map/server/MapServer.java @@ -28,7 +28,6 @@ public class MapServer implements MapApi { @Override public String asyncGeometry() { try { - // List areaEntities = MapUtils.readAreaEntity(); List areaEntities = mapService.areaEntities(); MapUtils.recursionWriteFull(areaEntities); }catch (Exception e) { diff --git a/backend/src/main/java/io/dataease/map/utils/MapUtils.java b/backend/src/main/java/io/dataease/map/utils/MapUtils.java index 79334df015..f3583ef57c 100644 --- a/backend/src/main/java/io/dataease/map/utils/MapUtils.java +++ b/backend/src/main/java/io/dataease/map/utils/MapUtils.java @@ -34,7 +34,6 @@ public class MapUtils { public static String formatCode(String code) { -// return code.substring(3); return code; } @@ -57,7 +56,6 @@ public class MapUtils { public static List readAreaEntity() { List> maps = readCodeList(); - // AreaEntity root = new AreaEntity; Map provinceMap = new ConcurrentHashMap<>(); Map cityMap = new ConcurrentHashMap<>(); @@ -66,7 +64,6 @@ public class MapUtils { AreaEntity china = root(); maps.stream().forEach(map -> { - // maps.stream().forEach(map -> { String province_code = map.get(Constants.PROVINCE_CODE).toString(); String city_code = map.get(Constants.CITY_CODE).toString(); String county_code = map.get(Constants.COUNTY_CODE).toString(); @@ -110,7 +107,6 @@ public class MapUtils { } } }); - // List treeNodes = provinceMap.entrySet().stream().map(Map.Entry::getValue).collect(Collectors.toList()); List result = new ArrayList<>(); result.add(china); return result; @@ -127,10 +123,6 @@ public class MapUtils { if (StrUtil.equals("1", mapResponse.getStatus()) && StrUtil.equalsAnyIgnoreCase("ok", mapResponse.getInfo()) && StrUtil.equalsAnyIgnoreCase("10000", mapResponse.getInfocode())) { List districts = mapResponse.getDistricts(); if (CollectionUtil.isNotEmpty(districts)) { - - /*District district = districts.get(0); - MapResultDto mapResultDto = buildGeometry(district, areaEntity); - writeFeatureFile(mapResultDto, areaEntity.getCode());*/ List kidFeatures = districts.stream().map(district -> buildFeature(district, areaEntity)).collect(Collectors.toList()); MapResultDto mapResultDto = buildGeometry(kidFeatures); writeFeatureFile(mapResultDto, areaEntity.getCode()); diff --git a/backend/src/main/java/io/dataease/plugins/config/PluginRunner.java b/backend/src/main/java/io/dataease/plugins/config/PluginRunner.java index bb91fe21ad..e04cf33318 100644 --- a/backend/src/main/java/io/dataease/plugins/config/PluginRunner.java +++ b/backend/src/main/java/io/dataease/plugins/config/PluginRunner.java @@ -47,7 +47,6 @@ public class PluginRunner implements ApplicationRunner { } } catch (Exception e) { LogUtil.error(e); - //e.printStackTrace(); } }); diff --git a/backend/src/main/java/io/dataease/plugins/loader/ControllerLoader.java b/backend/src/main/java/io/dataease/plugins/loader/ControllerLoader.java index 99c5cce463..45d57624bb 100644 --- a/backend/src/main/java/io/dataease/plugins/loader/ControllerLoader.java +++ b/backend/src/main/java/io/dataease/plugins/loader/ControllerLoader.java @@ -76,7 +76,6 @@ public class ControllerLoader { try { registerController(name); } catch (Exception e) { - // e.printStackTrace(); LogUtil.error(e); } }); diff --git a/backend/src/main/java/io/dataease/plugins/loader/ModuleClassLoader.java b/backend/src/main/java/io/dataease/plugins/loader/ModuleClassLoader.java index 5a357ae773..ab29523fe4 100644 --- a/backend/src/main/java/io/dataease/plugins/loader/ModuleClassLoader.java +++ b/backend/src/main/java/io/dataease/plugins/loader/ModuleClassLoader.java @@ -104,9 +104,6 @@ public class ModuleClassLoader extends URLClassLoader { byte[] classBytes = baos.toByteArray(); classBytesMap.put(className,classBytes); } - /*if (name.endsWith(".xml")) { - loadMapperXml(name); - }*/ } } catch (IOException e) { e.printStackTrace(); diff --git a/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java b/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java index debb306ccc..becea9e55a 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java @@ -36,7 +36,6 @@ public class XOidcServer { Map authParam = new HashMap<>(); authParam.put("response_type", "code"); authParam.put("state", "state"); - // authParam.put("redirect_uri", "http://localhost:9528"); oidcSettings.forEach(param -> { diff --git a/backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java b/backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java index e8b6e7623c..994eb8aac1 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XUserKeysServer.java @@ -24,7 +24,6 @@ public class XUserKeysServer { @PostMapping("validate") public String validate(ServletRequest request) { - // return ApiKeyHandler.getUser(WebUtils.toHttp(request)); return null; } diff --git a/backend/src/main/java/io/dataease/provider/datasource/DatasourceProvider.java b/backend/src/main/java/io/dataease/provider/datasource/DatasourceProvider.java index edc7380136..103a557da2 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/DatasourceProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/DatasourceProvider.java @@ -14,10 +14,6 @@ public abstract class DatasourceProvider { abstract public List getTables(DatasourceRequest datasourceRequest) throws Exception; -// public List getTableFileds(DatasourceRequest datasourceRequest) throws Exception { -// return new ArrayList<>(); -// }; - public void checkStatus(DatasourceRequest datasourceRequest) throws Exception { getData(datasourceRequest); } diff --git a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java index 47f29641ca..a2e9738d55 100644 --- a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java @@ -222,8 +222,7 @@ public class CKQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -328,8 +327,7 @@ public class CKQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -414,8 +412,7 @@ public class CKQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -525,8 +522,7 @@ public class CKQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -806,10 +802,8 @@ public class CKQueryProvider extends QueryProvider { whereName = originName; } if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) { whereValue = "''"; @@ -1028,10 +1022,8 @@ public class CKQueryProvider extends QueryProvider { String whereValue = ""; // 原始类型不是时间，在de中被转成时间的字段做处理 if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originField); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; diff --git a/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java index 9fb7b9eac1..ab74c1a3d1 100644 --- a/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java @@ -200,8 +200,7 @@ public class DorisQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -306,8 +305,7 @@ public class DorisQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -391,8 +389,7 @@ public class DorisQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -502,8 +499,7 @@ public class DorisQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -787,10 +783,8 @@ public class DorisQueryProvider extends QueryProvider { whereName = originName; } if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) { whereValue = "''"; @@ -962,10 +956,8 @@ public class DorisQueryProvider extends QueryProvider { whereName = originField; } if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; @@ -1019,10 +1011,8 @@ public class DorisQueryProvider extends QueryProvider { String whereValue = ""; // 原始类型不是时间，在de中被转成时间的字段做处理 if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; diff --git a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java index fa3babd645..d376cd3863 100644 --- a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java @@ -221,8 +221,7 @@ public class EsQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -346,8 +345,7 @@ public class EsQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -457,8 +455,7 @@ public class EsQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -734,10 +731,8 @@ public class EsQueryProvider extends QueryProvider { whereName = originName; } if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) { whereValue = "''"; @@ -923,10 +918,8 @@ public class EsQueryProvider extends QueryProvider { String whereValue = ""; // 原始类型不是时间，在de中被转成时间的字段做处理 if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originField); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; diff --git a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java index ea3cd6cdfd..950f0a2b90 100644 --- a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java @@ -180,8 +180,7 @@ public class HiveQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -286,8 +285,7 @@ public class HiveQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -372,8 +370,7 @@ public class HiveQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -483,8 +480,7 @@ public class HiveQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); + // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -764,10 +760,8 @@ public class HiveQueryProvider extends QueryProvider { whereName = originName; } if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) { -// whereValue = HiveConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) { whereValue = "''"; @@ -937,10 +931,8 @@ public class HiveQueryProvider extends QueryProvider { whereName = originField; } if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = HiveConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originField); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; @@ -993,10 +985,8 @@ public class HiveQueryProvider extends QueryProvider { String whereValue = ""; // 原始类型不是时间，在de中被转成时间的字段做处理 if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = HiveConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originField); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; diff --git a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java index 6ce769efbe..f03a466497 100644 --- a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java @@ -166,8 +166,6 @@ public class MongoQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -272,8 +270,6 @@ public class MongoQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -358,8 +354,6 @@ public class MongoQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -469,8 +463,6 @@ public class MongoQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -735,26 +727,10 @@ public class MongoQueryProvider extends QueryProvider { } else { originName = String.format(MongoConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); } -// if (field.getDeType() == DeTypeConstants.DE_TIME) { -// if (field.getDeExtractType() == DeTypeConstants.DE_STRING || field.getDeExtractType() == 5) { -// whereName = String.format(MongoConstants.STR_TO_DATE, originName, MongoConstants.DEFAULT_DATE_FORMAT); -// } -// if (field.getDeExtractType() == DeTypeConstants.DE_INT || field.getDeExtractType() == DeTypeConstants.DE_FLOAT || field.getDeExtractType() == 4) { -// String cast = String.format(MongoConstants.CAST, originName, MongoConstants.DEFAULT_INT_FORMAT) + "/1000"; -// whereName = String.format(MongoConstants.FROM_UNIXTIME, cast, MongoConstants.DEFAULT_DATE_FORMAT); -// } -// if (field.getDeExtractType() == DeTypeConstants.DE_TIME) { -// whereName = originName; -// } -// } else { -// whereName = originName; -// } whereName = originName; if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) { -// whereValue = MongoConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) { whereValue = "''"; @@ -800,20 +776,6 @@ public class MongoQueryProvider extends QueryProvider { originName = String.format(MongoConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName()); } -// if (field.getDeType() == DeTypeConstants.DE_TIME) { -// if (field.getDeExtractType() == DeTypeConstants.DE_STRING || field.getDeExtractType() == 5) { -// whereName = String.format(MongoConstants.STR_TO_DATE, originName, MongoConstants.DEFAULT_DATE_FORMAT); -// } -// if (field.getDeExtractType() == DeTypeConstants.DE_INT || field.getDeExtractType() == DeTypeConstants.DE_FLOAT || field.getDeExtractType() == 4) { -// String cast = String.format(MongoConstants.CAST, originName, MongoConstants.DEFAULT_INT_FORMAT) + "/1000"; -// whereName = String.format(MongoConstants.FROM_UNIXTIME, cast, MongoConstants.DEFAULT_DATE_FORMAT); -// } -// if (field.getDeExtractType() == DeTypeConstants.DE_TIME) { -// whereName = originName; -// } -// } else { -// whereName = originName; -// } whereName = originName; if (StringUtils.containsIgnoreCase(request.getOperator(), "in")) { @@ -882,28 +844,8 @@ public class MongoQueryProvider extends QueryProvider { private SQLObj getXFields(ChartViewFieldDTO x, String originField, String fieldAlias) { String fieldName = ""; if (x.getDeExtractType() == DeTypeConstants.DE_TIME) { -// if (x.getDeType() == DeTypeConstants.DE_INT || x.getDeType() == DeTypeConstants.DE_FLOAT) { -// fieldName = String.format(MongoConstants.UNIX_TIMESTAMP, originField) + "*1000"; -// } else if (x.getDeType() == DeTypeConstants.DE_TIME) { -// String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); -// fieldName = String.format(MongoConstants.DATE_FORMAT, originField, format); -// } else { -// fieldName = originField; -// } fieldName = originField; } else { -// if (x.getDeType() == DeTypeConstants.DE_TIME) { -// String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); -// if (x.getDeExtractType() == DeTypeConstants.DE_STRING) { -// fieldName = String.format(MongoConstants.DATE_FORMAT, originField, format); -// } else { -// String cast = String.format(MongoConstants.CAST, originField, MongoConstants.DEFAULT_INT_FORMAT) + "/1000"; -// String from_unixtime = String.format(MongoConstants.FROM_UNIXTIME, cast, MongoConstants.DEFAULT_DATE_FORMAT); -// fieldName = String.format(MongoConstants.DATE_FORMAT, from_unixtime, format); -// } -// } else { -// fieldName = originField; -// } fieldName = originField; } return SQLObj.builder() @@ -919,14 +861,6 @@ public class MongoQueryProvider extends QueryProvider { } else if (SQLConstants.DIMENSION_TYPE.contains(y.getDeType())) { fieldName = String.format(MongoConstants.AGG_FIELD, y.getSummary(), originField); } else { -// if (StringUtils.equalsIgnoreCase(y.getSummary(), "avg") || StringUtils.containsIgnoreCase(y.getSummary(), "pop")) { -// String cast = String.format(MongoConstants.CAST, originField, y.getDeType() == DeTypeConstants.DE_INT ? MongoConstants.DEFAULT_INT_FORMAT : MongoConstants.DEFAULT_FLOAT_FORMAT); -// String agg = String.format(MongoConstants.AGG_FIELD, y.getSummary(), cast); -// fieldName = String.format(MongoConstants.CAST, agg, MongoConstants.DEFAULT_FLOAT_FORMAT); -// } else { -// String cast = String.format(MongoConstants.CAST, originField, y.getDeType() == DeTypeConstants.DE_INT ? MongoConstants.DEFAULT_INT_FORMAT : MongoConstants.DEFAULT_FLOAT_FORMAT); -// fieldName = String.format(MongoConstants.AGG_FIELD, y.getSummary(), cast); -// } fieldName = String.format(MongoConstants.AGG_FIELD, y.getSummary(), originField); } return SQLObj.builder() @@ -943,10 +877,8 @@ public class MongoQueryProvider extends QueryProvider { String whereValue = ""; // 原始类型不是时间，在de中被转成时间的字段做处理 if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = MongoConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originField); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index a6090f85a5..6db5c79d8d 100644 --- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -189,8 +189,6 @@ public class MysqlQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -295,8 +293,6 @@ public class MysqlQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -381,8 +377,6 @@ public class MysqlQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -492,8 +486,6 @@ public class MysqlQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -773,10 +765,8 @@ public class MysqlQueryProvider extends QueryProvider { whereName = originName; } if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) { whereValue = "''"; @@ -946,10 +936,8 @@ public class MysqlQueryProvider extends QueryProvider { whereName = originField; } if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originField); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; @@ -1002,10 +990,8 @@ public class MysqlQueryProvider extends QueryProvider { String whereValue = ""; // 原始类型不是时间，在de中被转成时间的字段做处理 if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originField); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java index 182efce285..42fae9cddf 100644 --- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java @@ -237,8 +237,6 @@ public class OracleQueryProvider extends QueryProvider { String fieldAlias = String.format(OracleConstants.ALIAS_FIX, String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i)); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -344,8 +342,6 @@ public class OracleQueryProvider extends QueryProvider { String fieldAlias = String.format(OracleConstants.ALIAS_FIX, String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i)); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -430,8 +426,6 @@ public class OracleQueryProvider extends QueryProvider { String fieldAlias = String.format(OracleConstants.ALIAS_FIX, String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i)); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -542,8 +536,6 @@ public class OracleQueryProvider extends QueryProvider { String fieldAlias = String.format(OracleConstants.ALIAS_FIX, String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i)); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -828,10 +820,8 @@ public class OracleQueryProvider extends QueryProvider { whereName = originName; } if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) { whereValue = "''"; @@ -1020,10 +1010,8 @@ public class OracleQueryProvider extends QueryProvider { whereName = originField; } if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; @@ -1076,10 +1064,8 @@ public class OracleQueryProvider extends QueryProvider { String whereValue = ""; // 原始类型不是时间，在de中被转成时间的字段做处理 if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; diff --git a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java index 050dd33baa..a82cbef61b 100644 --- a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java @@ -82,7 +82,6 @@ public class PgQueryProvider extends QueryProvider { case "float8": case "money": return DeTypeConstants.DE_FLOAT;// 浮点 -// case "bool": case "TINYINT": return DeTypeConstants.DE_BOOL;// 布尔 case "bytea": @@ -212,8 +211,6 @@ public class PgQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -319,8 +316,6 @@ public class PgQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -406,8 +401,6 @@ public class PgQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -518,8 +511,6 @@ public class PgQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -803,10 +794,8 @@ public class PgQueryProvider extends QueryProvider { whereName = originName; } if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) { whereValue = "''"; @@ -991,10 +980,8 @@ public class PgQueryProvider extends QueryProvider { String whereValue = ""; // 原始类型不是时间，在de中被转成时间的字段做处理 if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; diff --git a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java index 2dda33e3e1..078f443178 100644 --- a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java @@ -91,7 +91,6 @@ public class RedshiftQueryProvider extends QueryProvider { case "float8": case "money": return DeTypeConstants.DE_FLOAT;// 浮点 -// case "bool": case "TINYINT": return DeTypeConstants.DE_BOOL;// 布尔 case "bytea": @@ -221,8 +220,6 @@ public class RedshiftQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -347,8 +344,6 @@ public class RedshiftQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -459,8 +454,6 @@ public class RedshiftQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() diff --git a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java index f07644a423..e5e31e2df2 100644 --- a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java @@ -189,8 +189,6 @@ public class SqlserverQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -280,8 +278,6 @@ public class SqlserverQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -359,8 +355,6 @@ public class SqlserverQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -482,8 +476,6 @@ public class SqlserverQueryProvider extends QueryProvider { String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i); // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); - // 处理横轴过滤 -// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() @@ -753,10 +745,8 @@ public class SqlserverQueryProvider extends QueryProvider { whereName = originName; } if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) { whereValue = "''"; @@ -948,10 +938,8 @@ public class SqlserverQueryProvider extends QueryProvider { String whereValue = ""; // 原始类型不是时间，在de中被转成时间的字段做处理 if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { -// whereValue = MySQLConstants.WHERE_VALUE_NULL; whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { -// whereTerm = String.format(whereTerm, originName); whereValue = ""; } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "empty")) { whereValue = "''"; diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 95f85e960b..543e0a60ec 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -380,17 +380,6 @@ public class ChartViewService { } } data = datasourceProvider.getData(datasourceRequest); - /** - * 直连不实用缓存 - String key = "provider_sql_"+datasourceRequest.getDatasource().getId() + "_" + datasourceRequest.getTable() + "_" +datasourceRequest.getQuery(); - Object cache; - if ((cache = CacheUtils.get(JdbcConstants.JDBC_PROVIDER_KEY, key)) == null) { - data = datasourceProvider.getData(datasourceRequest); - CacheUtils.put(JdbcConstants.JDBC_PROVIDER_KEY,key ,data, null, null); - }else { - data = (List) cache; - } - */ } else if (table.getMode() == 1) {// 抽取 // 连接doris，构建doris数据源查询 Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource"); @@ -410,22 +399,6 @@ public class ChartViewService { } else { datasourceRequest.setQuery(qp.getSQL(tableName, xAxis, yAxis, customFilter, extFilterList, ds, view)); } - /*// 定时抽取使用缓存 - Object cache; - // 仪表板有参数不实用缓存 - if (CollectionUtils.isNotEmpty(requestList.getFilter())) { - data = datasourceProvider.getData(datasourceRequest); - } - // 仪表板无参数 且 未缓存过该视图 则查询后缓存 - else if ((cache = CacheUtils.get(JdbcConstants.VIEW_CACHE_KEY, id)) == null) { - lock.lock(); - data = datasourceProvider.getData(datasourceRequest); - CacheUtils.put(JdbcConstants.VIEW_CACHE_KEY, id, data, null, null); - } - // 仪表板有缓存 使用缓存 - else { - data = (List) cache; - }*/ // 仪表板有参数不实用缓存 if (!cache || CollectionUtils.isNotEmpty(requestList.getFilter()) || CollectionUtils.isNotEmpty(requestList.getLinkageFilters()) @@ -444,10 +417,6 @@ public class ChartViewService { } } } -// // 返回数据量判定 -// if (StringUtils.equalsIgnoreCase("custom", view.getResultMode()) && data.size() > view.getResultCount()) { -// data = data.subList(0, view.getResultCount()); -// } Map map = new TreeMap<>(); // 图表组件可再扩展 @@ -1303,11 +1272,7 @@ public class ChartViewService { chartQuotaDTO.setId(yAxis.get(j).getId()); quotaList.add(chartQuotaDTO); scatterChartDataDTO.setQuotaList(quotaList); -// try { -// axisChartDataDTO.setValue(new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i])); -// } catch (Exception e) { -// axisChartDataDTO.setValue(new BigDecimal(0)); -// } + if (CollectionUtils.isNotEmpty(extBubble) && extBubble.size() > 0) { try { scatterChartDataDTO.setValue(new Object[]{ @@ -1332,41 +1297,6 @@ public class ChartViewService { } } - /*for (String[] d : data) { - StringBuilder a = new StringBuilder(); - for (int i = 0; i < xAxis.size(); i++) { - if (i == xAxis.size() - 1) { - a.append(d[i]); - } else { - a.append(d[i]).append("\n"); - } - } - x.add(a.toString()); - for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) { - int j = i - xAxis.size(); - if (CollectionUtils.isNotEmpty(extBubble) && extBubble.size() > 0) { - try { - series.get(j).getData().add(new Object[]{ - a.toString(), - new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i]), - new BigDecimal(StringUtils.isEmpty(d[xAxis.size() + yAxis.size()]) ? "0" : d[xAxis.size() + yAxis.size()]) - }); - } catch (Exception e) { - series.get(j).getData().add(new Object[]{a.toString(), new BigDecimal(0), new BigDecimal(0)}); - } - } else { - try { - series.get(j).getData().add(new Object[]{ - a.toString(), - new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i]) - }); - } catch (Exception e) { - series.get(j).getData().add(new Object[]{a.toString(), new BigDecimal(0)}); - } - } - } - }*/ - map.put("x", x); map.put("series", series); return map; @@ -1404,9 +1334,6 @@ public class ChartViewService { } private void checkName(ChartViewWithBLOBs chartView) { -// if (StringUtils.isEmpty(chartView.getId())) { -// return; -// } ChartViewExample chartViewExample = new ChartViewExample(); ChartViewExample.Criteria criteria = chartViewExample.createCriteria(); if (StringUtils.isNotEmpty(chartView.getId())) { diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index e14690a455..b6b3cba7c2 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -243,8 +243,6 @@ public class DataSetTableService { // 更新数据和字段 if (update == 1) { if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql") || StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) { - // 删除所有字段，重新抽象 -// dataSetTableFieldsService.deleteByTableId(datasetTable.getId()); saveTableField(datasetTable); } } @@ -735,7 +733,6 @@ public class DataSetTableService { String sql; DatasourceRequest datasourceRequest = new DatasourceRequest(); -// JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class); Datasource ds; if (dataSetTableRequest.getMode() == 0) { ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId()); @@ -746,7 +743,6 @@ public class DataSetTableService { datasourceRequest.setDatasource(ds); sql = getCustomSQLDoris(dataTableInfoDTO, list); } -// String table = DorisTableUtils.dorisName(dataSetTableRequest.getId()); DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); // 使用输入的sql先预执行一次,并拿到所有字段 datasourceRequest.setQuery(sql); diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java index 96f44d4c22..651b3eb999 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java @@ -306,8 +306,5 @@ public class DataSetTableTaskService { if(!datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){ scheduleService.fireNow(datasetTableTask); } -// if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){ -// scheduleService.addSchedule(datasetTableTask); -// } } } diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 761cb7a744..628bfcb571 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -189,7 +189,6 @@ public class ExtractDataService { extractData(datasetTable, "all_scope"); replaceTable(DorisTableUtils.dorisName(datasetTableId)); saveSucessLog(datasetTableTaskLog); -// sendWebMsg(datasetTable, null, true); updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime); if(ops.equalsIgnoreCase("替换")){ dataSetTableFieldsService.deleteByTableId(datasetTable.getId()); @@ -199,7 +198,6 @@ public class ExtractDataService { } } catch (Exception e) { saveErrorLog(datasetTableId, null, e); -// sendWebMsg(datasetTable, null, false); updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null); dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId))); } finally { @@ -218,11 +216,9 @@ public class ExtractDataService { Long execTime = System.currentTimeMillis(); extractData(datasetTable, "incremental_add"); saveSucessLog(datasetTableTaskLog); -// sendWebMsg(datasetTable, null, true); updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime); } catch (Exception e) { saveErrorLog(datasetTableId, null, e); -// sendWebMsg(datasetTable, null, false); updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null); } finally { deleteFile("incremental_add", datasetTableId); @@ -691,20 +687,6 @@ public class ExtractDataService { startEntry.setLocation(100, 100); jobMeta.addJobEntry(startEntry); - //trans -// JobEntryTrans transrans = new JobEntryTrans(); -// transrans.clearResultFiles = true; -// transrans.clearResultRows = true; -// transrans.followingAbortRemotely = true; -// transrans.setTransname(transName); -// transrans.setName("Transformation"); -// JobEntryCopy transEntry = new JobEntryCopy(transrans); -// transEntry.setDrawn(true); -// transEntry.setLocation(300, 100); -// jobMeta.addJobEntry(transEntry); - -// jobMeta.addJobHop(new JobHopMeta(startEntry, transEntry)); - //exec shell JobEntryShell shell = new JobEntryShell(); shell.setScript(script); @@ -807,7 +789,6 @@ public class ExtractDataService { case ck: CHConfiguration chConfiguration = new Gson().fromJson(datasource.getConfiguration(), CHConfiguration.class); dataMeta = new DatabaseMeta("db", "ORACLE", "Native", chConfiguration.getHost().trim(), chConfiguration.getDataBase().trim(), chConfiguration.getPort().toString(), chConfiguration.getUsername(), chConfiguration.getPassword()); -// dataMeta.addExtraOption("MYSQL", "characterEncoding", "UTF-8"); dataMeta.setDatabaseType("Clickhouse"); transMeta.addDatabase(dataMeta); selectSQL = getSelectSQL(extractType, datasetTable, datasource, datasetTableFields, selectSQL); @@ -1010,7 +991,6 @@ public class ExtractDataService { } private StepMeta udjc(List datasetTableFields, DatasourceTypes datasourceType) { -// String needToChangeColumnType = ""; String handleBinaryTypeCode = ""; String excelCompletion = ""; @@ -1129,17 +1109,6 @@ public class ExtractDataService { " get(Fields.Out, filed).getValueMeta().setType(2);\n" + " \t}"; - -// private final static String alterColumnTypeCode = " if(\"FILED\".equalsIgnoreCase(filed)){\n" + -// "\t if(tmp != null && tmp.equalsIgnoreCase(\"Y\")){\n" + -// " get(Fields.Out, filed).setValue(r, 1);\n" + -// " get(Fields.Out, filed).getValueMeta().setType(2);\n" + -// " }else{\n" + -// " get(Fields.Out, filed).setValue(r, 0);\n" + -// " get(Fields.Out, filed).getValueMeta().setType(2);\n" + -// " }\n" + -// " }\n" ; - private final static String handleExcelIntColumn = " \t\tif(tmp != null && tmp.endsWith(\".0\")){\n" + " try {\n" + " Long.valueOf(tmp.substring(0, tmp.length()-2));\n" + diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index 928e85a57a..0341b3a6cf 100644 --- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -264,7 +264,6 @@ public class DatasourceService { public void updateDatasourceStatus(){ List datasources = datasourceMapper.selectByExampleWithBLOBs(new DatasourceExample()); datasources.forEach(datasource -> { - // checkAndUpdateDatasourceStatus(datasource); checkAndUpdateDatasourceStatus(datasource, true); }); } diff --git a/backend/src/main/java/io/dataease/service/message/SysMsgService.java b/backend/src/main/java/io/dataease/service/message/SysMsgService.java index 60d72f98f5..5ced46a695 100644 --- a/backend/src/main/java/io/dataease/service/message/SysMsgService.java +++ b/backend/src/main/java/io/dataease/service/message/SysMsgService.java @@ -56,33 +56,6 @@ public class SysMsgService { @Autowired private SystemParameterService systemParameterService; - /* public List query(Long userId, MsgRequest msgRequest) { - String orderClause = " create_time desc"; - SysMsgExample example = new SysMsgExample(); - SysMsgExample.Criteria criteria = example.createCriteria(); - criteria.andUserIdEqualTo(userId); - - List orders = msgRequest.getOrders(); - - if (CollectionUtils.isNotEmpty(orders)) { - orderClause = String.join(", ", orders); - } - - if (ObjectUtils.isNotEmpty(msgRequest.getType())) { - criteria.andTypeIdEqualTo(msgRequest.getType()); - } - - if (ObjectUtils.isNotEmpty(msgRequest.getStatus())) { - criteria.andStatusEqualTo(msgRequest.getStatus()); - } - - criteria.andCreateTimeGreaterThanOrEqualTo(overTime()); - - example.setOrderByClause(orderClause); - List sysMsgs = sysMsgMapper.selectByExample(example); - return sysMsgs; - } - */ public List queryGrid(Long userId, MsgRequest msgRequest, List typeIds, Long startTime) { String orderClause = " create_time desc"; SysMsgExample example = new SysMsgExample(); @@ -95,14 +68,6 @@ public class SysMsgService { orderClause = String.join(", ", orders); } - /*if (ObjectUtils.isNotEmpty(msgRequest.getType())) { - SysMsgTypeExample sysMsgTypeExample = new SysMsgTypeExample(); - sysMsgTypeExample.createCriteria().andPidEqualTo(msgRequest.getType()); - - List sysMsgTypes = sysMsgTypeMapper.selectByExample(sysMsgTypeExample); - List typeIds = sysMsgTypes.stream().map(SysMsgType::getMsgTypeId).collect(Collectors.toList()); - criteria.andTypeIdIn(typeIds); - }*/ if (CollectionUtils.isNotEmpty(typeIds)){ criteria.andTypeIdIn(typeIds); } @@ -112,7 +77,6 @@ public class SysMsgService { } criteria.andCreateTimeGreaterThanOrEqualTo(startTime); - /* criteria.andCreateTimeGreaterThanOrEqualTo(overTime()); */ example.setOrderByClause(orderClause); List msgGridDtos = extSysMsgMapper.queryGrid(example); @@ -212,12 +176,10 @@ public class SysMsgService { sysMsgSetting1.setTypeId(2L); sysMsgSetting1.setChannelId(1L); sysMsgSetting1.setEnable(true); - // sysMsgSetting1.setUserId(userId); SysMsgSetting sysMsgSetting2 = new SysMsgSetting(); sysMsgSetting2.setTypeId(6L); sysMsgSetting2.setChannelId(1L); sysMsgSetting2.setEnable(true); - //sysMsgSetting2.setUserId(userId); List lists = new ArrayList<>(); lists.add(sysMsgSetting1); lists.add(sysMsgSetting2); @@ -234,7 +196,6 @@ public class SysMsgService { public void updateSetting(MsgSettingRequest request, Long userId) { Long typeId = request.getTypeId(); Long channelId = request.getChannelId(); - // Long userId = AuthUtils.getUser().getUserId(); SysMsgSettingExample example = new SysMsgSettingExample(); example.createCriteria().andUserIdEqualTo(userId).andTypeIdEqualTo(typeId).andChannelIdEqualTo(channelId); List sysMsgSettings = sysMsgSettingMapper.selectByExample(example); @@ -307,13 +268,11 @@ public class SysMsgService { @Cacheable(value = SysMsgConstants.SYS_MSG_USER_SUBSCRIBE, key = "#userId") public List subscribes(Long userId) { SysMsgSettingExample example = new SysMsgSettingExample(); - /*example.createCriteria().andUserIdEqualTo(userId).andEnableEqualTo(true);*/ example.createCriteria().andUserIdEqualTo(userId); List sysMsgSettings = sysMsgSettingMapper.selectByExample(example); // 添加默认订阅 sysMsgSettings = addDefault(sysMsgSettings); sysMsgSettings = sysMsgSettings.stream().filter(SysMsgSetting::getEnable).collect(Collectors.toList()); - // sysMsgSettings.addAll(defaultSettings()); List resultLists = sysMsgSettings.stream().map(item -> { SubscribeNode subscribeNode = new SubscribeNode(); subscribeNode.setTypeId(item.getTypeId()); diff --git a/backend/src/main/java/io/dataease/service/panel/PanelLinkJumpService.java b/backend/src/main/java/io/dataease/service/panel/PanelLinkJumpService.java index 4bacb27143..441b926d3a 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelLinkJumpService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelLinkJumpService.java @@ -84,10 +84,6 @@ public class PanelLinkJumpService { public PanelLinkJumpDTO queryWithView(String panelId, String viewId) { PanelLinkJumpDTO resultInfo = extPanelLinkJumpMapper.queryWithViewId(panelId, viewId); - // 获取链接类型为仪表板的关联视图fieldId-PanelLinkJumpInfo Map 映射关系 -// Map mapJumpInfoArray = resultInfo.getLinkJumpInfoArray().stream().filter(jumpInfo -> StringUtils.isNotEmpty(jumpInfo.getFieldId())) -// .collect(Collectors.toMap(PanelLinkJumpInfoDTO::getFieldId, PanelViewLinkageDTO->PanelViewLinkageDTO)); -// resultInfo.setMapJumpInfoArray(mapJumpInfoArray); return resultInfo; } diff --git a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java index 6ed14cf166..cf693a739a 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java @@ -159,7 +159,6 @@ public class PanelLinkService { } if (StringUtils.isEmpty(panelLink.getPwd())) return false; boolean verify = JWTUtils.verifyLink(token, panelLink.getResourceId(), panelLink.getPwd()); - /* boolean verify = JWTUtils.verifyLink(token, panelLink.getResourceId(), decryptParam(panelLink.getPwd())); */ return verify; } diff --git a/backend/src/main/java/io/dataease/service/panel/ShareService.java b/backend/src/main/java/io/dataease/service/panel/ShareService.java index a85d9d4aa3..3ad24a291d 100644 --- a/backend/src/main/java/io/dataease/service/panel/ShareService.java +++ b/backend/src/main/java/io/dataease/service/panel/ShareService.java @@ -76,9 +76,6 @@ public class ShareService { PanelShareExample example = new PanelShareExample(); example.createCriteria().andPanelGroupIdEqualTo(panelGroupId); List panelShares = mapper.selectByExample(example); - /*if (CollectionUtils.isEmpty(panelShares)) { - return; - }*/ Map> typeSharedMap = panelShares.stream().map(this::convertNode).collect(Collectors.groupingBy(TempShareNode::getType)); for (Map.Entry> entry : authURDMap.entrySet()) { @@ -169,11 +166,6 @@ public class ShareService { private Map filterData(List newTargets, List shareNodes) { Map result = new HashMap<>(); - /*if (null == newTargets) { - result.put("add", new ArrayList<>()); - result.put("red", new ArrayList<>()); - return result; - }*/ List newUserIds = new ArrayList<>(); for (int i = 0; i < newTargets.size(); i++) { Long newTargetId = newTargets.get(i); @@ -264,7 +256,6 @@ public class ShareService { String msg = StringUtils.joinWith("，", panelGroups.stream().map(PanelGroup::getName).collect(Collectors.toList())); Gson gson = new Gson(); userIdSet.forEach(userId -> { - // DeMsgutil.sendMsg(userId, 0, user.getNickName()+" 分享了仪表板【"+msg+"】给您，请查收!"); DeMsgutil.sendMsg(userId, 2L, user.getNickName()+" 分享了仪表板【"+msg+"】给您，请查收!", gson.toJson(panelIds)); }); diff --git a/backend/src/main/java/io/dataease/service/sys/DeptService.java b/backend/src/main/java/io/dataease/service/sys/DeptService.java index 7eb30ae7c8..a0d0001a08 100644 --- a/backend/src/main/java/io/dataease/service/sys/DeptService.java +++ b/backend/src/main/java/io/dataease/service/sys/DeptService.java @@ -79,8 +79,6 @@ public class DeptService { @Transactional public int batchDelete(List requests){ - /* Integer index = ids.stream().map(sysDeptMapper::deleteByPrimaryKey).reduce(Integer::sum).orElse(-1); - return index;*/ List ids = requests.stream().map(request -> { Long pid = request.getPid(); if (pid != DEPT_ROOT_PID){ @@ -127,7 +125,6 @@ public class DeptService { public List nodesTreeByCondition(BaseGridRequest request){ - //DeptService proxy = proxy(); List allNodes = allNodes(); List targetNodes = nodeByCondition(request); if(CollectionUtils.isEmpty(targetNodes)){ diff --git a/backend/src/main/java/io/dataease/service/system/EmailService.java b/backend/src/main/java/io/dataease/service/system/EmailService.java index 04ef4da47f..5dcf384616 100644 --- a/backend/src/main/java/io/dataease/service/system/EmailService.java +++ b/backend/src/main/java/io/dataease/service/system/EmailService.java @@ -133,8 +133,6 @@ public class EmailService { public void editMail(List parameters) { - /*List paramList = this.getParamList(ParamConstants.Classify.MAIL.getValue()); - boolean empty = paramList.size() <= 0;*/ parameters.forEach(parameter -> { SystemParameterExample example = new SystemParameterExample(); if (parameter.getParamKey().equals(ParamConstants.MAIL.PASSWORD.getValue())) { diff --git a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java index 7381c0ed2b..8660ae17c5 100644 --- a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java +++ b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java @@ -35,8 +35,6 @@ public class SystemParameterService { @Resource private FileService fileService; - - public String searchEmail() { return extSystemParameterMapper.email(); } @@ -47,11 +45,9 @@ public class SystemParameterService { if (!CollectionUtils.isEmpty(paramList)) { for (SystemParameter param : paramList) { if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.FRONT_TIME_OUT.getValue())) { - /* result.setFrontTimeOut(StringUtils.isBlank(param.getParamValue()) ? 0 : Integer.parseInt(param.getParamValue())); */ result.setFrontTimeOut(param.getParamValue()); } if (StringUtils.equals(param.getParamKey(), ParamConstants.BASIC.MSG_TIME_OUT.getValue())) { - /* result.setMsgTimeOut(StringUtils.isBlank(param.getParamValue()) ? 0 : Integer.parseInt(param.getParamValue())); */ result.setMsgTimeOut(param.getParamValue()); } } @@ -59,10 +55,6 @@ public class SystemParameterService { return result; } - - - - public String getSystemLanguage() { String result = StringUtils.EMPTY; SystemParameterExample example = new SystemParameterExample(); @@ -77,10 +69,6 @@ public class SystemParameterService { return result; } - - - - public void editBasic(List parameters) { parameters.forEach(parameter -> { SystemParameterExample example = new SystemParameterExample(); @@ -102,14 +90,10 @@ public class SystemParameterService { return systemParameterMapper.selectByExample(example); } - - public String getVersion() { return System.getenv("MS_VERSION"); } - - public void saveLdap(List parameters) { SystemParameterExample example = new SystemParameterExample(); parameters.forEach(param -> { @@ -135,7 +119,6 @@ public class SystemParameterService { return param.getParamValue(); } - public List getSystemParameterInfo(String paramConstantsType) { List paramList = this.getParamList(paramConstantsType); List dtoList = new ArrayList<>(); @@ -154,8 +137,6 @@ public class SystemParameterService { return dtoList; } - - public void saveUIInfo(Map> request, List bodyFiles) throws IOException { List parameters = request.get("systemParams"); if (null != bodyFiles) diff --git a/backend/src/main/resources/db/migration/V2__dataease_ddl.sql b/backend/src/main/resources/db/migration/V2__dataease_ddl.sql index c0d973e7e5..a288556c43 100644 --- a/backend/src/main/resources/db/migration/V2__dataease_ddl.sql +++ b/backend/src/main/resources/db/migration/V2__dataease_ddl.sql @@ -25,16 +25,6 @@ CREATE TABLE IF NOT EXISTS `system_parameter` ( )ENGINE = InnoDB DEFAULT CHARSET = utf8mb4; -/*CREATE TABLE IF NOT EXISTS `user_role` ( - `id` varchar(50) NOT NULL COMMENT 'ID of user''s role info', - `user_id` varchar(50) NOT NULL COMMENT 'User ID of this user-role info', - `role_id` varchar(50) NOT NULL COMMENT 'Role ID of this user-role info', - `source_id` varchar(50) DEFAULT NULL COMMENT 'The (system|organization|workspace) ID of this user-role info', - `create_time` bigint(13) NOT NULL COMMENT 'Create timestamp', - `update_time` bigint(13) NOT NULL COMMENT 'Update timestamp', - PRIMARY KEY (`id`) -)ENGINE = InnoDB -DEFAULT CHARSET = utf8mb4;*/ CREATE TABLE `datasource` ( `id` varchar(50) NOT NULL DEFAULT '' COMMENT 'ID',