From 0879846562ba70dbde372f1f57f1d052564a30ad Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Wed, 2 Jul 2025 09:35:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../mall/ebtp/login/common/RSA.java | 2 +- .../base/constant/CustomerQandaConstant.java | 26 +++++++++---------- .../supplier/base/constant/ErrorConstant.java | 8 ++++++ .../base/constant/SupplierRoleConstant.java | 14 ++++++++-- .../supplier/base/constant/UpConstant.java | 3 +++ .../supplier/base/constant/UserConstant.java | 10 +++++++ .../ebtp/supplier/base/dto/ContactDTO.java | 2 +- .../service/impl/SupplierBaseServiceImpl.java | 4 +-- .../ebtp/supplier/common/CoscoDateUtils.java | 10 +++---- ...CoscoPortalsHelpcenterQandaController.java | 3 ++- .../portals/entity/CoscoPortalsNotice.java | 5 ++-- .../CoscoPortalsCustomerQandaServiceImpl.java | 15 ++++++----- ...oscoPortalsHelpcenterQandaServiceImpl.java | 10 +++---- .../impl/CoscoPortalsLinksServiceImpl.java | 9 ++++--- .../CoscoPortalsRegulationsServiceImpl.java | 11 ++++---- 16 files changed, 84 insertions(+), 50 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorConstant.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/UserConstant.java diff --git a/pom.xml b/pom.xml index 4f6d177..d19b2d3 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ org.projectlombok lombok - 1.18.12 + 1.18.26 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/common/RSA.java b/src/main/java/com/chinaunicom/mall/ebtp/login/common/RSA.java index 75becf7..da1d9be 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/login/common/RSA.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/login/common/RSA.java @@ -28,7 +28,7 @@ public class RSA { */ public static Map initKey() throws Exception { KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(KEY_ALGORITHM); - keyPairGen.initialize(1024); + keyPairGen.initialize(2048); KeyPair keyPair = keyPairGen.generateKeyPair(); // 公钥 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CustomerQandaConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CustomerQandaConstant.java index 9f7367b..2c22730 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CustomerQandaConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CustomerQandaConstant.java @@ -1,18 +1,18 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.constant; -public interface CustomerQandaConstant { - /** - * 查看状态 - */ - public static final Long VIEW_STATUS = 2L; - /** - * 回复状态 - */ - public static final Long REPLY_STATUS = 1L; - /** - * 待回复状态` - */ - public static final Long WAIT_REPLY_STATUS = 0L; +public enum CustomerQandaConstant { + VIEW(2L), // 查看状态 + REPLY(1L), // 回复状态 + WAIT_REPLY(0L); // 待回复状态 + private final Long status; + + CustomerQandaConstant(Long status) { + this.status = status; + } + + public Long getStatus() { + return status; + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorConstant.java new file mode 100644 index 0000000..dfd5905 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorConstant.java @@ -0,0 +1,8 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.constant; + +public class ErrorConstant { + /** + * "请选择要修改的记录" + */ + public static final String SELECT_RECORD = "请选择要修改的记录"; +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierRoleConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierRoleConstant.java index a7dec94..bba9052 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierRoleConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierRoleConstant.java @@ -1,5 +1,15 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.constant; -public interface SupplierRoleConstant { - String SUPPLIER_ROLE_AGENT_ID = "121"; +public enum SupplierRoleConstant { + SUPPLIER_ROLE("121"); + + private final String status; + + SupplierRoleConstant(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/UpConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/UpConstant.java index a7fc327..c60dc09 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/UpConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/UpConstant.java @@ -1,6 +1,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.constant; public interface UpConstant { + + + /** * 草稿 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/UserConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/UserConstant.java new file mode 100644 index 0000000..3ca6347 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/UserConstant.java @@ -0,0 +1,10 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.constant; + + + +public interface UserConstant { + + + public static final String USER_NAME = "admin"; + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dto/ContactDTO.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dto/ContactDTO.java index 4dc478d..8e841d8 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dto/ContactDTO.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dto/ContactDTO.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @ApiModel(description = "中远海运供应商联系人DTO") public class ContactDTO extends SupplierContact { - private String roleCode= SupplierRoleConstant.SUPPLIER_ROLE_AGENT_ID; + private String roleCode= SupplierRoleConstant.SUPPLIER_ROLE.getStatus(); private String roleName; private Boolean hasAgentRole; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/SupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/SupplierBaseServiceImpl.java index 89178c0..907b14e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/SupplierBaseServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/SupplierBaseServiceImpl.java @@ -66,10 +66,10 @@ public class SupplierBaseServiceImpl extends ServiceImpl0){ for(ContactDTO contactDTO:page.getRecords()){ - SysUserRole userRole = new SysUserRole(contactDTO.getAccount(), SupplierRoleConstant.SUPPLIER_ROLE_AGENT_ID);//(contactDTO.getContactId(),cacheUser.getUserId()); + SysUserRole userRole = new SysUserRole(contactDTO.getAccount(), SupplierRoleConstant.SUPPLIER_ROLE.getStatus());//(contactDTO.getContactId(),cacheUser.getUserId()); BaseResponse booleanBaseResponse = systemApi.hasRole(userRole); contactDTO.setHasAgentRole(booleanBaseResponse.isSuccess()&&(booleanBaseResponse.getData()!=null)?booleanBaseResponse.getData().booleanValue():false); - contactDTO.setRoleCode(SupplierRoleConstant.SUPPLIER_ROLE_AGENT_ID); + contactDTO.setRoleCode(SupplierRoleConstant.SUPPLIER_ROLE.getStatus()); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoDateUtils.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoDateUtils.java index dbf8d80..84d918c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoDateUtils.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoDateUtils.java @@ -32,7 +32,7 @@ public class CoscoDateUtils extends org.apache.commons.lang3.time.DateUtils { public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; public static String YYYY_MM_DD__HH_MM_SS = "yyyy-MM-dd+HH:mm:ss"; - private static String[] parsePatterns = {"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; + private static String[] parsePatterns = {YYYY_MM_DD, YYYY_MM_DD_HH_MM_SS, "yyyy-MM-dd HH:mm", "yyyy-MM", "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; /** * 获取当前Date型日期 @@ -168,14 +168,14 @@ public class CoscoDateUtils extends org.apache.commons.lang3.time.DateUtils { } // 默认前置时间小时数 - private final static int defMinusHours = 12; + private final static int DEFMINUSHOURS = 12; /** * 根据前置时间获取Date * 例如 minusHours = 12 为获取12小时前Date */ public static Date backDate() { - return backDate(defMinusHours); + return backDate(DEFMINUSHOURS); } /** @@ -219,7 +219,7 @@ public class CoscoDateUtils extends org.apache.commons.lang3.time.DateUtils { // 月份日期集合 List dates = new ArrayList<>(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD); LocalDate day = firstDayOfMonth; // 当月份日期超过月份最后一日或大于当前日期 停止遍历 @@ -274,7 +274,7 @@ public class CoscoDateUtils extends org.apache.commons.lang3.time.DateUtils { }); private static final ThreadLocal outputFormatThreadLocal = ThreadLocal.withInitial(() -> { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf = new SimpleDateFormat(YYYY_MM_DD_HH_MM_SS); sdf.setTimeZone(TimeZone.getTimeZone("GMT")); // 设置时区为GMT return sdf; }); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/controller/CoscoPortalsHelpcenterQandaController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/controller/CoscoPortalsHelpcenterQandaController.java index 04b3b5c..86d24b7 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/controller/CoscoPortalsHelpcenterQandaController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/controller/CoscoPortalsHelpcenterQandaController.java @@ -4,6 +4,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.portals.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorConstant; import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsHelpcenterQanda; import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsLinks; import com.chinaunicom.zyhy.ebtp.supplier.portals.service.ICoscoPortalsHelpcenterQandaService; @@ -57,7 +58,7 @@ public class CoscoPortalsHelpcenterQandaController extends BaseController { @PutMapping public BaseResponse edit(@RequestBody CoscoPortalsHelpcenterQanda coscoPortalsHelpcenterQanda) { if(coscoPortalsHelpcenterQanda.getId()==null){ - return BaseResponse.fail("请选择要修改的记录"); + return BaseResponse.fail(ErrorConstant.SELECT_RECORD); } return BaseResponse.success(coscoPortalsHelpcenterQandaService.updateCoscoPortalsHelpcenterQanda(coscoPortalsHelpcenterQanda)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/entity/CoscoPortalsNotice.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/entity/CoscoPortalsNotice.java index 277537f..fac9d20 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/entity/CoscoPortalsNotice.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/entity/CoscoPortalsNotice.java @@ -1,12 +1,11 @@ package com.chinaunicom.zyhy.ebtp.supplier.portals.entity; -import java.util.Date; - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; + /** * 中远门户_通知中心对象 cosco_portals_notice * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsCustomerQandaServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsCustomerQandaServiceImpl.java index 319750e..2075a32 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsCustomerQandaServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsCustomerQandaServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CustomerQandaConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant; import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsCustomerQandaMapper; import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsCustomerQanda; import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsHelpcenterQanda; @@ -60,7 +61,7 @@ public class CoscoPortalsCustomerQandaServiceImpl extends BaseServiceImpl0){ - coscoPortalsCustomerQanda.setIsAnswer(CustomerQandaConstant.REPLY_STATUS); - coscoPortalsCustomerQanda.setAnswerBy("admin"); + coscoPortalsCustomerQanda.setIsAnswer(CustomerQandaConstant.REPLY.getStatus()); + coscoPortalsCustomerQanda.setAnswerBy(UserConstant.USER_NAME); coscoPortalsCustomerQanda.setAnswerTime(new Date()); } return coscoPortalsCustomerQandaMapper.updateCoscoPortalsCustomerQanda(coscoPortalsCustomerQanda); @@ -113,12 +114,12 @@ public class CoscoPortalsCustomerQandaServiceImpl extends BaseServiceImpl