hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/InterceptorConfig.java
File was deleted hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/MyCorsConfig.java
File was deleted hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/interceptor/JwtInterceptor.java
File was deleted 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 { hangzhoumesParent/gateway/src/main/java/com/mes/config/MyCorsConfig.java
File was renamed from hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/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); } } 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: 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(); } } } 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(); } 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; } } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java
New file @@ -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); } } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java
New file @@ -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); } } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java
New file @@ -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; } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageOutTask.java
New file @@ -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; } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/mapper/BigStorageCageFeedTaskMapper.java
New file @@ -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> { } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/mapper/BigStorageCageOutTaskMapper.java
New file @@ -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> { } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageFeedTaskService.java
New file @@ -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); } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/BigStorageCageOutTaskService.java
New file @@ -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); } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
New file @@ -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); } } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java
New file @@ -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); } } 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任务发送字 } } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/controller/TaskCacheController.java
New file @@ -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 { } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/entity/TaskCache.java
New file @@ -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; } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/mapper/TaskCacheMapper.java
New file @@ -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> { } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/service/TaskCacheService.java
New file @@ -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(); } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/service/impl/TaskCacheServiceImpl.java
New file @@ -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; } } 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 #设置默认的数据源或者数据源组,默认值即为master 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: 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 #设置默认的数据源或者数据源组,默认值即为master 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: 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: