From 9451d2f4787ff58be2f61ea5af87b2a07f97b0eb Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 01 Nov 2023 13:39:20 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 193 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 152 insertions(+), 41 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index d004610..fb279b4 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -1,38 +1,49 @@
package com.moral.api.controller;
-import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
+import cn.afterturn.easypoi.word.WordExportUtil;
+import cn.hutool.poi.word.WordUtil;
+import com.deepoove.poi.NiceXWPFDocument;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.data.MiniTableRenderData;
+import com.deepoove.poi.data.RowRenderData;
+import com.deepoove.poi.data.TextRenderData;
import com.moral.api.entity.Dustld;
import com.moral.api.pojo.bo.ExcelBO;
+import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
+import com.moral.api.pojo.dust.DustForm;
import com.moral.api.pojo.vo.excel.DailyVo;
import com.moral.api.service.DustldService;
import com.moral.api.service.SpecialDeviceService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.xmlbeans.impl.jam.provider.ResourcePath;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.moral.api.controller.SysTestController.getPath;
@Slf4j
@Api(tags = {"���������"})
@@ -99,31 +110,19 @@
@ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "time1", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "time2", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "type", value = "������������", required = true, paramType = "query", dataType = "String")
+ @ApiImplicitParam(name = "type", value = "������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "range", value = "������", required = true, paramType = "query", dataType = "int")
})
public ResultMessage carTrajectoryNewAvg(HttpServletRequest request) {
- long stime = System.currentTimeMillis();
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
- if (!params.containsKey("mac") || !params.containsKey("time1")|| !params.containsKey("type")|| !params.containsKey("time2")) {
+ if (!params.containsKey("mac") || !params.containsKey("time1")||!params.containsKey("range")|| !params.containsKey("type")|| !params.containsKey("time2")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
List<HistorySecondCruiserResultDTO> response = specialDeviceService.carTrajectoryNewAvg(params);
- if(CollectionUtils.isEmpty(response)){
- return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
- }
- long etime = System.currentTimeMillis();
- /*List<Map<Integer,HistorySecondCruiserResultDTO>> mapList = new ArrayList<>();
- for(int i = 0 ;i<response.size();i++){
- Map<Integer,HistorySecondCruiserResultDTO> map = new HashMap<>();
- map.put(i,response.get(i));
- mapList.add(map);
- }*/
//������������������
- System.out.printf("���������������%d ������.", (etime - stime));
- return ResultMessage.ok(response);
-
+ return ObjectUtils.isEmpty(response) ? ResultMessage.ok() : ResultMessage.ok(response);
}
@@ -229,6 +228,34 @@
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
}
+
+ /**
+ * ���������������������
+ * @return
+ */
+ @PostMapping("dailyDustlds")
+ public ResultMessage dailyDustlds(@RequestBody Map<String,Object> params, HttpServletResponse response) throws IOException {
+
+// Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ if (!params.containsKey("mac") || !params.containsKey("startTime") || !params.containsKey("endTime")){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ System.out.println(CruiserController.class.getResource("/word/���������������������.docx").getPath());
+ URL resource = getClass().getResource("/word/���������������������.docx");
+ String path = resource.getPath();
+ System.out.println(path);
+ Map<String, Object> map = dustldService.dailyDustlds(params);
+ if (ObjectUtils.isEmpty(map)){
+ return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+ }
+ test(map,response);
+
+ return ResultMessage.ok();
+ }
+
+
+
+
/**
* ������������������
* @param id
@@ -264,4 +291,88 @@
}
+
+ public static void downloadWord(String fileName, Map<String, Object> params, HttpServletResponse response, String newFileName) {
+ String path = getPath(fileName);//��������� resources������
+ try {
+ //������������������
+ OutputStream out = new FileOutputStream("G:\\home\\mon1\\" + newFileName);
+ File rootFile = new File(ResourceUtils.getURL("classpath:").getPath());
+ File file= new File(rootFile, path);
+ XWPFDocument word = WordExportUtil.exportWord07(file.getPath(), params);
+ response.setCharacterEncoding("utf-8");
+ response.setContentType("multipart/form-data");
+ response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(newFileName, "utf-8"));
+ //OutputStream out = response.getOutputStream();
+ word.write(out);
+ out.flush();
+ out.close();
+ } catch (Exception e) {
+ log.error ("������������������������������������������", e);
+ }
+ }
+
+
+ public static void test( Map<String, Object> params,HttpServletResponse response) throws IOException {
+ InputStream inputStream = WordUtil.class.getClassLoader().getResourceAsStream("word/���������������������.docx");
+ XWPFDocument compile = null;
+ try {
+ // File file = new File("���������������������.docx");
+ // FileUtils.copyToFile(inputStream,file);
+
+ //���������������������������
+ /*File rootFile = new File(ResourceUtils.getURL("classpath:").getPath());
+ File file= new File(rootFile, path);*/
+ //������������������������
+
+ //������������������������������������������������������{{}}������������������������,map������������key������������������������������������������
+ HashMap<String, Object> map = new HashMap<>();
+ //������������������������
+ RowRenderData header1 = RowRenderData.build(new TextRenderData("6495ED", "������"), new TextRenderData("6495ED", "������"),new TextRenderData("6495ED", "���������������������/������������"));
+
+ //���������������������������������������������������������list������������������������������foreach������������������
+ List<DustForm> list1 = (List<DustForm>) params.get("list1");
+
+ ArrayList<Map<String, Object>> mapArrayList = (ArrayList<Map<String, Object>>) params.get("list3");
+ ArrayList<RowRenderData> rsList1 = new ArrayList<>();
+ ArrayList<RowRenderData> rsList3 = new ArrayList<>();
+
+ for (int i = 0; i < list1.size(); i++) {
+ DustForm dustForm = list1.get(i);
+ RowRenderData row0 = RowRenderData.build(i+1+"",dustForm.getRoad(), dustForm.getValue()+"");
+ rsList1.add(row0);
+ }
+
+ for (int i = 0; i < mapArrayList.size(); i++) {
+ Map<String, Object> map1 = mapArrayList.get(i);
+ RowRenderData row = RowRenderData.build(i + 1 + "", map1.get("road").toString(), map1.get("value1").toString(), map1.get("value2").toString(), map1.get("value3").toString());
+ rsList3.add(row);
+ }
+ if (!ObjectUtils.isEmpty(mapArrayList)){
+ map.put("table3", new MiniTableRenderData(rsList3));
+ }
+ map.put("table1", new MiniTableRenderData(header1, rsList1));
+ map.put("data",params.get("data"));
+ map.put("time",params.get("time").toString());
+ map.put("date1",params.get("date1").toString());
+ map.put("date2",params.get("date2").toString());
+ File docxFile = new File("���������������������.docx");
+ FileUtils.copyToFile(inputStream,docxFile);
+ compile = WordExportUtil.exportWord07(docxFile.getPath(),map);
+ compile.write(response.getOutputStream());
+ compile.close();
+ inputStream.close();
+ } catch (IOException e) {
+ log.error ("������������������������������������������", e);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }finally {
+ compile.close();
+ inputStream.close();
+
+ }
+
+ }
+
+
}
--
Gitblit v1.8.0