diff --git a/wms/nladmin-system/doc/wms.xls b/wms/nladmin-system/doc/wms.xls deleted file mode 100644 index 38c5808..0000000 Binary files a/wms/nladmin-system/doc/wms.xls and /dev/null differ diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/StaticData.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/StaticData.java deleted file mode 100644 index d0e162a..0000000 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/StaticData.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.nl.wms.biBoard; - -import org.nl.wms.biBoard.screen.service.dto.AgvStatus; - -import java.util.HashMap; -import java.util.Map; - -public class StaticData { - public static Map agv_status= new HashMap<>(); - - public void sync(String carId,AgvStatus agvStatus){ - agv_status.put(carId,agvStatus); - } - -} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/run/AutoSyncAgvStatus.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/run/AutoSyncAgvStatus.java new file mode 100644 index 0000000..1cbd823 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/run/AutoSyncAgvStatus.java @@ -0,0 +1,69 @@ +package org.nl.wms.biBoard.run; + +import cn.hutool.http.HttpStatus; +import com.alibaba.fastjson.JSONObject; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.nl.wms.biBoard.screen.service.dto.AgvStatus; +import org.nl.wms.biBoard.temp.service.IBiTempRecordService; +import org.nl.wms.biBoard.temp.service.dao.BiTempRecord; +import org.nl.wms.ext.service.WmsToAcsService; +import org.nl.wms.ext.service.util.AcsResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +/** + *

+ * 任务自动下发 + *

+ * + * @author Liuxy + * @since 2025-06-09 + */ +@Slf4j +@Component +@Order(value = 1) +public class AutoSyncAgvStatus { + public static Map AGV_STATUS= new HashMap<>(); + @Autowired + private WmsToAcsService wmsToAcsService; + @SneakyThrows + public void run() { + System.out.println("------AutoSyncAgvStatus-------"); + this.doExecute(); + } + + /** + * 需要按照任务配置类型并行执行 + */ + private void doExecute() { + try { + AcsResponse agvStatus = wmsToAcsService.getAgvStatus(); + if (agvStatus.getStatus() == HttpStatus.HTTP_OK){ + final JSONObject resultData = agvStatus.getResultData(); + if (!CollectionUtils.isEmpty(resultData)){ + for (String carId : resultData.keySet()) { + JSONObject object = resultData.getJSONObject(carId); + if (object!=null){ + AgvStatus agvStatusDto = object.toJavaObject(AgvStatus.class); + AGV_STATUS.put(carId,agvStatusDto); + } + } + } + } + }catch (Exception ex){ + log.error(ex.getMessage()); + } + } + +} + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/run/AutoSyncTemp.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/run/AutoSyncTemp.java new file mode 100644 index 0000000..bcf788a --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/run/AutoSyncTemp.java @@ -0,0 +1,77 @@ +package org.nl.wms.biBoard.run; + +import cn.hutool.http.HttpStatus; +import com.alibaba.fastjson.JSONObject; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.nl.wms.biBoard.screen.service.dto.AgvStatus; +import org.nl.wms.biBoard.temp.service.IBiTempRecordService; +import org.nl.wms.biBoard.temp.service.dao.BiTempRecord; +import org.nl.wms.ext.service.WmsToAcsService; +import org.nl.wms.ext.service.util.AcsResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; + +/** + *

+ * 任务自动下发 + *

+ * + * @author Liuxy + * @since 2025-06-09 + */ +@Slf4j +@Component +@Order(value = 1) +public class AutoSyncTemp { + public static Map agv_status= new HashMap<>(); + @Autowired + private WmsToAcsService wmsToAcsService; + + @Autowired + private IBiTempRecordService iBiTempRecordService; + @SneakyThrows + public void run() { + System.out.println("------AutoSyncTemp-------"); + this.doExecute(); + } + + /** + * 需要按照任务配置类型并行执行 + */ + private void doExecute() { + try { + AcsResponse tempHumAcs = wmsToAcsService.getTempHumAcs(); + if (tempHumAcs.getStatus() == HttpStatus.HTTP_OK){ + //{ + // "status": "200", + // "message": "success", + // "resultData": { + // "temp": 25.6, 温度 + // "hum": 60.2 适度 + // } + //} + JSONObject data = tempHumAcs.getResultData(); + final BigDecimal temp = data.getBigDecimal("temp"); + final BigDecimal hum = data.getBigDecimal("hum"); + final BiTempRecord record = new BiTempRecord(); + record.setTemp(temp); + record.setHumidity(hum); + record.setRecord_datee(LocalDate.now()); + record.setRecord_timee(LocalDateTime.now()); + iBiTempRecordService.save(record); + } + }catch (Exception ex){ + log.error(ex.getMessage()); + } + } + +} + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/IScreenService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/IScreenService.java index 3a01ec0..58e5f7f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/IScreenService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/IScreenService.java @@ -1,5 +1,9 @@ package org.nl.wms.biBoard.screen.service; +import org.nl.wms.biBoard.screen.service.dto.AgvStatus; + +import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -20,9 +24,10 @@ public interface IScreenService { /** * 获取AGV状态 + * * @return Map */ - Map getAgvStatus(); + Collection getAgvStatus(); /** * 获取当天温度走势 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/dao/mapper/ScreenMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/dao/mapper/ScreenMapper.xml index 01de7a9..9c5c35e 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/dao/mapper/ScreenMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/biBoard/screen/service/dao/mapper/ScreenMapper.xml @@ -43,7 +43,8 @@