From d6ab2b87018bb2a820d85869ebea11cd79559798 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 18 四月 2024 15:02:34 +0800
Subject: [PATCH] 代码还原
---
hangzhoumesParent/moduleService/CacheGlassModule/pom.xml | 4 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 44 +++++++++++++---------
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java | 3 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 45 +++++++++++-----------
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 8 +++-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 13 ++++--
6 files changed, 70 insertions(+), 47 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
index 81c937a..bec683f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
@@ -21,6 +21,10 @@
<artifactId>mybatis-plus-join</artifactId>
<version>1.1.6</version>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.github.yulichang</groupId>-->
+<!-- <artifactId>mybatis-plus-join-boot-starter</artifactId>-->
+<!-- </dependency>-->
</dependencies>
<properties>
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
index 585741f..5dc7252 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
@@ -16,12 +16,17 @@
*/
public interface EdgStorageCageDetailsService extends IService<EdgStorageCageDetails> {
- //璇嗗埆 鐮存崯/鎷胯蛋
- public boolean identWorn(String glassid,int ControlsId);
+ /**
+ * 璇嗗埆 鐮存崯/鎷胯蛋
+ * @param glassid
+ * @param ControlsId
+ * @return
+ */
+ boolean identWorn(String glassid,int ControlsId);
//鑾峰彇 鍒囧壊褰撳墠鐗堝浘
- public List<Map> selectCutTerritory();
+ List<Map> selectCutTerritory();
//鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
- public List<Map> selectCurrentCutTerritory(String current);
+ List<Map> selectCurrentCutTerritory(String current);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index f23de00..48ae3fc 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -1,11 +1,9 @@
package com.mes.edgstoragecage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.github.yulichang.query.MPJQueryWrapper;
+import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.taskcache.mapper.HangzhouMesMapper;
@@ -17,7 +15,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -27,44 +25,47 @@
public class EdgStorageCageDetailsServiceImpl extends ServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
//鑾峰彇鍏ㄩ儴鏁版嵁
@Autowired
- private HangzhouMesMapper hangzhouMesMapper;
- @Autowired
private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
+
//璇嗗埆 鐮存崯/鎷胯蛋
- public boolean identWorn(String glassid,int ControlsId){
- List<EdgStorageCageDetails> edgStorageCageDetails=edgStorageCageDetailsMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid",glassid));
- if(edgStorageCageDetails.size()==1){
- edgStorageCageDetailsMapper.update(edgStorageCageDetails.get(0),new QueryWrapper<EdgStorageCageDetails>().eq("glassid",glassid));
+ public boolean identWorn(String glassid, int ControlsId) {
+ List<EdgStorageCageDetails> edgStorageCageDetails = edgStorageCageDetailsMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ if (edgStorageCageDetails.size() == 1) {
+ edgStorageCageDetailsMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
return true;
}
return false;
}
+
//鑾峰彇 鍒囧壊褰撳墠鐗堝浘
@Override
- public List<Map> selectCutTerritory(){
- List<Map> list= edgStorageCageDetailsMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
- .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+ public List<Map> selectCutTerritory() {
+ List<Map> list = edgStorageCageDetailsMapper.selectJoinList(
+ Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
+ .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
.leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
.leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
- .eq("state",1)
+ .eq("state", 1)
.orderByAsc("t.layout_sequence")
);
return list;
}
+
//鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
@Override
- public List<Map> selectCurrentCutTerritory(String current){
- List<Map> list= edgStorageCageDetailsMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
- .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+ public List<Map> selectCurrentCutTerritory(String current) {
+ List<Map> list = edgStorageCageDetailsMapper.selectJoinList(
+ Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
+ .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
.leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
.leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
- .eq("t.engineering_id",current)
+ .eq("t.engineering_id", current)
.orderByAsc("t.layout_sequence")
);
return list;
- };
+ }
+
+ ;
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index c59ac0c..b337c2d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -8,6 +8,8 @@
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Map;
@@ -29,6 +31,8 @@
EdgStorageCageMapper edgStorageCageMapper;
@Autowired
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
+ @Autowired
+ UpPattenUsageMapper upPattenUsageMapper;
@Override
//鏌ヨ绗煎唴绌烘牸
@@ -45,8 +49,8 @@
@Override
//鏌ヨ绗煎唴鍑虹墖浠诲姟 鎸夐挗鍖栫増鍥惧彿+鐗堝浘鍐呭簭鍙�
public List<Map> selectCacheOut(){
- List<Map> list= edgStorageCageMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
+ List<Map> list= upPattenUsageMapper.selectJoinList(
+ Map.class,new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
.isNotNull("escd.slot")
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
index 0fc6b8b..73efed6 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
@@ -1,11 +1,10 @@
package com.mes.taskcache.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 com.mes.taskcache.entity.TaskCache;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.taskcache.mapper.TaskCacheMapper;
import com.mes.taskcache.service.TaskCacheService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,38 +22,47 @@
*/
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
+
+ @Autowired
+ GlassInfoMapper glassInfoMapper;
+ @Autowired
+ TaskCacheMapper taskCacheMapper;
//娣诲姞鐞嗙墖绗间换鍔�
+ @Override
public boolean insertTaskCache(TaskCache taskCache){
- return this.save(taskCache);
+ taskCacheMapper.insert(taskCache);
+ return true;
}
-
//鏌ヨ纾ㄨ竟浠诲姟
- public List<TaskCache> selectEdgInfo(String line){
-
+ @Override
+ public List<TaskCache> selectEdgInfo(String line) {
+ return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line));
}
-
- //鏌ヨ鐞嗙墖浠诲姟
+ //鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
+ @Override
public List<TaskCache> selectCacheInfo(){
-
+ return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0));
}
-
//鏌ヨ鍏ㄩ儴浠诲姟
- public List<TaskCache> selectAll(){
-
+ @Override
+ public List<TaskCache> selectAll() {
+ return taskCacheMapper.selectList(null);
}
-
- //鏌ヨ杩涚墖浠诲姟
+ //鏌ヨ寰呰繘鐗囦换鍔�
+ @Override
public List<TaskCache> selectInputTaskCache(){
-
+ return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",1));
}
- //鏌ヨ鍑虹墖浠诲姟
+ //鏌ヨ寰呭嚭鐗囦换鍔�
+ @Override
public List<TaskCache> selectOutTaskCache(){
-
+ return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",2));
}
//鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ @Override
public List<TaskCache> selectLastOutCacheInfo(String line){
-
+ return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line).eq("taskstauts",1).orderByDesc("ID"));
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
index df3f669..b6efc63 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
@@ -1,6 +1,7 @@
package com.mes.uppattenusage.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
import com.mes.uppattenusage.entity.UpPattenUsage;
/**
@@ -11,6 +12,6 @@
* @author zhoush
* @since 2024-04-07
*/
-public interface UpPattenUsageMapper extends BaseMapper<UpPattenUsage> {
+public interface UpPattenUsageMapper extends MPJBaseMapper<UpPattenUsage> {
}
--
Gitblit v1.8.0