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

refactor(util): 重构BeanContext接口及相关实现

Browse Source 
将ContextUtils重命名为BeanContext，并统一客户端和服务端的实现
添加DefaultBeanContext作为默认实现
优化Inventory同步任务逻辑，支持WebSocket远程调用
更新tasker_mapper.json添加新的任务映射
移除未使用的syncInventory方法
This commit is contained in:
宋其青
2025-10-12 22:39:32 +08:00
parent 59d78619da
commit 5b3ab3ed00
17 changed files with 360 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/src/main/java/com/ecep/contract/cloud/AbstractCtx.java
View File

@@ -6,9 +6,7 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeParseException;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.function.Consumer;
import java.util.function.Supplier;
@@ -17,35 +15,38 @@ import org.springframework.beans.BeansException;
import org.springframework.util.StringUtils;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.SpringApp;
import com.ecep.contract.ds.company.service.CompanyService;
import com.ecep.contract.ds.other.service.EmployeeService;
import com.ecep.contract.ds.other.service.SysConfService;
import com.ecep.contract.util.ContextUtils;
import com.ecep.contract.util.BeanContext;
import com.ecep.contract.util.DefaultBeanContext;
import com.ecep.contract.util.MyStringUtils;
import com.ecep.contract.util.NumberUtils;
import lombok.Getter;
import lombok.Setter;
public class AbstractCtx implements ContextUtils {
public class AbstractCtx implements BeanContext {
@Setter
@Getter
Locale locale = Locale.getDefault();
private Map<Class<?>, Object> cachedBeans = new HashMap<>();
private BeanContext beanContext;
public <T> T getBean(Class<T> requiredType) throws BeansException {
return getCachedBean(requiredType);
public AbstractCtx() {
this(new DefaultBeanContext());
}
public AbstractCtx(BeanContext ctx) {
beanContext = ctx;
}
public <T> T getBean(Class<T> requiredType) throws BeansException {
return beanContext.getBean(requiredType);
}
@SuppressWarnings("unchecked")
public <T> T getCachedBean(Class<T> requiredType) throws BeansException {
Object object = cachedBeans.get(requiredType);
if (object == null) {
object = SpringApp.getBean(requiredType);
cachedBeans.put(requiredType, object);
}
return (T) object;
return beanContext.getCachedBean(requiredType);
}
public SysConfService getConfService() {

28
server/src/main/java/com/ecep/contract/cloud/u8/ctx/AbstractYongYouU8Ctx.java
View File

@@ -5,6 +5,9 @@ import java.util.function.Consumer;
import java.util.function.Supplier;
import com.ecep.contract.vo.*;
import ch.qos.logback.core.util.ContextUtil;
import org.hibernate.Hibernate;
import org.springframework.beans.BeansException;
import org.springframework.util.StringUtils;
@@ -19,6 +22,7 @@ import com.ecep.contract.ds.vendor.service.VendorEntityService;
import com.ecep.contract.ds.vendor.service.VendorService;
import com.ecep.contract.ds.company.model.Company;
import com.ecep.contract.model.Employee;
import com.ecep.contract.util.BeanContext;
import lombok.Getter;
import lombok.Setter;
@@ -28,6 +32,14 @@ public class AbstractYongYouU8Ctx extends AbstractCtx {
@Setter
YongYouU8Repository repository;
public AbstractYongYouU8Ctx() {
super();
}
public AbstractYongYouU8Ctx(BeanContext ctx) {
super(ctx);
}
public void from(AbstractYongYouU8Ctx parent) {
repository = parent.repository;
}
@@ -60,7 +72,7 @@ public class AbstractYongYouU8Ctx extends AbstractCtx {
}
boolean updateEmployeeByCode(Supplier<Employee> getter, Consumer<Employee> setter, String code,
MessageHolder holder, String topic) {
MessageHolder holder, String topic) {
if (StringUtils.hasText(code)) {
var employee = getEmployeeService().findByCode(code);
if (employee != null) {
@@ -71,7 +83,7 @@ public class AbstractYongYouU8Ctx extends AbstractCtx {
}
boolean updateEmployeeId(Supplier<Integer> getter, Consumer<Integer> setter, EmployeeVo employee,
MessageHolder holder, String topic) {
MessageHolder holder, String topic) {
if (employee == null) {
return false;
}
@@ -90,7 +102,7 @@ public class AbstractYongYouU8Ctx extends AbstractCtx {
}
boolean updateEmployeeIdByCode(Supplier<Integer> getter, Consumer<Integer> setter, String code,
MessageHolder holder, String topic) {
MessageHolder holder, String topic) {
if (StringUtils.hasText(code)) {
var employee = getEmployeeService().findByCode(code);
if (employee != null) {
@@ -101,7 +113,7 @@ public class AbstractYongYouU8Ctx extends AbstractCtx {
}
boolean updateEmployee(Supplier<Employee> getter, Consumer<Employee> setter, EmployeeVo employee,
MessageHolder holder, String topic) {
MessageHolder holder, String topic) {
if (employee == null) {
return false;
}
@@ -124,7 +136,7 @@ public class AbstractYongYouU8Ctx extends AbstractCtx {
}
boolean updateEmployeeByName(Supplier<Employee> getter, Consumer<Employee> setter, String name,
MessageHolder holder, String topic) {
MessageHolder holder, String topic) {
if (StringUtils.hasText(name)) {
EmployeeVo employee = getEmployeeService().findByName(name);
if (employee != null) {
@@ -135,7 +147,7 @@ public class AbstractYongYouU8Ctx extends AbstractCtx {
}
boolean updateEmployeeIdByName(Supplier<Integer> getter, Consumer<Integer> setter, String name,
MessageHolder holder, String topic) {
MessageHolder holder, String topic) {
if (StringUtils.hasText(name)) {
EmployeeVo employee = getEmployeeService().findByName(name);
if (employee != null) {
@@ -146,7 +158,7 @@ public class AbstractYongYouU8Ctx extends AbstractCtx {
}
boolean updateCompanyByCustomerCode(Supplier<Company> getter, Consumer<Company> setter, String customerCode,
MessageHolder holder, String topic) {
MessageHolder holder, String topic) {
Company company = null;
if (StringUtils.hasText(customerCode)) {
CompanyCustomerEntityService customerEntityService = getCompanyCustomerEntityService();
@@ -181,7 +193,7 @@ public class AbstractYongYouU8Ctx extends AbstractCtx {
}
boolean updateCompanyByVendorCode(Supplier<Company> getter, Consumer<Company> setter, String vendorCode,
MessageHolder holder, String topic) {
MessageHolder holder, String topic) {
Company company = null;
if (StringUtils.hasText(vendorCode)) {
VendorEntityService vendorEntityService = getCompanyVendorEntityService();

51
server/src/main/java/com/ecep/contract/cloud/u8/ctx/InventoryCtx.java
View File

@@ -7,41 +7,34 @@ import java.util.Objects;
import java.util.function.Consumer;
import java.util.function.Supplier;
import com.ecep.contract.vo.InventoryCatalogVo;
import org.hibernate.Hibernate;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.util.StringUtils;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.constant.CloudServiceConstant;
import com.ecep.contract.ds.other.service.InventoryCatalogService;
import com.ecep.contract.ds.other.service.InventoryService;
import com.ecep.contract.model.Inventory;
import com.ecep.contract.model.InventoryCatalog;
import com.ecep.contract.model.Price;
import com.ecep.contract.util.BeanContext;
import com.ecep.contract.vo.InventoryCatalogVo;
import com.ecep.contract.vo.InventoryVo;
import lombok.Setter;
public class InventoryCtx extends AbstractYongYouU8Ctx {
@Setter
private InventoryService inventoryService;
@Setter
private InventoryCatalogService inventoryCatalogService;
public InventoryCtx() {
super();
}
public InventoryCtx(BeanContext ctx) {
super(ctx);
}
public InventoryService getInventoryService() {
if (inventoryService == null) {
inventoryService = getBean(InventoryService.class);
}
return inventoryService;
return getCachedBean(InventoryService.class);
}
public InventoryCatalogService getInventoryCatalogService() {
if (inventoryCatalogService == null) {
inventoryCatalogService = getBean(InventoryCatalogService.class);
}
return inventoryCatalogService;
return getCachedBean(InventoryCatalogService.class);
}
private boolean applyInventoryDetail(Inventory item, Map<String, Object> map, MessageHolder holder) {
@@ -127,6 +120,21 @@ public class InventoryCtx extends AbstractYongYouU8Ctx {
return modified;
}
public boolean syncInventory(Inventory inventory, MessageHolder holder) {
Map<String, Object> map = null;
try {
map = repository.queryInventoryDetail(inventory.getCode());
} catch (EmptyResultDataAccessException e) {
holder.error("无此存货：" + inventory.getCode());
return false;
}
if (applyInventoryDetail(inventory, map, holder)) {
inventory.setUpdateDate(LocalDateTime.now());
return true;
}
return false;
}
public boolean syncInventoryDetailByCode(Inventory inventory, String inventoryCode, MessageHolder holder) {
if (repository == null) {
return false;
@@ -134,9 +142,6 @@ public class InventoryCtx extends AbstractYongYouU8Ctx {
Map<String, Object> map = null;
try {
map = repository.queryInventoryDetail(inventoryCode);
} catch (NoSuchBeanDefinitionException e) {
holder.warn("未启用 " + CloudServiceConstant.U8_NAME + " 服务");
return false;
} catch (EmptyResultDataAccessException e) {
holder.error("无此存货：" + inventoryCode);
return false;
@@ -159,7 +164,7 @@ public class InventoryCtx extends AbstractYongYouU8Ctx {
* @return 是否更新
*/
private boolean updateInventoryCatalog(Supplier<InventoryCatalog> getter, Consumer<InventoryCatalog> setter,
String catalogCode, MessageHolder holder, String topic) {
String catalogCode, MessageHolder holder, String topic) {
InventoryCatalogVo catalog = null;
if (StringUtils.hasText(catalogCode)) {
catalog = getInventoryCatalogService().findByCode(catalogCode);
@@ -195,7 +200,7 @@ public class InventoryCtx extends AbstractYongYouU8Ctx {
* @return 是否更新
*/
public boolean syncInventoryDetailByCode(Supplier<Inventory> getter, Consumer<Inventory> setter,
String inventoryCode, MessageHolder holder, String topic) {
String inventoryCode, MessageHolder holder, String topic) {
if (!StringUtils.hasText(inventoryCode)) {
return false;
}

95
server/src/main/java/com/ecep/contract/ds/other/controller/InventoryAllSyncTask.java Normal file
View File

@@ -0,0 +1,95 @@
package com.ecep.contract.ds.other.controller;
import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.domain.Specification;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.cloud.u8.ctx.InventoryCtx;
import com.ecep.contract.ds.other.service.InventoryService;
import com.ecep.contract.model.Inventory;
import com.ecep.contract.service.tasker.WebSocketServerTasker;
import com.ecep.contract.ui.Tasker;
import com.fasterxml.jackson.databind.JsonNode;
/**
* 全量同步库存
*/
public class InventoryAllSyncTask extends Tasker<Object> implements WebSocketServerTasker {
private InventoryCtx inventoryCtx;
public InventoryService getInventoryService() {
return getCachedBean(InventoryService.class);
}
@Override
public void init(JsonNode argsNode) {
}
@Override
protected Object execute(MessageHolder holder) throws Exception {
updateProgress(0, 1000);
inventoryCtx = new InventoryCtx(this);
inventoryCtx.initializeRepository(holder);
InventoryService service = getInventoryService();
Pageable pageRequest = PageRequest.ofSize(200);
AtomicInteger counter = new AtomicInteger(0);
Specification<Inventory> spec = null;
long total = service.count(spec);
holder.info("共需同步 " + total + " 条库存数据");
while (true) {
if (isCancelled()) {
holder.warn("库存同步任务已取消");
break;
}
Page<Inventory> page = service.findAll(spec, pageRequest);
if (page.isEmpty()) {
break;
}
for (Inventory inventory : page) {
if (isCancelled()) {
holder.warn("库存同步任务已取消");
break;
}
String prefix = counter.get() + " / " + total + "> #" + inventory.getId() + "> ";
MessageHolder subHolder = holder.sub(prefix);
syncInventory(inventory, subHolder);
int progress = (int) ((counter.incrementAndGet() * 1000L) / total);
updateProgress(progress, 1000);
}
if (!page.hasNext()) {
break;
}
pageRequest = page.nextPageable();
}
updateProgress(1000, 1000);
holder.info("库存同步任务完成！");
return null;
}
private void syncInventory(Inventory inventory, MessageHolder holder) {
holder.info("正在同步库存数据：" + inventory.getCode() + " - " + inventory.getName());
try {
if (inventoryCtx.syncInventoryDetailByCode(inventory, inventory.getCode(), holder)) {
inventoryCtx.getInventoryService().save(inventory);
holder.info("库存数据同步成功：" + inventory.getCode());
}
} catch (Exception e) {
holder.error("库存同步失败：" + inventory.getCode() + " - " + e.getMessage());
}
}
}

71
server/src/main/java/com/ecep/contract/ds/other/controller/InventorySyncTask.java
View File

@@ -11,54 +11,47 @@ import com.ecep.contract.MessageHolder;
import com.ecep.contract.cloud.u8.ctx.InventoryCtx;
import com.ecep.contract.ds.other.service.InventoryService;
import com.ecep.contract.model.Inventory;
import com.ecep.contract.service.tasker.WebSocketServerTasker;
import com.ecep.contract.ui.Tasker;
import com.ecep.contract.vo.InventoryVo;
import com.fasterxml.jackson.databind.JsonNode;
public class InventorySyncTask extends Tasker<Object> {
import lombok.Setter;
public class InventorySyncTask extends Tasker<Object> implements WebSocketServerTasker {
private InventoryCtx inventoryCtx;
@Setter
private Inventory inventory;
public InventoryService getInventoryService() {
return getCachedBean(InventoryService.class);
}
@Override
public void init(JsonNode argsNode) {
int inventoryId = argsNode.get(0).asInt();
inventory = getInventoryService().getById(inventoryId);
}
@Override
protected Object execute(MessageHolder holder) throws Exception {
inventoryCtx = new InventoryCtx();
if (inventory == null) {
holder.error("库存不存在");
return null;
}
updateProgress(0, 1000);
inventoryCtx = new InventoryCtx(this);
inventoryCtx.initializeRepository(holder);
InventoryService service = inventoryCtx.getInventoryService();
Pageable pageRequest = PageRequest.ofSize(200);
AtomicInteger counter = new AtomicInteger(0);
Specification<Inventory> spec = null;
long total = service.count(spec);
while (true) {
if (isCancelled()) {
break;
}
Page<Inventory> page = service.findAll(spec, pageRequest);
if (page.isEmpty()) {
break;
}
for (Inventory inventory : page) {
if (isCancelled()) {
break;
}
String prefix = counter.get() + " / " + total + "> #" + inventory.getId() + "> ";
MessageHolder subHolder = holder.sub(prefix);
syncInventory(inventory, subHolder);
updateProgress(counter.incrementAndGet(), total);
}
if (!page.hasNext()) {
break;
}
pageRequest = page.nextPageable();
if (inventoryCtx.syncInventory(inventory, holder)) {
getInventoryService().save(inventory);
holder.info("库存数据同步成功：" + inventory.getCode());
}
updateProgress(1, 1);
return super.call();
updateProgress(1000, 1000);
holder.info("库存同步任务完成！");
return null;
}
private void syncInventory(Inventory inventory, MessageHolder holder) {
if (inventoryCtx.syncInventoryDetailByCode(inventory, inventory.getCode(), holder)) {
inventoryCtx.getInventoryService().save(inventory);
}
}
}

23
server/src/main/java/com/ecep/contract/ui/Tasker.java
View File

@@ -16,11 +16,13 @@ import com.ecep.contract.ds.company.service.CompanyService;
import com.ecep.contract.ds.other.service.EmployeeService;
import com.ecep.contract.ds.other.service.SysConfService;
import com.ecep.contract.model.Employee;
import com.ecep.contract.util.BeanContext;
import com.ecep.contract.util.DefaultBeanContext;
import lombok.Getter;
import lombok.Setter;
public abstract class Tasker<T> implements java.util.concurrent.Callable<T> {
public abstract class Tasker<T> implements java.util.concurrent.Callable<T>, BeanContext {
private static final Logger logger = LoggerFactory.getLogger(Tasker.class);
@Setter
protected java.util.function.Predicate<Message> messageHandler;
@@ -33,13 +35,16 @@ public abstract class Tasker<T> implements java.util.concurrent.Callable<T> {
@Getter
@Setter
private Locale locale = Locale.getDefault();
private HashMap<Class<?>, Object> cachedMap = new HashMap<>();
private BeanContext beanContext;
@Setter
private Employee currentUser;
@Setter
@Getter
private boolean cancelled = false;
public Tasker() {
beanContext = new DefaultBeanContext();
}
public SysConfService getConfService() {
return getCachedBean(SysConfService.class);
@@ -53,18 +58,12 @@ public abstract class Tasker<T> implements java.util.concurrent.Callable<T> {
return getCachedBean(EmployeeService.class);
}
protected <K> K getBean(Class<K> requiredType) throws BeansException {
return SpringApp.getBean(requiredType);
public <K> K getBean(Class<K> requiredType) throws BeansException {
return beanContext.getBean(requiredType);
}
protected <K> K getCachedBean(Class<K> requiredType) {
@SuppressWarnings("unchecked")
K bean = (K) cachedMap.get(requiredType);
if (bean == null) {
bean = getBean(requiredType);
cachedMap.put(requiredType, bean);
}
return bean;
public <K> K getCachedBean(Class<K> requiredType) {
return beanContext.getCachedBean(requiredType);
}
public Employee getCurrentUser() {

29
server/src/main/java/com/ecep/contract/util/DefaultBeanContext.java Normal file
View File

@@ -0,0 +1,29 @@
package com.ecep.contract.util;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.BeansException;
import com.ecep.contract.SpringApp;
/**
* 默认的Bean上下文实现类
*/
public class DefaultBeanContext implements BeanContext {
private Map<Class<?>, Object> cachedBeans = new HashMap<>();
public <T> T getBean(Class<T> requiredType) throws BeansException {
return getCachedBean(requiredType);
}
@SuppressWarnings("unchecked")
public <T> T getCachedBean(Class<T> requiredType) throws BeansException {
Object object = cachedBeans.get(requiredType);
if (object == null) {
object = SpringApp.getBean(requiredType);
cachedBeans.put(requiredType, object);
}
return (T) object;
}
}

4
server/src/main/resources/tasker_mapper.json
View File

@@ -14,7 +14,9 @@
"CloudRkSyncTask": "com.ecep.contract.cloud.rk.CloudRkSyncTask",
"VendorReBuildFilesTasker": "com.ecep.contract.ds.vendor.task.VendorReBuildFilesTasker",
"CompanyVendorEvaluationFormUpdateTask": "com.ecep.contract.service.tasker.CompanyVendorEvaluationFormUpdateTask",
"VendorNextSignDateTask": "com.ecep.contract.service.tasker.VendorNextSignDateTask"
"VendorNextSignDateTask": "com.ecep.contract.service.tasker.VendorNextSignDateTask",
"InventorySyncTask": "com.ecep.contract.ds.other.controller.InventorySyncTask",
"InventoryAllSyncTask": "com.ecep.contract.ds.other.controller.InventoryAllSyncTask"
},
"descriptions": "任务注册信息, 客户端的任务可以通过 WebSocket 调用"
}