hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
File was renamed from hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java @@ -91,6 +91,10 @@ * 状态 */ private Integer state; /** * 格子号 */ private Integer slot; } hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
File was renamed from hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java @@ -1,7 +1,6 @@ package com.mes.temperingglass.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.mes.temperingglass.entity.TemperingGlassInfo; @@ -14,6 +13,6 @@ * @since 2024-04-07 */ @DS("salve_hangzhoumes") public interface TemperingGlassInfoMapper extends BaseMapper<TemperingGlassInfo>, MPJBaseMapper<TemperingGlassInfo> { public interface TemperingGlassInfoMapper extends MPJBaseMapper<TemperingGlassInfo> { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
File was renamed from hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java @@ -15,9 +15,11 @@ List<TemperingGlassInfo> selectWaitingGlass(); List<TemperingGlassInfo> selectIntoGlass(); List<TemperingGlassInfo> selectIntoGlass(int layoutId); List<TemperingGlassInfo> selectOutGlass(); List<TemperingGlassInfo> selectOverGlass(); List<TemperingGlassInfo> selectLayoutId(); } hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
File was renamed from hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java @@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.List; /** @@ -23,7 +23,7 @@ @DS("salve_hangzhoumes") public class TemperingAgoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingAgoService { @Autowired TemperingMapper temperingMapper; TemperingGlassInfoMapper temperingMapper; @Override public List<TemperingGlassInfo> selectWaitingGlass() { @@ -35,10 +35,11 @@ } @Override public List<TemperingGlassInfo> selectIntoGlass() { public List<TemperingGlassInfo> selectIntoGlass(int layoutId) { //获取进炉中的玻璃信息 QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); wrapper.eq("state",2) .eq("tempering_layout_id", layoutId) .orderByAsc("tempering_layout_id","tempering_feed_sequence"); return temperingMapper.selectList(wrapper); } @@ -64,4 +65,13 @@ wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId()); return temperingMapper.selectList(wrapper); } @Override public List<TemperingGlassInfo> selectLayoutId() { QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); wrapper.select("distinct tempering_layout_id") .eq("state",2) .orderByAsc("tempering_layout_id"); return temperingMapper.selectList(wrapper); } } hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -1,6 +1,7 @@ package com.mes.job; import cn.hutool.json.JSONObject; import com.mes.temperingglass.service.TemperingAgoService; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.service.TemperingAgoService; import com.mes.tools.WebSocketServer; @@ -32,9 +33,16 @@ //正在等待进片的玻璃 List<TemperingGlassInfo> waitingGlass = temperingAgoService.selectWaitingGlass(); jsonObject.append("waitingGlass", waitingGlass); //获取整在炉中的两个版图id List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId(); //进炉中的玻璃 List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(); List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId()); jsonObject.append("intoGlass", intoGlass); //进炉中的第二个版图 if (layoutId.size() > 1) { List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId()); jsonObject.append("intoGlass2", intoGlass2); } //出炉后的玻璃 List<TemperingGlassInfo> outGlass = temperingAgoService.selectOutGlass(); jsonObject.append("outGlass", outGlass); hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -1,12 +1,13 @@ package com.mes.temperingglass.controller; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.service.TemperingAgoService; import com.mes.temperingglass.entity.TemperingGlassInfo; 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 org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -30,13 +31,13 @@ log.info("等待中的玻璃信息{}",glass); return Result.build(200, "", glass); } @ApiOperation("查询进炉中的钢化等片中的版图信息,状态全为1的为已到。") @GetMapping("/selectIntoGlass") // 查询进炉中的钢化等片中的版图信息,状态全为1的为已到。 public Result <List<TemperingGlassInfo>> selectIntoGlass() { List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass(); log.info("进炉中的玻璃版图信息{}",glass); return Result.build(200, "", glass); } // @ApiOperation("查询进炉中的钢化等片中的版图信息,状态全为1的为已到。") // @GetMapping("/selectIntoGlass") // 查询进炉中的钢化等片中的版图信息,状态全为1的为已到。 // public Result <List<TemperingGlassInfo>> selectIntoGlass() { // List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass(); // log.info("进炉中的玻璃版图信息{}",glass); // return Result.build(200, "", glass); // } @ApiOperation("//钢化后显示出炉的版图信息。") @GetMapping("/selectOutGlass") //钢化后显示出炉的版图信息 public Result <List<TemperingGlassInfo>> selectOutGlass() { hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java
File was deleted hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
@@ -1,52 +1,60 @@ package com.mes; import com.mes.glassinfo.service.GlassInfoService; import com.mes.pp.mapper.OptimizeProjectMapper; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.service.TemperingAgoService; 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; /** * @Author : zhoush * @Date: 2024/3/27 16:37 * @Description: */ @Slf4j @RunWith(SpringRunner.class) @SpringBootTest(classes = TemperingGlassModuleApplication.class) public class TemperingApplicationTest { @Autowired private TemperingAgoService temperingAgoService; @Test public void testFindPa() { List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass(); log.info("进炉中的玻璃：{}", Arrays.asList(glass)); } @Test public void testFindPa2() { List<TemperingGlassInfo> glass = temperingAgoService.selectOutGlass(); log.info("已出中的玻璃：{}", Arrays.asList(glass)); } @Test public void testFindPa3() { List<TemperingGlassInfo> glass = temperingAgoService.selectWaitingGlass(); log.info("等待中的玻璃：{}", Arrays.asList(glass)); } @Test public void testFindPa4() { List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass(); log.info("等待中的玻璃：{}", Arrays.asList(glass)); } } //package com.mes; // //import com.mes.temperingglass.entity.TemperingGlassInfo; //import com.mes.temperingglass.service.TemperingAgoService; //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 java.util.Arrays; //import java.util.List; // ///** // * @Author : zhoush // * @Date: 2024/3/27 16:37 // * @Description: // */ //@Slf4j //@RunWith(SpringRunner.class) //@SpringBootTest(classes = TemperingGlassModuleApplication.class) //public class TemperingApplicationTest { // // @Autowired // private TemperingAgoService temperingAgoService; // // // @Test // public void testFindPa() { // List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass(12); // log.info("进炉中的玻璃：{}", Arrays.asList(glass)); // } // @Test // public void testFindPa2() { // List<TemperingGlassInfo> glass = temperingAgoService.selectOutGlass(); // log.info("已出中的玻璃：{}", Arrays.asList(glass)); // } // // @Test // public void testFindPa3() { // List<TemperingGlassInfo> glass = temperingAgoService.selectWaitingGlass(); // log.info("等待中的玻璃：{}", Arrays.asList(glass)); // } // @Test // public void testFindPa4() { // List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass(); // log.info("等待中的玻璃：{}", Arrays.asList(glass)); // } // @Test // public void testFindPa5() { // List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId(); // //进炉中的玻璃 // log.info("版图id：{}", Arrays.asList(layoutId.get(0).getTemperingLayoutId())); // List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId()); // log.info("玻璃版图id：{}", Arrays.asList(intoGlass)); // List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId()); // log.info("玻璃版图id：{}", Arrays.asList(intoGlass2)); // } //}
