From ddbb93dae803ea73b06bad25fb12eaa322768d18 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 09 七月 2024 19:14:19 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 129 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 113 insertions(+), 16 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 15a4398..a76e3db 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -1,15 +1,16 @@
package com.doumee.core.utils;
+import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdcardUtil;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.dto.CountCyclePriceDTO;
-import com.doumee.dao.business.model.ApplyDetail;
-import com.doumee.dao.business.model.Solutions;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ChangeDealTypeVO;
import com.doumee.dao.business.vo.CountCyclePriceVO;
import io.swagger.models.auth.In;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.compress.archivers.zip.Zip64Mode;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
import org.apache.commons.lang3.StringUtils;
@@ -96,7 +97,73 @@
public static final String DU_FILE ="DU_FILE" ;
public static final String SIGN_DONE_NOTIFY_URL = "SIGN_DONE_NOTIFY_URL";
public static final int FOUR = 4;
+ public static final String COMPANY_PHONE_AUTH ="COMPANY_PHONE_AUTH" ;
+
+ /**
+ * 鑾峰彇鐢宠鍗曟椂闂村垪鏍囬
+ * @param type 0寮�濮嬫椂闂� 1鎴鏃堕棿
+ * @param model
+ * @return
+ */
+ public static String getApplyTimeTitle(int type, InsuranceApply model){
+ if(type ==1){
+ if(Constants.equalsInteger(model.getSolutionType(),Constants.ONE)){
+ return Constants.equalsInteger(model.getUnionApplyTbdStatus(),Constants.THREE)?"淇濋櫓鐢熸晥璧锋湡":"鏈熸湜淇濋櫓鐢熸晥璧锋湡";
+ }else{
+ return Constants.equalsInteger(model.getStatus(), InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())?"淇濋櫓鐢熸晥璧锋湡":"鏈熸湜淇濋櫓鐢熸晥璧锋湡";
+ }
+ }else{
+ if(Constants.equalsInteger(model.getSolutionType(),Constants.ONE)){
+ return Constants.equalsInteger(model.getUnionApplyTbdStatus(),Constants.THREE)?"淇濋櫓鐢熸晥姝㈡湡":"棰勮鐢熸晥姝㈡湡";
+ }else{
+ return Constants.equalsInteger(model.getStatus(), InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())?"淇濋櫓鐢熸晥姝㈡湡":"棰勮鐢熸晥姝㈡湡";
+ }
+ }
+
+ }
+
+ /**
+ * 鑾峰彇鎵规敼鍗曟椂闂存爣棰樺垪
+ * @param type 0鏇存崲娲鹃仯鍗曚綅 1鍔犱繚 0鍑忎繚
+ * @param model
+ * @return
+ */
+ public static String getChangeApplyTimeTitle(int type, ApplyChange model){
+ if(type ==2){
+ return Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"鎵瑰崟鐢熸晥鏈�":"鏈熸湜鎵瑰崟鐢熸晥鏈�";
+ }else if(type ==1){
+ return Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"鎵瑰鐢熸晥璧锋湡":"鏈熸湜鎵瑰鐢熸晥璧锋湡";
+ }else{
+ return Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"鎵瑰噺鐢熸晥璧锋湡":"鏈熸湜鎵瑰噺鐢熸晥璧锋湡";
+ }
+ }
+
+
+ public static String getApplyTimeTitle(int type, UnionApply model){
+ if(type ==1){
+ return Constants.equalsInteger(model.getStatus(), UnionApplyStatus.FINISH.getKey())?"淇濋櫓鐢熸晥璧锋湡":"鏈熸湜淇濋櫓鐢熸晥璧锋湡";
+ }else{
+ return Constants.equalsInteger(model.getStatus(), UnionApplyStatus.FINISH.getKey())?"淇濋櫓鐢熸晥姝㈡湡":"棰勮鐢熸晥姝㈡湡";
+ }
+
+ }
+
+ /**
+ * 鑾峰彇鎵规敼鍗曟椂闂存爣棰樺垪
+ * @param type 0鏇存崲娲鹃仯鍗曚綅 1鍔犱繚 0鍑忎繚
+ * @param model
+ * @return
+ */
+ public static String getChangeApplyTimeTitle(int type, UnionChange model){
+ if(type ==2){
+ return Constants.equalsInteger(model.getStatus(), UnionChangeStatus.FINISH.getKey())?"鎵瑰崟鐢熸晥鏈�":"鏈熸湜鎵瑰崟鐢熸晥鏈�";
+ }else if(type ==1){
+ return Constants.equalsInteger(model.getStatus(), UnionChangeStatus.FINISH.getKey())?"鎵瑰鐢熸晥璧锋湡":"鏈熸湜鎵瑰鐢熸晥璧锋湡";
+ }else{
+ return Constants.equalsInteger(model.getStatus(), UnionChangeStatus.FINISH.getKey())?"鎵瑰噺鐢熸晥璧锋湡":"鏈熸湜鎵瑰噺鐢熸晥璧锋湡";
+ }
+ }
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
*/
@@ -386,7 +453,7 @@
if(StringUtils.isBlank(idCard)){
return 2;
}
- Pattern pattern = Pattern.compile("\\d{17}[\\d|x]"); // 瀹氫箟韬唤璇佸彿鐮佹牸寮忕殑姝ｅ垯琛ㄨ揪寮�
+ Pattern pattern = Pattern.compile("\\d{17}[\\d|x|X]"); // 瀹氫箟韬唤璇佸彿鐮佹牸寮忕殑姝ｅ垯琛ㄨ揪寮�
Matcher matcher = pattern.matcher(idCard);
Integer sex = 0;
if (matcher.matches()) {
@@ -401,6 +468,7 @@
}
return sex;
}
+
/**
* 鐘舵�� 0宸蹭繚瀛樸��1寰呭鏍搞��2瀹℃牳閫氳繃銆�3閫�鍥炰慨鏀广��4瀹℃牳椹冲洖銆�5寰呮湇鍔℃満鏋勭‘璁ゃ��6鏈嶅姟鏈烘瀯鎷掔粷銆�7宸插垎閰嶆湇鍔℃満鏋勩��8璇婃柇涓�
@@ -759,9 +827,12 @@
}
public static void main(String[] args) {
-
- System.out.println(IdcardUtil.isValidCard("340621199310134818"));
- System.out.println(IdcardUtil.isValidCard("341621199310134818"));
+ System.out.println(IdcardUtil.isValidCard("342623199201150101"));
+ System.out.println(IdcardUtil.isValidCard("342623199201150102"));
+ System.out.println(IdcardUtil.isValidCard("342623199201150103"));
+ System.out.println(IdcardUtil.isValidCard("342623199201150104"));
+// System.out.println(IdcardUtil.isValidCard("340621199310134818"));
+// System.out.println(IdcardUtil.isValidCard("341621199310134818"));
// System.out.println("{\"companyName\":\"搴斿疂绉戞妧\",\"endtime\":\"2024-03-01 17:19:00\",\"erpId\":\"4D40185D5BC74A13821BE46EAF8B4179\",\"erpWithVisitDTOList\":[],\"faceImg\":\"20240304/1709518170325_742.jpg\",\"idcardNo\":\"342501199609300535\",\"idcardType\":0,\"name\":\"榛勬檵\",\"phone\":\"17756328697\",\"reason\":\"鎺㈤櫓\",\"receptMemberId\":\"E7E514BD7DE3F27CE0530B630A0AEAE0\",\"starttime\":\"2024-03-01 13:18:00\"}");
}
@@ -2133,7 +2204,13 @@
InputStream inStream = null;
OutputStream os = null;
try {
- String tempDir = System.getProperty("java.io.tmpdir")+fileName;
+ String tempDir = "C:\\hj\\jars\\temp\\";
+ File f = new File(tempDir);
+ if(!f.exists() ){
+ f.mkdirs();
+ }
+ tempDir += fileName;
+ System.out.println(url+"================="+tempDir);
file = new File(tempDir);
//涓嬭浇
urlfile = new URL(url);
@@ -2159,25 +2236,44 @@
}
}
}catch (Exception e){
-
+ e.printStackTrace();
}
return file;
}
- public static void packFilesToZip(List<File> files, ServletOutputStream os) throws IOException {
- try (ZipArchiveOutputStream zipOutputStream = new ZipArchiveOutputStream(os)) {
+ public static void packFilesToZip(List<File> files, OutputStream os) throws IOException {
+ try {
+ ZipArchiveOutputStream zipOutputStream = new ZipArchiveOutputStream(os);
+ zipOutputStream.setUseZip64(Zip64Mode.AsNeeded);
for (File file : files) {
+ if(!file.exists()){
+ System.out.println("===鏂囦欢涓嶅瓨鍦�======="+file.getPath());
+ continue;
+ }else{
+ System.out.println("===鏂囦欢瀛樺湪======="+file.getPath());
+ }
ZipArchiveEntry entry = new ZipArchiveEntry(file.getName());
zipOutputStream.putArchiveEntry(entry);
- try (FileInputStream fileInputStream = new FileInputStream(file)) {
- byte[] buffer = new byte[1024];
- int length;
- while ((length = fileInputStream.read(buffer)) > 0) {
- zipOutputStream.write(buffer, 0, length);
- }
+ FileInputStream fileInputStream = new FileInputStream(file);
+ byte[] buffer = new byte[1024];
+ int length;
+ while ((length = fileInputStream.read(buffer)) > 0) {
+ zipOutputStream.write(buffer, 0, length);
}
zipOutputStream.closeArchiveEntry();
+ zipOutputStream.flush();
+ IoUtil.close(fileInputStream);
file.delete();
+ }
+ }catch (Exception e){
+ throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR.getCode(),"瀵逛笉璧凤紝涓嬭浇鍘嬬缉鏂囦欢澶辫触");
+ }finally {
+ if (os != null) {
+ try {
+ os.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
}
}
@@ -2379,4 +2475,5 @@
}
}
+
}
--
Gitblit v1.9.3