ソースを参照

删除了无用代码

wuweihao 5 年 前
コミット
7555198f4a

+ 0 - 4
src/main/java/com/fd/controller/ModelController.java

@@ -5,7 +5,6 @@ import com.fd.constant.MsgCode;
 import com.fd.constant.TypeCode;
 import com.fd.dto.ConfigJsonDto;
 import com.fd.dto.PageDto;
-import com.fd.dto.MyQueue;
 import com.fd.entity.FileEntity;
 import com.fd.entity.OutputFileEntity;
 import com.fd.server.ModelServer;
@@ -187,9 +186,6 @@ public class ModelController {
 
         // 把数据放入队列中
         boolean offer = false;
-//        MyQueue data = new MyQueue();
-//        data.setOutputFile(entity);
-//        data.setStr(cmd);
         try {
             offer = modelQueue.offer(count.incrementAndGet(), 1, TimeUnit.SECONDS);
             log.info("model slice 入队成功");

+ 0 - 6
src/main/java/com/fd/controller/RasterController.java

@@ -211,9 +211,6 @@ public class RasterController {
 
 
         // 把数据放入队列中
-//        MyQueue data = new MyQueue();
-//        data.setOutputFile(entity);
-//        data.setStr(cmd);
         boolean offer = false;
         try {
             offer = coordQueue.offer(coordCount.incrementAndGet(), 1, TimeUnit.SECONDS);
@@ -271,9 +268,6 @@ public class RasterController {
 
 
         // 把数据放入队列中
-//        MyQueue data = new MyQueue();
-//        data.setOutputFile(entity);
-//        data.setStr(cmd);
         boolean offer = false;
 
         try {

+ 0 - 14
src/main/java/com/fd/controller/VectorController.java

@@ -1,35 +1,27 @@
 package com.fd.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.fd.constant.Command;
 import com.fd.constant.MsgCode;
 import com.fd.constant.TypeCode;
 import com.fd.dto.ConfigJsonDto;
-import com.fd.dto.MyQueue;
 import com.fd.dto.PageDto;
 import com.fd.dto.StyleDto;
 import com.fd.entity.FileEntity;
 import com.fd.entity.OutputFileEntity;
 import com.fd.entity.StyleEntity;
-import com.fd.server.CmdServer;
 import com.fd.server.VectorServer;
-import com.fd.server.impl.VectorServerImpl;
 import com.fd.thread.AsyncTask;
 import com.fd.util.FileUtils;
 import com.fd.util.R;
 import com.fd.util.RegexUtils;
-import com.fd.util.SpringContext;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.PostConstruct;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Date;
@@ -242,9 +234,6 @@ public class VectorController {
 
 
         // 把数据放入队列中
-//        MyQueue data = new MyQueue();
-//        data.setOutputFile(entity);
-//        data.setStr(cmd);
         boolean offer = false;
         try {
             offer = vectorCoordQueue.offer(coordCount.incrementAndGet(), 1, TimeUnit.SECONDS);
@@ -336,9 +325,6 @@ public class VectorController {
 
 
         // 把数据放入队列中
-//        MyQueue data = new MyQueue();
-//        data.setOutputFile(entity);
-//        data.setStr(cmd);
         boolean offer = false;
         try {
             offer = vectorSliceQueue.offer(sliceCount.incrementAndGet(), 1, TimeUnit.SECONDS);

+ 0 - 17
src/main/java/com/fd/dto/MyQueue.java

@@ -1,17 +0,0 @@
-package com.fd.dto;
-
-import com.fd.entity.OutputFileEntity;
-import lombok.Data;
-
-/**
- * Created by Owen on 2019/11/22 0022 14:25
- *
- * 消息队列,用来传参
- */
-@Data
-public class MyQueue {
-
-    private OutputFileEntity outputFile;
-
-    private String str;
-}

+ 0 - 1
src/main/java/com/fd/thread/AsyncTask.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.fd.constant.Command;
 import com.fd.constant.MsgCode;
 import com.fd.constant.TypeCode;
-import com.fd.dto.MyQueue;
 import com.fd.entity.OutputFileEntity;
 import com.fd.server.ModelServer;
 import com.fd.server.RasterServer;