添加功能

2025-08-08 18:38:18 +08:00 · 2025-08-08 18:38:18 +08:00 · 36bb7c0c30
parent 4a9aad9eb4
commit 36bb7c0c30
8 changed files with 96 additions and 19 deletions
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/schedule/LdapScheduledTask.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/schedule/LdapScheduledTask.java
@ -27,12 +27,16 @@ import java.util.List;
 public class LdapScheduledTask {

    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN);
+
    @Resource
    private IAdService adService;
+
    @Resource
    private IAdSyncService adSyncService;
+
    @Resource
    private DepartmentControllerService departmentControllerService;
+
    @Resource
    private UserControllerService userControllerService;

--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/constant/InventoryCheckTaskState.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/constant/InventoryCheckTaskState.java
@ -0,0 +1,28 @@
+package com.nflg.wms.common.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Objects;
+
+@Getter
+@AllArgsConstructor
+public enum InventoryCheckTaskState {
+
+    UnPublish(0, "未发布"),
+    Published(1, "已发布"),
+    InProgress(2, "进行中"),
+    Completed(3, "已完成");
+
+    private final Integer state;
+    private final String description;
+
+    public static InventoryCheckTaskState findByValue(Integer value) {
+        for (InventoryCheckTaskState valueEnum : InventoryCheckTaskState.values()) {
+            if (Objects.equals(valueEnum.getState(), value)) {
+                return valueEnum;
+            }
+        }
+        return null;
+    }
+}
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/util/DateTimeUtil.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/util/DateTimeUtil.java
@ -60,4 +60,13 @@ public class DateTimeUtil {
                .withZoneSameInstant(ZoneId.systemDefault())
                .toLocalDateTime();
    }
+
+    public static LocalDate asUTCDate(LocalDate date) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
+        return date.atStartOfDay(ZoneId.systemDefault())
+                .withZoneSameInstant(ZoneOffset.UTC)
+                .toLocalDate();
+    }
 }
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/config/MysqlDataSourceConfig.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/config/MysqlDataSourceConfig.java
@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInt
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import com.nflg.wms.repository.handler.UTCLocalDateTimeTypeHandler;
-import com.nflg.wms.repository.handler.UTCLocalDateTypeHandler;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.type.TypeHandlerRegistry;
 import org.mybatis.spring.annotation.MapperScan;
@ -18,7 +17,6 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.transaction.annotation.EnableTransactionManagement;

 import javax.sql.DataSource;
-import java.time.LocalDate;
 import java.time.LocalDateTime;

@Configuration
@ -39,7 +37,7 @@ public class MysqlDataSourceConfig {

        TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry();
        typeHandlerRegistry.register(LocalDateTime.class, new UTCLocalDateTimeTypeHandler());
-        typeHandlerRegistry.register(LocalDate.class, new UTCLocalDateTypeHandler());
+//        typeHandlerRegistry.register(LocalDate.class, new UTCLocalDateTypeHandler());

        sqlSessionFactoryBean.setConfiguration(configuration);
        sqlSessionFactoryBean.setDataSource(masterDataSource);
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryCheckTaskServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryCheckTaskServiceImpl.java
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.nflg.wms.common.constant.InventoryCheckTaskState;
 import com.nflg.wms.common.pojo.qo.InventoryCheckTaskMaterialsQO;
 import com.nflg.wms.common.pojo.qo.InventoryCheckTaskSaveQO;
 import com.nflg.wms.common.pojo.qo.InventoryCheckTaskSearchQO;
@ -118,13 +119,13 @@ public class WmsInventoryCheckTaskServiceImpl extends ServiceImpl<WmsInventoryCh
    public void complete(Long taskId) {
        WmsInventoryCheckTask task = getById(taskId);
        VUtil.trueThrowBusinessError(Objects.isNull(task)).throwMessage("未找到任务");
-        VUtil.trueThrowBusinessError(!Objects.equals(task.getState(), 2)).throwMessage("任务未开始或已完成");
+        VUtil.trueThrowBusinessError(!Objects.equals(task.getState(), InventoryCheckTaskState.InProgress.getState())).throwMessage("任务未开始或已完成");
        lambdaUpdate()
-                .set(WmsInventoryCheckTask::getState, 3)
+                .set(WmsInventoryCheckTask::getState, InventoryCheckTaskState.Completed.getState())
                .set(WmsInventoryCheckTask::getUpdateBy, UserUtil.getUserName())
                .set(WmsInventoryCheckTask::getUpdateTime, LocalDateTime.now())
                .eq(WmsInventoryCheckTask::getId, taskId)
-                .eq(WmsInventoryCheckTask::getState, 2)
+                .eq(WmsInventoryCheckTask::getState, InventoryCheckTaskState.InProgress.getState())
                .update();
    }

--- a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/InventoryCheckTaskProcessor.java
+++ b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/InventoryCheckTaskProcessor.java
@ -0,0 +1,47 @@
+package com.nflg.wms.scheduled.processor;
+
+import com.nflg.wms.common.constant.InventoryCheckTaskState;
+import com.nflg.wms.repository.entity.WmsInventoryCheckTask;
+import com.nflg.wms.repository.service.IWmsInventoryCheckTaskService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+import tech.powerjob.worker.core.processor.ProcessResult;
+import tech.powerjob.worker.core.processor.TaskContext;
+import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
+import tech.powerjob.worker.log.OmsLogger;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Component(value = "InventoryCheckTaskProcessor")
+public class InventoryCheckTaskProcessor implements BasicProcessor {
+
+    @Resource
+    private IWmsInventoryCheckTaskService inventoryCheckTaskService;
+
+    @Override
+    public ProcessResult process(TaskContext context) {
+        OmsLogger omsLogger = context.getOmsLogger();
+        omsLogger.info("开始");
+        List<WmsInventoryCheckTask> datas = inventoryCheckTaskService.lambdaQuery().eq(WmsInventoryCheckTask::getState, InventoryCheckTaskState.Published.getState()).list();
+        omsLogger.info("共【{}】条已发布数据", datas.size());
+        datas.forEach(data -> {
+            omsLogger.info("处理【{}】开始", data.getTaskNo());
+            if (LocalDate.now().isAfter(data.getEndTime())) {
+                inventoryCheckTaskService.lambdaUpdate()
+                        .eq(WmsInventoryCheckTask::getId, data.getId())
+                        .set(WmsInventoryCheckTask::getState, InventoryCheckTaskState.Completed.getState())
+                        .update();
+                omsLogger.info("设置为状态:{}", InventoryCheckTaskState.Completed.getDescription());
+            } else if (data.getStartTime().isAfter(LocalDate.now())) {
+                inventoryCheckTaskService.lambdaUpdate()
+                        .eq(WmsInventoryCheckTask::getId, data.getId())
+                        .set(WmsInventoryCheckTask::getState, InventoryCheckTaskState.InProgress.getState())
+                        .update();
+                omsLogger.info("设置为状态:{}", InventoryCheckTaskState.InProgress.getDescription());
+            }
+            omsLogger.info("处理【{}】结束", data.getTaskNo());
+        });
+        return new ProcessResult(true, "处理完毕");
+    }
+}
--- a/nflg-wms-scheduled/src/main/resources/application-dev.yml
+++ b/nflg-wms-scheduled/src/main/resources/application-dev.yml
@ -1,10 +0,0 @@
-logging:
-  level:
-    root: info
-    com:
-      nflg: debug
-      alibaba:
-        cloud:
-          nacos: debug
-      org:
-        springframework: debug
--- a/nflg-wms-scheduled/src/main/resources/application.yml
+++ b/nflg-wms-scheduled/src/main/resources/application.yml
@ -4,17 +4,17 @@ spring:
  application:
    name: scheduled
  profiles:
-    active: dev
+    active: sit
  config:
    import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
  cloud:
    nacos:
      config:
-        server-addr: ${nacos.server-addr:112.74.186.154:8848}
+        server-addr: ${nacos.server-addr:192.168.163.83:8848}
        namespace: wms
        group: ${spring.profiles.active}
      discovery:
-        server-addr: ${nacos.server-addr:112.74.186.154:8848}
+        server-addr: ${nacos.server-addr:192.168.163.83:8848}
        namespace: wms
        group: ${spring.profiles.active}
 logging: