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

严智鑫

2024-04-19 4e632eef221f01e7d27745cc20e4fb205dd34509

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

 LoadGlassModule/pom.xml

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 LoadGlassModule/src/main/java/com/mes/entity/UpPattenUsage.java

File was deleted

 LoadGlassModule/src/main/java/com/mes/entity/UpWorkstation.java

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 LoadGlassModule/src/main/resources/JsonFile/PlcAlbania.json

File was deleted

 LoadGlassModule/src/main/resources/application.yml

File was deleted

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

File was deleted

 LoadGlassModule/target/classes/application.yml

File was deleted

 TemperingGlassModule/MES-Module (1).iml

File was deleted

 TemperingGlassModule/MES-Module.iml

File was deleted

 TemperingGlassModule/effective-pom.xml

File was deleted

 TemperingGlassModule/pom.xml

File was deleted

 TemperingGlassModule/src/main/JsonFile/PlcAlbania.json

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 TemperingGlassModule/src/main/java/com/mes/controller/TemperingController.java

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 TemperingGlassModule/src/main/java/com/mes/entity/UpPattenUsage.java

File was deleted

 TemperingGlassModule/src/main/java/com/mes/entity/UpWorkstation.java

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 TemperingGlassModule/src/main/java/com/mes/service/TemperingOverService.java

File was deleted

 TemperingGlassModule/src/main/java/com/mes/service/TemperingService.java

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 TemperingGlassModule/src/main/resources/application.yml

File was deleted

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

File was deleted

 TemperingGlassModule/target/MES-Module-0.0.1-SNAPSHOT.jar.original

Binary files differ

 TemperingGlassModule/target/classes/application.yml

File was deleted

 TemperingGlassModule/target/maven-archiver/pom.properties

File was deleted

 TemperingGlassModule/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

File was deleted

 TemperingGlassModule/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

File was deleted

 TemperingGlassModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

File was deleted

 TemperingGlassModule/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

File was deleted

 TemperingGlassModule/target/surefire-reports/TEST-com.mes.MesApplicationTests.xml

File was deleted

 TemperingGlassModule/target/surefire-reports/com.mes.MesApplicationTests.txt

File was deleted

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

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

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
import org.apache.ibatis.annotations.Mapper;
@@ -18,6 +19,6 @@
 */
@Mapper
@DS("pp")
public interface OptimizeProjectMapper extends BaseMapper<OptimizeProject> {
public interface OptimizeProjectMapper extends MPJBaseMapper<OptimizeProject> {
    List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest);
}

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

@@ -1,6 +1,7 @@
package com.mes.pp.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;

@@ -14,7 +15,7 @@
 * @author zhoush
 * @since 2024-04-16
 */
public interface OptimizeProjectService extends IService<OptimizeProject> {
public interface OptimizeProjectService extends MPJBaseService<OptimizeProject> {

    /**
     * 查询可领取的任务工程信息

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

@@ -4,6 +4,7 @@
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.github.yulichang.base.MPJBaseServiceImpl;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.mapper.OptimizeProjectMapper;
@@ -28,7 +29,7 @@
@Service
@DS("pp")
@Slf4j
public class OptimizeProjectServiceImpl extends ServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
public class OptimizeProjectServiceImpl extends MPJBaseServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {

    @Resource
    UpPattenUsageMapper upPattenUsageMapper;

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java

@@ -39,10 +39,10 @@

    @ApiOperation("点击选择工程保存后进行调用,传入工程号")
    @GetMapping("/saveUpPattenUsage") //查询现在上片机的玻璃信息
    public Result<List<UpPattenUsage>> saveUpPattenUsage(@RequestBody String engineeringId) {
        List<UpPattenUsage> glass = upPattenUsageService.saveUpPattenUsage(engineeringId);
        log.info("显示工位上的玻璃信息:{}", glass);
        return Result.build(200, "", glass);
    public Result<Integer> saveUpPattenUsage(@RequestBody String engineeringId) {
        //List<OptimizeUpPattenUsage> glass = upPattenUsageService.saveUpPattenUsage(engineeringId);
        log.info("显示工位上的玻璃信息:{}", 200);
        return Result.build(200, "", 200);
    }
}


 hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/OptimizeUpPattenUsage.java

New file
@@ -0,0 +1,98 @@
package com.mes.uppattenusage.entity;

public class OptimizeUpPattenUsage {

    /**
     * 工程号
     */
    private String projectNo;

    /**
     * 膜系id
     */
    private String glassType;

    /**
     * 宽
     */
    private Double width;

    /**
     * 高
     */
    private Double height;

    /**
     * 厚度
     */
    private Double glassThickness;

    /**
     * 原片版图片序
     */
    private Integer heatLayoutSort;

    /**
     * 状态
     */
    private Integer state;

    // Getter methods
    public String getProjectNo() {
        return projectNo;
    }

    public String getGlassType() {
        return glassType;
    }

    public Double getWidth() {
        return width;
    }

    public Double getHeight() {
        return height;
    }

    public Double getGlassThickness() {
        return glassThickness;
    }

    public Integer getHeatLayoutSort() {
        return heatLayoutSort;
    }

    public Integer getState() {
        return state;
    }

    // Setter methods
    public void setProjectNo(String projectNo) {
        this.projectNo = projectNo;
    }

    public void setGlassType(String glassType) {
        this.glassType = glassType;
    }

    public void setWidth(Double width) {
        this.width = width;
    }

    public void setHeight(Double height) {
        this.height = height;
    }

    public void setGlassThickness(Double glassThickness) {
        this.glassThickness = glassThickness;
    }

    public void setHeatLayoutSort(Integer heatLayoutSort) {
        this.heatLayoutSort = heatLayoutSort;
    }

    public void setState(Integer state) {
        this.state = state;
    }

}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java

@@ -1,8 +1,9 @@
package com.mes.uppattenusage.service;
import com.github.yulichang.base.MPJBaseService;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.baomidou.mybatisplus.extension.service.IService;

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

/**
 * <p>
@@ -12,9 +13,9 @@
 * @author zhoush
 * @since 2024-04-18
 */
public interface UpPattenUsageService extends IService<UpPattenUsage> {
public interface UpPattenUsageService extends MPJBaseService<UpPattenUsage> {
     List<UpPattenUsage> prioritylist(int state);

     List<UpPattenUsage> saveUpPattenUsage(String engineeringId);
     List<Map> saveUpPattenUsage(String engineeringId);
}


 hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java

@@ -1,15 +1,22 @@
package com.mes.uppattenusage.service.impl;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.uppattenusage.entity.OptimizeUpPattenUsage;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

/**
 * <p>
@@ -21,7 +28,10 @@
 */
@Service
@Slf4j
public class UpPattenUsageServiceImpl extends ServiceImpl<UpPattenUsageMapper, UpPattenUsage> implements UpPattenUsageService {
public class UpPattenUsageServiceImpl extends MPJBaseServiceImpl<UpPattenUsageMapper, UpPattenUsage> implements UpPattenUsageService {

    @Autowired
    OptimizeProjectMapper optimizeProjectMapper;
    @Override
    public List<UpPattenUsage> prioritylist(int state) {
        log.info("将参数传入到查询类里,工程号做非空判断模糊查询");
@@ -32,12 +42,15 @@
    }

    @Override
    public List<UpPattenUsage> saveUpPattenUsage(String engineeringId) {
        List<UpPattenUsage> list = this.list();
    @DS("pp")
    public List<Map> saveUpPattenUsage(String engineeringId) {

        if (engineeringId != null) {
            LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(UpPattenUsage::getEngineeringId,engineeringId);
            return this.list(wrapper);

            List<Map> upPattenUsageList=optimizeProjectMapper.selectJoinList(Map.class,new MPJQueryWrapper<OptimizeProject>()
                    .select("t.project_no,t.glass_type,b.width,b.height,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.heat_layout_sort")
                    .leftJoin("optimize_layout b on t.project_no=b.project_no")
                    .eq("b.project_no",engineeringId));
        }
        return Collections.emptyList();
    }

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml

@@ -18,6 +18,11 @@
            <artifactId>mybatis-plus-join</artifactId>
            <version>1.1.6</version>
        </dependency>
                <dependency>
                    <groupId>com.github.yulichang</groupId>
                    <artifactId>mybatis-plus-join</artifactId>
                    <version>1.1.6</version>
                </dependency>
    </dependencies>
<properties>
    <maven.compiler.source>8</maven.compiler.source>

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/controller/UpPattenUsageController.java

File was deleted

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/entity/UpPattenUsage.java

File was deleted

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/mapper/UpPattenUsageMapper.java

File was deleted

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/service/UpPattenUsageService.java

File was deleted

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/UpPattenUsageServiceImpl.java

File was deleted

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkstation.java

@@ -66,7 +66,7 @@
    /**
     * 膜系
     */
    private Integer filmsId;
    private String filmsId;

    /**
     * 数量

 hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java

@@ -1,16 +1,19 @@
package com.mes;

import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.uppattenusage.entity.OptimizeUpPattenUsage;
import com.mes.uppattenusage.service.impl.UpPattenUsageServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

/**
 * @Author : zhoush
@@ -24,6 +27,8 @@

    @Resource
    private OptimizeProjectMapper optimizeProjectMapper;
    @Autowired
    private UpPattenUsageServiceImpl upPattenUsageService;

    @Test
    public void test() {
@@ -36,4 +41,10 @@
    public void testFindPath() {
        log.info("完整路径：{}", Arrays.asList("123"));
    }

    @Test
    public void testFindPa() {
        List<Map> glass = upPattenUsageService.saveUpPattenUsage("P24032204");
        log.info("完整路径：{}", Arrays.asList(glass));
    }
}