访客系统
上一版本: 4ac3741d | 补丁 | 提交 | 忽略空白
liukangdong
2024-05-09 414bf4d19526522d0856a72590064fc32c7bf107 
Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
已删除1个文件
已修改5个文件
83 ■■■■■ 文件已修改
.gitignore 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
log/eva.log 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/admin_timer/src/main/resources/logback-spring.xml 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/resources/logback-spring.xml 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 .gitignore


@@ -14,6 +14,9 @@


*.war


*.ear


*.iml


/logs


*.log


*.zip




# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml


hs_err_pid*




 log/eva.log




 server/visits/admin_timer/src/main/resources/logback-spring.xml


@@ -2,14 +2,13 @@


<configuration>


    <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">


        <layout class="ch.qos.logback.classic.PatternLayout">


            <pattern>


                - %msg%n


            </pattern>


            <pattern>%highlight(%date{yyyy-MM-dd HH:mm:ss}) | %highlight(%-5level) | %highlight(%thread) | %highlight(%logger) | %msg%n</pattern>


        </layout>


    </appender>


    <property name="log.path" value="logs/visitsTimer"></property>


    <property name="log.fileSize" value="100MB"></property>


    <property name="log.historyDays" value="7"></property>




    <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


            <level>ERROR</level>


@@ -18,9 +17,7 @@


            <onMismatch>ACCEPT</onMismatch>


        </filter>


        <encoder>


            <pattern>


                %msg%n


            </pattern>


            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>


        </encoder>


        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">


            <!--路径-->


@@ -36,10 +33,7 @@


            <level>ERROR</level>


        </filter>


        <encoder>


            <pattern>


                %msg%n


            </pattern>




            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>


        </encoder>


        <!--滚动策略-->


        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">


@@ -50,7 +44,15 @@


            <totalSizeCap>1GB</totalSizeCap>


        </rollingPolicy>


    </appender>




    <!-- 异步写入日志 -->


    <appender name ="ASYNC" class= "ch.qos.logback.classic.AsyncAppender">


        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->


        <discardingThreshold >0</discardingThreshold>


        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->


        <queueSize>512</queueSize>


        <!-- 添加附加的appender,最多只能添加一个 -->


        <appender-ref ref ="fileInfoLog"/>


    </appender>


    <root level="info">


        <appender-ref ref="consoleLog"/>


        <appender-ref ref="fileInfoLog"/>




 server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java


@@ -14,6 +14,8 @@


import com.hikvision.artemis.sdk.config.ArtemisConfig;


import org.apache.commons.lang3.StringUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.context.annotation.DependsOn;


import org.springframework.core.annotation.Order;


import org.springframework.stereotype.Service;




import javax.annotation.PostConstruct;


@@ -35,11 +37,26 @@


    @PostConstruct


    public  int  initHkConfig(){


        //获取根组织编码


        initHkParamConfig();


        getRootOrgCode();


        //开始订阅门禁事件、访客事件、和停车场事件


        startHkEventSub();


        return  0;


    }




    public  int  initHkParamConfig(){


        if(StringUtils.isBlank(ArtemisConfig.appKey )


                ||StringUtils.isBlank(ArtemisConfig.host )


                ||StringUtils.isBlank(ArtemisConfig.appSecret )


        ){


            ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();


            ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();


            ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();


            HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();


        }


        HKTools.interfaceLogService=interfaceLogService;


        return  0;


    }


    /**


     *    获取根组织编码


     */




 server/visits/dmvisit_admin/src/main/resources/logback-spring.xml


@@ -2,14 +2,13 @@


<configuration>


    <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">


        <layout class="ch.qos.logback.classic.PatternLayout">


            <pattern>


                - %msg%n


            </pattern>


            <pattern>%highlight(%date{yyyy-MM-dd HH:mm:ss}) | %highlight(%-5level) | %highlight(%thread) | %highlight(%logger) | %msg%n</pattern>


        </layout>


    </appender>


    <property name="log.path" value="logs/visitsAdmin"></property>


    <property name="log.fileSize" value="100MB"></property>


    <property name="log.historyDays" value="7"></property>




    <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">


        <filter class="ch.qos.logback.classic.filter.LevelFilter">


            <level>ERROR</level>


@@ -18,9 +17,7 @@


            <onMismatch>ACCEPT</onMismatch>


        </filter>


        <encoder>


            <pattern>


                %msg%n


            </pattern>


            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>


        </encoder>


        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">


            <!--路径-->


@@ -36,10 +33,7 @@


            <level>ERROR</level>


        </filter>


        <encoder>


            <pattern>


                %msg%n


            </pattern>




            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>


        </encoder>


        <!--滚动策略-->


        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">


@@ -50,7 +44,15 @@


            <totalSizeCap>1GB</totalSizeCap>


        </rollingPolicy>


    </appender>




    <!-- 异步写入日志 -->


    <appender name ="ASYNC" class= "ch.qos.logback.classic.AsyncAppender">


        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->


        <discardingThreshold >0</discardingThreshold>


        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->


        <queueSize>512</queueSize>


        <!-- 添加附加的appender,最多只能添加一个 -->


        <appender-ref ref ="fileInfoLog"/>


    </appender>


    <root level="info">


        <appender-ref ref="consoleLog"/>


        <appender-ref ref="fileInfoLog"/>




 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java


@@ -6,7 +6,9 @@


import com.doumee.core.utils.Constants;


import com.doumee.service.business.InterfaceLogService;


import com.hikvision.artemis.sdk.config.ArtemisConfig;


import org.apache.commons.lang3.StringUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.core.annotation.Order;


import org.springframework.stereotype.Service;




import javax.annotation.PostConstruct;


@@ -26,10 +28,15 @@




    @PostConstruct


    public  int  initHkConfig(){


        ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();


        ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();


        ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();


        HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();


        if(StringUtils.isBlank(ArtemisConfig.appKey )


                ||StringUtils.isBlank(ArtemisConfig.host )


                ||StringUtils.isBlank(ArtemisConfig.appSecret )


        ){


            ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();


            ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();


            ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();


            HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();


        }


        HKTools.interfaceLogService=interfaceLogService;


        return  0;


    }