添加图层id到各个模块

README.md

@@ -10,7 +10,7 @@
     /data/tomcat_cesium_8082
     
     gis数据：
-        /root/gis/data/output/vector
+        /root/gis/data/output/
         
     
     俊波前端：

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

@@ -12,6 +12,7 @@ import com.fd.util.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -33,35 +34,30 @@ public class HeatMapController {
     @PostMapping("findByDate")
     private R findByDate(@RequestBody PageDto param){
         Page<HeatMap> page = heatMapServer.findByDate(param);
-
         return new R(200, page);
     }
 
+    @GetMapping("list")
+    private R list(){
+        List<HeatMap> all = heatMapRepository.findAll();
+        return new R(200, all);
+    }
+
+    /**
+     * 添加json 数据到db
+     * @return
+     */
+    @ApiIgnore
     @GetMapping("2")
     private R save(){
-
         test();
         return new R(200, "");
     }
 
-    public static void main(String[] args) {
-//        String resource = FileUtils.getResource();
-//
-//        String s = FileUtils.readFile(resource + "static/out/a.json");
-////        JSONObject original = JSON.parseObject(s);
-//        List<HeatMap> list = JSONObject.parseArray(s, HeatMap.class);
-//        for (HeatMap m : list) {
-//            heatMapRepository.save
-//        }
-
-
-    }
 
     private void test(){
         String resource = FileUtils.getResource();
-
         String s = FileUtils.readFile(resource + "static/out/heatmap.json");
-//        JSONObject original = JSON.parseObject(s);
         List<HeatMap> list = JSONObject.parseArray(s, HeatMap.class);
         for (HeatMap m : list) {
 

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

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
@@ -69,6 +70,7 @@ public class UserController {
     }
 
 
+
     @GetMapping("/logout")
     public R logout(HttpServletRequest request) {
         log.info("run logout");
@@ -91,6 +93,7 @@ public class UserController {
      *
      * 用postman 模拟请求头，Authorization
      */
+    @ApiIgnore
     @GetMapping("free")
     private R free(){
         log.info("run free");
@@ -106,6 +109,7 @@ public class UserController {
 
     }
 
+    @ApiIgnore
     @GetMapping("free1")
     private R free1(HttpServletRequest req){
         log.info("run free");
@@ -125,6 +129,7 @@ public class UserController {
     /**
      * 只用登录用户才能访问
      */
+    @ApiIgnore
     @GetMapping("/auth/a")
     @RequiresAuthentication
     public R requireAuth() {
@@ -134,6 +139,7 @@ public class UserController {
         return new R(200, "已经登录， 登录模式………………");
     }
 
+    @ApiIgnore
     @GetMapping("/auth/k")
     @RequiresAuthentication
     public R list() {
@@ -147,6 +153,7 @@ public class UserController {
      * 需要登录
      * 只有admin角色可以看
      */
+    @ApiIgnore
     @GetMapping("/auth/role")
     @RequiresRoles("admin")
     public R requireRole() {
@@ -158,6 +165,7 @@ public class UserController {
      * 需要登录
      * 需要有view和edit 权限才可以看
      */
+    @ApiIgnore
     @GetMapping("/auth/edit")
     @RequiresPermissions(logical = Logical.AND, value = {"view", "edit"})
     public R requirePermission() {
@@ -168,13 +176,14 @@ public class UserController {
      * 需要登录
      * 只要有view 权限都可以看
      */
+    @ApiIgnore
     @GetMapping("/auth/view")
     @RequiresPermissions(logical = Logical.AND, value = {"view"})
     public R requirePermissionView() {
         return new R(200, "你拥有view的权限");
     }
 
-
+    @ApiIgnore
     @RequestMapping(path = "/401")
     @ResponseStatus(HttpStatus.UNAUTHORIZED)
     public R unauthorized() {

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

@@ -56,9 +56,6 @@ public class ConvertServerImpl extends BaseServerImpl implements ConvertServer {
     @Value("${base.path}")
     private String BASE_PATH;
 
-//    @Autowired
-//    private AsyncTask asyncTask;
-
 
     @PostConstruct
     private void init(){
@@ -74,21 +71,6 @@ public class ConvertServerImpl extends BaseServerImpl implements ConvertServer {
 
 
 
-
-//    @Autowired
-//    private UserRepository userRepository;
-//
-//    /**
-//     * 队列
-//     */
-//    private static BlockingQueue<Integer> queue = new LinkedBlockingQueue<Integer>(2);
-//
-//    /**
-//     * 保证线程安全的
-//     */
-//    private static AtomicInteger count = new AtomicInteger();
-
-
     @Override
     public R uploads(MultipartFile[] files, HttpServletRequest req, String type, String coord) {
         log.warn("run uploads");
@@ -340,25 +322,6 @@ public class ConvertServerImpl extends BaseServerImpl implements ConvertServer {
         log.warn("end download");
     }
 
-    public static void main(String[] args) {
-        String filePath = "F:\\test\\test123\\aa.txt";
-        String inPath = "F:/test/test123";
-        String inPath1 = "F:\\test\\test123\\";
-        String outPath = "F:\\test\\test1234\\1.zip";
-
-        String s = StringUtils.substringBefore("AA.JPG", ".");
-
-        // 得到目录
-//        filePath = StringUtils.substringBeforeLast(filePath, File.separator);
-        System.out.println(s);
-//        ZipUtil.zip(inPath1, outPath, true);
-
-//        ZipUtil.zip("f:/test/test123", "f:/test/1234/2.zip");
-//        byte[] gzip = ZipUtil.gzip(new File("f:/test/1234/2.zip"));
-//        HttpUtil.download()
-
-    }
-
 
     /**
      * 重写 deleteById
@@ -387,13 +350,7 @@ public class ConvertServerImpl extends BaseServerImpl implements ConvertServer {
         return new R(200, MsgCode.SUCCESS);
     }
 
-//    private OutputFileEntity getOutputFileEntity(Long id) {
-//        Optional<OutputFileEntity> o = outputFileRepository.findById(id);
-//        if (o.isPresent()) {
-//            return o.get();
-//        }
-//        return null;
-//    }
+
 
 
 

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

@@ -360,6 +360,10 @@ public class DemServerImpl extends BaseServerImpl implements DemServer {
         long cu = System.currentTimeMillis();
         // 需要唯一
         String name = "dem_" + cu;
+
+        // 新增id字段，为要素查询使用
+        subJson.put("id", entity.getId());
+
         subJson.put("name", name);
         subJson.put("text", param.getText());
         // raster 就用这个类型

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

@@ -179,6 +179,7 @@ public class ModelServerImpl extends BaseServerImpl implements ModelServer  {
                 StringBuffer errorStr = new StringBuffer();
 
                 // error : 坑， 控制台信息是从errorBuf这里出来的
+                // model 切片信息是从errorBuf打印出来的
                 String errorLine;
                 while ((errorLine = errorBuf.readLine()) != null) {
                     errorStr.append(errorLine).append("\n");
@@ -370,6 +371,10 @@ public class ModelServerImpl extends BaseServerImpl implements ModelServer  {
         long cu = System.currentTimeMillis();
         // 需要唯一
         String name = "model_" + cu;
+
+        // 新增id字段，为要素查询使用
+        subJson.put("id", entity.getId());
+
         subJson.put("name", name);
         subJson.put("text", param.getText());
         // raster 就用这个类型

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

@@ -535,8 +535,13 @@ public class RasterServerImpl extends BaseServerImpl implements RasterServer {
 
         JSONObject subJson = new JSONObject();
         long cu = System.currentTimeMillis();
+
         // 需要唯一
         String name = "raster_" + cu;
+
+        // 新增id字段，为要素查询使用
+        subJson.put("id", entity.getId());
+
         subJson.put("name", name);
         subJson.put("text", param.getText());
         // raster 就用这个类型