1.实现新建文件夹接口能写数据到数据库中。

.idea/workspace.xml

@@ -27,7 +27,14 @@
   <component name="ChangeListManager">
     <list default="true" id="d75a3a91-5d58-44f3-9ee5-41347d560b6a" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bootstrap/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/src/main/resources/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -80,11 +87,11 @@
       <recent name="com.electromagnetic.industry.software.data.manage.service.mappers" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.electromagnetic.industry.software.data.manage.repository.dao" />
+      <recent name="com.electromagnetic.industry.software.data.manage.repository.impl" />
+      <recent name="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository" />
       <recent name="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.impl" />
       <recent name="com.electromagnetic.industry.software.data.manage.service.mappers" />
-      <recent name="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames" />
-      <recent name="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service" />
-      <recent name="com.electromagnetic.industry.software.data.manage.service.facade" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\projects\electromagnetic-data\bootstrap\src\main\java\com\electromagnetic\industry\software\data\manage\controller" />
@@ -121,7 +128,8 @@
       <workItem from="1730254338199" duration="1566000" />
       <workItem from="1730255932838" duration="2029000" />
       <workItem from="1731287388986" duration="3225000" />
-      <workItem from="1731309429571" duration="5701000" />
+      <workItem from="1731309429571" duration="7862000" />
+      <workItem from="1731394779722" duration="5659000" />
     </task>
     <servers />
   </component>
@@ -163,70 +171,74 @@
       <screen x="0" y="0" width="1280" height="672" />
     </state>
     <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.1280.672@0.0.1280.672" timestamp="1729592809847" />
+    <state width="385" height="466" key="DebuggerActiveHint" timestamp="1731400555757">
+      <screen x="0" y="0" width="2560" height="1400" />
+    </state>
+    <state width="385" height="466" key="DebuggerActiveHint/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400555757" />
     <state x="842" y="190" key="FileChooserDialogImpl" timestamp="1730254963238">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="842" y="190" key="FileChooserDialogImpl/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730254963238" />
     <state x="421" y="91" key="FileChooserDialogImpl/0.0.1280.672@0.0.1280.672" timestamp="1729594896548" />
-    <state width="1920" height="239" key="GridCell.Tab.0.bottom" timestamp="1731312860473">
+    <state width="1920" height="366" key="GridCell.Tab.0.bottom" timestamp="1731400543848">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="1920" height="239" key="GridCell.Tab.0.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731312860473" />
+    <state width="1920" height="366" key="GridCell.Tab.0.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543848" />
     <state width="1237" height="200" key="GridCell.Tab.0.bottom/0.0.1280.672@0.0.1280.672" timestamp="1729595008609" />
-    <state width="1920" height="239" key="GridCell.Tab.0.center" timestamp="1731312860473">
+    <state width="1920" height="366" key="GridCell.Tab.0.center" timestamp="1731400543848">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="1920" height="239" key="GridCell.Tab.0.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731312860473" />
+    <state width="1920" height="366" key="GridCell.Tab.0.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543848" />
     <state width="1237" height="200" key="GridCell.Tab.0.center/0.0.1280.672@0.0.1280.672" timestamp="1729595008608" />
-    <state width="1920" height="239" key="GridCell.Tab.0.left" timestamp="1731312860472">
+    <state width="1920" height="366" key="GridCell.Tab.0.left" timestamp="1731400543848">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="1920" height="239" key="GridCell.Tab.0.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731312860472" />
+    <state width="1920" height="366" key="GridCell.Tab.0.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543848" />
     <state width="1237" height="200" key="GridCell.Tab.0.left/0.0.1280.672@0.0.1280.672" timestamp="1729595008608" />
-    <state width="1920" height="239" key="GridCell.Tab.0.right" timestamp="1731312860473">
+    <state width="1920" height="366" key="GridCell.Tab.0.right" timestamp="1731400543848">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="1920" height="239" key="GridCell.Tab.0.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731312860473" />
+    <state width="1920" height="366" key="GridCell.Tab.0.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543848" />
     <state width="1237" height="200" key="GridCell.Tab.0.right/0.0.1280.672@0.0.1280.672" timestamp="1729595008609" />
-    <state width="1920" height="239" key="GridCell.Tab.1.bottom" timestamp="1731312860473">
+    <state width="1920" height="366" key="GridCell.Tab.1.bottom" timestamp="1731400548127">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="1920" height="239" key="GridCell.Tab.1.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731312860473" />
+    <state width="1920" height="366" key="GridCell.Tab.1.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400548127" />
     <state width="1237" height="200" key="GridCell.Tab.1.bottom/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
-    <state width="1920" height="239" key="GridCell.Tab.1.center" timestamp="1731312860473">
+    <state width="1920" height="366" key="GridCell.Tab.1.center" timestamp="1731400548127">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="1920" height="239" key="GridCell.Tab.1.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731312860473" />
+    <state width="1920" height="366" key="GridCell.Tab.1.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400548127" />
     <state width="1237" height="200" key="GridCell.Tab.1.center/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
-    <state width="1920" height="239" key="GridCell.Tab.1.left" timestamp="1731312860473">
+    <state width="1920" height="366" key="GridCell.Tab.1.left" timestamp="1731400548127">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="1920" height="239" key="GridCell.Tab.1.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731312860473" />
+    <state width="1920" height="366" key="GridCell.Tab.1.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400548127" />
     <state width="1237" height="200" key="GridCell.Tab.1.left/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
-    <state width="1920" height="239" key="GridCell.Tab.1.right" timestamp="1731312860473">
+    <state width="1920" height="366" key="GridCell.Tab.1.right" timestamp="1731400548127">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="1920" height="239" key="GridCell.Tab.1.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731312860473" />
+    <state width="1920" height="366" key="GridCell.Tab.1.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400548127" />
     <state width="1237" height="200" key="GridCell.Tab.1.right/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
-    <state width="1920" height="366" key="GridCell.Tab.2.bottom" timestamp="1730255920501">
+    <state width="1920" height="366" key="GridCell.Tab.2.bottom" timestamp="1731400543700">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="1920" height="366" key="GridCell.Tab.2.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730255920501" />
+    <state width="1920" height="366" key="GridCell.Tab.2.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543700" />
     <state width="1237" height="200" key="GridCell.Tab.2.bottom/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
-    <state width="1920" height="366" key="GridCell.Tab.2.center" timestamp="1730255920501">
+    <state width="1920" height="366" key="GridCell.Tab.2.center" timestamp="1731400543700">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="1920" height="366" key="GridCell.Tab.2.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730255920501" />
+    <state width="1920" height="366" key="GridCell.Tab.2.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543700" />
     <state width="1237" height="200" key="GridCell.Tab.2.center/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
-    <state width="1920" height="366" key="GridCell.Tab.2.left" timestamp="1730255920501">
+    <state width="1920" height="366" key="GridCell.Tab.2.left" timestamp="1731400543700">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="1920" height="366" key="GridCell.Tab.2.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730255920501" />
+    <state width="1920" height="366" key="GridCell.Tab.2.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543700" />
     <state width="1237" height="200" key="GridCell.Tab.2.left/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
-    <state width="1920" height="366" key="GridCell.Tab.2.right" timestamp="1730255920501">
+    <state width="1920" height="366" key="GridCell.Tab.2.right" timestamp="1731400543700">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state width="1920" height="366" key="GridCell.Tab.2.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730255920501" />
+    <state width="1920" height="366" key="GridCell.Tab.2.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543700" />
     <state width="1237" height="200" key="GridCell.Tab.2.right/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
     <state x="339" y="296" key="SettingsEditor" timestamp="1730166699747">
       <screen x="0" y="0" width="2560" height="1400" />
@@ -237,14 +249,35 @@
       <screen x="0" y="0" width="1280" height="672" />
     </state>
     <state x="439" y="114" key="chooseDestDirectoryDialog/0.0.1280.672@0.0.1280.672" timestamp="1729594820137" />
-    <state x="991" y="256" width="1572" height="833" key="dock-window-1" timestamp="1730163893500">
+    <state x="36" y="80" width="1584" height="1217" key="dock-window-1" timestamp="1731398039896">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="991" y="256" width="1572" height="833" key="dock-window-1/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730163893500" />
+    <state x="36" y="80" width="1584" height="1217" key="dock-window-1/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731398039896" />
-    <state x="695" y="51" width="1858" height="1238" key="find.popup" timestamp="1731314470395">
+    <state x="695" y="51" width="1858" height="1238" key="find.popup" timestamp="1731399177756">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="695" y="51" width="1858" height="1238" key="find.popup/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731314470395" />
+    <state x="695" y="51" width="1858" height="1238" key="find.popup/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731399177756" />
     <state x="338" y="39" width="929" height="594" key="find.popup/0.0.1280.672@0.0.1280.672" timestamp="1729595280874" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java</url>
+          <line>29</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java</url>
+          <line>50</line>
+          <option name="timeStamp" value="4" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java</url>
+          <line>66</line>
+          <option name="timeStamp" value="7" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>

bootstrap/src/main/resources/application.properties

@@ -15,9 +15,12 @@ spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource
 #spring.datasource.url=jdbc:mysql://${DATASOURCE_URL:obproxy-0c63.ops.cloud.cic.inter}:3306/${DATASOURCE_HOST:dataplatform_ptst}?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
 #spring.datasource.username=${DATASOURCE_NAME:dataplatform@ProjectTest_tenant5#testdb}
 #spring.datasource.password=${DATASOURCE_PASSWORD:Y7G6v4_3ijn77K_Kbl_U85}
-spring.datasource.url=jdbc:mysql://139.196.179.195:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
+spring.datasource.url=jdbc:mysql://192.168.1.21:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
 spring.datasource.username=comac
-spring.datasource.password=2024*Comac
+spring.datasource.password=comac
+#spring.datasource.url=jdbc:mysql://139.196.179.195:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
+#spring.datasource.username=comac
+#spring.datasource.password=2024*Comac
 
 
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver

bootstrap/target/classes/application.properties

@@ -15,9 +15,12 @@ spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource
 #spring.datasource.url=jdbc:mysql://${DATASOURCE_URL:obproxy-0c63.ops.cloud.cic.inter}:3306/${DATASOURCE_HOST:dataplatform_ptst}?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
 #spring.datasource.username=${DATASOURCE_NAME:dataplatform@ProjectTest_tenant5#testdb}
 #spring.datasource.password=${DATASOURCE_PASSWORD:Y7G6v4_3ijn77K_Kbl_U85}
-spring.datasource.url=jdbc:mysql://139.196.179.195:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
+spring.datasource.url=jdbc:mysql://192.168.1.21:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
 spring.datasource.username=comac
-spring.datasource.password=2024*Comac
+spring.datasource.password=comac
+#spring.datasource.url=jdbc:mysql://139.196.179.195:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
+#spring.datasource.username=comac
+#spring.datasource.password=2024*Comac
 
 
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/EDDataRepository.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2004-2024 All Rights Reserved.
+ */
+package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository;
+
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+/**
+ * @author
+ * @version $Id: EDDataRepos.java, v 0.1 2024-07-29 19:02
+ */
+public interface EDDataRepository {
+
+    /**
+     * 创建文件夹
+     * @param parames
+     * @return
+     */
+    Boolean createFolder(EDDataInfo edDataInfo);
+
+    /**
+     * 获取文件信息列表
+     * @param parames
+     * @return
+     */
+    Boolean getFileInfoList(EDDataParams parames);
+
+    /**
+     * 上传
+     * @param parames
+     * @return
+     */
+    Boolean upload(EDDataParams parames);
+
+    /**
+     * 下载
+     * @param parames
+     * @return
+     */
+    Boolean download(EDDataParams parames);
+
+
+}

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java

@@ -1,5 +1,6 @@
 package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service;
 
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserPage;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
@@ -16,27 +17,27 @@ public interface EDDataService {
      * @param parames
      * @return
      */
-    Boolean createFolder(EDDataParams request);
+    Boolean createFolder(EDDataInfo edDataInfo);
 
     /**
      * 获取文件信息列表
      * @param parames
      * @return
      */
-    Boolean getFileInfoList(EDDataParams request);
+    Boolean getFileInfoList(EDDataParams parames);
 
     /**
      * 上传
      * @param parames
      * @return
      */
-    Boolean upload(EDDataParams request);
+    Boolean upload(EDDataParams parames);
 
     /**
      * 下载
      * @param parames
      * @return
      */
-    Boolean download(EDDataParams request);
+    Boolean download(EDDataParams parames);
 
 }

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java

@@ -6,12 +6,13 @@ package com.electromagnetic.industry.software.data.manage.domain.boardservice.in
 import com.electromagnetic.industry.software.data.manage.common.ElectromagneticErrorEnum;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.EffectFlagEnum;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.IndicatorCardStatusEnum;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserExtend;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserPage;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.UserParams;
-import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.UserRepository;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.EDDataRepository;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.EDDataService;
 import com.github.pagehelper.PageInfo;
 import electromagnetic.data.framework.share.enums.ElectromagneticSceneIncidentEnum;
@@ -35,33 +36,18 @@ public class EDDataServiceImpl implements EDDataService {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LoggerConstant.DOMAIN_SERVICE);
 
-    //@Resource
+    @Resource
-    //private UserRepository userRepository;
+    private EDDataRepository edDataRepository;
-    ///**
+
-    // * 获取中支指标配置列表
-    // * @param parames
-    // * @return
-    // */
-    //@Override
-    //public UserPage getUserList(UserParams parames) {
-    //    UserPage userPage=new UserPage();
-    //    //数据查询
-    //    PageInfo<UserExtend> pageInfo=userRepository.getUserList(parames);
-    //    List<String> userStrings=new ArrayList<>();
-    //    pageInfo.getList().forEach(e->userStrings.add(e.getUserAccount()));
-    //    //查询指标
-    //    userPage.setUserExtends(pageInfo);
-    //    return userPage;
-    //}
 
     /**
      * 创建文件夹
      * @param parames
      * @return
      */
-    public Boolean createFolder(EDDataParams request)
+    public Boolean createFolder(EDDataInfo edDataInfo)
     {
-
+        edDataRepository.createFolder(edDataInfo);
         return Boolean.TRUE;
     }
 
@@ -70,9 +56,9 @@ public class EDDataServiceImpl implements EDDataService {
      * @param parames
      * @return
      */
-    public Boolean getFileInfoList(EDDataParams request)
+    public Boolean getFileInfoList(EDDataParams parames)
     {
-
+        edDataRepository.getFileInfoList(parames);
         return Boolean.TRUE;
     }
 
@@ -81,9 +67,9 @@ public class EDDataServiceImpl implements EDDataService {
      * @param parames
      * @return
      */
-    public Boolean upload(EDDataParams request)
+    public Boolean upload(EDDataParams parames)
     {
-
+        edDataRepository.upload(parames);
         return Boolean.TRUE;
     }
 
@@ -92,9 +78,9 @@ public class EDDataServiceImpl implements EDDataService {
      * @param parames
      * @return
      */
-    public Boolean download(EDDataParams request)
+    public Boolean download(EDDataParams parames)
     {
-
+        edDataRepository.download(parames);
         return Boolean.TRUE;
     }
 

facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java

@@ -1,8 +1,10 @@
 package com.electromagnetic.industry.software.data.manage.request.indicator;
 
+import electromagnetic.data.framework.share.model.BaseRequest;
+
 import java.util.Date;
 
-public class EDDataRequest {
+public class EDDataRequest extends BaseRequest {
     private static final long serialVersionUID = 8717292719122744818L;
 
     /**

infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/EDDataMapper.java

@@ -0,0 +1,45 @@
+package com.electromagnetic.industry.software.data.manage.repository.dao;
+
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface EDDataMapper {
+
+    /**
+     * 创建文件夹
+     * @param parames
+     * @return
+     */
+    Boolean createFolder(EDDataInfo edDataInfo);
+
+    /**
+     * 获取文件信息列表
+     * @param parames
+     * @return
+     */
+    Boolean getFileInfoList(EDDataParams parames);
+
+    /**
+     * 上传
+     * @param parames
+     * @return
+     */
+    Boolean upload(EDDataParams parames);
+
+    /**
+     * 下载
+     * @param parames
+     * @return
+     */
+    Boolean download(EDDataParams parames);
+
+
+
+}

infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/EDDataRepositoryImpl.java

@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2004-2024 All Rights Reserved.
+ */
+package com.electromagnetic.industry.software.data.manage.repository.impl;
+
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.EDDataRepository;
+import com.electromagnetic.industry.software.data.manage.repository.dao.EDDataMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author
+ * @version $Id: IndicatorCardRepositoryImpl.java, v 0.1 2024-07-29 19:04
+ */
+@Repository
+public class EDDataRepositoryImpl implements EDDataRepository {
+
+    @Resource
+    private EDDataMapper edDataMapper;
+
+    /**
+     * 创建文件夹
+     *
+     * @param parames
+     * @return
+     */
+    @Override
+    public Boolean createFolder(EDDataInfo edDataInfo)
+    {
+        return edDataMapper.createFolder(edDataInfo);
+    }
+
+    /**
+     * 获取文件信息列表
+     * @param parames
+     * @return
+     */
+    @Override
+    public Boolean getFileInfoList(EDDataParams parames)
+    {
+        return edDataMapper.getFileInfoList(parames);
+    }
+
+    /**
+     * 上传
+     * @param parames
+     * @return
+     */
+    @Override
+    public Boolean upload(EDDataParams parames)
+    {
+        return edDataMapper.upload(parames);
+    }
+
+    /**
+     * 下载
+     * @param parames
+     * @return
+     */
+    @Override
+    public Boolean download(EDDataParams parames)
+    {
+        return edDataMapper.download(parames);
+    }
+
+
+}

infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml

@@ -1,198 +1,225 @@
 <?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.electromagnetic.industry.software.data.manage.repository.dao.IndicatorCardMapper">
-  <resultMap id="BaseResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
-    <result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
-    <result column="indicator_card_type" jdbcType="VARCHAR" property="indicatorCardType" />
-    <result column="dataservice_no" jdbcType="VARCHAR" property="dataserviceNo" />
-    <result column="dataservice_name" jdbcType="VARCHAR" property="dataserviceName" />
-    <result column="indicator_card_order" jdbcType="INTEGER" property="indicatorCardOrder" />
-    <result column="access_control" jdbcType="VARCHAR" property="accessControl" />
-    <result column="home_display" jdbcType="VARCHAR" property="homeDisplay" />
-    <result column="warning_flag" jdbcType="VARCHAR" property="warningFlag" />
-    <result column="template_nos" jdbcType="VARCHAR" property="templateNos" />
-    <result column="card_status" jdbcType="VARCHAR" property="cardStatus" />
-    <result column="creator" jdbcType="VARCHAR" property="creator" />
-    <result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
-    <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
-    <result column="modifier" jdbcType="VARCHAR" property="modifier" />
-    <result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
-    <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
-    <result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
-  </resultMap>
 
-  <resultMap id="IndicatorCardMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend">
+<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.EDDataMapper">
-    <id column="id" jdbcType="BIGINT" property="id" />
+<insert id="createFolder" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo">
-    <result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
+  <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-    <result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
+    SELECT LAST_INSERT_ID()
-    <result column="indicator_card_type" jdbcType="VARCHAR" property="indicatorCardType" />
+  </selectKey>
-    <result column="dataservice_no" jdbcType="VARCHAR" property="dataserviceNo" />
+  insert into ed_data_info (id, category_id,
-    <result column="dataservice_name" jdbcType="VARCHAR" property="dataserviceName" />
+  data_id, data_no, data_name,
-    <result column="indicator_card_order" jdbcType="INTEGER" property="indicatorCardOrder" />
+  data_type, file_type,
-    <result column="access_control" jdbcType="VARCHAR" property="accessControl" />
+  version,content, implant_json, data_status,
-    <result column="home_display" jdbcType="VARCHAR" property="homeDisplay" />
+  creator, creator_name, gmt_create,
-    <result column="warning_flag" jdbcType="VARCHAR" property="warningFlag" />
+  modifier, modifier_name, gmt_modified,
-    <result column="template_nos" jdbcType="VARCHAR" property="templateNos" />
+  effect_flag
-    <result column="home" jdbcType="VARCHAR" property="home" />
+  )
-    <result column="warning" jdbcType="VARCHAR" property="warning" />
+  values (#{id,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR},
-    <result column="card_status" jdbcType="VARCHAR" property="cardStatus" />
+  #{dataId,jdbcType=VARCHAR}, #{dataNo,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR},
-    <result column="creator" jdbcType="VARCHAR" property="creator" />
+  #{dataType,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},
-    <result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
+  #{version,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR}, #{implantJson,jdbcType=VARCHAR}, #{dataStatus,jdbcType=VARCHAR},
-    <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
+  #{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
-    <result column="modifier" jdbcType="VARCHAR" property="modifier" />
+  #{modifierName,jdbcType=VARCHAR},now(),1
-    <result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
+  )
-    <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
+</insert>
-    <result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
+
-    <result column="renew_type" jdbcType="VARCHAR" property="renewType" />
+</mapper>
-    <result column="warning_indicator" jdbcType="VARCHAR" property="warningIndicator" />
+
-  </resultMap>
+<!--
-  <sql id="Base_Column_List">
+<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.IndicatorCardMapper">
+<resultMap id="BaseResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
+  <id column="id" jdbcType="BIGINT" property="id" />
+  <result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
+  <result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
+  <result column="indicator_card_type" jdbcType="VARCHAR" property="indicatorCardType" />
+  <result column="dataservice_no" jdbcType="VARCHAR" property="dataserviceNo" />
+  <result column="dataservice_name" jdbcType="VARCHAR" property="dataserviceName" />
+  <result column="indicator_card_order" jdbcType="INTEGER" property="indicatorCardOrder" />
+  <result column="access_control" jdbcType="VARCHAR" property="accessControl" />
+  <result column="home_display" jdbcType="VARCHAR" property="homeDisplay" />
+  <result column="warning_flag" jdbcType="VARCHAR" property="warningFlag" />
+  <result column="template_nos" jdbcType="VARCHAR" property="templateNos" />
+  <result column="card_status" jdbcType="VARCHAR" property="cardStatus" />
+  <result column="creator" jdbcType="VARCHAR" property="creator" />
+  <result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
+  <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
+  <result column="modifier" jdbcType="VARCHAR" property="modifier" />
+  <result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
+  <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
+  <result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
+</resultMap>
+
+<resultMap id="IndicatorCardMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend">
+  <id column="id" jdbcType="BIGINT" property="id" />
+  <result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
+  <result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
+  <result column="indicator_card_type" jdbcType="VARCHAR" property="indicatorCardType" />
+  <result column="dataservice_no" jdbcType="VARCHAR" property="dataserviceNo" />
+  <result column="dataservice_name" jdbcType="VARCHAR" property="dataserviceName" />
+  <result column="indicator_card_order" jdbcType="INTEGER" property="indicatorCardOrder" />
+  <result column="access_control" jdbcType="VARCHAR" property="accessControl" />
+  <result column="home_display" jdbcType="VARCHAR" property="homeDisplay" />
+  <result column="warning_flag" jdbcType="VARCHAR" property="warningFlag" />
+  <result column="template_nos" jdbcType="VARCHAR" property="templateNos" />
+  <result column="home" jdbcType="VARCHAR" property="home" />
+  <result column="warning" jdbcType="VARCHAR" property="warning" />
+  <result column="card_status" jdbcType="VARCHAR" property="cardStatus" />
+  <result column="creator" jdbcType="VARCHAR" property="creator" />
+  <result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
+  <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
+  <result column="modifier" jdbcType="VARCHAR" property="modifier" />
+  <result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
+  <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
+  <result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
+  <result column="renew_type" jdbcType="VARCHAR" property="renewType" />
+  <result column="warning_indicator" jdbcType="VARCHAR" property="warningIndicator" />
+</resultMap>
+<sql id="Base_Column_List">
     id, indicator_card_no, indicator_card_name, indicator_card_type, dataservice_no,
     dataservice_name, indicator_card_order, access_control,home_display, warning_flag,
     template_nos,card_status, creator, creator_name, gmt_create, modifier, modifier_name, gmt_modified,
     effect_flag
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select
+  select
-    <include refid="Base_Column_List" />
+  <include refid="Base_Column_List" />
-    from dataplatform_wisdom_indicator_card
+  from dataplatform_wisdom_indicator_card
-    where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and card_status='Enable' and effect_flag = 1
+  where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and card_status='Enable' and effect_flag = 1
-  </select>
+</select>
-  <select id="getIndicatorCardOrder"
+<select id="getIndicatorCardOrder"
-          parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams"
+        parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams"
-          resultMap="BaseResultMap">
+        resultMap="BaseResultMap">
-    select
+  select
-    <include refid="Base_Column_List" />
+  <include refid="Base_Column_List" />
-    from dataplatform_wisdom_indicator_card
+  from dataplatform_wisdom_indicator_card
-    where effect_flag = 1
+  where effect_flag = 1
-    order by indicator_card_order desc
+  order by indicator_card_order desc
-    limit 1
+  limit 1
-  </select>
+</select>
-  <select id="getIndicatorCardListConfig" resultMap="IndicatorCardMap" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams">
+<select id="getIndicatorCardListConfig" resultMap="IndicatorCardMap" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams">
-      SELECT
+  SELECT
-      card.id,
+  card.id,
-      card.indicator_card_no,
+  card.indicator_card_no,
-      card.indicator_card_name,
+  card.indicator_card_name,
-      card.indicator_card_type,
+  card.indicator_card_type,
-      card.dataservice_no,
+  card.dataservice_no,
-      card.dataservice_name,
+  card.dataservice_name,
-      card.indicator_card_order,
+  card.indicator_card_order,
-      card.access_control,
+  card.access_control,
-      card.home_display,
+  card.home_display,
-      card.warning_flag,
+  card.warning_flag,
-      card.template_nos,
+  card.template_nos,
-      card.card_status,
+  card.card_status,
-      card.creator, card.creator_name, card.gmt_create, card.modifier,
+  card.creator, card.creator_name, card.gmt_create, card.modifier,
-      card.modifier_name,card.gmt_modified,card.effect_flag,indictor.renew_type,indictor.warning_indicator,
+  card.modifier_name,card.gmt_modified,card.effect_flag,indictor.renew_type,indictor.warning_indicator,
-      ( SELECT config_status FROM dataplatform_wisdom_user_resource_config WHERE resource_no = card.indicator_card_no AND config_type = 'indicatorCard' and member_code=#{userId,jdbcType=VARCHAR} limit 1) AS home,
+  ( SELECT config_status FROM dataplatform_wisdom_user_resource_config WHERE resource_no = card.indicator_card_no AND config_type = 'indicatorCard' and member_code=#{userId,jdbcType=VARCHAR} limit 1) AS home,
-      ( SELECT config_status FROM dataplatform_wisdom_indicator_org_config WHERE indicator_no = indictor.indicator_no AND config_type = 'warning' and org_code=#{orgCode,jdbcType=VARCHAR} limit 1) AS warning
+  ( SELECT config_status FROM dataplatform_wisdom_indicator_org_config WHERE indicator_no = indictor.indicator_no AND config_type = 'warning' and org_code=#{orgCode,jdbcType=VARCHAR} limit 1) AS warning
-    FROM
+  FROM
-    dataplatform_wisdom_indicator_card card LEFT JOIN dataplatform_wisdom_user_resource_config config on config.resource_no=card.indicator_card_no
+  dataplatform_wisdom_indicator_card card LEFT JOIN dataplatform_wisdom_user_resource_config config on config.resource_no=card.indicator_card_no
-    and config.member_code = #{userId,jdbcType=VARCHAR} and config.config_type = 'indicatorCard'
+  and config.member_code = #{userId,jdbcType=VARCHAR} and config.config_type = 'indicatorCard'
-    left JOIN dataplatform_wisdom_indicator indictor on indictor.indicator_card_no=card.indicator_card_no
+  left JOIN dataplatform_wisdom_indicator indictor on indictor.indicator_card_no=card.indicator_card_no
-    and indictor.indicator_type='host'
+  and indictor.indicator_type='host'
-    <where>
+  <where>
-      card.effect_flag = 1
+    card.effect_flag = 1
-      <if test="indicatorCardType!=null and indicatorCardType!='' and indicatorCardType!='ALL'">
+    <if test="indicatorCardType!=null and indicatorCardType!='' and indicatorCardType!='ALL'">
-        and card.indicator_card_type='${indicatorCardType}'
+      and card.indicator_card_type='${indicatorCardType}'
-      </if>
+    </if>
-      <if test="accessControl!=null and accessControl!=''">
+    <if test="accessControl!=null and accessControl!=''">
-        and card.access_control LIKE '%${accessControl}%'
+      and card.access_control LIKE '%${accessControl}%'
-      </if>
+    </if>
-      <if test="indicatorName!=null and indicatorName!=''">
+    <if test="indicatorName!=null and indicatorName!=''">
-        and indictor.indicator_name LIKE '%${indicatorName}%'
+      and indictor.indicator_name LIKE '%${indicatorName}%'
-      </if>
+    </if>
-      <if test="cardStatus!=null and cardStatus!=''">
+    <if test="cardStatus!=null and cardStatus!=''">
-        and card.card_status='${cardStatus}'
+      and card.card_status='${cardStatus}'
-      </if>
+    </if>
-      <if test="homeType!=null and homeType!=''">
+    <if test="homeType!=null and homeType!=''">
-        and ( config.resource_no is null or ( config.member_code=#{userId,jdbcType=VARCHAR} and config.config_status='display'))
+      and ( config.resource_no is null or ( config.member_code=#{userId,jdbcType=VARCHAR} and config.config_status='display'))
-      </if>
+    </if>
-    </where>
+  </where>
-    GROUP BY card.id
+  GROUP BY card.id
-    order by card.indicator_card_order asc
+  order by card.indicator_card_order asc
-  </select>
+</select>
-  <insert id="insert" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
+<insert id="insert" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+  <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
+    SELECT LAST_INSERT_ID()
-    </selectKey>
+  </selectKey>
-    insert into dataplatform_wisdom_indicator_card (indicator_card_no, indicator_card_name,
+  insert into dataplatform_wisdom_indicator_card (indicator_card_no, indicator_card_name,
-    indicator_card_type, dataservice_no, dataservice_name,
+  indicator_card_type, dataservice_no, dataservice_name,
-    indicator_card_order, access_control,
+  indicator_card_order, access_control,
-    home_display,warning_flag, template_nos, creator,
+  home_display,warning_flag, template_nos, creator,
-    creator_name, gmt_create, modifier,
+  creator_name, gmt_create, modifier,
-    modifier_name, gmt_modified, effect_flag
+  modifier_name, gmt_modified, effect_flag
-    )
+  )
-    values (#{indicatorCardNo,jdbcType=VARCHAR}, #{indicatorCardName,jdbcType=VARCHAR},
+  values (#{indicatorCardNo,jdbcType=VARCHAR}, #{indicatorCardName,jdbcType=VARCHAR},
-    #{indicatorCardType,jdbcType=VARCHAR}, #{dataserviceNo,jdbcType=VARCHAR}, #{dataserviceName,jdbcType=VARCHAR},
+  #{indicatorCardType,jdbcType=VARCHAR}, #{dataserviceNo,jdbcType=VARCHAR}, #{dataserviceName,jdbcType=VARCHAR},
-    #{indicatorCardOrder,jdbcType=VARCHAR}, #{accessControl,jdbcType=VARCHAR},
+  #{indicatorCardOrder,jdbcType=VARCHAR}, #{accessControl,jdbcType=VARCHAR},
-    #{homeDisplay,jdbcType=VARCHAR},#{warningFlag,jdbcType=VARCHAR}, #{templateNos,jdbcType=VARCHAR}, #{creator,jdbcType=VARCHAR},
+  #{homeDisplay,jdbcType=VARCHAR},#{warningFlag,jdbcType=VARCHAR}, #{templateNos,jdbcType=VARCHAR}, #{creator,jdbcType=VARCHAR},
-    #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
+  #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
-    #{modifierName,jdbcType=VARCHAR},now(),1
+  #{modifierName,jdbcType=VARCHAR},now(),1
-    )
+  )
-  </insert>
+</insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
+<update id="updateByPrimaryKeySelective" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
-    update dataplatform_wisdom_indicator_card
+  update dataplatform_wisdom_indicator_card
-    <set>
+  <set>
-      <if test="indicatorCardName != null">
+    <if test="indicatorCardName != null">
-        indicator_card_name = #{indicatorCardName,jdbcType=VARCHAR},
+      indicator_card_name = #{indicatorCardName,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="indicatorCardType != null">
+    <if test="indicatorCardType != null">
-        indicator_card_type = #{indicatorCardType,jdbcType=VARCHAR},
+      indicator_card_type = #{indicatorCardType,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="dataserviceNo != null">
+    <if test="dataserviceNo != null">
-        dataservice_no = #{dataserviceNo,jdbcType=VARCHAR},
+      dataservice_no = #{dataserviceNo,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="dataserviceName != null">
+    <if test="dataserviceName != null">
-        dataservice_name = #{dataserviceName,jdbcType=VARCHAR},
+      dataservice_name = #{dataserviceName,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="indicatorCardOrder != null">
+    <if test="indicatorCardOrder != null">
-        indicator_card_order = #{indicatorCardOrder,jdbcType=INTEGER},
+      indicator_card_order = #{indicatorCardOrder,jdbcType=INTEGER},
-      </if>
+    </if>
-      <if test="accessControl != null">
+    <if test="accessControl != null">
-        access_control = #{accessControl,jdbcType=VARCHAR},
+      access_control = #{accessControl,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="homeDisplay != null">
+    <if test="homeDisplay != null">
-        home_display = #{homeDisplay,jdbcType=VARCHAR},
+      home_display = #{homeDisplay,jdbcType=VARCHAR},
-      </if>
+    </if>
-       <if test="warningFlag != null">
+    <if test="warningFlag != null">
-        warning_flag = #{warningFlag,jdbcType=VARCHAR},
+      warning_flag = #{warningFlag,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="templateNos != null">
+    <if test="templateNos != null">
-        template_nos = #{templateNos,jdbcType=VARCHAR},
+      template_nos = #{templateNos,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="modifier != null">
+    <if test="modifier != null">
-        modifier = #{modifier,jdbcType=VARCHAR},
+      modifier = #{modifier,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="modifierName != null">
+    <if test="modifierName != null">
-        modifier_name = #{modifierName,jdbcType=VARCHAR},
+      modifier_name = #{modifierName,jdbcType=VARCHAR},
-      </if>
+    </if>
-      gmt_modified = now()
+    gmt_modified = now()
-    </set>
+  </set>
-    where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
+  where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
-  </update>
+</update>
 
-  <update id="updateStatusOrEffect" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
+<update id="updateStatusOrEffect" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
-    update dataplatform_wisdom_indicator_card
+  update dataplatform_wisdom_indicator_card
-    <set>
+  <set>
-      <if test="cardStatus != null">
+    <if test="cardStatus != null">
-        card_status = #{cardStatus,jdbcType=VARCHAR},
+      card_status = #{cardStatus,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="effectFlag != null">
+    <if test="effectFlag != null">
-        effect_flag = #{effectFlag,jdbcType=VARCHAR},
+      effect_flag = #{effectFlag,jdbcType=VARCHAR},
-      </if>
+    </if>
-      gmt_modified = now()
+    gmt_modified = now()
-    </set>
+  </set>
-    where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
+  where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
-  </update>
+</update>
 
-  <update id="updateIndicatorCardOrder" parameterType="java.util.List">
+<update id="updateIndicatorCardOrder" parameterType="java.util.List">
-    <foreach collection="list" separator=";" item="item">
+  <foreach collection="list" separator=";" item="item">
-      update dataplatform_wisdom_indicator_card
+    update dataplatform_wisdom_indicator_card
-      set indicator_card_order = #{item.indicatorCardOrder,jdbcType=INTEGER}
+    set indicator_card_order = #{item.indicatorCardOrder,jdbcType=INTEGER}
-      where indicator_card_no = #{item.indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
+    where indicator_card_no = #{item.indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
-    </foreach>
+  </foreach>
-  </update>
+</update>
-</mapper>
+</mapper>
+ -->

infrastructure/repository/target/classes/sqlmapper/IndicatorCardMapper.xml

@@ -1,198 +1,225 @@
 <?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.electromagnetic.industry.software.data.manage.repository.dao.IndicatorCardMapper">
-  <resultMap id="BaseResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
-    <result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
-    <result column="indicator_card_type" jdbcType="VARCHAR" property="indicatorCardType" />
-    <result column="dataservice_no" jdbcType="VARCHAR" property="dataserviceNo" />
-    <result column="dataservice_name" jdbcType="VARCHAR" property="dataserviceName" />
-    <result column="indicator_card_order" jdbcType="INTEGER" property="indicatorCardOrder" />
-    <result column="access_control" jdbcType="VARCHAR" property="accessControl" />
-    <result column="home_display" jdbcType="VARCHAR" property="homeDisplay" />
-    <result column="warning_flag" jdbcType="VARCHAR" property="warningFlag" />
-    <result column="template_nos" jdbcType="VARCHAR" property="templateNos" />
-    <result column="card_status" jdbcType="VARCHAR" property="cardStatus" />
-    <result column="creator" jdbcType="VARCHAR" property="creator" />
-    <result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
-    <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
-    <result column="modifier" jdbcType="VARCHAR" property="modifier" />
-    <result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
-    <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
-    <result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
-  </resultMap>
 
-  <resultMap id="IndicatorCardMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend">
+<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.EDDataMapper">
-    <id column="id" jdbcType="BIGINT" property="id" />
+<insert id="createFolder" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo">
-    <result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
+  <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-    <result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
+    SELECT LAST_INSERT_ID()
-    <result column="indicator_card_type" jdbcType="VARCHAR" property="indicatorCardType" />
+  </selectKey>
-    <result column="dataservice_no" jdbcType="VARCHAR" property="dataserviceNo" />
+  insert into ed_data_info (id, category_id,
-    <result column="dataservice_name" jdbcType="VARCHAR" property="dataserviceName" />
+  data_id, data_no, data_name,
-    <result column="indicator_card_order" jdbcType="INTEGER" property="indicatorCardOrder" />
+  data_type, file_type,
-    <result column="access_control" jdbcType="VARCHAR" property="accessControl" />
+  version,content, implant_json, data_status,
-    <result column="home_display" jdbcType="VARCHAR" property="homeDisplay" />
+  creator, creator_name, gmt_create,
-    <result column="warning_flag" jdbcType="VARCHAR" property="warningFlag" />
+  modifier, modifier_name, gmt_modified,
-    <result column="template_nos" jdbcType="VARCHAR" property="templateNos" />
+  effect_flag
-    <result column="home" jdbcType="VARCHAR" property="home" />
+  )
-    <result column="warning" jdbcType="VARCHAR" property="warning" />
+  values (#{id,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR},
-    <result column="card_status" jdbcType="VARCHAR" property="cardStatus" />
+  #{dataId,jdbcType=VARCHAR}, #{dataNo,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR},
-    <result column="creator" jdbcType="VARCHAR" property="creator" />
+  #{dataType,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},
-    <result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
+  #{version,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR}, #{implantJson,jdbcType=VARCHAR}, #{dataStatus,jdbcType=VARCHAR},
-    <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
+  #{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
-    <result column="modifier" jdbcType="VARCHAR" property="modifier" />
+  #{modifierName,jdbcType=VARCHAR},now(),1
-    <result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
+  )
-    <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
+</insert>
-    <result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
+
-    <result column="renew_type" jdbcType="VARCHAR" property="renewType" />
+</mapper>
-    <result column="warning_indicator" jdbcType="VARCHAR" property="warningIndicator" />
+
-  </resultMap>
+<!--
-  <sql id="Base_Column_List">
+<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.IndicatorCardMapper">
+<resultMap id="BaseResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
+  <id column="id" jdbcType="BIGINT" property="id" />
+  <result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
+  <result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
+  <result column="indicator_card_type" jdbcType="VARCHAR" property="indicatorCardType" />
+  <result column="dataservice_no" jdbcType="VARCHAR" property="dataserviceNo" />
+  <result column="dataservice_name" jdbcType="VARCHAR" property="dataserviceName" />
+  <result column="indicator_card_order" jdbcType="INTEGER" property="indicatorCardOrder" />
+  <result column="access_control" jdbcType="VARCHAR" property="accessControl" />
+  <result column="home_display" jdbcType="VARCHAR" property="homeDisplay" />
+  <result column="warning_flag" jdbcType="VARCHAR" property="warningFlag" />
+  <result column="template_nos" jdbcType="VARCHAR" property="templateNos" />
+  <result column="card_status" jdbcType="VARCHAR" property="cardStatus" />
+  <result column="creator" jdbcType="VARCHAR" property="creator" />
+  <result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
+  <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
+  <result column="modifier" jdbcType="VARCHAR" property="modifier" />
+  <result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
+  <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
+  <result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
+</resultMap>
+
+<resultMap id="IndicatorCardMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend">
+  <id column="id" jdbcType="BIGINT" property="id" />
+  <result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
+  <result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
+  <result column="indicator_card_type" jdbcType="VARCHAR" property="indicatorCardType" />
+  <result column="dataservice_no" jdbcType="VARCHAR" property="dataserviceNo" />
+  <result column="dataservice_name" jdbcType="VARCHAR" property="dataserviceName" />
+  <result column="indicator_card_order" jdbcType="INTEGER" property="indicatorCardOrder" />
+  <result column="access_control" jdbcType="VARCHAR" property="accessControl" />
+  <result column="home_display" jdbcType="VARCHAR" property="homeDisplay" />
+  <result column="warning_flag" jdbcType="VARCHAR" property="warningFlag" />
+  <result column="template_nos" jdbcType="VARCHAR" property="templateNos" />
+  <result column="home" jdbcType="VARCHAR" property="home" />
+  <result column="warning" jdbcType="VARCHAR" property="warning" />
+  <result column="card_status" jdbcType="VARCHAR" property="cardStatus" />
+  <result column="creator" jdbcType="VARCHAR" property="creator" />
+  <result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
+  <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
+  <result column="modifier" jdbcType="VARCHAR" property="modifier" />
+  <result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
+  <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
+  <result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
+  <result column="renew_type" jdbcType="VARCHAR" property="renewType" />
+  <result column="warning_indicator" jdbcType="VARCHAR" property="warningIndicator" />
+</resultMap>
+<sql id="Base_Column_List">
     id, indicator_card_no, indicator_card_name, indicator_card_type, dataservice_no,
     dataservice_name, indicator_card_order, access_control,home_display, warning_flag,
     template_nos,card_status, creator, creator_name, gmt_create, modifier, modifier_name, gmt_modified,
     effect_flag
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select
+  select
-    <include refid="Base_Column_List" />
+  <include refid="Base_Column_List" />
-    from dataplatform_wisdom_indicator_card
+  from dataplatform_wisdom_indicator_card
-    where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and card_status='Enable' and effect_flag = 1
+  where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and card_status='Enable' and effect_flag = 1
-  </select>
+</select>
-  <select id="getIndicatorCardOrder"
+<select id="getIndicatorCardOrder"
-          parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams"
+        parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams"
-          resultMap="BaseResultMap">
+        resultMap="BaseResultMap">
-    select
+  select
-    <include refid="Base_Column_List" />
+  <include refid="Base_Column_List" />
-    from dataplatform_wisdom_indicator_card
+  from dataplatform_wisdom_indicator_card
-    where effect_flag = 1
+  where effect_flag = 1
-    order by indicator_card_order desc
+  order by indicator_card_order desc
-    limit 1
+  limit 1
-  </select>
+</select>
-  <select id="getIndicatorCardListConfig" resultMap="IndicatorCardMap" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams">
+<select id="getIndicatorCardListConfig" resultMap="IndicatorCardMap" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams">
-      SELECT
+  SELECT
-      card.id,
+  card.id,
-      card.indicator_card_no,
+  card.indicator_card_no,
-      card.indicator_card_name,
+  card.indicator_card_name,
-      card.indicator_card_type,
+  card.indicator_card_type,
-      card.dataservice_no,
+  card.dataservice_no,
-      card.dataservice_name,
+  card.dataservice_name,
-      card.indicator_card_order,
+  card.indicator_card_order,
-      card.access_control,
+  card.access_control,
-      card.home_display,
+  card.home_display,
-      card.warning_flag,
+  card.warning_flag,
-      card.template_nos,
+  card.template_nos,
-      card.card_status,
+  card.card_status,
-      card.creator, card.creator_name, card.gmt_create, card.modifier,
+  card.creator, card.creator_name, card.gmt_create, card.modifier,
-      card.modifier_name,card.gmt_modified,card.effect_flag,indictor.renew_type,indictor.warning_indicator,
+  card.modifier_name,card.gmt_modified,card.effect_flag,indictor.renew_type,indictor.warning_indicator,
-      ( SELECT config_status FROM dataplatform_wisdom_user_resource_config WHERE resource_no = card.indicator_card_no AND config_type = 'indicatorCard' and member_code=#{userId,jdbcType=VARCHAR} limit 1) AS home,
+  ( SELECT config_status FROM dataplatform_wisdom_user_resource_config WHERE resource_no = card.indicator_card_no AND config_type = 'indicatorCard' and member_code=#{userId,jdbcType=VARCHAR} limit 1) AS home,
-      ( SELECT config_status FROM dataplatform_wisdom_indicator_org_config WHERE indicator_no = indictor.indicator_no AND config_type = 'warning' and org_code=#{orgCode,jdbcType=VARCHAR} limit 1) AS warning
+  ( SELECT config_status FROM dataplatform_wisdom_indicator_org_config WHERE indicator_no = indictor.indicator_no AND config_type = 'warning' and org_code=#{orgCode,jdbcType=VARCHAR} limit 1) AS warning
-    FROM
+  FROM
-    dataplatform_wisdom_indicator_card card LEFT JOIN dataplatform_wisdom_user_resource_config config on config.resource_no=card.indicator_card_no
+  dataplatform_wisdom_indicator_card card LEFT JOIN dataplatform_wisdom_user_resource_config config on config.resource_no=card.indicator_card_no
-    and config.member_code = #{userId,jdbcType=VARCHAR} and config.config_type = 'indicatorCard'
+  and config.member_code = #{userId,jdbcType=VARCHAR} and config.config_type = 'indicatorCard'
-    left JOIN dataplatform_wisdom_indicator indictor on indictor.indicator_card_no=card.indicator_card_no
+  left JOIN dataplatform_wisdom_indicator indictor on indictor.indicator_card_no=card.indicator_card_no
-    and indictor.indicator_type='host'
+  and indictor.indicator_type='host'
-    <where>
+  <where>
-      card.effect_flag = 1
+    card.effect_flag = 1
-      <if test="indicatorCardType!=null and indicatorCardType!='' and indicatorCardType!='ALL'">
+    <if test="indicatorCardType!=null and indicatorCardType!='' and indicatorCardType!='ALL'">
-        and card.indicator_card_type='${indicatorCardType}'
+      and card.indicator_card_type='${indicatorCardType}'
-      </if>
+    </if>
-      <if test="accessControl!=null and accessControl!=''">
+    <if test="accessControl!=null and accessControl!=''">
-        and card.access_control LIKE '%${accessControl}%'
+      and card.access_control LIKE '%${accessControl}%'
-      </if>
+    </if>
-      <if test="indicatorName!=null and indicatorName!=''">
+    <if test="indicatorName!=null and indicatorName!=''">
-        and indictor.indicator_name LIKE '%${indicatorName}%'
+      and indictor.indicator_name LIKE '%${indicatorName}%'
-      </if>
+    </if>
-      <if test="cardStatus!=null and cardStatus!=''">
+    <if test="cardStatus!=null and cardStatus!=''">
-        and card.card_status='${cardStatus}'
+      and card.card_status='${cardStatus}'
-      </if>
+    </if>
-      <if test="homeType!=null and homeType!=''">
+    <if test="homeType!=null and homeType!=''">
-        and ( config.resource_no is null or ( config.member_code=#{userId,jdbcType=VARCHAR} and config.config_status='display'))
+      and ( config.resource_no is null or ( config.member_code=#{userId,jdbcType=VARCHAR} and config.config_status='display'))
-      </if>
+    </if>
-    </where>
+  </where>
-    GROUP BY card.id
+  GROUP BY card.id
-    order by card.indicator_card_order asc
+  order by card.indicator_card_order asc
-  </select>
+</select>
-  <insert id="insert" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
+<insert id="insert" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+  <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
+    SELECT LAST_INSERT_ID()
-    </selectKey>
+  </selectKey>
-    insert into dataplatform_wisdom_indicator_card (indicator_card_no, indicator_card_name,
+  insert into dataplatform_wisdom_indicator_card (indicator_card_no, indicator_card_name,
-    indicator_card_type, dataservice_no, dataservice_name,
+  indicator_card_type, dataservice_no, dataservice_name,
-    indicator_card_order, access_control,
+  indicator_card_order, access_control,
-    home_display,warning_flag, template_nos, creator,
+  home_display,warning_flag, template_nos, creator,
-    creator_name, gmt_create, modifier,
+  creator_name, gmt_create, modifier,
-    modifier_name, gmt_modified, effect_flag
+  modifier_name, gmt_modified, effect_flag
-    )
+  )
-    values (#{indicatorCardNo,jdbcType=VARCHAR}, #{indicatorCardName,jdbcType=VARCHAR},
+  values (#{indicatorCardNo,jdbcType=VARCHAR}, #{indicatorCardName,jdbcType=VARCHAR},
-    #{indicatorCardType,jdbcType=VARCHAR}, #{dataserviceNo,jdbcType=VARCHAR}, #{dataserviceName,jdbcType=VARCHAR},
+  #{indicatorCardType,jdbcType=VARCHAR}, #{dataserviceNo,jdbcType=VARCHAR}, #{dataserviceName,jdbcType=VARCHAR},
-    #{indicatorCardOrder,jdbcType=VARCHAR}, #{accessControl,jdbcType=VARCHAR},
+  #{indicatorCardOrder,jdbcType=VARCHAR}, #{accessControl,jdbcType=VARCHAR},
-    #{homeDisplay,jdbcType=VARCHAR},#{warningFlag,jdbcType=VARCHAR}, #{templateNos,jdbcType=VARCHAR}, #{creator,jdbcType=VARCHAR},
+  #{homeDisplay,jdbcType=VARCHAR},#{warningFlag,jdbcType=VARCHAR}, #{templateNos,jdbcType=VARCHAR}, #{creator,jdbcType=VARCHAR},
-    #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
+  #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
-    #{modifierName,jdbcType=VARCHAR},now(),1
+  #{modifierName,jdbcType=VARCHAR},now(),1
-    )
+  )
-  </insert>
+</insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
+<update id="updateByPrimaryKeySelective" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
-    update dataplatform_wisdom_indicator_card
+  update dataplatform_wisdom_indicator_card
-    <set>
+  <set>
-      <if test="indicatorCardName != null">
+    <if test="indicatorCardName != null">
-        indicator_card_name = #{indicatorCardName,jdbcType=VARCHAR},
+      indicator_card_name = #{indicatorCardName,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="indicatorCardType != null">
+    <if test="indicatorCardType != null">
-        indicator_card_type = #{indicatorCardType,jdbcType=VARCHAR},
+      indicator_card_type = #{indicatorCardType,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="dataserviceNo != null">
+    <if test="dataserviceNo != null">
-        dataservice_no = #{dataserviceNo,jdbcType=VARCHAR},
+      dataservice_no = #{dataserviceNo,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="dataserviceName != null">
+    <if test="dataserviceName != null">
-        dataservice_name = #{dataserviceName,jdbcType=VARCHAR},
+      dataservice_name = #{dataserviceName,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="indicatorCardOrder != null">
+    <if test="indicatorCardOrder != null">
-        indicator_card_order = #{indicatorCardOrder,jdbcType=INTEGER},
+      indicator_card_order = #{indicatorCardOrder,jdbcType=INTEGER},
-      </if>
+    </if>
-      <if test="accessControl != null">
+    <if test="accessControl != null">
-        access_control = #{accessControl,jdbcType=VARCHAR},
+      access_control = #{accessControl,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="homeDisplay != null">
+    <if test="homeDisplay != null">
-        home_display = #{homeDisplay,jdbcType=VARCHAR},
+      home_display = #{homeDisplay,jdbcType=VARCHAR},
-      </if>
+    </if>
-       <if test="warningFlag != null">
+    <if test="warningFlag != null">
-        warning_flag = #{warningFlag,jdbcType=VARCHAR},
+      warning_flag = #{warningFlag,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="templateNos != null">
+    <if test="templateNos != null">
-        template_nos = #{templateNos,jdbcType=VARCHAR},
+      template_nos = #{templateNos,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="modifier != null">
+    <if test="modifier != null">
-        modifier = #{modifier,jdbcType=VARCHAR},
+      modifier = #{modifier,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="modifierName != null">
+    <if test="modifierName != null">
-        modifier_name = #{modifierName,jdbcType=VARCHAR},
+      modifier_name = #{modifierName,jdbcType=VARCHAR},
-      </if>
+    </if>
-      gmt_modified = now()
+    gmt_modified = now()
-    </set>
+  </set>
-    where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
+  where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
-  </update>
+</update>
 
-  <update id="updateStatusOrEffect" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
+<update id="updateStatusOrEffect" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
-    update dataplatform_wisdom_indicator_card
+  update dataplatform_wisdom_indicator_card
-    <set>
+  <set>
-      <if test="cardStatus != null">
+    <if test="cardStatus != null">
-        card_status = #{cardStatus,jdbcType=VARCHAR},
+      card_status = #{cardStatus,jdbcType=VARCHAR},
-      </if>
+    </if>
-      <if test="effectFlag != null">
+    <if test="effectFlag != null">
-        effect_flag = #{effectFlag,jdbcType=VARCHAR},
+      effect_flag = #{effectFlag,jdbcType=VARCHAR},
-      </if>
+    </if>
-      gmt_modified = now()
+    gmt_modified = now()
-    </set>
+  </set>
-    where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
+  where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
-  </update>
+</update>
 
-  <update id="updateIndicatorCardOrder" parameterType="java.util.List">
+<update id="updateIndicatorCardOrder" parameterType="java.util.List">
-    <foreach collection="list" separator=";" item="item">
+  <foreach collection="list" separator=";" item="item">
-      update dataplatform_wisdom_indicator_card
+    update dataplatform_wisdom_indicator_card
-      set indicator_card_order = #{item.indicatorCardOrder,jdbcType=INTEGER}
+    set indicator_card_order = #{item.indicatorCardOrder,jdbcType=INTEGER}
-      where indicator_card_no = #{item.indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
+    where indicator_card_no = #{item.indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
-    </foreach>
+  </foreach>
-  </update>
+</update>
-</mapper>
+</mapper>
+ -->

service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java

@@ -1,6 +1,6 @@
 package com.electromagnetic.industry.software.data.manage.service.facade;
 
-import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserPage;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.EDDataService;
 import com.electromagnetic.industry.software.data.manage.facade.EDDataFacade;
@@ -10,6 +10,7 @@ import com.electromagnetic.industry.software.data.manage.response.indicator.User
 import com.electromagnetic.industry.software.data.manage.service.mappers.EDDataMappers;
 import electromagnetic.data.framework.share.model.ElectromagneticResult;
 import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
+import electromagnetic.data.framework.share.id.IdWorker;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -48,9 +49,22 @@ public class EDDataFacadeImpl implements EDDataFacade {
      */
     @Override
     public ElectromagneticResult<Boolean> createFolder(EDDataRequest request) {
-        EDDataParams parames = EDDataMappers.INSTANCE.getEDDataParames(request);
+        EDDataInfo edDataInfo = EDDataMappers.INSTANCE.getEDDataInfo(request);
-        edDataService.createFolder(parames);
+        edDataInfo.setCreator(request.getUserId());
+        edDataInfo.setCreatorName(request.getPersonName());
+        //edDataInfo.setModifier(request.getUserId());
+        edDataInfo.setModifierName(request.getPersonName());
+        edDataInfo.setModifier(IdWorker.getSnowFlakeIdString());
 
+        edDataInfo.setCategoryId(IdWorker.getSnowFlakeIdString());
+        edDataInfo.setDataNo(IdWorker.getSnowFlakeIdString());
+        edDataInfo.setDataId(IdWorker.getSnowFlakeIdString());
+        edDataInfo.setDataType("folder");
+        edDataInfo.setDataName("testFolder");
+        edDataInfo.setVersion("1.0.0");
+        edDataInfo.setDataStatus("publish");
+
+        edDataService.createFolder(edDataInfo);
         return ElectromagneticResultUtil.success(Boolean.TRUE);
     }
 

service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java

@@ -4,6 +4,7 @@
 package com.electromagnetic.industry.software.data.manage.service.mappers;
 
 
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.UserPage;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
 import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
@@ -27,5 +28,11 @@ public interface EDDataMappers {
      * @return
      */
     EDDataParams getEDDataParames(EDDataRequest request);
+    /**
+     * 文件数据扩展模型入参转换
+     * @param request
+     * @return
+     */
+    EDDataInfo getEDDataInfo(EDDataRequest request);
 
 }

service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java

@@ -1,12 +1,13 @@
 package com.electromagnetic.industry.software.data.manage.service.mappers;
 
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
 import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
 import javax.annotation.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-11-11T16:03:11+0800",
+    date = "2024-11-12T16:08:00+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_432 (Temurin)"
 )
 public class EDDataMappersImpl implements EDDataMappers {
@@ -21,4 +22,15 @@ public class EDDataMappersImpl implements EDDataMappers {
 
         return eDDataParams;
     }
+
+    @Override
+    public EDDataInfo getEDDataInfo(EDDataRequest request) {
+        if ( request == null ) {
+            return null;
+        }
+
+        EDDataInfo eDDataInfo = new EDDataInfo();
+
+        return eDDataInfo;
+    }
 }