From 39e49bdfab3d77951f2a9b22f84a22d7980de8b7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 22 四月 2021 15:54:33 +0800
Subject: [PATCH] 1、新增物品类型表可维护物品类型2、新增物品的出入库操作 无需进行走申请流程3、部分查询条件优化
---
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java | 107 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 77 insertions(+), 30 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 4f50f3d..05aca90 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";
@@ -171,6 +170,29 @@
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";
/**
@@ -210,7 +232,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");
@@ -241,6 +263,7 @@
return getRandom() + String.format(idLength, count);
}
}
+
public static String nextId() {
return nextId("%04d");
@@ -295,13 +318,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 {
@@ -321,29 +386,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 {
@@ -490,7 +537,6 @@
//璋冪敤鏈嶅姟
return getCode(prefixMap.get("agentId"));
}
-
/**
* 鑾峰彇灏忓尯鐓х墖ID
@@ -827,7 +873,6 @@
return getCode(prefixMap.get("pgId"));
}
-
/**
* 鑾峰彇restTemplate
*
@@ -905,4 +950,6 @@
}
return result;
}
+
+
}
--
Gitblit v1.8.0