Forráskód Böngészése

场景计算结果处理,修改容量状态报错

dengsixing 3 éve
szülő
commit
4989197bb7

+ 95 - 77
4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/FileConvertController.java

@@ -1,77 +1,95 @@
-package com.fdkankan.scene.controller;
-
-import cn.hutool.core.io.FileTypeUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.UUID;
-import com.fdkankan.common.constant.ConstantFilePath;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.controller.BaseController;
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.util.CreateObjUtil;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.nio.file.Paths;
-import javax.servlet.ServletOutputStream;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/5/17
- **/
-@RestController
-@RequestMapping("/service/file/convert")
-public class FileConvertController extends BaseController {
-
-    @RequestMapping(value = "/getModeldata", method = RequestMethod.POST)
-    public void convertTxtToModeldata(@RequestParam("file") MultipartFile file) throws Exception{
-
-        //生成uuid
-        String uuid = UUID.randomUUID().toString();
-
-        String path = ConstantFilePath.FILE_CONVERT_PATH + uuid;
-        String srcPath = path + "/" + file.getOriginalFilename();
-        String targetPath = path + "vision.modeldata";
-        File srcFile = new File(srcPath);
-        if(!srcFile.getParentFile().exists()){
-            srcFile.getParentFile().mkdirs();
-        }
-        file.transferTo(new File(srcPath));
-        String type = FileTypeUtil.getType(srcFile);
-        if(!"txt".equals(type)){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_7007, "txt");
-        }
-        CreateObjUtil.convertTxtToVisionmodeldata(srcPath, targetPath);
-        if(!FileUtil.exist(targetPath)){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_8005);
-        }
-        BufferedInputStream inputStream = FileUtil.getInputStream(targetPath);
-        ServletOutputStream outputStream = response.getOutputStream();
-        IoUtil.copy(inputStream, outputStream);
-
-
-//        IoUtil.
-
-
-
-
-
-
-
-    }
-
-
-
-
-
-}
+//package com.fdkankan.scene.controller;
+//
+//import cn.hutool.core.io.FileTypeUtil;
+//import cn.hutool.core.io.FileUtil;
+//import cn.hutool.core.io.IoUtil;
+//import cn.hutool.core.lang.UUID;
+//import com.fdkankan.common.constant.ConstantFilePath;
+//import com.fdkankan.common.constant.ErrorCode;
+//import com.fdkankan.common.controller.BaseController;
+//import com.fdkankan.common.exception.BusinessException;
+//import com.fdkankan.common.util.CreateObjUtil;
+//import java.io.BufferedInputStream;
+//import java.io.File;
+//import java.io.IOException;
+//import java.io.PrintWriter;
+//import java.nio.file.Paths;
+//import javax.servlet.ServletOutputStream;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMethod;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.multipart.MultipartFile;
+//
+///**
+// * <p>
+// * TODO
+// * </p>
+// *
+// * @author dengsixing
+// * @since 2022/5/17
+// **/
+//@RestController
+//@RequestMapping("/service/file/convert")
+//public class FileConvertController extends BaseController {
+//
+//    @RequestMapping(value = "/getModeldata", method = RequestMethod.POST)
+//    public void convertTxtToModeldata(@RequestParam("file") MultipartFile file) throws Exception{
+//
+//        //生成uuid
+//        String fileName = ""
+//        String uuid = UUID.randomUUID().toString();
+//
+////        String path = ConstantFilePath.FILE_CONVERT_PATH + uuid;
+//        String path = "F:\\mnt\\4Dkankan\\" + uuid;
+//        String srcPath = path + "/" + file.getOriginalFilename();
+//        String targetPath = path + "/vision.modeldata";
+//        File srcFile = new File(srcPath);
+//        if(!srcFile.getParentFile().exists()){
+//            srcFile.getParentFile().mkdirs();
+//        }
+//        file.transferTo(new File(srcPath));
+//        String type = FileTypeUtil.getType(srcFile);
+//        if(!"txt".equals(type)){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_7007, "txt");
+//        }
+//        CreateObjUtil.convertTxtToVisionmodeldata(srcPath, targetPath);
+//        if(!FileUtil.exist(targetPath)){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_8005);
+//        }
+//
+//        // 设置返回内容格式
+//        response.setContentType("application/octet-stream");
+//
+//        // 把文件名按UTF-8取出并按ISO8859-1编码,保证弹出窗口中的文件名中文不乱码
+//        // 中文不要太多,最多支持17个中文,因为header有150个字节限制。
+//        // 这一步一定要在读取文件之后进行,否则文件名会乱码,找不到文件
+//        String fileName = new String(fileName.getBytes("UTF-8"),"ISO8859-1");
+//
+//        // 设置下载弹窗的文件名和格式(文件名要包括名字和文件格式)
+//        response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+//
+//
+//
+//        BufferedInputStream inputStream = FileUtil.getInputStream(targetPath);
+//        ServletOutputStream outputStream = response.getOutputStream();
+//        IoUtil.copy(inputStream, outputStream);
+//        IoUtil.close(outputStream);
+//        IoUtil.close(inputStream);
+//
+//
+////        IoUtil.
+//
+//
+//
+//
+//
+//
+//
+//    }
+//
+//
+//
+//
+//
+//}

+ 2 - 2
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/BuildScenePostServiceImpl.java

@@ -558,14 +558,14 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
         }
         scenePlusService.update(
             new LambdaUpdateWrapper<ScenePlus>()
-                .set(ScenePlus::getPayStatus, PayStatus.NO_CAPACITY)
+                .set(ScenePlus::getPayStatus, PayStatus.NO_CAPACITY.code())
                 .eq(ScenePlus::getId, scenePlusId));
 
 
         // TODO: 2022/3/22 plus版本稳定后删除---------------------------start
         sceneProService.update(
             new LambdaUpdateWrapper<ScenePro>()
-                .set(ScenePro::getPayStatus, PayStatus.NO_CAPACITY)
+                .set(ScenePro::getPayStatus, PayStatus.NO_CAPACITY.code())
                 .eq(ScenePro::getId, sceneProId));
         // TODO: 2022/3/22 plus版本稳定后删除---------------------------end
     }