From c3e31f2f61e38505501a7f7816c94411f78cae63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com>
Date: Fri, 30 Apr 2021 10:28:18 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=92=E8=89=B2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=96=B9=E6=B3=95=202=E3=80=81=E5=B9=82?=
 =?UTF-8?q?=E7=AD=89=E6=80=A7=E5=8E=BB=E6=8E=89=E7=BB=9F=E4=B8=80=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=89=8D=E7=BC=80=203=E3=80=81excel=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebtp/common/constant/EbtpRoleEnum.java    | 13 ++++++
 .../idempotent/aspect/IdempotentAspect.java   |  2 +-
 .../poiExport/constant/ExportConstant.java    | 40 +++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/constant/EbtpRoleEnum.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/constant/EbtpRoleEnum.java
index 8cb78d9..fb220c2 100644
--- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/constant/EbtpRoleEnum.java
+++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/constant/EbtpRoleEnum.java
@@ -1,5 +1,7 @@
 package com.chinaunicom.mall.ebtp.common.constant;
 
+import java.util.Arrays;
+
 public enum EbtpRoleEnum {
 
 
@@ -25,6 +27,8 @@ public enum EbtpRoleEnum {
 
     SYSTEM_ADMIN("ebtp-system-admin", "EBTP系统管理员"),
 
+    DEFAULT("", ""),
+
     ;
 
 
@@ -38,6 +42,15 @@ public enum EbtpRoleEnum {
         this.desc = desc;
     }
 
+    public static EbtpRoleEnum matchDesc(String desc) {
+        return Arrays.stream(values()).filter(o -> o.getDesc().equals(desc)).findAny().orElse(DEFAULT);
+    }
+
+    public static EbtpRoleEnum matchRole(String role) {
+        return Arrays.stream(values()).filter(o -> o.getRole().equals(role)).findAny().orElse(DEFAULT);
+    }
+
+
     public String getRole() {
         return role;
     }
diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/idempotent/aspect/IdempotentAspect.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/idempotent/aspect/IdempotentAspect.java
index 367a16b..f210919 100644
--- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/idempotent/aspect/IdempotentAspect.java
+++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/idempotent/aspect/IdempotentAspect.java
@@ -82,7 +82,7 @@ public class IdempotentAspect {
 		String value = LocalDateTime.now().toString().replace("T", " ");
 		if (null != rMapCache.get(key)) {
 			// had stored
-			CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("[idempotent]:" + info,true);
+			CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName(info,true);
 		}
 		synchronized (this) {
 			boolean submitAble = redisTemplate.opsForValue().setIfAbsent(key, value,expireTime,timeUnit);
diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/poiExport/constant/ExportConstant.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/poiExport/constant/ExportConstant.java
index 5ac6418..fc2f96e 100644
--- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/poiExport/constant/ExportConstant.java
+++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/poiExport/constant/ExportConstant.java
@@ -140,10 +140,50 @@ public class ExportConstant {
         }else if("content_black".equals(key)){
 
             return ExportConstant.getContentStyle(wb,"宋体",11,color);
+        }else if("noBorderCenter16".equals(key)){
+            return ExportConstant.noBorderCenter16(wb);
+        }else if("noBorderLeft12".equals(key)){
+            return ExportConstant.noBorderLeft12(wb);
+        }else if("noBorderRight12".equals(key)){
+            return ExportConstant.noBorderRight12(wb);
         }
 
         return ExportConstant.getContentStyle(wb,"宋体",11,color);
     }
+
+    public static XSSFCellStyle noBorderCenter16(XSSFWorkbook wb){
+        XSSFCellStyle cellStyle = wb.createCellStyle();
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);//水平居中
+        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//垂直居中
+
+        XSSFFont font = wb.createFont();
+        font.setFontHeightInPoints((short) 16);
+        cellStyle.setFont(font);
+        return cellStyle;
+    }
+
+    public static XSSFCellStyle noBorderLeft12(XSSFWorkbook wb){
+        XSSFCellStyle cellStyle = wb.createCellStyle();
+        cellStyle.setAlignment(HorizontalAlignment.LEFT);//水平居左
+        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//垂直居中
+
+        XSSFFont font = wb.createFont();
+        font.setFontHeightInPoints((short) 12);
+        cellStyle.setFont(font);
+        return cellStyle;
+    }
+
+    public static XSSFCellStyle noBorderRight12(XSSFWorkbook wb){
+        XSSFCellStyle cellStyle = wb.createCellStyle();
+        cellStyle.setAlignment(HorizontalAlignment.RIGHT);//水平居右
+        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//垂直居中
+
+        XSSFFont font = wb.createFont();
+        font.setFontHeightInPoints((short) 12);
+        cellStyle.setFont(font);
+        return cellStyle;
+    }
+
     /**
      * 获取表头项目名称一列的样式
      * @param wb 文本对象