From ba5210dc8c6c537cacc59c18d58baa9744cd2b9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:14:39 +0800
Subject: [PATCH] 优化报修单推送bug
---
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java | 157 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 126 insertions(+), 31 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java b/java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
index 8e5a337..f342f18 100644
--- a/java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
@@ -1,14 +1,13 @@
package com.java110.core.factory;
import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.idSeq.IdSeqDto;
import com.java110.intf.code.ICodeApi;
+import com.java110.intf.order.IIdSeqInnerServiceSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
-import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.GenerateCodeException;
-import com.java110.utils.exception.ResponseErrorException;
import com.java110.utils.factory.ApplicationContextFactory;
-import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import org.springframework.web.client.RestTemplate;
@@ -59,7 +58,7 @@
public static final String CODE_PREFIX_subCommentAttrId = "62";
public static final String CODE_PREFIX_commentPhotoId = "63";
public static final String CODE_PREFIX_commentScoreId = "64";
- public static final String CODE_PREFIX_communityId = "70";
+ public static final String CODE_PREFIX_communityId = "";
public static final String CODE_PREFIX_communityPhotoId = "71";
public static final String CODE_PREFIX_communityMemberId = "72";
public static final String CODE_PREFIX_feeId = "90";
@@ -138,7 +137,7 @@
public static final String CODE_PREFIX_appraiseId = "80";
public static final String CODE_PREFIX_rentingConfigId = "81";
public static final String CODE_PREFIX_rentingId = "81";
-
+ public static final String CODE_PREFIX_addressId = "82";
public static final String CODE_PREFIX_waterId = "78";
@@ -147,6 +146,8 @@
public static final String CODE_PREFIX_appointmentId = "80";
public static final String CODE_PREFIX_contractId = "81";
public static final String CODE_PREFIX_contractTypeId = "81";
+ public static final String CODE_PREFIX_contractFileId = "89";
+
public static final String CODE_PREFIX_specCd = "82";
public static final String CODE_PREFIX_loginId = "82";
public static final String CODE_PREFIX_templateId = "82";
@@ -155,7 +156,72 @@
public static final String CODE_PREFIX_auditId = "84";
public static final String CODE_PREFIX_typeCd = "85";
public static final String CODE_PREFIX_docId = "86";
+ public static final String CODE_PREFIX_categoryId = "87";
+ public static final String CODE_PREFIX_specId = "88";
+ public static final String CODE_PREFIX_productId = "90";
+ public static final String CODE_PREFIX_valueId = "91";
+ public static final String CODE_PREFIX_groupId = "92";
+ public static final String CODE_PREFIX_batchId = "93";
+ public static final String CODE_PREFIX_statisticsId = "94";
+ public static final String CODE_PREFIX_labelId = "94";
+ public static final String CODE_PREFIX_cartId = "95";
+ public static final String CODE_PREFIX_orderId = "96";
+ public static final String CODE_PREFIX_oaId = "97";
+ public static final String CODE_PREFIX_logId = "10";
+ public static final String CODE_PREFIX_eventId = "11";
+ public static final String CODE_PREFIX_returnId = "12";
+ public static final String CODE_PREFIX_discountId = "13";
+ public static final String CODE_PREFIX_ruleId = "14";
+ public static final String CODE_PREFIX_configDiscountId = "14";
+ public static final String CODE_PREFIX_detailDiscountId = "15";
+ public static final String CODE_PREFIX_errId = "10";
+ public static final String CODE_PREFIX_IfdId = "11";
+ public static final String CODE_PREFIX_databusId = "12";
+ public static final String CODE_PREFIX_auId = "13";
+ public static final String CODE_PREFIX_ardId = "14";
+ public static final String CODE_PREFIX_applyType = "15";
+ public static final String CODE_PREFIX_classesId = "16";
+ public static final String CODE_PREFIX_rId = "17";
+ public static final String CODE_PREFIX_qaId = "18";
+ public static final String CODE_PREFIX_titleId = "19";
+ public static final String CODE_PREFIX_userQaId = "20";
+ public static final String CODE_PREFIX_userTitleId = "21";
+ public static final String CODE_PREFIX_beId = "22";
+ public static final String CODE_PREFIX_collectionId = "23";
+ public static final String CODE_PREFIX_authId = "23";
+ public static final String CODE_PREFIX_planId = "24";
+ public static final String CODE_PREFIX_visitId = "24";
+ public static final String CODE_PREFIX_shId = "25";
+ public static final String CODE_PREFIX_allocationStorehouseId = "26";
+ public static final String CODE_PREFIX_usId = "27";
+ public static final String CODE_PREFIX_rstId = "28";
+ public static final String CODE_PREFIX_crId = "28";
+ public static final String CODE_PREFIX_partyaId = "28";
+ public static final String CODE_PREFIX_rsId = "29";
+ public static final String CODE_PREFIX_ausId = "29";
+ public static final String CODE_PREFIX_rsurId = "30";
+ public static final String CODE_PREFIX_applyId = "29";
+ public static final String CODE_PREFIX_prId = "30";
+ public static final String CODE_PREFIX_acctId = "31";
+ public static final String CODE_PREFIX_vipAcctId = "32";
+ public static final String CODE_PREFIX_rssId = "33";
+ public static final String CODE_PREFIX_pfId = "34";
+ public static final String CODE_PREFIX_ARDRID = "35";
+ public static final String CODE_PREFIX_csId = "36";
+ public static final String CODE_PREFIX_bankId = "74";
+ public static final String CODE_PREFIX_bondId = "76";
+ public static final String CODE_PREFIX_bobjId = "77";
+ public static final String CODE_PREFIX_smsId = "78";
+ public static final String CODE_PREFIX_adsId = "78";
+ public static final String CODE_PREFIX_userAnId = "88";
+ public static final String CODE_PREFIX_anValueId = "68";
+ public static final String CODE_PREFIX_backId = "78";
+ public static final String CODE_PREFIX_monthId = "79";
+ public static final String CODE_PREFIX_xmlId = "79";
+ public static final String CODE_PREFIX_formId = "80";
+ public static final String CODE_PREFIX_dataId = "81";
+ public static final String CODE_PREFIX_tranId = "82";
/**
@@ -195,7 +261,7 @@
prefixMap.put("subCommentAttrId", "62");
prefixMap.put("commentPhotoId", "63");
prefixMap.put("commentScoreId", "64");
- prefixMap.put("communityId", "70");
+ prefixMap.put("communityId", "");
prefixMap.put("communityPhotoId", "71");
prefixMap.put("communityMemberId", "72");
prefixMap.put("agentId", "80");
@@ -226,6 +292,7 @@
return getRandom() + String.format(idLength, count);
}
}
+
public static String nextId() {
return nextId("%04d");
@@ -280,13 +347,55 @@
}
/**
+ * 鑾峰彇杞︿綅ID
+ *
+ * @return
+ * @throws GenerateCodeException
+ */
+ public static String getPsId(String prefix) throws GenerateCodeException {
+ if (!MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_NEED_INVOKE_GENERATE_ID))) {
+ return prefix + DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_H) + nextId("%04d");
+ }
+ //璋冪敤鏈嶅姟
+ return getCode(prefix);
+ }
+
+ /**
+ * 鑾峰彇璧勬簮ID
+ *
+ * @return
+ * @throws GenerateCodeException
+ */
+ public static String getResId(String prefix) throws GenerateCodeException {
+ if (!MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_NEED_INVOKE_GENERATE_ID))) {
+ return prefix + DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_H) + nextId("%04d");
+ }
+ //璋冪敤鏈嶅姟
+ return getCode(prefix);
+ }
+
+ /**
+ * 鐢熸垚璐圭敤id
+ *
+ * @return
+ * @throws GenerateCodeException
+ */
+ public static String getFeeId(String prefix) throws GenerateCodeException {
+ if (!MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_NEED_INVOKE_GENERATE_ID))) {
+ return prefix + DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_H) + nextId("%04d");
+ }
+ //璋冪敤鏈嶅姟
+ return getCode(prefix);
+ }
+
+ /**
* 瑙勬牸ID
*
* @return
* @throws GenerateCodeException
*/
public static String getSpecCd() throws GenerateCodeException {
- return DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_L) + nextId("%04d");
+ return nextId("%06d");
}
public static String getOId() throws GenerateCodeException {
@@ -306,29 +415,11 @@
*/
private static String getCode(String prefix) throws GenerateCodeException {
//璋冪敤鏈嶅姟
- String code = "-1";
- try {
- String responseMessage = restTemplate().postForObject(MappingCache.getValue(MappingConstant.KEY_CODE_PATH),
- createCodeRequestJson(getTransactionId(), prefix, prefix).toJSONString(), String.class);
+ IIdSeqInnerServiceSMO idSeqInnerServiceSMOImpl = ApplicationContextFactory.getBean(IIdSeqInnerServiceSMO.class.getName(), IIdSeqInnerServiceSMO.class);
+ IdSeqDto idSeqDto = new IdSeqDto(prefix);
+ idSeqDto = idSeqInnerServiceSMOImpl.generateCode(idSeqDto);
- if (ResponseConstant.RESULT_CODE_ERROR.equals(responseMessage)) {
- throw new ResponseErrorException(ResponseConstant.RESULT_CODE_ERROR, "鐢熸垚oId缂栫爜澶辫触");
- }
- Assert.jsonObjectHaveKey(responseMessage, "code", "缂栫爜鐢熸垚绯荤粺 杩斿洖鎶ユ枃閿欒" + responseMessage);
-
- JSONObject resJson = JSONObject.parseObject(responseMessage);
-
- if (!ResponseConstant.RESULT_CODE_SUCCESS.equals(resJson.getString("code"))) {
- throw new ResponseErrorException(resJson.getString("code"), "鐢熸垚oId缂栫爜澶辫触 "
- + resJson.getString("message"));
- }
- code = resJson.getString("id");
- } catch (Exception e) {
- throw new GenerateCodeException(ResponseConstant.RESULT_CODE_ERROR, e.getMessage());
- } finally {
- return code;
- }
-
+ return idSeqDto.getId();
}
public static String getBId() throws GenerateCodeException {
@@ -475,7 +566,6 @@
//璋冪敤鏈嶅姟
return getCode(prefixMap.get("agentId"));
}
-
/**
* 鑾峰彇灏忓尯鐓х墖ID
@@ -812,7 +902,6 @@
return getCode(prefixMap.get("pgId"));
}
-
/**
* 鑾峰彇restTemplate
*
@@ -890,4 +979,10 @@
}
return result;
}
+
+ public static String getUUID() {
+ UUID uuid = UUID.randomUUID();
+ return uuid.toString().replaceAll("-", "");
+ }
+
}
--
Gitblit v1.8.0