From 5eaa6c003d49b3d555f272ca73d7f91280a8e02f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 四月 2024 12:30:32 +0800
Subject: [PATCH] 代码移动到新架构
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 3 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 2 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java | 5 ++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java | 14 +++---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 5 +-
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java | 4 ++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 5 ++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 23 ++++++++---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java | 34 +++++++++++-----
9 files changed, 65 insertions(+), 30 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
index 5f296d8..7b778e5 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
@@ -3,8 +3,8 @@
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.bigstorage.service.impl.BigStorageCageDetailsServiceImpl;
-import com.mes.bigstorage.service.impl.BigStorageCageServiceImpl;
+import com.mes.bigstorage.service.BigStorageCageDetailsService;
+import com.mes.bigstorage.service.BigStorageCageService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,8 +25,8 @@
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {
- private BigStorageCageServiceImpl bigStorageCageServiceImpl;
- private BigStorageCageDetailsServiceImpl bigStorageCageDetailsServiceImpl;
+ private BigStorageCageService bigStorageCageService;
+ private BigStorageCageDetailsService bigStorageCageDetailsService;
//todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
@ApiOperation("娴嬭瘯")
@@ -38,19 +38,19 @@
@ApiOperation("鐞嗙墖绗间俊鎭�")
@GetMapping("/BigStorageCage")
public List<BigStorageCage> BigStorageCage() {
- return bigStorageCageServiceImpl.list();
+ return bigStorageCageService.list();
}
@ApiOperation("鐞嗙墖绗艰鎯�")
@GetMapping("/BigStorageCageDetails")
public List<BigStorageCageDetails> BigStorageCageDetails() {
- return bigStorageCageDetailsServiceImpl.list();
+ return bigStorageCageDetailsService.list();
}
@ApiOperation("灏忚溅瀹炴椂浣嶇疆")
@GetMapping("/CarPosition")
public List<Integer> CarPosition() {
- return bigStorageCageDetailsServiceImpl.GetCarposition();
+ return bigStorageCageDetailsService.getCarposition();
}
@ApiOperation("鎵嬪姩瀹屾垚浠诲姟")
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java
index 33e2813..220ccab 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java
@@ -6,6 +6,8 @@
import com.mes.uppattenusage.entity.GlassInfo;
import org.apache.ibatis.annotations.Update;
+import java.util.List;
+
/**
* <p>
* Mapper 鎺ュ彛
@@ -25,4 +27,6 @@
BigStorageCageDetails SelectTemperingFeedSlot(GlassInfo glassInfo);
BigStorageCageDetails SelectOtherFeedSlot();
+
+ List<String> selectTemperingId();
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
index e0e19e3..4d4527c 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
@@ -15,9 +15,8 @@
* @since 2024-03-27
*/
public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> {
- List<Integer> GetCarposition();
+ public boolean getTemperingGlass();
- //鑾峰彇灏忚溅瀹炴椂浣嶇疆
-
+ List<Integer> getCarposition();
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
index 24d6c4f..0f0c840 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
@@ -21,5 +21,6 @@
* @since 2024-03-27
*/
public interface BigStorageCageService extends IService<BigStorageCage> {
-
+ public void updateRemainWidth(int Slot);
+ public BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails);
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index 1145f00..c1adf50 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -5,13 +5,9 @@
import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
import com.mes.bigstorage.mapper.BigStorageCageMapper;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
-import com.mes.uppattenusage.entity.GlassInfo;
-import com.mes.uppattenusage.mapper.GlassInfoMapper;
-import com.mes.uppattenusage.service.GlassInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
/**
@@ -23,6 +19,21 @@
* @since 2024-03-27
*/
@Service
-public abstract class BigStorageCageDetailsServiceImpl extends ServiceImpl<BigStorageCageDetailsMapper, BigStorageCageDetails> implements BigStorageCageDetailsService {
+public class BigStorageCageDetailsServiceImpl extends ServiceImpl<BigStorageCageDetailsMapper, BigStorageCageDetails> implements BigStorageCageDetailsService {
+ @Autowired
+ private BigStorageCageMapper bigStorageCageMapper;
+ @Override
+ public boolean getTemperingGlass(){
+ //鑾峰彇绗煎瓙鍐呮墍鏈夌増鍥惧彿
+ List<String> temperingIdList=bigStorageCageMapper.selectTemperingId();
+ for (String temperingId:temperingIdList
+ ) {
+ }
+ return true;
+ }
+ @Override
+ public List<Integer> getCarposition(){
+ return null;
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
index 3aebc01..ac3ee85 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -28,6 +28,7 @@
private BigStorageCageMapper bigStorageCageMapper;
@Autowired
private BigStorageCageDetailsMapper bigStorageCageDetailsMapper;
+ @Override
public BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) {
@@ -58,7 +59,8 @@
}
//淇敼鏍煎瓙鍓╀綑瀹藉害
- private void updateRemainWidth(int Slot){
+ @Override
+ public void updateRemainWidth(int Slot){
//鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅
int width=5000;
List<BigStorageCageDetails> bigStorageCageDetailsList= Collections.singletonList(bigStorageCageDetailsMapper.selectById(Slot));
@@ -69,4 +71,5 @@
//淇敼鏍煎瓙鍓╀綑瀹藉害
bigStorageCageMapper.UpdateRemainWidth(Slot,width);
}
+
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
index 92dd63a..203bcb8 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
@@ -1,11 +1,12 @@
package com.mes.component;
import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.bigstorage.service.impl.BigStorageCageServiceImpl;
+import com.mes.bigstorage.service.BigStorageCageDetailsService;
+import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
-import com.mes.temperingglass.service.impl.TemperingGlassInfoServiceImpl;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.uppattenusage.entity.GlassInfo;
-import com.mes.uppattenusage.service.impl.GlassInfoServiceImpl;
+import com.mes.uppattenusage.service.GlassInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
@@ -13,11 +14,13 @@
public class PlcStorageCage extends Thread {
@Autowired
- private BigStorageCageServiceImpl bigStorageCageServiceImpl;
+ private BigStorageCageService bigStorageCageService;
@Autowired
- private TemperingGlassInfoServiceImpl temperingGlassInfoServiceImpl;
+ private BigStorageCageDetailsService bigStorageCageDetailsService;
@Autowired
- private GlassInfoServiceImpl glassInfoServiceImpl;
+ private TemperingGlassInfoService temperingGlassInfoService;
+ @Autowired
+ private GlassInfoService glassInfoService;
@Override
public void run() {
while (this != null) {
@@ -30,29 +33,38 @@
if("1".equals(plcFeedReq)){
BigStorageCageDetails bigStorageCageDetails=new BigStorageCageDetails();
//浼犲叆鐜荤拑id
- GlassInfo glassInfo=glassInfoServiceImpl.getById(plcFeedGlassid);
+ GlassInfo glassInfo=glassInfoService.getById(plcFeedGlassid);
- BigStorageCageDetails SlotInfo=bigStorageCageServiceImpl.FeedGlass(glassInfo,bigStorageCageDetails);
+ BigStorageCageDetails SlotInfo=bigStorageCageService.FeedGlass(glassInfo,bigStorageCageDetails);
if(SlotInfo!=null){
- //鍙戦�佷换鍔＄粰Plc
+ //plc浠诲姟鍙戦�佸瓧
}
}
//鍑虹墖璇锋眰
String plcOutReq ="0";
+ boolean result=false;
if("1".equals(plcOutReq)){
//鑾峰彇閽㈠寲灏忕墖琛ㄦ湭鍑虹淇℃伅
- List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoServiceImpl.SelectTemperingGlassInfo();
+ List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.SelectTemperingGlassInfo();
//娌℃湁鍙嚭鐨勭幓鐠冩椂
if(temperingGlassInfoList!=null){
//鏌ヨ鏄惁鏈夊皬鐗囧叏閮ㄥ埌榻愮殑閽㈠寲鐗堝浘
+ result = bigStorageCageDetailsService.getTemperingGlass();
}else{
//缁х画褰撳墠閽㈠寲鐗堝浘鐨勪换鍔�
- temperingGlassInfoServiceImpl.addOutTask(temperingGlassInfoList);
+
+ temperingGlassInfoService.addOutTask(temperingGlassInfoList);
+ result=true;
+ }
+ if(result==true){
+ //plc浠诲姟鍙戦�佸瓧
}
}
+
+
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
index 69d497c..1a737e4 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -12,5 +14,6 @@
* @since 2024-03-27
*/
public interface TemperingGlassInfoService extends IService<TemperingGlassInfo> {
-
+ public void addOutTask(List<TemperingGlassInfo> temperingGlassInfoList);
+ public List<TemperingGlassInfo> SelectTemperingGlassInfo();
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index fd2bdf0..b9fa01f 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -19,6 +19,7 @@
@Service
public class TemperingGlassInfoServiceImpl extends ServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
+ @Override
public void addOutTask(List<TemperingGlassInfo> temperingGlassInfoList) {
double carwidth=5000;
double gay=50;
@@ -33,6 +34,7 @@
}
}
+ @Override
public List<TemperingGlassInfo> SelectTemperingGlassInfo() {
return null;
}
--
Gitblit v1.8.0