dev

raster 模块修改好

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

@@ -94,7 +94,6 @@ public class RasterController {
         String strCoord = Arrays.toString(coord);
 
         RasterServer rasterServer = SpringContext.getBean(RasterServerImpl.class);
-        CmdServer cmdServer = SpringContext.getBean(CmdServerImpl.class);
 
         // 文件名全名
         String fileName = file.getOriginalFilename();
@@ -120,7 +119,7 @@ public class RasterController {
         OutputFileEntity entity = (OutputFileEntity) r.getData();
 
         // 判断坐标
-        entity = JudgeCoord(entity, rasterServer, cmdServer);
+        entity = JudgeCoord(entity, rasterServer);
 
         return new R(200, entity);
 
@@ -130,13 +129,12 @@ public class RasterController {
      * 上传后判断坐标，显示原始坐标
      * @return
      */
-    private OutputFileEntity JudgeCoord(OutputFileEntity entity, RasterServer rasterServer, CmdServer cmdServer){
+    private OutputFileEntity JudgeCoord(OutputFileEntity entity, RasterServer rasterServer){
 
         String cmd = Command.RASTER_JUDGE_COORD;
         cmd = cmd.replace("@inputFile", entity.getUploadPath());
         log.info("cmd: {}", cmd);
 
-//        Integer isJudge = cmdServer.exeCmdRasterJudgeCoord(cmd);
 
         Integer isJudge = rasterServer.cmdJudgeCoord(cmd);
 
@@ -210,7 +208,6 @@ public class RasterController {
         log.info("run cmdJudgeCoord: {}", fileId);
 
         RasterServer rasterServer = SpringContext.getBean(RasterServerImpl.class);
-//        CmdServer cmdServer = SpringContext.getBean(CmdServerImpl.class);
 
         OutputFileEntity entity = rasterServer.findById(fileId);
 
@@ -369,7 +366,6 @@ public class RasterController {
                 log.warn("run SliceConsumerThread");
                 OutputFileEntity  entity = data.getOutputFile();
                 log.info("raster cmd: {}", data.getStr());
-//                Integer integer = cmdServer.exeCmdRasterSlice(data.getStr(), entity);
                 Integer integer = rasterServer.cmdSlice(data.getStr(), entity);
                 if (integer != 0) {
                     log.info("error command exeCmdRasterSlice");
@@ -479,7 +475,6 @@ public class RasterController {
         log.info("cmd1: {}", step_1);
         log.info("cmd2: {}", step_2);
 
-//        Integer integer = cmdServer.exeCmd(step_1, step_2);
         Integer integer = rasterServer.exeCmd(step_1, step_2);
 
         if (integer != 0) {