日志错误信息修改

ruoyi-admin/src/main/java/com/ruoyi/pt/controller/AEventsController.java

@@ -70,14 +70,14 @@ public class AEventsController extends BaseController {
     }
 
 
-    /**
+//    /**
-     * 取最新一条事件（预警钟）
+//     * 取最新一条事件（预警钟）
-     */
+//     */
-    @GetMapping("/limitOneMsg")
+//    @GetMapping("/limitOneMsg")
-    @ApiOperation(value = "取最新一条事件（预警钟）", response = Events.class)
+//    @ApiOperation(value = "取最新一条事件（预警钟）", response = Events.class)
-    public AjaxResult limitOneMsg() {
+//    public AjaxResult limitOneMsg() {
-        return success(aEventsService.limitOneMsg());
+//        return success(aEventsService.limitOneMsg());
-    }
+//    }
 
     /**
      * 根据100条最新事件查询对应工单
@@ -93,8 +93,11 @@ public class AEventsController extends BaseController {
      * 获取日志错误信息
      */
     @GetMapping("/getErrorMsg")
-    @ApiOperation(value = "获取日志错误信息")
+    @ApiOperation(value = "获取日志错误信息",response = Events.class)
-    public AjaxResult getErrorMsg() {
+    public AjaxResult getErrorMsg(@RequestParam(value = "permissions",required = true) String permissions) {
+        if(!"administrator".equals(permissions)){
+            throw new ServiceException("认证失败,无法访问系统资源");
+        }
         return success(aEventsService.getErrorMsg());
     }
 

ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/AEventsMapper.java

@@ -64,7 +64,7 @@ public interface AEventsMapper {
     /**
      * 取最新一条事件
      */
-    Events limitOneMsg();
+    List<Events> limitOneMsg();
 
     /**
      * casesImport表提级或退回

ruoyi-admin/src/main/java/com/ruoyi/pt/service/AEventsService.java

@@ -60,7 +60,7 @@ public interface AEventsService {
     /**
      * 取最新一条事件
      */
-    Events limitOneMsg();
+    List<Events> limitOneMsg();
 
     /**
      * 根据查询条件查询事件待审核个数

ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/AEventsServiceImpl.java

@@ -255,7 +255,7 @@ public class AEventsServiceImpl implements AEventsService {
      * 取最新一条事件
      */
     @Override
-    public Events limitOneMsg() {
+    public List<Events> limitOneMsg() {
         return aEventsMapper.limitOneMsg();
     }
 
@@ -284,9 +284,9 @@ public class AEventsServiceImpl implements AEventsService {
     @Override
     public Object getErrorMsg() {
         if (redisCache.hasKey("isNo")) {
-            return redisCache.getCacheObject("isNo");
+            return "算法运行异常";
         } else {
-            return null;
+            return aEventsMapper.limitOneMsg();
         }
     }
 }

ruoyi-admin/src/main/resources/mapper/pt/AEventsMapper.xml

@@ -118,16 +118,18 @@
         select * from cases_import
         where CASE_SERIAL = #{id}
     </select>
-    <select id="limitOneMsg" resultMap="EventResult">
+
-        select * from events
-        order by eventTime
-        limit 1
-    </select>
     <select id="fiveEventCount" resultType="com.ruoyi.pt.entity.response.FiveEventCountResponse">
         select msgType,COUNT(*) as count from events
         where isReport is null
         group by msgType
     </select>
+    <select id="limitOneMsg" resultMap="EventResult">
+        select * from events
+        where eventTime >= NOW() - INTERVAL 1 HOUR
+        order by eventTime
+            limit 1
+    </select>
 
 
     <update id="edit" parameterType="Events">

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -121,6 +121,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
 //                .antMatchers("/gateway/event/event/eventData/eventProgress/**").anonymous()
                 .antMatchers("/earlyWarningAudit/massEvents/login").permitAll()
                 .antMatchers("/earlyWarningAudit/massEvents/appLogin").permitAll()
+                .antMatchers("/earlyWarningAudit/massEvents/getErrorMsg").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()