chenxudong
/
electromagnetic-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决合并冲突

This commit is contained in:
s2042968 2024-11-12 17:27:15 +08:00
parent 240599cf2d 2be0613aab
commit 3b08ca0f80
15 changed files with 1316 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

283
.idea/workspace.xml Normal file
View File

@ -0,0 +1,283 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BranchesTreeState">
<expand>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
</path>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
</path>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
</path>
</expand>
<select>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="BRANCH:develop" type="e8cecc67:BranchNodeDescriptor" />
</path>
</select>
</component>
<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/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" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="mavenHome" value="$PROJECT_DIR$/../../../tool/apache-maven-3.6.3" />
<option name="userSettingsFile" value="D:\tool\apache-maven-3.6.3\conf\settings.xml" />
</MavenGeneralSettings>
</option>
</component>
<component name="ProjectId" id="2nkGOViBwqGJnnvZpyAdfpUDQFK" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="DatabaseDriversLRU" value="mysql" />
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_directory_selection" value="$PROJECT_DIR$/facade/src/main/java/com/electromagnetic/industry/software/data/manage" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
<property name="node.js.path.for.package.tslint" value="project" />
<property name="node.js.selected.package.eslint" value="(autodetect)" />
<property name="node.js.selected.package.tslint" value="(autodetect)" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.0" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
</component>
<component name="RecentsManager">
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<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" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\projects\electromagnetic-data\bootstrap\src\main\java\com\electromagnetic\industry\software\data\manage\controller" />
</key>
</component>
<component name="RunManager">
<configuration name="Application" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="bootstrap" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.electromagnetic.industry.software.data.manage.bootstrap.Application" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="d75a3a91-5d58-44f3-9ee5-41347d560b6a" name="Default Changelist" comment="" />
<created>1729509628475</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1729509628475</updated>
<workItem from="1729509635355" duration="58000" />
<workItem from="1729509704543" duration="2381000" />
<workItem from="1729591265278" duration="1289000" />
<workItem from="1729592594884" duration="1677000" />
<workItem from="1729594541674" duration="744000" />
<workItem from="1730086166510" duration="12260000" />
<workItem from="1730110058862" duration="3127000" />
<workItem from="1730170375131" duration="5193000" />
<workItem from="1730253753807" duration="548000" />
<workItem from="1730254338199" duration="1566000" />
<workItem from="1730255932838" duration="2029000" />
<workItem from="1731287388986" duration="3225000" />
<workItem from="1731309429571" duration="7862000" />
<workItem from="1731394779722" duration="5659000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="2" />
</component>
<component name="Vcs.Log.History.Properties">
<option name="COLUMN_ORDER">
<list>
<option value="0" />
<option value="2" />
<option value="3" />
<option value="1" />
</list>
</option>
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="WindowStateProjectService">
<state x="619" y="353" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1730104485895">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="619" y="353" key="#com.intellij.execution.impl.EditConfigurationsDialog/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730104485895" />
<state x="1003" y="579" width="602" height="272" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1730099349210">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="1003" y="579" width="602" height="272" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730099349210" />
<state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1729592809847">
<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="366" key="GridCell.Tab.0.bottom" timestamp="1731400543848">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<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="366" key="GridCell.Tab.0.center" timestamp="1731400543848">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<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="366" key="GridCell.Tab.0.left" timestamp="1731400543848">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<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="366" key="GridCell.Tab.0.right" timestamp="1731400543848">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<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="366" key="GridCell.Tab.1.bottom" timestamp="1731400548127">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<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="366" key="GridCell.Tab.1.center" timestamp="1731400548127">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<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="366" key="GridCell.Tab.1.left" timestamp="1731400548127">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<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="366" key="GridCell.Tab.1.right" timestamp="1731400548127">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<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="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="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="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="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="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="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="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="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" />
</state>
<state x="339" y="296" key="SettingsEditor/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730166699747" />
<state x="142" y="0" key="SettingsEditor/0.0.1280.672@0.0.1280.672" timestamp="1729594936823" />
<state x="439" y="114" key="chooseDestDirectoryDialog" timestamp="1729594820137">
<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="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="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="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="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>

48
bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java
View File

@ -1,6 +1,6 @@
package com.electromagnetic.industry.software.data.manage.controller; package com.electromagnetic.industry.software.data.manage.controller;
import com.electromagnetic.industry.software.data.manage.facade.user.UserFacade; import com.electromagnetic.industry.software.data.manage.facade.EDDataFacade;
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest; import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
import electromagnetic.data.framework.share.model.ElectromagneticResult; import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil; import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
@ -17,15 +17,51 @@ import javax.annotation.Resource;
public class EDDataController { public class EDDataController {
@Resource @Resource
private UserFacade userFacade; private EDDataFacade edDataFacade;
@ApiOperation(value = "新建文件夹",notes = "") @ApiOperation(value = "新建文件夹",notes = "")
@RequestMapping(value = "/createFolder",method = RequestMethod.POST) @RequestMapping(value = "/createFolder",method = RequestMethod.POST)
public ElectromagneticResult<String> createFolder(@RequestBody EDDataRequest request){ public ElectromagneticResult<?> createFolder(@RequestBody EDDataRequest request){
return ElectromagneticResultUtil.success("新建文件夹接口"); //return ElectromagneticResultUtil.success("新建文件夹接口");
return edDataFacade.createFolder(request);
} }
//public ElectromagneticResult<UserPageResponse> createFolder(@RequestBody EDDataRequest request){
// return userFacade.getUserList(request); @ApiOperation(value = "获取文件信息列表",notes = "")
@RequestMapping(value = "/getFileInfoList",method = RequestMethod.POST)
public ElectromagneticResult<?> getFileInfoList(@RequestBody EDDataRequest request){
//return ElectromagneticResultUtil.success("获取文件信息列表");
return edDataFacade.getFileInfoList(request);
}
@ApiOperation(value = "上传",notes = "")
@RequestMapping(value = "/upload",method = RequestMethod.POST)
public ElectromagneticResult<?> upload(@RequestBody EDDataRequest request){
//return ElectromagneticResultUtil.success("上传");
return edDataFacade.upload(request);
}
@ApiOperation(value = "下载",notes = "")
@RequestMapping(value = "/download",method = RequestMethod.POST)
public ElectromagneticResult<?> download(@RequestBody EDDataRequest request){
//return ElectromagneticResultUtil.success("下载");
return edDataFacade.download(request);
}
@ApiOperation(value = "复制",notes = "")
@RequestMapping(value = "/copy",method = RequestMethod.POST)
public ElectromagneticResult<?> copy(@RequestBody EDDataRequest request){
return ElectromagneticResultUtil.success("复制");
}
@ApiOperation(value = "重命名",notes = "")
@RequestMapping(value = "/rename",method = RequestMethod.POST)
public ElectromagneticResult<?> rename(@RequestBody EDDataRequest request){
return ElectromagneticResultUtil.success("重命名");
}
} }

35
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/EDDataParams.java Normal file
View File

@ -0,0 +1,35 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class EDDataParams implements Serializable {
private static final long serialVersionUID = -4835122199589863011L;
/**
* 当前页
*/
private Integer pageIndex = 1;
/**
* 每页数据
*/
private Integer pageSize = 10;
/**
* 上级文件夹数据码,为空是顶级
*/
private Long parentId;
/**
* 文件夹名称
*/
private String name;
/**
* 关键词
*/
private String keyWord;
/**
* 文件数据编码
*/
private String dataId;
}

50
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/repository/EDDataRepository.java Normal file
View File

@ -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);
}

42
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java Normal file
View File

@ -0,0 +1,42 @@
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.parames.EDDataParams;
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
import java.util.List;
public interface EDDataService {
/**
* 创建文件夹
* @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);
}

86
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java Normal file
View File

@ -0,0 +1,86 @@
/**
* Copyright (c) 2004-2024 All Rights Reserved.
*/
package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.impl;
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.parames.EDDataParams;
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;
import electromagnetic.data.framework.share.exception.ElectromagneticBizRuntimeException;
import electromagnetic.data.framework.share.exception.LoggerConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* @author
* @version $Id: IndicatorCardServiceImpl.java, v 0.1 2024-07-26 17:20
*/
@Service
public class EDDataServiceImpl implements EDDataService {
private static final Logger LOGGER = LoggerFactory.getLogger(LoggerConstant.DOMAIN_SERVICE);
@Resource
private EDDataRepository edDataRepository;
/**
* 创建文件夹
* @param parames
* @return
*/
public Boolean createFolder(EDDataInfo edDataInfo)
{
edDataRepository.createFolder(edDataInfo);
return Boolean.TRUE;
}
/**
* 获取文件信息列表
* @param parames
* @return
*/
public Boolean getFileInfoList(EDDataParams parames)
{
edDataRepository.getFileInfoList(parames);
return Boolean.TRUE;
}
/**
* 上传
* @param parames
* @return
*/
public Boolean upload(EDDataParams parames)
{
edDataRepository.upload(parames);
return Boolean.TRUE;
}
/**
* 下载
* @param parames
* @return
*/
public Boolean download(EDDataParams parames)
{
edDataRepository.download(parames);
return Boolean.TRUE;
}
}

38
facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/EDDataFacade.java Normal file
View File

@ -0,0 +1,38 @@
package com.electromagnetic.industry.software.data.manage.facade;
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
import electromagnetic.data.framework.share.model.ElectromagneticResult;
public interface EDDataFacade {
/**
* 创建文件夹
* @param request
* @return
*/
ElectromagneticResult<Boolean> createFolder(EDDataRequest request);
/**
* 获取文件信息列表
* @param request
* @return
*/
public ElectromagneticResult<Boolean> getFileInfoList(EDDataRequest request);
/**
* 上传
* @param request
* @return
*/
public ElectromagneticResult<Boolean> upload(EDDataRequest request);
/**
* 下载
* @param request
* @return
*/
public ElectromagneticResult<Boolean> download(EDDataRequest request);
}

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

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

45
infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/EDDataMapper.java Normal file
View File

@ -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);
}

76
infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/EDDataRepositoryImpl.java Normal file
View File

@ -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);
}
}

65
infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml
View File

@ -1,7 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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.EDDataMapper">
<insert id="createFolder" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into ed_data_info (id, category_id,
data_id, data_no, data_name,
data_type, file_type,
version,content, implant_json, data_status,
creator, creator_name, gmt_create,
modifier, modifier_name, gmt_modified,
effect_flag
)
values (#{id,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR},
#{dataId,jdbcType=VARCHAR}, #{dataNo,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR},
#{dataType,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},
#{version,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR}, #{implantJson,jdbcType=VARCHAR}, #{dataStatus,jdbcType=VARCHAR},
#{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
#{modifierName,jdbcType=VARCHAR},now(),1
)
</insert>
</mapper>
<!--
<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.IndicatorCardMapper"> <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"> <resultMap id="BaseResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" /> <result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
<result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" /> <result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
@ -21,9 +47,9 @@
<result column="modifier_name" jdbcType="VARCHAR" property="modifierName" /> <result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" /> <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
<result column="effect_flag" jdbcType="TINYINT" property="effectFlag" /> <result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
</resultMap> </resultMap>
<resultMap id="IndicatorCardMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend"> <resultMap id="IndicatorCardMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" /> <result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
<result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" /> <result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
@ -47,20 +73,20 @@
<result column="effect_flag" jdbcType="TINYINT" property="effectFlag" /> <result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
<result column="renew_type" jdbcType="VARCHAR" property="renewType" /> <result column="renew_type" jdbcType="VARCHAR" property="renewType" />
<result column="warning_indicator" jdbcType="VARCHAR" property="warningIndicator" /> <result column="warning_indicator" jdbcType="VARCHAR" property="warningIndicator" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, indicator_card_no, indicator_card_name, indicator_card_type, dataservice_no, id, indicator_card_no, indicator_card_name, indicator_card_type, dataservice_no,
dataservice_name, indicator_card_order, access_control,home_display, warning_flag, 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, template_nos,card_status, creator, creator_name, gmt_create, modifier, modifier_name, gmt_modified,
effect_flag effect_flag
</sql> </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
@ -69,8 +95,8 @@
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,
@ -113,8 +139,8 @@
</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>
@ -132,8 +158,8 @@
#{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">
@ -172,9 +198,9 @@
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">
@ -186,13 +212,14 @@
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>
-->

65
infrastructure/repository/target/classes/sqlmapper/IndicatorCardMapper.xml
View File

@ -1,7 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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.EDDataMapper">
<insert id="createFolder" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into ed_data_info (id, category_id,
data_id, data_no, data_name,
data_type, file_type,
version,content, implant_json, data_status,
creator, creator_name, gmt_create,
modifier, modifier_name, gmt_modified,
effect_flag
)
values (#{id,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR},
#{dataId,jdbcType=VARCHAR}, #{dataNo,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR},
#{dataType,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},
#{version,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR}, #{implantJson,jdbcType=VARCHAR}, #{dataStatus,jdbcType=VARCHAR},
#{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
#{modifierName,jdbcType=VARCHAR},now(),1
)
</insert>
</mapper>
<!--
<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.IndicatorCardMapper"> <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"> <resultMap id="BaseResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" /> <result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
<result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" /> <result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
@ -21,9 +47,9 @@
<result column="modifier_name" jdbcType="VARCHAR" property="modifierName" /> <result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" /> <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
<result column="effect_flag" jdbcType="TINYINT" property="effectFlag" /> <result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
</resultMap> </resultMap>
<resultMap id="IndicatorCardMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend"> <resultMap id="IndicatorCardMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" /> <result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
<result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" /> <result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
@ -47,20 +73,20 @@
<result column="effect_flag" jdbcType="TINYINT" property="effectFlag" /> <result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
<result column="renew_type" jdbcType="VARCHAR" property="renewType" /> <result column="renew_type" jdbcType="VARCHAR" property="renewType" />
<result column="warning_indicator" jdbcType="VARCHAR" property="warningIndicator" /> <result column="warning_indicator" jdbcType="VARCHAR" property="warningIndicator" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, indicator_card_no, indicator_card_name, indicator_card_type, dataservice_no, id, indicator_card_no, indicator_card_name, indicator_card_type, dataservice_no,
dataservice_name, indicator_card_order, access_control,home_display, warning_flag, 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, template_nos,card_status, creator, creator_name, gmt_create, modifier, modifier_name, gmt_modified,
effect_flag effect_flag
</sql> </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
@ -69,8 +95,8 @@
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,
@ -113,8 +139,8 @@
</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>
@ -132,8 +158,8 @@
#{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">
@ -172,9 +198,9 @@
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">
@ -186,13 +212,14 @@
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>
-->

115
service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java Normal file
View File

@ -0,0 +1,115 @@
package com.electromagnetic.industry.software.data.manage.service.facade;
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;
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
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;
@Service
public class EDDataFacadeImpl implements EDDataFacade {
@Resource
private EDDataService edDataService;
///**
// * 获取用户列表
// * WISDOM_INDICATORCARDLISTCONFIG
// * /platform/api/dataplatform/wisdomdecision/indicator/card/getIndicatorCardListConfig
// * @param request
// * @return
// */
//@Override
//public ElectromagneticResult<UserPageResponse> getUserList(UserRequest request) {
// UserParams parames= UserMappers.INSTANCE.getUserParames(request);
// //获取中支指标配置列表
// UserPage userExtends = userService.getUserList(parames);
// //模型转换
// UserPageResponse userPageResponse = UserMappers.INSTANCE.getUserToModel(userExtends);
// return ElectromagneticResultUtil.success(userPageResponse);
//}
/**
* 创建文件夹
* WISDOM_CREATE_FOLDER
* /data/ed/file/createFolder
*
* @param request
* @return
*/
@Override
public ElectromagneticResult<Boolean> createFolder(EDDataRequest request) {
EDDataInfo edDataInfo = EDDataMappers.INSTANCE.getEDDataInfo(request);
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);
}
/**
* 获取文件信息列表
* WISDOM_GET_FILEINFOLIST
* /data/ed/file/getFileInfoList
*
* @param request
* @return
*/
public ElectromagneticResult<Boolean> getFileInfoList(EDDataRequest request)
{
EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request);
edDataService.getFileInfoList(parames);
return ElectromagneticResultUtil.success(Boolean.TRUE);
}
/**
* 上传
* WISDOM_UPLOAD
* /data/ed/file/upload
* @param request
* @return
*/
public ElectromagneticResult<Boolean> upload(EDDataRequest request)
{
EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request);
edDataService.upload(parames);
return ElectromagneticResultUtil.success(Boolean.TRUE);
}
/**
* 下载
* WISDOM_DOWNLOAD
* /data/ed/file/download
* @param request
* @return
*/
public ElectromagneticResult<Boolean> download(EDDataRequest request)
{
EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request);
edDataService.download(parames);
return ElectromagneticResultUtil.success(Boolean.TRUE);
}
}

35
service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java Normal file
View File

@ -0,0 +1,35 @@
/**
* Copyright (c) 2004-2024 All Rights Reserved.
*/
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 org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**
* 电磁数据-文件数据模型转换
* @author
* @version $Id: IndicatorCardMappers.java, v 0.1 2024-07-29 18:03
*/
@Mapper
public interface EDDataMappers {
EDDataMappers INSTANCE= Mappers.getMapper(EDDataMappers.class);
/**
* 文件数据扩展模型入参转换
* @param request
* @return
*/
EDDataParams getEDDataParames(EDDataRequest request);
/**
* 文件数据扩展模型入参转换
* @param request
* @return
*/
EDDataInfo getEDDataInfo(EDDataRequest request);
}

36
service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java Normal file
View File

@ -0,0 +1,36 @@
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-12T16:08:00+0800",
comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_432 (Temurin)"
)
public class EDDataMappersImpl implements EDDataMappers {
@Override
public EDDataParams getEDDataParames(EDDataRequest request) {
if ( request == null ) {
return null;
}
EDDataParams eDDataParams = new EDDataParams();
return eDDataParams;
}
@Override
public EDDataInfo getEDDataInfo(EDDataRequest request) {
if ( request == null ) {
return null;
}
EDDataInfo eDDataInfo = new EDDataInfo();
return eDDataInfo;
}
}