Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wuyouming666

2024-04-17 5d70dcef9c9b4f7eb1cd092dcc4f4b8b802c5d30

Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

 CacheGlassModule.zip

Binary files differ

 CacheGlassModule/.vs/CacheVerticalGlassModule/v16/.suo

Binary files differ

 CacheGlassModule/.vs/ProjectSettings.json

File was deleted

 CacheGlassModule/.vs/VSWorkspaceState.json

File was deleted

 CacheGlassModule/.vs/slnx.sqlite

Binary files differ

 CacheGlassModule/MES-Module.iml

File was deleted

 CacheGlassModule/effective-pom.xml

File was deleted

 CacheGlassModule/pom.xml

File was deleted

 CacheGlassModule/src/main/java/com/mes/MesApplication.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/common/CacheUtil.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/common/Constants.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/common/PlcTools/S7object.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/common/PlcTools/S7object2.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/common/Result.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/common/interceptor/JwtInterceptor.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/config/InterceptorConfig.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/config/MyCorsConfig.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/config/MybatisPlusConfig.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/config/SwaggerConfig.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/config/WebSocketConfig.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/controller/dto/UserDTO.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuItemController.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/EdgStorageCageDetails.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/Engineering.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/GlassFilms.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/GlassInfo.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/TaskCache.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/Tempered.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/Tempering.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/device/InitUtil.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/device/PLCAutoMes.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/device/PlcBitInfo.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/device/PlcBitObject.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/device/PlcParameterInfo.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/device/PlcParameterObject.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/userInfo/SysError.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/userInfo/SysMenu.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/userInfo/SysMenuItem.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/entity/userInfo/User.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/exception/GlobalExceptionHandle.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/exception/ServiceException.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/mapper/HangzhouMesMapper.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/mapper/PpMapper.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysErrorMapper.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuMapper.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/LogicService.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/service/pp/PpService.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/service/userInfo/UserService.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/tools/TokenTools.java

File was deleted

 CacheGlassModule/src/main/java/com/mes/tools/WebSocketServer.java

File was deleted

 CacheGlassModule/src/main/resources/application.yml

File was deleted

 CacheGlassModule/src/main/resources/banner.txt

File was deleted

 CacheGlassModule/src/test/java/com/mes/MesApplicationTests.java

File was deleted

 CacheGlassModule/target/classes/application.yml

File was deleted

 LoadGlassModule.zip

Binary files differ

 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/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java

@@ -1,8 +1,16 @@
package com.mes.pp.controller;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
@@ -13,8 +21,28 @@
 * @since 2024-04-16
 */
@RestController
@RequestMapping("/userinfo/optimize-project")
@RequestMapping("/optimizeProject")
@Slf4j
public class OptimizeProjectController {
    @Autowired
    //获取待选择的工程号
    private OptimizeProjectService optimizeProjectService;

    @ApiOperation("显示工程选择信息")
    @PostMapping("/listByState") //显示工程选择信息
    public Result<List<OptimizeProject>> listByState(@RequestBody OptimizeRequest optimizeRequest) {
        log.info("将请求参数封装在请求类里面");
        List<OptimizeProject> glass = optimizeProjectService.listByState(optimizeRequest);
        log.info("显示工程选择信息:{}", glass);
        return Result.build(200, "", glass);
    }

//    public Result<List<OptimizeProject>> saveProject(@RequestBody OptimizeRequest optimizeRequest) {
//        log.info("将请求参数封装在请求类里面");
//        List<OptimizeProject> glass = optimizeProjectService.saveProject(optimizeRequest);
//        log.info("显示工程选择信息:{}", glass);
//        return Result.build(200, "", glass);
//    }

}


 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java

@@ -7,7 +7,7 @@
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * <p>
@@ -94,7 +94,7 @@
     */
    private Integer creater;

    private LocalDateTime createTime;
    private Date createTime;

    @TableField("intRemark")
    private Integer intremark;

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java

@@ -7,7 +7,7 @@
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * <p>
@@ -182,12 +182,12 @@
    /**
     * 创建时间
     */
    private LocalDateTime createTime;
    private Date createTime;

    /**
     * 修改时间
     */
    private LocalDateTime updateTime;
    private Date updateTime;

    /**
     * 预留，使用需注明

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/OptimizeRequest.java

New file
@@ -0,0 +1,17 @@
package com.mes.pp.entity.request;

import io.swagger.annotations.ApiParam;
import lombok.Data;

/**
 * @author wu
 */
@Data
public class OptimizeRequest {

    @ApiParam("")
    private Integer state;

    @ApiParam("")
    private String projectNo;
}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java

@@ -4,6 +4,8 @@
import com.mes.pp.entity.OptimizeProject;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * <p>
 * Mapper 接口

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java

@@ -2,6 +2,9 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;

import java.util.List;

/**
 * <p>
@@ -13,4 +16,9 @@
 */
public interface OptimizeProjectService extends IService<OptimizeProject> {

    /**
     * 查询可领取的任务工程信息
     * @return
     */
    List<OptimizeProject> listByState(OptimizeRequest optimizeRequest);
}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java

@@ -1,11 +1,17 @@
package com.mes.pp.service.impl;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.pp.service.OptimizeProjectService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,6 +23,18 @@
 */
@Service
@DS("pp")
@Slf4j
public class OptimizeProjectServiceImpl extends ServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {


    @Override
    public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
        log.info("将参数传入到查询类里,工程号做非空判断模糊查询");
        LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(OptimizeProject::getState,optimizeRequest.getState())
                .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo())
                .groupBy(OptimizeProject::getProjectNo);
        log.info("返回工程信息");
        return this.list(wrapper);
    }
}

 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/mapper/SysMenuMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.menu.entity.SysMenu;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

@@ -13,6 +14,7 @@
 * @author zhoush
 * @since 2024-04-11
 */
@Mapper
public interface SysMenuMapper extends BaseMapper<SysMenu> {

    List<String> selectPermsByUserId(long parseLong);

 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/SysRoleMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.role.entity.SysRole;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
@@ -11,6 +12,7 @@
 * @author zhoush
 * @since 2024-04-11
 */
@Mapper
public interface SysRoleMapper extends BaseMapper<SysRole> {

}

 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/SysRoleMenuMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.role.entity.SysRoleMenu;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
@@ -11,6 +12,7 @@
 * @author zhoush
 * @since 2024-04-11
 */
@Mapper
public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {

}

 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/common/springsecurity/src/main/java/com/mes/userinfo/mapper/SysUserMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.userinfo.entity.SysUser;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
@@ -11,6 +12,7 @@
 * @author zhoush
 * @since 2024-04-11
 */
@Mapper
public interface SysUserMapper extends BaseMapper<SysUser> {

}

 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/mapper/SysUserRoleMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.userinfo.entity.SysUserRole;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
@@ -11,6 +12,7 @@
 * @author zhoush
 * @since 2024-04-11
 */
@Mapper
public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {

}

 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/CacheGlassModule/pom.xml

@@ -17,10 +17,9 @@
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>com.mes</groupId>
            <artifactId>servicebase</artifactId>
            <version>1.0-SNAPSHOT</version>
            <scope>compile</scope>
            <groupId>com.github.yulichang</groupId>
            <artifactId>mybatis-plus-join</artifactId>
            <version>1.1.6</version>
        </dependency>
    </dependencies>


 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java

@@ -1,7 +1,11 @@
package com.mes.edgstoragecage.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -11,6 +15,6 @@
 * @author zhoush
 * @since 2024-04-07
 */
public interface EdgStorageCageDetailsMapper extends BaseMapper<EdgStorageCageDetails> {
public interface EdgStorageCageDetailsMapper extends MPJBaseMapper<EdgStorageCageDetails> {

}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java

@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;

import java.util.List;
import java.util.Map;

/**
 * <p>
 *  服务类
@@ -12,5 +15,10 @@
 * @since 2024-04-07
 */
public interface EdgStorageCageDetailsService extends IService<EdgStorageCageDetails> {
    //获取全部 磨边前缓存笼信息
    public List<Map> getEdgStorageInfos();
    //修改 笼内数据
    public List<Map> setEdgStorageInfos();


}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java

@@ -2,6 +2,10 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.glassinfo.entity.GlassInfo;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -13,4 +17,21 @@
 */
public interface EdgStorageCageService extends IService<EdgStorageCage> {

    //查询笼内空格
    List<EdgStorageCage> selectCacheEmpty();

    //查询笼内出片顺序详情
    List<EdgStorageCage> selectCacheOut();

    //查询笼内详情
    List<Map> selectCacheInfos();

    //添加理片笼信息  传入glassid
    boolean insertCacheInfo(String glassid);

    //修改理片笼内信息
    boolean updateCacheInfo(String cacheId);

    //删除理片笼内信息
    boolean deleteCacheInfo(String cacheId);
}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java

@@ -1,10 +1,18 @@
package com.mes.edgstoragecage.service.impl;

import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.taskcache.mapper.HangzhouMesMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -16,5 +24,28 @@
 */
@Service
public class EdgStorageCageDetailsServiceImpl extends ServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
    //获取全部数据
    @Autowired
    private HangzhouMesMapper hangzhouMesMapper;
    @Autowired
    private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;

    //获取磨边前缓存理片笼信息
    @Override
    public List<Map> getEdgStorageInfos(){
        List<Map> map=edgStorageCageDetailsMapper.selectJoinList(
                Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
                        .select("a.c","a.d")
                        .leftJoin("ab a on t.id=a.id")
                        .le("a.id","1")
        );
        return map;
    };

    @Override
    public List<Map> setEdgStorageInfos(){
        return hangzhouMesMapper.selectCachInfo();
    };


}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java

@@ -1,10 +1,17 @@
package com.mes.edgstoragecage.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
 * <p>
@@ -17,4 +24,54 @@
@Service
public class EdgStorageCageServiceImpl extends ServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {

    @Autowired
    EdgStorageCageMapper edgStorageCageMapper;
    @Autowired
    EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;

    @Override
    //查询笼内空格   EdgStorageCage as esc left join EdgStorageCageDetails as escd esc.device_id=escd.device_id
    public List<EdgStorageCage> selectCacheEmpty(){
        List<EdgStorageCage> listEdgStorageCage= edgStorageCageMapper.selectList(null);
        ;
        List<EdgStorageCageDetails> orderList = listEdgStorageCage.stream()
                .flatMap(user -> edgStorageCageDetailsMapper.selectList(
                        new QueryWrapper<EdgStorageCageDetails>().eq("user_id", user.getId())).stream()
                )
                .collect(Collectors.toList());

        return listEdgStorageCage;
    }

    @Override
    //查询笼内出片任务
    public List<EdgStorageCage> selectCacheOut(){
        List<EdgStorageCage> list= new ArrayList<EdgStorageCage>();
        return list;
    }

    @Override
    //理片缓存详情
    public List<Map> selectCacheInfos(){
        List<Map> mapList=new ArrayList<>();
        return mapList;
    }

    @Override
    //添加理片笼信息  传入glassid
    public boolean insertCacheInfo(String glassid){
        return false;
    }

    @Override
    //修改理片笼内信息
    public boolean updateCacheInfo(String cacheId){
        return false;
    }

    @Override
    //删除理片笼内信息
    public boolean deleteCacheInfo(String cacheId){
        return false;
    }
}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.glassinfo.entity.GlassInfo;

import java.util.List;

/**
 * <p>
 *  服务类
@@ -13,4 +15,7 @@
 */
public interface GlassInfoService extends IService<GlassInfo> {

    public List<GlassInfo> selectAll();
    public List<GlassInfo> selectId(String glassId);
    public List<GlassInfo> selectFlowcardId(String flowcard_id);
}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java

@@ -1,10 +1,15 @@
package com.mes.glassinfo.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -17,4 +22,28 @@
@Service
public class GlassInfoServiceImpl extends ServiceImpl<GlassInfoMapper, GlassInfo> implements GlassInfoService {

    @Autowired
    GlassInfoMapper glassInfoMapper;

    //根据ID 获取小片数据
    @Override
    public List<GlassInfo> selectId(String glassId){
        QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<GlassInfo>();
        queryWrapper.eq("id",glassId);
        return glassInfoMapper.selectList(queryWrapper);
    };

    //获取全部小片数据
    @Override
    public List<GlassInfo> selectAll(){
        return glassInfoMapper.selectList(null);
    };

    //根据工程 获取小片数据
    @Override
    public List<GlassInfo> selectFlowcardId(String flowcardId){
        QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<GlassInfo>();
        queryWrapper.eq("flowcardId",flowcardId);
        return glassInfoMapper.selectList(queryWrapper);
    };
}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.taskcache.entity.TaskCache;

import java.util.List;

/**
 * <p>
 * 服务类
@@ -13,4 +15,24 @@
 */
public interface TaskCacheService extends IService<TaskCache> {

    //添加理片笼任务
    public boolean insertTaskCache();

    //查询磨边任务
    public List<TaskCache> selectEdgInfo(String line);

    //查询理片任务
    public List<TaskCache> selectCacheInfo();

    //查询全部任务
    public List<TaskCache> selectAll();

    //查询进片任务
    public List<TaskCache> selectInputTaskCache();

    //查询出片任务
    public List<TaskCache> selectOutTaskCache();

    //查询  A09  或 A10 最新的一片 出片任务
    public boolean selectLastOutCacheInfo();
}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java

@@ -6,6 +6,8 @@
import com.mes.taskcache.service.TaskCacheService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
 *  服务实现类
@@ -17,4 +19,42 @@
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {

    //添加理片笼任务
    @Override
    public boolean insertTaskCache(){
        return false;
    }

    //查询磨边任务
    @Override
    public List<TaskCache> selectEdgInfo(String line) {
        return null;
    }
    //查询理片任务
    @Override
    public List<TaskCache> selectCacheInfo(){
        return null;
    }
    //查询全部任务
    @Override
    public List<TaskCache> selectAll() {
        return null;
    }
    //查询进片任务
    @Override
    public List<TaskCache> selectInputTaskCache(){
        return null;
    }

    //查询出片任务
    @Override
    public List<TaskCache> selectOutTaskCache(){
        return null;
    }

    //查询  A09  或 A10 最新的一片 出片任务
    @Override
    public boolean selectLastOutCacheInfo(){
        return false;
    }
}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml

@@ -2,10 +2,15 @@
  port: 8081
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/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,41 @@
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/LoadGlassModule/src/main/java/com/mes/common/S7object.java

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java

@@ -1,6 +1,7 @@
package com.mes.workstation.controller;


import com.mes.workstation.entity.GlassInfo;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.service.UpWorkstationService;
import com.mes.utils.Result;
@@ -25,7 +26,7 @@
public class UpWorkstationController {
    @Autowired
    private UpWorkstationService upWorkstationService;

    private GlassInfo glassInfo;
    @ApiOperation("显示工位上的玻璃信息")
    @GetMapping("/list") //查询现在上片机的玻璃信息
    public Result<List<UpWorkstation>> list() {
@@ -34,18 +35,16 @@
        return Result.build(200, "", glass);
    }

    @PostMapping("/updateGlassMessage") //修改一条工位信息,接收实例类字段为宽高厚膜系数量工位id

    //新增工位信息修改一条工位信息,接收实例类字段为宽高厚膜系数量工位id
    //删除工位信息也用这个,除了工位id玻璃信息传null
    @PostMapping("/updateGlassMessage")
    @ResponseBody
    public void updateGlassMessage(@RequestBody UpWorkstation upwork) {
        upWorkstationService.updateGlassMessage(upwork);
    }

    //todo: 和updateGlassMessage类似
//    @PostMapping("/deleteGlass") //修改一条工位的玻璃信息，传输工位id将玻璃信息相关字段更改为null
//    @ResponseBody
//    public void selectCutTerritory(int upworkid) {
//        loadGlassService.deleteGlass(upworkid);
//    }


    @PostMapping("/selectPriority") //开始上片任务
    @ResponseBody

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.S7object;
//import com.mes.common.S7object;
import com.mes.workstation.entity.UpWorkSequence;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.mapper.UpWorkstationMapper;
@@ -38,20 +38,20 @@
        UpWorkSequence loadid1 = this.baseMapper.selectPriority(1).get(0);
        UpWorkSequence loadid2 = this.baseMapper.selectPriority(2).get(0);
        //判断一二号工位哪边的顺序更先
        if(loadid1.getSequence()>loadid2.getSequence()) {
            S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
        }else if(loadid1.getSequence()==loadid2.getSequence()){
            //当两个工位上的玻璃数相同时，判断哪个工位上的玻璃数更少,优先清空一个架子
            int glassnum1=loadid1.getNumber();//Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue());
            int glassnum2=loadid2.getNumber();//Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue());
            if(glassnum1>glassnum2){
                S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
            }else{
                S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
            }
        }else{
            S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
        }
//        if(loadid1.getSequence()>loadid2.getSequence()) {
//            S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
//        }else if(loadid1.getSequence()==loadid2.getSequence()){
//            //当两个工位上的玻璃数相同时，判断哪个工位上的玻璃数更少,优先清空一个架子
//            int glassnum1=loadid1.getNumber();//Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue());
//            int glassnum2=loadid2.getNumber();//Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue());
//            if(glassnum1>glassnum2){
//                S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
//            }else{
//                S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
//            }
//        }else{
//            S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
//        }
    }

    /**

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java

File was deleted

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java

@@ -1,27 +1,51 @@
package com.mes.temperingglass.controller;
import java.util.List;

import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingOverService;
import com.mes.temperingglass.service.TemperingService;
import com.mes.utils.Result;

/**
 * <p>
 * 前端控制器
 * </p>
 *
 * @author zhoush
 * @since 2024-04-07
 */

@RestController
@RequestMapping("/temperingGlassInfo")

// TidyUpGlassModule 钢化模块
public class TemperingGlassInfoController {

        //todo: 实例代码 待删除
    @ApiOperation("测试")
    @GetMapping("/index")
    public String index() {
        return "hello world";
    }
}
    @Autowired
     TemperingService temperingService;

    @Autowired
    private TemperingOverService temperingOverService;

    @PostMapping("/SelectWaitingGlass") // 查询钢化等片中的版图信息,状态为1的为已到,状态为0的为等待中
    @ResponseBody
    public Result SelectWaitingGlass(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
        List<TemperingGlassInfo> glass = temperingService.SelectWaitingGlass();
        System.out.println(glass);
        return Result.build(200,"", glass);
    }

    @GetMapping("/SelectIntoGlass") // 查询进炉中的钢化等片中的版图信息,状态全为1的为已到。
    @ResponseBody
    public Result SelectIntoGlass(String ProcessId) {
        List<TemperingGlassInfo> glass = temperingService.SelectIntoGlass();
        System.out.println(glass);
        return Result.build(200,"", glass);
    }

    @GetMapping("/SelectOutGlass") //钢化后显示出炉的版图信息
    @ResponseBody
    public Result SelectOutGlass(String ProcessId) {
        List<TemperingGlassInfo> glass = temperingOverService.SelectOutGlass();
        System.out.println(glass);
        return Result.build(200,"", glass);
    }


  

}

 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:

 hangzhoumesParent/moduleService/pom.xml

@@ -37,11 +37,11 @@
        </dependency>

        <!--依赖服务的工具类-->
        <dependency>
            <groupId>com.mes</groupId>
            <artifactId>common</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>com.mes</groupId>-->
<!--            <artifactId>common</artifactId>-->
<!--            <version>1.0-SNAPSHOT</version>-->
<!--        </dependency>-->

        <dependency>
            <artifactId>servicebase</artifactId>

 src.rar

Binary files differ