From 592ab0784bb1b8b692570c203ab282db300d9e5a Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 17 四月 2024 10:21:46 +0800
Subject: [PATCH] 磨边前模块文件删除提交
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java | 29 ++
hangzhoumesParent/gateway/src/main/resources/application.yml | 8
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java | 42 ++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/mapper/BigStorageCageOutTaskMapper.java | 16 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageOutTaskService.java | 19 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java | 40 ++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java | 35 +++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageFeedTaskService.java | 23 ++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml | 13
hangzhoumesParent/gateway/src/main/java/com/mes/config/MyCorsConfig.java | 26 -
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/mapper/BigStorageCageFeedTaskMapper.java | 16 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageOutTask.java | 37 +++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 10 -
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 5
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/service/TaskCacheService.java | 17 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 13
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/service/impl/TaskCacheServiceImpl.java | 53 +++++
/dev/null | 47 ----
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 3
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java | 38 +++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/entity/TaskCache.java | 49 ++++
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 1
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/controller/TaskCacheController.java | 21 ++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/mapper/TaskCacheMapper.java | 16 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java | 4
26 files changed, 486 insertions(+), 97 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/InterceptorConfig.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/InterceptorConfig.java
deleted file mode 100644
index a5ad9af..0000000
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/InterceptorConfig.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.mes.common.config;
-
-import com.mes.common.interceptor.JwtInterceptor;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import javax.annotation.Resource;
-
-@Configuration
-public class InterceptorConfig implements WebMvcConfigurer {
- @Resource
- private JwtInterceptor jwtInterceptor;
-
- @Override
- public void addInterceptors(InterceptorRegistry registry) {
- registry.addInterceptor(jwtInterceptor)
- .addPathPatterns("/**")
- .excludePathPatterns("/user/login",
- "/user/register",
- "/swagger-resources/**"
- , "/webjars/**"
- , "/v2/**"
- , "/swagger-ui.html/**"
- , "/swagger-ui.html#/**");
- }
-
- @Override
- public void addCorsMappings(CorsRegistry registry) {
- // 璁剧疆鍏佽璺ㄥ煙鐨勮矾寰�
- registry.addMapping("/**")
- // 璁剧疆鍏佽璺ㄥ煙璇锋眰鐨勫煙鍚�
-// .allowedOriginPatterns("*")
- // 鏄惁鍏佽cookie
- .allowCredentials(true)
- // 璁剧疆鍏佽鐨勮姹傛柟寮�
- .allowedMethods("GET", "POST", "DELETE", "PUT")
- // 璁剧疆鍏佽鐨刪eader灞炴��
- .allowedHeaders("*")
- // 璺ㄥ煙鍏佽鏃堕棿
- .maxAge(3600);
- }
-
-}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/MyCorsConfig.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/MyCorsConfig.java
deleted file mode 100644
index 7b3acd4..0000000
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/MyCorsConfig.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mes.common.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * @Author : zhoush
- * @Date: 2024/3/25 14:13
- * @Description:
- */
-@Configuration
-public class MyCorsConfig {
-
- @Bean
- public WebMvcConfigurer corsConfigurer() {
- return new WebMvcConfigurer() {
- @Override
- public void addCorsMappings(CorsRegistry registry) {
- registry.addMapping("/**");
- }
- };
- }
-}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/interceptor/JwtInterceptor.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/interceptor/JwtInterceptor.java
deleted file mode 100644
index b95b9e1..0000000
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/interceptor/JwtInterceptor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.mes.common.interceptor;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Component
-public class JwtInterceptor implements HandlerInterceptor {
- @Override
- public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
- //return HandlerInterceptor.super.preHandle(request, response, handler);
- /*String token=request.getHeader("token");
- if(!(handler instanceof HandlerMethod)){
- return true;
- }
-
- if(StrUtil.isBlank(token)){
- throw new ServiceException(Constants.Code_401,"鏃爐oken,閲嶆柊鐧婚檰");
- }
- String userId;
- try{
- userId = JWT.decode(token).getAudience().get(0);
- }catch (Exception e){
- throw new ServiceException(Constants.Code_500,"token鏍煎紡閿欒");
- }
-
- UserDTO getUserDTO = cacheUtil.getCacheData(userId);
-
- if(getUserDTO != null && !getUserDTO.getToken().equals(token)){
- throw new ServiceException(Constants.Code_600,"鐢ㄦ埛鍦ㄥ叾浠栦綅缃櫥闄�");
- }
-
-
- String password=userService.getUserByID(userId).toLowerCase();
- //鐢ㄦ埛瀵嗙爜鍔犵楠岃瘉
- JWTVerifier jwtVerifier = JWT.require(Algorithm.HMAC256(password)).build();
- try {
- jwtVerifier.verify(token);
- } catch (JWTVerificationException e) {
- throw new ServiceException(Constants.Code_401,"token楠岃瘉澶辫触,璇烽噸鏂扮櫥闄�");
- }*/
- return true;
- }
-
-}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
index aa99f77..326e4d0 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -16,7 +16,6 @@
* @since 2024-04-11
*/
@RestController
-@CrossOrigin
@RequestMapping("/userinfo")
public class SysUserController {
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/config/MyCorsConfig.java b/hangzhoumesParent/gateway/src/main/java/com/mes/config/MyCorsConfig.java
similarity index 63%
rename from hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/config/MyCorsConfig.java
rename to hangzhoumesParent/gateway/src/main/java/com/mes/config/MyCorsConfig.java
index 521c147..f7f9f8d 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/config/MyCorsConfig.java
+++ b/hangzhoumesParent/gateway/src/main/java/com/mes/config/MyCorsConfig.java
@@ -1,12 +1,10 @@
-package com.mes.common.config;
+package com.mes.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.reactive.CorsWebFilter;
import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* @Author : zhoush
@@ -15,32 +13,22 @@
*/
@Configuration
public class MyCorsConfig {
-
@Bean
- public WebMvcConfigurer corsConfigurer() {
- return new WebMvcConfigurer() {
- @Override
- public void addCorsMappings(CorsRegistry registry) {
- registry.addMapping("/**");
- }
- };
- }
+ public CorsWebFilter corsFilter() {
- @Bean
- public CorsWebFilter corsWebFilter() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-
CorsConfiguration corsConfiguration = new CorsConfiguration();
-
- //1銆侀厤缃法鍩�
+ //鍏佽鍝簺澶磋法鍩�
corsConfiguration.addAllowedHeader("*");
+ // 鍏佽鍝簺鏂瑰紡璺ㄥ煙 get post delete 绛夋柟寮�
corsConfiguration.addAllowedMethod("*");
+ //鍏佽鍝簺璇锋眰鏉ユ簮璺ㄥ煙 * 浠绘剰鏉ユ簮
corsConfiguration.addAllowedOrigin("*");
+ // 鏄惁鍏佽鎼哄甫cooker璺ㄥ煙
corsConfiguration.setAllowCredentials(true);
-
+ //娉ㄥ唽璺ㄨ秺閰嶇疆 /**閰嶇疆璇锋眰璺緞
source.registerCorsConfiguration("/**", corsConfiguration);
return new CorsWebFilter(source);
}
-
}
diff --git a/hangzhoumesParent/gateway/src/main/resources/application.yml b/hangzhoumesParent/gateway/src/main/resources/application.yml
index 8776a14..1452d31 100644
--- a/hangzhoumesParent/gateway/src/main/resources/application.yml
+++ b/hangzhoumesParent/gateway/src/main/resources/application.yml
@@ -20,28 +20,28 @@
- StripPrefix=2
- id: cacheVerticalGlass
- uri: http://127.0.0.1:8082
+ uri: lb://cacheVerticalGlass
predicates:
- Path=/api/cacheVerticalGlass/**
filters:
- StripPrefix=2
- id: loadGlass
- uri: http://127.0.0.1:8083
+ uri: lb://loadGlass
predicates:
- Path=/api/loadGlass/**
filters:
- StripPrefix=2
- id: temperingGlass
- uri: http://127.0.0.1:8084
+ uri: lb://temperingGlass
predicates:
- Path=/api/temperingGlass/**
filters:
- StripPrefix=2
- id: unLoadGlass
- uri: http://127.0.0.1:8085
+ uri: lb://unLoadGlass
predicates:
- Path=/api/unLoadGlass/**
filters:
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index 4ba8dde..4041b1e 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -29,11 +30,11 @@
private BigStorageCageDetailsService bigStorageCageDetailsService;
@ApiOperation("鐞嗙墖绗艰鎯�")
- @GetMapping("/bigStorageCageDetails")
+ @PostMapping("/bigStorageCageDetails")
public List<BigStorageCageDetails> bigStorageCageDetails() {
return bigStorageCageDetailsService.list();
- }
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
index d8bb16e..60ba4df 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
@@ -18,13 +18,12 @@
*/
public interface BigStorageCageService extends IService<BigStorageCage> {
- void updateRemainWidth(int Slot);
+ void updateRemainWidth(int slot);
BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails);
boolean outGlass();
List<BigStorageCage> querybigStorageCageDetail();
-
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index ab37677..298761d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -24,14 +24,4 @@
@Resource
private BigStorageCageMapper bigStorageCageMapper;
-// @Override
- public boolean getTemperingGlass() {
-// //鑾峰彇绗煎瓙鍐呮墍鏈夌増鍥惧彿
-// List<String> temperingIdList = bigStorageCageMapper.selectTemperingId();
-// for (String temperingId : temperingIdList
-// ) {
-//
-// }
- return true;
- }
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java
new file mode 100644
index 0000000..0a684a8
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java
@@ -0,0 +1,38 @@
+package com.mes.userinfo.controller;
+
+
+import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
+import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@ApiModel("杩涚墖浠诲姟淇℃伅")
+@RestController
+@RequestMapping("/userinfo/big-storage-cage-feed-task")
+public class BigStorageCageFeedTaskController {
+
+ @Autowired
+ private BigStorageCageFeedTaskService bigStorageCageFeedTaskService;
+ @ApiOperation("杩涚墖浠诲姟淇℃伅")
+ @GetMapping("/querybigStorageCageTask")
+ public List<BigStorageCageFeedTask> querybigStorageCageFeedTask(int taskState) {
+ return bigStorageCageFeedTaskService.querybigStorageCageFeedTask(taskState);
+ }
+}
+
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java
new file mode 100644
index 0000000..1330b54
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java
@@ -0,0 +1,40 @@
+package com.mes.userinfo.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mes.bigstorage.entity.BigStorageCage;
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
+import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@ApiModel("鍑虹墖浠诲姟淇℃伅")
+@RestController
+@RequestMapping("/userinfo/big-storage-cage-out-task")
+public class BigStorageCageOutTaskController {
+
+ @Autowired
+ private BigStorageCageOutTaskService bigStorageCageOutTaskService;
+ @ApiOperation("杩涚墖浠诲姟淇℃伅")
+ @GetMapping("/querybigStorageCageTask")
+ public List<BigStorageCageOutTask> querybigStorageCageOutTask(int taskState) {
+ return bigStorageCageOutTaskService.querybigStorageCageOutTask(taskState);
+ }
+
+}
+
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java
new file mode 100644
index 0000000..db9fb95
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java
@@ -0,0 +1,35 @@
+package com.mes.bigstoragetask.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BigStorageCageFeedTask implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ private Integer tragetSlot;
+
+ private Integer taskType;
+
+ private Integer taskState;
+
+ private Integer line;
+
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageOutTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageOutTask.java
new file mode 100644
index 0000000..a760643
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageOutTask.java
@@ -0,0 +1,37 @@
+package com.mes.bigstoragetask.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BigStorageCageOutTask implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ private Integer startSlot;
+
+ private Integer endSlot;
+
+ private Integer trainNumber;
+
+ private Integer serialNumber;
+
+ private Integer taskState;
+
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/mapper/BigStorageCageFeedTaskMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/mapper/BigStorageCageFeedTaskMapper.java
new file mode 100644
index 0000000..3765470
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/mapper/BigStorageCageFeedTaskMapper.java
@@ -0,0 +1,16 @@
+package com.mes.bigstoragetask.mapper;
+
+import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+public interface BigStorageCageFeedTaskMapper extends BaseMapper<BigStorageCageFeedTask> {
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/mapper/BigStorageCageOutTaskMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/mapper/BigStorageCageOutTaskMapper.java
new file mode 100644
index 0000000..4c29af4
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/mapper/BigStorageCageOutTaskMapper.java
@@ -0,0 +1,16 @@
+package com.mes.bigstoragetask.mapper;
+
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+public interface BigStorageCageOutTaskMapper extends BaseMapper<BigStorageCageOutTask> {
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageFeedTaskService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageFeedTaskService.java
new file mode 100644
index 0000000..f9a3cf8
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageFeedTaskService.java
@@ -0,0 +1,23 @@
+package com.mes.bigstoragetask.service;
+
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+public interface BigStorageCageFeedTaskService extends IService<BigStorageCageFeedTask> {
+
+ void addFeedTask(BigStorageCageDetails slotInfo, Integer plcFeedReqLine, int taskType);
+
+ List<BigStorageCageFeedTask> querybigStorageCageFeedTask(int taskState);
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageOutTaskService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageOutTaskService.java
new file mode 100644
index 0000000..54fa79a
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageOutTaskService.java
@@ -0,0 +1,19 @@
+package com.mes.bigstoragetask.service;
+
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+public interface BigStorageCageOutTaskService extends IService<BigStorageCageOutTask> {
+
+ List<BigStorageCageOutTask> querybigStorageCageOutTask(int taskState);
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
new file mode 100644
index 0000000..6da110b
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
@@ -0,0 +1,42 @@
+package com.mes.bigstoragetask.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
+import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
+import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@Service
+public class BigStorageCageFeedTaskServiceImpl extends ServiceImpl<BigStorageCageFeedTaskMapper, BigStorageCageFeedTask> implements BigStorageCageFeedTaskService {
+
+ @Override
+ public void addFeedTask(BigStorageCageDetails slotInfo, Integer plcFeedReqLine, int taskType){
+ BigStorageCageFeedTask bigStorageCageFeedTask=new BigStorageCageFeedTask();
+ bigStorageCageFeedTask.setId(slotInfo.getId());
+ bigStorageCageFeedTask.setTaskState(0);
+ bigStorageCageFeedTask.setLine(plcFeedReqLine);
+ bigStorageCageFeedTask.setTragetSlot(slotInfo.getSlot());
+ bigStorageCageFeedTask.setTaskType(taskType);
+ baseMapper.insert(bigStorageCageFeedTask);
+ }
+
+ @Override
+ public List<BigStorageCageFeedTask> querybigStorageCageFeedTask(int taskState){
+ LambdaQueryWrapper<BigStorageCageFeedTask> getFeedTaskWrapper=new LambdaQueryWrapper<>();
+ getFeedTaskWrapper.eq(BigStorageCageFeedTask::getTaskState,1);
+ return baseMapper.selectList(getFeedTaskWrapper);
+ }
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java
new file mode 100644
index 0000000..c874c83
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java
@@ -0,0 +1,29 @@
+package com.mes.bigstoragetask.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
+import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
+import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@Service
+public class BigStorageCageOutTaskServiceImpl extends ServiceImpl<BigStorageCageOutTaskMapper, BigStorageCageOutTask> implements BigStorageCageOutTaskService {
+
+ @Override
+ public List<BigStorageCageOutTask> querybigStorageCageOutTask(int taskState){
+ LambdaQueryWrapper<BigStorageCageOutTask> getOutTaskWrapper=new LambdaQueryWrapper<>();
+ getOutTaskWrapper.eq(BigStorageCageOutTask::getTaskState,taskState);
+ return baseMapper.selectList(getOutTaskWrapper);
+ }
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
index 5a238b9..d584dec 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
@@ -32,8 +32,8 @@
//浼犲叆鐜荤拑id
GlassInfo glassInfo = glassInfoService.getById(plcFeedGlassid);
- BigStorageCageDetails SlotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
- if (SlotInfo != null) {
+ BigStorageCageDetails slotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
+ if (slotInfo != null) {
//plc浠诲姟鍙戦�佸瓧
}
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/controller/TaskCacheController.java
new file mode 100644
index 0000000..28383ce
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/controller/TaskCacheController.java
@@ -0,0 +1,21 @@
+package com.mes.userinfo.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@RestController
+@RequestMapping("/userinfo/task-cache")
+public class TaskCacheController {
+
+}
+
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/entity/TaskCache.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/entity/TaskCache.java
new file mode 100644
index 0000000..a42018b
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/entity/TaskCache.java
@@ -0,0 +1,49 @@
+package com.mes.edgstoragetask.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TaskCache implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID缂栧彿
+ */
+ @TableId("ID")
+ private String id;
+
+ /**
+ * 璧峰
+ */
+ private String startCell;
+
+ /**
+ * 鐩爣
+ */
+ private String endCell;
+
+ /**
+ * 浠诲姟绫诲瀷 1:杩� 2锛氬嚭
+ */
+ private String taskType;
+
+ /**
+ * 浠诲姟鐘舵�� 0 鏈紑濮� 1宸插畬鎴�
+ */
+ private String taskStauts;
+
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/mapper/TaskCacheMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/mapper/TaskCacheMapper.java
new file mode 100644
index 0000000..0f9d676
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/mapper/TaskCacheMapper.java
@@ -0,0 +1,16 @@
+package com.mes.edgstoragetask.mapper;
+
+import com.mes.edgstoragetask.entity.TaskCache;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+public interface TaskCacheMapper extends BaseMapper<TaskCache> {
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/service/TaskCacheService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/service/TaskCacheService.java
new file mode 100644
index 0000000..9b066de
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/service/TaskCacheService.java
@@ -0,0 +1,17 @@
+package com.mes.edgstoragetask.service;
+
+import com.mes.edgstoragetask.entity.TaskCache;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+public interface TaskCacheService extends IService<TaskCache> {
+
+ int judgeTasktype();
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/service/impl/TaskCacheServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/service/impl/TaskCacheServiceImpl.java
new file mode 100644
index 0000000..1d82f99
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/service/impl/TaskCacheServiceImpl.java
@@ -0,0 +1,53 @@
+package com.mes.edgstoragetask.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
+import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
+import com.mes.edgstoragetask.entity.TaskCache;
+import com.mes.edgstoragetask.mapper.TaskCacheMapper;
+import com.mes.edgstoragetask.service.TaskCacheService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@Qualifier("")
+@Service
+public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
+ @Resource
+ private BigStorageCageFeedTaskMapper bigStorageCageFeedTaskMapper;
+ @Override
+ public int judgeTasktype(){
+ //鍒ゆ柇鏍规嵁褰撳墠鍗ц浆绔嬩换鍔′笌纾ㄨ竟绾夸换鍔″垽鏂槸鍚﹀惎鍔ㄥ崸杞珛
+// for (int i=1;i<=2;i++){
+// //鏌ヨ鍗ц浆绔嬪綋鍓嶄换鍔�
+// int width=5000;
+// int num=0;
+// List<BigStorageCageFeedTask> bgStorageCageFeedTask =bigStorageCageFeedTaskMapper.();
+// //鏌ヨ纾ㄨ竟绾垮綋鍓嶄换鍔�
+// LambdaQueryWrapper<TaskCache> taskCacheWrapper=new LambdaQueryWrapper<>();
+// taskCacheWrapper.eq(TaskCache::getTaskStauts,"0");
+// List<TaskCache> taskCacheList=taskCacheService.list(taskCacheWrapper);
+// //鍒ゆ柇褰撳墠绾胯矾杩橀渶瑕佸啀涓婂嚑鐗囨墠鑳芥弧瓒冲皬杞﹀搴�
+// for (TaskCache taskCache:taskCacheList
+// ) {
+// if(taskCache.getId().equals("1")){
+// //杩涚墖杞﹀搴﹀噺鍘诲皬鐗囧搴�
+// }
+// }
+// //鐗囨暟灏忎簬绛変簬2鏃跺彟涓�鏉＄嚎鍗ц浆绔嬪惎鍔�
+// log.info("鍙戦�佸崸杞珛鍚姩淇″彿");
+// }
+ return 0;
+ }
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index 29a0efb..f1da52d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,10 +3,15 @@
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false
- username: root
- password: beibo.123/
+ dynamic:
+ primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+ strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
+ datasource:
+ hangzhoumes:
+ url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
cloud:
nacos:
discovery:
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
index bf3f011..a84c58e 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,10 +2,15 @@
port: 8084
spring:
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false
- username: root
- password: beibo.123/
+ dynamic:
+ primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+ strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
+ datasource:
+ hangzhoumes:
+ url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
cloud:
nacos:
discovery:
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
index a11fc50..bea69f9 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
@@ -12,8 +12,6 @@
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
-
-
cloud:
nacos:
discovery:
--
Gitblit v1.8.0