From 6f39f26611a67e6c3edf561337490a270444c256 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 29 四月 2024 16:02:12 +0800
Subject: [PATCH] 增加注释
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 46 ++++++++++------------------------------------
1 files changed, 10 insertions(+), 36 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 a3976f0..a723b66 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,6 +1,5 @@
package com.mes.downstorage.service.impl;
-import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.common.PLCAutoMes;
import com.mes.common.S7control;
import com.mes.device.PlcParameterObject;
@@ -9,19 +8,17 @@
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.DownStorageCageDetailsService;
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.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -44,23 +41,10 @@
private DownGlassTaskService downGlassTaskService;
@Autowired
private DownStorageCageDetailsService downStorageCageDetailsService;
- @Override
- public List<Map> gettask(){
- downStorageCageMapper.selectList(null);
-// downStorageCageMapper.selectJoin();
- return null;
- };
- @Override
- public List<Map> selectCacheEmpty(){
- return baseMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<DownStorageCage>().selectAll(DownStorageCage.class)
- .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
- .leftJoin("down_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
- .isNull("escd.slot")
- );
- }
+
+
@@ -84,32 +68,22 @@
public DownGlassTask createDownGlassTask(GlassInfo glassInfo, String startCell, String endCell,String taskType ) {
DownGlassTask downGlassTask = new DownGlassTask();
- downGlassTask.setId(glassInfo.getId());
- downGlassTask.setStartCell(startCell);
- downGlassTask.setTaskType(taskType);
- downGlassTask.setEndCell(endCell);
- downGlassTask.setWidth(glassInfo.getWidth());
- downGlassTask.setHeight(glassInfo.getHeight());
- downGlassTask.setFilmsid(String.valueOf(glassInfo.getFilmsid()));
- downGlassTask.setThickness(glassInfo.getThickness());
- downGlassTask.setFlowCardId(glassInfo.getFlowcardId());
+ BeanUtils.copyProperties(downGlassTask,glassInfo);
+ downGlassTask.setStartCell(startCell);
+ downGlassTask.setTaskType(taskType);
+ downGlassTask.setEndCell(endCell);
return downGlassTask;
}
public DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, String startCell, String endCell,String taskType ) {
DownGlassTask downGlassTask = new DownGlassTask();
- downGlassTask.setId(glassInfo.getId());
+
+ BeanUtils.copyProperties(downGlassTask,glassInfo);
downGlassTask.setStartCell(startCell);
downGlassTask.setTaskType(taskType);
downGlassTask.setEndCell(endCell);
- downGlassTask.setWidth(glassInfo.getWidth());
- downGlassTask.setHeight(glassInfo.getHeight());
- downGlassTask.setFilmsid(String.valueOf(glassInfo.getFilmsid()));
- downGlassTask.setThickness(glassInfo.getThickness());
- downGlassTask.setFlowCardId(glassInfo.getFlowCardId());
-
return downGlassTask;
}
@@ -125,7 +99,7 @@
//鍚屾壘鍒板悓娴佺▼鍗￠檮杩戠┖鏍�
List<DownStorageCageDetails> list = downStorageCageDetailsService.getIsExistIntoCacheByflowcardid(GlassInfo.getFlowcardId(), GlassInfo.getWidth());
- List<Map> selectCacheEmpty=selectCacheEmpty();
+ List<DownStorageCageDetails> selectCacheEmpty=downStorageCageDetailsService.selectCacheEmpty2();
// list<Map> list=selectCacheEmpty();
// list<Map> = downStorageCageService.selectCacheEmpty();
--
Gitblit v1.8.0