From 2f7adcfb5d2e1add6fb75af7b95818245edd9140 Mon Sep 17 00:00:00 2001 From: fuqingji <51312040@qq.com> Date: Mon, 21 Mar 2022 15:25:11 +0800 Subject: [PATCH] 20220315-bugs --- .../project/common/EbpProjectCommonUtil.java | 110 +++++++++--------- .../project/common/InquiryCommonUtil.java | 36 +++--- .../project/common/ProjectCommonUtil.java | 2 +- .../common/ProjectlnnerShotExceptionEnum.java | 20 +++- .../fallback/EbtpMallBidClientFallback.java | 5 +- .../EbtpMallProcessClientFallback.java | 5 +- .../fallback/EbtpProjectClientFallback.java | 5 +- .../fallback/MallResuClientFallback.java | 6 +- .../fallback/PriceQueryApiClientFallback.java | 4 +- .../feign/fallback/WfapApiClientFallback.java | 3 +- 10 files changed, 107 insertions(+), 89 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java index 6a0719e..aacc48f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/EbpProjectCommonUtil.java @@ -8,9 +8,10 @@ import java.util.stream.Collectors; /** * 项目委托推送数据辅助类 + * * @author daixc - * @date 2020/12/04 * @version V1.0 + * @date 2020/12/04 */ public class EbpProjectCommonUtil { @@ -33,12 +34,12 @@ public class EbpProjectCommonUtil { /** * 组织形式 自主执行 */ - public static final String ORGANIZATIONAL_FORM_001="001"; + public static final String ORGANIZATIONAL_FORM_001 = "001"; /** * 组织形式 代理执行 */ - public static final String ORGANIZATIONAL_FORM_002="002"; + public static final String ORGANIZATIONAL_FORM_002 = "002"; /** * 采购方式 001 公开招标 @@ -91,7 +92,7 @@ public class EbpProjectCommonUtil { public static final String COMPAR_SELECT_MODE_001 = "001"; /** - * 比选方式 002 多阶段评审 + * 比选方式 002 多阶段评审 */ public static final String COMPAR_SELECT_MODE_002 = "002"; @@ -164,7 +165,7 @@ public class EbpProjectCommonUtil { * 子业务类型(001:需求; 002:项目; 003:公告; 004:协议;005:代理; 006:专家; 007:订单; 008:模板库; * 009:招标采购中心; 010;财务及预算; 011:库存; 012:领用; 013:商品; 014:公开市场; 020:其他;) */ - public static final String SUB_BUSINESS_TYPE ="009"; + public static final String SUB_BUSINESS_TYPE = "009"; /** * 审批返回 审批通过 @@ -179,22 +180,22 @@ public class EbpProjectCommonUtil { /** * 标段异常处理 投标人不足3个 */ - public static final String FAIL_STATUS_001 = "001"; + public static final String FAIL_STATUS_001 = "001"; /** * 标段异常处理 购买标书的潜在投标人不足3个 */ - public static final String FAIL_STATUS_002 = "002"; + public static final String FAIL_STATUS_002 = "002"; /** * 标段异常处理 评审委员会否决全部投标 */ - public static final String FAIL_STATUS_003 = "003"; + public static final String FAIL_STATUS_003 = "003"; /** * 标段异常处理 其他 */ - public static final String FAIL_STATUS_004 = "004"; + public static final String FAIL_STATUS_004 = "004"; /** * 招标方式 依法必须招标 @@ -209,59 +210,59 @@ public class EbpProjectCommonUtil { /** * 组织形式转换 MAP */ - public static Map ORGANIZATIONAL_MAP = new HashMap(){{ - put(ORGANIZATIONAL_FORM_001,ProjectCommonUtil.ORGANIZATION_2); - put(ORGANIZATIONAL_FORM_002,ProjectCommonUtil.ORGANIZATION_1); + public static final Map ORGANIZATIONAL_MAP = new HashMap() {{ + put(ORGANIZATIONAL_FORM_001, ProjectCommonUtil.ORGANIZATION_2); + put(ORGANIZATIONAL_FORM_002, ProjectCommonUtil.ORGANIZATION_1); }}; /** * 采购类型转换 MAP */ - public static Map PROCUREMENT_TYPE_MAP = new HashMap(){{ - put(TARGET_TYPE_001,ProjectCommonUtil.PROCUREMENT_TYPE_1); - put(TARGET_TYPE_002,ProjectCommonUtil.PROCUREMENT_TYPE_2); - put(TARGET_TYPE_003,ProjectCommonUtil.PROCUREMENT_TYPE_3); - put(TARGET_TYPE_004,ProjectCommonUtil.PROCUREMENT_TYPE_4); + public static final Map PROCUREMENT_TYPE_MAP = new HashMap() {{ + put(TARGET_TYPE_001, ProjectCommonUtil.PROCUREMENT_TYPE_1); + put(TARGET_TYPE_002, ProjectCommonUtil.PROCUREMENT_TYPE_2); + put(TARGET_TYPE_003, ProjectCommonUtil.PROCUREMENT_TYPE_3); + put(TARGET_TYPE_004, ProjectCommonUtil.PROCUREMENT_TYPE_4); }}; /** * 采购方式转换 MAP */ - public static Map PROCUREMENT_MODE_MAP = new HashMap(){{ - put(PURC_MODE_001,ProjectCommonUtil.PROCUREMENT_MODE_1); - put(PURC_MODE_002,ProjectCommonUtil.PROCUREMENT_MODE_2); - put(PURC_MODE_003,ProjectCommonUtil.PROCUREMENT_MODE_5); - put(PURC_MODE_004,ProjectCommonUtil.PROCUREMENT_MODE_6); - put(PURC_MODE_005,ProjectCommonUtil.PROCUREMENT_MODE_3); + public static final Map PROCUREMENT_MODE_MAP = new HashMap() {{ + put(PURC_MODE_001, ProjectCommonUtil.PROCUREMENT_MODE_1); + put(PURC_MODE_002, ProjectCommonUtil.PROCUREMENT_MODE_2); + put(PURC_MODE_003, ProjectCommonUtil.PROCUREMENT_MODE_5); + put(PURC_MODE_004, ProjectCommonUtil.PROCUREMENT_MODE_6); + put(PURC_MODE_005, ProjectCommonUtil.PROCUREMENT_MODE_3); }}; /** * 资金来源转换 MAP */ - public static Map FUNDS_PROVIDER_MAP = new HashMap(){{ - put(FUND_ORIGN_001,ProjectCommonUtil.FUNDS_PROVIDER_2); - put(FUND_ORIGN_002,ProjectCommonUtil.FUNDS_PROVIDER_1); - put(FUND_ORIGN_003,ProjectCommonUtil.FUNDS_PROVIDER_3); - put(FUND_ORIGN_004,ProjectCommonUtil.FUNDS_PROVIDER_4); - put(FUND_ORIGN_005,ProjectCommonUtil.FUNDS_PROVIDER_5); - put(FUND_ORIGN_006,ProjectCommonUtil.FUNDS_PROVIDER_6); + public static final Map FUNDS_PROVIDER_MAP = new HashMap() {{ + put(FUND_ORIGN_001, ProjectCommonUtil.FUNDS_PROVIDER_2); + put(FUND_ORIGN_002, ProjectCommonUtil.FUNDS_PROVIDER_1); + put(FUND_ORIGN_003, ProjectCommonUtil.FUNDS_PROVIDER_3); + put(FUND_ORIGN_004, ProjectCommonUtil.FUNDS_PROVIDER_4); + put(FUND_ORIGN_005, ProjectCommonUtil.FUNDS_PROVIDER_5); + put(FUND_ORIGN_006, ProjectCommonUtil.FUNDS_PROVIDER_6); }}; /** * 比选方式转换 MAP */ - public static Map SELECTION_METHOD_MAP = new HashMap(){{ - put(COMPAR_SELECT_MODE_001,ProjectCommonUtil.SELECTION_METHOD_1); - put(COMPAR_SELECT_MODE_002,ProjectCommonUtil.SELECTION_METHOD_2); + public static final Map SELECTION_METHOD_MAP = new HashMap() {{ + put(COMPAR_SELECT_MODE_001, ProjectCommonUtil.SELECTION_METHOD_1); + put(COMPAR_SELECT_MODE_002, ProjectCommonUtil.SELECTION_METHOD_2); }}; /** * 资审方式转换 MAP */ - public static Map EXAMINATION_METHOD_MAP = new HashMap(){{ - put(SUPP_QUALIFY_001,ProjectCommonUtil.EXAMINATION_METHOD_1); - put(SUPP_QUALIFY_002,ProjectCommonUtil.EXAMINATION_METHOD_2); + public static final Map EXAMINATION_METHOD_MAP = new HashMap() {{ + put(SUPP_QUALIFY_001, ProjectCommonUtil.EXAMINATION_METHOD_1); + put(SUPP_QUALIFY_002, ProjectCommonUtil.EXAMINATION_METHOD_2); // put(COMPAR_SELECT_MODE_002,ProjectCommonUtil.EXAMINATION_METHOD_3); // put(COMPAR_SELECT_MODE_002,ProjectCommonUtil.EXAMINATION_METHOD_4); }}; @@ -269,44 +270,45 @@ public class EbpProjectCommonUtil { /** * 评审次数转换 MAP */ - public static Map RECRUITMENT_METHOD_MAP = new HashMap(){{ - put(REVIEW_NUM_001,ProjectCommonUtil.RECRUITMENT_METHOD_1); - put(REVIEW_NUM_002,ProjectCommonUtil.RECRUITMENT_METHOD_2); - put(REVIEW_NUM_003,ProjectCommonUtil.RECRUITMENT_METHOD_3); + public static final Map RECRUITMENT_METHOD_MAP = new HashMap() {{ + put(REVIEW_NUM_001, ProjectCommonUtil.RECRUITMENT_METHOD_1); + put(REVIEW_NUM_002, ProjectCommonUtil.RECRUITMENT_METHOD_2); + put(REVIEW_NUM_003, ProjectCommonUtil.RECRUITMENT_METHOD_3); }}; /** * 评审方法转换 MAP */ - public static Map EVAL_METHOD_MAP = new HashMap(){{ - put(SCORE_TYPE_001,ProjectCommonUtil.EVAL_METHOD_1); - put(SCORE_TYPE_002,ProjectCommonUtil.EVAL_METHOD_2); + public static final Map EVAL_METHOD_MAP = new HashMap() {{ + put(SCORE_TYPE_001, ProjectCommonUtil.EVAL_METHOD_1); + put(SCORE_TYPE_002, ProjectCommonUtil.EVAL_METHOD_2); }}; /** * 标段异常转换 MAP */ - public static Map FAIL_STATUS_MAP = new HashMap(){{ - put(ProjectCommonUtil.EXCEPTION_DESC_1,FAIL_STATUS_001); - put(ProjectCommonUtil.EXCEPTION_DESC_2,FAIL_STATUS_002); - put(ProjectCommonUtil.EXCEPTION_DESC_3,FAIL_STATUS_003); - put(ProjectCommonUtil.EXCEPTION_DESC_4,FAIL_STATUS_004); + public static final Map FAIL_STATUS_MAP = new HashMap() {{ + put(ProjectCommonUtil.EXCEPTION_DESC_1, FAIL_STATUS_001); + put(ProjectCommonUtil.EXCEPTION_DESC_2, FAIL_STATUS_002); + put(ProjectCommonUtil.EXCEPTION_DESC_3, FAIL_STATUS_003); + put(ProjectCommonUtil.EXCEPTION_DESC_4, FAIL_STATUS_004); }}; /** * 招标方式转换 MAP */ - public static Map BID_METHOD_MAP = new HashMap(){{ - put(BID_METHOD_001,ProjectCommonUtil.OPEN_TENDER_FORM_1); - put(BID_METHOD_002,ProjectCommonUtil.OPEN_TENDER_FORM_2); + public static final Map BID_METHOD_MAP = new HashMap() {{ + put(BID_METHOD_001, ProjectCommonUtil.OPEN_TENDER_FORM_1); + put(BID_METHOD_002, ProjectCommonUtil.OPEN_TENDER_FORM_2); }}; /** * 获取map的key - * @param map 集合 + * + * @param map 集合 * @param value value值 - * @param 泛型 key - * @param 泛型 value + * @param 泛型 key + * @param 泛型 value * @return 返回结果 */ public static Set getKeysByStream(Map map, V value) { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java index 79f81a1..8947736 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java @@ -5,9 +5,10 @@ import java.util.Map; /** * 询价项目委托推送数据辅助类 + * * @author daixc - * @date 2020/12/04 * @version V1.0 + * @date 2020/12/04 */ public class InquiryCommonUtil { @@ -72,45 +73,44 @@ public class InquiryCommonUtil { public static final int ANNOUNCEMENT_STATUS = -1; - /** * 组织形式转换 MAP */ - public static Map IS_DELEGATION_MAP = new HashMap(){{ - put(IS_DELEGATION_0,ProjectCommonUtil.ORGANIZATION_2); - put(IS_DELEGATION_1,ProjectCommonUtil.ORGANIZATION_1); + public static final Map IS_DELEGATION_MAP = new HashMap() {{ + put(IS_DELEGATION_0, ProjectCommonUtil.ORGANIZATION_2); + put(IS_DELEGATION_1, ProjectCommonUtil.ORGANIZATION_1); }}; /** * 采购类型转换 MAP */ - public static Map BID_TYPE_MAP = new HashMap(){{ - put(BID_TYPE_1,ProjectCommonUtil.PROCUREMENT_TYPE_1); - put(BID_TYPE_2,ProjectCommonUtil.PROCUREMENT_TYPE_2); - put(BID_TYPE_3,ProjectCommonUtil.PROCUREMENT_TYPE_3); + public static final Map BID_TYPE_MAP = new HashMap() {{ + put(BID_TYPE_1, ProjectCommonUtil.PROCUREMENT_TYPE_1); + put(BID_TYPE_2, ProjectCommonUtil.PROCUREMENT_TYPE_2); + put(BID_TYPE_3, ProjectCommonUtil.PROCUREMENT_TYPE_3); }}; /** * 采购方式 MAP */ - public static Map BUY_WAY_MAP = new HashMap(){{ - put(BUY_WAY_0,ProjectCommonUtil.PROCUREMENT_MODE_7); + public static final Map BUY_WAY_MAP = new HashMap() {{ + put(BUY_WAY_0, ProjectCommonUtil.PROCUREMENT_MODE_7); }}; /** * 询价模式 MAP */ - public static Map INQUIRY_MODEL_MAP = new HashMap(){{ - put(INQUIRY_MODEL_0,ProjectCommonUtil.INQUIRY_METHOD_1); - put(INQUIRY_MODEL_1,ProjectCommonUtil.INQUIRY_METHOD_2); + public static final Map INQUIRY_MODEL_MAP = new HashMap() {{ + put(INQUIRY_MODEL_0, ProjectCommonUtil.INQUIRY_METHOD_1); + put(INQUIRY_MODEL_1, ProjectCommonUtil.INQUIRY_METHOD_2); }}; /** - *中选方式转换 MAP + * 中选方式转换 MAP */ - public static Map SELECT_TYPE_MAP = new HashMap(){{ - put(SELECT_TYPE_0,ProjectCommonUtil.EVAL_METHOD_2); - put(SELECT_TYPE_1,ProjectCommonUtil.EVAL_METHOD_1); + public static final Map SELECT_TYPE_MAP = new HashMap() {{ + put(SELECT_TYPE_0, ProjectCommonUtil.EVAL_METHOD_2); + put(SELECT_TYPE_1, ProjectCommonUtil.EVAL_METHOD_1); }}; /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java index f7c2756..17bf757 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java @@ -553,7 +553,7 @@ public class ProjectCommonUtil { */ public static final String IS_AGAIN_PURCHASE_1 = "1"; - public static Map PROCUREMENT_MODE_MAP = new HashMap(){{ + public static final Map PROCUREMENT_MODE_MAP = new HashMap(){{ String[] biddingArray = {PROCUREMENT_MODE_1,PROCUREMENT_MODE_2}; String[] recruitArray = {PROCUREMENT_MODE_4}; String[] negotiationArray = {PROCUREMENT_MODE_5,PROCUREMENT_MODE_6}; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectlnnerShotExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectlnnerShotExceptionEnum.java index 9b93653..ef27aa3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectlnnerShotExceptionEnum.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectlnnerShotExceptionEnum.java @@ -6,6 +6,7 @@ import lombok.Getter; /** * 项目建档错误提示信息 + * * @author daixc * @date 2020/10/10 */ @@ -13,14 +14,27 @@ import lombok.Getter; @AllArgsConstructor public enum ProjectlnnerShotExceptionEnum implements BusinessExceptionAssert { + /** + * 暂无此项目建档信息 + */ AUCTION_PROJECT_INFORMATION_NONE(200001, "暂无此项目建档信息!"), + /** + * 查询不到此数据 + */ AUCTION_PROJECT_FAILED_TO_QUERY_ITEM_DATA(200002, "查询不到此数据!"), + /** + * 已参与此竞拍项目 + */ AUCTION_PROJECT_CAN_ALREADY(200003, "已参与此竞拍项目!"), + /** + * 再次发起竞拍失败 + */ AUCTION_PROJECT_FAILED_TO_OPEN_AUCTION_AGAIN(200004, "再次发起竞拍失败!"), - AUCTION_PROJECT_FAILED_TO_OPEN_AUCTION_AGAIN_MATERIAL(200005, "再次发起竞拍失败!") - - ; + /** + * 再次发起竞拍失败 + */ + AUCTION_PROJECT_FAILED_TO_OPEN_AUCTION_AGAIN_MATERIAL(200005, "再次发起竞拍失败!"); /** * 返回码 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallBidClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallBidClientFallback.java index 57df155..80fbb7d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallBidClientFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallBidClientFallback.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.project.feign.fallback; +import cn.hutool.core.exceptions.ExceptionUtil; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.project.feign.EbtpMallBidApi; import com.chinaunicom.mall.ebtp.project.feign.entity.AgainRoomVO; @@ -15,8 +16,6 @@ import java.util.List; /** - * - * * @author yuzining * @version 1.0 * @date 2020-10-05 14:57:11 @@ -28,7 +27,7 @@ public class EbtpMallBidClientFallback implements FallbackFactory { @Override public MallPurpApi create(Throwable throwable) { - throwable.printStackTrace(); + log.info(ExceptionUtil.stacktraceToString(throwable)); return new MallPurpApi() { @Override public BaseResponse projInvitationFail(ProjInvitationFailRequest failRequest) { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/MallResuClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/MallResuClientFallback.java index 426dd06..d190aa9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/MallResuClientFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/MallResuClientFallback.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.project.feign.fallback; +import cn.hutool.core.exceptions.ExceptionUtil; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.project.feign.MallResuApi; import feign.hystrix.FallbackFactory; @@ -8,15 +9,16 @@ import org.springframework.stereotype.Component; /** * 用友项目中心查询API + * * @author daixc * @date 2021/04/06 */ @Slf4j @Component -public class MallResuClientFallback implements FallbackFactory { +public class MallResuClientFallback implements FallbackFactory { @Override public MallResuApi create(Throwable throwable) { - throwable.printStackTrace(); + log.info(ExceptionUtil.stacktraceToString(throwable)); return new MallResuApi() { @Override public BaseResponse findStatusByPurpIdForEval(Long purpId) { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/PriceQueryApiClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/PriceQueryApiClientFallback.java index 5dd6615..6605673 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/PriceQueryApiClientFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/PriceQueryApiClientFallback.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.project.feign.fallback; +import cn.hutool.core.exceptions.ExceptionUtil; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.project.feign.PriceQueryApi; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryNoticeVO; @@ -9,6 +10,7 @@ import org.springframework.stereotype.Component; /** * 询价接口返回 + * * @author daixc * @date 2021/02/19 */ @@ -17,7 +19,7 @@ import org.springframework.stereotype.Component; public class PriceQueryApiClientFallback implements FallbackFactory { @Override public PriceQueryApi create(Throwable throwable) { - throwable.printStackTrace(); + log.info(ExceptionUtil.stacktraceToString(throwable)); return new PriceQueryApi() { @Override public BaseResponse updateInquiryAllowPublish(InquiryNoticeVO vo) { diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java index a994ed6..da754be 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.project.feign.fallback; +import cn.hutool.core.exceptions.ExceptionUtil; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.project.feign.WfapApi; import com.chinaunicom.mall.ebtp.project.feign.entity.Approve; @@ -13,7 +14,7 @@ import org.springframework.stereotype.Component; public class WfapApiClientFallback implements FallbackFactory { @Override public WfapApi create(Throwable throwable) { - throwable.printStackTrace(); + log.info(ExceptionUtil.stacktraceToString(throwable)); return new WfapApi() { @Override public BaseResponse start(Approve approve) {