修改了shiroConfig

src/main/java/com/fd/controller/DemController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -60,25 +61,19 @@ public class DemController {
     public R list(@RequestBody PageDto param, HttpServletRequest req) {
         String token = req.getHeader("Authorization");
 
-//        Page<OutputFileEntity> page = demServer.findByList(TypeCode.FILE_TYPE_DEM, param, token);
-//        return new R(200, page);
+        Page<OutputFileEntity> page = demServer.findByList(TypeCode.FILE_TYPE_DEM, param, token);
+        return new R(200, page);
 
-        return demServer.findByType(TypeCode.FILE_TYPE_DEM, param);
+//        return demServer.findByType(TypeCode.FILE_TYPE_DEM, param);
     }
 
 
-//    @ApiOperation("进度查询")
-//    @GetMapping("progress/{fileId}/")
-//    public R getProgress(@PathVariable("fileId") Long fileId) {
-//        OutputFileEntity entity = demServer.findById(fileId);
-//        return new R(200, entity);
-//    }
 
-    @GetMapping("test")
-    public R test(){
-//        demServer.test();
-        return new R(200,"1111");
-    }
+//    @GetMapping("test")
+//    public R test(){
+////        demServer.test();
+//        return new R(200,"1111");
+//    }
 
 
     @ApiOperation("删除文件")
@@ -89,7 +84,7 @@ public class DemController {
 
 
 
-//    @RequiresRoles("admin")
+    @RequiresRoles("admin")
     @ApiOperation("移动数据到服务器上")
     @PostMapping("move/{fileId}/")
     public R moveFile(@PathVariable("fileId") Long fileId, @RequestBody ConfigJsonDto param) {
@@ -98,5 +93,13 @@ public class DemController {
         return demServer.moveFileToServer(fileId, param);
     }
 
+    @RequiresRoles("admin")
+    @ApiOperation("测试")
+    @PostMapping("test")
+    public R test() {
+        log.info("run test ");
+        return new R(2000, "admin 权限可以查看 dem");
+    }
+
 
 }

src/main/java/com/fd/controller/ModelController.java

@@ -227,4 +227,13 @@ public class ModelController {
     }
 
 
+    @RequiresRoles("admin")
+    @ApiOperation("测试")
+    @PostMapping("test")
+    public R test() {
+        log.info("run test ");
+        return new R(2000, "admin 权限可以查看 model");
+    }
+
+
 }

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

@@ -98,6 +98,9 @@ public class DemServerImpl extends BaseServerImpl implements DemServer {
     @Override
     public R uploads(MultipartFile[] files, HttpServletRequest req) {
         log.warn("run uploads");
+
+        String token = req.getHeader("Authorization");
+
         if (files != null && files.length > 0) {
 
             // 创建目录
@@ -139,6 +142,11 @@ public class DemServerImpl extends BaseServerImpl implements DemServer {
             Integer integer = CmdUtil.exeCmdSingle(cmd);
             log.warn("cmd success");
 
+            String username = JWTUtil.getUsername(token);
+
+            // 根据用户名查找用户
+            User user = userRepository.findByUsername(username);
+
             // 保存信息
             OutputFileEntity outputFile = new OutputFileEntity();
             if (integer == 0) {
@@ -165,6 +173,10 @@ public class DemServerImpl extends BaseServerImpl implements DemServer {
                 outputFile.setResStatus(0);
                 outputFile.setBuildPath(outPath);
 
+                // 添加分组
+                outputFile.setUserId(user.getId());
+                outputFile.setUserGroup(user.getUserGroup());
+
                 outputFile = outputFileRepository.save(outputFile);
                 log.warn("end uploads");
                 return new R(200, outputFile);

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

@@ -85,10 +85,9 @@ public class ShiroConfig {
         filterRuleMap.put("/test/**", "anon");
         filterRuleMap.put("/manage/**", "anon");
 
-        filterRuleMap.put("/api/dem/**", "anon");
-        filterRuleMap.put("/test/convert/**", "anon");
-        filterRuleMap.put("/api/convert/**", "anon");
-        filterRuleMap.put("/n/t/**", "anon");
+//        filterRuleMap.put("/api/dem/**", "anon");
+//        filterRuleMap.put("/test/convert/**", "anon");
+//        filterRuleMap.put("/api/convert/**", "anon");
 
 
         // swagger 不拦截

src/main/resources/application-uat.properties

@@ -71,7 +71,7 @@ copy.file.path.raster=/var/www/html/data/
 copy.file.path.vector=/var/www/html/data/
 
 #config.json λÖÃ
-config.path=/usr/share/nginx/html/3dmap/config.json
+config.path=/var/www/html/3dmap/config.json
 
 #config.jsonµÄ teileset µÄÏà¶Ô·¾¶
 config.tileset=../data/wuyidaxue/tileset.json