liuc/biz_portal_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加地址

Browse Source
This commit is contained in:
YY
2025-07-02 09:35:44 +08:00
parent f29ccae674
commit 0879846562
16 changed files with 84 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -63,7 +63,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.12</version>
<version>1.18.26</version>
</dependency>
<dependency>

2
src/main/java/com/chinaunicom/mall/ebtp/login/common/RSA.java
View File

@ -28,7 +28,7 @@ public class RSA {
*/
public static Map<String, Object> initKey() throws Exception {
KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(KEY_ALGORITHM);
keyPairGen.initialize(1024);
keyPairGen.initialize(2048);
KeyPair keyPair = keyPairGen.generateKeyPair();
// 公钥

26
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CustomerQandaConstant.java
View File

@ -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;
}
}

8
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorConstant.java Normal file
View File

@ -0,0 +1,8 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
public class ErrorConstant {
/**
* "请选择要修改的记录"
*/
public static final String SELECT_RECORD = "请选择要修改的记录";
}

14
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierRoleConstant.java
View File

@ -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;
}
}

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/UpConstant.java
View File

@ -1,6 +1,9 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
public interface UpConstant {
/**
* 草稿
*/

10
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/UserConstant.java Normal file
View File

@ -0,0 +1,10 @@
package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
public interface UserConstant {
public static final String USER_NAME = "admin";
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dto/ContactDTO.java
View File

@ -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;
}

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/SupplierBaseServiceImpl.java
View File

@ -66,10 +66,10 @@ public class SupplierBaseServiceImpl extends ServiceImpl<SupplierBaseMapper, Cos
page=supplierContactMapper.selectByMainContactId(page,searchVO);
if(page!=null && page.getRecords()!=null && page.getRecords().size()>0){
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<Boolean> 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());
}
}

10
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoDateUtils.java
View File

@ -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<String> 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<SimpleDateFormat> 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;
});

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/controller/CoscoPortalsHelpcenterQandaController.java
View File

@ -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));
}

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/entity/CoscoPortalsNotice.java
View File

@ -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
*

15
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsCustomerQandaServiceImpl.java
View File

@ -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 BaseServiceImpl<CoscoP
coscoPortalsCustomerQanda.setId(PropertyUtils.getSnowflakeId());
coscoPortalsCustomerQanda.setUpdateTime(new Date());
coscoPortalsCustomerQanda.setAskTime(new Date());
coscoPortalsCustomerQanda.setCreateBy("admin");
coscoPortalsCustomerQanda.setCreateBy(UserConstant.USER_NAME);
return coscoPortalsCustomerQandaMapper.insertCoscoPortalsCustomerQanda(coscoPortalsCustomerQanda);
}
@ -73,10 +74,10 @@ public class CoscoPortalsCustomerQandaServiceImpl extends BaseServiceImpl<CoscoP
@Override
public int updateCoscoPortalsCustomerQanda(CoscoPortalsCustomerQanda coscoPortalsCustomerQanda) {
coscoPortalsCustomerQanda.setUpdateTime(new Date());
coscoPortalsCustomerQanda.setUpdateBy("admin");
coscoPortalsCustomerQanda.setUpdateBy(UserConstant.USER_NAME);
if(coscoPortalsCustomerQanda.getAnswerContent()!=null && coscoPortalsCustomerQanda.getAnswerContent().length()>0){
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<CoscoP
@Override
public int seeEdit(String id) {
CoscoPortalsCustomerQanda coscoPortalsCustomerQanda = coscoPortalsCustomerQandaMapper.selectCoscoPortalsCustomerQandaById(id);
if (coscoPortalsCustomerQanda.getIsAnswer().equals(CustomerQandaConstant.WAIT_REPLY_STATUS)) {
if (coscoPortalsCustomerQanda.getIsAnswer().equals(CustomerQandaConstant.WAIT_REPLY.getStatus())) {
CoscoPortalsCustomerQanda qanda = new CoscoPortalsCustomerQanda();
qanda.setId(id);
qanda.setIsAnswer(CustomerQandaConstant.VIEW_STATUS);
qanda.setIsAnswer(CustomerQandaConstant.VIEW.getStatus());
qanda.setUpdateTime(new Date());
qanda.setUpdateBy("admin");
qanda.setUpdateBy(UserConstant.USER_NAME);
return coscoPortalsCustomerQandaMapper.updateCoscoPortalsCustomerQanda(qanda);
}
return 0;

10
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsHelpcenterQandaServiceImpl.java
View File

@ -5,9 +5,9 @@ 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.UpConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsHelpcenterQandaMapper;
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -59,7 +59,7 @@ public class CoscoPortalsHelpcenterQandaServiceImpl extends BaseServiceImpl<Cosc
coscoPortalsHelpcenterQanda.setCreateTime(new Date());
coscoPortalsHelpcenterQanda.setId(PropertyUtils.getSnowflakeId());
coscoPortalsHelpcenterQanda.setUpdateTime(new Date());
coscoPortalsHelpcenterQanda.setCreateBy("admin");
coscoPortalsHelpcenterQanda.setCreateBy(UserConstant.USER_NAME);
coscoPortalsHelpcenterQanda.setStatus(UpConstant.DRAFT);
return coscoPortalsHelpcenterQandaMapper.insertCoscoPortalsHelpcenterQanda(coscoPortalsHelpcenterQanda);
}
@ -73,7 +73,7 @@ public class CoscoPortalsHelpcenterQandaServiceImpl extends BaseServiceImpl<Cosc
@Override
public int updateCoscoPortalsHelpcenterQanda(CoscoPortalsHelpcenterQanda coscoPortalsHelpcenterQanda) {
coscoPortalsHelpcenterQanda.setUpdateTime(new Date());
coscoPortalsHelpcenterQanda.setUpdateBy("admin");
coscoPortalsHelpcenterQanda.setUpdateBy(UserConstant.USER_NAME);
return coscoPortalsHelpcenterQandaMapper.updateCoscoPortalsHelpcenterQanda(coscoPortalsHelpcenterQanda);
}
@ -117,7 +117,7 @@ public class CoscoPortalsHelpcenterQandaServiceImpl extends BaseServiceImpl<Cosc
qanda.setId(id);
qanda.setStatus(UpConstant.UP);
qanda.setUpdateTime(new Date());
qanda.setUpdateBy("admin");
qanda.setUpdateBy(UserConstant.USER_NAME);
return coscoPortalsHelpcenterQandaMapper.updateCoscoPortalsHelpcenterQanda(qanda);
}
@ -127,7 +127,7 @@ public class CoscoPortalsHelpcenterQandaServiceImpl extends BaseServiceImpl<Cosc
qanda.setId(id);
qanda.setStatus(UpConstant.DOWN);
qanda.setUpdateTime(new Date());
qanda.setUpdateBy("admin");
qanda.setUpdateBy(UserConstant.USER_NAME);
return coscoPortalsHelpcenterQandaMapper.updateCoscoPortalsHelpcenterQanda(qanda);
}
}

9
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksServiceImpl.java
View File

@ -8,6 +8,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.UpConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsLinksClassificationMapper;
import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsLinksMapper;
import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsLinks;
@ -60,7 +61,7 @@ public class CoscoPortalsLinksServiceImpl extends BaseServiceImpl<CoscoPortalsLi
coscoPortalsLinks.setCreateTime(new Date());
coscoPortalsLinks.setId(PropertyUtils.getSnowflakeId());
coscoPortalsLinks.setUpdateTime(new Date());
coscoPortalsLinks.setCreateBy("admin");
coscoPortalsLinks.setCreateBy(UserConstant.USER_NAME);
coscoPortalsLinks.setStatus(UpConstant.DISABLE);
return coscoPortalsLinksMapper.insertCoscoPortalsLinks(coscoPortalsLinks);
}
@ -74,7 +75,7 @@ public class CoscoPortalsLinksServiceImpl extends BaseServiceImpl<CoscoPortalsLi
@Override
public int updateCoscoPortalsLinks(CoscoPortalsLinks coscoPortalsLinks) {
coscoPortalsLinks.setUpdateTime(new Date());
coscoPortalsLinks.setUpdateBy("admin");
coscoPortalsLinks.setUpdateBy(UserConstant.USER_NAME);
return coscoPortalsLinksMapper.updateCoscoPortalsLinks(coscoPortalsLinks);
}
@ -117,7 +118,7 @@ public class CoscoPortalsLinksServiceImpl extends BaseServiceImpl<CoscoPortalsLi
CoscoPortalsLinks coscoPortalsLinks=new CoscoPortalsLinks();
coscoPortalsLinks.setId(id);
coscoPortalsLinks.setUpdateTime(new Date());
coscoPortalsLinks.setUpdateBy("admin");
coscoPortalsLinks.setUpdateBy(UserConstant.USER_NAME);
coscoPortalsLinks.setStatus(UpConstant.ENABLE);
return coscoPortalsLinksMapper.updateCoscoPortalsLinks(coscoPortalsLinks);
}
@ -133,7 +134,7 @@ public class CoscoPortalsLinksServiceImpl extends BaseServiceImpl<CoscoPortalsLi
coscoPortalsLinks.setId(id);
coscoPortalsLinks.setStatus(UpConstant.DISABLE);
coscoPortalsLinks.setUpdateTime(new Date());
coscoPortalsLinks.setUpdateBy("admin");
coscoPortalsLinks.setUpdateBy(UserConstant.USER_NAME);
return coscoPortalsLinksMapper.updateCoscoPortalsLinks(coscoPortalsLinks);
}
}

11
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsRegulationsServiceImpl.java
View File

@ -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.UpConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsRegulationsMapper;
import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsRegulations;
import com.chinaunicom.zyhy.ebtp.supplier.portals.service.ICoscoPortalsRegulationsService;
@ -58,7 +59,7 @@ public class CoscoPortalsRegulationsServiceImpl extends BaseServiceImpl<CoscoPor
coscoPortalsRegulations.setCreateTime(new Date());
coscoPortalsRegulations.setId(PropertyUtils.getSnowflakeId());
coscoPortalsRegulations.setUpdateTime(new Date());
coscoPortalsRegulations.setCreateBy("admin");
coscoPortalsRegulations.setCreateBy(UserConstant.USER_NAME);
return coscoPortalsRegulationsMapper.insertCoscoPortalsRegulations(coscoPortalsRegulations);
}
@ -71,7 +72,7 @@ public class CoscoPortalsRegulationsServiceImpl extends BaseServiceImpl<CoscoPor
@Override
public int updateCoscoPortalsRegulations(CoscoPortalsRegulations coscoPortalsRegulations) {
coscoPortalsRegulations.setUpdateTime(new Date());
coscoPortalsRegulations.setUpdateBy("admin");
coscoPortalsRegulations.setUpdateBy(UserConstant.USER_NAME);
return coscoPortalsRegulationsMapper.updateCoscoPortalsRegulations(coscoPortalsRegulations);
}
@ -119,9 +120,9 @@ public class CoscoPortalsRegulationsServiceImpl extends BaseServiceImpl<CoscoPor
CoscoPortalsRegulations coscoPortalsRegulations = new CoscoPortalsRegulations();
coscoPortalsRegulations.setId(id);
coscoPortalsRegulations.setStatus(UpConstant.UP);
coscoPortalsRegulations.setPublishBy("admin");
coscoPortalsRegulations.setPublishBy(UserConstant.USER_NAME);
coscoPortalsRegulations.setUpdateTime(new Date());
coscoPortalsRegulations.setUpdateBy("admin");
coscoPortalsRegulations.setUpdateBy(UserConstant.USER_NAME);
return coscoPortalsRegulationsMapper.updateCoscoPortalsRegulations(coscoPortalsRegulations);
}
@ -131,7 +132,7 @@ public class CoscoPortalsRegulationsServiceImpl extends BaseServiceImpl<CoscoPor
coscoPortalsRegulations.setId(id);
coscoPortalsRegulations.setStatus(UpConstant.DOWN);
coscoPortalsRegulations.setUpdateTime(new Date());
coscoPortalsRegulations.setUpdateBy("admin");
coscoPortalsRegulations.setUpdateBy(UserConstant.USER_NAME);
return coscoPortalsRegulationsMapper.updateCoscoPortalsRegulations(coscoPortalsRegulations);
}