commit

xpc

2024-01-30 cc9ebffc57e6343745cb1eadc47360d6107936bc

commit

 README.md

@@ -4,8 +4,3 @@

    ## ä¾èµ–于标准产品版本v1.0.0
    ## å‰ç«¯é¡¹ç›®ç‰ˆæœ¬ä¸ºv2.0.0

### æ›´æ–°æ—¥å¿—

#### 2023å¹´6月30日
    1.新增日志监控接口

 product-server-data-center/src/main/java/com/product/data/center/service/DataArchivingQueue.java

@@ -1,5 +1,6 @@
package com.product.data.center.service;

import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.RandomUtil;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -103,6 +104,8 @@
                        int totalPage = ceilPage(partSize, QUERY_PAGE_SIZE);
                        StringBuilder tempFilter = new StringBuilder(128);
                        for (int j = 0; j < totalPage; j++) {
                            //查询时检查队列数量，如果超过最大值则等待
                            checkQueueCount(sourceTable);
                            while (!allowQuery(sourceTable)) {
                                Thread.sleep(RandomUtil.randomInt(800, 1200));
                            }
@@ -301,6 +304,22 @@
    }

    /**
     * æ£€æŸ¥é˜Ÿåˆ—数量
     */
    private void checkQueueCount(String tableName) {
        //初始时间
        long startTime = System.currentTimeMillis();
        while (queryMap.get(tableName) != null && queryMap.get(tableName).size() >= 10) {
            //与初始时间比较，如果超过10分钟则打印
            if (System.currentTimeMillis() - startTime > 600000) {
                WriteUtil.append("DA-队列数量超过10，当前数量：" + queryMap.get(tableName).size());
                startTime = System.currentTimeMillis();
            }
            ThreadUtil.sleep(10000);
        }
    }

    /**
     * æ”¾å…¥é˜Ÿåˆ—
     *
     * @param tableName
@@ -325,12 +344,8 @@
                    }
                }
            }

            queryQueue.add(dte);
            WriteUtil.append("DA-成功放入队列-" + tableName + "-当前剩余队列数：" + queryQueue.size());
            while (queryQueue.size() >= 10) {
                SpringMVCContextHolder.getSystemLogger().error("DA-队列已满-" + tableName + "-当前剩余队列数：" + queryQueue.size());
            }
        }
    }


 product-server-data-center/src/main/java/com/product/data/center/service/DataArchivingService.java

@@ -390,6 +390,8 @@
                String maxID = paramFse.getString("max_id");
                String minID = paramFse.getString("min_id");
                String splitTableType = "1".equals(configFse.getString("split_table_type")) ? "1" : "0";
                //开启队列查询时，先清空队列防止上次未处理完的数据占用内存
                dataArchivingQueue.clear(sourceTable);
                dataArchivingQueue.query(sourceDbe, sourceTable, filterSb.toString(), null, uniqueField, minID);
                DataTableEntity allDte;
                Map<String, List<DataTableEntity>> groupDteMap;

 product-server-datasource/src/main/java/com/product/datasource/connection/ConnectionManager.java

@@ -200,6 +200,7 @@
        }
        Boolean enabling = Global.getPropertyToBoolean("data.system.oracle.connection-pool.enabling", "false");
        if (enabling) {
            synchronized (url.intern()){
            DruidDataSource druidDataSource = DB_DRUID_DATA_SOURCE_MAP.get(ArrayUtil.join(params, ","));
            if (druidDataSource == null || druidDataSource.isClosed()) {
                druidDataSource = new DruidDataSource();
@@ -243,6 +244,7 @@
                }
            }
        }
        }
        return getConnection(url, dbe);
    }


 product-server-report_v2/pom.xml

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/config/CmnConst.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/config/ReportCode.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/config/SystemCode.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/config/SystemParamSet.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/controller/ChartPropertyConfigController.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/controller/DataListReportController.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/controller/EChartsReportConfigController.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/controller/GenerateEChartController.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/controller/ListReportConfigController.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/controller/ReportConfigController.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/controller/ReportDatasourceController.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/controller/ReportTypeController.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/controller/TestDao.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/patch/PatchService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/quartz/ReportDataProcessQuartz.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/quartz/ViewDataConvertService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/CommonReportService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/DataListReportService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/EChartsReportConfigServiceimple.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/GenerateEChartService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/GroupReportService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/ListReportConfigService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/ListReportConfigServiceImple.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/ListReportServer.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/Report.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/ReportConfigService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/ReportDatasourceService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/ReportServerNew.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/ReportTypeService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/idel/EChartsReportConfigService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/idel/IChartPropertyConfigService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/idel/IGenerateEChartService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/idel/IReportConfigService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/idel/IReportDatasourceService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/idel/IReportTypeService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/idel/IViewDataConvertService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/main/java/com/product/server/report/service/idel/ListReportConfigService.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/test/java/com/product/server/report/AppTest.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/test/java/com/product/server/report/GenerateEChartTest.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/test/java/com/product/server/report/ReportConfigTest.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/test/java/com/product/server/report/ReportDatasourceTest.java

ÎļþÒÑɾ³ý

 product-server-report_v2/src/test/java/com/product/server/report/ReportTypeTest.java

ÎļþÒÑɾ³ý

 product-server-web/doc/ϵͳÉè¼Æ

@@ -1,8 +1,5 @@
版本控制：
    å½“前产品版本1.0.0
    è¡ç”Ÿé¡¹ç›®ç‰ˆæœ¬
        1.1.0       picc（绵阳人保）
        1.2.0       xn
    è¯¦ç»†è§£é‡Š
        ï¼ˆ1）目前的版本号共有3级，标准版按照1.0.0
        ï¼ˆ2）第一位作为产品大版本

 product-server-web/doc/ϵͳ²¿Êð.docx

Binary files differ

 product-server-web/doc/´íÎó´úÂëÏêϸ˵Ã÷.docx

Binary files differ

 product-server-web/imp_temp/¹ú¼Ê»¯LabelÄ£°å.xls

Binary files differ

 product-server-web/imp_temp/¸Úλģ°å.xls

Binary files differ

 product-server-web/imp_temp/¸ÚλµÈ¼¶Ä£°å.xls

Binary files differ

 product-server-web/imp_temp/³É±¾ÖÐÐÄÄ£°å.xlsx

Binary files differ

 product-server-web/imp_temp/Óû§ÐÅÏ¢.xls

Binary files differ

 product-server-web/imp_temp/×éÖ¯»ú¹¹Ä£°å.xls

Binary files differ

 product-server-web/jdbcDriver/JDBC.3.50.JCinfomix.tar

Binary files differ

 product-server-web/jdbcDriver/JDBC.3.50.JCinfomix/doc/install.txt

ÎļþÒÑɾ³ý

 product-server-web/jdbcDriver/JDBC.3.50.JCinfomix/doc/jdbcrel.htm

ÎļþÒÑɾ³ý

 product-server-web/jdbcDriver/JDBC.3.50.JCinfomix/doc/patchinfo.htm

ÎļþÒÑɾ³ý

 product-server-web/jdbcDriver/JDBC.3.50.JCinfomix/setup.jar

Binary files differ

 product-server-web/lib/mrc-ess-server-util-1.0.0-SNAPSHOT.jar

Binary files differ

 product-server-web/resources/LicenseKey.dat

@@ -1 +1 @@
7B6D2332DBB13421010AC91951B73AEE393AA4F5E45D8A81A6572ED29A0FB4447DF3FE2BEC7CD96B066B1AE8A658B97478DCAB2B59F0971241263C69679C721A8AF5514BD65B339FAA7B3034926730E3C0A10BE750BEFD02EF5E6D69BC6C0FB8C1C348F8AC9A60FC4AB8FB2FEA42C50CAB06A195F98259C08B6C31D545887F18799794981CB48507331CED6BEB79F5906E4004B0AC2F98E0EFD14C077055804FC7CEC36666395AD381078F5E8FB364798D6C34BDEA2C8A6093268E09421A203464C23223A30D8931DBC483E47344CF423031D5AF976CDB0FFA21F5B6B628B6849AF9155D68993343EC171BCAADEDBAABE9D583A4A011414F37B7AA8E1D4A6430845B63042C6A1344FBBEB1A94FB4011BB62C489CBCD7701D080AB8E175C45B74DB215C8C4DB5DC38B302550F805E6D3F9C86C247339259CBE2CF1AB21F676ED7BCFE01765BFC566E1A297633E94FF59CF3EAC9D0F54C6CB7BC55018A276886773A9FEB7C620BF276B43B068619ACB745A41F663CDCAF8EFF977E29E4FBCA0F18
704F16B1D215BC04042005365EB2001E3324D7BEEBA9206CA1F670D493A7874D7C65C473EBDEBD0C0EF47C7DAA7F2BF77CAEEAD85E4F681748A2D3CD6A86DF628FF6A90AD4E28B7DA66B8EA0915E4F4DC5DAAC065A7B746CEE1E7533BE0918A4C79FBCDEA24B82014A01B6D8E3A52BBDAC3DAA66FE9FDE3E8D92ACB54DA1746779BBD63F16726C6330140ED5EF0D1974692C5AABA9DBB6BFE742983374187BC2C0BF118861E3A0D68EF1CCBA87CA33988FB2F40FEE7ACFF8952DDCAC47AD42976792F264AC0C6C90D698959D70638E1C38307B559BB540F0F978D3F8B663E7D59E4143B96D5A6C02E5D5086BA3858386E638D338AA4353193CF6FDCC122CF6D68768ACF82104FB2AFF7BC993427E0A2CBD0DD5F1BF735AAC085FB9987E6CA983DB4C45064137A400B6F3DA128276ED819B65241830F4C8B5E849C75F16C93A17B11FE7195A7DF875199562CBE01186A6F4E87FFFF487D09BB4D1887F23C681DB31D998DB659BD4CAB381937A188CEF2DAA2F7065D5A5D42D9697A6E6F00BA3E9

 product-server-web/sql_patch/update_sql20220107_001.sql

ÎļþÒÑɾ³ý

 product-server-web/sql_patch/update_sql20220107_002.sql

ÎļþÒÑɾ³ý

 product-server-web/sql_patch/update_sql20220108_001.sql

ÎļþÒÑɾ³ý

 product-server-web/src/main/resources/application-dev.properties

@@ -76,19 +76,8 @@
data.source.type=mysql
data.source.driver=com.mysql.cj.jdbc.Driver
#################local###############################
#data.source.url=jdbc:mysql://110.185.195.204:9092/ch_kt_mes_apply?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
#data.source.url=jdbc:mysql://192.168.137.1:3306/ch_kt_mes_apply?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
# \u672C\u5730mysql8
#data.source.url=jdbc:mysql://127.0.0.1:3308/ch_kt_mes_apply?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
# \u6D4B\u8BD5\u670D\u52A1\u5668
#data.source.url=jdbc:mysql://10.4.69.68:3306/ch_kt_mes_apply?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
# \u6B63\u5F0F\u670D\u52A1\u5668-\u91C7\u96C6
#data.source.url=jdbc:mysql://10.13.1.39:3306/ch_kt_mes_apply?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
# \u6B63\u5F0F\u670D\u52A1\u5668-\u62A5\u8868
data.source.url=jdbc:mysql://10.13.1.39:3306/ch_kt_mes_apply?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
data.source.user=root
#data.source.password=root123
#data.source.password=a123
data.source.password=CHKTADMIN
##################local###############################
#-------------------------druid\u8FDE\u63A5\u6C60\u7684\u914D\u7F6E\u4FE1\u606F------------------------

 product-server-web/src/main/resources/application.properties

@@ -1,5 +1,5 @@
# dev prod
spring.profiles.active=dev
spring.profiles.active=prod

# *********server log start **************
server.tomcat.access-log-pattern=%h %D %m %l %u %t "%r" %s %b

 product-server-web/src/main/resources/logback-spring.xml

@@ -2,7 +2,8 @@
    <property name="LOG_HOME" value="./logs/backend" />
    <timestamp key="byDate" datePattern="yyyy-MM-dd"/>
    <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
    <property name="MESSAGE_FILE_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}.%M - %msg%n" />
    <property name="MESSAGE_FILE_PATTERN"
              value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}.%M - %msg%n"/>
    <!-- æ—¥å¿—文件保留时长 -->
    <property name="maxhistory" value="60"/>
    <!-- æ—¥å¿—文件分割大小 -->
@@ -86,7 +87,7 @@
    <!-- ç”Ÿäº§çŽ¯å¢ƒ -->
    <springProfile name="prod">
        <root level="info">
            <appender-ref ref="consoleAppender"/>
            <!--            ç¦ç”¨æŽ§åˆ¶å°æ‰“印-->
            <appender-ref ref="errorAppender"/>
            <appender-ref ref="infoAppender"/>
        </root>