From d9d502b669dcbfc8e3aed10014aa99930979cd7a Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 11 三月 2025 09:50:47 +0800 Subject: [PATCH] 1、大理片笼新增复位按钮:清除笼内状态为0的玻璃数据,并将格子尺寸恢复到初始状态。 2、历史任务按钮:按照查询条件查询理片笼信息历史任务 3、fixbug:卧式理片笼没有玻璃时,仅恢复格子的尺寸 4、fixbug:中空出片顺序错乱,当数量小于总层数时,增加是否同一对玻璃的判断,避免少于总层数出片玻璃不是一对情况的发生 5、向前端推送上片的工位信息 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java index 42b56a2..b3de82f 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java @@ -1,15 +1,12 @@ package com.mes; -import com.mes.common.WebSocketServer; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.ConfigurableApplicationContext; -import springfox.documentation.swagger2.annotations.EnableSwagger2; -import com.mes.edgstoragecage.service.*; +import org.springframework.scheduling.annotation.EnableScheduling; +import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; /** * @Author : zhoush @@ -20,15 +17,13 @@ @SpringBootApplication @MapperScan("com.mes.*.mapper") @EnableDiscoveryClient -@EnableSwagger2 +@EnableSwagger2WebMvc +@EnableScheduling public class CacheGlassModuleApplication { public static void main(String[] args) { try { - SpringApplication springApplication = new SpringApplication(CacheGlassModuleApplication.class); - ConfigurableApplicationContext applicationContext = springApplication.run(args); - WebSocketServer.setApplicationContext(applicationContext); - //SpringApplication.run(CacheGlassModuleApplication.class, args); + SpringApplication.run(CacheGlassModuleApplication.class, args); } catch (Exception e) { log.error(e.getMessage()); } -- Gitblit v1.8.0