hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
@@ -22,7 +22,7 @@ // 2、全局配置 // 全局配置 GlobalConfig gc = new GlobalConfig(); gc.setOutputDir("D:\\Documents\\hangzhoumesParent2\\"); gc.setOutputDir("D:\\Documents\\hangzhoumesParent3\\"); gc.setServiceName("%sService"); //去掉Service接口的首字母I gc.setAuthor("wu"); @@ -41,7 +41,7 @@ // 4、包配置 PackageConfig pc = new PackageConfig(); pc.setParent("com.mes"); pc.setModuleName("engineering"); //模块名 pc.setModuleName("glassinfo"); //模块名 pc.setController("controller"); pc.setService("service"); pc.setMapper("mapper"); @@ -50,7 +50,7 @@ // 5、策略配置 StrategyConfig strategy = new StrategyConfig(); strategy.setInclude("engineering"); strategy.setInclude("glass_info"); strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
@@ -1,8 +1,10 @@ package com.mes.uppattenusage.controller; import com.mes.glassinfo.service.GlassInfoService; import com.mes.uppattenusage.entity.OptimizeUpPattenUsage; import com.mes.uppattenusage.entity.UpPattenUsage; import com.mes.glassinfo.entity.GlassInfo; import com.mes.uppattenusage.service.UpPattenUsageService; import com.mes.utils.Result; import io.swagger.annotations.ApiOperation; @@ -30,6 +32,8 @@ @Autowired private UpPattenUsageService upPattenUsageService; @Autowired private GlassInfoService glassInfoService; @ApiOperation("显示正在出片的工程信息") @GetMapping("/prioritylist") //查询现在上片机的玻璃信息 public Result<List<UpPattenUsage>> prioritylist() { @@ -42,8 +46,10 @@ @GetMapping("/saveUpPattenUsage") //查询现在上片机的玻璃信息 public Result<Integer> saveUpPattenUsage(String engineeringId) { List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineeringId); log.info("将查询出的UpPattenUsage数据保存到数据库表里:{}", 200); log.info("将查询出的UpPattenUsage数据保存到数据库表里"); upPattenUsageService.saveUpPattenUsage(upPattenUsages); log.info("从PP表查询glassinfo的数据并保存到表里"); List<GlassInfo> glassinfo=glassInfoService.selectGlassInfo(engineeringId); return Result.build(200, "", 200); } } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
@@ -45,14 +45,14 @@ return Result.build(200, "", upwork); } @ApiOperation("开始上片任务") @PostMapping("/selectPriority") //调用上片任务 @ResponseBody public void selectPriority() { UpWorkSequence work=upWorkstationService.selectPriority(); log.info("显示可上的玻璃信息:{}", work); } // @ApiOperation("开始上片任务") // @PostMapping("/selectPriority") //调用上片任务 // @ResponseBody // public void selectPriority() { // UpWorkSequence work=upWorkstationService.selectPriority(); // log.info("显示可上的玻璃信息:{}", work); // // } }
@@ -1,5 +1,7 @@ package com.mes; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.service.GlassInfoService; import com.mes.pp.mapper.OptimizeProjectMapper; import com.mes.uppattenusage.entity.OptimizeUpPattenUsage; import com.mes.uppattenusage.entity.UpPattenUsage; @@ -30,7 +32,8 @@ private OptimizeProjectMapper optimizeProjectMapper; @Autowired private UpPattenUsageServiceImpl upPattenUsageService; @Autowired private GlassInfoService glassInfoService; @Test public void test() { // List<OptimizeProject> list = optimizeProjectMapper.saveProject("P24032204"); @@ -48,4 +51,9 @@ List<UpPattenUsage> glass = upPattenUsageService.selectSaveUpPattenUsage("P24032204"); log.info("完整路径：{}", Arrays.asList(glass)); } @Test public void textglassinfo(){ List<GlassInfo> glass= glassInfoService.selectGlassInfo("P24032204"); log.info("glassinfo：{}", Arrays.asList(glass)); } } hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -1,10 +1,10 @@ package com.mes.temperingglass.controller; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.service.TemperingAgoService; import com.mes.temperingglass.service.TemperingOverService; import com.mes.temperingglass.service.TemperingService; import com.mes.utils.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -26,24 +26,27 @@ TemperingService temperingService; @Autowired private TemperingOverService temperingOverService; @Autowired private TemperingAgoService temperingAgoService; @ApiOperation("查询钢化等片中的版图信息,状态为1的为已到,状态为0的为等待中") @GetMapping("/selectWaitingGlass") // 查询钢化等片中的版图信息,状态为1的为已到,状态为0的为等待中 public Result <List<TemperingGlassInfo>> selectWaitingGlass() { List<TemperingGlassInfo> glass = temperingService.selectWaitingGlass(); List<TemperingGlassInfo> glass = temperingAgoService.selectWaitingGlass(); log.info("等待中的玻璃信息{}",glass); return Result.build(200, "", glass); } @ApiOperation("查询进炉中的钢化等片中的版图信息,状态全为1的为已到。") @GetMapping("/selectIntoGlass") // 查询进炉中的钢化等片中的版图信息,状态全为1的为已到。 public Result <List<TemperingGlassInfo>> selectIntoGlass() { List<TemperingGlassInfo> glass = temperingService.SelectIntoGlass(); List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass(); log.info("进炉中的玻璃版图信息{}",glass); return Result.build(200, "", glass); } @ApiOperation("//钢化后显示出炉的版图信息。") @GetMapping("/selectOutGlass") //钢化后显示出炉的版图信息 public Result <List<TemperingGlassInfo>> selectOutGlass() { List<TemperingGlassInfo> glass = temperingOverService.SelectOutGlass(); List<TemperingGlassInfo> glass = temperingAgoService.SelectOutGlass(); log.info("钢化出炉后的玻璃信息{}",glass); return Result.build(200, "", glass); } hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
@@ -1,6 +1,7 @@ package com.mes.temperingglass.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.mes.temperingglass.entity.TemperingGlassInfo; /** @@ -11,6 +12,6 @@ * @author zhoush * @since 2024-04-07 */ public interface TemperingGlassInfoMapper extends BaseMapper<TemperingGlassInfo> { public interface TemperingGlassInfoMapper extends BaseMapper<TemperingGlassInfo>, MPJBaseMapper<TemperingGlassInfo> { } hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
New file @@ -0,0 +1,23 @@ package com.mes.temperingglass.service; import com.baomidou.mybatisplus.extension.service.IService; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.github.yulichang.base.MPJBaseService; import java.util.List; /** * <p> * 服务类 * </p> * * @author zhoush * @since 2024-04-07 */ public interface TemperingAgoService extends MPJBaseService<TemperingGlassInfo> { List<TemperingGlassInfo> selectWaitingGlass(); List<TemperingGlassInfo> selectIntoGlass(); List<TemperingGlassInfo> SelectOutGlass(); } hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
File was deleted hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
@@ -50,7 +50,7 @@ } //显示等待中的版图 public List<TemperingGlassInfo> selectWaitingGlass() { public List<TemperingGlassInfo> SelectWaitingGlass() { List<TemperingGlassInfo> WaitingGlass = temperingMapper.SelectWaitingGlass(); return WaitingGlass; } hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
New file @@ -0,0 +1,55 @@ package com.mes.temperingglass.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.query.MPJQueryWrapper; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.mapper.TemperingGlassInfoMapper; import com.mes.temperingglass.mapper.TemperingMapper; import com.mes.temperingglass.service.TemperingAgoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.github.yulichang.base.MPJBaseServiceImpl; import java.util.Collections; import java.util.List; /** * <p> * 服务实现类 * </p> * * @author zhoush * @since 2024-04-07 */ @Service public class TemperingAgoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingAgoService { @Autowired TemperingMapper temperingMapper; @Override public List<TemperingGlassInfo> selectWaitingGlass() { //获取等待进炉中的玻璃信息 QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); wrapper.inSql("flowcard_id", "select flowcard_id from tempering_glass_info GROUP BY flowcard_id,state having count(state) = 2"); return temperingMapper.selectList(wrapper); } @Override public List<TemperingGlassInfo> selectIntoGlass() { //获取进炉中的玻璃信息 QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); wrapper.inSql("flowcard_id", "select flowcard_id from tempering_glass_info where state=1 GROUP BY flowcard_id,state having count(state) = 1"); return temperingMapper.selectList(wrapper); } @Override public List<TemperingGlassInfo> SelectOutGlass() { //获取出炉中的玻璃信息 QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>(); wapper.eq("state", 3); return temperingMapper.selectList(wapper); } } hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
File was deleted
