songqq/contract-manager
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

feat: 重构员工控制器并优化JSON序列化配置

Browse Source 
refactor(EmployeeController): 重命名EmployyeController为EmployeeController并优化代码结构
feat(EmployeeController): 添加@JsonIgnoreProperties注解解决循环引用问题
feat(JacksonConfig): 新增Jackson配置类处理Hibernate代理和循环引用
fix(EmployeeService): 修复缓存注解格式问题
feat(Employee): 添加@JsonIgnoreProperties注解忽略可能导致循环引用的字段
feat(EmployeeRole): 添加@JsonIgnore注解忽略关联字段
fix(application.properties): 调整Redis缓存配置和错误处理设置
refactor(IndexController): 移除错误处理方法
feat(GlobalExceptionHandler): 新增全局异常处理类
refactor(SecurityConfig): 优化安全配置并启用方法级安全注解
refactor(AbstractCtx): 优化日期时间处理方法
build: 更新项目版本至0.0.53-SNAPSHOT
This commit is contained in:
宋其青
2025-09-04 16:06:47 +08:00
parent acb63116d5
commit 0e444508ff
21 changed files with 772 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/main/java/com/ecep/contract/cloud/rk/CloudRkService.java
View File

@@ -5,13 +5,13 @@ import java.io.IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import com.ecep.contract.util.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +36,7 @@ import com.ecep.contract.ds.other.service.SysConfService;
import com.ecep.contract.model.CloudRk;
import com.ecep.contract.model.Company;
import com.ecep.contract.model.CompanyBlackReason;
import com.ecep.contract.util.FileUtils;
import com.ecep.contract.util.HttpJsonUtils;
import com.ecep.contract.util.MyStringUtils;
import com.fasterxml.jackson.annotation.JsonAlias;
@@ -200,7 +201,7 @@ public class CloudRkService implements IEntityService<CloudRk> {
if (!reasonList.isEmpty()) {
companyBlackReasonRepository.saveAll(reasonList);
}
cloudRk.setCloudBlackListUpdated(Instant.now());
cloudRk.setCloudBlackListUpdated(LocalDateTime.now());
}
private void toCompanyBlackReasonList(
@@ -234,12 +235,12 @@ public class CloudRkService implements IEntityService<CloudRk> {
*/
public boolean checkBlackListUpdateElapse(
Company company, CloudRk cloudRk, BlackListUpdateContext context) {
Instant start = cloudRk.getCloudBlackListUpdated();
LocalDateTime start = cloudRk.getCloudBlackListUpdated();
if (start == null) {
return true;
}
Instant elapse = start.plusSeconds(context.getElapse());
return elapse.isBefore(Instant.now());
LocalDateTime elapse = start.plusSeconds(context.getElapse());
return elapse.isBefore(LocalDateTime.now());
}
public CloudRk getOrCreateCloudRk(CloudInfo info) {

4
server/src/main/java/com/ecep/contract/cloud/rk/CloudRkSyncTask.java
View File

@@ -1,7 +1,7 @@
package com.ecep.contract.cloud.rk;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
@@ -96,7 +96,7 @@ public class CloudRkSyncTask extends Tasker<Object> {
} catch (Exception e) {
throw new RuntimeException(e);
} finally {
cloudRk.setLatestUpdate(Instant.now());
cloudRk.setLatestUpdate(LocalDateTime.now());
service.save(cloudRk);
}
// updateProgress(counter.incrementAndGet(), total);

18
server/src/main/java/com/ecep/contract/cloud/rk/EntReportParser.java
View File

@@ -37,7 +37,6 @@ public class EntReportParser {
private CloudRk cloudRk;
private boolean modified = false;
public void parse(JsonNode json) {
if (!json.has("B1001")) {
// 没有数据
@@ -79,7 +78,6 @@ public class EntReportParser {
}
private void updateLegalRepresentativeContact(JsonNode data) {
String legalRepresentative = company.getLegalRepresentative();
if (!StringUtils.hasText(legalRepresentative)) {
@@ -94,7 +92,7 @@ public class EntReportParser {
return;
}
if (contactList.isEmpty()) {
//没有，创建法人联系人
// 没有，创建法人联系人
contact = new CompanyContact();
contact.setCompany(company);
contact.setName(legalRepresentative);
@@ -107,10 +105,11 @@ public class EntReportParser {
any = contactList.stream().findAny();
}
contact = any.get();
// if (contact.getPostion() == null || !contact.setPostion().contains("法定代表人")) {
// contact.setMemo("法定代表人");
// modified = true;
// }
// if (contact.getPostion() == null || !contact.setPostion().contains("法定代表人"))
// {
// contact.setMemo("法定代表人");
// modified = true;
// }
}
if (!StringUtils.hasText(contact.getEmail())) {
@@ -190,7 +189,7 @@ public class EntReportParser {
modified = true;
}
} else {
//fixed 当平台返回的 社会统一信用代码为空时，如果原来已经有的，则不做更新
// fixed 当平台返回的 社会统一信用代码为空时，如果原来已经有的，则不做更新
if (StringUtils.hasText(company.getUniscid())) {
if (logger.isInfoEnabled()) {
logger.info("来自平台的 UNISCID 为空，但本地{}已经记录{}，不做更改", company.getName(), company.getUniscid());
@@ -212,7 +211,7 @@ public class EntReportParser {
return;
}
LocalDateTime updated = objectMapper.convertValue(node, LocalDateTime.class);
cloudRk.setCloudEntUpdate(updated.toInstant(ZoneOffset.ofHours(8)));
cloudRk.setCloudEntUpdate(updated);
}
private void updateCompanyProperty(String field, JsonNode node, String... excludeValues) {
@@ -255,7 +254,6 @@ public class EntReportParser {
}
}
private void saveJsonToFile(JsonNode json) {
String companyPath = company.getPath();
if (StringUtils.hasText(companyPath)) {

111
server/src/main/java/com/ecep/contract/cloud/rk/ctx/CloudRkCtx.java
View File

@@ -25,7 +25,6 @@ import java.util.stream.Collectors;
import javax.net.ssl.SSLException;
import com.ecep.contract.util.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
@@ -44,6 +43,7 @@ import com.ecep.contract.model.Company;
import com.ecep.contract.model.CompanyBlackReason;
import com.ecep.contract.model.CompanyContact;
import com.ecep.contract.model.CompanyOldName;
import com.ecep.contract.util.FileUtils;
import com.ecep.contract.util.HttpJsonUtils;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.JsonNode;
@@ -99,8 +99,7 @@ public class CloudRkCtx extends AbstractCtx {
Proxy.Type proxyType = Proxy.Type.valueOf(proxyUri.getScheme().toUpperCase());
socksProxy = new Proxy(
proxyType,
new InetSocketAddress(proxyUri.getHost(), proxyUri.getPort())
);
new InetSocketAddress(proxyUri.getHost(), proxyUri.getPort()));
}
return socksProxy;
}
@@ -109,7 +108,6 @@ public class CloudRkCtx extends AbstractCtx {
HttpJsonUtils.post(url, data, consumer, getObjectMapper(), getSocksProxy());
}
public boolean syncCompany(Company company, CloudRk cloudRk, MessageHolder holder) {
if (!StringUtils.hasText(cloudRk.getCloudId())) {
holder.warn("未定义平台编号, 尝试从平台上自动获取");
@@ -157,19 +155,17 @@ public class CloudRkCtx extends AbstractCtx {
return updated;
}
/**
* 更新黑名单列表
*/
public boolean updateBlackList(
Company company, CloudRk cloudRk, MessageHolder holder
) throws IOException {
Instant start = cloudRk.getCloudBlackListUpdated();
Company company, CloudRk cloudRk, MessageHolder holder) throws IOException {
LocalDateTime start = cloudRk.getCloudBlackListUpdated();
if (start != null) {
long elapse = getConfService().getLong(CloudRkService.KEY_BLACK_LIST_ELAPSE);
if (elapse > 0) {
Instant next = start.plusSeconds(elapse);
if (next.isAfter(Instant.now())) {
LocalDateTime next = start.plusSeconds(elapse);
if (next.isAfter(LocalDateTime.now())) {
holder.debug("更新时间未到, 上次更新时间 = " + start);
return false;
}
@@ -179,7 +175,6 @@ public class CloudRkCtx extends AbstractCtx {
String api = getConfService().getString(CloudRkService.KEY_BLACK_LIST_URL);
List<String> companyNames = getCompanyService().getAllNames(company);
List<CompanyBlackReason> reasonList = new ArrayList<>();
List<CompanyBlackReason> dbReasons = getCompanyBlackReasonService().findAllByCompany(company);
for (String name : companyNames) {
@@ -195,22 +190,21 @@ public class CloudRkCtx extends AbstractCtx {
}
if (reasonList.isEmpty()) {
cloudRk.setCloudBlackListUpdated(Instant.now());
cloudRk.setCloudBlackListUpdated(LocalDateTime.now());
return false;
}
for (CompanyBlackReason companyBlackReason : reasonList) {
getCompanyBlackReasonService().save(companyBlackReason);
}
cloudRk.setCloudBlackListUpdated(Instant.now());
cloudRk.setCloudBlackListUpdated(LocalDateTime.now());
return true;
}
private boolean applyBlackReason(
JsonNode json, Company company, CloudRk cloudRk,
List<CompanyBlackReason> reasonList, List<CompanyBlackReason> dbReasons,
MessageHolder holder
) {
MessageHolder holder) {
if (isUnSuccess(json, holder)) {
return false;
}
@@ -246,11 +240,11 @@ public class CloudRkCtx extends AbstractCtx {
private void toCompanyBlackReasonList(
Company company, BlackReasonType type,
JsonNode reason, List<CompanyBlackReason> dbReasons,
List<CompanyBlackReason> reasonList
) throws JsonMappingException {
List<CompanyBlackReason> reasonList) throws JsonMappingException {
ObjectNode object = (ObjectNode) reason;
String key = "rk-" + object.remove("id").asText();
CompanyBlackReason cbr = dbReasons.stream().filter(r -> r.getKey().equals(key)).findAny().orElseGet(CompanyBlackReason::new);
CompanyBlackReason cbr = dbReasons.stream().filter(r -> r.getKey().equals(key)).findAny()
.orElseGet(CompanyBlackReason::new);
getObjectMapper().updateValue(cbr, reason);
cbr.setCompany(company);
cbr.setType(type);
@@ -258,13 +252,11 @@ public class CloudRkCtx extends AbstractCtx {
reasonList.add(cbr);
}
/**
* 更新评分
*/
public boolean updateEnterpriseCredit(
Company company, CloudRk cloudRk, MessageHolder holder
) throws IOException {
Company company, CloudRk cloudRk, MessageHolder holder) throws IOException {
String api = getConfService().getString(CloudRkService.KEY_ENT_SCORE_URL);
AtomicBoolean modified = new AtomicBoolean(false);
try {
@@ -332,8 +324,7 @@ public class CloudRkCtx extends AbstractCtx {
* 客户信用
*/
public boolean updateCustomerScore(
Company company, CloudRk cloudRk, MessageHolder holder
) throws IOException {
Company company, CloudRk cloudRk, MessageHolder holder) throws IOException {
String url = getConfService().getString(CloudRkService.KEY_CUSTOMER_REPORT_URL);
AtomicBoolean modified = new AtomicBoolean(false);
try {
@@ -381,16 +372,15 @@ public class CloudRkCtx extends AbstractCtx {
if (updateNumber(cloudRk::getCustomerScore, cloudRk::setCustomerScore, score, holder, "客户信用总分")) {
modified = true;
}
if (updateText(cloudRk::getCustomerDescription, cloudRk::setCustomerDescription, description, holder, "客户信用评级说明")) {
if (updateText(cloudRk::getCustomerDescription, cloudRk::setCustomerDescription, description, holder,
"客户信用评级说明")) {
modified = true;
}
return modified;
}
public boolean updateVendorScore(
Company company, CloudRk cloudRk, MessageHolder holder
) throws IOException {
Company company, CloudRk cloudRk, MessageHolder holder) throws IOException {
String url = getConfService().getString(CloudRkService.KEY_VENDOR_REPORT_URL);
AtomicBoolean modified = new AtomicBoolean(false);
try {
@@ -437,7 +427,8 @@ public class CloudRkCtx extends AbstractCtx {
if (updateNumber(cloudRk::getVendorScore, cloudRk::setVendorScore, score, holder, "供应商信用总分")) {
modified = true;
}
if (updateText(cloudRk::getVendorDescription, cloudRk::setVendorDescription, description, holder, "供应商信用评级说明")) {
if (updateText(cloudRk::getVendorDescription, cloudRk::setVendorDescription, description, holder,
"供应商信用评级说明")) {
modified = true;
}
return modified;
@@ -451,8 +442,7 @@ public class CloudRkCtx extends AbstractCtx {
* @return true 更新了 cloudId，否则false
*/
private boolean queryCloudIdAndSelectOne(
Company company, CloudRk cloudRk, MessageHolder holder
) {
Company company, CloudRk cloudRk, MessageHolder holder) {
try {
List<CloudRkService.EntInfo> entInfos = queryEnterpriseWithFuzzy(company, cloudRk, holder);
// 返回的查询结果为空时
@@ -464,14 +454,17 @@ public class CloudRkCtx extends AbstractCtx {
}
// 在返回的结果中，找到与公司名字一致的一个
Optional<CloudRkService.EntInfo> optional = entInfos.stream().filter(n -> n.getName().equals(company.getName())).findAny();
Optional<CloudRkService.EntInfo> optional = entInfos.stream()
.filter(n -> n.getName().equals(company.getName())).findAny();
if (optional.isPresent()) {
cloudRk.setCloudId(optional.get().getId());
return true;
}
//
holder.error("在平台中查询到多个匹配 (" + entInfos.stream().map(CloudRkService.EntInfo::getName).collect(Collectors.joining(", ")) + ")，请手工同步选择匹配");
holder.error("在平台中查询到多个匹配 ("
+ entInfos.stream().map(CloudRkService.EntInfo::getName).collect(Collectors.joining(", "))
+ ")，请手工同步选择匹配");
return false;
} catch (Exception e) {
@@ -484,13 +477,11 @@ public class CloudRkCtx extends AbstractCtx {
}
}
/**
* 使用模糊查询接口查询相关企业信息
*/
public List<CloudRkService.EntInfo> queryEnterpriseWithFuzzy(
Company company, CloudRk cloudRk, MessageHolder holder
) throws IOException {
Company company, CloudRk cloudRk, MessageHolder holder) throws IOException {
String url = getConfService().getString(CloudRkService.KEY_ENT_FUZZY_URL);
List<CloudRkService.EntInfo> results = new ArrayList<>();
ObjectMapper objectMapper = getObjectMapper();
@@ -508,7 +499,8 @@ public class CloudRkCtx extends AbstractCtx {
return results;
}
private boolean applyEnterpriseQuery(JsonNode json, Company company, CloudRk cloudRk, List<CloudRkService.EntInfo> results, MessageHolder holder) {
private boolean applyEnterpriseQuery(JsonNode json, Company company, CloudRk cloudRk,
List<CloudRkService.EntInfo> results, MessageHolder holder) {
if (!json.has("data")) {
// 没有数据
holder.error("数据异常，返回的json中没有 data 字段");
@@ -542,8 +534,7 @@ public class CloudRkCtx extends AbstractCtx {
* 更新企业工商注册信息
*/
public boolean updateEnterpriseInfo(
Company company, CloudRk cloudRk, MessageHolder holder
) throws IOException {
Company company, CloudRk cloudRk, MessageHolder holder) throws IOException {
String api = getConfService().getString(CloudRkService.KEY_ENT_REPORT_URL);
Proxy socksProxy = getSocksProxy();
holder.debug("更新企业工商注册信息: " + company.getName() + " @ " + api + ", proxy=" + socksProxy);
@@ -609,10 +600,12 @@ public class CloudRkCtx extends AbstractCtx {
if (updateText(company::getRegisteredCapital, company::setRegisteredCapital, data, "regcap", holder, "注册资金")) {
modified = true;
}
if (updateText(company::getRegisteredCapitalCurrency, company::setRegisteredCapitalCurrency, data, "regcapcur", holder, "资本金币种")) {
if (updateText(company::getRegisteredCapitalCurrency, company::setRegisteredCapitalCurrency, data, "regcapcur",
holder, "资本金币种")) {
modified = true;
}
if (updateText(company::getLegalRepresentative, company::setLegalRepresentative, data, "frname", holder, "法人")) {
if (updateText(company::getLegalRepresentative, company::setLegalRepresentative, data, "frname", holder,
"法人")) {
modified = true;
}
if (updateText(company::getDistrict, company::setDistrict, data, "regorgprovince", holder, "注册区域")) {
@@ -636,10 +629,21 @@ public class CloudRkCtx extends AbstractCtx {
updateCompanyNameHistory(company, data, holder.sub("曾用名"));
updateLegalRepresentativeContact(company, data, holder.sub("法人联系方式"));
updateInstant(cloudRk::getCloudEntUpdate, cloudRk::setCloudEntUpdate, data, "updated", holder, "更新时间", false);
updateLocalDateTime(cloudRk::getCloudEntUpdate, cloudRk::setCloudEntUpdate, data, "updated", holder, "更新时间");
return modified;
}
public boolean updateLocalDateTime(Supplier<LocalDateTime> getter, Consumer<LocalDateTime> setter, JsonNode data,String field,
MessageHolder holder, String topic) {
JsonNode node = data.get(field);
if (node == null || node.isNull()) {
return false;
}
LocalDateTime updated = getObjectMapper().convertValue(node, LocalDateTime.class);
updateLocalDateTime(getter, setter, updated, holder, topic);
return false;
}
/**
* 更新法人联系人联系方式
@@ -650,7 +654,6 @@ public class CloudRkCtx extends AbstractCtx {
return;
}
CompanyContactService contactService = SpringApp.getBean(CompanyContactService.class);
List<CompanyContact> contactList = contactService.findAllByCompanyAndName(company, legalRepresentative);
if (contactList == null) {
@@ -660,7 +663,7 @@ public class CloudRkCtx extends AbstractCtx {
CompanyContact contact = null;
boolean modified = false;
if (contactList.isEmpty()) {
//没有，创建法人联系人
// 没有，创建法人联系人
contact = new CompanyContact();
contact.setCompany(company);
contact.setName(legalRepresentative);
@@ -705,7 +708,8 @@ public class CloudRkCtx extends AbstractCtx {
}
private boolean updateOperationPeriodBegin(Company company, JsonNode data, MessageHolder holder) {
return updateLocalDate(company::getOperationPeriodBegin, company::setOperationPeriodBegin, data, "opfrom", holder, "营业期限起始日期", true);
return updateLocalDate(company::getOperationPeriodBegin, company::setOperationPeriodBegin, data, "opfrom",
holder, "营业期限起始日期", true);
}
private boolean updateOperationPeriodEnd(Company company, JsonNode data, MessageHolder holder) {
@@ -716,14 +720,15 @@ public class CloudRkCtx extends AbstractCtx {
String text = node.asText();
if (StringUtils.hasText(text)) {
if (text.equals("-")) {
return updateLocalDate(company::getOperationPeriodEnd, company::setOperationPeriodEnd, (LocalDate) null, holder, "营业期限截至日期", true);
return updateLocalDate(company::getOperationPeriodEnd, company::setOperationPeriodEnd, (LocalDate) null,
holder, "营业期限截至日期", true);
}
return updateLocalDate(company::getOperationPeriodEnd, company::setOperationPeriodEnd, data, "opto", holder, "营业期限截至日期", true);
return updateLocalDate(company::getOperationPeriodEnd, company::setOperationPeriodEnd, data, "opto", holder,
"营业期限截至日期", true);
}
return false;
}
private void updateCompanyNameHistory(Company company, JsonNode data, MessageHolder holder) {
JsonNode node = data.get("nameHistory");
if (node == null) {
@@ -754,7 +759,8 @@ public class CloudRkCtx extends AbstractCtx {
}
}
private boolean updateLocalDate(Supplier<LocalDate> getter, Consumer<LocalDate> setter, JsonNode data, String field, MessageHolder holder, String topic, boolean allowNull) {
private boolean updateLocalDate(Supplier<LocalDate> getter, Consumer<LocalDate> setter, JsonNode data, String field,
MessageHolder holder, String topic, boolean allowNull) {
JsonNode node = data.get(field);
if (node == null || node.isNull()) {
return false;
@@ -766,11 +772,13 @@ public class CloudRkCtx extends AbstractCtx {
return updateLocalDate(getter, setter, localDate, holder, topic, allowNull);
}
private boolean updateLocalDate(Supplier<LocalDate> getter, Consumer<LocalDate> setter, JsonNode data, String field, MessageHolder holder, String topic) {
private boolean updateLocalDate(Supplier<LocalDate> getter, Consumer<LocalDate> setter, JsonNode data, String field,
MessageHolder holder, String topic) {
return updateLocalDate(getter, setter, data, field, holder, topic, false);
}
private void updateInstant(Supplier<Instant> getter, Consumer<Instant> setter, JsonNode data, String field, MessageHolder holder, String topic, boolean allowNull) {
private void updateInstant(Supplier<Instant> getter, Consumer<Instant> setter, JsonNode data, String field,
MessageHolder holder, String topic, boolean allowNull) {
JsonNode node = data.get("updated");
if (node == null) {
return;
@@ -787,7 +795,8 @@ public class CloudRkCtx extends AbstractCtx {
updateInstant(getter, setter, instant, holder, topic);
}
private boolean updateText(Supplier<String> getter, Consumer<String> setter, JsonNode data, String field, MessageHolder holder, String topic) {
private boolean updateText(Supplier<String> getter, Consumer<String> setter, JsonNode data, String field,
MessageHolder holder, String topic) {
JsonNode node = data.get(field);
if (node == null || node.isNull()) {
return false;