From 967c35a4aea280512b71cca6547e126bcde5a024 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 六月 2024 15:04:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 5 -
/dev/null | 15 ---
hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java | 112 +++++++++++++++-------------
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java | 3
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 8 +-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 4 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java | 16 +++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 21 ++--
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java | 4
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 10 ++
10 files changed, 105 insertions(+), 93 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
similarity index 95%
rename from hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
index 8aaa9b1..ac47c7b 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
@@ -91,6 +91,10 @@
* 鐘舵��
*/
private Integer state;
+ /**
+ * 鏍煎瓙鍙�
+ */
+ private Integer slot;
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
similarity index 64%
rename from hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
index 76f6375..dc41a61 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
+++ b/hangzhoumesParent/common/servicebase/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> {
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
similarity index 81%
rename from hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
index feefa31..83088d7 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
+++ b/hangzhoumesParent/common/servicebase/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();
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
similarity index 82%
rename from hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
index 0e8c654..01ed8a7 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/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);
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
deleted file mode 100644
index 08fa5a6..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.mes.glassinfo.controller;
-
-import com.mes.glassinfo.entity.GlassInfo;
-import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.utils.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@Api(description = "鐜荤拑淇℃伅灏忕墖")
-@RestController
-@RequestMapping("/glassInfo")
-public class GlassInfoController {
-
- @Autowired
- private GlassInfoService glassInfoService;
-
- @ApiOperation("鏍规嵁鐜荤拑灏忕墖ID鏌ヨ 鐜荤拑鏁版嵁锛氬弬鏁�(鐜荤拑ID)")
- @PostMapping("/selectId")
- @ResponseBody
- public Result selectId(String ProcessId) {
- List<GlassInfo> list = glassInfoService.selectId(ProcessId);
- return Result.build(200,"鎴愬姛",list);
- }
- @ApiOperation("鏌ヨ鎵�鏈夌幓鐠冨皬鐗囦俊鎭� 鐜荤拑鏁版嵁 鍙傛暟()")
- @PostMapping("/selectAll")
- @ResponseBody
- public Result selectAll() {
- List<GlassInfo> list = glassInfoService.selectAll();
- return Result.build(200,"鎴愬姛",list);
- }
- @ApiOperation("鏌ヨ宸ョ▼涓嬬殑鐜荤拑灏忕墖淇℃伅 鐜荤拑鏁版嵁 鍙傛暟(宸ョ▼鍙�)")
- @PostMapping("/selectFlowCardId")
- @ResponseBody
- public Result selectFlowCardId(String flowCardId) {
- List<GlassInfo> list = glassInfoService.selectFlowCardId(flowCardId);
- return Result.build(200,"鎴愬姛",list);
- }
-}
-
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/mapper/GlassInfoMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/mapper/GlassInfoMapper.java
deleted file mode 100644
index ade0460..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/mapper/GlassInfoMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mes.glassinfo.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.mes.glassinfo.entity.GlassInfo;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface GlassInfoMapper extends MPJBaseMapper<GlassInfo> {
-
-}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
deleted file mode 100644
index f5117b0..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.mes.glassinfo.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.glassinfo.entity.GlassInfo;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface GlassInfoService extends IService<GlassInfo> {
-
- /**
- * 鏌ヨ鎵�鏈夌幓鐠冨皬鐗囦俊鎭�
- * @return
- */
- public List<GlassInfo> selectAll();
-
- /**
- * 鏍规嵁鐜荤拑缂栧彿鏌ヨ鐜荤拑灏忕墖淇℃伅
- * @param glassId
- * @return
- */
- public List<GlassInfo> selectId(String glassId);
-
- /**
- * 鏍规嵁宸ョ▼鍙锋煡璇㈢幓鐠冨皬鐗囦俊鎭�
- * @param flowCardId
- * @return
- */
- public List<GlassInfo> selectFlowCardId(String flowCardId);
-}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
deleted file mode 100644
index 7e04d74..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.mes.glassinfo.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.query.MPJLambdaQueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.mes.glassinfo.entity.GlassInfo;
-import com.mes.glassinfo.mapper.GlassInfoMapper;
-import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.taskcache.entity.TaskCache;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-@Service
-public class GlassInfoServiceImpl extends ServiceImpl<GlassInfoMapper, GlassInfo> implements GlassInfoService {
-
-
- /**
- * 鏍规嵁ID 鑾峰彇灏忕墖鏁版嵁
- * @param glassId
- * @return
- */
- @Override
- public List<GlassInfo> selectId(String glassId){
- return baseMapper.selectList(new MPJLambdaWrapper<GlassInfo>().selectAll(GlassInfo.class).eq(GlassInfo::getGlassId,glassId));
-// return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("glass_id",glassId));
- };
-
- /**
- * 鑾峰彇鍏ㄩ儴灏忕墖鏁版嵁
- * @return
- */
- @Override
- public List<GlassInfo> selectAll(){
- return baseMapper.selectList(null);
- };
-
- /**
- * 鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
- * @param flowCardId
- * @return
- */
- @Override
- public List<GlassInfo> selectFlowCardId(String flowCardId){
- return baseMapper.selectList(new MPJLambdaWrapper<GlassInfo>().selectAll(GlassInfo.class).eq(GlassInfo::getFlowCardId,flowCardId));
- //Sql鐗堟湰
-// return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("flow_card_id",flowCardId));
- };
-}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
index 0f57394..4bf1348 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -112,11 +112,6 @@
log.info("Sql鏁版嵁锛歿}", Arrays.asList(list));
}
- @Test
- public void testglassinfo() {
- List<GlassInfo> glassInfos = glassInfoService.selectId("7");
- log.info("鐜荤拑鏁版嵁鏁版嵁锛歿}", Arrays.asList(glassInfos));
- }
@Test
public void testCacheGlass() {
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index 06ffda6..8c66de2 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -43,7 +43,7 @@
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 3000000)
+ @Scheduled(fixedDelay = 300)
public void plcLoadGlassTask() throws InterruptedException {
try {
//鑾峰彇鑱旀満鐘舵��
@@ -87,7 +87,7 @@
}
}
- @Scheduled(fixedDelay = 3000000)
+ @Scheduled(fixedDelay = 300)
public void plcLoadGlassReport(){
//鑾峰彇鏄惁鏈夋眹鎶�
String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
@@ -144,8 +144,8 @@
public void loadGlassStatus(){
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
- //String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
- String inkageStatus ="1";
+ String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
+ //String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
index 3b05bc6..d548f45 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
+++ b/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);
+ //鑾峰彇鏁村湪鐐変腑鐨勪袱涓増鍥緄d
+ 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);
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index feb079a..3496554 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/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() {
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java
deleted file mode 100644
index 2b0a3a7..0000000
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mes.temperingglass.mapper;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-@Mapper
-@DS("salve_hangzhoumes")
-public interface TemperingMapper extends BaseMapper<TemperingGlassInfo> {
-
-}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
index 422b941..e5e4608 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
+++ b/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));
+// }
+//}
--
Gitblit v1.8.0