From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/controller/ExcelController.java | 84 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 82 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/ExcelController.java b/screen-api/src/main/java/com/moral/api/controller/ExcelController.java
index 1425868..177a003 100644
--- a/screen-api/src/main/java/com/moral/api/controller/ExcelController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/ExcelController.java
@@ -11,6 +11,7 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.io.IOException;
+import java.text.ParseException;
import java.util.List;
import java.util.Map;
@@ -18,7 +19,10 @@
import com.moral.api.pojo.bo.ExcelBO;
import com.moral.api.pojo.vo.excel.ExcelVo;
+import com.moral.api.pojo.vo.excel.HnExcelVo;
+import com.moral.api.pojo.vo.excel.SyExcelVo;
import com.moral.api.service.ExcelService;
+import com.moral.api.service.HnExcelService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
@@ -31,8 +35,12 @@
@Autowired
private ExcelService excelService;
+
+ @Autowired
+ private HnExcelService hnExcelService;
+
/**
- * ������
+ * ���������������
* @param request
* @return
* @throws IOException
@@ -50,7 +58,7 @@
/**
- * ������
+ * ���������������
* @param id
* @return
*/
@@ -86,4 +94,76 @@
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),excelBOS);
}
+
+ /**
+ * ���������������������
+ * @param request
+ * @return
+ * @throws IOException
+ */
+ @PostMapping("syExcelImport")
+ public ResultMessage syExcelImport(HttpServletRequest request) throws IOException, ParseException {
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ if (!params.containsKey("time") || !params.containsKey("code") || params.containsKey("data")){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
+ ExcelBO excelImport = hnExcelService.getExcelImport(files, params);
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),excelImport);
+ }
+
+ /**
+ * ���������������
+ * @param id
+ * @return
+ */
+ @GetMapping("/syExcelExport")
+ public ResultMessage syExcelExport(Integer id){
+ if (id==null){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+
+ SyExcelVo syExcelVo = hnExcelService.SyExport(id);
+ if (syExcelVo==null){
+ return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+ }
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),syExcelVo);
+ }
+
+
+ /**
+ * ���������������������������
+ * @param id
+ * @return
+ */
+ @GetMapping("/hnExcelExport")
+ public ResultMessage hnExcelExport(Integer id) throws ParseException {
+ if (id==null){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+
+ HnExcelVo hnExcelVo = hnExcelService.hnExport(id);
+ if (hnExcelVo==null){
+ return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+ }
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),hnExcelVo);
+ }
+
+
+ /**
+ * ���������������
+ * @param request
+ * @return
+ * @throws IOException
+ */
+ @PostMapping("rexcelImport")
+ public ResultMessage rexcelImport(HttpServletRequest request) throws IOException {
+
+ List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
+
+ excelService.rexcelImport(files);
+ return ResultMessage.ok(1);
+ }
+
+
}
--
Gitblit v1.8.0