Bläddra i källkod

合并以前代码导致定时任务关闭 定时任务放开

LHB 2 månader sedan
förälder
incheckning
8b3c48efd2

+ 1 - 1
blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -2126,7 +2126,7 @@ public class TaskController extends BladeController {
     /**
      * 任务超时提示信息
      */
-//    @Scheduled(cron = "0 0 3 * * ?")
+    @Scheduled(cron = "0 0 3 * * ?")
     public void TaskTimeoutTips() {
         String key = "task.time.out";
         String value = ParamCache.getValue(key);

+ 1 - 1
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialDeviceInfoServiceImpl.java

@@ -87,7 +87,7 @@ public class TrialDeviceInfoServiceImpl extends BaseServiceImpl<TrialDeviceInfoM
      * 修改校验状态
      * cron = "0 0 1 * * ?" 每天1点执行
      */
-//    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 0 1 * * ?")
     public void syncUpdateIsCalibration() {
         //获取所有数据
         List<TrialDeviceInfo> trialDeviceInfos = baseMapper.selectList(Wrappers.<TrialDeviceInfo>lambdaQuery());

+ 3 - 3
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/WeatherInfoServiceImpl.java

@@ -120,7 +120,7 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
     /**
      * 获取当前系统所有项目下所有合同段的当天天气
      */
-//    @Scheduled(cron = "0 18 10 * * ?")
+    @Scheduled(cron = "0 18 10 * * ?")
     public void syncWeatherInfo() {
         if (!SystemUtils.isLinux()) {
             return;
@@ -178,7 +178,7 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
     /**
      * 同步历史天气
      */
-//    @Scheduled(cron = "0 0 8 * * ?")
+    @Scheduled(cron = "0 0 8 * * ?")
     public void syncHistoryWeatherInfo() {
         if (!SystemUtils.isLinux()) {
             return;
@@ -295,7 +295,7 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
     }
 
     //去除重复天气,并填充每个合同段缺失的天气
-//    @Scheduled(cron = "0 0 9 * * ?")
+    @Scheduled(cron = "0 0 9 * * ?")
     public void scanMissWeather(){
         if (!SystemUtils.isLinux()) {
             return;

+ 1 - 1
blade-service/blade-control/src/main/java/org/springblade/control/service/impl/PublicScheduledTaskServiceImpl.java

@@ -28,7 +28,7 @@ public class PublicScheduledTaskServiceImpl {
      * 定时删除费用管理的草稿数据信息
      * cron = 每天早上3点执行
      */
-//    @Scheduled(cron = "0 0 3 * * ?")
+    @Scheduled(cron = "0 0 3 * * ?")
     void delDraftDataInfo() {
         LocalDate currentDate = LocalDate.now();
         LocalTime midnight = LocalTime.MIDNIGHT;

+ 1 - 1
blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/EVController.java

@@ -58,7 +58,7 @@ public class EVController {
     @Resource(name = "taskExecutor1")
     private ThreadPoolExecutor executor;
 
-   // @Scheduled(cron = "0/10 * * * * ?")
+    @Scheduled(cron = "0/10 * * * * ?")
     public void SignInfo() {
         //执行代码
 

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsParamController.java

@@ -536,7 +536,7 @@ public class WbsParamController {
     }
 
      /*每天固定时间刷新treeCode*/
-//    @Scheduled(cron = " 0 0 3,13 * * ?")
+    @Scheduled(cron = " 0 0 3,13 * * ?")
     public  void job(){
         System.out.println("treeCode刷新任务开始"+ LocalDateTime.now());
         if(Optional.ofNullable(System.getProperty("os.name")).orElse(StringPool.EMPTY).equals("Linux")){
@@ -544,7 +544,7 @@ public class WbsParamController {
         }
     }
 
-//    @Scheduled(initialDelay = 100000,fixedDelay = 30000)
+    @Scheduled(initialDelay = 100000,fixedDelay = 30000)
     public  void monitor(){
         /*System.out.println("treeCode刷新检测"+ LocalDateTime.now());*/
         try {

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/job/SystemMsgJob.java

@@ -42,7 +42,7 @@ public class SystemMsgJob {
     /**
      *  定时推送公告-取消公告-修改公告状态,不想污染日志,使用jdbc
      */
-//    @Scheduled(cron = "0/10 * * * * ?")
+    @Scheduled(cron = "0/10 * * * * ?")
     public void autoUpdateMsgStatus(){
         // 本地环境跳过执行(可添加日志输出)
         if (!schedulerEnabled) return;

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/TableInfoServiceImpl.java

@@ -56,7 +56,7 @@ public class TableInfoServiceImpl extends BaseServiceImpl<TableInfoMapper, Table
      * 十分钟执行一次
      * 替换动态表中的阿里云地址
      */
-//    @Scheduled(cron = "0 */10 * * * ?")
+    @Scheduled(cron = "0 */10 * * * ?")
 //    @Scheduled(fixedDelay = 60000)
     public void aliyunUrlReplace() {
         System.out.println("执行阿里云地址替换-----------------------------开始");

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -3058,7 +3058,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
     /**
      * 修改initTableId
      */
-//    @Scheduled(cron = "0 0 3 * * ?")
+    @Scheduled(cron = "0 0 3 * * ?")
     public void updateInitTableId() {
         List<WbsTreePrivate> wbsTreePrivates = baseMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery().isNull(WbsTreePrivate::getInitTableId).isNotNull(WbsTreePrivate::getInitTableName).ne(WbsTreePrivate::getType, 1));
         List<TableInfo> list = baseMapper.selectTabInfoAll();

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeSynchronousRecordServiceImpl.java

@@ -234,7 +234,7 @@ public class WbsTreeSynchronousRecordServiceImpl extends ServiceImpl<WbsTreeSync
      * 同步节点表单
      * 定时检查同步任务,状态为1的数据如果最后更新时间与当前时间超过10分钟,则修改状态为1
      */
-//    @Scheduled(fixedDelay = 10000)
+    @Scheduled(fixedDelay = 10000)
     public void syncInit() {
         // 本地环境跳过执行(可添加日志输出)
         if (!schedulerEnabled) return;

+ 7 - 7
blade-service/blade-repair/src/main/java/org/springblade/repair/controller/CheckAndRepairController.java

@@ -53,7 +53,7 @@ public class CheckAndRepairController {
      */
     @RequestMapping("/checkAndRepairExcelHtml")
     @ApiOperation("定时检测修复ExcelHtml")
-//    @Scheduled(cron = "00 00 00 * * ?")
+    @Scheduled(cron = "00 00 00 * * ?")
     public void checkAndRepairExcelHtml() {
         StringBuilder result=new StringBuilder("");
         String sql = "Select * from m_excel_tab where  is_deleted=0 and file_url is  not null";
@@ -144,7 +144,7 @@ public class CheckAndRepairController {
     /**
      * 定时更新private和contract的html,通过is_private_type_id;保证一样
      */
-//    @Scheduled(cron = "0 0  3 * * ?")
+    @Scheduled(cron = "0 0  3 * * ?")
     public void checkAndRepairPrivateAndContractHtml() {
         System.out.println("开始扫描private和contract的html");
         StringBuilder result=new StringBuilder("");
@@ -169,7 +169,7 @@ public class CheckAndRepairController {
      * 定时更新private initTable或者excelID,保证一样
      */
     @GetMapping("/checkAndRepairPrivateInitTableAndExcelId")
-//    @Scheduled(cron = "0 30  1 * * ?")
+    @Scheduled(cron = "0 30  1 * * ?")
     public void checkAndRepairPrivateInitTableAndExcelId() {
         System.out.println("开始扫描private initTable和ExcelId");
         String privateSql="select p_key_id,init_table_name,excel_id,html_url from m_wbs_tree_private where type=2 AND is_deleted=0 AND (excel_id IS NULL OR init_table_name IS NULL OR html_url IS NULL)";
@@ -223,7 +223,7 @@ public class CheckAndRepairController {
      * 定时更新contract initTable或者excelID,保证一样
      */
     @GetMapping("/checkAndRepairContractInitTableAndExcelId")
-//    @Scheduled(cron = "0  00  2 * * ?")
+    @Scheduled(cron = "0  00  2 * * ?")
     public void checkAndRepairContractInitTableAndExcelId() {
         System.out.println("定时更新contract initTable和ExcelId");
         String contractSql="select p_key_id,init_table_name,excel_id,html_url from m_wbs_tree_contract where type=2 AND is_deleted=0 AND (excel_id IS NULL OR init_table_name IS NULL OR html_url IS NULL)";
@@ -289,7 +289,7 @@ public class CheckAndRepairController {
      * 定时检测excel文件后缀名
      */
     @GetMapping("/checkExcelExtension")
-//    @Scheduled(cron = "0 00  12 * * ?")
+    @Scheduled(cron = "0 00  12 * * ?")
     public void checkExcelExtension(){
         String sql="select id,name,extension from m_excel_tab where is_deleted=0";
         List<ExcelTab> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ExcelTab.class));
@@ -316,7 +316,7 @@ public class CheckAndRepairController {
      * 定时检测private html是否包含privateUrlCopy 但是不包括独立表单
      */
     @GetMapping("/checkPrivateHtmlIsCopy")
-//    @Scheduled(cron = "0 30 23 * * ?")
+    @Scheduled(cron = "0 30 23 * * ?")
     public void checkPrivateHtmlIsCopy(){
         String sql="select p_key_id,project_id,html_url from m_wbs_tree_private where is_deleted=0 and html_url  NOT LIKE '%privateUrlCopy%' AND type=2";
         List<WbsTreePrivate> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(WbsTreePrivate.class));
@@ -368,7 +368,7 @@ public class CheckAndRepairController {
      * 检查private html文件是否存在
      */
     @GetMapping("/checkPrivateHtmlIsExist")
-//    @Scheduled(cron = "0  0  3 * * ?")
+    @Scheduled(cron = "0  0  3 * * ?")
     public void checkPrivateHtmlIsExist() throws Exception {
         String sql="select p_key_id, excel_id,html_url from m_wbs_tree_private where html_url IS NOT NULL  and is_deleted=0";
         List<WbsTreePrivate> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(WbsTreePrivate.class));

+ 1 - 1
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -1088,7 +1088,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
     /**
      * 定时清理本地缓存信息,不在批量电签时删除,批量电签是多线程,会一直删除,导致缓存基本不生效(已废除Redis缓存,走本地缓存不需要Redis)
      */
-//    @Scheduled(fixedRate = 180000) //每3分钟执行一次
+    @Scheduled(fixedRate = 180000) //每3分钟执行一次
     public void clearContractLocalCacheAndRedisCache() {
         //获取锁
         ReentrantLock lock = new ReentrantLock();