Merge branch 'feature-zhaji' into 'develop'

Feature zhaji

See merge request !249

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java

@@ -328,6 +328,8 @@ public interface CommonConstants {
 	String PARAM_IS_NOT_ERROR = "传参异常，请检查参数";
 	int EXCEL_EXPORT_LIMIT = 60000;
 
+	String USER = "用户";
+
 	/**
 	 * multipart/form-data
 	 * @Author fxj

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/ValidityConstants.java

@@ -69,6 +69,8 @@ public class ValidityConstants {
 	/** 最多200位 规则 */
 	public static final String PATTERN_200 = "[\\s\\S]{1,200}$";
 
+	public static String  NUMBER_OF_DECIMAL_PLACE= "^[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*$";
+
 	/** 不超过两位小数的正数 */
 	public static final String POSITIVE_INTEGER_PATTERN_TWO_FLOAT = "^[+]?([0-9]+(.[0-9]{1,2})?)$";
 	/** 身份证规则(x只能大写) */

yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpInsuranceUtil.java

@@ -38,28 +38,19 @@ public class EkpInsuranceUtil {
 	 * 注意key的书写格式,类似EL表达式的方式，属性关系用'.', 列表和数组关系用[]，Map关系用["xxx"]
 	 */
 	public String sendToEkp(EkpInteractiveParam param){
-		log.info("推送EKP开始");
 		RestTemplate yourRestTemplate = new RestTemplate();
 		EKPInsurancePushParam pushParam = insuranceDetail2PushParam(param);
 		try{
 			String formValues = new ObjectMapper().writeValueAsString(pushParam);
-			log.info("formValues:"+formValues);
 			//指向EKP的接口url
 			//把ModelingAppModelParameterAddForm转换成MultiValueMap
-			JSONObject loginName = new JSONObject();
-			loginName.append("LoginName",ekpInsuranceProperties.getInsuranceLoginName());
-			String loginData = new ObjectMapper().writeValueAsString(loginName);
 			MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
-			//wholeForm.add("docSubject", new String(docSubject.getBytes("UTF-8"),"ISO-8859-1") );
 			wholeForm.add("docSubject",ekpInsuranceProperties.getInsuranceFocSubject());
 			wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}");
-			//wholeForm.add("docCreator", loginData);
 			wholeForm.add("docStatus", ekpInsuranceProperties.getInsuranceDocStatus());
 			wholeForm.add("fdModelId", ekpInsuranceProperties.getInsuranceFdModelId());
 			wholeForm.add("fdFlowId", ekpInsuranceProperties.getInsuranceFdFlowId());
-			//wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1"));
 			wholeForm.add("formValues", formValues);
-			//wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") );
 			HttpHeaders headers = new HttpHeaders();
 			//如果EKP对该接口启用了Basic认证，那么客户端需要加入
 			//addAuth(headers,"yourAccount"+":"+"yourPassword");是VO，则使用APPLICATION_JSON
@@ -67,14 +58,14 @@ public class EkpInsuranceUtil {
 			//必须设置上传类型，如果入参是字符串，使用MediaType.TEXT_PLAIN；如果
 			HttpEntity<MultiValueMap<String,Object>> entity = new HttpEntity<MultiValueMap<String,Object>>(wholeForm,headers);
 			//有返回值的情况 VO可以替换成具体的JavaBean
+			log.info("推送EKP开始,formValues:"+formValues);
 			ResponseEntity<String> obj = yourRestTemplate.exchange(ekpInsuranceProperties.getInsuranceUrl(), HttpMethod.POST, entity, String.class);
-			log.info("obj:"+obj);
 			String body = obj.getBody();
 			if (StringUtils.isBlank(body)){
-				log.error("交易失败"+body);
+				log.error("交易失败:"+obj);
 				return null;
 			}else{
-				log.info("交易成功："+body);
+				log.info("交易成功："+obj);
 				return body;
 			}
 		}catch (Exception e){

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -1096,6 +1096,26 @@ public class InsurancesConstants {
 	 */
 	public static final String SETTLE_ID_ATYPISM = "结算id不一致";
 
+	/**
+	 * 获取项目信息失败
+	 */
+	public static final String GET_DEPT_DETAIL_ERROR = "获取项目信息失败:";
+
+	/**
+	 * 获取项目信息失败
+	 */
+	public static final String ERROR_LIST = "errorList";
+
+	/**
+	 * 获取项目信息失败
+	 */
+	public static final String SUCCESS_LIST = "successList";
+
+	/**
+	 * OSS文件上传接口异常：
+	 */
+	public static final String OSS_ERROR = "OSS文件上传接口异常：";
+
 
 
 

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/BigDecimalUtils.java

 package com.yifu.cloud.plus.v1.yifu.insurances.util;
 
 import com.google.common.base.Optional;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ValidityConstants;
 
 import java.math.BigDecimal;
 import java.util.regex.Matcher;
@@ -13,7 +15,6 @@ import java.util.regex.Pattern;
  * @Description 提供精确的浮点数运算(包括加、减、乘、除、四舍五入)工具类
  **/
 public class BigDecimalUtils {
-        static Pattern  p= Pattern.compile("^[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*$");
         /**
          * BigDecimal的加法运算封装
          * @author : shijing
@@ -50,7 +51,7 @@ public class BigDecimalUtils {
             Integer r = b1;
             if (null != bn) {
                 for (Integer b : bn) {
-                    r += Optional.fromNullable(b).or(0);
+                    r += Optional.fromNullable(b).or(CommonConstants.ZERO_INT);
                 }
             }
             return r > 0 ? r : 0;
@@ -87,7 +88,7 @@ public class BigDecimalUtils {
                     r = r.subtract((null == b ? BigDecimal.ZERO : b));
                 }
             }
-            return isZero ? (r.compareTo(BigDecimal.ZERO) == -1 ? BigDecimal.ZERO : r) : r;
+            return isZero ? (r.compareTo(BigDecimal.ZERO) == CommonConstants.ONE_INT_NEGATE ? BigDecimal.ZERO : r) : r;
         }
 
         /**
@@ -105,10 +106,10 @@ public class BigDecimalUtils {
             Integer r = b1;
             if (null != bn) {
                 for (Integer b : bn) {
-                    r -= Optional.fromNullable(b).or(0);
+                    r -= Optional.fromNullable(b).or(CommonConstants.ZERO_INT);
                 }
             }
-            return null != r && r > 0 ? r : 0;
+            return null != r && r > CommonConstants.ZERO_INT ? r : CommonConstants.ZERO_INT;
         }
 
         /**
@@ -151,7 +152,7 @@ public class BigDecimalUtils {
                 return defaultValue;
             }
             try {
-                return BigDecimal.valueOf(b1.doubleValue()).divide(BigDecimal.valueOf(b2.doubleValue()), 2, BigDecimal.ROUND_HALF_UP);
+                return BigDecimal.valueOf(b1.doubleValue()).divide(BigDecimal.valueOf(b2.doubleValue()), CommonConstants.TWO_INT, BigDecimal.ROUND_HALF_UP);
             } catch (Exception e) {
                 return defaultValue;
             }
@@ -190,7 +191,7 @@ public class BigDecimalUtils {
             if (null == b1 || null == b2) {
                 return BigDecimal.ZERO;
             }
-            return BigDecimal.valueOf(b1.doubleValue()).multiply(BigDecimal.valueOf(b2.doubleValue())).setScale(2, BigDecimal.ROUND_HALF_UP);
+            return BigDecimal.valueOf(b1.doubleValue()).multiply(BigDecimal.valueOf(b2.doubleValue())).setScale( CommonConstants.TWO_INT, BigDecimal.ROUND_HALF_UP);
         }
         public static <T extends Number> BigDecimal safeMultiply(T b1, T b2, T b3) {
             if (null == b1 || null == b2 || null == b3) {
@@ -249,7 +250,7 @@ public class BigDecimalUtils {
 		if (null == bigDecimal){
 			return true;
 		}
-		if (bigDecimal.compareTo(BigDecimal.ZERO) == 0){
+		if (bigDecimal.compareTo(BigDecimal.ZERO) ==  CommonConstants.ZERO_INT){
 			return true;
 		}
 		return false;
@@ -265,7 +266,7 @@ public class BigDecimalUtils {
             if (null == b1) {
                 return BigDecimal.ZERO;
             }
-            return BigDecimal.valueOf(b1.doubleValue()).setScale(2, BigDecimal.ROUND_HALF_UP);
+            return BigDecimal.valueOf(b1.doubleValue()).setScale(CommonConstants.TWO_INT, BigDecimal.ROUND_HALF_UP);
         }
 
     /**
@@ -274,16 +275,16 @@ public class BigDecimalUtils {
      * @return
      */
     public static boolean isBigDecimal(String str){
-        if(str==null || str.trim().length() == 0){
+        if(str==null || str.trim().length() == CommonConstants.ZERO_INT){
             return false;
         }
         char[] chars = str.toCharArray();
         int sz = chars.length;
-        int i = (chars[0] == '-') ? 1 : 0;
+        int i = (chars[CommonConstants.ZERO_INT] == '-') ? CommonConstants.ONE_INT : CommonConstants.ZERO_INT;
         if(i == sz){
             return false;
         }
-        if(chars[i] == '.'){
+        if(chars[i] == CommonConstants.SPOT_CHAR){
             //除了负号，第一位不能为'小数点'
             return false;
         }
@@ -333,6 +334,7 @@ public class BigDecimalUtils {
      * @return double
      */
     public static BigDecimal getNumberOfDecimalPlace(String str, int point) {
+		Pattern  p= Pattern.compile(ValidityConstants.NUMBER_OF_DECIMAL_PLACE);
         Matcher m=p.matcher(str);
         boolean b=m.matches();
         if(b){

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java

@@ -122,7 +122,7 @@ public class ValidityUtil {
      * @param email 邮箱（电子邮件）
      * @return boolean
      */
-    public static boolean validateEamil(final String email){
+    public static boolean validateEmail(final String email){
         if(Common.isEmpty(email)){
             return Boolean.FALSE ;
         }
@@ -169,11 +169,11 @@ public class ValidityUtil {
 			return Boolean.FALSE ;
 		}
 		BigDecimal bigDecimalMoney= new BigDecimal(money);
-		boolean max = bigDecimalMoney.compareTo(CommonConstants.MONEY_MAX) >0;
+		boolean max = bigDecimalMoney.compareTo(CommonConstants.MONEY_MAX) >CommonConstants.ZERO_INT;
 		if(max){
 			return Boolean.FALSE ;
 		}
-		boolean min = bigDecimalMoney.compareTo(CommonConstants.MONEY_MIN) <=0;
+		boolean min = bigDecimalMoney.compareTo(CommonConstants.MONEY_MIN) <=CommonConstants.ZERO_INT;
 		if(min){
 			return Boolean.FALSE ;
 		}
@@ -202,7 +202,7 @@ public class ValidityUtil {
 	 */
 	public static boolean validateMoneyMax(final String money) {
 		BigDecimal bigDecimalMoney= new BigDecimal(money);
-		boolean max = bigDecimalMoney.compareTo(CommonConstants.MONEY_MAX) >0;
+		boolean max = bigDecimalMoney.compareTo(CommonConstants.MONEY_MAX) >CommonConstants.ZERO_INT;
 		if(max){
 			return Boolean.FALSE ;
 		}
@@ -345,7 +345,7 @@ public class ValidityUtil {
         if (!validateMobile(phone)){
             return Boolean.FALSE;
         }
-        String initializeInfo = "用户".concat(phone.substring(phone.length()-6, phone.length()));
+        String initializeInfo = CommonConstants.USER.concat(phone.substring(phone.length()-CommonConstants.SIX_INT, phone.length()));
         if (!str.trim().equals(initializeInfo)){
             return Boolean.FALSE;
         }
@@ -393,13 +393,13 @@ public class ValidityUtil {
             return false;
         }
 
-        if(numStr==""){
+        if(CommonConstants.EMPTY_STRING.equals(numStr)){
             return false;
         }
         //验证是否是float型
-        if(numStr.contains(".")){
-            if(numStr.indexOf('.')==numStr.lastIndexOf('.')){
-                StringTokenizer st=new StringTokenizer(numStr,".");
+        if(numStr.contains(CommonConstants.SPOT)){
+            if(numStr.indexOf(CommonConstants.SPOT_CHAR)==numStr.lastIndexOf(CommonConstants.SPOT_CHAR)){
+                StringTokenizer st=new StringTokenizer(numStr,CommonConstants.SPOT);
                 while(st.hasMoreElements()){
                     String splitStr= st.nextToken();
                     for(int i=splitStr.length();--i>=0;){
@@ -429,15 +429,15 @@ public class ValidityUtil {
             return false;
         }
 
-        if(numStr==""){
+        if(CommonConstants.EMPTY_STRING.equals(numStr)){
             return false;
         }
         //验证是否是float型
-        if(numStr.contains(".")){
+        if(numStr.contains(CommonConstants.SPOT)){
             return false;
         }else{
             //验证是否是int型
-            for(int i=numStr.length();--i>=0;){
+            for(int i=numStr.length();--i>=CommonConstants.ZERO_INT;){
                 if(!Character.isDigit(numStr.charAt(i))){
                     return false;
                 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceEnclosureServiceImpl.java

@@ -63,15 +63,14 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
 		if (file.getSize() > (CommonConstants.FIFTY_INT*CommonConstants.BYTE*CommonConstants.BYTE)){
 			return R.failed(InsurancesConstants.INSURANCE_ENCLOSURE_SIZE_ERROR);
 		}
-		String enclosureName =  Objects.requireNonNull(file.getOriginalFilename()).substring(0,file.getOriginalFilename().lastIndexOf("."));
-		String fileName = System.currentTimeMillis() + "_" + file.getOriginalFilename();
+		String fileName = System.currentTimeMillis() + CommonConstants.DOWN_LINE_STRING + file.getOriginalFilename();
 		//filePath不传默认存储空间的根目录
 		//支持的附件格式
 		String key = "";
 		if (!Common.isNotNull(filePath)) {
 			key = fileName;
 		} else {
-			key = filePath + "/" + fileName;
+			key = filePath + CommonConstants.SLASH_SPLIT_LINE_STRING + fileName;
 		}
 		boolean flag = ossUtil.uploadFileByStream(file.getInputStream(), key, null);
 		if (flag) {
@@ -92,7 +91,7 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
 			try {
 				this.save(insuranceEnclosure);
 			} catch (Exception e) {
-				log.error("OSS文件上传接口异常：" + e.getMessage());
+				log.error(InsurancesConstants.OSS_ERROR + e.getMessage());
 				ossUtil.deleteObject(null, key);
 				return R.failed("failed:" + e.getMessage());
 			}