From 1ec001c3d7b887374fe7239906d92af78352889c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 24 Jun 2021 14:00:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=20unused=20impor?= =?UTF-8?q?ts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/ext/ExtDataSetTaskMapper.java | 1 - .../base/mapper/ext/ExtPanelShareMapper.java | 1 - .../mapper/ext/ExtPanelTemplateMapper.java | 1 - .../base/mapper/ext/ExtPanelViewMapper.java | 1 - .../mapper/ext/ExtPluginSysMenuMapper.java | 2 -- .../mapper/ext/ExtSysAuthDetailMapper.java | 3 -- .../io/dataease/commons/utils/AuthUtils.java | 13 ------- .../io/dataease/commons/utils/Md5Utils.java | 7 ---- .../io/dataease/commons/utils/TreeUtils.java | 2 -- .../dataease/controller/I18nController.java | 2 -- .../controller/SystemParameterController.java | 3 -- .../handler/ResultResponseBodyAdvice.java | 11 ------ .../panel/PanelDesignController.java | 8 ----- .../panel/PanelSubjectController.java | 4 --- .../controller/panel/server/ShareServer.java | 1 - .../request/chart/ChartGroupRequest.java | 1 - .../request/panel/PanelGroupRequest.java | 1 - .../controller/sys/SysDeptController.java | 1 - .../controller/sys/SysMenuController.java | 2 -- .../controller/sys/SysRoleController.java | 1 - .../sys/response/DeptNodeResponse.java | 1 - .../datasource/dto/SqlServerConfigration.java | 1 - .../io/dataease/dto/panel/po/PanelViewPo.java | 1 - .../dataease/job/sechedule/DeScheduleJob.java | 8 +++-- .../job/sechedule/ScheduleManager.java | 36 +++++++++---------- .../listener/DataSourceInitStartListener.java | 5 --- .../notice/sender/AbstractNoticeSender.java | 1 - .../notice/service/NoticeService.java | 1 - .../dataease/plugins/config/LoadjarUtil.java | 2 -- .../service/chart/ChartViewService.java | 3 -- .../service/dataset/ExtractDataService.java | 1 - .../service/panel/PanelGroupService.java | 9 ----- .../service/panel/PanelTemplateService.java | 1 - .../service/panel/PanelViewService.java | 2 -- .../dataease/service/panel/ShareService.java | 3 -- .../system/SystemParameterService.java | 7 ---- 36 files changed, 21 insertions(+), 127 deletions(-) diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java index 870cc1863d..16356e5c1c 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java @@ -3,7 +3,6 @@ package io.dataease.base.mapper.ext; import io.dataease.base.domain.DatasetTableTaskLog; import io.dataease.dto.dataset.DataSetTaskLogDTO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.java index bdd70c8719..a676b133e6 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.java @@ -2,7 +2,6 @@ package io.dataease.base.mapper.ext; import io.dataease.base.domain.PanelShare; import io.dataease.base.mapper.ext.query.GridExample; -import io.dataease.dto.panel.PanelShareDto; import io.dataease.dto.panel.PanelSharePo; import org.apache.ibatis.annotations.Param; diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.java index 4fa75ff3ef..3d5acda362 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.java @@ -1,7 +1,6 @@ package io.dataease.base.mapper.ext; import io.dataease.controller.request.panel.PanelTemplateRequest; -import io.dataease.dto.panel.PanelGroupDTO; import io.dataease.dto.panel.PanelTemplateDTO; import org.apache.ibatis.annotations.Param; diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java index 85d7f46f6e..99f3d9f24f 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java @@ -1,7 +1,6 @@ package io.dataease.base.mapper.ext; import io.dataease.dto.panel.PanelViewDto; -import io.dataease.dto.panel.po.PanelViewPo; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPluginSysMenuMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPluginSysMenuMapper.java index 8cf09f813a..d7e3068ffb 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPluginSysMenuMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPluginSysMenuMapper.java @@ -1,7 +1,5 @@ package io.dataease.base.mapper.ext; -import io.dataease.base.mapper.ext.query.GridExample; -import io.dataease.controller.sys.request.SimpleTreeNode; import io.dataease.plugins.common.dto.PluginSysMenu; import org.apache.ibatis.annotations.Param; diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysAuthDetailMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysAuthDetailMapper.java index 8d40f1726e..7fd97b6165 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysAuthDetailMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysAuthDetailMapper.java @@ -1,9 +1,6 @@ package io.dataease.base.mapper.ext; import io.dataease.base.domain.SysAuthDetail; -import io.dataease.controller.request.SysAuthDetailRequest; -import io.dataease.controller.request.SysAuthRequest; -import io.dataease.dto.SysAuthDTO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java b/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java index e84b597d2d..fbfce091f0 100644 --- a/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java +++ b/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java @@ -1,9 +1,6 @@ package io.dataease.commons.utils; import io.dataease.auth.api.dto.CurrentUserDto; -import io.dataease.auth.entity.TokenInfo; -import io.dataease.auth.util.JWTUtils; -import io.dataease.base.domain.SysUser; import io.dataease.service.sys.SysUserService; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -19,16 +16,6 @@ public class AuthUtils { AuthUtils.sysUserService = sysUserService; } - /*public static SysUser getUser(){ - SecurityUtils.getSubject().getPrincipal() - String token = ServletUtils.getToken(); - TokenInfo tokenInfo = JWTUtils.tokenInfoByToken(token); - SysUser sysUser = new SysUser(); - sysUser.setUserId(tokenInfo.getUserId()); - SysUser user = sysUserService.findOne(sysUser); - return user; - }*/ - public static CurrentUserDto getUser(){ CurrentUserDto userDto = (CurrentUserDto)SecurityUtils.getSubject().getPrincipal(); return userDto; diff --git a/backend/src/main/java/io/dataease/commons/utils/Md5Utils.java b/backend/src/main/java/io/dataease/commons/utils/Md5Utils.java index aeb2ab72a6..a093061ae8 100644 --- a/backend/src/main/java/io/dataease/commons/utils/Md5Utils.java +++ b/backend/src/main/java/io/dataease/commons/utils/Md5Utils.java @@ -1,13 +1,6 @@ package io.dataease.commons.utils; -import java.util.List; -import java.io.File; import java.security.MessageDigest; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; public class Md5Utils { private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; diff --git a/backend/src/main/java/io/dataease/commons/utils/TreeUtils.java b/backend/src/main/java/io/dataease/commons/utils/TreeUtils.java index a85c6a6e22..d7cfb3e13e 100644 --- a/backend/src/main/java/io/dataease/commons/utils/TreeUtils.java +++ b/backend/src/main/java/io/dataease/commons/utils/TreeUtils.java @@ -1,8 +1,6 @@ package io.dataease.commons.utils; import io.dataease.commons.model.ITreeBase; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.util.Assert; import java.util.*; diff --git a/backend/src/main/java/io/dataease/controller/I18nController.java b/backend/src/main/java/io/dataease/controller/I18nController.java index d6e37eab59..fafc89094d 100644 --- a/backend/src/main/java/io/dataease/controller/I18nController.java +++ b/backend/src/main/java/io/dataease/controller/I18nController.java @@ -10,8 +10,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/backend/src/main/java/io/dataease/controller/SystemParameterController.java b/backend/src/main/java/io/dataease/controller/SystemParameterController.java index 8bb20f7223..14c7b5ebef 100644 --- a/backend/src/main/java/io/dataease/controller/SystemParameterController.java +++ b/backend/src/main/java/io/dataease/controller/SystemParameterController.java @@ -2,13 +2,10 @@ package io.dataease.controller; import io.dataease.base.domain.SystemParameter; import io.dataease.commons.constants.ParamConstants; -import io.dataease.commons.constants.RoleConstants; -import io.dataease.dto.BaseSystemConfigDTO; import io.dataease.dto.SystemParameterDTO; import io.dataease.notice.domain.MailInfo; import io.dataease.service.FileService; import io.dataease.service.system.SystemParameterService; -import org.apache.shiro.authz.annotation.RequiresRoles; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/backend/src/main/java/io/dataease/controller/handler/ResultResponseBodyAdvice.java b/backend/src/main/java/io/dataease/controller/handler/ResultResponseBodyAdvice.java index 23e2166843..e7c1a8d213 100644 --- a/backend/src/main/java/io/dataease/controller/handler/ResultResponseBodyAdvice.java +++ b/backend/src/main/java/io/dataease/controller/handler/ResultResponseBodyAdvice.java @@ -1,17 +1,10 @@ package io.dataease.controller.handler; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.JavaBeanSerializer; -import com.alibaba.fastjson.serializer.ObjectSerializer; -import com.alibaba.fastjson.serializer.SerializeConfig; import com.google.gson.Gson; -import io.dataease.commons.constants.I18nConstants; import io.dataease.controller.ResultHolder; import io.dataease.controller.handler.annotation.I18n; import io.dataease.controller.handler.annotation.NoResultHolder; import io.dataease.i18n.Translator; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; @@ -22,10 +15,6 @@ import org.springframework.http.server.ServerHttpResponse; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; -import java.lang.reflect.Array; -import java.util.Collection; -import java.util.Map; - /** * 统一处理返回结果集 */ diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelDesignController.java b/backend/src/main/java/io/dataease/controller/panel/PanelDesignController.java index 73217192db..a4e9a09a0f 100644 --- a/backend/src/main/java/io/dataease/controller/panel/PanelDesignController.java +++ b/backend/src/main/java/io/dataease/controller/panel/PanelDesignController.java @@ -1,12 +1,9 @@ package io.dataease.controller.panel; -import io.dataease.controller.request.panel.PanelGroupRequest; -import io.dataease.dto.panel.PanelGroupDTO; import io.dataease.service.panel.PanelGroupService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.List; /** * Author: wangjiahao @@ -20,11 +17,6 @@ public class PanelDesignController { @Resource private PanelGroupService panelGroupService; -// @GetMapping("/find/{id}") -// public void deleteCircle(@PathVariable String id) { -// panelGroupService.deleteCircle(id); -// } - @PostMapping("/saveDesign/{id}") public void deleteCircle(@PathVariable String id) { panelGroupService.deleteCircle(id); diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelSubjectController.java b/backend/src/main/java/io/dataease/controller/panel/PanelSubjectController.java index 75b3fa3ab7..6164643ff5 100644 --- a/backend/src/main/java/io/dataease/controller/panel/PanelSubjectController.java +++ b/backend/src/main/java/io/dataease/controller/panel/PanelSubjectController.java @@ -1,12 +1,8 @@ package io.dataease.controller.panel; import io.dataease.base.domain.PanelSubject; -import io.dataease.base.domain.PanelTemplateWithBLOBs; import io.dataease.controller.request.panel.PanelSubjectRequest; -import io.dataease.controller.request.panel.PanelTemplateRequest; -import io.dataease.dto.panel.PanelTemplateDTO; import io.dataease.service.panel.PanelSubjectService; -import io.dataease.service.panel.PanelTemplateService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/backend/src/main/java/io/dataease/controller/panel/server/ShareServer.java b/backend/src/main/java/io/dataease/controller/panel/server/ShareServer.java index 82845e111b..1e5004197e 100644 --- a/backend/src/main/java/io/dataease/controller/panel/server/ShareServer.java +++ b/backend/src/main/java/io/dataease/controller/panel/server/ShareServer.java @@ -6,7 +6,6 @@ import io.dataease.controller.request.panel.PanelShareRequest; import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.dto.panel.PanelShareDto; import io.dataease.service.panel.ShareService; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/backend/src/main/java/io/dataease/controller/request/chart/ChartGroupRequest.java b/backend/src/main/java/io/dataease/controller/request/chart/ChartGroupRequest.java index a3f3c2514e..8ddcd1958c 100644 --- a/backend/src/main/java/io/dataease/controller/request/chart/ChartGroupRequest.java +++ b/backend/src/main/java/io/dataease/controller/request/chart/ChartGroupRequest.java @@ -1,7 +1,6 @@ package io.dataease.controller.request.chart; import io.dataease.base.domain.ChartGroup; -import io.dataease.base.domain.DatasetGroup; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/controller/request/panel/PanelGroupRequest.java b/backend/src/main/java/io/dataease/controller/request/panel/PanelGroupRequest.java index 09e3f1bf78..ccb7392b6f 100644 --- a/backend/src/main/java/io/dataease/controller/request/panel/PanelGroupRequest.java +++ b/backend/src/main/java/io/dataease/controller/request/panel/PanelGroupRequest.java @@ -1,6 +1,5 @@ package io.dataease.controller.request.panel; -import io.dataease.base.domain.PanelGroup; import io.dataease.dto.panel.PanelGroupDTO; import lombok.Data; 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 12aafad21b..6b322c6714 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java @@ -15,7 +15,6 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import java.util.List; import java.util.stream.Collectors; diff --git a/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java b/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java index f24e883f43..492d13ad57 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java @@ -8,8 +8,6 @@ import io.dataease.controller.handler.annotation.I18n; import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.controller.sys.request.MenuCreateRequest; import io.dataease.controller.sys.request.MenuDeleteRequest; -import io.dataease.controller.sys.request.SimpleTreeNode; -import io.dataease.controller.sys.response.DeptNodeResponse; import io.dataease.controller.sys.response.MenuNodeResponse; import io.dataease.controller.sys.response.MenuTreeNode; import io.dataease.service.sys.MenuService; diff --git a/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java b/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java index 2927dd94a1..a1bd02516f 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java @@ -7,7 +7,6 @@ import io.dataease.base.domain.SysRole; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; import io.dataease.controller.sys.base.BaseGridRequest; -import io.dataease.controller.sys.request.RoleGridRequest; import io.dataease.controller.sys.request.RoleMenusRequest; import io.dataease.controller.sys.response.RoleUserItem; import io.dataease.service.sys.SysRoleService; diff --git a/backend/src/main/java/io/dataease/controller/sys/response/DeptNodeResponse.java b/backend/src/main/java/io/dataease/controller/sys/response/DeptNodeResponse.java index a826a7f149..a7c61ad690 100644 --- a/backend/src/main/java/io/dataease/controller/sys/response/DeptNodeResponse.java +++ b/backend/src/main/java/io/dataease/controller/sys/response/DeptNodeResponse.java @@ -3,7 +3,6 @@ package io.dataease.controller.sys.response; import io.dataease.base.domain.SysDept; import lombok.Data; -import java.util.List; @Data public class DeptNodeResponse extends SysDept { diff --git a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java index 47ee64bce1..7282704586 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java +++ b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java @@ -2,7 +2,6 @@ package io.dataease.datasource.dto; import lombok.Getter; import lombok.Setter; -import org.apache.commons.lang3.StringUtils; @Getter diff --git a/backend/src/main/java/io/dataease/dto/panel/po/PanelViewPo.java b/backend/src/main/java/io/dataease/dto/panel/po/PanelViewPo.java index aa9b4fa013..8bde7f305b 100644 --- a/backend/src/main/java/io/dataease/dto/panel/po/PanelViewPo.java +++ b/backend/src/main/java/io/dataease/dto/panel/po/PanelViewPo.java @@ -1,6 +1,5 @@ package io.dataease.dto.panel.po; -import io.dataease.commons.model.ITreeBase; import lombok.Data; @Data diff --git a/backend/src/main/java/io/dataease/job/sechedule/DeScheduleJob.java b/backend/src/main/java/io/dataease/job/sechedule/DeScheduleJob.java index ecbf81d1e6..aad83dc740 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/DeScheduleJob.java +++ b/backend/src/main/java/io/dataease/job/sechedule/DeScheduleJob.java @@ -1,8 +1,11 @@ package io.dataease.job.sechedule; -import com.google.gson.Gson; import io.dataease.commons.utils.LogUtil; -import org.quartz.*; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.quartz.JobKey; +import org.quartz.JobDataMap; public abstract class DeScheduleJob implements Job { @@ -19,7 +22,6 @@ public abstract class DeScheduleJob implements Job { this.expression = jobDataMap.getString("expression"); this.taskId = jobDataMap.getString("taskId"); this.updateType = jobDataMap.getString("updateType"); - LogUtil.info(jobKey.getGroup() + " Running: " + datasetTableId); LogUtil.info("CronExpression: " + expression); businessExecute(context); 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 7c29437eca..4465c81c30 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java +++ b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java @@ -1,7 +1,22 @@ package io.dataease.job.sechedule; import io.dataease.commons.utils.LogUtil; -import org.quartz.*; +import org.quartz.Job; +import org.quartz.JobDataMap; +import org.quartz.JobKey; +import org.quartz.Scheduler; +import org.quartz.SchedulerException; +import org.quartz.TriggerKey; +import org.quartz.JobBuilder; +import org.quartz.JobDetail; +import org.quartz.SimpleTrigger; +import org.quartz.TriggerBuilder; +import org.quartz.SimpleScheduleBuilder; +import org.quartz.Trigger; +import org.quartz.CronScheduleBuilder; +import org.quartz.CronTrigger; +import org.quartz.CronExpression; +import org.quartz.JobExecutionContext; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -414,25 +429,6 @@ public class ScheduleManager { return returnMap; } -// public static Date getNTimeByCron(String cron) { -// try { -// CronTriggerImpl cronTriggerImpl = new CronTriggerImpl(); -// cronTriggerImpl.setCronExpression(cron); -// Calendar calendar = Calendar.getInstance(); -// Date now = calendar.getTime(); -//// calendar.add(java.util.Calendar.YEAR, 1); -// calendar.add(Calendar.MONTH, 2); -// -// List dates = TriggerUtils.computeFireTimesBetween(cronTriggerImpl, null, now, calendar.getTime()); -// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -// String nextTime = dateFormat.format(dates.get(0)); -// Date date = dateFormat.parse(nextTime); -// return date; -// } catch (Exception e) { -// throw new RuntimeException(e); -// } -// } - public static CronTrigger getCronTrigger(String cron) { if (!CronExpression.isValidExpression(cron)) { throw new RuntimeException("cron :" + cron + " error"); diff --git a/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java b/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java index 141361d560..a33ed18388 100644 --- a/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java +++ b/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java @@ -1,17 +1,12 @@ package io.dataease.listener; -import io.dataease.base.domain.DatasetTableTask; import io.dataease.datasource.service.DatasourceService; -import io.dataease.service.ScheduleService; import io.dataease.service.dataset.DataSetTableService; -import io.dataease.service.dataset.DataSetTableTaskService; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; - import javax.annotation.Resource; -import java.util.List; @Component @Order(value = 1) diff --git a/backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java b/backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java index e95e819c4e..d0a37fe1f9 100644 --- a/backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java +++ b/backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java @@ -5,7 +5,6 @@ import io.dataease.commons.constants.NoticeConstants; import io.dataease.commons.utils.LogUtil; import io.dataease.notice.domain.MessageDetail; import io.dataease.notice.domain.UserDetail; -/*import io.dataease.service.UserService;*/ import io.dataease.service.sys.SysUserService; import org.apache.commons.collections4.MapUtils; import org.apache.commons.io.IOUtils; diff --git a/backend/src/main/java/io/dataease/notice/service/NoticeService.java b/backend/src/main/java/io/dataease/notice/service/NoticeService.java index 10c2fc483a..170c1910ff 100644 --- a/backend/src/main/java/io/dataease/notice/service/NoticeService.java +++ b/backend/src/main/java/io/dataease/notice/service/NoticeService.java @@ -3,7 +3,6 @@ package io.dataease.notice.service; import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.base.domain.MessageTask; import io.dataease.base.domain.MessageTaskExample; -import io.dataease.base.domain.SysUser; import io.dataease.base.mapper.MessageTaskMapper; import io.dataease.commons.exception.DEException; import io.dataease.commons.utils.AuthUtils; diff --git a/backend/src/main/java/io/dataease/plugins/config/LoadjarUtil.java b/backend/src/main/java/io/dataease/plugins/config/LoadjarUtil.java index 56af7d0482..8637a0beb1 100644 --- a/backend/src/main/java/io/dataease/plugins/config/LoadjarUtil.java +++ b/backend/src/main/java/io/dataease/plugins/config/LoadjarUtil.java @@ -8,8 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; import java.net.URI; import java.net.URL; import java.util.List; 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 ad1f1a117e..1828eccdba 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -13,14 +13,11 @@ import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.controller.request.chart.ChartExtRequest; import io.dataease.controller.request.chart.ChartGroupRequest; import io.dataease.controller.request.chart.ChartViewRequest; -import io.dataease.controller.request.dataset.DataSetGroupRequest; import io.dataease.datasource.provider.DatasourceProvider; import io.dataease.datasource.provider.ProviderFactory; import io.dataease.datasource.request.DatasourceRequest; import io.dataease.datasource.service.DatasourceService; import io.dataease.dto.chart.*; -import io.dataease.dto.dataset.DataSetGroupDTO; -import io.dataease.dto.dataset.DataSetTableDTO; import io.dataease.dto.dataset.DataTableInfoDTO; import io.dataease.i18n.Translator; import io.dataease.provider.QueryProvider; 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 61cbf32eb4..19b85939a5 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -20,7 +20,6 @@ import io.dataease.datasource.provider.DatasourceProvider; import io.dataease.datasource.provider.JdbcProvider; import io.dataease.datasource.provider.ProviderFactory; import io.dataease.datasource.request.DatasourceRequest; -import io.dataease.dto.dataset.DataSetTaskLogDTO; import io.dataease.dto.dataset.DataTableInfoDTO; import io.dataease.provider.QueryProvider; import org.apache.commons.collections4.CollectionUtils; diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index 70e4c389e7..2a63827f7f 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -2,18 +2,13 @@ package io.dataease.service.panel; import io.dataease.base.domain.*; import io.dataease.base.mapper.ChartViewMapper; -import io.dataease.base.mapper.PanelDesignMapper; import io.dataease.base.mapper.PanelGroupMapper; -import io.dataease.base.mapper.ext.ExtPanelDesignMapper; import io.dataease.base.mapper.ext.ExtPanelGroupMapper; import io.dataease.commons.constants.PanelConstants; import io.dataease.commons.utils.AuthUtils; -import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.TreeUtils; import io.dataease.controller.request.panel.PanelGroupRequest; import io.dataease.dto.chart.ChartViewDTO; -import io.dataease.dto.dataset.DataSetGroupDTO; -import io.dataease.dto.panel.PanelDesignDTO; import io.dataease.dto.panel.PanelGroupDTO; import io.dataease.i18n.Translator; import io.dataease.service.chart.ChartViewService; @@ -22,17 +17,13 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; - import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID; -import java.util.stream.Collectors; /** * Author: wangjiahao diff --git a/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java b/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java index 02d2ff2775..7673fc3b4b 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java @@ -4,7 +4,6 @@ import io.dataease.base.domain.*; import io.dataease.base.mapper.PanelTemplateMapper; import io.dataease.base.mapper.ext.ExtPanelTemplateMapper; import io.dataease.commons.constants.CommonConstants; -import io.dataease.commons.constants.PanelConstants; import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.BeanUtils; import io.dataease.controller.request.panel.PanelTemplateRequest; diff --git a/backend/src/main/java/io/dataease/service/panel/PanelViewService.java b/backend/src/main/java/io/dataease/service/panel/PanelViewService.java index 7520493270..5ffe8fc8d0 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelViewService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelViewService.java @@ -1,10 +1,8 @@ package io.dataease.service.panel; import io.dataease.base.mapper.ext.ExtPanelViewMapper; -import io.dataease.base.mapper.ext.query.GridExample; import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.BeanUtils; -import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.dto.panel.PanelViewDto; import io.dataease.dto.panel.po.PanelViewPo; import org.apache.commons.collections.CollectionUtils; 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 d3b8d07708..6c2d7c1300 100644 --- a/backend/src/main/java/io/dataease/service/panel/ShareService.java +++ b/backend/src/main/java/io/dataease/service/panel/ShareService.java @@ -4,7 +4,6 @@ import io.dataease.auth.api.dto.CurrentRoleDto; import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.base.domain.PanelShare; import io.dataease.base.domain.PanelShareExample; -import io.dataease.base.domain.SysUser; import io.dataease.base.mapper.PanelShareMapper; import io.dataease.base.mapper.ext.ExtPanelShareMapper; import io.dataease.base.mapper.ext.query.GridExample; @@ -13,7 +12,6 @@ import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.CommonBeanFactory; import io.dataease.controller.request.panel.PanelShareRequest; import io.dataease.controller.sys.base.BaseGridRequest; -import io.dataease.controller.sys.base.ConditionEntity; import io.dataease.dto.panel.PanelShareDto; import io.dataease.dto.panel.PanelSharePo; import org.apache.commons.collections.CollectionUtils; @@ -22,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; 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 781695a777..cfabe1c283 100644 --- a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java +++ b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java @@ -1,12 +1,9 @@ package io.dataease.service.system; import com.alibaba.fastjson.JSON; -import com.google.gson.JsonObject; import io.dataease.base.domain.FileMetadata; import io.dataease.base.domain.SystemParameter; import io.dataease.base.domain.SystemParameterExample; -import io.dataease.base.mapper.FileContentMapper; -import io.dataease.base.mapper.FileMetadataMapper; import io.dataease.base.mapper.SystemParameterMapper; import io.dataease.base.mapper.ext.ExtSystemParameterMapper; import io.dataease.commons.constants.ParamConstants; @@ -14,7 +11,6 @@ import io.dataease.commons.exception.DEException; import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.EncryptUtils; import io.dataease.commons.utils.LogUtil; -import io.dataease.dto.BaseSystemConfigDTO; import io.dataease.dto.SystemParameterDTO; import io.dataease.i18n.Translator; import io.dataease.notice.domain.MailInfo; @@ -22,7 +18,6 @@ import io.dataease.service.FileService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; -import org.json.JSONObject; import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; @@ -35,8 +30,6 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import java.io.IOException; import java.io.InputStream; -import java.nio.file.FileStore; -import java.time.Instant; import java.util.*;