From 1797c2a2455ce04f15678a5754d90908aa7d2e2c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 22 十月 2024 17:32:59 +0800
Subject: [PATCH] 2024-10-22 朱宝民 图片上传接口、音频上传接口、图片及音频路径获取接口

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java |   43 +++++++++++++++++++++----------------------
 1 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index 8fabaa3..57b5513 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -1,12 +1,13 @@
 package com.dy.pipIrrProject.intake;
 
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.support.ExcelTypeEnum;
 import com.dy.common.aop.SsoAop;
 import com.dy.common.webUtil.BaseResponse;
 import com.dy.common.webUtil.BaseResponseUtils;
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrGlobal.excel.CellWriteHandler;
+import com.dy.pipIrrGlobal.excel.ExcelUtil;
 import com.dy.pipIrrGlobal.pojoPr.PrIntake;
 import com.dy.pipIrrGlobal.voPr.VoIntake;
 import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
@@ -35,6 +36,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
@@ -78,7 +80,7 @@
         try {
             QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll();
             if (res == null) {
-                return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage());
+                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
             } else {
                 return BaseResponseUtils.buildSuccess(res);
             }
@@ -106,7 +108,7 @@
     @SsoAop()
     public BaseResponse<PrIntake> one(@PathVariable("id") Long id) {
         if (this.intakeSv.selectById(id) == null) {
-            return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage());
+            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
         } else {
             return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id));
         }
@@ -127,7 +129,7 @@
         try {
             QueryResultVo<List<VoIntake>> res = intakeSv.getIntakes(vo);
             if (res == null) {
-                return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage());
+                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
             }
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
@@ -151,17 +153,17 @@
     public BaseResponse<Boolean> add(@RequestBody @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult) {
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         if (bindingResult != null && bindingResult.hasErrors()) {
-            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
         List<Long> ids = intakeSv.getIntakeIdsByName(po.getName());
         if (ids.size() > 0) {
-            return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
+            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
         }
         po.setOperateDt(new Date());
         po.setDeleted((byte) 0);
         Integer rec = Optional.ofNullable(intakeSv.addIntake(po)).orElse(0);
         if (rec == 0) {
-            return BaseResponseUtils.buildFail(ProjectResultCode.ADD_INTAKE_FAIL.getMessage());
+            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.ADD_INTAKE_FAIL.getMessage());
         }
         return BaseResponseUtils.buildSuccess(true);
     }
@@ -185,11 +187,11 @@
     @SsoAop()
     public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult) {
         if (bindingResult != null && bindingResult.hasErrors()) {
-            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
         List<Long> ids = intakeSv.getIntakeIdByNameExcludeId(po.getId(), po.getName());
         if (ids.size() > 0) {
-            return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
+            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
         }
         int count;
         po.setOperateDt(new Date());
@@ -200,7 +202,7 @@
             return BaseResponseUtils.buildException(e.getMessage());
         }
         if (count <= 0) {
-            return BaseResponseUtils.buildFail(ProjectResultCode.UPDATE_INTAKE.getMessage());
+            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.UPDATE_INTAKE.getMessage());
         } else {
             return BaseResponseUtils.buildSuccess(true);
         }
@@ -225,14 +227,14 @@
     @SsoAop()
     public BaseResponse<Boolean> delete(@RequestBody Map map) {
         if (map == null || map.size() <= 0) {
-            return BaseResponseUtils.buildFail(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage());
+            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage());
         }
         Long id = Long.parseLong(map.get("id").toString());
         try {
             //鍙栨按鍙D
             Integer recordCount = Optional.ofNullable(intakeSv.delete(id)).orElse(0);
             if (recordCount == 0) {
-                return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage());
+                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage());
             } else {
                 return BaseResponseUtils.buildSuccess(true);
             }
@@ -240,8 +242,6 @@
             log.error("淇濆瓨鍒嗘按鍙e紓甯�", e);
             return BaseResponseUtils.buildException(e.getMessage());
         }
-
-
     }
 
     /**
@@ -252,16 +252,15 @@
      */
     @SneakyThrows(IOException.class)
     @GetMapping(value = "exportIntakes")
+    @SsoAop()
     public void exportIntakes(HttpServletResponse response, QueryVo vo) {
-        setExcelRespProp(response, "鍙栨按鍙e垪琛�");
-        //List<VoDivide> memberList = LocalJsonUtil.getListFromJson("json/members.json", VoDivide.class);
-        List<VoIntake> memberList = intakeSv.exportIntakes(vo);
+        List<VoIntake> intakeList = intakeSv.exportIntakes(vo);
 
-        EasyExcel.write(response.getOutputStream())
-                .head(VoIntake.class)
-                .excelType(ExcelTypeEnum.XLSX)
-                .sheet("鍙栨按鍙e垪琛�")
-                .doWrite(memberList);
+        ExcelUtil.setExcelRespProp(response, "鍙栨按鍙e垪琛�" + LocalDate.now());
+        EasyExcel.write(response.getOutputStream(), VoIntake.class)
+                .registerWriteHandler(new CellWriteHandler("鍙栨按鍙e垪琛�"))
+                .sheet("鍙栨按鍙�")
+                .doWrite(intakeList);
     }
 
     /**

--
Gitblit v1.8.0