kobe6258 преди 3 месеца
родител
ревизия
a5256baebc
променени са 33 файла, в които са добавени 1828 реда и са изтрити 52 реда
  1. 511 1
      .idea/easyCodeTableSetting.xml
  2. 1 0
      qhtx-eta-integrator/qhtx-integrator-common/src/main/java/com/qhtx/eta/common/constant/ETAConstants.java
  3. 1 0
      qhtx-eta-integrator/qhtx-integrator-common/src/main/java/com/qhtx/eta/common/eunms/ErrorEnum.java
  4. 48 0
      qhtx-eta-integrator/qhtx-integrator-common/src/main/java/com/qhtx/eta/common/utils/MD5Utils.java
  5. 20 0
      qhtx-eta-integrator/qhtx-integrator-domain/src/main/java/com/qhtx/eta/domain/convert/DWIndexWithLinkCodeDTOConverter.java
  6. 11 0
      qhtx-eta-integrator/qhtx-integrator-domain/src/main/java/com/qhtx/eta/domain/entity/DWIndexWithLinkCodeDTO.java
  7. 5 1
      qhtx-eta-integrator/qhtx-integrator-domain/src/main/java/com/qhtx/eta/domain/entity/LinkDataDTO.java
  8. 123 11
      qhtx-eta-integrator/qhtx-integrator-domain/src/main/java/com/qhtx/eta/domain/job/ETASyncJob.java
  9. 14 0
      qhtx-eta-integrator/qhtx-integrator-domain/src/main/java/com/qhtx/eta/domain/service/DWIndexFrameService.java
  10. 36 6
      qhtx-eta-integrator/qhtx-integrator-domain/src/main/java/com/qhtx/eta/domain/service/impl/DWIndexFrameServiceImpl.java
  11. 11 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/entity/dw/DWIndex.java
  12. 159 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/entity/dw/TDampDwIndex.java
  13. 4 4
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/entity/dw/TDampDwIndexData.java
  14. 78 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/entity/dw/TDampDwIndexLink.java
  15. 197 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/entity/dw/TDampDwLinkDetail.java
  16. 45 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/mapper/TDampDwIndexDao.java
  17. 2 1
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/mapper/TDampDwIndexDataDao.java
  18. 33 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/mapper/TDampDwIndexLinkDao.java
  19. 35 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/mapper/TDampDwLinkDetailDao.java
  20. 2 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/TDampDwIndexDataService.java
  21. 22 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/TDampDwIndexLinkService.java
  22. 26 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/TDampDwIndexService.java
  23. 27 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/TDampDwLinkDetailService.java
  24. 25 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/impl/TDampDwIndexDataServiceImpl.java
  25. 33 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/impl/TDampDwIndexLinkServiceImpl.java
  26. 44 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/impl/TDampDwIndexServiceImpl.java
  27. 38 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/impl/TDampDwLinkDetailServiceImpl.java
  28. 2 2
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper/EtaApiQuotaInfoDao.xml
  29. 72 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper/TDampDwIndexDao.xml
  30. 56 19
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper/TDampDwIndexDataDao.xml
  31. 47 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper/TDampDwIndexLinkDao.xml
  32. 9 7
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper/TDampDwLinkDataDao.xml
  33. 91 0
      qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper/TDampDwLinkDetailDao.xml

+ 511 - 1
.idea/easyCodeTableSetting.xml

@@ -3,6 +3,395 @@
   <component name="EasyCodeTableSetting">
     <option name="tableInfoMap">
       <map>
+        <entry key="DW.T_DAMP_DW_INDEX">
+          <value>
+            <TableInfoDTO>
+              <option name="comment" value="指标表" />
+              <option name="fullColumn">
+                <list>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="主键" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="id" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="指标名称中文" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="indexCnName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="签名,中文名的MD5生成,用来保证名称唯一" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="cnSignature" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="指标名称中文简称" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="indexShortName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="指标名称英文" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="indexEnName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="指标编码" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="indexCode" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="来源" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="sourceName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="频度" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="frequency" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="保留位数" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="places" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="指标状态 1:正常维护 2停止维护" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="status" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="维护方式 1:人工 2:爬虫 3:计算 4:对接;" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="maintainType" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="是否对外,1:是,0:否" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="isForeign" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="衍生公式;" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="deriveFormula" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="是否删除,1:是,0:否" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="isDelete" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="是否启用,1:是,0:否" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="isEnable" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="框架id" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="frameId" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="目标信息表id" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="infoTableId" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="目标信息表名" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="infoTableName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="目标信息表ES表名" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="infoTableEsName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="目标数据表id" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="dataTableId" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="目标数据表名" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="dataTableName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="目标数据表ES表名" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="dataTableEsName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="单位" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="units" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="英文描述" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="enRemarks" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="中文描述" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="cnRemarks" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="创建时间" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="createTime" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="更新时间" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="updateTime" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="创建人id" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="createUserId" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="创建人名称" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="createUserName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="更新人id" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="updateUserId" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="更新人名称" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="updateUserName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="分类名称(弃用)" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="dataName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="分类代码(弃用)" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="dataClassifyCode" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="分类 值名称" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="valueName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="分类 值编码" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="valueCode" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                </list>
+              </option>
+              <option name="name" value="TDampDwIndex" />
+              <option name="preName" value="" />
+              <option name="saveModelName" value="qhtx-integrator-infra" />
+              <option name="savePackageName" value="com.qhtx.eta.infra" />
+              <option name="savePath" value="./qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra" />
+              <option name="templateGroupName" value="Default" />
+            </TableInfoDTO>
+          </value>
+        </entry>
+        <entry key="DW.T_DAMP_DW_INDEX_LINK">
+          <value>
+            <TableInfoDTO>
+              <option name="comment" value="DW层-指标和对接码关系表" />
+              <option name="fullColumn">
+                <list>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="主键" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="id" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="指标id" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="indexId" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="指标编码" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="indexCode" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="对接码详情表id" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="linkDataId" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="对接码" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="linkCode" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="时间范围起" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="dateFrom" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="时间范围止" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="dateTo" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="是否删除,1:是,0:否" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="isDelete" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="创建时间" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="createTime" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="更新时间" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="updateTime" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="创建人id" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="createUserId" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="创建人名称" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="createUserName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="更新人id" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="updateUserId" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="更新人" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="updateUserName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="htUniqueCode" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="indexCnName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                </list>
+              </option>
+              <option name="name" value="TDampDwIndexLink" />
+              <option name="preName" value="" />
+              <option name="saveModelName" value="qhtx-integrator-infra" />
+              <option name="savePackageName" value="com.qhtx.eta.infra" />
+              <option name="savePath" value="./qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra" />
+              <option name="templateGroupName" value="Default" />
+            </TableInfoDTO>
+          </value>
+        </entry>
         <entry key="DW.T_DAMP_DW_LINK_DATA">
           <value>
             <TableInfoDTO>
@@ -132,6 +521,127 @@
             </TableInfoDTO>
           </value>
         </entry>
+        <entry key="DW.T_DAMP_DW_LINK_DETAIL">
+          <value>
+            <TableInfoDTO>
+              <option name="fullColumn">
+                <list>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="主键id" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="id" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="linkId" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="linkId" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="对接码" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="linkCode" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="对接码名称" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="linkName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="数据时间" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="dataDate" />
+                    <option name="type" value="java.util.Date" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="发布时间" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="publishTime" />
+                    <option name="type" value="java.util.Date" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="数据值" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="dataValue" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="数据值(非数值类型)" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="dataValueChar" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="备注" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="remark" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="是否删除,1:是,0:否" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="isDelete" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="元素值" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="elementVal" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="元素名" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="elementName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="创建时间" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="createTime" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="更新时间" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="updateTime" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="分区" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="partitionId" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                </list>
+              </option>
+              <option name="name" value="TDampDwLinkDetail" />
+              <option name="preName" value="" />
+              <option name="saveModelName" value="qhtx-integrator-infra" />
+              <option name="savePackageName" value="com.qhtx.eta.infra" />
+              <option name="savePath" value="./qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra" />
+              <option name="templateGroupName" value="Default" />
+            </TableInfoDTO>
+          </value>
+        </entry>
         <entry key="DW.T_DAMP_DW_LINK_INFO">
           <value>
             <TableInfoDTO>
@@ -263,7 +773,7 @@
               <option name="preName" value="" />
               <option name="saveModelName" value="qhtx-integrator-infra" />
               <option name="savePackageName" value="com.qhtx.eta.infra" />
-              <option name="savePath" value="./qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper" />
+              <option name="savePath" value="./qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra" />
               <option name="templateGroupName" value="Default" />
             </TableInfoDTO>
           </value>

+ 1 - 0
qhtx-eta-integrator/qhtx-integrator-common/src/main/java/com/qhtx/eta/common/constant/ETAConstants.java

@@ -57,4 +57,5 @@ public class ETAConstants {
 
 
     public static final String COLON = ":";
+    public static final int SEQ_LENGTH = 10;
 }

+ 1 - 0
qhtx-eta-integrator/qhtx-integrator-common/src/main/java/com/qhtx/eta/common/eunms/ErrorEnum.java

@@ -10,6 +10,7 @@ public enum ErrorEnum {
      */
     BEAN_COVERT_TO_MAP_ERROR("00001", "bean转换成map失败"),
     PARSE_TIME_ERROR("00002", "解析时间错误"),
+    DB_ERROR("00003", "数据库执行异常"),
     /**
      * SYSTEM ERROR CODE
      */

+ 48 - 0
qhtx-eta-integrator/qhtx-integrator-common/src/main/java/com/qhtx/eta/common/utils/MD5Utils.java

@@ -0,0 +1,48 @@
+package com.qhtx.eta.common.utils;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.security.MessageDigest;
+
+@Slf4j
+public class MD5Utils {
+    private static final String HEX_DIGITS[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"};
+
+    private static String byteArrayToHexString(byte[] b) {
+        StringBuilder resultSb = new StringBuilder();
+        for (int i = 0; i < b.length; i++) {
+            resultSb.append(byteToHexString(b[i]));
+        }
+        return resultSb.toString();
+    }
+
+    private static String byteToHexString(byte b) {
+        int n = b;
+        if (n < 0) {
+            n += 256;
+        }
+        int d1 = n / 16;
+        int d2 = n % 16;
+        return HEX_DIGITS[d1] + HEX_DIGITS[d2];
+    }
+
+    public static String md5Encode(String origin) {
+        return md5Encode(origin, "UTF-8");
+    }
+
+    public static String md5Encode(String origin, String charsetName) {
+        String resultString = null;
+        try {
+            resultString = origin;
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            if (charsetName == null || charsetName.isEmpty()) {
+                resultString = byteArrayToHexString(md.digest(resultString.getBytes()));
+            } else {
+                resultString = byteArrayToHexString(md.digest(resultString.getBytes(charsetName)));
+            }
+        } catch (Exception e) {
+            log.error("MD5加密失败", e);
+        }
+        return resultString;
+    }
+}

+ 20 - 0
qhtx-eta-integrator/qhtx-integrator-domain/src/main/java/com/qhtx/eta/domain/convert/DWIndexWithLinkCodeDTOConverter.java

@@ -0,0 +1,20 @@
+package com.qhtx.eta.domain.convert;
+
+import com.qhtx.eta.domain.entity.DWIndexWithLinkCodeDTO;
+import com.qhtx.eta.infra.entity.dw.DWIndex;
+import com.qhtx.eta.infra.entity.dw.TDampDwIndex;
+import com.qhtx.eta.infra.entity.dw.TDampDwIndexLink;
+import com.qhtx.eta.infra.entity.dw.TDampDwLinkData;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface DWIndexWithLinkCodeDTOConverter {
+    DWIndexWithLinkCodeDTOConverter INSTANCE = Mappers.getMapper(DWIndexWithLinkCodeDTOConverter.class);
+
+    TDampDwIndex convertDTOToEntity(DWIndexWithLinkCodeDTO dto);
+
+
+    TDampDwIndexLink convertDTOToLinkEntity(DWIndexWithLinkCodeDTO dto);
+    // TDampDwLinkData
+}

+ 11 - 0
qhtx-eta-integrator/qhtx-integrator-domain/src/main/java/com/qhtx/eta/domain/entity/DWIndexWithLinkCodeDTO.java

@@ -7,8 +7,17 @@ import java.util.List;
 
 @Data
 public class DWIndexWithLinkCodeDTO {
+    private String id;
+    private String indexCnName;
+    private String cnSignature;
+    private String indexShortName;
+    private String sourceName;
+    private String frequency;
     private String indexId;
     private String indexCode;
+    private Integer places = -1;
+    private Long dateFrom;
+    private String linkDataId;
     private Integer status = 1;
     private Integer maintainType = 4;
     private Integer isForeign = 1;
@@ -18,6 +27,8 @@ public class DWIndexWithLinkCodeDTO {
     private String dataTableName = "t_damp_dw_index_data";
     private String units;
     private String cnRemarks;
+    private Long createTime;
+    private Long updateTime;
     private Integer createUserId = 0;
     private String createUserName = "SYS_INIT";
     private String linkCode;

+ 5 - 1
qhtx-eta-integrator/qhtx-integrator-domain/src/main/java/com/qhtx/eta/domain/entity/LinkDataDTO.java

@@ -6,6 +6,10 @@ import java.util.List;
 
 @Data
 public class LinkDataDTO {
+    /**
+     * 对接码id
+     */
+    private String id;
 
     /**
      * 对接码管理表主键
@@ -23,7 +27,7 @@ public class LinkDataDTO {
      * 对接码所属字段名称,以,隔开
      */
     private String linkFiledName;
-    
+
     /**
      * 元素值
      */

+ 123 - 11
qhtx-eta-integrator/qhtx-integrator-domain/src/main/java/com/qhtx/eta/domain/job/ETASyncJob.java

@@ -5,10 +5,11 @@ import com.google.common.collect.Lists;
 import com.qhtx.eta.common.eunms.DataSourceType;
 import com.qhtx.eta.common.eunms.ErrorEnum;
 import com.qhtx.eta.common.exception.ETAException;
-import com.qhtx.eta.domain.annotation.DomainTransDataSource;
+import com.qhtx.eta.common.utils.MD5Utils;
 import com.qhtx.eta.domain.config.ScheduleConfig;
 import com.qhtx.eta.domain.config.ScheduleTaskConfig;
 import com.qhtx.eta.domain.convert.ClassifyMappingDTOConverter;
+import com.qhtx.eta.domain.convert.DWIndexWithLinkCodeDTOConverter;
 import com.qhtx.eta.domain.entity.*;
 import com.qhtx.eta.domain.enums.ETADataStatus;
 import com.qhtx.eta.domain.enums.ETAInterfaceEnum;
@@ -25,22 +26,31 @@ import com.qhtx.eta.common.constant.ETAConstants;
 import com.qhtx.eta.domain.service.impl.TDampLinkService;
 import com.qhtx.eta.domain.task.FixedDelayTaskRegistrar;
 import com.qhtx.eta.domain.task.SchedulingRunnable;
-import com.qhtx.eta.infra.annotation.UseDataSource;
-import com.qhtx.eta.infra.entity.dw.TEtaIndexPushTask;
-import com.qhtx.eta.infra.entity.ods.EtaApiQuotaInfo;
+import com.qhtx.eta.infra.datasource.DataSourceContextHolder;
+import com.qhtx.eta.infra.entity.dw.*;
 import com.qhtx.eta.infra.enums.Frequency;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.time.Month;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -85,6 +95,8 @@ public class ETASyncJob implements CommandLineRunner {
     @Resource
     private ETAPushDataService etaPushDataService;
 
+    @Resource
+    private TransactionTemplate transactionTemplate;
     @Resource
     private RedissonClient redissonClient;
 
@@ -221,12 +233,13 @@ public class ETASyncJob implements CommandLineRunner {
             log.info("================================ 开始同步接口指标分类列表 ================================ ");
             log.info("================================ 接口指标分类列表数量:{}条================================ ", classifyList.size());
             try {
-//                etaClassifyService.syncClassify(classifyList);
-//                List<ClassifyMappingDTO> processingList = etaClassifyService.getProcessingList();
-//                if (!CollectionUtils.isEmpty(processingList)) {
-//                    log.info("processingList size:{}", processingList.size());
-//                    dwIndexFrameService.processing(ClassifyMappingDTOConverter.INSTANCE.convertDTOToDWIndexFrameList(processingList));
-//                }
+                // etaClassifyService.syncClassify(classifyList);
+                List<ClassifyMappingDTO> processingList = etaClassifyService.getProcessingList();
+                if (!CollectionUtils.isEmpty(processingList)) {
+                    log.info("processingList size:{}", processingList.size());
+                    dwIndexFrameService.processing(ClassifyMappingDTOConverter.INSTANCE.convertDTOToDWIndexFrameList(processingList));
+                }
+                log.info("================================ 指标分类列表同步完成 ================================ ");
                 //对接码指标数据
                 CompletableFuture<List<QuotaInfoDTO>> QuotaInfoFutures = CompletableFuture.supplyAsync(() -> etaQuotaService.getQuotaList());
                 //对接码数据
@@ -261,16 +274,86 @@ public class ETASyncJob implements CommandLineRunner {
                             classifyMap.put(classifyId, classify);
                         }
                         for (LinkDataDTO linkDataDTO : linkDataList) {
+                            String dateFrom = "1970-01-02";
+                            long startDate = new SimpleDateFormat(ETAConstants.DATE_PATTERN).parse(dateFrom).getTime();
+                            long createTime = new Date().getTime();
                             DWIndexWithLinkCodeDTO dwIndexWithLinkCodeDTO = new DWIndexWithLinkCodeDTO();
+                            dwIndexWithLinkCodeDTO.setCreateTime(createTime);
+                            dwIndexWithLinkCodeDTO.setUpdateTime(createTime);
+                            dwIndexWithLinkCodeDTO.setDateFrom(startDate);
                             dwIndexWithLinkCodeDTO.setLinkCode(linkDataDTO.getLinkCode());
                             dwIndexWithLinkCodeDTO.setLinkId(linkDataDTO.getLinkId());
+                            dwIndexWithLinkCodeDTO.setLinkDataId(linkDataDTO.getId());
                             QuotaInfoDTO dimensionData = dimensionDataMap.get(linkDataDTO.getElementVal());
+                            if (dimensionData == null) {
+                                log.warn("未找到对应指标数据:{}", linkDataDTO.getElementVal());
+                                continue;
+                            }
+                            dwIndexWithLinkCodeDTO.setFrequency(dimensionData.getFrequency());
+                            dwIndexWithLinkCodeDTO.setIndexCnName(dimensionData.getEdbName());
+                            String signature = MD5Utils.md5Encode(dwIndexWithLinkCodeDTO.getIndexCnName());
+                            dwIndexWithLinkCodeDTO.setCnSignature(signature);
+                            dwIndexWithLinkCodeDTO.setIndexShortName(dimensionData.getEdbName());
+                            dwIndexWithLinkCodeDTO.setUnits(dimensionData.getUnit());
+                            dwIndexWithLinkCodeDTO.setSourceName(dimensionData.getEdbSourceName());
+                            dwIndexWithLinkCodeDTO.setCnRemarks(dimensionData.getEdbName());
                             ClassifyMappingDTO classify = classifyMap.get(dimensionData.getClassifyId());
+                            if (classify == null) {
+                                log.warn("未找到对应指标分类:{}", dimensionData.getClassifyId());
+                                continue;
+                            }
+                            String indexId = UUID.randomUUID().toString().replaceAll("-", "");
+                            List<Long> seqs = dwIndexFrameService.getIndexSeq(1);
+                            String indexCode = "ZB" + String.format("%0" + ETAConstants.SEQ_LENGTH + "d", seqs.get(0));
+                            dwIndexWithLinkCodeDTO.setIndexCode(indexCode);
+                            dwIndexWithLinkCodeDTO.setId(indexId);
+                            dwIndexWithLinkCodeDTO.setIndexId(indexId);
                             dwIndexWithLinkCodeDTO.setFrameId(classify.getIndexFrameId());
                             dwIndexWithLinkCodeList.add(dwIndexWithLinkCodeDTO);
                         }
+                        //开始处理指标
+                        for (DWIndexWithLinkCodeDTO dwIndexWithLinkCodeDTO : dwIndexWithLinkCodeList) {
+                            TDampDwIndex dwIndex = DWIndexWithLinkCodeDTOConverter.INSTANCE.convertDTOToEntity(dwIndexWithLinkCodeDTO);
+                            TDampDwIndexLink tDampDwIndexLink = DWIndexWithLinkCodeDTOConverter.INSTANCE.convertDTOToLinkEntity(dwIndexWithLinkCodeDTO);
+                            //获取对接码数据
+                            List<TDampDwIndexData> dwLinkDetailList = dwIndexFrameService.getlinkDataList(dwIndexWithLinkCodeDTO.getLinkCode()).stream().map(linkData -> {
+                                TDampDwIndexData dwIndexData = new TDampDwIndexData();
+                                dwIndexData.setId(UUID.randomUUID().toString().replace("-", ""));
+                                dwIndexData.setDataDate(convertDateByFrequency(linkData.getDataDate(), Frequency.getFrequencyByDesc(dwIndex.getFrequency())));
+                                dwIndexData.setDataValue(new BigDecimal(String.valueOf(linkData.getDataValue())));
+                                dwIndexData.setDataValueChar(linkData.getDataValueChar());
+                                dwIndexData.setIndexId(dwIndex.getId());
+                                dwIndexData.setIndexCode(dwIndex.getIndexCode());
+                                dwIndexData.setCreateTime(System.currentTimeMillis());
+                                dwIndexData.setUpdateTime(System.currentTimeMillis());
+                                dwIndexData.setCreateUserId(0L);
+                                dwIndexData.setPublishTime(linkData.getPublishTime());
+                                dwIndexData.setCreateUserName(" ");
+                                dwIndexData.setUpdateUserId(0L);
+                                dwIndexData.setUpdateUserName(" ");
+                                dwIndexData.setIsDelete(0);
+                                return dwIndexData;
+                            }).collect(Collectors.toList());
+                            if (CollectionUtils.isEmpty(dwLinkDetailList)) {
+                                log.warn("未找到对应指标数据:{},不同步指标", dwIndexWithLinkCodeDTO.getLinkCode());
+                                continue;
+                            }
+                            DataSourceContextHolder.setDataSourceType(DataSourceType.DW);
+                            transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+                                @Override
+                                @Transactional(rollbackFor = Exception.class)
+                                protected void doInTransactionWithoutResult(@NotNull TransactionStatus status) {
+                                    //现插入指标
+                                    dwIndexFrameService.insertIndex(dwIndex);
+                                    //更新指标对接码
+                                    dwIndexFrameService.insertIndexLink(tDampDwIndexLink);
+                                    dwIndexFrameService.batchInsertIndexData(dwLinkDetailList);
+                                    //添加指标数据
+                                }
+                            });
+                        }
                     }
-                    System.out.println("etaApiQuotaInfoList size:" + etaApiQuotaInfoList.size());
+
                 } catch (Exception e) {
                     log.error("同步指标数据数据失败", e);
                 }
@@ -383,6 +466,35 @@ public class ETASyncJob implements CommandLineRunner {
         }
     }
 
+
+    private Date convertDateByFrequency(Date date, Frequency frequency) {
+        if (date == null || frequency == null) {
+            return null;
+        }
+        LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        switch (frequency) {
+            case DAILY:
+            case DECADELY:
+                return date;
+            case WEEKLY:
+                return Date.from(localDate.plusDays(DayOfWeek.FRIDAY.getValue() - localDate.getDayOfWeek().getValue()).atStartOfDay(ZoneId.systemDefault()).toInstant());
+            case MONTHLY:
+                return Date.from(localDate.with(TemporalAdjusters.lastDayOfMonth()).atStartOfDay(ZoneId.systemDefault()).toInstant());
+            case YEARLY:
+                return Date.from(localDate.with(TemporalAdjusters.lastDayOfYear()).atStartOfDay(ZoneId.systemDefault()).toInstant());
+            case SEMI_ANNUAL: {
+                Month month = (localDate.getMonthValue() > 6) ? Month.DECEMBER : Month.JUNE;
+                return Date.from(localDate.of(localDate.getYear(), month, month.length(localDate.isLeapYear())).atStartOfDay(ZoneId.systemDefault()).toInstant());
+            }
+            case QUARTERLY: {
+                Month month = Month.of(localDate.getMonth().firstMonthOfQuarter().getValue()).plus(2L);
+                return Date.from(localDate.of(localDate.getYear(), month, month.length(localDate.isLeapYear())).atStartOfDay(ZoneId.systemDefault()).toInstant());
+            }
+            default:
+                return null;
+        }
+    }
+
     private void pause() {
         try {
             Thread.sleep(interval);

+ 14 - 0
qhtx-eta-integrator/qhtx-integrator-domain/src/main/java/com/qhtx/eta/domain/service/DWIndexFrameService.java

@@ -3,7 +3,11 @@ package com.qhtx.eta.domain.service;
 import com.qhtx.eta.domain.entity.DWIndexDTO;
 import com.qhtx.eta.domain.entity.DWIndexDataDTO;
 import com.qhtx.eta.domain.entity.DWIndexFrameDTO;
+import com.qhtx.eta.infra.entity.dw.TDampDwLinkDetail;
 import com.qhtx.eta.infra.entity.dw.DWIndex;
+import com.qhtx.eta.infra.entity.dw.TDampDwIndex;
+import com.qhtx.eta.infra.entity.dw.TDampDwIndexData;
+import com.qhtx.eta.infra.entity.dw.TDampDwIndexLink;
 
 import java.util.List;
 
@@ -22,4 +26,14 @@ public interface DWIndexFrameService {
     DWIndexDTO getIndex(String indexCode);
 
     List<DWIndexDataDTO> getIndexData(String indexCode);
+
+    void insertIndex(TDampDwIndex dwIndex);
+
+    List<Long> getIndexSeq(int nums);
+
+    void insertIndexLink(TDampDwIndexLink tDampDwIndexLink);
+
+    List<TDampDwLinkDetail> getlinkDataList(String linkCode);
+
+    void batchInsertIndexData(List<TDampDwIndexData> dwLinkDetailList);
 }

+ 36 - 6
qhtx-eta-integrator/qhtx-integrator-domain/src/main/java/com/qhtx/eta/domain/service/impl/DWIndexFrameServiceImpl.java

@@ -4,7 +4,6 @@ import com.alibaba.druid.util.StringUtils;
 import com.qhtx.eta.common.constant.ETAConstants;
 import com.qhtx.eta.common.eunms.ErrorEnum;
 import com.qhtx.eta.common.exception.ETAException;
-import com.qhtx.eta.domain.annotation.DomainTransDataSource;
 import com.qhtx.eta.domain.convert.DWIndexDTOConverter;
 import com.qhtx.eta.domain.convert.DWIndexDataDTOConverter;
 import com.qhtx.eta.domain.convert.DWIndexFrameDTOConverter;
@@ -14,17 +13,14 @@ import com.qhtx.eta.domain.entity.DWIndexFrameDTO;
 import com.qhtx.eta.domain.service.DWIndexFrameService;
 import com.qhtx.eta.domain.utils.RedisUtils;
 import com.qhtx.eta.infra.datasource.DataSourceContextHolder;
+import com.qhtx.eta.infra.entity.dw.TDampDwLinkDetail;
 import com.qhtx.eta.infra.entity.dw.*;
-import com.qhtx.eta.infra.service.EtaApiClassifyService;
-import com.qhtx.eta.infra.service.IndexFrameService;
-import com.qhtx.eta.infra.service.TDampDwIndexDataService;
-import com.qhtx.eta.infra.service.TEtaIndexPushTaskService;
+import com.qhtx.eta.infra.service.*;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.util.CollectionUtils;
@@ -59,6 +55,15 @@ public class DWIndexFrameServiceImpl implements DWIndexFrameService {
     @Resource
     private TDampDwIndexDataService tDampDwIndexDataService;
 
+    @Resource
+    private TDampDwIndexLinkService tDampDwIndexLinkService;
+
+    @Resource
+    private TDampDwLinkDetailService tDampDwLinkDetailService;
+
+
+    @Resource
+    private TDampDwIndexService tDampDwIndexService;
     @Resource(name = "IndexDataThreadPool")
     private ThreadPoolExecutor indexDataThreadPool;
 
@@ -184,6 +189,31 @@ public class DWIndexFrameServiceImpl implements DWIndexFrameService {
         return allResults.stream().map(DWIndexDataDTOConverter.INSTANCE::convertToDTO).collect(Collectors.toList());
     }
 
+    @Override
+    public void insertIndex(TDampDwIndex dwIndex) {
+        tDampDwIndexService.insert(dwIndex);
+    }
+
+    @Override
+    public List<Long> getIndexSeq(int nums) {
+        return tDampDwIndexService.getIndexSeq(nums);
+    }
+
+    @Override
+    public void insertIndexLink(TDampDwIndexLink tDampDwIndexLink) {
+        tDampDwIndexLinkService.insert(tDampDwIndexLink);
+    }
+
+    @Override
+    public List<TDampDwLinkDetail> getlinkDataList(String linkCode) {
+        return tDampDwLinkDetailService.queryByLinkCode(linkCode);
+    }
+
+    @Override
+    public void batchInsertIndexData(List<TDampDwIndexData> dwLinkDetailList) {
+        tDampDwIndexDataService.batchInsertIndexData(dwLinkDetailList);
+    }
+
     private List<DWIndexFrameDTO> parseList(FrameNode node) {
         if (node == null) {
             return null;

+ 11 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/entity/dw/DWIndex.java

@@ -12,4 +12,15 @@ public class DWIndex {
     private String frequency;
     private String units;
     private String places;
+    private String cnSignature;
+    private Integer status ;
+    private Integer maintainType;
+    private Integer isForeign ;
+    private Integer isDelete ;
+    private Integer isEnable;
+    private String frameId;
+    private String dataTableName;
+    private String cnRemarks;
+    private Integer createUserId;
+    private String createUserName ;
 }

+ 159 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/entity/dw/TDampDwIndex.java

@@ -0,0 +1,159 @@
+package com.qhtx.eta.infra.entity.dw;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 指标表(TDampDwIndex)实体类
+ *
+ * @author makejava
+ * @since 2024-10-15 17:51:49
+ */
+@Data
+public class TDampDwIndex implements Serializable {
+    private static final long serialVersionUID = -20237045048334321L;
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 指标名称中文
+     */
+    private String indexCnName;
+    /**
+     * 签名,中文名的MD5生成,用来保证名称唯一
+     */
+    private String cnSignature;
+    /**
+     * 指标名称中文简称
+     */
+    private String indexShortName;
+    /**
+     * 指标名称英文
+     */
+    private String indexEnName;
+    /**
+     * 指标编码
+     */
+    private String indexCode;
+    /**
+     * 来源
+     */
+    private String sourceName;
+    /**
+     * 频度
+     */
+    private String frequency;
+    /**
+     * 保留位数
+     */
+    private Integer places;
+    /**
+     * 指标状态 1:正常维护 2停止维护
+     */
+    private Integer status;
+    /**
+     * 维护方式 1:人工 2:爬虫 3:计算 4:对接;
+     */
+    private Integer maintainType;
+    /**
+     * 是否对外,1:是,0:否
+     */
+    private Integer isForeign;
+    /**
+     * 衍生公式;
+     */
+    private String deriveFormula;
+    /**
+     * 是否删除,1:是,0:否
+     */
+    private Integer isDelete;
+    /**
+     * 是否启用,1:是,0:否
+     */
+    private Integer isEnable;
+    /**
+     * 框架id
+     */
+    private String frameId;
+    /**
+     * 目标信息表id
+     */
+    private String infoTableId;
+    /**
+     * 目标信息表名
+     */
+    private String infoTableName;
+    /**
+     * 目标信息表ES表名
+     */
+    private String infoTableEsName;
+    /**
+     * 目标数据表id
+     */
+    private String dataTableId;
+    /**
+     * 目标数据表名
+     */
+    private String dataTableName;
+    /**
+     * 目标数据表ES表名
+     */
+    private String dataTableEsName;
+    /**
+     * 单位
+     */
+    private String units;
+    /**
+     * 英文描述
+     */
+    private String enRemarks;
+    /**
+     * 中文描述
+     */
+    private String cnRemarks;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+    /**
+     * 更新时间
+     */
+    private String updateTime;
+    /**
+     * 创建人id
+     */
+    private String createUserId;
+    /**
+     * 创建人名称
+     */
+    private String createUserName;
+    /**
+     * 更新人id
+     */
+    private String updateUserId;
+    /**
+     * 更新人名称
+     */
+    private String updateUserName;
+    /**
+     * 分类名称(弃用)
+     */
+    private String dataName;
+    /**
+     * 分类代码(弃用)
+     */
+    private String dataClassifyCode;
+    /**
+     * 分类 值名称
+     */
+    private String valueName;
+    /**
+     * 分类 值编码
+     */
+    private String valueCode;
+
+
+}
+

+ 4 - 4
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/entity/dw/TDampDwIndexData.java

@@ -54,15 +54,15 @@ public class TDampDwIndexData {
     /**
      * 创建时间
      */
-    private String createTime;
+    private Long createTime;
     /**
      * 更新时间
      */
-    private String updateTime;
+    private Long updateTime;
     /**
      * 创建人id
      */
-    private String createUserId;
+    private Long createUserId;
     /**
      * 创建人名称
      */
@@ -70,7 +70,7 @@ public class TDampDwIndexData {
     /**
      * 更新人
      */
-    private String updateUserId;
+    private Long updateUserId;
     /**
      * 更新人名字
      */

+ 78 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/entity/dw/TDampDwIndexLink.java

@@ -0,0 +1,78 @@
+package com.qhtx.eta.infra.entity.dw;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * DW层-指标和对接码关系表(TDampDwIndexLink)实体类
+ *
+ * @author makejava
+ * @since 2024-10-16 11:03:42
+ */
+@Data
+public class TDampDwIndexLink implements Serializable {
+    private static final long serialVersionUID = -55387477011291395L;
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 指标id
+     */
+    private String indexId;
+    /**
+     * 指标编码
+     */
+    private String indexCode;
+    /**
+     * 对接码详情表id
+     */
+    private String linkDataId;
+    /**
+     * 对接码
+     */
+    private String linkCode;
+    /**
+     * 时间范围起
+     */
+    private Long dateFrom;
+    /**
+     * 时间范围止
+     */
+    private Long dateTo;
+    /**
+     * 是否删除,1:是,0:否
+     */
+    private Integer isDelete;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+    /**
+     * 更新时间
+     */
+    private String updateTime;
+    /**
+     * 创建人id
+     */
+    private String createUserId;
+    /**
+     * 创建人名称
+     */
+    private String createUserName;
+    /**
+     * 更新人id
+     */
+    private String updateUserId;
+    /**
+     * 更新人
+     */
+    private String updateUserName;
+
+    private String htUniqueCode;
+
+    private String indexCnName;
+
+}
+

+ 197 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/entity/dw/TDampDwLinkDetail.java

@@ -0,0 +1,197 @@
+package com.qhtx.eta.infra.entity.dw;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * (TDampDwLinkDetail)实体类
+ *
+ * @author makejava
+ * @since 2024-10-16 16:00:58
+ */
+public class TDampDwLinkDetail implements Serializable {
+    private static final long serialVersionUID = 279446444269201700L;
+/**
+     * 主键id
+     */
+    private String id;
+/**
+     * linkId
+     */
+    private String linkId;
+/**
+     * 对接码
+     */
+    private String linkCode;
+/**
+     * 对接码名称
+     */
+    private String linkName;
+/**
+     * 数据时间
+     */
+    private Date dataDate;
+/**
+     * 发布时间
+     */
+    private Date publishTime;
+/**
+     * 数据值
+     */
+    private Integer dataValue;
+/**
+     * 数据值(非数值类型)
+     */
+    private String dataValueChar;
+/**
+     * 备注
+     */
+    private String remark;
+/**
+     * 是否删除,1:是,0:否
+     */
+    private Integer isDelete;
+/**
+     * 元素值
+     */
+    private String elementVal;
+/**
+     * 元素名
+     */
+    private String elementName;
+/**
+     * 创建时间
+     */
+    private String createTime;
+/**
+     * 更新时间
+     */
+    private String updateTime;
+/**
+     * 分区
+     */
+    private Integer partitionId;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getLinkId() {
+        return linkId;
+    }
+
+    public void setLinkId(String linkId) {
+        this.linkId = linkId;
+    }
+
+    public String getLinkCode() {
+        return linkCode;
+    }
+
+    public void setLinkCode(String linkCode) {
+        this.linkCode = linkCode;
+    }
+
+    public String getLinkName() {
+        return linkName;
+    }
+
+    public void setLinkName(String linkName) {
+        this.linkName = linkName;
+    }
+
+    public Date getDataDate() {
+        return dataDate;
+    }
+
+    public void setDataDate(Date dataDate) {
+        this.dataDate = dataDate;
+    }
+
+    public Date getPublishTime() {
+        return publishTime;
+    }
+
+    public void setPublishTime(Date publishTime) {
+        this.publishTime = publishTime;
+    }
+
+    public Integer getDataValue() {
+        return dataValue;
+    }
+
+    public void setDataValue(Integer dataValue) {
+        this.dataValue = dataValue;
+    }
+
+    public String getDataValueChar() {
+        return dataValueChar;
+    }
+
+    public void setDataValueChar(String dataValueChar) {
+        this.dataValueChar = dataValueChar;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getElementVal() {
+        return elementVal;
+    }
+
+    public void setElementVal(String elementVal) {
+        this.elementVal = elementVal;
+    }
+
+    public String getElementName() {
+        return elementName;
+    }
+
+    public void setElementName(String elementName) {
+        this.elementName = elementName;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getPartitionId() {
+        return partitionId;
+    }
+
+    public void setPartitionId(Integer partitionId) {
+        this.partitionId = partitionId;
+    }
+
+}
+

+ 45 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/mapper/TDampDwIndexDao.java

@@ -0,0 +1,45 @@
+package com.qhtx.eta.infra.mapper;
+
+import com.qhtx.eta.infra.entity.dw.TDampDwIndex;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 指标表(TDampDwIndex)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-10-15 17:51:36
+ */
+public interface TDampDwIndexDao {
+
+
+    /**
+     * 新增数据
+     *
+     * @param tDampDwIndex 实例对象
+     * @return 影响行数
+     */
+    int insert(@Param("entity") TDampDwIndex tDampDwIndex);
+
+    /**
+     * 批量新增数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<TDampDwIndex> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<TDampDwIndex> entities);
+
+    /**
+     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<TDampDwIndex> 实例对象列表
+     * @return 影响行数
+     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
+     */
+    int insertOrUpdateBatch(@Param("entities") List<TDampDwIndex> entities);
+
+
+    List<Long> getIndexSeq(@Param("nums") Integer nums);
+}
+

+ 2 - 1
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/mapper/TDampDwIndexDataDao.java

@@ -30,8 +30,9 @@ public interface TDampDwIndexDataDao {
      * @param tDampDwIndexData 实例对象
      * @return 影响行数
      */
-    int insert(TDampDwIndexData tDampDwIndexData);
+    int insert(@Param("entity") TDampDwIndexData tDampDwIndexData);
 
+    void insertList(@Param("list") List<TDampDwIndexData> tDampDwIndexDataList);
 
     List<TDampDwIndexData> queryByDate(@Param("indexCode") String indexCode, @Param("begin") Date beginDate, @Param("offset") int offset, @Param("limit") int limit);
 

+ 33 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/mapper/TDampDwIndexLinkDao.java

@@ -0,0 +1,33 @@
+package com.qhtx.eta.infra.mapper;
+
+import com.qhtx.eta.infra.entity.dw.TDampDwIndexLink;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * DW层-指标和对接码关系表(TDampDwIndexLink)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-10-16 11:03:42
+ */
+public interface TDampDwIndexLinkDao {
+    /**
+     * 统计总行数
+     *
+     * @param tDampDwIndexLink 查询条件
+     * @return 总行数
+     */
+    long count(TDampDwIndexLink tDampDwIndexLink);
+
+    /**
+     * 新增数据
+     *
+     * @param tDampDwIndexLink 实例对象
+     * @return 影响行数
+     */
+    int insert(@Param("entity") TDampDwIndexLink tDampDwIndexLink);
+
+
+}
+

+ 35 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/mapper/TDampDwLinkDetailDao.java

@@ -0,0 +1,35 @@
+package com.qhtx.eta.infra.mapper;
+
+import com.qhtx.eta.infra.entity.dw.TDampDwLinkDetail;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * (TDampDwLinkDetail)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-10-16 16:00:58
+ */
+public interface TDampDwLinkDetailDao {
+
+
+    /**
+     * 查询指定行数据
+     *
+     * @param linkCode 对接码
+     * @return 对象列表
+     */
+    List<TDampDwLinkDetail> queryAllByLinkCode(@Param("linkCode") String linkCode);
+
+    /**
+     * 统计总行数
+     *
+     * @param tDampDwLinkDetail 查询条件
+     * @return 总行数
+     */
+    long count(TDampDwLinkDetail tDampDwLinkDetail);
+
+
+}
+

+ 2 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/TDampDwIndexDataService.java

@@ -20,4 +20,6 @@ public interface TDampDwIndexDataService {
     List<TDampDwIndexData> queryByDate(String indexCode, String beginDate, int offset, int limit);
 
     int countByIndexCodeWithDate(String indexCode, String beginDate);
+
+    void batchInsertIndexData(List<TDampDwIndexData> dwLinkDetailList);
 }

+ 22 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/TDampDwIndexLinkService.java

@@ -0,0 +1,22 @@
+package com.qhtx.eta.infra.service;
+
+import com.qhtx.eta.infra.entity.dw.TDampDwIndexLink;
+
+/**
+ * DW层-指标和对接码关系表(TDampDwIndexLink)表服务接口
+ *
+ * @author makejava
+ * @since 2024-10-16 11:03:42
+ */
+public interface TDampDwIndexLinkService {
+
+    /**
+     * 新增数据
+     *
+     * @param tDampDwIndexLink 实例对象
+     * @return 实例对象
+     */
+    TDampDwIndexLink insert(TDampDwIndexLink tDampDwIndexLink);
+
+
+}

+ 26 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/TDampDwIndexService.java

@@ -0,0 +1,26 @@
+package com.qhtx.eta.infra.service;
+
+import com.qhtx.eta.infra.entity.dw.TDampDwIndex;
+
+import java.util.List;
+
+/**
+ * 指标表(TDampDwIndex)表服务接口
+ *
+ * @author makejava
+ * @since 2024-10-15 17:51:49
+ */
+public interface TDampDwIndexService {
+
+
+    /**
+     * 新增数据
+     *
+     * @param tDampDwIndex 实例对象
+     * @return 实例对象
+     */
+    TDampDwIndex insert(TDampDwIndex tDampDwIndex);
+
+
+    List<Long> getIndexSeq(int num);
+}

+ 27 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/TDampDwLinkDetailService.java

@@ -0,0 +1,27 @@
+package com.qhtx.eta.infra.service;
+
+import com.qhtx.eta.infra.entity.dw.TDampDwLinkDetail;
+
+import java.util.List;
+
+/**
+ * (TDampDwLinkDetail)表服务接口
+ *
+ * @author makejava
+ * @since 2024-10-16 16:00:58
+ */
+public interface TDampDwLinkDetailService {
+
+
+
+    /**
+     * 查询linkCode数据
+     *
+     * @param linkCode       对接码
+     * @return 查询结果
+     */
+    List<TDampDwLinkDetail> queryByLinkCode(String linkCode);
+
+
+
+}

+ 25 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/impl/TDampDwIndexDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qhtx.eta.infra.service.impl;
 
+import com.qhtx.eta.common.constant.ETAConstants;
 import com.qhtx.eta.common.eunms.DataSourceType;
 import com.qhtx.eta.common.eunms.ErrorEnum;
 import com.qhtx.eta.common.exception.ETAException;
@@ -9,9 +10,15 @@ import com.qhtx.eta.infra.mapper.TDampDwIndexDataDao;
 import com.qhtx.eta.infra.service.TDampDwIndexDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import javax.annotation.Resource;
+import java.sql.SQLException;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
@@ -29,6 +36,9 @@ public class TDampDwIndexDataServiceImpl implements TDampDwIndexDataService {
     @Resource
     private TDampDwIndexDataDao tDampDwIndexDataDao;
 
+    @Resource
+    private SqlSessionTemplate sqlSessionTemplate;
+
     /**
      * @param indexCode
      * @param offset
@@ -67,4 +77,19 @@ public class TDampDwIndexDataServiceImpl implements TDampDwIndexDataService {
             throw new ETAException(ErrorEnum.PARSE_TIME_ERROR, "停止更新当前指标" + indexCode);
         }
     }
+
+    @Override
+    public void batchInsertIndexData(List<TDampDwIndexData> dwLinkDataList) {
+        try (SqlSession sqlSession = sqlSessionTemplate.getSqlSessionFactory().openSession(ExecutorType.BATCH, false)) {
+            // tDampDwIndexDataDao.insertList(dwLinkDataList);
+           // TDampDwIndexDataDao tDampDwIndexDataDao = sqlSession.getMapper(TDampDwIndexDataDao.class);
+            for (TDampDwIndexData dwLinkData : dwLinkDataList) {
+                tDampDwIndexDataDao.insert(dwLinkData);
+            }
+            sqlSession.commit(!TransactionSynchronizationManager.isSynchronizationActive());
+        } catch (Exception e) {
+            log.error("批量插入指标数据失败,数据库异常", e);
+            throw new ETAException(ErrorEnum.DB_ERROR);
+        }
+    }
 }

+ 33 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/impl/TDampDwIndexLinkServiceImpl.java

@@ -0,0 +1,33 @@
+package com.qhtx.eta.infra.service.impl;
+
+import com.qhtx.eta.infra.entity.dw.TDampDwIndexLink;
+import com.qhtx.eta.infra.mapper.TDampDwIndexLinkDao;
+import com.qhtx.eta.infra.service.TDampDwIndexLinkService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * DW层-指标和对接码关系表(TDampDwIndexLink)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-10-16 11:03:42
+ */
+@Service("tDampDwIndexLinkService")
+public class TDampDwIndexLinkServiceImpl implements TDampDwIndexLinkService {
+    @Resource
+    private TDampDwIndexLinkDao tDampDwIndexLinkDao;
+
+    /**
+     * 新增数据
+     *
+     * @param tDampDwIndexLink 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public TDampDwIndexLink insert(TDampDwIndexLink tDampDwIndexLink) {
+        this.tDampDwIndexLinkDao.insert(tDampDwIndexLink);
+        return tDampDwIndexLink;
+    }
+
+}

+ 44 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/impl/TDampDwIndexServiceImpl.java

@@ -0,0 +1,44 @@
+package com.qhtx.eta.infra.service.impl;
+
+import com.qhtx.eta.common.eunms.DataSourceType;
+import com.qhtx.eta.infra.annotation.UseDataSource;
+import com.qhtx.eta.infra.entity.dw.TDampDwIndex;
+import com.qhtx.eta.infra.mapper.TDampDwIndexDao;
+import com.qhtx.eta.infra.service.TDampDwIndexService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 指标表(TDampDwIndex)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-10-15 17:51:49
+ */
+@Service("tDampDwIndexService")
+@UseDataSource(dataSourceType = DataSourceType.DW)
+public class TDampDwIndexServiceImpl implements TDampDwIndexService {
+    @Resource
+    private TDampDwIndexDao tDampDwIndexDao;
+
+
+    /**
+     * 新增数据
+     *
+     * @param tDampDwIndex 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public TDampDwIndex insert(TDampDwIndex tDampDwIndex) {
+        this.tDampDwIndexDao.insert(tDampDwIndex);
+        return tDampDwIndex;
+    }
+
+    @Override
+    public List<Long> getIndexSeq(int nums) {
+        return tDampDwIndexDao.getIndexSeq(nums);
+    }
+
+
+}

+ 38 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/java/com/qhtx/eta/infra/service/impl/TDampDwLinkDetailServiceImpl.java

@@ -0,0 +1,38 @@
+package com.qhtx.eta.infra.service.impl;
+
+import com.qhtx.eta.common.eunms.DataSourceType;
+import com.qhtx.eta.infra.annotation.UseDataSource;
+import com.qhtx.eta.infra.entity.dw.TDampDwLinkDetail;
+import com.qhtx.eta.infra.mapper.TDampDwLinkDetailDao;
+import com.qhtx.eta.infra.service.TDampDwLinkDetailService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * (TDampDwLinkDetail)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-10-16 16:00:58
+ */
+@Service("tDampDwLinkDetailService")
+@UseDataSource(dataSourceType = DataSourceType.DW)
+public class TDampDwLinkDetailServiceImpl implements TDampDwLinkDetailService {
+    @Resource
+    private TDampDwLinkDetailDao tDampDwLinkDetailDao;
+
+
+    /**
+     * 分页查询
+     *
+     * @param linkCode 对接码
+     * @return 查询结果
+     */
+    @Override
+    public List<TDampDwLinkDetail> queryByLinkCode(String linkCode) {
+        return tDampDwLinkDetailDao.queryAllByLinkCode(linkCode);
+    }
+
+
+}

+ 2 - 2
qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper/EtaApiQuotaInfoDao.xml

@@ -70,7 +70,7 @@
         order by quota_id asc
     </select>
     <select id="getAllQuotaList" resultMap="EtaApiQuotaInfoMap">
-        select  EDB_INFO_ID, EDB_CODE, UNIQUE_CODE, EDB_NAME, CLASSIFY_ID, EDB_SOURCE_NAME from T_ETA_API_QUOTA_INFO
+        select  EDB_INFO_ID, EDB_CODE, UNIQUE_CODE, EDB_NAME, CLASSIFY_ID, EDB_SOURCE_NAME,unique_code,frequency,unit from T_ETA_API_QUOTA_INFO
         <where>
            IS_DELETE = 0
         </where>
@@ -85,7 +85,7 @@
     <select id="queryQuotaListPage" resultMap="EtaApiQuotaInfoMap">
         select *
         from (select *
-              from (select rownum NO, EDB_INFO_ID, EDB_CODE, UNIQUE_CODE, EDB_NAME, CLASSIFY_ID, EDB_SOURCE_NAME
+              from (select rownum NO, EDB_INFO_ID, EDB_CODE, UNIQUE_CODE, EDB_NAME, CLASSIFY_ID, EDB_SOURCE_NAME,unique_code,frequency,unit
                     from T_ETA_API_QUOTA_INFO
                     where is_delete = 0
                     ORDER BY NO ASC)

+ 72 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper/TDampDwIndexDao.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qhtx.eta.infra.mapper.TDampDwIndexDao">
+
+    <resultMap type="com.qhtx.eta.infra.entity.dw.TDampDwIndex" id="TDampDwIndexMap">
+        <result property="id" column="ID" jdbcType="VARCHAR"/>
+        <result property="indexCnName" column="INDEX_CN_NAME" jdbcType="VARCHAR"/>
+        <result property="cnSignature" column="CN_SIGNATURE" jdbcType="VARCHAR"/>
+        <result property="indexShortName" column="INDEX_SHORT_NAME" jdbcType="VARCHAR"/>
+        <result property="indexEnName" column="INDEX_EN_NAME" jdbcType="VARCHAR"/>
+        <result property="indexCode" column="INDEX_CODE" jdbcType="VARCHAR"/>
+        <result property="sourceName" column="SOURCE_NAME" jdbcType="VARCHAR"/>
+        <result property="frequency" column="FREQUENCY" jdbcType="VARCHAR"/>
+        <result property="places" column="PLACES" jdbcType="VARCHAR"/>
+        <result property="status" column="STATUS" jdbcType="INTEGER"/>
+        <result property="maintainType" column="MAINTAIN_TYPE" jdbcType="INTEGER"/>
+        <result property="isForeign" column="IS_FOREIGN" jdbcType="INTEGER"/>
+        <result property="deriveFormula" column="DERIVE_FORMULA" jdbcType="VARCHAR"/>
+        <result property="isDelete" column="IS_DELETE" jdbcType="INTEGER"/>
+        <result property="isEnable" column="IS_ENABLE" jdbcType="INTEGER"/>
+        <result property="frameId" column="FRAME_ID" jdbcType="VARCHAR"/>
+        <result property="infoTableId" column="INFO_TABLE_ID" jdbcType="VARCHAR"/>
+        <result property="infoTableName" column="INFO_TABLE_NAME" jdbcType="VARCHAR"/>
+        <result property="infoTableEsName" column="INFO_TABLE_ES_NAME" jdbcType="VARCHAR"/>
+        <result property="dataTableId" column="DATA_TABLE_ID" jdbcType="VARCHAR"/>
+        <result property="dataTableName" column="DATA_TABLE_NAME" jdbcType="VARCHAR"/>
+        <result property="dataTableEsName" column="DATA_TABLE_ES_NAME" jdbcType="VARCHAR"/>
+        <result property="units" column="UNITS" jdbcType="VARCHAR"/>
+        <result property="enRemarks" column="EN_REMARKS" jdbcType="VARCHAR"/>
+        <result property="cnRemarks" column="CN_REMARKS" jdbcType="VARCHAR"/>
+        <result property="createTime" column="CREATE_TIME" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="UPDATE_TIME" jdbcType="VARCHAR"/>
+        <result property="createUserId" column="CREATE_USER_ID" jdbcType="VARCHAR"/>
+        <result property="createUserName" column="CREATE_USER_NAME" jdbcType="VARCHAR"/>
+        <result property="updateUserId" column="UPDATE_USER_ID" jdbcType="VARCHAR"/>
+        <result property="updateUserName" column="UPDATE_USER_NAME" jdbcType="VARCHAR"/>
+        <result property="dataName" column="DATA_NAME" jdbcType="VARCHAR"/>
+        <result property="dataClassifyCode" column="DATA_CLASSIFY_CODE" jdbcType="VARCHAR"/>
+        <result property="valueName" column="VALUE_NAME" jdbcType="VARCHAR"/>
+        <result property="valueCode" column="VALUE_CODE" jdbcType="VARCHAR"/>
+    </resultMap>
+
+
+    <!--新增所有列-->
+    <insert id="insert" keyProperty="" useGeneratedKeys="true">
+        insert into T_DAMP_DW_INDEX(ID, INDEX_CN_NAME, CN_SIGNATURE, INDEX_SHORT_NAME, INDEX_EN_NAME, INDEX_CODE,
+                                    SOURCE_NAME, FREQUENCY, PLACES, STATUS, MAINTAIN_TYPE, IS_FOREIGN, DERIVE_FORMULA,
+                                    IS_DELETE, IS_ENABLE, FRAME_ID, INFO_TABLE_ID, INFO_TABLE_NAME, INFO_TABLE_ES_NAME,
+                                    DATA_TABLE_ID, DATA_TABLE_NAME, DATA_TABLE_ES_NAME, UNITS, EN_REMARKS, CN_REMARKS,
+                                    CREATE_TIME, UPDATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, UPDATE_USER_ID,
+                                    UPDATE_USER_NAME, DATA_NAME, DATA_CLASSIFY_CODE, VALUE_NAME, VALUE_CODE)
+        values (#{entity.id,jdbcType=VARCHAR}, #{entity.indexCnName,jdbcType=VARCHAR}, #{entity.cnSignature,jdbcType=VARCHAR}, #{entity.indexShortName,jdbcType=VARCHAR},
+                #{entity.indexEnName,jdbcType=VARCHAR}, #{entity.indexCode,jdbcType=VARCHAR}, #{entity.sourceName,jdbcType=VARCHAR},
+                #{entity.frequency,jdbcType=VARCHAR}, #{entity.places,jdbcType=VARCHAR}, #{entity.status,jdbcType=INTEGER}, #{entity.maintainType,jdbcType=INTEGER}, #{entity.isForeign,jdbcType=INTEGER},
+                #{entity.deriveFormula,jdbcType=VARCHAR}, #{entity.isDelete,jdbcType=INTEGER},
+                #{entity.isEnable,jdbcType=INTEGER}, #{entity.frameId,jdbcType=VARCHAR}, #{entity.infoTableId,jdbcType=VARCHAR}, #{entity.infoTableName,jdbcType=VARCHAR},
+                #{entity.infoTableEsName,jdbcType=VARCHAR}, #{entity.dataTableId,jdbcType=VARCHAR},
+                #{entity.dataTableName,jdbcType=VARCHAR}, #{entity.dataTableEsName,jdbcType=VARCHAR}, #{entity.units,jdbcType=VARCHAR}, #{entity.enRemarks,jdbcType=VARCHAR},
+                #{entity.cnRemarks,jdbcType=VARCHAR}, #{entity.createTime,jdbcType=VARCHAR},
+                #{entity.updateTime,jdbcType=VARCHAR}, #{entity.createUserId,jdbcType=VARCHAR}, #{entity.createUserName,jdbcType=VARCHAR}, #{entity.updateUserId,jdbcType=VARCHAR},
+                #{entity.updateUserName,jdbcType=VARCHAR}, #{entity.dataName,jdbcType=VARCHAR},
+                #{entity.dataClassifyCode,jdbcType=VARCHAR}, #{entity.valueName,jdbcType=VARCHAR}, #{entity.valueCode,jdbcType=VARCHAR})
+    </insert>
+
+
+    <select id="getIndexSeq" resultType="java.lang.Long">
+        select SEQ_ON_INDEX_CODE.nextval num from (select 1 from all_objects where rownum <![CDATA[<=]]> ${nums})
+    </select>
+
+
+</mapper>
+

+ 56 - 19
qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper/TDampDwIndexDataDao.xml

@@ -21,28 +21,65 @@
         <result property="preDataDate" column="PRE_DATA_DATE" jdbcType="TIMESTAMP"/>
     </resultMap>
 
-    <resultMap type="com.qhtx.eta.infra.entity.dw.TDampDwIndexData" id="DataMap">
-        <result property="dataDate" column="DATA_DATE" jdbcType="TIMESTAMP"/>
-        <result property="dataValue" column="DATA_VALUE" jdbcType="INTEGER"/>
-    </resultMap>
 
     <select id="countByIndexCode" resultType="int">
-        select count(1) from T_DAMP_DW_INDEX_DATA where index_code = #{indexCode} and is_delete=0
+        select count(1)
+        from T_DAMP_DW_INDEX_DATA
+        where index_code = #{indexCode}
+          and is_delete = 0
     </select>
 
-    <select id="queryAllByLimit" resultMap="DataMap">
-        select * from ( select * from (select rownum NO, DATA_DATE, DATA_VALUE from T_DAMP_DW_INDEX_DATA where
-        index_code = #{indexCode}  and is_delete =0 ORDER BY NO ASC) where NO <![CDATA[>]]> #{offset}) where ROWNUM
-         <![CDATA[<=]]>
-        #{limit}
-    </select>
-    <select id="countByIndexCodeWithDate" resultType="int">
-        select count(1) from T_DAMP_DW_INDEX_DATA where index_code = #{indexCode} and is_delete=0 and DATA_DATE <![CDATA[>=]]> #{begin}
-    </select>
-    <select id="queryByDate" resultMap="DataMap">
-        select * from ( select * from (select rownum NO, DATA_DATE, DATA_VALUE from T_DAMP_DW_INDEX_DATA where
-            index_code = #{indexCode}  and is_delete =0 and DATA_DATE <![CDATA[>]]> #{begin} ORDER BY NO ASC) where NO <![CDATA[>]]> #{offset}) where ROWNUM
-         <![CDATA[<=]]>  #{limit}
-    </select>
+    <!--新增所有列-->
+    <insert id="insertList">
+        insert into T_DAMP_DW_INDEX_DATA(ID, INDEX_ID, INDEX_CODE, DATA_DATE, PUBLISH_TIME,
+        DATA_VALUE, DATA_VALUE_CHAR, REMARK, IS_DELETE,
+        CREATE_TIME, UPDATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
+        UPDATE_USER_ID, UPDATE_USER_NAME, PRE_DATA_DATE)
+        values
+        <foreach collection="list" item="entity" separator="UNION ALL">
+            SELECT #{entity.id,jdbcType=VARCHAR} AS ID,
+            #{entity.indexId,jdbcType=VARCHAR} AS INDEX_ID,
+            #{entity.indexCode,jdbcType=VARCHAR} AS INDEX_CODE,
+            #{entity.dataDate,jdbcType=TIMESTAMP} AS DATA_DATE,
+            #{entity.publishTime,jdbcType=TIMESTAMP} AS PUBLISH_TIME,
+            #{entity.dataValue,jdbcType=DOUBLE} AS DATA_VALUE,
+            #{entity.dataValueChar,jdbcType=VARCHAR} AS ,
+            #{entity.remark,jdbcType=VARCHAR} AS REMARK,
+            #{entity.isDelete,jdbcType=INTEGER} AS IS_DELETE,
+            #{entity.createTime,jdbcType=VARCHAR} AS CREATE_TIME,
+            #{entity.updateTime,jdbcType=VARCHAR} AS UPDATE_TIME,
+            #{entity.createUserId,jdbcType=VARCHAR} AS CREATE_USER_ID,
+            #{entity.createUserName,jdbcType=VARCHAR} AS CREATE_USER_NAME,
+            #{entity.updateUserId,jdbcType=VARCHAR} AS UPDATE_USER_ID,
+            #{entity.updateUserName,jdbcType=VARCHAR} AS UPDATE_USER_NAME,
+            #{entity.preDataDate,jdbcType=TIMESTAMP} AS PRE_DATA_DATE
+            FROM dual
+        </foreach>
+    </insert>
+
+
+    <!--新增所有列-->
+    <insert id="insert">
+        insert into T_DAMP_DW_INDEX_DATA(ID, INDEX_ID, INDEX_CODE, DATA_DATE, PUBLISH_TIME,
+                                         DATA_VALUE, DATA_VALUE_CHAR, REMARK, IS_DELETE,
+                                         CREATE_TIME, UPDATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
+                                         UPDATE_USER_ID, UPDATE_USER_NAME, PRE_DATA_DATE)
+        values (#{entity.id,jdbcType=VARCHAR},
+                #{entity.indexId,jdbcType=VARCHAR},
+                #{entity.indexCode,jdbcType=VARCHAR},
+                #{entity.dataDate,jdbcType=TIMESTAMP},
+                #{entity.publishTime,jdbcType=TIMESTAMP},
+                #{entity.dataValue,jdbcType=DOUBLE},
+                #{entity.dataValueChar,jdbcType=VARCHAR},
+                #{entity.remark,jdbcType=VARCHAR},
+                #{entity.isDelete,jdbcType=INTEGER},
+                #{entity.createTime,jdbcType=VARCHAR},
+                #{entity.updateTime,jdbcType=VARCHAR},
+                #{entity.createUserId,jdbcType=VARCHAR},
+                #{entity.createUserName,jdbcType=VARCHAR},
+                #{entity.updateUserId,jdbcType=VARCHAR},
+                #{entity.updateUserName,jdbcType=VARCHAR},
+                #{entity.preDataDate,jdbcType=TIMESTAMP})
+    </insert>
 </mapper>
 

+ 47 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper/TDampDwIndexLinkDao.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qhtx.eta.infra.mapper.TDampDwIndexLinkDao">
+
+    <resultMap type="com.qhtx.eta.infra.entity.dw.TDampDwIndexLink" id="TDampDwIndexLinkMap">
+        <result property="id" column="ID" jdbcType="VARCHAR"/>
+        <result property="indexId" column="INDEX_ID" jdbcType="VARCHAR"/>
+        <result property="indexCode" column="INDEX_CODE" jdbcType="VARCHAR"/>
+        <result property="linkDataId" column="LINK_DATA_ID" jdbcType="VARCHAR"/>
+        <result property="linkCode" column="LINK_CODE" jdbcType="VARCHAR"/>
+        <result property="dateFrom" column="DATE_FROM" jdbcType="BIGINT"/>
+        <result property="dateTo" column="DATE_TO" jdbcType="BIGINT"/>
+        <result property="isDelete" column="IS_DELETE" jdbcType="INTEGER"/>
+        <result property="createTime" column="CREATE_TIME" jdbcType="BIGINT"/>
+        <result property="updateTime" column="UPDATE_TIME" jdbcType="BIGINT"/>
+        <result property="createUserId" column="CREATE_USER_ID" jdbcType="VARCHAR"/>
+        <result property="createUserName" column="CREATE_USER_NAME" jdbcType="VARCHAR"/>
+        <result property="updateUserId" column="UPDATE_USER_ID" jdbcType="VARCHAR"/>
+        <result property="updateUserName" column="UPDATE_USER_NAME" jdbcType="VARCHAR"/>
+        <result property="htUniqueCode" column="HT_UNIQUE_CODE" jdbcType="VARCHAR"/>
+        <result property="indexCnName" column="INDEX_CN_NAME" jdbcType="VARCHAR"/>
+    </resultMap>
+
+
+    <!--统计总行数-->
+    <select id="count" resultType="java.lang.Long">
+        select count(1)
+        from T_DAMP_DW_INDEX_LINK
+    </select>
+
+    <!--新增所有列-->
+    <insert id="insert" keyProperty="" useGeneratedKeys="true">
+        insert into T_DAMP_DW_INDEX_LINK(ID, INDEX_ID, INDEX_CODE, LINK_DATA_ID, LINK_CODE, DATE_FROM, DATE_TO,
+                                         IS_DELETE, CREATE_TIME, UPDATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
+                                         UPDATE_USER_ID, UPDATE_USER_NAME, HT_UNIQUE_CODE, INDEX_CN_NAME)
+        values (#{entity.id,jdbcType=VARCHAR}, #{entity.indexId,jdbcType=VARCHAR}, #{entity.indexCode,jdbcType=VARCHAR},
+                #{entity.linkDataId,jdbcType=VARCHAR}, #{entity.linkCode,jdbcType=VARCHAR},
+                #{entity.dateFrom,jdbcType=BIGINT}, #{entity.dateTo,jdbcType=BIGINT},
+                #{entity.isDelete,jdbcType=INTEGER}, #{entity.createTime,jdbcType=BIGINT},
+                #{entity.updateTime,jdbcType=BIGINT}, #{entity.createUserId,jdbcType=VARCHAR},
+                #{entity.createUserName,jdbcType=VARCHAR}, #{entity.updateUserId,jdbcType=VARCHAR},
+                #{entity.updateUserName,jdbcType=VARCHAR}, #{entity.htUniqueCode,jdbcType=VARCHAR},
+                #{entity.indexCnName,jdbcType=VARCHAR})
+    </insert>
+
+</mapper>
+

+ 9 - 7
qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper/TDampDwLinkDataDao.xml

@@ -28,6 +28,7 @@
         select *
         from (select *
               from (select rownum NO,
+                           ID,
                            LINK_ID,
                            LINK_CODE,
                            LINK_NAME,
@@ -50,13 +51,14 @@
 
 
     <select id="queryAll"  resultMap="TDampDwLinkDataMap">
-        select  LINK_ID,
-                LINK_CODE,
-                LINK_NAME,
-                LINK_FILED_NAME,
-                LINK_FILED_IDS,
-                ELEMENT_VAL,
-                ELEMENT_NAME
+        select ID,
+               LINK_ID,
+               LINK_CODE,
+               LINK_NAME,
+               LINK_FILED_NAME,
+               LINK_FILED_IDS,
+               ELEMENT_VAL,
+               ELEMENT_NAME
         from T_DAMP_DW_LINK_DATA
     </select>
 

+ 91 - 0
qhtx-eta-integrator/qhtx-integrator-infra/src/main/resources/mapper/TDampDwLinkDetailDao.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qhtx.eta.infra.mapper.TDampDwLinkDetailDao">
+
+    <resultMap type="com.qhtx.eta.infra.entity.dw.TDampDwLinkDetail" id="TDampDwLinkDetailMap">
+        <result property="id" column="ID" jdbcType="VARCHAR"/>
+        <result property="linkId" column="LINK_ID" jdbcType="VARCHAR"/>
+        <result property="linkCode" column="LINK_CODE" jdbcType="VARCHAR"/>
+        <result property="linkName" column="LINK_NAME" jdbcType="VARCHAR"/>
+        <result property="dataDate" column="DATA_DATE" jdbcType="TIMESTAMP"/>
+        <result property="publishTime" column="PUBLISH_TIME" jdbcType="TIMESTAMP"/>
+        <result property="dataValue" column="DATA_VALUE" jdbcType="INTEGER"/>
+        <result property="dataValueChar" column="DATA_VALUE_CHAR" jdbcType="VARCHAR"/>
+        <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+        <result property="isDelete" column="IS_DELETE" jdbcType="INTEGER"/>
+        <result property="elementVal" column="ELEMENT_VAL" jdbcType="VARCHAR"/>
+        <result property="elementName" column="ELEMENT_NAME" jdbcType="VARCHAR"/>
+        <result property="createTime" column="CREATE_TIME" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="UPDATE_TIME" jdbcType="VARCHAR"/>
+        <result property="partitionId" column="PARTITION_ID" jdbcType="INTEGER"/>
+    </resultMap>
+
+
+    <!--查询指定行数据-->
+    <select id="queryAllByLinkCode" resultMap="TDampDwLinkDetailMap" fetchSize="1000">
+        select
+        DATA_DATE,PUBLISH_TIME,DATA_VALUE,DATA_VALUE_CHAR,REMARK,UPDATE_TIME
+        from T_DAMP_DW_LINK_DETAIL
+        <where>
+            is_delete=0
+            <if test="linkCode != null and linkCode != ''">
+                and LINK_CODE = #{linkCode}
+            </if>
+        </where>
+    </select>
+
+    <!--统计总行数-->
+    <select id="count" resultType="java.lang.Long">
+        select count(1)
+        from T_DAMP_DW_LINK_DETAIL
+        <where>
+            <if test="id != null and id != ''">
+                and ID = #{id}
+            </if>
+            <if test="linkId != null and linkId != ''">
+                and LINK_ID = #{linkId}
+            </if>
+            <if test="linkCode != null and linkCode != ''">
+                and LINK_CODE = #{linkCode}
+            </if>
+            <if test="linkName != null and linkName != ''">
+                and LINK_NAME = #{linkName}
+            </if>
+            <if test="dataDate != null">
+                and DATA_DATE = #{dataDate}
+            </if>
+            <if test="publishTime != null">
+                and PUBLISH_TIME = #{publishTime}
+            </if>
+            <if test="dataValue != null">
+                and DATA_VALUE = #{dataValue}
+            </if>
+            <if test="dataValueChar != null and dataValueChar != ''">
+                and DATA_VALUE_CHAR = #{dataValueChar}
+            </if>
+            <if test="remark != null and remark != ''">
+                and REMARK = #{remark}
+            </if>
+            <if test="isDelete != null">
+                and IS_DELETE = #{isDelete}
+            </if>
+            <if test="elementVal != null and elementVal != ''">
+                and ELEMENT_VAL = #{elementVal}
+            </if>
+            <if test="elementName != null and elementName != ''">
+                and ELEMENT_NAME = #{elementName}
+            </if>
+            <if test="createTime != null and createTime != ''">
+                and CREATE_TIME = #{createTime}
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                and UPDATE_TIME = #{updateTime}
+            </if>
+            <if test="partitionId != null">
+                and PARTITION_ID = #{partitionId}
+            </if>
+        </where>
+    </select>
+
+</mapper>
+