add BaseServer

src/main/java/com/fd/repository/OutputFileRepository.java

@@ -14,7 +14,7 @@ import org.springframework.data.jpa.repository.Query;
  */
 public interface OutputFileRepository extends JpaRepository<OutputFileEntity, Long> {
 
-    OutputFileEntity findByAndAndUploadId(Long uploadId);
+    OutputFileEntity findByUploadId(Long uploadId);
 
     // 条件分页查询
     Page<OutputFileEntity> findByType(String type, Pageable pageable);

src/main/java/com/fd/server/BaseServer.java

@@ -0,0 +1,25 @@
+package com.fd.server;
+
+import com.fd.dto.PageDto;
+import com.fd.entity.FileEntity;
+import com.fd.entity.OutputFileEntity;
+import com.fd.util.R;
+import org.springframework.data.domain.Page;
+
+/**
+ * Created by Owen on 2019/12/19 0019 10:21
+ */
+public interface BaseServer {
+
+    Page<OutputFileEntity> findByList(String type, PageDto param, String token);
+
+    R findByType(String type, PageDto param);
+
+    OutputFileEntity findById(Long fileId);
+
+    FileEntity findByInputFileId(Long fileId);
+
+    FileEntity saveInputFile(FileEntity fileEntity);
+
+
+}

src/main/java/com/fd/server/ModelServer.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * Created by Owen on 2019/11/21 0021 15:29
  */
-public interface ModelServer extends OutputFileServer {
+public interface ModelServer extends BaseServer {
 
     // 大文件上传
     R uploadBigFile(MultipartFile file);
@@ -21,9 +21,7 @@ public interface ModelServer extends OutputFileServer {
 
     OutputFileEntity save(OutputFileEntity fileSchedule);
 
-    OutputFileEntity findById(Long fileId);
-
-    R findByType(String fileTypeModel, PageDto param);
+//    R findByType(String type, PageDto param);
 
     R moveFileToServer(Long fileId, ConfigJsonDto param);
 
@@ -33,7 +31,5 @@ public interface ModelServer extends OutputFileServer {
 
     Integer cmdSlice(String cmd);
 
-    FileEntity findByInputFileId(Long fileId);
 
-    FileEntity saveInputFile(FileEntity fileEntity);
 }

src/main/java/com/fd/server/impl/BaseServerImpl.java

@@ -0,0 +1,99 @@
+package com.fd.server.impl;
+
+import com.fd.constant.TypeCode;
+import com.fd.constant.UserCode;
+import com.fd.dto.PageDto;
+import com.fd.entity.FileEntity;
+import com.fd.entity.OutputFileEntity;
+import com.fd.entity.User;
+import com.fd.repository.FileRepository;
+import com.fd.repository.OutputFileRepository;
+import com.fd.repository.StyleRepository;
+import com.fd.repository.UserRepository;
+import com.fd.server.BaseServer;
+import com.fd.shiro.JWTUtil;
+import com.fd.util.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+/**
+ * Created by Owen on 2019/12/19 0019 10:17
+ */
+@Service
+public class BaseServerImpl implements BaseServer {
+
+    @Autowired
+    private OutputFileRepository outputFileRepository;
+
+    @Autowired
+    private StyleRepository styleRepository;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private FileRepository fileRepository;
+
+    @Override
+    public Page<OutputFileEntity> findByList(String type, PageDto param, String token) {
+
+        String username = JWTUtil.getUsername(token);
+
+        // 根据用户名查找用户
+        User user = userRepository.findByUsername(username);
+
+        // 判断用户角色
+
+        Page<OutputFileEntity> page = null;
+
+        // 部门经理
+        if (UserCode.USER_ROLE_ROOT.equals(user.getRole())) {
+            page = outputFileRepository.findByTypeAndUserGroup(type, user.getUserGroup(), PageRequest.of(param.getPageNum(), param.getPageSize(), Sort.by("createTime").descending()));
+
+            //普通用户
+        } else if (UserCode.USER_ROLE_USER.equals(user.getRole())) {
+            page = outputFileRepository.findByTypeAndUserId(type, user.getId(), PageRequest.of(param.getPageNum(), param.getPageSize(), Sort.by("createTime").descending()));
+
+            // 管理员用户
+        } else {
+            page = outputFileRepository.findByTypeAndResStatus(type, 0, PageRequest.of(param.getPageNum(), param.getPageSize(), Sort.by("createTime").descending()));
+
+        }
+
+        return page;
+    }
+
+    @Override
+    public OutputFileEntity findById(Long fileId) {
+        Optional<OutputFileEntity> o = outputFileRepository.findById(fileId);
+        if (o.isPresent()) {
+            return o.get();
+        }
+        return null;
+    }
+
+    @Override
+    public FileEntity findByInputFileId(Long fileId) {
+        Optional<FileEntity> o = fileRepository.findById(fileId);
+        if (o.isPresent()) {
+            return o.get();
+        }
+        return null;
+    }
+
+    @Override
+    public FileEntity saveInputFile(FileEntity fileEntity) {
+        return fileRepository.save(fileEntity);
+    }
+
+    @Override
+    public R findByType(String type, PageDto pageDto) {
+        Page<OutputFileEntity> page = outputFileRepository.findByTypeAndResStatus(type, 0,PageRequest.of(pageDto.getPageNum(), pageDto.getPageSize(), Sort.by("createTime").descending()));
+        return new R(200, page);
+    }
+}

src/main/java/com/fd/server/impl/ModelServerImpl.java

@@ -39,7 +39,7 @@ import java.util.Optional;
  */
 @Log4j2
 @Service
-public class ModelServerImpl extends OutputFileServerImpl implements ModelServer  {
+public class ModelServerImpl extends BaseServerImpl implements ModelServer  {
 
     @Value("${input.file.path.model}")
     private String INPUT_FILE_PATH;
@@ -213,21 +213,11 @@ public class ModelServerImpl extends OutputFileServerImpl implements ModelServer
             return isCmd;
         }
 
-    @Override
-    public FileEntity findByInputFileId(Long fileId) {
-        Optional<FileEntity> o = fileRepository.findById(fileId);
-        if (o.isPresent()) {
-            return o.get();
-        }
-        return null;
-    }
 
 
 
-    @Override
-    public FileEntity saveInputFile(FileEntity fileEntity) {
-        return fileRepository.save(fileEntity);
-    }
+
+
 
 
     @Override
@@ -329,7 +319,7 @@ public class ModelServerImpl extends OutputFileServerImpl implements ModelServer
 
     @Override
     public OutputFileEntity findByUploadId(Long uploadId) {
-        return outputFileRepository.findByAndAndUploadId(uploadId);
+        return outputFileRepository.findByUploadId(uploadId);
     }
 
     @Override
@@ -337,20 +327,9 @@ public class ModelServerImpl extends OutputFileServerImpl implements ModelServer
         return outputFileRepository.save(fileSchedule);
     }
 
-    @Override
-    public OutputFileEntity findById(Long fileId) {
-        Optional<OutputFileEntity> o = outputFileRepository.findById(fileId);
-        if (o.isPresent()) {
-            return o.get();
-        }
-        return null;
-    }
 
-    @Override
-    public R findByType(String fileTypeModel, PageDto pageDto) {
-        Page<OutputFileEntity> page = outputFileRepository.findByTypeAndResStatus(fileTypeModel, 0,PageRequest.of(pageDto.getPageNum(), pageDto.getPageSize(), Sort.by("createTime").descending()));
-        return new R(200, page);
-    }
+
+
 
 
     private void writeJsonFile(ConfigJsonDto param,  OutputFileEntity entity) {

src/main/java/com/fd/shiro/ShiroConfig.java

@@ -67,6 +67,7 @@ public class ShiroConfig {
         Map<String, String> filterRuleMap = new HashMap<>();
 
         filterRuleMap.put("/login", "anon");
+        filterRuleMap.put("/test/**", "anon");
 
         // swagger 不拦截
         filterRuleMap.put("/swagger-resources/**", "anon");

src/main/resources/application.properties

@@ -1,7 +1,7 @@
 server.port=8082
 
 # file multipart
-spring.profiles.active=uat
+spring.profiles.active=dev
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=51200MB
 spring.servlet.multipart.max-request-size=51200MB