From a72412ea76015aa84883da72e643c63096c71a24 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 24 四月 2024 09:00:44 +0800
Subject: [PATCH] 认证权限
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 151 +++++++++++++++++++++++++------------------------
1 files changed, 77 insertions(+), 74 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index e91289e..958affc 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -1,20 +1,17 @@
package com.mes.downstorage.service.impl;
-import com.github.yulichang.query.MPJQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.PLCAutoMes;
import com.mes.common.S7control;
import com.mes.device.PlcParameterObject;
import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downstorage.entity.DownStorageCage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.downstorage.entity.DownStorageCageDetails;
-import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
import com.mes.downstorage.mapper.DownStorageCageMapper;
import com.mes.downstorage.service.DownStorageCageService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,8 +30,6 @@
@Slf4j
@Service
public class DownStorageCageServiceImpl extends ServiceImpl<DownStorageCageMapper, DownStorageCage> implements DownStorageCageService {
- @Autowired
- private DownStorageCageMapper downStorageCageMapper;
@Autowired
private GlassInfoService glassInfoService;
@@ -44,7 +39,7 @@
private DownGlassTaskService downGlassTaskService;
@Override
public List<Map> gettask(){
- downStorageCageMapper.selectList(null);
+ baseMapper.selectList(null);
// downStorageCageMapper.selectJoin();
return null;
};
@@ -54,14 +49,17 @@
@Override
public List<DownStorageCageDetails> getCacheLeisure() {
log.info(" 鏌ヨ绗煎瓙鍐呯┖闂�");
- List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
- DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNull("escd.slot")
- .orderByAsc("escd.slot")
- );
- return list;
+// MPJLambdaWrapper<DownStorageCageDetails> wrapper = new MPJLambdaWrapper<>();
+// wrapper.selectAll(DownStorageCageDetails.class)
+// List<DownStorageCageDetails> list = baseMapper.selectJoinList(
+// DownStorageCageDetails.class,Wrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .isNull("escd.slot")
+// .orderByAsc("escd.slot")
+// );
+// return list;
+ return null;
}
@@ -87,17 +85,18 @@
@Override
public List<DownStorageCageDetails> getCacheOut(int start, int end) {
log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�");
- return downStorageCageMapper.selectJoinList(
- DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id")
- .leftJoin("glass_info gi on dw.flow_card_id = gi.flowcard_id and gi.flowcard_id=escd.flow_card_id ")
- .isNotNull("escd.slot")
- .between("dw.workstation_id", start, end)
- .orderByDesc("escd.width")
- .orderByDesc("escd.height")
- );
+// return baseMapper.selectJoinList(
+// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id")
+// .leftJoin("glass_info gi on dw.flow_card_id = gi.flowcard_id and gi.flowcard_id=escd.flow_card_id ")
+// .isNotNull("escd.slot")
+// .between("dw.workstation_id", start, end)
+// .orderByDesc("escd.width")
+// .orderByDesc("escd.height")
+// );
+ return null;
}
@@ -107,12 +106,13 @@
@Override
public List<Map> getCacheInfo() {
log.info(" 鏌ヨ绗煎瓙鍐呬俊鎭�");
- return downStorageCageMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .orderByAsc("t.slot")
- );
+// return baseMapper.selectJoinList(
+// Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .orderByAsc("t.slot")
+// );
+ return null;
}
@@ -121,17 +121,18 @@
@Override
public List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width) {
log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸");
- List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
- DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNotNull("escd.slot")
- .eq("escd.tempering_layout_id", tempering_layout_id)
- .lt("escd.tempering_feed_sequence", tempering_feed_sequence)
- .gt("t.remain_width", width)
- .orderByAsc("escd.tempering_feed_sequence")
- );
- return list;
+// List<DownStorageCageDetails> list = baseMapper.selectJoinList(
+// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .isNotNull("escd.slot")
+// .eq("escd.tempering_layout_id", tempering_layout_id)
+// .lt("escd.tempering_feed_sequence", tempering_feed_sequence)
+// .gt("t.remain_width", width)
+// .orderByAsc("escd.tempering_feed_sequence")
+// );
+// return list;
+ return null;
}
@@ -143,34 +144,35 @@
@Override
public List<DownStorageCageDetails> IsExistIntoCacheByflowcardid(String flowcardid, double width) {
log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
- return downStorageCageMapper.selectJoinList(
- DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNotNull("escd.slot")
- .lt("escd.flow_card_id", flowcardid)
- // 鏉′欢 t.remain_width - width > 0
- .apply("t.remain_width - " + width + " > 0")
- .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
- );
+// return baseMapper.selectJoinList(
+// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .isNotNull("escd.slot")
+// .lt("escd.flow_card_id", flowcardid)
+// // 鏉′欢 t.remain_width - width > 0
+// .apply("t.remain_width - " + width + " > 0")
+// .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
+// );
+ return null;
}
@Override
public List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width) {
- log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
- return downStorageCageMapper.selectJoinList(
- DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNotNull("escd.slot")
- .lt("escd.tempering_layout_id", tempering_layout_id)
- // 鏉′欢 t.remain_width - width > 0
- .apply("t.remain_width - " + width + " > 0")
- .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
- );
-
+// log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
+// return baseMapper.selectJoinList(
+// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .isNotNull("escd.slot")
+// .lt("escd.tempering_layout_id", tempering_layout_id)
+// // 鏉′欢 t.remain_width - width > 0
+// .apply("t.remain_width - " + width + " > 0")
+// .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
+// );
+ return null;
}
@@ -183,15 +185,16 @@
public List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width) {
log.info(" 鍗曠墖鎯呭喌 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓娴佺▼鍗″彿鐨勭┖鏍�");
- return downStorageCageMapper.selectJoinList(
- DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
- .select("escd.*")
- .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
- .isNotNull("escd.slot")
- .eq("escd.flow_card_id", flowcardid)
- .gt("t.remain_width", width)
- .orderByAsc("escd.sequence")
- );
+// return baseMapper.selectJoinList(
+// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .isNotNull("escd.slot")
+// .eq("escd.flow_card_id", flowcardid)
+// .gt("t.remain_width", width)
+// .orderByAsc("escd.sequence")
+// );
+ return null;
}
--
Gitblit v1.8.0