Merge remote-tracking branch 'origin/main'

# Conflicts:
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/AdmittedPersonController.java
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/ResourceMonitorController.java

securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java

@@ -65,7 +65,8 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
      * 越权 放权的请求 指定的前缀 -公共的请求+数据接口
      */
     public static String[] WHITE_URL=new String[]{"/sys/selected/","/dataCenter/inter/","/back/verify/"};
-
+    //图片默认放权
+    public final static String images="JPG,PNG,JPEG,";
     /**
      * 越权白名单路径->指定的路径
      */
@@ -144,6 +145,13 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
      */
     private boolean checkIsYq(HttpServletRequest request) throws Exception {
         String requestUri = request.getRequestURI();
+        if(requestUri.contains(".")){
+            String imageType=requestUri.substring(requestUri.lastIndexOf(".")+1).toUpperCase();
+            if (images.contains(imageType)){
+                return true;
+            }
+        }
+
         if(Arrays.asList(WHITE_URLS).contains(requestUri)){
             return true;
         }

securityControl-gateway/src/main/java/com/securityControl/gateway/filter/ResponseEncryptFilter.java

@@ -49,6 +49,8 @@ public class ResponseEncryptFilter implements GlobalFilter, Ordered {
      */
     public final static String KEY_HEAD="decrypt";
 
+    public final static String images="JPG,PNG,JPEG,";
+
     /**忽略加密的参数的请求*/
     public static List<String> ignoreUrls = new ArrayList<>();
 
@@ -61,8 +63,16 @@ public class ResponseEncryptFilter implements GlobalFilter, Ordered {
         log.info("============================ResponseEncryptFilter start===================================");
 
         ServerHttpRequest request = exchange.getRequest();
-        URI uri = request.getURI();
+
         String reqPath = request.getURI().getPath();
+        if(reqPath.contains(".")){
+            String imageType=reqPath.substring(reqPath.lastIndexOf(".")+1).toUpperCase();
+            if (images.contains(imageType)){
+                return chain.filter(exchange);
+            }
+        }
+
+
         boolean sf = ignoreUrls.contains(reqPath);
         if(sf){
             return chain.filter(exchange);

securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/config/ResourcesConfigAdapter.java

@@ -11,7 +11,7 @@ public class ResourcesConfigAdapter extends WebMvcConfigurerAdapter {
 //        registry.addResourceHandler("/files/**").addResourceLocations("file:/data/ahsbs/file/");
 //        super.addResourceHandlers(registry);
 
-        registry.addResourceHandler("/files/**").addResourceLocations("file:D:\\file\\");
+        registry.addResourceHandler("/files/**").addResourceLocations("file:F:\\File\\");
         super.addResourceHandlers(registry);
     }
 

securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/DailyDutyReportController.java

@@ -3,7 +3,9 @@ package com.sercurityControl.proteam.dutyTask.controller;
 import com.securityControl.common.core.utils.StringUtils;
 import com.securityControl.common.core.web.domain.AjaxResult;
 import com.securityControl.common.log.annotation.Log;
+import com.securityControl.common.log.annotation.SysLog;
 import com.securityControl.common.log.enums.BusinessType;
+import com.securityControl.common.log.enums.OperaType;
 import com.securityControl.common.log.enums.OperationType;
 import com.sercurityControl.proteam.dutyTask.service.DailyDutyReportService;
 import com.sercurityControl.proteam.util.FileToBase64;
@@ -58,7 +60,7 @@ public class DailyDutyReportController {
      * @date 2022-12-23 9:56
      */
     @PostMapping("getDailyData")
-    @Log(title = "值班日报", menu = "值班任务->值班日报", businessType = BusinessType.QUERY, details = "值班日报列表")
+    @SysLog(title = "值班日报", model = "值班任务->值班日报", operaType = OperaType.QUERY, details = "值班日报列表")
     public AjaxResult getDailyData(String currentDay) {
         Map<String, Object> map = new HashMap<>(16);
         try {
@@ -90,7 +92,7 @@ public class DailyDutyReportController {
     }
 
     @GetMapping("downloadDaily")
-    @Log(title = "值班日报", menu = "值班任务->值班日报", businessType = BusinessType.EXPORT, details = "值班日报导出", grade = OperationType.EXPORT_BUSINESS)
+    @SysLog(title = "值班日报", model = "值班任务->值班日报", operaType = OperaType.EXPORT, details = "值班日报导出")
     public void downloadDaily(HttpServletRequest request, HttpServletResponse response, String currentDay, String chineseDate) {
         Map<String, Object> map = new HashMap<>(16);
         Map<String, Object> data = new HashMap<>(16);

securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/HistoryController.java

@@ -1,6 +1,8 @@
 package com.sercurityControl.proteam.dutyTask.controller;
 
 import com.securityControl.common.core.web.domain.AjaxResult;
+import com.securityControl.common.log.annotation.SysLog;
+import com.securityControl.common.log.enums.OperaType;
 import com.sercurityControl.proteam.dutyTask.domain.HistoryDto;
 import com.sercurityControl.proteam.dutyTask.service.HistoryService;
 import lombok.extern.slf4j.Slf4j;
@@ -29,6 +31,7 @@ public class HistoryController {
      * @date 2024/1/25 15:28
      */
     @PostMapping("getHistoryByDateType")
+    @SysLog(title = "综合展示", model = "综合展示->综合展示", operaType = OperaType.EXPORT, details = "历史记录查询")
     public AjaxResult getHistoryByDateType(HistoryDto dto) {
         return service.getHistoryByDateType(dto);
     }

securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/TicketController.java

@@ -1,6 +1,8 @@
 package com.sercurityControl.proteam.dutyTask.controller;
 
 import com.securityControl.common.core.web.domain.AjaxResult;
+import com.securityControl.common.log.annotation.SysLog;
+import com.securityControl.common.log.enums.OperaType;
 import com.sercurityControl.proteam.dutyTask.domain.TicketInfoVo;
 import com.sercurityControl.proteam.dutyTask.service.TicketService;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +36,7 @@ public class TicketController {
      * @date 2024/12/2 14:07
      */
     @PostMapping("getTicketInfo")
+    @SysLog(title = "作业票管理", model = "告警记录->作业票管理", operaType = OperaType.EXPORT, details = "作业票管理记录查询")
     public AjaxResult getTicketInfo(TicketInfoVo vo){
         return service.getTicketInfo(vo);
     }

securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/DailyReportController.java

@@ -3,7 +3,9 @@ package com.sercurityControl.proteam.supplement.controller;
 import com.securityControl.common.core.utils.StringUtils;
 import com.securityControl.common.core.web.domain.AjaxResult;
 import com.securityControl.common.log.annotation.Log;
+import com.securityControl.common.log.annotation.SysLog;
 import com.securityControl.common.log.enums.BusinessType;
+import com.securityControl.common.log.enums.OperaType;
 import com.securityControl.common.log.enums.OperationType;
 import com.sercurityControl.proteam.dutyTask.domain.*;
 import com.sercurityControl.proteam.dutyTask.service.DayPaperService;
@@ -44,7 +46,7 @@ public class DailyReportController {
     private DayPaperService dayPaperService;
 
     @GetMapping("downloadDaily")
-    @Log(title = "值班日报", menu = "值班任务->值班日报", businessType = BusinessType.EXPORT, details = "值班日报导出", grade = OperationType.EXPORT_BUSINESS)
+    @SysLog(title = "值班任务", model = "值班任务->值班日报", operaType = OperaType.EXPORT, details = "值班日报导出")
     public void downloadDaily(HttpServletRequest request, HttpServletResponse response, String currentDay, String chineseDate) {
         download(request, response, currentDay, chineseDate);
     }