Browse Source

修复sonarqube异味

lyq 1 year ago
parent
commit
127035466c

+ 7 - 8
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/AlarmEventServiceImpl.java

@@ -98,7 +98,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String address = eventsVo.getData().getAlarm().getPlaceName();
         CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
                 REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), DateUtils.getNowDate());
-        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
+        this.insertEventCatalogue(centereventTEventcatalogue);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -159,7 +159,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String address = eventsVo.getData().getText()[0].getOrgName();
         CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
                 REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), DateUtils.getNowDate());
-        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
+        this.insertEventCatalogue(centereventTEventcatalogue);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -177,7 +177,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
     }
 
     // 事件目录
-    private CentereventTEventcatalogue insertEventCatalogue(CentereventTEventcatalogue eventcatalogue) {
+    private void insertEventCatalogue(CentereventTEventcatalogue eventcatalogue) {
         //生成uuid
         String eventCode = IdUtils.simpleUUID();
         eventcatalogue.setId(eventCode);
@@ -189,7 +189,6 @@ public class AlarmEventServiceImpl implements AlarmEventService {
             eventcatalogue.setCreateTime(DateUtils.getNowDate());
         }
         centereventTEventcatalogueService.insertCentereventTEventcatalogue(eventcatalogue);
-        return eventcatalogue;
     }
 
     // 事件部门
@@ -270,7 +269,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String address = centerdataTCamera.getCameraRegion();
         CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
                 REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), daHuaFireEventVO.getCreateTime());
-        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
+        this.insertEventCatalogue(centereventTEventcatalogue);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -365,7 +364,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String address = daHuaOtherEventVO.getAddress();
         CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
                 REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), daHuaOtherEventVO.getCreateTime());
-        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
+        this.insertEventCatalogue(centereventTEventcatalogue);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -399,7 +398,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String eventName = sensorEventVo.getReportor() + DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, sensorEventVo.getReportTime()) + eventtype.getEventTypeName();
         CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(sensorEventVo.getEventType(), sensorEventVo.getEventTypeXl(), eventName, sensorEventVo.getEventDescription(), sensorEventVo.getLongitude(), sensorEventVo.getLatitude(), sensorEventVo.getReportor(), sensorEventVo.getReportTime(), sensorEventVo.getAddress(),
                 REPORTING_SOURCE_4, "上报", FOREST_EVENT_STATUS_1, sensorEventVo.getSensorId(), sensorEventVo.getReportor(), DateUtils.getNowDate());
-        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
+        this.insertEventCatalogue(centereventTEventcatalogue);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -430,7 +429,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
                 "签收", FOREST_EVENT_STATUS_2, SecurityUtils.getLoginUser().getSysUser().getUserId().toString(), SecurityUtils.getLoginUser().getSysUser().getNickName(), DateUtils.getNowDate());
         eventcatalogue.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         eventcatalogue.setDeptName(SecurityUtils.getLoginUser().getSysUser().getDeptNames());
-        eventcatalogue = this.insertEventCatalogue(eventcatalogue);
+        this.insertEventCatalogue(eventcatalogue);
         // 事件部门
         List<CenterdataTAidevicedept> listDept = new ArrayList<>();
         listDept.add(new CenterdataTAidevicedept(eventcatalogue.getDeptId(), eventcatalogue.getDeptName()));

+ 0 - 1
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/CenterEventAppServiceImpl.java

@@ -113,7 +113,6 @@ public class CenterEventAppServiceImpl extends BaseService implements ICenterEve
         sal.setEventCode(appEventSalBO.getEventCode());
         Map<String, Object> asl = centereventTFireEventService.getYuAnByEventCode(sal);
         if (StringUtils.isNotNull(asl) && StringUtils.isNotBlank(MapUtils.getString(asl, FILE_PREFIX_LOCAL))) {
-//            asl.put(FILE_PREFIX_LOCAL, keyMap.get(FILE_PREFIX_APP) + MapUtils.getString(asl, FILE_PREFIX_LOCAL));
             StringBuilder newDiles = new StringBuilder();
             String url = MapUtils.getString(asl, FILE_PREFIX_LOCAL);
             String name = MapUtils.getString(asl, "fileName");

+ 1 - 26
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/CentereventTEventcatalogueServiceImpl.java

@@ -242,13 +242,6 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
         centereventDeptEvent.setCreateBy(SecurityUtils.getUserId().toString());
         centereventDeptEvent.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centereventDeptEventService.insertCentereventTDeptEvent(centereventDeptEvent);
-//        if (StringUtils.isNotEmpty(centereventTEventcatalogue.getHgjDeptId())) {
-//            centereventDeptEvent.setId(IdUtils.fastSimpleUUID());
-//            centereventDeptEvent.setDeptId(Long.parseLong(centereventTEventcatalogue.getHgjDeptId()));
-//            centereventDeptEvent.setDeptName(centereventTEventcatalogue.getHgjDeptName());
-//            centereventDeptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_3);
-//            centereventDeptEventService.insertCentereventTDeptEvent(centereventDeptEvent);
-//        }
         // 市级行管局
         CentereventTEventtypemapdept centereventTEventtypemapdept = new CentereventTEventtypemapdept();
         centereventTEventtypemapdept.setEventTypeValue(centereventTEventcatalogue.getEventTypeXl());
@@ -327,7 +320,6 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
     private void updateSublistByEventtype(CentereventtDeptEventBO centereventtDeptEventBO) {
         // 子表信息
         CentereventTEventtype centereventTEventtype = centereventTEventtypeService.selectCentereventTEventtypeById(centereventtDeptEventBO.getEventType());
-//        if ("1".equals(centereventTEventtype.getParentId())) {
         CentereventTFireEvent centereventTFireEvent = new CentereventTFireEvent();
         centereventTFireEvent.setId(IdUtils.simpleUUID());
         centereventTFireEvent.setEventCode(centereventtDeptEventBO.getEventCode());
@@ -339,7 +331,6 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
         centereventTFireEvent.setDeptId(Long.parseLong(centereventtDeptEventBO.getDeptId()));
         centereventTFireEvent.setDeptName(centereventtDeptEventBO.getDeptName());
         centereventTFireEventMapper.insertCentereventTFireEvent(centereventTFireEvent);
-//        }
         // 推送市级行管局
         CentereventTEventtypemapdept centereventTEventtypemapdept = new CentereventTEventtypemapdept();
         centereventTEventtypemapdept.setEventTypeValue(centereventTEventtype.getId());
@@ -481,24 +472,10 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
             case "wb":
                 centereventTEventcatalogue.setEventStatus("误报");
                 centereventTEventcatalogue.setEventStatusValue("forest_event_status_3");
-//                int count = centereventDeptEventService.selectCentereventTDeptEventByEventCode(centereventtDeptEventBO.getEventCode(), centereventTDeptEvent.getDeptId().toString());
-//                // 所有部门都置为误报,才为误报
-//                if (count == 0) {
-//                    centereventTEventcatalogue.setEventStatus("误报");
-//                    centereventTEventcatalogue.setEventStatusValue("forest_event_status_3");
-//                }
-
-//                centereventTDeptEvent.setEventStatus("误报");
-//                centereventTDeptEvent.setEventStatusValue("forest_event_status_3");
                 break;
             case "cf":
                 centereventTEventcatalogue.setEventStatus("重复");
                 centereventTEventcatalogue.setEventStatusValue("forest_event_status_4");
-
-//                centereventTDeptEvent.setEventStatus("重复");
-//                centereventTDeptEvent.setEventStatusValue("forest_event_status_4");
-//                // 一个部门置为重复,所有都重复
-//                centereventDeptEventService.updateCentereventTDeptEventCf(centereventtDeptEventBO.getEventCode());
                 break;
             case "bj":
                 centereventTEventcatalogue.setDataStatus("0");// 办结后恢复统计查询状态
@@ -713,7 +690,6 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
                 centereventTDownloads.setLogId(uuid);
                 centereventTDownloadsService.insertCentereventTDownloads(centereventTDownloads);
 //                TimeUnit.MINUTES.sleep(5);//延时5分钟在调取
-                logger.info("定时任务等待下载=====>{}", DateUtils.dateTimeNow());
                 try {
                     Thread.sleep(300000);
                 } catch (InterruptedException e) {
@@ -731,8 +707,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
                 centereventTDownloadsService.insertCentereventTDownloads(centereventTDownloads);
             }
         }
-        logger.info("附件表查询回写=====>{}", DateUtils.dateTimeNow());
-        //视频下载日志表 视频下载成功  定时任务结束回调,检验是否真的成功
+        // 视频下载日志表 视频下载成功  定时任务结束回调,检验是否真的成功
         List<CentereventTDownloads> downloadsList = centereventTDownloadsService.validDownloadIs();
         for (CentereventTDownloads down : downloadsList) {
             if (StringUtils.isNotEmpty(down.getAttachPath())) {

+ 2 - 2
src/main/java/com/sooka/sponest/event/index/service/impl/CenterevenTEventIndexServiceImpl.java

@@ -77,8 +77,8 @@ public class CenterevenTEventIndexServiceImpl implements ICenterevenTEventIndexS
                 resultMap.put(QS, qs);
                 resultMap.put(BJ, bj);
                 resultMap.put(GD, gd);
-                resultMap.put("bjgd", bj + gd);
-                resultMap.put("bjgdRate", bjgdRate);
+                resultMap.put(BJ_GD, bj + gd);
+                resultMap.put(BJ_GD_RATE, bjgdRate);
                 resultMap.put("today_bjgd", todaybjgd);
                 resultMap.put("today_bjgdRate", todaybjgdRate);
             } else if ("伊通县".equals(map.get("name"))) {

+ 1 - 1
src/main/java/com/sooka/sponest/event/remoteapi/factory/RemoteDataServiceFallbackFactory.java

@@ -54,7 +54,7 @@ public class RemoteDataServiceFallbackFactory implements FallbackFactory<RemoteD
 
             @Override
             public void updateEventAttacHandle(CenterdataTAttach centerdataTAttach) {
-
+                throw new UnsupportedOperationException();
             }
 
             @Override

+ 111 - 111
src/main/java/com/sooka/sponest/event/test/ScheduleTask.java

@@ -1,112 +1,112 @@
 package com.sooka.sponest.event.test;
-//
-//import com.ruoyi.common.core.utils.DateUtils;
-//import com.ruoyi.common.core.utils.SpringUtils;
-//import com.ruoyi.common.core.utils.StringUtils;
-//import com.ruoyi.common.core.utils.uuid.IdUtils;
-//import com.ruoyi.common.redis.service.RedisService;
-//import com.sooka.sponest.event.centereventtdeptevent.domain.CentereventDeptEvent;
-//import com.sooka.sponest.event.centereventtdeptevent.service.ICentereventDeptEventService;
-//import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
-//import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTEventcatalogueService;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.BeanUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.scheduling.annotation.EnableScheduling;
-//
-//import java.security.SecureRandom;
-//
-///**
-// * @author lyq
-// * @date 2023年7月22日
-// */
-//@Configuration
-//@EnableScheduling
-//public class ScheduleTask {
-//
-//    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-//
-//    @Autowired
-//    private ICentereventTEventcatalogueService centereventTEventcatalogueService;
-//
-//    @Autowired
-//    private ICentereventDeptEventService centereventDeptEventService;
-//
-//    /**
-//     * 定时任务 MQ-ES数据同步测试
-//     */
-////    @Scheduled(fixedRate = 200)
-//    private void mqtest() {
-//        // 读取缓存
-//        RedisService redis = SpringUtils.getBean(RedisService.class);
-//        String mark = redis.getCacheObject("testmq:mark");
-//        if (StringUtils.isBlank(mark)) {
-//            mark = "mark";
-//            redis.setCacheObject("testmq:mark", mark);
-//            redis.setCacheObject("testmq:insert", 0);
-//            redis.setCacheObject("testmq:update", 0);
-//            redis.setCacheObject("testmq:max", 300);
-//        }
-//        Integer insertNo = redis.getCacheObject("testmq:insert");
-//        Integer updateNo = redis.getCacheObject("testmq:update");
-//        Integer max = redis.getCacheObject("testmq:max");
-//        if (max < (insertNo + updateNo)) {
-//            return;
-//        }
-//        SecureRandom random = new SecureRandom();
-//        int month = random.nextInt(2);
-//        int day = random.nextInt(20) + 10;
-//        String start = "";
-//        String end = "";
-//        if (0 == month) {
-//            start = String.format("2023-06-%s", day);
-//            end = String.format("2023-06-%s", day + 1);
-//        } else {
-//            start = String.format("2023-07-%s", day);
-//            end = String.format("2023-07-%s", day + 1);
-//        }
-//        int limit = random.nextInt(1000) + 1;
-//        CentereventTEventcatalogue eventcatalogue = centereventTEventcatalogueService.mqtest(start, end, limit);
-//        if (null != eventcatalogue) {
-//            // 新增、修改权限比重
-//            int number = random.nextInt(100) + 1;
-//            if (51 > number) {
-//                redis.setCacheObject("testmq:insert", ++insertNo);
-//                String uuid = IdUtils.fastSimpleUUID();
-//                CentereventDeptEvent deptEvent = new CentereventDeptEvent();
-//                deptEvent.setId(uuid);
-//                deptEvent.setEventCode(uuid);
-//                deptEvent.setDeptId(365L);
-//                deptEvent.setDeptName("四平市");
-//                deptEvent.setEventStatus("上报");
-//                deptEvent.setEventStatusValue("forest_event_status_1");
-//                deptEvent.setDeptHandleType("dept_handleType_2");
-//                deptEvent.setCreateBy("1");
-//                deptEvent.setCreateName(mark + "_insert_" + insertNo);
-//                deptEvent.setCreateTime(DateUtils.getNowDate());
-//                centereventDeptEventService.insertCentereventTDeptEvent(deptEvent);
-//
-//                CentereventTEventcatalogue eventcataloguenew = new CentereventTEventcatalogue();
-//                BeanUtils.copyProperties(eventcatalogue, eventcataloguenew);
-//                eventcataloguenew.setId(deptEvent.getId());
-//                eventcataloguenew.setEventCode(deptEvent.getEventCode());
-//                eventcataloguenew.setReportSource("reporting_source_2");
-//                eventcataloguenew.setEventStatus(deptEvent.getEventStatus());
-//                eventcataloguenew.setEventStatusValue(deptEvent.getEventStatusValue());
-//                eventcataloguenew.setCreateBy(deptEvent.getCreateBy());
-//                eventcataloguenew.setCreateName(deptEvent.getCreateName());
-//                eventcataloguenew.setCreateTime(deptEvent.getCreateTime());
-//                centereventTEventcatalogueService.insertCentereventTEventcatalogue(eventcataloguenew);
-//            } else {
-//                redis.setCacheObject("testmq:update", ++updateNo);
-//                eventcatalogue.setUpdateBy(1L);
-//                eventcatalogue.setUpdateName(mark + "_update_" + updateNo);
-//                eventcatalogue.setUpdateTime(DateUtils.getNowDate());
-//                centereventTEventcatalogueService.updateCentereventTEventcatalogue(eventcatalogue);
-//            }
-//            logger.info("---新增{},修改{}---", insertNo, updateNo);
-//        }
-//    }
-//}
+
+/*import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.SpringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.common.redis.service.RedisService;
+import com.sooka.sponest.event.centereventtdeptevent.domain.CentereventDeptEvent;
+import com.sooka.sponest.event.centereventtdeptevent.service.ICentereventDeptEventService;
+import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
+import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTEventcatalogueService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;*/
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/*import java.security.SecureRandom;*/
+
+/**
+ * @author lyq
+ * @date 2023年7月22日
+ */
+@Configuration
+@EnableScheduling
+public class ScheduleTask {
+
+    /*private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    private ICentereventTEventcatalogueService centereventTEventcatalogueService;
+
+    @Autowired
+    private ICentereventDeptEventService centereventDeptEventService;
+
+    *//**
+     * 定时任务 MQ-ES数据同步测试
+     *//*
+//    @Scheduled(fixedRate = 200)
+    private void mqtest() {
+        // 读取缓存
+        RedisService redis = SpringUtils.getBean(RedisService.class);
+        String mark = redis.getCacheObject("testmq:mark");
+        if (StringUtils.isBlank(mark)) {
+            mark = "mark";
+            redis.setCacheObject("testmq:mark", mark);
+            redis.setCacheObject("testmq:insert", 0);
+            redis.setCacheObject("testmq:update", 0);
+            redis.setCacheObject("testmq:max", 300);
+        }
+        Integer insertNo = redis.getCacheObject("testmq:insert");
+        Integer updateNo = redis.getCacheObject("testmq:update");
+        Integer max = redis.getCacheObject("testmq:max");
+        if (max < (insertNo + updateNo)) {
+            return;
+        }
+        SecureRandom random = new SecureRandom();
+        int month = random.nextInt(2);
+        int day = random.nextInt(20) + 10;
+        String start = "";
+        String end = "";
+        if (0 == month) {
+            start = String.format("2023-06-%s", day);
+            end = String.format("2023-06-%s", day + 1);
+        } else {
+            start = String.format("2023-07-%s", day);
+            end = String.format("2023-07-%s", day + 1);
+        }
+        int limit = random.nextInt(1000) + 1;
+        CentereventTEventcatalogue eventcatalogue = centereventTEventcatalogueService.mqtest(start, end, limit);
+        if (null != eventcatalogue) {
+            // 新增、修改权限比重
+            int number = random.nextInt(100) + 1;
+            if (51 > number) {
+                redis.setCacheObject("testmq:insert", ++insertNo);
+                String uuid = IdUtils.fastSimpleUUID();
+                CentereventDeptEvent deptEvent = new CentereventDeptEvent();
+                deptEvent.setId(uuid);
+                deptEvent.setEventCode(uuid);
+                deptEvent.setDeptId(365L);
+                deptEvent.setDeptName("四平市");
+                deptEvent.setEventStatus("上报");
+                deptEvent.setEventStatusValue("forest_event_status_1");
+                deptEvent.setDeptHandleType("dept_handleType_2");
+                deptEvent.setCreateBy("1");
+                deptEvent.setCreateName(mark + "_insert_" + insertNo);
+                deptEvent.setCreateTime(DateUtils.getNowDate());
+                centereventDeptEventService.insertCentereventTDeptEvent(deptEvent);
+
+                CentereventTEventcatalogue eventcataloguenew = new CentereventTEventcatalogue();
+                BeanUtils.copyProperties(eventcatalogue, eventcataloguenew);
+                eventcataloguenew.setId(deptEvent.getId());
+                eventcataloguenew.setEventCode(deptEvent.getEventCode());
+                eventcataloguenew.setReportSource("reporting_source_2");
+                eventcataloguenew.setEventStatus(deptEvent.getEventStatus());
+                eventcataloguenew.setEventStatusValue(deptEvent.getEventStatusValue());
+                eventcataloguenew.setCreateBy(deptEvent.getCreateBy());
+                eventcataloguenew.setCreateName(deptEvent.getCreateName());
+                eventcataloguenew.setCreateTime(deptEvent.getCreateTime());
+                centereventTEventcatalogueService.insertCentereventTEventcatalogue(eventcataloguenew);
+            } else {
+                redis.setCacheObject("testmq:update", ++updateNo);
+                eventcatalogue.setUpdateBy(1L);
+                eventcatalogue.setUpdateName(mark + "_update_" + updateNo);
+                eventcatalogue.setUpdateTime(DateUtils.getNowDate());
+                centereventTEventcatalogueService.updateCentereventTEventcatalogue(eventcatalogue);
+            }
+            logger.info("---新增{},修改{}---", insertNo, updateNo);
+        }
+    }*/
+}

+ 1 - 1
src/main/java/com/sooka/sponest/event/urge/EventSocketAdapter.java

@@ -18,7 +18,7 @@ public class EventSocketAdapter extends MessageListenerAdapter {
 
     @Override
     public void onMessage(Message message, byte[] pattern) {
-        logger.info(String.format("redis Message Received on channel {0} message :: {1}", new String(message.getChannel()), message.toString()));
+        logger.info(String.format("redis Message Received on channel %s message :: %s", new String(message.getChannel()), message.toString()));
         // 转换消息为对象
         CentereventTEventcatalogue eventcatalogue = JSONObject.parseObject(message.toString(), CentereventTEventcatalogue.class);
         // 开始循环当前服务的用户集合

+ 2 - 3
src/main/java/com/sooka/sponest/event/urge/service/impl/EventDownServiceImpl.java

@@ -32,13 +32,12 @@ public class EventDownServiceImpl implements EventDownService {
 
     @Override
     public void toVoidDownLoad(Map<String, Object> maps) {
-        logger.info("===========================>");
         try {
             Thread.sleep(300000);
         } catch (Exception e) {
             logger.info("Exception!", e);
         }
-        //视频下载日志表 视频下载成功  定时任务结束回调,检验是否真的成功
+        // 视频下载日志表 视频下载成功  定时任务结束回调,检验是否真的成功
         CentereventTDownloads down = centereventTDownloadsService.validDownloadIsOne(MapUtils.getString(maps, "LogId"));
         if (StringUtils.isNotEmpty(down.getAttachPath())) {
             down.setFlag("1");
@@ -52,6 +51,6 @@ public class EventDownServiceImpl implements EventDownService {
 
     @Override
     public void update(Observable o, Object arg) {
-
+        throw new UnsupportedOperationException();
     }
 }

+ 1 - 5
src/main/java/com/sooka/sponest/event/utils/ScheduleTaskUtil.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.event.utils;
 
-import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.redis.service.RedisService;
@@ -38,8 +37,7 @@ public class ScheduleTaskUtil {
 
     @Scheduled(cron = "0 10 0 * * ?")
     //@GetMapping("/down")
-    public void runTask() throws Exception {
-        logger.info("执行定时任务开始=>{}", DateUtils.dateTimeNow());
+    public void runTask() {
         long startMill = System.currentTimeMillis();
         // 读取缓存
         RedisService redis = SpringUtils.getBean(RedisService.class);
@@ -50,8 +48,6 @@ public class ScheduleTaskUtil {
             params.put("taskValue", "1");
             centereventTEventcatalogueService.downloadsCommon(params);
         }
-        //redis.deleteObject(DOWN_LOCK);
         redis.setCacheObject(DOWN_LOCK, (System.currentTimeMillis() - startMill), (long) 3600 * 12, TimeUnit.SECONDS);
-        logger.info("执行定时任务结束=====>{}", DateUtils.dateTimeNow());
     }
 }