From fd8289ff75b2cae1d88e50795fc1e634fe05df64 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 四月 2024 11:04:17 +0800
Subject: [PATCH] 移动代码到新架构
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java | 9 ++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 19 ++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java | 36 ++++++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 7 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageMapper.java | 12 +++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 53 +++++++++++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 8 ++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/CacheVerticalClassModuleApplication.java | 1
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java | 4 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java | 62 +++++++++++++++
10 files changed, 208 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/CacheVerticalClassModuleApplication.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/CacheVerticalClassModuleApplication.java
index 263f81a..b559502 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/CacheVerticalClassModuleApplication.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/CacheVerticalClassModuleApplication.java
@@ -25,6 +25,5 @@
}catch (Exception e){
log.error(e.getMessage());
}
-
}
}
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 746b3ed..5f296d8 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
@@ -1,11 +1,17 @@
package com.mes.bigstorage.controller;
+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 io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* <p>
@@ -19,11 +25,37 @@
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {
- //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
+ private BigStorageCageServiceImpl bigStorageCageServiceImpl;
+ private BigStorageCageDetailsServiceImpl bigStorageCageDetailsServiceImpl;
+
+ //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
@ApiOperation("娴嬭瘯")
@GetMapping("/index")
public String index() {
return "hello world";
}
-}
+ @ApiOperation("鐞嗙墖绗间俊鎭�")
+ @GetMapping("/BigStorageCage")
+ public List<BigStorageCage> BigStorageCage() {
+ return bigStorageCageServiceImpl.list();
+ }
+
+ @ApiOperation("鐞嗙墖绗艰鎯�")
+ @GetMapping("/BigStorageCageDetails")
+ public List<BigStorageCageDetails> BigStorageCageDetails() {
+ return bigStorageCageDetailsServiceImpl.list();
+ }
+
+ @ApiOperation("灏忚溅瀹炴椂浣嶇疆")
+ @GetMapping("/CarPosition")
+ public List<Integer> CarPosition() {
+ return bigStorageCageDetailsServiceImpl.GetCarposition();
+ }
+
+ @ApiOperation("鎵嬪姩瀹屾垚浠诲姟")
+ @GetMapping("/FinishTask")
+ public void FinishTask(int type, int id) {
+ // bigStorageCageDetailsService.FinishTask();
+ }
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
index 852e1f5..a27e26f 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.bigstorage.entity.BigStorageCageDetails;
+import feign.Param;
/**
@@ -14,4 +15,7 @@
*/
public interface BigStorageCageDetailsMapper extends BaseMapper<BigStorageCageDetails> {
+ BigStorageCageDetails SelectTemperingFeedSlot(@Param("bigStorageCageDetails") BigStorageCageDetails bigStorageCageDetails);
+
+ BigStorageCageDetails SelectEmptyFeedSlot();
}
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 22a9d7b..33e2813 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
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.bigstorage.entity.BigStorageCage;
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.uppattenusage.entity.GlassInfo;
+import org.apache.ibatis.annotations.Update;
/**
* <p>
@@ -13,4 +16,13 @@
*/
public interface BigStorageCageMapper extends BaseMapper<BigStorageCage> {
+
+ BigStorageCageDetails SelectEmptyFeedSlot();
+
+ @Update("update big_storage_cage set remain_width = #{width} where slot=#{slot}")
+ public void UpdateRemainWidth(int slot,int width);
+
+ BigStorageCageDetails SelectTemperingFeedSlot(GlassInfo glassInfo);
+
+ BigStorageCageDetails SelectOtherFeedSlot();
}
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 ef46c59..e0e19e3 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
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.mapper.BigStorageCageMapper;
+
+import java.util.List;
/**
* <p>
@@ -12,5 +15,9 @@
* @since 2024-03-27
*/
public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> {
+ 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 00df15c..24d6c4f 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
@@ -2,6 +2,15 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.bigstorage.entity.BigStorageCage;
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
+import com.mes.bigstorage.mapper.BigStorageCageMapper;
+import com.mes.uppattenusage.entity.GlassInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
/**
* <p>
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 8949518..72fe082 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
@@ -3,9 +3,17 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.bigstorage.entity.BigStorageCageDetails;
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.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟瀹炵幇绫�
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 4c88df2..e992bec 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
@@ -2,9 +2,17 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.bigstorage.entity.BigStorageCage;
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
import com.mes.bigstorage.mapper.BigStorageCageMapper;
import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.uppattenusage.entity.GlassInfo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
/**
* <p>
@@ -16,5 +24,50 @@
*/
@Service
public class BigStorageCageServiceImpl extends ServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService {
+ @Autowired
+ private BigStorageCageMapper;
+ @Autowired
+ private BigStorageCageDetailsMapper bigStorageCageDetailsMapper;
+ public BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) {
+ BigStorageCageDetails bigStorageCageDetails=new ArrayList<>();
+
+ //鑾峰彇鍚岄挗鍖栫増鍥緄d鍙繘鐗囩殑鏍煎瓙
+ BigStorageCageDetails layoutSlotInfo =bigStorageCageMapper.SelectTemperingFeedSlot(glassInfo);
+ //鏈夌鍚堟潯浠剁殑鏍煎瓙鏃�
+ if (layoutSlotInfo!=null) {
+ //灏嗙幓鐠冧俊鎭～鍏ョ悊鐗囩璇︽儏琛�
+ bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
+ }else{
+ //鑾峰彇涓嶅埌鏃讹細
+
+ //鑾峰彇鍙繘鐗囨牸瀛愪俊鎭�
+ BigStorageCageDetails EmptySlotInfo=bigStorageCageMapper.SelectEmptyFeedSlot();
+ if (EmptySlotInfo!=null){
+ bigStorageCageDetails.setSlot(EmptySlotInfo.getSlot());
+ }else{
+ //鑾峰彇鍏朵粬绗兼牸瀛�-
+ BigStorageCageDetails OtherSlotInfo=bigStorageCageMapper.SelectOtherFeedSlot();
+ bigStorageCageDetails.setSlot(OtherSlotInfo.getSlot());
+ }
+ //灏嗙幓鐠冧俊鎭斁鍏ヨ鏍煎瓙
+
+ }
+
+ updateRemainWidth(bigStorageCageDetails.getSlot());
+ return bigStorageCageDetails;
+ }
+
+ //淇敼鏍煎瓙鍓╀綑瀹藉害
+ private void updateRemainWidth(int Slot){
+ //鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅
+ int width=5000;
+ List<BigStorageCageDetails> bigStorageCageDetailsList= Collections.singletonList(bigStorageCageDetailsMapper.selectById(Slot));
+ for (BigStorageCageDetails bigStorageCageDetails:bigStorageCageDetailsList
+ ) {
+ width-=Integer.parseInt(bigStorageCageDetails.getWidth().toString())+bigStorageCageDetails.getGap();
+ }
+ //淇敼鏍煎瓙鍓╀綑瀹藉害
+ 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
new file mode 100644
index 0000000..92dd63a
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java
@@ -0,0 +1,62 @@
+package com.mes.component;
+
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.service.impl.BigStorageCageServiceImpl;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.impl.TemperingGlassInfoServiceImpl;
+import com.mes.uppattenusage.entity.GlassInfo;
+import com.mes.uppattenusage.service.impl.GlassInfoServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+public class PlcStorageCage extends Thread {
+
+ @Autowired
+ private BigStorageCageServiceImpl bigStorageCageServiceImpl;
+ @Autowired
+ private TemperingGlassInfoServiceImpl temperingGlassInfoServiceImpl;
+ @Autowired
+ private GlassInfoServiceImpl glassInfoServiceImpl;
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
+
+ Thread.sleep(500);
+ String plcFeedReq ="0";
+ String plcFeedGlassid ="111";
+ //Plc杩涚墖璇锋眰鏃�
+ if("1".equals(plcFeedReq)){
+ BigStorageCageDetails bigStorageCageDetails=new BigStorageCageDetails();
+ //浼犲叆鐜荤拑id
+ GlassInfo glassInfo=glassInfoServiceImpl.getById(plcFeedGlassid);
+
+ BigStorageCageDetails SlotInfo=bigStorageCageServiceImpl.FeedGlass(glassInfo,bigStorageCageDetails);
+ if(SlotInfo!=null){
+ //鍙戦�佷换鍔＄粰Plc
+ }
+ }
+
+ //鍑虹墖璇锋眰
+ String plcOutReq ="0";
+ if("1".equals(plcOutReq)){
+ //鑾峰彇閽㈠寲灏忕墖琛ㄦ湭鍑虹淇℃伅
+ List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoServiceImpl.SelectTemperingGlassInfo();
+ //娌℃湁鍙嚭鐨勭幓鐠冩椂
+ if(temperingGlassInfoList!=null){
+ //鏌ヨ鏄惁鏈夊皬鐗囧叏閮ㄥ埌榻愮殑閽㈠寲鐗堝浘
+ }else{
+ //缁х画褰撳墠閽㈠寲鐗堝浘鐨勪换鍔�
+ temperingGlassInfoServiceImpl.addOutTask(temperingGlassInfoList);
+ }
+ }
+
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+}
\ No newline at end of file
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 e233e1a..d6f1b62 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
@@ -6,6 +6,8 @@
import com.mes.temperingglass.service.TemperingGlassInfoService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -17,4 +19,21 @@
@Service
public class TemperingGlassInfoServiceImpl extends ServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
+ public void addOutTask(List<TemperingGlassInfo> temperingGlassInfoList) {
+ double carwidth=5000;
+ double gay=50;
+ //鍐欏叆浠诲姟鍒颁换鍔¤〃
+ for (TemperingGlassInfo temperingGlassInfo:temperingGlassInfoList
+ ) {
+ if((carwidth-gay-temperingGlassInfo.getWidth())>0){
+ //娣诲姞浠诲姟鍒颁换鍔¤〃
+ }else{
+ break;
+ }
+ }
+ }
+
+ public List<TemperingGlassInfo> SelectTemperingGlassInfo() {
+
+ }
}
--
Gitblit v1.8.0