diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/AEventsController.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/AEventsController.java index ba691f7..0ea0689 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/AEventsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/controller/AEventsController.java @@ -70,14 +70,14 @@ public class AEventsController extends BaseController { } - /** - * 取最新一条事件(预警钟) - */ - @GetMapping("/limitOneMsg") - @ApiOperation(value = "取最新一条事件(预警钟)", response = Events.class) - public AjaxResult limitOneMsg() { - return success(aEventsService.limitOneMsg()); - } +// /** +// * 取最新一条事件(预警钟) +// */ +// @GetMapping("/limitOneMsg") +// @ApiOperation(value = "取最新一条事件(预警钟)", response = Events.class) +// public AjaxResult limitOneMsg() { +// return success(aEventsService.limitOneMsg()); +// } /** * 根据100条最新事件查询对应工单 @@ -93,8 +93,11 @@ public class AEventsController extends BaseController { * 获取日志错误信息 */ @GetMapping("/getErrorMsg") - @ApiOperation(value = "获取日志错误信息") - public AjaxResult getErrorMsg() { + @ApiOperation(value = "获取日志错误信息",response = Events.class) + public AjaxResult getErrorMsg(@RequestParam(value = "permissions",required = true) String permissions) { + if(!"administrator".equals(permissions)){ + throw new ServiceException("认证失败,无法访问系统资源"); + } return success(aEventsService.getErrorMsg()); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/AEventsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/AEventsMapper.java index e254cf3..c18e821 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/AEventsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/mapper/AEventsMapper.java @@ -64,7 +64,7 @@ public interface AEventsMapper { /** * 取最新一条事件 */ - Events limitOneMsg(); + List limitOneMsg(); /** * casesImport表提级或退回 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/AEventsService.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/AEventsService.java index 948d7b4..4132a12 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/AEventsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/AEventsService.java @@ -60,7 +60,7 @@ public interface AEventsService { /** * 取最新一条事件 */ - Events limitOneMsg(); + List limitOneMsg(); /** * 根据查询条件查询事件待审核个数 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/AEventsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/AEventsServiceImpl.java index 9e163be..c236804 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/AEventsServiceImpl.java +++ b/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 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(); } } } diff --git a/ruoyi-admin/src/main/resources/mapper/pt/AEventsMapper.xml b/ruoyi-admin/src/main/resources/mapper/pt/AEventsMapper.xml index ed6eb82..f347813 100644 --- a/ruoyi-admin/src/main/resources/mapper/pt/AEventsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/pt/AEventsMapper.xml @@ -118,16 +118,18 @@ select * from cases_import where CASE_SERIAL = #{id} - + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 4601af0..7443780 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/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()