From 34b2fc4c457397cef1f0cc920344c82a9f4a3bc9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 15 十月 2024 15:20:07 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java | 12 +-
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 21 ++--
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java | 14 ++-
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java | 26 ++++--
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java | 7 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java | 34 ++++----
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java | 48 ++++++------
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml | 12 +-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/excel/CellWriteHandler.java | 46 +---------
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 2
10 files changed, 102 insertions(+), 120 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/excel/ReportExportCellWriteHandler.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/excel/CellWriteHandler.java
similarity index 68%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/excel/ReportExportCellWriteHandler.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/excel/CellWriteHandler.java
index 8f3ede8..f022b96 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/excel/ReportExportCellWriteHandler.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/excel/CellWriteHandler.java
@@ -21,17 +21,16 @@
/**
* @author ZhuBaoMin
- * @date 2024-08-26 14:18
- * @LastEditTime 2024-08-26 14:18
- * @Description
+ * @date 2024-10-12 11:40
+ * @LastEditTime 2024-10-12 11:40
+ * @Description 鎬昏处琛ㄦ牸璁剧疆
*/
-
-public class ReportExportCellWriteHandler extends AbstractVerticalCellStyleStrategy {
+public class CellWriteHandler extends AbstractVerticalCellStyleStrategy {
private String title;
PropertyPlaceholderHelper propertyPlaceholderHelper = new PropertyPlaceholderHelper("${", "}");
- public ReportExportCellWriteHandler(String title) {
+ public CellWriteHandler(String title) {
this.title = title;
}
@@ -110,40 +109,10 @@
if (cell.getRowIndex() >= 2){
((XSSFCellStyle) originCellStyle).setFillForegroundColor(new XSSFColor(new java.awt.Color(237, 237, 237), new DefaultIndexedColorMap()));
- // 绁ㄩ潰鎬讳环
+
//if (cell.getColumnIndex() == 10){
// int actualCellRowNum = context.getCell().getRowIndex() + 1;
// context.getCell().setCellFormula("I" + actualCellRowNum +"+J" + actualCellRowNum);
- // System.out.println("绗�" + context.getCell().getRowIndex() + "琛�,绗�" + context.getCell().getColumnIndex() + "绁ㄩ潰鎬讳环鍐欏叆鍏紡瀹屾垚");
- //}else if (cell.getColumnIndex() == 12){
- // // 鏀粯绁ㄦ
- // int actualCellRowNum = context.getCell().getRowIndex() + 1;
- // context.getCell().setCellFormula("K" + actualCellRowNum +"-L" + actualCellRowNum);
- // System.out.println("绗�" + context.getCell().getRowIndex() + "琛�,绗�" + context.getCell().getColumnIndex() + "鏀粯绁ㄦ鍐欏叆鍏紡瀹屾垚");
- //}else if (cell.getColumnIndex() == 15){
- // // 鏀粯鎬婚
- // int actualCellRowNum = context.getCell().getRowIndex() + 1;
- // context.getCell().setCellFormula("M" + actualCellRowNum +"+N" + actualCellRowNum +"+O" + actualCellRowNum);
- // System.out.println("绗�" + context.getCell().getRowIndex() + "琛�,绗�" + context.getCell().getColumnIndex() + "鏀粯鎬婚鍐欏叆鍏紡瀹屾垚");
- //}else if (cell.getColumnIndex() == 17){
- // // 瀹為檯鍒╂鼎
- // int actualCellRowNum = context.getCell().getRowIndex() + 1;
- // context.getCell().setCellFormula("L" + actualCellRowNum +"+Q" + actualCellRowNum);
- // System.out.println("绗�" + context.getCell().getRowIndex() + "琛�,绗�" + context.getCell().getColumnIndex() + "瀹為檯鍒╂鼎鍐欏叆鍏紡瀹屾垚");
- //}else if (cell.getColumnIndex() == 18){
- // // 搴旀敹娆�
- // int actualCellRowNum = context.getCell().getRowIndex() + 1;
- // context.getCell().setCellFormula("P" + actualCellRowNum +"+R" + actualCellRowNum);
- // System.out.println("绗�" + context.getCell().getRowIndex() + "琛�,绗�" + context.getCell().getColumnIndex() + "搴旀敹娆惧啓鍏ュ叕寮忓畬鎴�");
- //}else if (cell.getColumnIndex() == 20){
- // // 鏈敹娆�
- // int actualCellRowNum = context.getCell().getRowIndex() + 1;
- // context.getCell().setCellFormula("S" + actualCellRowNum +"-T" + actualCellRowNum);
- // System.out.println("绗�" + context.getCell().getRowIndex() + "琛�,绗�" + context.getCell().getColumnIndex() + "鏈敹娆惧啓鍏ュ叕寮忓畬鎴�");
- //}else if (cell.getColumnIndex() >= 2){
- // ((XSSFCellStyle) originCellStyle).setFillForegroundColor(new XSSFColor(new java.awt.Color(189, 215, 238), new DefaultIndexedColorMap()));
- //}else if (cell.getColumnIndex() < 2){
- // ((XSSFCellStyle) originCellStyle).setFillForegroundColor(new XSSFColor(new java.awt.Color(255, 192, 0), new DefaultIndexedColorMap()));
//}
}
@@ -169,5 +138,4 @@
cellData.getWriteCellStyle().setWriteFont(headWriteFont);
}
-}
-
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
index 1042061..2a8adb3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
@@ -1,12 +1,14 @@
package com.dy.pipIrrGlobal.voPr;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,39 +18,40 @@
* @author ZhuBaoMin
* @date 2023-12-29 10:27
* @LastEditTime 2023-12-29 10:27
- * @Description
+ * @Description 鎺у埗鍣ㄨ鍥惧璞�
*/
@Data
-@Schema(title = "鎺у埗鍣ㄨ鍥惧璞�")
+@JsonPropertyOrder({ "id", "rtuAddr", "intakeName", "bindNumber", "findDt", "isOnLine", "protocol", "remarks"})
+@HeadRowHeight(30)
+@ContentRowHeight(20)
public class VoController implements BaseEntity {
private static final long serialVersionUID = 202401241704003L;
@Schema(title = "ID")
- @ExcelProperty("ID")
- @ColumnWidth(10)
+ @ExcelIgnore
private String id;
@Schema(title = "鎺у埗鍣ㄥ湴鍧�")
- @ExcelProperty("鎺у埗鍣ㄥ湴鍧�")
+ @ExcelProperty(value = {"${title}", "闃�鎺у櫒鍦板潃"})
@ColumnWidth(15)
private String rtuAddr;
@Schema(title = "缁戝畾鍙栨按鍙�")
- @ExcelProperty("缁戝畾鍙栨按鍙�")
- @ColumnWidth(10)
+ @ExcelProperty(value = {"${title}", "鍙栨按鍙ｇ紪鍙�"})
+ @ColumnWidth(15)
private String intakeName;
@Schema(title = "缁戝畾娆℃暟")
- @ExcelProperty("缁戝畾娆℃暟")
+ @ExcelProperty(value = {"${title}", "缁戝畾娆℃暟"})
@ColumnWidth(10)
private Integer bindNumber;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(title = "鍙戠幇鏃ユ湡鏃堕棿")
- @ExcelProperty("鍙戠幇鏃ユ湡鏃堕棿")
- @ColumnWidth(30)
+ @ExcelProperty(value = {"${title}", "鍙戠幇鏃堕棿"})
+ @ColumnWidth(20)
private Date findDt;
// @Schema(title = "鍦ㄧ嚎鐘舵��")
@@ -59,16 +62,15 @@
/**
* 鏄惁鍦ㄧ嚎
*/
+ @ExcelIgnore
private Boolean isOnLine;
@Schema(title = "閫氳鍗忚")
- @ExcelProperty("閫氳鍗忚")
- @ColumnWidth(10)
+ @ExcelIgnore
private String protocol;
@Schema(title = "澶囨敞")
- @ExcelProperty("澶囨敞")
- @ColumnWidth(10)
+ @ExcelIgnore
private String remarks;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
index c8b7ece..530f5ad 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
@@ -3,8 +3,11 @@
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,62 +22,61 @@
*/
@Data
-@Schema(title = "鍙栨按鍙ｈ鍥惧璞�")
+@JsonPropertyOrder({ "intakeId", "intakeName", "divideId", "divideName", "blockId", "blockName", "isBind", "address", "lng", "lat", "operator", "operateDt", "remarks", "controllerId", "rtuAddr"})
+@HeadRowHeight(30)
+@ContentRowHeight(20)
public class VoIntake implements BaseEntity {
private static final long serialVersionUID = 202312261049001L;
@Schema(title = "鍙栨按鍙D")
- @ExcelProperty("鍙栨按鍙D")
- @ColumnWidth(10)
+ @ExcelIgnore
private String intakeId;
@Schema(title = "鍙栨按鍙ｅ悕绉�")
- @ExcelProperty("鍙栨按鍙ｅ悕绉�")
+ @ExcelProperty(value = {"${title}", "鍙栨按鍙ｇ紪鍙�"})
@ColumnWidth(15)
private String intakeName;
@Schema(title = "鍒嗘按鎴縄D")
- @ExcelProperty("鍒嗘按鎴縄D")
- @ColumnWidth(10)
+ @ExcelIgnore
private String divideId;
@Schema(title = "鎵�灞炲垎姘存埧")
- @ExcelProperty("鎵�灞炲垎姘存埧")
+ @ExcelProperty(value = {"${title}", "鎵�灞炲垎姘存埧"})
@ColumnWidth(15)
private String divideName;
@Schema(title = "鐗囧尯ID")
- @ExcelProperty("鐗囧尯ID")
- @ColumnWidth(15)
+ @ExcelIgnore
private String blockId;
@Schema(title = "鎵�灞炵墖鍖�")
- @ExcelProperty("鎵�灞炵墖鍖�")
+ @ExcelProperty(value = {"${title}", "鎵�灞炵墖鍖�"})
@ColumnWidth(15)
private String blockName;
@Schema(title = "缁戝畾璁惧")
- @ExcelProperty("缁戝畾璁惧")
- @ColumnWidth(6)
+ @ExcelProperty(value = {"${title}", "缁戝畾璁惧"})
+ @ColumnWidth(10)
private String isBind;
@Schema(title = "鍦板潃")
- @ExcelProperty("鍦板潃")
- @ColumnWidth(25)
+ @ExcelProperty(value = {"${title}", "鍦板潃"})
+ @ColumnWidth(30)
private String address;
@Schema(title = "缁忓害")
- @ExcelProperty("缁忓害")
- @ColumnWidth(25)
+ @ExcelProperty(value = {"${title}", "缁忓害"})
+ @ColumnWidth(20)
private String lng;
@Schema(title = "绾害")
- @ExcelProperty("绾害")
- @ColumnWidth(25)
+ @ExcelProperty(value = {"${title}", "绾害"})
+ @ColumnWidth(20)
private String lat;
@Schema(title = "鎿嶄綔浜�")
- @ExcelProperty("鎿嶄綔浜�")
+ @ExcelIgnore
@ColumnWidth(25)
private String operator;
@@ -85,17 +87,15 @@
private Date operateDt;
@Schema(title = "澶囨敞")
- @ExcelProperty("澶囨敞")
- @ColumnWidth(250)
+ @ExcelIgnore
private String remarks;
@Schema(title = "鎺у埗鍣↖D")
- @ExcelProperty("鎺у埗鍣↖D")
- @ColumnWidth(15)
+ @ExcelIgnore
private String controllerId;
@Schema(title = "鎺у埗鍣ㄥ湴鍧�")
- @ExcelProperty("鎺у埗鍣ㄥ湴鍧�")
+ @ExcelProperty(value = {"${title}", "鎺у埗鍣ㄥ湴鍧�"})
@ColumnWidth(15)
private String rtuAddr;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
index 57b15a9..9a85b2a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -31,6 +31,7 @@
/**
* 璁㈠崟鍙�
*/
+ @ExcelProperty(value = {"${title}", "璁㈠崟鍙�"})
@ColumnWidth(25)
private String orderNumber;
@@ -45,19 +46,21 @@
* 姘村崱缂栧彿
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- @ColumnWidth(15)
- private Long cardNum;
+ @ExcelProperty(value = {"${title}", "姘村崱缂栧彿"})
+ @ColumnWidth(20)
+ private String cardNum;
/**
* 韬唤璇佸彿
*/
+ @ExcelProperty(value = {"${title}", "韬唤璇佸彿"})
@ColumnWidth(15)
private String idCard;
/**
* 鍐滄埛缂栧彿
*/
- //@ExcelIgnore
+ @ExcelProperty(value = {"${title}", "鍐滄埛缂栧彿"})
@ColumnWidth(15)
private String clientNum;
@@ -113,6 +116,7 @@
/**
* 浣欓
*/
+ @ExcelProperty(value = {"${title}", "浣欓"})
@ColumnWidth(15)
private Double money;
@@ -141,12 +145,14 @@
/**
* 鏀堕摱鍛樺鍚�
*/
+ @ExcelProperty(value = {"${title}", "鏀堕摱鍛樺鍚�"})
@ColumnWidth(15)
private String cashierName;
/**
* 鍗＄墖鐘舵��
*/
+ @ExcelProperty(value = {"${title}", "鍗＄墖鐘舵��"})
@ColumnWidth(15)
private String cardState;
@@ -154,7 +160,7 @@
* 鏉戝簞鍚嶇О
*/
@ExcelProperty(value = {"${title}", "鏉戝簞鍚嶇О"})
- @ColumnWidth(20)
+ @ColumnWidth(35)
private String districtTitle;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index cf670a7..2bdde07 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -217,7 +217,7 @@
con.protocol,
inta.remarks,
rtus.isOnLine,
- (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) AS bindNumber,
+ (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND operateType = 1) AS bindNumber,
con.findDt AS findDt
FROM pr_controller con
LEFT JOIN pr_intake_controller ic ON ic.controllerId = con.id
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
index 9c251e9..d6dbe83 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
@@ -428,9 +428,9 @@
<if test="timeStart != null and timeStart != '' ">
OR rohrl.rtu_dt < #{timeStart}
</if>
- <if test="timeStop != null and timeStop != '' ">
- OR rohrl.rtu_dt > #{timeStop}
- </if>
+<!-- <if test="timeStop != null and timeStop != '' ">-->
+<!-- OR rohrl.rtu_dt > #{timeStop}-->
+<!-- </if>-->
ORDER BY rtu_dt ASC
</select>
<!--鑾峰彇鏈�杩戞湭鎶ユ暟鐨勫彇姘村彛-->
@@ -446,9 +446,9 @@
<if test="timeStart != null">
OR rohrl.rtu_dt < #{timeStart}
</if>
- <if test="timeStop != null">
- OR rohrl.rtu_dt > #{timeStop}
- </if>
+<!-- <if test="timeStop != null">-->
+<!-- OR rohrl.rtu_dt > #{timeStop}-->
+<!-- </if>-->
ORDER BY rtu_dt ASC
</select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index e8b00e6..90fbbba 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
@@ -244,13 +244,13 @@
@SsoAop()
public BaseResponse<Boolean> changePassword(String id, String oldPassword, String newPassword) throws Exception {
if (id == null) {
- return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
+ return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖");
}
if (StringUtils.isNullOrEmpty(oldPassword)) {
- return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉鑳戒负绌�");
+ return BaseResponseUtils.buildErrorMsg("鏃у瘑鐮佷笉鑳戒负绌�");
}
if (StringUtils.isNullOrEmpty(newPassword)) {
- return BaseResponseUtils.buildFail("鏂板瘑鐮佷笉鑳戒负绌�");
+ return BaseResponseUtils.buildErrorMsg("鏂板瘑鐮佷笉鑳戒负绌�");
}
/*
濡傛灉鍓嶇杩涜浜哹ase64鍔犲瘑
@@ -265,10 +265,10 @@
try {
BaUser po = this.sv.selectById(idLg);
if (Objects.isNull(po)) {
- return BaseResponseUtils.buildFail("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
+ return BaseResponseUtils.buildErrorMsg("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触");
} else {
if (!po.password.equalsIgnoreCase(oldPassword)) {
- return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉姝ｇ‘锛岃姹傚け璐�");
+ return BaseResponseUtils.buildErrorMsg("鏃у瘑鐮佷笉姝ｇ‘锛岃姹傚け璐�");
} else {
count = this.sv.changePassword(idLg, newPassword);
}
@@ -278,7 +278,7 @@
return BaseResponseUtils.buildException(e.getMessage());
}
if (count <= 0) {
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
return BaseResponseUtils.buildSuccess(true);
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
index e8a1df2..c68002e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
@@ -1,13 +1,14 @@
package com.dy.pipIrrProject.controller;
-import com.alibaba.fastjson2.JSONArray;
import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.fastjson2.JSONArray;
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.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.voPr.VoController;
@@ -32,6 +33,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.time.LocalDate;
import java.util.*;
/**
@@ -224,15 +226,19 @@
@SneakyThrows(IOException.class)
@RequestMapping(value = "/export", method = RequestMethod.GET)
public void export(HttpServletResponse response, QueryVo vo) {
- setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�");
- //List<VoDivide> memberList = LocalJsonUtil.getListFromJson("json/members.json", VoDivide.class);
- List<VoController> memberList = controllerSv.export(vo);
+ //setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�");
+ List<VoController> controllerList = controllerSv.export(vo);
+ ExcelUtil.setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�" + LocalDate.now());
+ EasyExcel.write(response.getOutputStream(), VoController.class)
+ .registerWriteHandler(new CellWriteHandler("鎺у埗鍣ㄥ垪琛�"))
+ .sheet("鎺у埗鍣�")
+ .doWrite(controllerList);
- EasyExcel.write(response.getOutputStream())
- .head(VoController.class)
- .excelType(ExcelTypeEnum.XLSX)
- .sheet("鎺у埗鍣ㄥ垪琛�")
- .doWrite(memberList);
+ //EasyExcel.write(response.getOutputStream())
+ // .head(VoController.class)
+ // .excelType(ExcelTypeEnum.XLSX)
+ // .sheet("鎺у埗鍣ㄥ垪琛�")
+ // .doWrite(memberList);
}
/**
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 44694c6..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.*;
@@ -240,8 +242,6 @@
log.error("淇濆瓨鍒嗘按鍙ｅ紓甯�", 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, "鍙栨按鍙ｅ垪琛�");
- //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("鍙栨按鍙ｅ垪琛�")
- .doWrite(memberList);
+ ExcelUtil.setExcelRespProp(response, "鍙栨按鍙ｅ垪琛�" + LocalDate.now());
+ EasyExcel.write(response.getOutputStream(), VoIntake.class)
+ .registerWriteHandler(new CellWriteHandler("鍙栨按鍙ｅ垪琛�"))
+ .sheet("鍙栨按鍙�")
+ .doWrite(intakeList);
}
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java
index 2190533..8466db3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java
@@ -6,8 +6,8 @@
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.excel.ReportExportCellWriteHandler;
import com.dy.pipIrrGlobal.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoSe.SeAudits;
import com.dy.pipIrrGlobal.pojoSe.SeGeneral;
@@ -94,7 +94,7 @@
List<VoGeneral> generalList = generalSv.exportGenerals(vo).getObj();
EasyExcel.write(response.getOutputStream(), VoGeneral.class)
- .registerWriteHandler(new ReportExportCellWriteHandler("璐㈠姟瀵硅处-鎬昏处"))
+ .registerWriteHandler(new CellWriteHandler("璐㈠姟瀵硅处-鎬昏处"))
.sheet("鎬昏处")
.doWrite(generalList);
}
@@ -270,8 +270,9 @@
list.add(po);
EasyExcel.write(response.getOutputStream(), VoTradeDetails.class)
- .registerWriteHandler(new ReportExportCellWriteHandler("璐㈠姟瀵硅处-浜ゆ槗鏄庣粏"))
+ .registerWriteHandler(new CellWriteHandler("璐㈠姟瀵硅处-浜ゆ槗鏄庣粏"))
.sheet("浜ゆ槗鏄庣粏")
.doWrite(list);
}
+
}
--
Gitblit v1.8.0