IntelligentRecognition/ah-jjsp-service/.svn/pristine/3e/3eab5020339c42d777b264f4159df4e8cd14215f.svn-base

Index: securityControl-modules/securityControl-task/src/main/java/com/securityControl/task/service/impl/DeviceServiceImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+>package com.securityControl.task.service.impl;\r\n\r\nimport com.alibaba.fastjson2.JSON;\r\nimport com.securityControl.common.core.utils.aes.ListHelper;\r\nimport com.securityControl.common.core.utils.aes.StringHelper;\r\nimport com.securityControl.common.redis.service.RedisService;\r\nimport com.securityControl.task.domain.vo.*;\r\nimport com.securityControl.task.mapper.DeviceDao;\r\nimport com.securityControl.task.service.DeviceService;\r\nimport com.securityControl.task.util.DateTimeHelper;\r\nimport com.securityControl.task.util.QxWebUtil;\r\nimport com.securityControl.task.util.TYVideoUtil;\r\nimport com.securityControl.task.util.video.QxVideotape;\r\nimport com.sgcc.isc.service.adapter.factory.agent.IFrontLoadedAgent;\r\nimport org.slf4j.Logger;\r\nimport org.slf4j.LoggerFactory;\r\nimport org.springframework.beans.factory.annotation.Autowired;\r\nimport org.springframework.stereotype.Service;\r\n\r\nimport javax.annotation.Resource;\r\nimport java.util.ArrayList;\r\nimport java.util.List;\r\n\r\n/**\r\n * 设备信息\r\n */\r\n@Service\r\npublic class DeviceServiceImpl   implements DeviceService {\r\n\r\n    private static final Logger log = LoggerFactory.getLogger(DeviceServiceImpl.class);\r\n\r\n    @Autowired\r\n    private DeviceDao deviceDao;\r\n    @Resource\r\n    private RedisService redisUtil;\r\n    /**\r\n     * 更新通道二 全部设备状态\r\n     */\r\n    @Override\r\n    public void QxUpdateDeviceState() {\r\n        try{\r\n            List<String> list=new ArrayList<>();\r\n            list.add(\"2\");list.add(\"to-2\");\r\n            List<DeviceVo> deviceVoList=deviceDao.getAllDeviceList(list);\r\n            getQxDeviceState(deviceVoList);\r\n        }catch (Exception e){\r\n            log.error(e.toString(),e);\r\n        }\r\n    }\r\n\r\n    /**\r\n     * 更新通道一 全部设备状态\r\n     */\r\n    @Override\r\n    public void TyUpdateDeviceState() {\r\n        try{\r\n            List<DeviceVo> deviceVoList=deviceDao.getTyDeviceList();\r\n            getTyDeviceState(deviceVoList);\r\n        }catch (Exception e){\r\n            log.error(e.toString(),e);\r\n        }\r\n    }\r\n    /**\r\n     * 通道一 当日施工球机状态更新\r\n     */\r\n    @Override\r\n     public void TyDeviceState(){\r\n            try {\r\n                List<DeviceVo> deviceVoList=deviceDao.getTYClassMettintState();\r\n                getTyDeviceState(deviceVoList);\r\n            }catch (Exception e){\r\n                log.error(e.toString(),e);\r\n            }\r\n     }\r\n\r\n    /**\r\n     *  通道二 当日施工球机状态更新\r\n     */\r\n    @Override\r\n    public void  QxDeviceState(){\r\n        try{\r\n            List<String> list=new ArrayList<>();\r\n            list.add(\"2\");list.add(\"to-2\");\r\n            List<DeviceVo> deviceVoList=deviceDao.getClassMettintState(list,DateTimeHelper.getNowDay());\r\n            getQxDeviceState(deviceVoList);\r\n        }catch (Exception e){\r\n            log.error(e.toString(),e);\r\n        }\r\n    }\r\n\r\n    /**\r\n     * 更新球机信号\r\n     */\r\n    @Override\r\n    public void updateDeviceXh() {\r\n        try{\r\n            List<String> list=new ArrayList<>();\r\n            list.add(\"to-1\");list.add(\"to-2\");\r\n            List<DeviceVo> deviceVoList=deviceDao.getOnlineDevice(list);\r\n            String token=QxVideotape.login();\r\n            for (DeviceVo dev:deviceVoList) {\r\n                String puid=dev.getPuId();\r\n                String xh= QxVideotape.getDeviceXh(puid,token);\r\n                if(StringHelper.isNotEmpty(xh)){\r\n                    deviceDao.updateDeviceXh(xh,puid);\r\n                }\r\n            }\r\n        }catch (Exception e){\r\n            log.error(e.toString(),e);\r\n\r\n        }\r\n    }\r\n    /**\r\n     * 通道 2在线时长\r\n     */\r\n    @Override\r\n    public void getQxUpdateDeviceTime(){\r\n        try{\r\n            List<String> list=new ArrayList<>();\r\n            list.add(\"2\");list.add(\"to-2\");\r\n            String time=DateTim
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- securityControl-modules/securityControl-task/src/main/java/com/securityControl/task/service/impl/DeviceServiceImpl.java	(revision 06490d545baa03c6355afd5a1006797b74dc8eea)
+++ securityControl-modules/securityControl-task/src/main/java/com/securityControl/task/service/impl/DeviceServiceImpl.java	(date 1690337165656)
@@ -255,7 +255,7 @@
             String time=DateTimeHelper.getNowDay();//今日
 
 
-            deviceDao.updateWeekPlan("2023-07-10","2023-07-17","2023-07-23");//周计划
+           // deviceDao.updateWeekPlan("2023-07-10","2023-07-17","2023-07-23");//周计划
             deviceDao.updateDailPlan(yDay,time);
             deviceDao.updatClassMetting(yDay,time);
             deviceDao.updatClassMetting(tomDay,yDay);
Index: securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+>package com.securityControl.common.security.interceptor;\r\n\r\nimport com.alibaba.fastjson2.JSON;\r\nimport com.github.pagehelper.util.StringUtil;\r\nimport com.securityControl.common.core.constant.SecurityConstants;\r\nimport com.securityControl.common.core.context.SecurityContextHolder;\r\nimport com.securityControl.common.core.utils.JwtUtils;\r\nimport com.securityControl.common.core.utils.ServletUtils;\r\nimport com.securityControl.common.core.utils.StringUtils;\r\nimport com.securityControl.common.core.utils.aes.DateTimeHelper;\r\nimport com.securityControl.common.core.utils.aes.StringHelper;\r\nimport com.securityControl.common.core.utils.ip.IpUtils;\r\nimport com.securityControl.common.core.web.domain.AjaxResult;\r\nimport com.securityControl.common.security.enums.UrlEnums;\r\nimport com.securityControl.common.security.utils.SafeUtil;\r\nimport com.securityControl.common.security.utils.Sm3Utils;\r\nimport com.securityControl.common.security.utils.XssRequestWrapper;\r\nimport com.securityControl.system.api.RemoteLogService;\r\nimport com.securityControl.system.api.domain.SysOperLog;\r\nimport com.sgcc.isc.framework.common.constant.Constants;\r\nimport com.sgcc.isc.service.adapter.factory.AdapterFactory;\r\nimport com.sgcc.isc.service.adapter.helper.IResourceService;\r\nimport lombok.extern.slf4j.Slf4j;\r\nimport org.springframework.beans.factory.annotation.Autowired;\r\nimport org.springframework.scheduling.annotation.Async;\r\nimport org.springframework.util.AntPathMatcher;\r\nimport org.springframework.util.PathMatcher;\r\nimport org.springframework.web.servlet.AsyncHandlerInterceptor;\r\n\r\nimport javax.servlet.ServletRequest;\r\nimport javax.servlet.http.HttpServletRequest;\r\nimport javax.servlet.http.HttpServletResponse;\r\nimport javax.servlet.http.HttpSession;\r\nimport java.io.*;\r\nimport java.nio.charset.StandardCharsets;\r\nimport java.util.*;\r\n\r\n/**\r\n * @author bonus\r\n * @data 2023/2/6 17:22\r\n * @description 安全参数验证\r\n */\r\n@Slf4j\r\npublic class ParamSecureHandler implements AsyncHandlerInterceptor {\r\n    @Autowired\r\n    private final PathMatcher pathMatcher = new AntPathMatcher();\r\n\r\n    //@Autow\r\n    public static String rnd = null;\r\n\r\n\r\n    private String whiteURL =\"http://27.196.164.56:21001/\";\r\n\r\n//    private String whiteURL=\"http://localhost:63343/\";\r\n\r\n    //   private String whiteURL =\"http://27.196.156.43:9988/\";\r\n\r\n    @Autowired\r\n    private RemoteLogService remoteLogService;\r\n\r\n    private static Map<String, List<Double>> requestLogMap = null;\r\n\r\n    IResourceService resourceService = (IResourceService) AdapterFactory.getInstance(Constants.CLASS_RESOURCE);\r\n\r\n\r\n    @Override\r\n    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {\r\n        System.out.println(\"进入了拦截器\");\r\n        System.err.println(request.getRequestURI());\r\n        if(Objects.equals(\"/pot/superStatistics/importExcel\",request.getRequestURI()) ||\r\n                Objects.equals(\"/pot/todayTask/uploadNoticeVio\",request.getRequestURI()) ||\r\n                Objects.equals(\"/pot/superStatistics/editUploadNoticeVio\",request.getRequestURI()) ||\r\n                Objects.equals(\"/pot/todayTask/uploadExceptionReport\",request.getRequestURI()) ||\r\n                Objects.equals(\"/getUserTicket\",request.getRequestURI()) ||\r\n                Objects.equals(\"/\",request.getRequestURI()) ||\r\n                Objects.equals(\"/pot/todayTask/uploadExceptionReport\",request.getRequestURI()) ||\r\n                Objects.equals(\"/pot/superStatistics/uploadNoticeVioRect\",request.getRequestURI()) ||\r\n                Objects.equals(\"/pot/device/importExcel\",request.getRequestURI()) ||\r\n                Objects.equals(\"/pot/TRiskPressDropRate/importExcel\",request.getRequestURI()) ||\r\n                Objects.equals(\"pot/early/exportToExcel\",request.getRequestURI()) ||\r\n                Objects.equals(\"/sys/dict/getDictList\",request.getRequestURI())
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java	(revision 06490d545baa03c6355afd5a1006797b74dc8eea)
+++ securityControl-common/securityControl-common-security/src/main/java/com/securityControl/common/security/interceptor/ParamSecureHandler.java	(date 1690285900674)
@@ -105,7 +105,7 @@
          */
         String referUrl= request.getHeader("Referer");
         if(StringHelper.isNotEmpty(referUrl)){
-            if(referUrl.contains("/ahsfsaq/")){
+            if(referUrl.contains("/ahsfs")){
                 requestUrl=referUrl.split("21001")[0];
                 requestUrl=requestUrl+"21001/";
             }