统一标准格式

zd-modules/zd-base/src/main/java/com/zd/base/files/bigupload/controller/UploadController.java

@@ -3,8 +3,8 @@ package com.zd.base.files.bigupload.controller;
 
 import com.zd.base.files.bigupload.dto.FileChunkDTO;
 import com.zd.base.files.bigupload.dto.FileChunkResultDTO;
-import com.zd.base.files.bigupload.response.RestApiResponse;
 import com.zd.base.files.bigupload.service.IUploadService;
+import com.zd.model.domain.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
  * @Version 1.0
  **/
 @RestController
-@RequestMapping("upload")
+@RequestMapping("/upload")
 public class UploadController {
 
     @Autowired
@@ -25,14 +25,14 @@ public class UploadController {
      *
      * @return
      */
-    @GetMapping("chunk")
-    public RestApiResponse<Object> checkChunkExist(FileChunkDTO chunkDTO) {
+    @GetMapping("/chunk")
+    public ResultData<Object> checkChunkExist(FileChunkDTO chunkDTO) {
         FileChunkResultDTO fileChunkCheckDTO;
         try {
             fileChunkCheckDTO = uploadService.checkChunkExist(chunkDTO);
-            return RestApiResponse.success(fileChunkCheckDTO);
+            return ResultData.success(fileChunkCheckDTO);
         } catch (Exception e) {
-            return RestApiResponse.error(e.getMessage());
+            return ResultData.fail(e.getMessage());
         }
     }
 
@@ -43,13 +43,13 @@ public class UploadController {
      * @param chunkDTO
      * @return
      */
-    @PostMapping("chunk")
-    public RestApiResponse<Object> uploadChunk(FileChunkDTO chunkDTO) {
+    @PostMapping("/chunk")
+    public ResultData<Object> uploadChunk(FileChunkDTO chunkDTO) {
         try {
             uploadService.uploadChunk(chunkDTO);
-            return RestApiResponse.success(chunkDTO.getIdentifier());
+            return ResultData.success(chunkDTO.getIdentifier());
         } catch (Exception e) {
-            return RestApiResponse.error(e.getMessage());
+            return ResultData.fail(e.getMessage());
         }
     }
 
@@ -59,13 +59,13 @@ public class UploadController {
      * @param chunkDTO
      * @return
      */
-    @PostMapping("merge")
-    public RestApiResponse<Object> mergeChunks(@RequestBody FileChunkDTO chunkDTO) {
+    @PostMapping("/merge")
+    public ResultData<Object> mergeChunks(@RequestBody FileChunkDTO chunkDTO) {
         try {
             String filePath = uploadService.mergeChunk(chunkDTO.getIdentifier(), chunkDTO.getFilename(), chunkDTO.getTotalChunks());
-            return RestApiResponse.success(filePath);
+            return ResultData.success(filePath);
         } catch (Exception e) {
-            return RestApiResponse.error(e.getMessage());
+            return ResultData.fail(e.getMessage());
         }
     }
 

zd-modules/zd-base/src/main/java/com/zd/base/files/bigupload/response/RestApiResponse.java

@@ -1,75 +0,0 @@
-package com.zd.base.files.bigupload.response;
-
-
-/**
- * @Author donggaosheng
- * @Date 2021/1/16 14:37
- * @Version 1.0
- **/
-public class RestApiResponse<T> {
-
-    private int code;
-
-    /**
-     * 是否成功
-     */
-    private boolean success;
-
-    /**
-     * 响应数据
-     */
-    private T data;
-
-    public boolean isSuccess() {
-        return success;
-    }
-
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    public T getData() {
-        return data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public static <T> RestApiResponse<T> success(T data) {
-        RestApiResponse<T> result = new RestApiResponse<>();
-        result.success = true;
-        result.code=200;
-        result.data = data;
-        return result;
-    }
-
-    public static <T> RestApiResponse<T> success() {
-        RestApiResponse<T> result = new RestApiResponse<>();
-        result.success = true;
-        result.code=200;
-        return result;
-    }
-
-    public static <T> RestApiResponse<T> error(T data) {
-        RestApiResponse<T> result = new RestApiResponse<>();
-        result.success = false;
-        result.code=500;
-        result.data = data;
-        return result;
-    }
-
-    public static <T> RestApiResponse<T> flag(boolean data) {
-        RestApiResponse<T> result = new RestApiResponse<>();
-        result.success = data;
-        return result;
-    }
-}

zd-modules/zd-base/src/main/java/com/zd/base/files/bigupload/service/impl/UploadServiceImpl.java

@@ -10,7 +10,6 @@ import com.zd.base.files.bigupload.utils.FileUtils;
 import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -40,12 +39,6 @@ public class UploadServiceImpl implements IUploadService {
     private RedisTemplate<String, Object> redisTemplate;
 
     /**
-     * 域名或本机访问地址
-     */
-    @Value("${file.domain}")
-    public String domain;
-
-    /**
      * 上传文件存储在本地的根路径
      */
     @Value("${file.path}")

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/word/WordUtils.java

@@ -2,15 +2,12 @@ package com.zd.laboratory.utils.word;
 
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
-import com.deepoove.poi.data.DocxRenderData;
 import com.deepoove.poi.data.Includes;
-import com.deepoove.poi.data.Pictures;
 import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import org.springframework.core.io.ClassPathResource;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.List;
@@ -27,37 +24,6 @@ public class WordUtils {
      * @param response
      */
     public static void getWord1(Word1 word1, List<Word1.Detail> list, HttpServletResponse response) throws IOException {
-//        URL url = Thread.currentThread().getContextClassLoader().getResource("word/1.docx");
-
-//        String url;
-//        String os =  System.getProperty("os.name");
-//        if (os.toLowerCase().startsWith("win")) {
-//            url = WordUtils.class.getResource("/word/1.docx").getPath();
-//        }else {
-//            url = "/home/word_temp/1.docx";
-//        }
-
-
-        /*word1 = new Word1();
-        word1.setCheck_day("12");
-        word1.setCheck_dept_name("测绘学院实验中心");
-        word1.setCheck_month("1");
-        word1.setCheck_year("2022");
-        word1.setDept_name("环境与测绘学院");
-
-        list = new ArrayList<>();
-
-        for (int i = 1; i < 11; i++) {
-            Word1.Detail detail = word1.new Detail();
-            detail.setIndex(i+"");
-            detail.setSub_name("实验室" + i);
-            detail.setCheck_desc("危险描述" + i);
-            detail.setCheck_img("http://deepoove.com/images/icecream.png");
-            detail.setCheck_option_name("危险选项" + i);
-            list.add(detail);
-        }*/
-
-
         Configure config = Configure.builder().bind("details", new LoopRowTableRenderPolicy()).build();
 
         ClassPathResource classpathResource = new ClassPathResource("word/1.docx");
@@ -83,65 +49,10 @@ public class WordUtils {
                     }
                     put("details",list);
                 }});
-//        template.writeAndClose(new FileOutputStream("E:\\out1.docx"));
         template.write(response.getOutputStream());
     }
 
     public static void getWord2(Word2 word2, List<Word2.Detail> list, HttpServletResponse response) throws IOException {
-//        URL url = Thread.currentThread().getContextClassLoader().getResource("word/2.docx");
-
-        /*String url, detailUrl;
-
-        String os =  System.getProperty("os.name");
-        if (os.toLowerCase().startsWith("win")) {
-            url = WordUtils.class.getResource("/word/2.docx").getPath();
-            detailUrl = WordUtils.class.getResource("/word/word2_detail.docx").getPath();
-        }else {
-            url = "/home/word_temp/2.docx";
-            detailUrl = "/home/word_temp/word2_detail.docx";
-        }*/
-
-        /*word2 = new Word2();
-        word2.setDept_name("环境与测绘学院");
-        word2.setSub_name("实验室名称");
-        word2.setCheck_year("2022");
-        word2.setCheck_month("1");
-        word2.setCheck_day("14");
-        word2.setCode("001");
-        word2.setCount(5+"");
-        word2.setCheck_dept_name("环测实验中心");
-        word2.setCheck_result("审核结果");
-        word2.setNow_year("2022");
-        word2.setNow_month("1");
-        word2.setNow_day("14");
-        word2.setCheck_room("103");
-        word2.setCheck_date("2022-01-14 08:40");
-        word2.setCheck_nick_name("张大山");
-
-        list = new ArrayList<>();
-
-
-//        WordPolicy wordPolicy = new WordPolicy();
-        List<RowRenderData> rowRenderData = new ArrayList<>();
-        for (int i = 1; i < 11; i++) {
-            Word2.Detail detail = word2.new Detail();
-            detail.setIndex(i+"");
-            detail.setOption_code("0" + i);
-            detail.setCheck_desc("问题描述" + i);
-            detail.setCheck_img("http://deepoove.com/images/icecream.png");
-            list.add(detail);
-
-           *//* rowRenderData.addAll(Arrays.asList(
-                    Rows.of(
-                            detail.getIndex(),
-                            detail.getOption_code(),
-                            detail.getCheck_desc(),
-                            detail.getCheck_img())
-                            .center().create()));*//*
-        }*/
-//        wordPolicy.setLabors(rowRenderData);
-
-//        Configure config = Configure.builder().bind("%", new PictureRenderPolicy()).build();
 
         Configure config = Configure.createDefault().plugin('%', new SignPicPolicy());
 
@@ -169,62 +80,11 @@ public class WordUtils {
 //                    put("details", Includes.ofLocal(classpathResource.getInputStream()).setRenderModel(list).create());
                     put("details", Includes.ofStream(classpathResource.getInputStream()).setRenderModel(list).create());
                 }});
-//        template.writeAndClose(new FileOutputStream("E:\\out2.docx"));
         template.write(response.getOutputStream());
     }
 
 
     public static void getWord3(Word3 word3, List<Word3.Detail> list, List<Word3.Descs> descs, HttpServletResponse response) throws IOException {
-//        URL url = Thread.currentThread().getContextClassLoader().getResource("word/3.docx");
-        /*String url, detailUrl;
-
-        String os =  System.getProperty("os.name");
-        if (os.toLowerCase().startsWith("win")) {
-            url = WordUtils.class.getResource("/word/3.docx").getPath();
-            detailUrl = WordUtils.class.getResource("/word/word3_detail.docx").getPath();
-        }else {
-            url = "/home/word_temp/3.docx";
-            detailUrl = "/home/word_temp/word3_detail.docx";
-        }*/
-        /*word3 = new Word3();
-        word3.setCode("001");
-        word3.setDept_name("环境与测绘学院");
-        word3.setCheck_nick_name("张大山");
-        word3.setSub_name("实验室名称");
-        word3.setCheck_room("103");
-        word3.setNow_year("2022");
-        word3.setNow_month("1");
-        word3.setNow_day("14");
-        word3.setCheck_year("2022");
-        word3.setCheck_month("1");
-        word3.setCheck_day("14");
-        word3.setCount(5+"");
-        word3.setFinish_count(3+"");
-        word3.setUn_count(2+"");
-
-
-        list = new ArrayList<>();
-
-        for (int i = 1; i < 11; i++) {
-            Word3.Detail detail = word3.new Detail();
-            detail.setIndex(i+"");
-            detail.setOption_code("0" + i);
-            detail.setCheck_desc("问题描述" + i);
-            //detail.setCheck_img("http://deepoove.com/images/icecream.png");
-            list.add(detail);
-        }
-
-        descs = new ArrayList<>();
-        for (int i = 1; i < 8; i++) {
-            Word3.Descs desc = word3.new Descs();
-            desc.setIndex(CN_NUM[i-1]);
-            desc.setCheck_option_name("检查项" + i);
-            desc.setCheck_desc("隐患描述" + i);
-            desc.setCheck_cause("原因分析" + i);
-            desc.setCheck_result("检查结果" + i);
-            desc.setCheck_img("http://deepoove.com/images/icecream.png");
-            descs.add(desc);
-        }*/
 
         Configure config = Configure.builder().bind("details", new LoopRowTableRenderPolicy())
                 .addPlugin('%', new SignPicPolicy()).build();
@@ -255,10 +115,4 @@ public class WordUtils {
 //        template.writeAndClose(new FileOutputStream("E:\\out3.docx"));
         template.write(response.getOutputStream());
     }
-
-    public static void main(String[] args) throws IOException {
-//        WordUtils.getWord3();
-
-//        System.out.println(WordUtils.class.getResource("/word/1.docx").getPath());
-    }
 }