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/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 81 ++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 37 deletions(-)
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 45cf60f..cebe39d 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,16 +1,17 @@
package com.mes.edgstoragecage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
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;
+import com.mes.pp.entity.OptimizeDetail;
+import com.mes.pp.mapper.OptimizeDetailMapper;
+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.List;
import java.util.Map;
@@ -24,49 +25,55 @@
*/
@Service
public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
- //鑾峰彇鍏ㄩ儴鏁版嵁
- @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));
-// return true;
-// }
+ @Autowired
+ UpPattenUsageMapper upPattenUsageMapper;
+ @Autowired
+ OptimizeDetailMapper optimizeDetailMapper;
+
+ /**
+ * 璇嗗埆 鎷胯蛋:200/鐮存崯:201
+ * @param glassId
+ * @param ControlsId
+ * @return
+ */
+ public boolean identWorn(String glassId, int ControlsId) {
+ List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glass_id", glassId));
+ if (edgStorageCageDetails.size() == 1) {
+ EdgStorageCageDetails item=edgStorageCageDetails.get(0);
+ item.setState(ControlsId);
+ baseMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glass_id", glassId));
+ return true;
+ }
return false;
}
- //鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ /**
+ * 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ * @return
+ */
@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")
-// .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)
-// .orderByAsc("t.layout_sequence")
-// );
-// return list;
-
+ public List<OptimizeDetail> selectCutTerritory() {
+ List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectList(new QueryWrapper<UpPattenUsage>()
+ .eq("state", 1));
+ if(!upPattenUsage.isEmpty()){
+ UpPattenUsage upPattenUsage1=upPattenUsage.get(0);
+ return optimizeDetailMapper.selectList(new QueryWrapper<OptimizeDetail>()
+ .eq("project_no", upPattenUsage1.getEngineeringId())
+ .eq("stock_id",upPattenUsage1.getLayoutSequence())
+ );
+ }
return null;
}
- //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ /**
+ * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ * @param current
+ * @return
+ */
@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")
-// .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)
-// .orderByAsc("t.layout_sequence")
-// );
-// return list;
- return null;
+ public List<OptimizeDetail> selectCurrentCutTerritory(String current) {
+ return optimizeDetailMapper.selectList(new QueryWrapper<OptimizeDetail>().eq("project_no", current));
}
;
--
Gitblit v1.8.0