解决冲突

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

@@ -22,7 +22,6 @@ public class EDDataController {
     @ApiOperation(value = "新建文件夹",notes = "")
     @RequestMapping(value = "/createFolder",method = RequestMethod.POST)
     public ElectromagneticResult<?> createFolder(@RequestBody EDDataRequest request){
-        //return ElectromagneticResultUtil.success("新建文件夹接口");
         return edDataFacade.createFolder(request);
     }
 
@@ -30,15 +29,20 @@ public class EDDataController {
     @ApiOperation(value = "获取文件信息列表",notes = "")
     @RequestMapping(value = "/getFileInfoList",method = RequestMethod.POST)
     public ElectromagneticResult<?> getFileInfoList(@RequestBody EDDataRequest request){
-        //return ElectromagneticResultUtil.success("获取文件信息列表");
         return edDataFacade.getDataInfoList(request);
     }
 
 
+    @ApiOperation(value = "更新文件占用状态",notes = "")
+    @RequestMapping(value = "/updateFileStatus",method = RequestMethod.POST)
+    public ElectromagneticResult<?> updateFileStatus(@RequestBody EDDataRequest request){
+        return edDataFacade.updateFileStatus(request);
+    }
+
+
     @ApiOperation(value = "上传",notes = "")
     @RequestMapping(value = "/upload",method = RequestMethod.POST)
     public ElectromagneticResult<?> upload(@RequestBody EDDataRequest request){
-        //return ElectromagneticResultUtil.success("上传");
         return edDataFacade.upload(request);
     }
 
@@ -46,7 +50,6 @@ public class EDDataController {
     @ApiOperation(value = "下载",notes = "")
     @RequestMapping(value = "/download",method = RequestMethod.POST)
     public ElectromagneticResult<?> download(@RequestBody EDDataRequest request){
-        //return ElectromagneticResultUtil.success("下载");
         return edDataFacade.download(request);
     }
 

bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/user/UserController.java

@@ -6,7 +6,10 @@ import com.electromagnetic.industry.software.data.manage.request.user.UserReques
 import electromagnetic.data.framework.share.result.BaseResult;
 import electromagnetic.data.framework.share.result.LoginResult;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 

bootstrap/src/main/resources/application.properties

@@ -15,9 +15,9 @@ 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://localhost:3306/mydatabase?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
-spring.datasource.username=comac
+spring.datasource.username=root
-spring.datasource.password=2024*Comac
+spring.datasource.password=123456
 
 
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/model/EDDataPage.java

@@ -7,7 +7,6 @@ import com.github.pagehelper.PageInfo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 分页综合返回

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/parames/EDDataParams.java

@@ -3,7 +3,6 @@ package com.electromagnetic.industry.software.data.manage.domain.boardservice.in
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 @Data
 public class EDDataParams implements Serializable {
@@ -32,4 +31,8 @@ public class EDDataParams implements Serializable {
      * 文件数据编码
      */
     private String dataId;
+    /**
+     * 文件数据状态
+     */
+    private String dataStatus;
 }

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

@@ -4,14 +4,9 @@
 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
@@ -20,7 +15,7 @@ public interface EDDataRepository {
 
     /**
      * 创建文件夹
-     * @param parames
+     * @param edDataInfo
      * @return
      */
     Boolean createFolder(EDDataInfo edDataInfo);
@@ -32,6 +27,13 @@ public interface EDDataRepository {
      */
     PageInfo<EDDataInfo> getDataInfoList(EDDataParams parames);
 
+    /**
+     * 更新文件占用状态
+     * @param parames
+     * @return
+     */
+    Boolean updateFileStatus(EDDataParams parames);
+
     /**
      * 上传
      * @param parames

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

@@ -1,15 +1,8 @@
 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.EDDataPage;
 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.request.indicator.EDDataRequest;
-import electromagnetic.data.framework.share.model.ElectromagneticResult;
-import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
-
-import java.util.List;
 
 public interface EDDataService {
 
@@ -27,6 +20,13 @@ public interface EDDataService {
      */
     EDDataPage getDataInfoList(EDDataParams parames);
 
+    /**
+     * 更新文件占用状态
+     * @param parames
+     * @return
+     */
+    Boolean updateFileStatus(EDDataParams parames);
+
     /**
      * 上传
      * @param parames

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

@@ -3,28 +3,18 @@
  */
 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.IndicatorCardHomeDisplayEnum;
-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.EDDataPage;
 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
@@ -41,7 +31,7 @@ public class EDDataServiceImpl implements EDDataService {
 
     /**
      * 创建文件夹
-     * @param parames
+     * @param edDataInfo
      * @return
      */
     public Boolean createFolder(EDDataInfo edDataInfo)
@@ -64,6 +54,17 @@ public class EDDataServiceImpl implements EDDataService {
         return edDataPage;
     }
 
+    /**
+     * 更新文件占用状态
+     * @param parames
+     * @return
+     */
+    public Boolean updateFileStatus(EDDataParams parames)
+    {
+        edDataRepository.updateFileStatus(parames);
+        return Boolean.TRUE;
+    }
+
     /**
      * 上传
      * @param parames

electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/config/DefaultValidationTool.java

@@ -10,18 +10,17 @@ import electromagnetic.data.framework.share.util.Functions;
 import electromagnetic.data.framework.share.util.Results;
 import electromagnetic.data.framework.share.validation.ValidationResult;
 import electromagnetic.data.framework.share.validation.ValidationTool;
-import electromagnetic.data.framework.share.util.*;
 import org.hibernate.validator.HibernateValidator;
 import org.hibernate.validator.HibernateValidatorConfiguration;
 import org.springframework.beans.factory.InitializingBean;
 
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
+import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
 import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
-import javax.validation.Validator;
 
 /**
  * 默认的验证工具实现，支持函数化的编程方式

electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/config/ValidationToolAutoConfiguration.java

@@ -3,9 +3,9 @@
  */
 package electromagnetic.data.framework.share.config;
 
+import electromagnetic.data.framework.share.util.DefaultSimpleValidationTool;
 import electromagnetic.data.framework.share.validation.SimpleValidationTool;
 import electromagnetic.data.framework.share.validation.ValidationTool;
-import electromagnetic.data.framework.share.util.DefaultSimpleValidationTool;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/log/ServiceResultHandleUtil.java

@@ -8,11 +8,11 @@ import electromagnetic.data.framework.share.enums.ElectromagneticCommonErrorEnum
 import electromagnetic.data.framework.share.enums.ElectromagneticSceneIncidentEnum;
 import electromagnetic.data.framework.share.exception.BizRuntimeException;
 import electromagnetic.data.framework.share.exception.ElectromagneticBizRuntimeException;
+import electromagnetic.data.framework.share.exception.IllegalParameterException;
 import electromagnetic.data.framework.share.model.ElectromagneticPaginationResult;
 import electromagnetic.data.framework.share.model.ElectromagneticResult;
 import electromagnetic.data.framework.share.model.PageModel;
 import electromagnetic.data.framework.share.result.CallbackResult;
-import electromagnetic.data.framework.share.exception.IllegalParameterException;
 
 import javax.xml.bind.ValidationException;
 import java.util.Optional;

electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/util/DefaultSimpleValidationTool.java

@@ -3,9 +3,9 @@
  */
 package electromagnetic.data.framework.share.util;
 
+import electromagnetic.data.framework.share.exception.IllegalParameterException;
 import electromagnetic.data.framework.share.validation.SimpleValidationTool;
 import electromagnetic.data.framework.share.validation.ValidationTool;
-import electromagnetic.data.framework.share.exception.IllegalParameterException;
 
 /**
  * @author wsk

electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/validation/config/ElectromagneticValidationToolAutoConfiguration.java

@@ -4,10 +4,10 @@
 package electromagnetic.data.framework.share.validation.config;
 
 
-import electromagnetic.data.framework.share.validation.ValidationTool;
 import electromagnetic.data.framework.share.config.DefaultValidationTool;
 import electromagnetic.data.framework.share.config.ValidationToolAutoConfiguration;
 import electromagnetic.data.framework.share.validation.ElectromagneticSimpleValidationTool;
+import electromagnetic.data.framework.share.validation.ValidationTool;
 import electromagnetic.data.framework.share.validation.impl.ElectromagneticSimpleValidationToolImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/validation/impl/ElectromagneticSimpleValidationToolImpl.java

@@ -4,9 +4,9 @@
 package electromagnetic.data.framework.share.validation.impl;
 
 
-import electromagnetic.data.framework.share.validation.ValidationTool;
 import electromagnetic.data.framework.share.exception.IllegalParameterException;
 import electromagnetic.data.framework.share.validation.ElectromagneticSimpleValidationTool;
+import electromagnetic.data.framework.share.validation.ValidationTool;
 
 /**
  */

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

@@ -4,9 +4,6 @@ import com.electromagnetic.industry.software.data.manage.request.indicator.EDDat
 import com.electromagnetic.industry.software.data.manage.response.indicator.EDDataPageResponse;
 import electromagnetic.data.framework.share.model.ElectromagneticResult;
 
-import java.util.List;
-import java.util.Map;
-
 public interface EDDataFacade {
 
     /**
@@ -24,6 +21,13 @@ public interface EDDataFacade {
      */
     ElectromagneticResult<EDDataPageResponse> getDataInfoList(EDDataRequest request);
 
+    /**
+     * 更新文件占用状态
+     * @param request
+     * @return
+     */
+    ElectromagneticResult<Boolean> updateFileStatus(EDDataRequest request);
+
     /**
      * 上传
      * @param request

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

@@ -4,12 +4,11 @@
 package com.electromagnetic.industry.software.data.manage.facade;
 
 
-
-import electromagnetic.data.framework.share.model.ElectromagneticResult;
 import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorCardRequest;
 import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorDataRequest;
 import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardDetailReponse;
 import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardPageResponse;
+import electromagnetic.data.framework.share.model.ElectromagneticResult;
 
 import java.util.List;
 import java.util.Map;

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

@@ -3,8 +3,6 @@ package com.electromagnetic.industry.software.data.manage.request.indicator;
 import electromagnetic.data.framework.share.model.BaseRequest;
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class EDDataRequest extends BaseRequest {
 
@@ -24,10 +22,6 @@ public class EDDataRequest extends BaseRequest {
      * 文件夹名称
      */
     private String name;
-    /**
-     * 文件夹名称
-     */
-    private String fileName;
     /**
      * 关键词
      */
@@ -36,4 +30,8 @@ public class EDDataRequest extends BaseRequest {
      * 文件数据编码
      */
     private String dataId;
+    /**
+     * 文件数据状态
+     */
+    private String dataStatus;
 }

facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/indicator/EDDataPageResponse.java

@@ -8,7 +8,6 @@ import com.github.pagehelper.PageInfo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author
@@ -20,5 +19,5 @@ public class EDDataPageResponse implements Serializable {
     /**
      * 指电磁数据-文件信息数据
      */
-    private PageInfo<EDDataResponse> edDataPage;
+    private PageInfo<EDDataResponse> edDataInfo;
 }

infrastructure/common/src/main/java/com/electromagnetic/industry/software/data/manage/repository/ObMybatisConfig.java

@@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.core.JdbcTemplate;

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

@@ -1,11 +1,7 @@
 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 com.github.pagehelper.PageInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -14,11 +10,11 @@ import java.util.List;
 public interface EDDataMapper {
 
     /**
-     * 创建文件夹
+     * 创建文件/文件夹数据信息
      * @param edDataInfo
      * @return
      */
-    Boolean createFolder(EDDataInfo edDataInfo);
+    Boolean createDataInfo(EDDataInfo edDataInfo);
 
     /**
      * 获取文件信息列表
@@ -28,17 +24,11 @@ public interface EDDataMapper {
     List<EDDataInfo> getDataInfoList(EDDataParams parames);
 
     /**
-     * 上传
+     * 更新文件占用状态
      * @param parames
      * @return
      */
-    Boolean upload(EDDataParams parames);
+    Boolean updateFileStatus(EDDataParams parames);
 
-    /**
-     * 下载
-     * @param parames
-     * @return
-     */
-    Boolean download(EDDataParams parames);
 
 }

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

@@ -4,10 +4,7 @@
 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;
@@ -36,7 +33,7 @@ public class EDDataRepositoryImpl implements EDDataRepository {
     @Override
     public Boolean createFolder(EDDataInfo edDataInfo)
     {
-        return edDataMapper.createFolder(edDataInfo);
+        return edDataMapper.createDataInfo(edDataInfo);
     }
 
     /**
@@ -52,6 +49,17 @@ public class EDDataRepositoryImpl implements EDDataRepository {
         return new PageInfo<>(edDataInfoList);
     }
 
+    /**
+     * 更新文件占用状态
+     * @param parames
+     * @return
+     */
+    @Override
+    public Boolean updateFileStatus(EDDataParams parames)
+    {
+        return edDataMapper.updateFileStatus(parames);
+    }
+
     /**
      * 上传
      * @param parames
@@ -60,7 +68,9 @@ public class EDDataRepositoryImpl implements EDDataRepository {
     @Override
     public Boolean upload(EDDataParams parames)
     {
-        return edDataMapper.upload(parames);
+        //return edDataMapper.upload(parames);
+        //edDataMapper.createDataInfo(edDataInfo);
+        return Boolean.TRUE;
     }
 
     /**
@@ -71,7 +81,8 @@ public class EDDataRepositoryImpl implements EDDataRepository {
     @Override
     public Boolean download(EDDataParams parames)
     {
-        return edDataMapper.download(parames);
+        //return edDataMapper.download(parames);
+        return Boolean.TRUE;
     }
 
 

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

@@ -0,0 +1,83 @@
+<?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.EDDataMapper">
+
+  <resultMap id="BaseResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="category_id" jdbcType="VARCHAR" property="categoryId" />
+    <result column="data_id" jdbcType="VARCHAR" property="dataId" />
+    <result column="data_no" jdbcType="VARCHAR" property="dataNo" />
+    <result column="data_name" jdbcType="VARCHAR" property="dataName" />
+    <result column="data_type" jdbcType="VARCHAR" property="dataType" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="implant_json" jdbcType="VARCHAR" property="implantJson" />
+    <result column="data_status" jdbcType="VARCHAR" property="dataStatus" />
+    <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>
+  <sql id="Base_Column_list">
+    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
+  </sql>
+
+
+  <insert id="createDataInfo" 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>
+
+  <select id="getDataInfoList" resultMap="BaseResultMap"
+          parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams">
+    SELECT
+    <include refid="Base_Column_list"/>
+    FROM
+    ed_data_info
+    where
+      effect_flag = 1
+      <if test="parentId!=null and parentId!=''">
+        and category_id='${parentId}'
+      </if>
+      <if test="keyWord!=null and keyWord!=''">
+        and data_name LIKE '%${keyWord}%'
+      </if>
+    GROUP BY id
+    order by gmt_modified asc
+  </select>
+
+  <update id="updateFileStatus" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams">
+    update ed_data_info
+    <set>
+      <if test="dataStatus != null and dataStatus!=''">
+        data_status = #{dataStatus,jdbcType=VARCHAR},
+      </if>
+      gmt_modified = now()
+    </set>
+    where data_id = #{dataId,jdbcType=VARCHAR} and effect_flag = 1
+  </update>
+
+</mapper>
+

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

@@ -1,61 +1,6 @@
 <?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.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>
-<select id="getDataInfoList" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams">
-  SELECT
-  data.id,
-  data.category_id,
-  data.data_id,
-  data.data_no,
-  data.data_name,
-  data.data_type,
-  data.file_type,
-  data.version,
-  data.content,
-  data.implant_json,
-  data.data_status,
-  data.creator, card.creator_name, card.gmt_create, card.modifier,
-  data.modifier_name,card.gmt_modified,card.effect_flag
-  FROM
-  ed_data_info data
-  <where>
-    data.effect_flag = 1
-    <if test="parentId!=null and parentId!=''">
-      and data.category_id='${parentId}'
-    </if>
-    <if test="keyWord!=null and keyWord!=''">
-      and data.data_name LIKE '%${keyWord}%'
-    </if>
-  </where>
-  GROUP BY data.id
-  order by data.gmt_modified asc
-</select>
-
-
-</mapper>
-
-<!--
 <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" />
@@ -252,4 +197,3 @@
   </foreach>
 </update>
 </mapper>
- -->

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

@@ -8,10 +8,9 @@ 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.response.indicator.EDDataPageResponse;
 import com.electromagnetic.industry.software.data.manage.service.mappers.EDDataMappers;
-import com.electromagnetic.industry.software.data.manage.service.mappers.IndicatorCardMappers;
+import electromagnetic.data.framework.share.id.IdWorker;
 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;
@@ -22,24 +21,6 @@ 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
@@ -88,6 +69,20 @@ public class EDDataFacadeImpl implements EDDataFacade {
         return ElectromagneticResultUtil.success(edDataPageResponse);
     }
 
+    /**
+     * 更新文件占用状态
+     * WISDOM_UPDATE_FILESTATUS
+     * /data/ed/file/updateFileStatus
+     * @param request
+     * @return
+     */
+    public ElectromagneticResult<Boolean> updateFileStatus(EDDataRequest request)
+    {
+        EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request);
+        edDataService.updateFileStatus(parames);
+        return ElectromagneticResultUtil.success(Boolean.TRUE);
+    }
+
     /**
      * 上传
      * WISDOM_UPLOAD

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

@@ -3,13 +3,13 @@
  */
 package com.electromagnetic.industry.software.data.manage.service.facade;
 
-import com.electromagnetic.industry.software.data.manage.facade.IndicatorCardFacade;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.Indicator;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardDetial;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardPage;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.IndicatorCardService;
+import com.electromagnetic.industry.software.data.manage.facade.IndicatorCardFacade;
 import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorCardRequest;
 import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorDataRequest;
 import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardDetailReponse;

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

@@ -10,8 +10,6 @@ import com.electromagnetic.industry.software.data.manage.request.user.UserReques
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
-import java.util.List;
-
 /**
  * 用户模型转换
  * @author szt