登出接口

.gitignore

@@ -24,3 +24,5 @@ hs_err_pid*
 
 .vs
 .idea
+*.iml
+**/target/

bootstrap/pom.xml

@@ -149,9 +149,8 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>2.1.13.RELEASE</version>
                 <configuration>
-                    <!-- executable fat jar -->
+                    <jvmArguments>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7087</jvmArguments>
-                    <outputDirectory>../target</outputDirectory>
+                    <executable>true</executable>
-<!--                    <classifier>executable</classifier>-->
                 </configuration>
                 <executions>
                     <execution>
@@ -161,6 +160,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
 
     </build>

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

@@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 
 @RequestMapping("/data/ed/file")

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

@@ -1,18 +1,13 @@
 package com.electromagnetic.industry.software.data.manage.controller.user;
 
 import com.electromagnetic.industry.software.data.manage.facade.user.UserFacade;
-import com.electromagnetic.industry.software.data.manage.request.user.GetSingleUserRequest;
-import com.electromagnetic.industry.software.data.manage.request.user.UserModiRequest;
-import com.electromagnetic.industry.software.data.manage.request.user.UserPublishRequest;
-import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
-import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
-import electromagnetic.data.framework.share.model.ElectromagneticResult;
 import com.electromagnetic.industry.software.data.manage.request.user.*;
+import electromagnetic.data.framework.share.model.ElectromagneticResult;
 import io.swagger.annotations.ApiOperation;
-import jdk.internal.org.objectweb.asm.tree.analysis.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 @RequestMapping("/data/ed/user")
 @RestController
@@ -66,4 +61,10 @@ public class UserController {
     public ElectromagneticResult<?> deleteUser(@RequestBody UserDeleteRequest userDeleteRequest) {
         return userFacade.deleteUser(userDeleteRequest);
     }
+
+    @ApiOperation(value="登出", notes = "")
+    @RequestMapping(value = "/logout", method = RequestMethod.POST)
+    public ElectromagneticResult<?> logout(@RequestHeader("Authorization") String token) {
+        return userFacade.logout(token);
+    }
 }

bootstrap/src/main/resources/application-test.properties

@@ -0,0 +1,28 @@
+#required
+spring.application.name=electromagnetic-data
+
+spring.profiles.active=test
+# security
+run.mode=NORMAL
+com.alipay.env=shared
+#log
+logging.path=./logs
+loggerPath=electromagnetic-data
+logging.level.com.aliyun.fsi.insurance=${LOG_LEVEL:INFO}
+#日志配置
+logging.config=classpath:${LOG_CONFIG:log4j2-spring.xml}
+
+
+spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.url=jdbc:mysql://127.0.0.1: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
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+mybatis.mapper-locations=classpath:sqlmapper/*.xml
+pagehelper.helperDialect=mysql
+pagehelper.reasonable=false
+server.port=8888
+

bootstrap/src/main/resources/application.properties

@@ -15,7 +15,7 @@ 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://139.224.43.89: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
 

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

@@ -5,7 +5,6 @@ package com.electromagnetic.industry.software.data.manage.domain.boardservice.in
 
 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.github.pagehelper.PageInfo;
 
 import java.util.List;
 

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

@@ -3,7 +3,6 @@
  */
 package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.impl;
 
-import cn.hutool.poi.excel.cell.CellSetter;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataPage;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/params/PublishParam.java

@@ -1,9 +1,9 @@
 package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params;
 
-import java.util.List;
-
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class PublishParam {
     private static final long serialVersionUID = 1L;

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/params/UserDeleteKeyWords.java

@@ -2,8 +2,6 @@ package com.electromagnetic.industry.software.data.manage.domain.boardservice.us
 
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class UserDeleteKeyWords {
 

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/repository/CategoryRepository.java

@@ -15,4 +15,19 @@ public interface CategoryRepository {
      * 获取所有节点
      */
     List<Category> getAllCategories();
+
+    /**
+     * 获取节点通过编码ID
+     * @param category
+     * @return
+     */
+    List<Category> selectCategories(Category category);
+
+    /**
+     * 获取子节点通过父ID
+     * @param category
+     * @return
+     */
+    List<Category> selectChildCategories(Category category);
+
 }

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/repository/TokenRepository.java

@@ -17,4 +17,11 @@ public interface TokenRepository {
      * @return
      */
     public Token selectToken(String token);
+
+    /**
+     * 删除令牌
+     * @param token
+     * @return
+     */
+    public int deleteToken(String token);
 }

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/repository/UserRepository.java

@@ -1,8 +1,8 @@
 package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.repository;
 
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
-import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
 
 import java.util.List;

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/CategoryService.java

@@ -11,4 +11,32 @@ public interface CategoryService {
      */
     public List<Category> buildCategoryTree();
 
+    /**
+     * 获取所有节点
+     * @return
+     */
+    List<Category> selectAllCategories();
+
+    /**
+     * 获取节点通过编码ID
+     * @param category
+     * @return
+     */
+    List<Category> selectCategories(Category category);
+
+    /**
+     * 获取子节点通过父ID
+     * @param category
+     * @return
+     */
+    List<Category> selectChildCategories(Category category);
+
+    /**
+     * 获取 指定节点的 父节点 从所有节点数组中
+     * @param categoryId
+     * @param categoryList
+     * @return
+     */
+    Category getParentCategories(String categoryId, List<Category> categoryList);
+
 }

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/TokenService.java

@@ -24,4 +24,9 @@ public interface TokenService {
      * 查看token是否有效
      */
     public Boolean isTokenValid(String tokenStr);
+
+    /**
+     * 删除token
+     */
+    public int deleteToken(String tokenStr);
 }

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/UserService.java

@@ -1,8 +1,8 @@
 package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service;
 
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
-import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
 
 import java.util.List;

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/CategoryServiceImpl.java

@@ -80,4 +80,55 @@ public class CategoryServiceImpl implements CategoryService {
     private boolean hasChild(List<Category> list, Category category) {
         return !getChildList(list, category).isEmpty();
     }
+
+    /**
+     * 获取所有节点
+     * @return
+     */
+    public List<Category> selectAllCategories() { return categoryRepository.getAllCategories(); }
+
+    /**
+     * 获取节点通过编码ID
+     * @param category
+     * @return
+     */
+    public List<Category> selectCategories(Category category) { return categoryRepository.selectCategories(category); }
+
+    /**
+     * 获取子节点通过父ID
+     * @param category
+     * @return
+     */
+    public List<Category> selectChildCategories(Category category) { return categoryRepository.selectChildCategories(category); }
+
+    /**
+     * 获取 指定节点的 父节点 从所有节点数组中
+     * @param categoryId
+     * @param categoryList
+     * @return
+     */
+    public Category getParentCategories(String categoryId, List<Category> categoryList)
+    {
+        Category category = null;
+        Category categoryParent = null;
+        for(Category iter : categoryList)
+        {
+            if(category == null && iter.getCategoryId().equals(categoryId))
+            {
+                category = iter;
+                break;
+            }
+        }
+        for(Category iter : categoryList)
+        {
+            if(categoryParent == null && iter.getCategoryId().equals(category.getParentId()))
+            {
+                categoryParent = iter;
+                break;
+            }
+        }
+
+        return categoryParent;
+    }
+
 }

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/TokenServiceImpl.java

@@ -71,4 +71,12 @@ public class TokenServiceImpl implements TokenService {
         }
         return false;
     }
+
+    /**
+     * 删除token
+     */
+    @Override
+    public int deleteToken(String tokenStr){
+        return tokenRepository.deleteToken(tokenStr);
+    }
 }

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/UserServiceImpl.java

@@ -1,10 +1,10 @@
 package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.impl;
 
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.EffectFlagEnum;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.enums.PublishEnum;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
-import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.repository.UserRepository;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.UserService;
@@ -13,10 +13,9 @@ import electromagnetic.data.framework.share.util.SignUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import java.util.List;
-import java.lang.String;
-import javax.annotation.Resource;
 
+import javax.annotation.Resource;
+import java.util.List;
 import static cn.hutool.core.date.DateTime.now;
 
 @Service

electromagnetic-framework/src/main/java/electromagnetic/data/framework/share/sign/AESUtils.java

@@ -8,14 +8,15 @@ package electromagnetic.data.framework.share.sign;
  * @version $Id: AESUtils.java, v 0.1 2022-07-06 14:57
  */
 
+import org.apache.tomcat.util.codec.binary.Base64;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
 import javax.crypto.*;
 import javax.crypto.spec.SecretKeySpec;
 import java.io.UnsupportedEncodingException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.apache.tomcat.util.codec.binary.Base64;
 import java.security.Security;
 
 /**

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

@@ -1,6 +1,5 @@
 package com.electromagnetic.industry.software.data.manage.facade.Category;
 
-import java.util.List;
 import electromagnetic.data.framework.share.model.ElectromagneticResult;
 
 public interface CategoryFacade {

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

@@ -1,12 +1,9 @@
 package com.electromagnetic.industry.software.data.manage.facade.user;
 
-import com.electromagnetic.industry.software.data.manage.request.user.GetSingleUserRequest;
-import com.electromagnetic.industry.software.data.manage.request.user.UserModiRequest;
-import com.electromagnetic.industry.software.data.manage.request.user.UserPublishRequest;
-import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
-import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
-import electromagnetic.data.framework.share.model.ElectromagneticResult;
 import com.electromagnetic.industry.software.data.manage.request.user.*;
+import electromagnetic.data.framework.share.model.ElectromagneticResult;
+
+import javax.servlet.http.HttpServletRequest;
 
 public interface UserFacade {
 
@@ -66,4 +63,11 @@ public interface UserFacade {
      * @return
      */
     ElectromagneticResult<?> deleteUser(UserDeleteRequest userDeleteRequest);
+
+    /**
+     * 用户登出
+     * @param token
+     * @return
+     */
+    ElectromagneticResult<?> logout(String token);
 }

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

@@ -1,8 +1,8 @@
 package com.electromagnetic.industry.software.data.manage.request.indicator;
 
-import org.springframework.web.multipart.MultipartFile;
 import electromagnetic.data.framework.share.model.BaseRequest;
 import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Date;
 

facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/GetSingleUserRequest.java

@@ -1,6 +1,5 @@
 package com.electromagnetic.industry.software.data.manage.request.user;
 
-import cn.hutool.core.date.DateTime;
 import electromagnetic.data.framework.share.model.BaseRequest;
 import lombok.Data;
 

facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserDeleteRequest.java

@@ -1,11 +1,9 @@
 package com.electromagnetic.industry.software.data.manage.request.user;
 
-import cn.hutool.core.date.DateTime;
 import electromagnetic.data.framework.share.model.BaseRequest;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 @Data

facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserPublishRequest.java

@@ -1,11 +1,9 @@
 package com.electromagnetic.industry.software.data.manage.request.user;
 
-import cn.hutool.core.date.DateTime;
 import electromagnetic.data.framework.share.model.BaseRequest;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 

facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserWorkNumRequest.java

@@ -1,11 +1,9 @@
 package com.electromagnetic.industry.software.data.manage.request.user;
 
-import cn.hutool.core.date.DateTime;
 import electromagnetic.data.framework.share.model.BaseRequest;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 @Data

facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/user/UserSearchResponse.java

@@ -4,7 +4,6 @@
 package com.electromagnetic.industry.software.data.manage.response.user;
 
 import lombok.Data;
-import org.apache.catalina.User;
 
 import java.io.Serializable;
 import java.util.List;

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

@@ -19,4 +19,16 @@ public interface CategoryMapper {
      * @return
      */
     List<Category> selectAllCategories();
+
+    /**
+     * 获取节点通过编码ID
+     * @return
+     */
+    List<Category> selectCategories(Category category);
+
+    /**
+     * 获取子节点通过父ID
+     * @return
+     */
+    List<Category> selectChildCategories(Category category);
 }

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

@@ -2,8 +2,6 @@ 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.parames.EDDataParams;
-import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
-import electromagnetic.data.framework.share.model.ElectromagneticResult;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

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

@@ -19,4 +19,11 @@ public interface TokenMapper {
      * @return Token
      */
     Token selectToken(String token);
+
+    /**
+     * 删除token
+     * @param token
+     * @return
+     */
+    int deleteToken(String token);
 }

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

@@ -1,8 +1,8 @@
 package com.electromagnetic.industry.software.data.manage.repository.dao;
 
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
-import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
 import org.apache.ibatis.annotations.Mapper;
 

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

@@ -26,8 +26,22 @@ public class CategoryRepositoryImpl implements CategoryRepository {
      * 获取所有节点
      */
     @Override
-    public List<Category> getAllCategories(){
+    public List<Category> getAllCategories() { return categoryMapper.selectAllCategories(); }
-        return categoryMapper.selectAllCategories();
+
-    }
+    /**
+     * 获取节点通过编码ID
+     * @param category
+     * @return
+     */
+    @Override
+    public List<Category> selectCategories(Category category) { return categoryMapper.selectCategories(category); }
+
+    /**
+     * 获取子节点通过父ID
+     * @param category
+     * @return
+     */
+    @Override
+    public List<Category> selectChildCategories(Category category) { return categoryMapper.selectChildCategories(category); }
 
 }

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

@@ -7,8 +7,6 @@ import com.electromagnetic.industry.software.data.manage.domain.boardservice.ind
 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.repository.dao.EDDataMapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;

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

@@ -30,4 +30,12 @@ public class TokenRepositoryImpl implements TokenRepository {
      */
     @Override
     public Token selectToken(String token) {return tokenMapper.selectToken(token);}
+
+    /**
+     * 删除令牌
+     * @param token
+     * @return
+     */
+    @Override
+    public int deleteToken(String token) {return tokenMapper.deleteToken(token);};
 }

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

@@ -4,16 +4,16 @@
 package com.electromagnetic.industry.software.data.manage.repository.impl;
 
 
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
-import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.repository.UserRepository;
 import com.electromagnetic.industry.software.data.manage.repository.dao.UserMapper;
 import org.springframework.stereotype.Repository;
-import java.util.List;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Repository
 public class UserRepositoryImpl implements UserRepository {

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

@@ -32,4 +32,17 @@
         <include refid="selectUserVo" />
         where category_status="available"
     </select>
+
+    <select id="selectCategories" resultMap="CategoryResultMap"
+            parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.category.model.Category">
+        <include refid="selectUserVo" />
+        where category_id = categoryId and category_status="available"
+    </select>
+
+    <select id="selectChildCategories" resultMap="CategoryResultMap"
+            parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.category.model.Category">
+        <include refid="selectUserVo" />
+        where parent_id = parentId and category_status="available"
+    </select>
+
 </mapper>

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

@@ -36,4 +36,8 @@
         where token=#{token}
     </select>
 
+    <delete id="deleteToken" parameterType="String">
+        delete from tokens where token=#{token}
+    </delete>
+
 </mapper>

pom.xml

@@ -257,89 +257,78 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
+                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <artifactId>maven-resources-plugin</artifactId>
                 <configuration>
-                    <includeSystemScope>true</includeSystemScope>
+                    <nonFilteredFileExtensions>
-
+                        <nonFilteredFileExtension>ico</nonFilteredFileExtension>
-                    <mainClass>none</mainClass>     <!-- 取消查找本项目下的Main方法：为了解决Unable to find main class的问题 -->
+                        <nonFilteredFileExtension>eot</nonFilteredFileExtension>
-                    <classifier>execute</classifier>    <!-- 为了解决依赖模块找不到此模块中的类或属性 -->
+                        <nonFilteredFileExtension>svg</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>woff</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>tag</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
                 </configuration>
-                <executions>
+            </plugin>
-                    <execution>
+            <!--<plugin>-->
-                        <goals>
+            <!--<groupId>org.springframework.boot</groupId>-->
-                            <goal>repackage</goal>
+            <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
-                        </goals>
+            <!--<configuration>-->
-                    </execution>
+            <!--<fork>true</fork>-->
-                </executions>
+            <!--</configuration>-->
+            <!--</plugin>-->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.0.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.2</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                    <!-- 添加引入本地jar组件 -->
-                    <!-- <compilerArguments>
-                         <extdirs>D:/code/tool/dataplatform-tool-parent/lib/dingtalk-1.0.0.jar</extdirs>
-                     </compilerArguments>-->
-                    <!--<compilerArgs>
-                        <arg>-extdirs</arg>
-                        <arg>${project.basedir}/lib/</arg>
-                    </compilerArgs>-->
-                </configuration>
-
-            </plugin>
-            <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.5</version>
                 <configuration>
-                    <encoding>UTF-8</encoding>
+                    <delimiters>
-                </configuration>
+                        <delimiter>@</delimiter>
-                <executions>
+                    </delimiters>
-                    <execution>
+                    <useDefaultDelimiters>true</useDefaultDelimiters>
-                        <configuration>
-                            <!--                            <dataFile>target/jacoco.exec</dataFile>-->
-
-                            <outputDirectory>/usr/src/target</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-
-            </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.7</version>
-                <configuration>
-                    <instrumentation>
-                        <excludes>
-                            <exclude>**/*DO.class</exclude>
-                            <exclude>**/*Config.class</exclude>
-                            <exclude>**/*Param.class</exclude>
-                            <exclude>**/*Enum.class</exclude>
-                        </excludes>
-                    </instrumentation>
-                    <check/>
                 </configuration>
             </plugin>
-
         </plugins>
-
+        <resources>
+            <resource>
+                <directory>src/main/webapp</directory>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.btl</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>static/**</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>static/**</include>
+                </includes>
+            </resource>
+        </resources>
     </build>
 
 </project>

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

@@ -2,10 +2,12 @@ package com.electromagnetic.industry.software.data.manage.service.facade;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.category.model.Category;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
 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.service.EDDataService;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.CategoryService;
 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;
@@ -22,13 +24,17 @@ import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class EDDataFacadeImpl implements EDDataFacade {
 
     @Resource
     private EDDataService edDataService;
+    private CategoryService categoryService;
 
     /**
      * 创建文件夹
@@ -59,7 +65,7 @@ public class EDDataFacadeImpl implements EDDataFacade {
         edDataInfo.setNote(request.getNote());
 
         edDataInfo.setDataId(IdWorker.getSnowFlakeIdString());
-        edDataInfo.setDataNo(IdWorker.getSnowFlakeIdString());
+        edDataInfo.setDataNo(edDataInfo.getDataId());
         edDataInfo.setDataType("folder");
         edDataInfo.setVersion("1.0.0");
         edDataInfo.setDataStatus("publish");
@@ -228,7 +234,8 @@ public class EDDataFacadeImpl implements EDDataFacade {
             // 文件保存目录路径
             String fileSavePath = storageDirectory + "/" + parentFolderPath;
             String treeName = "目录树名称";
-            String newFileName = treeName + "," + parentFolderName + "," + fileFullName;
+            //String newFileName = treeName + "," + parentFolderName + "," + fileFullName;
+            String newFileName = fileFullName;
 
             // 文件数据信息写到数据库
             {
@@ -253,7 +260,7 @@ public class EDDataFacadeImpl implements EDDataFacade {
                 edDataInfo.setGmtBatchUpload(request.getGmtBatchUpload());
 
                 edDataInfo.setDataId(IdWorker.getSnowFlakeIdString());
-                edDataInfo.setDataNo(IdWorker.getSnowFlakeIdString());
+                edDataInfo.setDataNo(edDataInfo.getDataId());
                 edDataInfo.setDataType("file");
                 edDataInfo.setVersion("1.0.0");
                 edDataInfo.setDataStatus("publish");
@@ -267,7 +274,7 @@ public class EDDataFacadeImpl implements EDDataFacade {
                 boolean isSuccess = edDataService.createDataInfo(edDataInfo);
 
                 String userHome = System.getProperty("user.home");
-                File cacheDirectory = new File(userHome + "\\AppData\\Local\\Temp\\EDData");
+                File cacheDirectory = new File(userHome + "\\AppData\\Local\\Temp\\EDData\\Upload");
                 if (!cacheDirectory.exists()) {
                     cacheDirectory.mkdirs();
                 }
@@ -358,6 +365,70 @@ public class EDDataFacadeImpl implements EDDataFacade {
         //2、循环list将每个文件复制到新建目录并进行重命名，命名规则：目录树编码+,+文件夹编码（有则填写无则为空）+,+文件编码
         //3、打包新建为zip，并根据生产下载地址（域名+文件路径+文件）
         //4、返回前端下载的地址
+
+        // **********在导出的过程中可能会出现有用户上传文件的情况
+
+        // 获取目录编码ID
+        String categoryId = request.getParentId();
+
+        // 获取缓存文件夹的绝对路径
+        String userHome = System.getProperty("user.home");
+        File cacheDirectory = new File(userHome + "\\AppData\\Local\\Temp\\EDData\\Export");
+        if (!cacheDirectory.exists()) {
+            cacheDirectory.mkdirs();
+        }
+
+        String cacheFolder = cacheDirectory.getAbsolutePath(); // 缓存文件夹的绝对路径
+
+
+        List<Category> categoryList = categoryService.selectAllCategories();
+
+        {
+            // 遍历客户端上传的
+            EDDataParams folderParames = new EDDataParams();
+            for (String dataId : request.getDataIdArr()) {
+                Category category = new Category();
+                category.setCategoryId(dataId);
+                categoryService.selectCategories(category);
+
+                //folderParames.setDataId(dataId);
+                //EDDataInfo edDataInfo = edDataService.getDataInfo(folderParames);
+                //if(edDataInfo != null)
+                //{
+                //    JSONObject implantJsonObject = JSON.parseObject(edDataInfo.getImplantJson());
+                //    String filePath = implantJsonObject.getString("folderPath");
+                //    filePath = storageDirectory + "/" + filePath + "/" + edDataInfo.getDataName();
+                //    dataPathArr.add(filePath);
+                //}
+            }
+        }
+
+
+        String parentFolderPath = "";   //上级文件夹路径
+        String parentFolderIdPath = ""; //上级文件夹ID路径
+        String parentFolderName = "";   //上级文件夹名称
+
+        // 获取上级文件夹路径
+        {
+            EDDataParams folderParames = new EDDataParams();
+            folderParames.setDataId(categoryId);
+            EDDataInfo edDataInfoParent = edDataService.getDataInfo(folderParames);
+            if(edDataInfoParent == null) {
+                ElectromagneticResultUtil.fail(HttpStatus.BAD_REQUEST.toString(),"上级文件夹为空！");
+            }
+            JSONObject implantJsonObject = JSON.parseObject(edDataInfoParent.getImplantJson());
+            parentFolderPath = implantJsonObject.getString("folderPath");
+            parentFolderIdPath = implantJsonObject.getString("folderIdPath");
+            if(!parentFolderPath.isEmpty())
+                parentFolderPath += "/" ;
+            if(!parentFolderIdPath.isEmpty())
+                parentFolderIdPath += "/" ;
+            parentFolderPath += edDataInfoParent.getDataName();
+            parentFolderIdPath += edDataInfoParent.getDataId();
+            parentFolderName = edDataInfoParent.getDataName();
+        }
+
+
         return null;
     }
 

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

@@ -11,15 +11,10 @@ import com.electromagnetic.industry.software.data.manage.domain.boardservice.use
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.util.UserConstant;
 import com.electromagnetic.industry.software.data.manage.facade.user.UserFacade;
 import com.electromagnetic.industry.software.data.manage.request.user.*;
-import com.electromagnetic.industry.software.data.manage.request.user.UserModiRequest;
-import com.electromagnetic.industry.software.data.manage.request.user.UserPublishRequest;
-import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
-import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
 import com.electromagnetic.industry.software.data.manage.response.user.SingleUserResponse;
 import com.electromagnetic.industry.software.data.manage.response.user.UserLoginResponse;
 import com.electromagnetic.industry.software.data.manage.response.user.UserSearchResponse;
 import com.electromagnetic.industry.software.data.manage.service.mappers.UserMappers;
-import com.github.pagehelper.PageInfo;
 import electromagnetic.data.framework.share.id.IdWorker;
 import electromagnetic.data.framework.share.model.ElectromagneticResult;
 import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
@@ -29,6 +24,7 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Service
@@ -200,6 +196,14 @@ public class UserFacadeImpl implements UserFacade {
         }
 
     }
-
+    /**
-
+     * 用户登出
+     * @param token
+     * @return
+     */
+    @Override
+    public ElectromagneticResult<?> logout(String token) {
+        token = token.substring(7);
+        return ElectromagneticResultUtil.success(tokenService.deleteToken(token));
+    }
 }

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

@@ -3,15 +3,12 @@
  */
 package com.electromagnetic.industry.software.data.manage.service.mappers;
 
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.UserLoginInfo;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
-import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
-import com.electromagnetic.industry.software.data.manage.request.user.UserModiRequest;
 import com.electromagnetic.industry.software.data.manage.request.user.*;
-import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.UserLoginInfo;
-import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
-import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
 import com.electromagnetic.industry.software.data.manage.response.user.SingleUserResponse;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;