From d95bb591d97f82a93407e383e72a9ff159407434 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 22 四月 2024 13:24:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 21 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeDetailServiceImpl.java | 3
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 30 ++-
UI-Project/src/assets/shangpianji.png | 0
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 22 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 7
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 19 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java | 8
/dev/null | 51 ------
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 52 +++++-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java | 38 +++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeDetailService.java | 3
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 16 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 68 ++++---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeDetailMapper.java | 5
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 38 +---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 21 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml | 15 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java | 5
20 files changed, 263 insertions(+), 161 deletions(-)
diff --git a/UI-Project/src/assets/shangpianji.png b/UI-Project/src/assets/shangpianji.png
new file mode 100644
index 0000000..fb645ca
--- /dev/null
+++ b/UI-Project/src/assets/shangpianji.png
Binary files differ
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeDetailMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeDetailMapper.java
index b73f34e..59ed7a3 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeDetailMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeDetailMapper.java
@@ -1,6 +1,8 @@
package com.mes.pp.mapper;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
import com.mes.pp.entity.OptimizeDetail;
import org.apache.ibatis.annotations.Mapper;
@@ -12,7 +14,8 @@
* @author zhoush
* @since 2024-04-16
*/
+@DS("pp")
@Mapper
-public interface OptimizeDetailMapper extends BaseMapper<OptimizeDetail> {
+public interface OptimizeDetailMapper extends MPJBaseMapper<OptimizeDetail> {
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeDetailService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeDetailService.java
index 3cd12bc..cb8aee3 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeDetailService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeDetailService.java
@@ -1,6 +1,7 @@
package com.mes.pp.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.pp.entity.OptimizeDetail;
/**
@@ -11,6 +12,6 @@
* @author zhoush
* @since 2024-04-16
*/
-public interface OptimizeDetailService extends IService<OptimizeDetail> {
+public interface OptimizeDetailService extends MPJBaseService<OptimizeDetail> {
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeDetailServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeDetailServiceImpl.java
index 81df3f4..3259c58 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeDetailServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeDetailServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
import com.mes.pp.entity.OptimizeDetail;
import com.mes.pp.mapper.OptimizeDetailMapper;
import com.mes.pp.service.OptimizeDetailService;
@@ -17,6 +18,6 @@
*/
@Service
@DS("pp")
-public class OptimizeDetailServiceImpl extends ServiceImpl<OptimizeDetailMapper, OptimizeDetail> implements OptimizeDetailService {
+public class OptimizeDetailServiceImpl extends MPJBaseServiceImpl<OptimizeDetailMapper, OptimizeDetail> implements OptimizeDetailService {
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
index d7a94c3..defc8cb 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
@@ -1,6 +1,7 @@
package com.mes.edgstoragecage.controller;
import com.mes.edgstoragecage.entity.EdgStorageCage;
+import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
import com.mes.taskcache.entity.TaskCache;
@@ -24,7 +25,7 @@
* @author zhoush
* @since 2024-04-07
*/
-@Api("纾ㄨ竟鍓嶇紦瀛�")
+@Api(tags = "鐞嗙墖绗肩紦瀛�")
@RestController
@RequestMapping("/edgStorageCage")
public class EdgStorageCageController {
@@ -56,7 +57,7 @@
@ApiOperation("鍒犻櫎纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��")
@PostMapping("/deleteEdgStorageCage")
@ResponseBody
- public Result deleteEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
+ public Result deleteEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage, EdgStorageCageDetails edgStorageCageDetails) {
boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
return Result.build(200,"鍒犻櫎鎴愬姛",1);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
index af0ffe8..5b217ed 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.mes.pp.entity.OptimizeDetail;
import java.util.List;
import java.util.Map;
@@ -19,15 +20,24 @@
/**
* 璇嗗埆 鐮存崯/鎷胯蛋
- * @param glassid
+ * @param glassId
* @param ControlsId
* @return
*/
- boolean identWorn(String glassid,int ControlsId);
- //鑾峰彇 鍒囧壊褰撳墠鐗堝浘
- List<Map> selectCutTerritory();
- //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
- List<Map> selectCurrentCutTerritory(String current);
+ boolean identWorn(String glassId,int ControlsId);
+
+ /**
+ * 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ * @return
+ */
+ List<OptimizeDetail> selectCutTerritory();
+
+ /**
+ * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ * @param current
+ * @return
+ */
+ List<OptimizeDetail> selectCurrentCutTerritory(String current);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
index 4e16726..a8309dc 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
@@ -17,15 +17,28 @@
*/
public interface EdgStorageCageService extends MPJBaseService<EdgStorageCage> {
- //鏌ヨ绗煎唴绌烘牸
+ /**
+ * 鏌ヨ绗煎唴绌烘牸
+ * @return
+ */
List<Map> selectCacheEmpty();
- //鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
+ /**
+ * 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
+ * @return
+ */
List<Map> selectCacheOut();
- //鏌ヨ绗煎唴璇︽儏
+ /**
+ * 鏌ヨ绗煎唴璇︽儏
+ * @return
+ */
List<Map> selectEdgStorageCages();
- //淇敼鐞嗙墖绗煎唴淇℃伅
+ /**
+ * 淇敼鐞嗙墖绗煎唴淇℃伅
+ * @param edgStorageCage
+ * @return
+ */
boolean updateEdgStorageCage(EdgStorageCage edgStorageCage);
}
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 e5339fb..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,15 +1,13 @@
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.github.yulichang.wrapper.interfaces.LambdaJoin;
-import com.mes.edgstoragecage.entity.EdgStorageCage;
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;
@@ -30,44 +28,52 @@
@Autowired
UpPattenUsageMapper upPattenUsageMapper;
+ @Autowired
+ OptimizeDetailMapper optimizeDetailMapper;
- //璇嗗埆 鐮存崯/鎷胯蛋
- public boolean identWorn(String glassid, int ControlsId) {
- List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ /**
+ * 璇嗗埆 鎷胯蛋: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) {
- baseMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ 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 = upPattenUsageMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
- .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
- .select("gi.x_coordinate","gi.y_coordinate","gi.tempering_feed_sequence")
- .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.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 = baseMapper.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;
+ public List<OptimizeDetail> selectCurrentCutTerritory(String current) {
+ return optimizeDetailMapper.selectList(new QueryWrapper<OptimizeDetail>().eq("project_no", current));
}
;
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index e863425..ee05420 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -33,44 +33,54 @@
@Autowired
UpPattenUsageMapper upPattenUsageMapper;
+ /**
+ * 鏌ヨ绗煎唴绌烘牸
+ * @return
+ */
@Override
- //鏌ヨ绗煎唴绌烘牸
public List<Map> selectCacheEmpty(){
- List<Map> map=baseMapper.selectJoinList(
+ return baseMapper.selectJoinList(
Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
.isNull("escd.slot")
);
- return map;
}
+ /**
+ * 鏌ヨ绗煎唴鍑虹墖浠诲姟 鎸夐挗鍖栫増鍥惧彿+鐗堝浘鍐呭簭鍙�
+ * @return
+ */
@Override
- //鏌ヨ绗煎唴鍑虹墖浠诲姟 鎸夐挗鍖栫増鍥惧彿+鐗堝浘鍐呭簭鍙�
public List<Map> selectCacheOut(){
- List<Map> list= upPattenUsageMapper.selectJoinList(
+ return upPattenUsageMapper.selectJoinList(
Map.class,new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
.isNotNull("escd.slot")
.orderByAsc("escd.tempering_layout_id","escd.tempering_feed_sequence")
);
- return list;
}
+ /**
+ * 鐞嗙墖缂撳瓨璇︽儏
+ * @return
+ */
@Override
- //鐞嗙墖缂撳瓨璇︽儏
public List<Map> selectEdgStorageCages(){
- List<Map> map=baseMapper.selectJoinList(
+ return baseMapper.selectJoinList(
Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
);
- return map;
}
+ /**
+ * 淇敼鐞嗙墖绗煎唴淇℃伅 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
+ * @param edgStorageCage
+ * @return
+ */
@Override
- //淇敼鐞嗙墖绗煎唴淇℃伅 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage){
baseMapper.updateById(edgStorageCage);
return true;
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
index 5a78021..78b491f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
@@ -3,6 +3,7 @@
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +23,7 @@
* @author zhoush
* @since 2024-04-07
*/
+@Api(tags = "鐜荤拑淇℃伅灏忕墖")
@RestController
@RequestMapping("/glassInfo")
public class GlassInfoController {
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index 081732b..7e387a2 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -120,12 +120,17 @@
/**
* 宸ョ▼鍙�
*/
- private Integer engineerId;
+ private String engineerId;
/**
* 鐢熶骇瑙勫垯id
*/
private Integer ruleId;
+ /**
+ * 鐜荤拑ID
+ */
+ private String glassId;
+
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
index ed5b84a..f5117b0 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
@@ -15,7 +15,23 @@
*/
public interface GlassInfoService extends IService<GlassInfo> {
+ /**
+ * 鏌ヨ鎵�鏈夌幓鐠冨皬鐗囦俊鎭�
+ * @return
+ */
public List<GlassInfo> selectAll();
+
+ /**
+ * 鏍规嵁鐜荤拑缂栧彿鏌ヨ鐜荤拑灏忕墖淇℃伅
+ * @param glassId
+ * @return
+ */
public List<GlassInfo> selectId(String glassId);
+
+ /**
+ * 鏍规嵁宸ョ▼鍙锋煡璇㈢幓鐠冨皬鐗囦俊鎭�
+ * @param flowCardId
+ * @return
+ */
public List<GlassInfo> selectFlowCardId(String flowCardId);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index a874049..f62e9ca 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -23,21 +23,32 @@
public class GlassInfoServiceImpl extends ServiceImpl<GlassInfoMapper, GlassInfo> implements GlassInfoService {
- //鏍规嵁ID 鑾峰彇灏忕墖鏁版嵁
+ /**
+ * 鏍规嵁ID 鑾峰彇灏忕墖鏁版嵁
+ * @param glassId
+ * @return
+ */
@Override
public List<GlassInfo> selectId(String glassId){
- return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("id",glassId));
+ return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("glass_id",glassId));
};
- //鑾峰彇鍏ㄩ儴灏忕墖鏁版嵁
+ /**
+ * 鑾峰彇鍏ㄩ儴灏忕墖鏁版嵁
+ * @return
+ */
@Override
public List<GlassInfo> selectAll(){
return baseMapper.selectList(null);
};
- //鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
+ /**
+ * 鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
+ * @param flowCardId
+ * @return
+ */
@Override
public List<GlassInfo> selectFlowCardId(String flowCardId){
- return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("flowCardId",flowCardId));
+ return baseMapper.selectList(new QueryWrapper<GlassInfo>().eq("flow_card_id",flowCardId));
};
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
index 9634f19..fae360b 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -2,11 +2,11 @@
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.edgstoragecage.service.EdgStorageCageService;
-import com.mes.edgstoragecage.service.impl.EdgStorageCageDetailsServiceImpl;
-import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
-import com.mes.taskcache.service.HangzhoumesService;
-import com.mes.taskcache.service.PpService;
+import com.mes.pp.entity.OptimizeDetail;
+import com.mes.taskcache.entity.TaskCache;
+import com.mes.taskcache.service.TaskCacheService;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,6 +22,7 @@
* @author zhoush
* @since 2024-04-07
*/
+@Api(tags = "璇嗗埆鏄剧ず")
@RestController
@RequestMapping("/taskCache")
public class TaskCacheController {
@@ -30,30 +31,25 @@
private EdgStorageCageDetailsService edgStorageCageDetailsService;
@Autowired
- private HangzhoumesService hangzhoumesService;
+ private EdgStorageCageService edgStorageCageService;
+ @Autowired
+ private TaskCacheService taskCacheService;
@ApiOperation("鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
@PostMapping("/cutTerritory")
@ResponseBody
public Result cutTerritory(String current) {
- List<Map> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
+ List<OptimizeDetail> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
return Result.build(200,"鎴愬姛",h);
}
@ApiOperation("璇嗗埆鏄剧ず 褰撳墠鐗堝浘 鍙傛暟()")
@PostMapping("/currentCutTerritory")
@ResponseBody
public Result currentCutTerritory() {
- List<Map> h = edgStorageCageDetailsService.selectCutTerritory();
+ List<OptimizeDetail> h = edgStorageCageDetailsService.selectCutTerritory();
return Result.build(200,"鎴愬姛",h);
}
- @ApiOperation("璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘 鍙傛暟(鐗堝浘缂栧彿)")
- @PostMapping("/selectCutTerritory")
- @ResponseBody
- public Result selectCutTerritory(String TerritoryId) {
- List<Map> h = edgStorageCageDetailsService.selectCutTerritory();
- return Result.build(200,"鎴愬姛",h);
- }
- @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[0:鐮存崯锛�1锛氭嬁璧癩锛�")
+ @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[200锛氭嬁璧帮紝201:鐮存崯]锛�")
@PostMapping("/identControls")
@ResponseBody
public Result identControls(@RequestParam(name = "identId", required = false) String identId,@RequestParam(name = "controlsId", required = false) int controlsId) {
@@ -61,18 +57,12 @@
boolean issucess = edgStorageCageDetailsService.identWorn(identId,controlsId);
return Result.build(200,"鎴愬姛",issucess);
}
- @ApiOperation("鏌ヨ绗煎唴淇℃伅 鍙傛暟()")
- @PostMapping("/selectCageInfo")
- @ResponseBody
- public Result selectCageInfo() {
- List<Map> h = hangzhoumesService.SelectCageInfo();
- return Result.build(200,"鎴愬姛",h);
- }
+
@ApiOperation("纾ㄨ竟浠诲姟 鍙傛暟()")
@PostMapping("/selectEdgTask")
@ResponseBody
- public Result selectEdgTask(String ProcessId) {
- List<Map> EdgTasks = hangzhoumesService.SelectEdgInfo("1");
+ public Result selectEdgTask(String line) {
+ List<TaskCache> EdgTasks = taskCacheService.selectEdgInfo(line);
return Result.build(200,"鎴愬姛",EdgTasks);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java
index acd8f83..e4b9286 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java
@@ -7,9 +7,9 @@
@TableName("task_cache")
public class TaskCache {
private String ID;//浠诲姟缂栧彿
- private String startcell;//璧峰
- private String endcell;//缁撴潫
- private String tasktype;//浠诲姟绫诲瀷
- private String taskstauts;//浠诲姟鐘舵��
+ private String startCell;//璧峰
+ private String endCell;//缁撴潫
+ private String taskType;//浠诲姟绫诲瀷
+ private String taskStatus;//浠诲姟鐘舵��
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/mapper/HangzhouMesMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/mapper/HangzhouMesMapper.java
deleted file mode 100644
index ab38e20..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/mapper/HangzhouMesMapper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.mes.taskcache.mapper;
-
-
-import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
-import com.mes.glassinfo.entity.GlassInfo;
-import com.mes.taskcache.entity.TaskCache;
-import org.apache.ibatis.annotations.*;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface HangzhouMesMapper {
-
- // 鐜荤拑淇℃伅 鎸塈D鏌ヨ
- @Select("select * from `glass_info` where id=#{id}")
- GlassInfo selectGlassId(String id);
-
- // 鏌ヨ纾ㄨ竟淇℃伅
- @Select("select * from task_cache where task_type='2' and task_stauts='2' and end_cell=#{EndCell}")
- List<Map> selectEdgInfo(String EndCell);
-
- // 鏌ヨ绗煎瓙鍐呯┖闂�
- @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is null order by escd.slot")
- List<EdgStorageCageDetails> selectCacheLeisure();
-
- // 鏌ヨ绗煎瓙鍐呭嚭鐗囦换鍔�
- @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot WHERE escd.slot IS NOT NULL order by escd.tempering_layout_id,escd.tempering_feed_sequence")
- List<EdgStorageCageDetails> selectCacheOut();
-
- // 鏌ヨ绗煎瓙鍐呬俊鎭�
- @Select("select esc.*,escd.id as detailsID,escd.device_id as details_device_id,escd.glass_id,escd.sequence,escd.flow_card_id,escd.glass_type,escd.width,escd.height,escd.thickness,escd.edg_width,escd.edg_height,escd.tempering_layout_id,escd.tempering_feed_sequence,escd.pattern_sequence,escd.state,escd.gap from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot order by esc.slot")
- List<Map> selectCachInfo();
-
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
- @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id=#{tempering_layout_id} and escd.tempering_feed_sequence<#{tempering_feed_sequence} and esc.remain_width-#{width}>0 order by escd.tempering_feed_sequence")
- List<EdgStorageCageDetails> selectIsExistIntoCache(Integer tempering_layout_id, Integer tempering_feed_sequence, double width);
-
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
- @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id<#{tempering_layout_id} and esc.remain_width-#{width}>0 order by escd.tempering_layout_id desc,escd.tempering_feed_sequence")
- List<EdgStorageCageDetails> selectIsExistIntoCache(Integer tempering_layout_id, double width);
-
- // 鏌ヨ鍏ㄩ儴浠诲姟
- @Select("select * from task_cache")
- List<TaskCache> selectCacheInfoAll();
-
- // 鏌ヨ杩涚墖浠诲姟
- @Select("select * from task_cache where task_type='1' and task_stauts='0'")
- List<TaskCache> selectInputCacheInfo();
-
- // 鏌ヨ鍑虹墖浠诲姟
- @Select("select * from task_cache where task_type='2' and task_stauts='0'")
- List<TaskCache> selectOutCacheInfo();
-
- // 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
- @Select("select * from task_cache where task_type='2' and task_stauts='2' and end_cell=#{EndCell} limit 1")
- GlassInfo selectLastOutCacheInfo(String EndCell);
-
- // 淇敼绗煎瓙鍐呬俊鎭�
- @Update("update")
- Integer updateCache(@Param("id") Integer id, @Param("order_id") String order_id);
-
- // 娣诲姞鐞嗙墖浠诲姟
- @Insert("INSERT into task_cache VALUES(#{id},#{start},#{end},#{type},0)")
- Integer insertCacheTask(String id, String start, String end, String type);
-
- //
- // @Insert("INSERT `order`(order_id)VALUES(#{order_id})")
- // Integer insert(Order order);
- //
- // @Delete("delete from `order` where id=#{id}")
- // Integer deleteById(@Param("id") Integer id);
- //
- // @Update("update `order` set order_id=#{order_id} where id=#{id}")
- // Integer update(@Param("id") Integer id,@Param("order_id") String order_id);
-}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/mapper/PpMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/mapper/PpMapper.java
deleted file mode 100644
index 8f2c0dc..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/mapper/PpMapper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.mes.taskcache.mapper;
-
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-import java.util.Map;
-
-//
-//@DS("pp")
-@Mapper
-public interface PpMapper {
-
-// // 閽㈠寲鎸夊伐绋嬫煡璇�
-// @Select("select * from `v_optimize_heat_layout` where project_no=#{projeceid} ")
-// List<Tempered> selectTemperedTerritory(String projeceid);
-
- // 鍒囧壊鐗堝浘 鎸夊伐绋�,鐗堝浘缂栧彿鏌ヨ
- @Select("select * from optimize_detail where project_no=#{projeceid} and stock_id=#{TerritoryId}")
- List<Map> selectCutTerritory(String projeceid, String TerritoryId);
-
- // 鍒囧壊鐗堝浘 鎸夊伐绋嬫煡璇�
- @Select("select * from optimize_detail where project_no=#{projeceid} ")
- List<Map> selectCutTerritory(String projeceid);
-
- //
- // @Insert("INSERT `order`(order_id)VALUES(#{order_id})")
- // Integer insert(Order order);
- //
- // @Delete("delete from `order` where id=#{id}")
- // Integer deleteById(@Param("id") Integer id);
- //
- // @Update("update `order` set order_id=#{order_id} where id=#{id}")
- // Integer update(@Param("id") Integer id,@Param("order_id") String order_id);
-}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/HangzhoumesService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/HangzhoumesService.java
deleted file mode 100644
index 7c59022..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/HangzhoumesService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.mes.taskcache.service;
-
-
-import com.mes.glassinfo.entity.GlassInfo;
-import com.mes.taskcache.mapper.HangzhouMesMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class HangzhoumesService {
-
- @Autowired
- private HangzhouMesMapper hangzhouMesMapper;
-
- //鏍规嵁缂栧彿 鏌ユ壘鐜荤拑灏忕墖淇℃伅
- public GlassInfo getUserInfo(String process_id) {
- return hangzhouMesMapper.selectGlassId(process_id);
- }
-
- //鐞嗙墖缂撳瓨 绗煎唴淇℃伅
- public List<Map> SelectCageInfo() {
- return hangzhouMesMapper.selectCachInfo();
- }
-
- //纾ㄨ竟灏忕墖淇℃伅
- public List<Map> SelectEdgInfo(String line) {
- return hangzhouMesMapper.selectEdgInfo(line);
- }
-
-
-}
-
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java
deleted file mode 100644
index 5dc3f77..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.mes.taskcache.service;
-
-import java.util.List;
-
-import com.mes.common.PLCAutoMes;
-import com.mes.common.PlcParameterObject;
-//import com.mes.common.S7object;
-import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
-import com.mes.glassinfo.entity.GlassInfo;
-import com.mes.taskcache.mapper.HangzhouMesMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-
-
-
-@Service
-public class LogicService {
- @Autowired
- private HangzhouMesMapper hangzhouMesMapper;
-
-// //鐞嗙墖
-// public void Process(){
-// String Result= S7object.getinstance().plccontrol.ReadWord("DB14.0", 1).get(0)+"";
-// String Number=S7object.getinstance().plccontrol.ReadWord("DB14.2", 1).get(0)+"";
-// if(Result=="1"){//杩涚墖璇锋眰
-// processInto(Number);
-// }else if(Result=="2"){//鍑虹墖璇锋眰
-// processOut();
-// }else if(Result=="3"){//杩涘嚭鐗囪姹�
-// if (!processOut()) { //鍏堝嚭鍚庤繘
-// processInto(Number);
-// }
-// }
-// }
-// //鐞嗙墖 杩�
-// public boolean processInto(String Number){
-// //鏌ヨ娑堟伅闃熷垪閲岀殑鐜荤拑
-// GlassInfo GlassInfo=hangzhouMesMapper.selectGlassId(Number);
-// PlcParameterObject plcmes= PLCAutoMes.PlcMesObject;
-// if(GlassInfo!=null){//瀛樺湪姝ょ幓鐠冪紪鍙�
-// //鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿
-// List<EdgStorageCageDetails> list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperingLayoutId(),GlassInfo.getTemperingFeedSequence(),GlassInfo.getWidth());
-// //绌烘爡鏍煎彿
-// if (list.size()==0) {
-// list=hangzhouMesMapper.selectCacheLeisure();
-// }
-// //灏忎簬姝ょ幓鐠冮挗鍖栫増鍥惧簭鍙风殑鏍呮牸鍙�
-// if(list.size()==0){
-// list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperingLayoutId(),GlassInfo.getWidth());
-// }
-// if(list.size()>0){
-// //瀛樺湪绌烘牸
-// //1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
-// //2.鍥炲 1杩涚墖
-// EdgStorageCageDetails item=list.get(0);
-// hangzhouMesMapper.insertCacheTask(GlassInfo.getId()+"","0",item.getSlot()+"","1");
-// S7object.getinstance().plccontrol.WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
-// return true;
-// }
-//
-// }else{
-// // ID缂栧彿涓嶅瓨鍦� 涓嶅鐞�/鍥炲PLC 杩涜鎶ヨ鎻愮ず
-// }
-// //杩斿洖缁撴灉
-// return false;
-// }
-// //鐞嗙墖 鍑�
-// public boolean processOut(){
-// //鏌ヨ浠诲姟
-// String A09=S7object.getinstance().plccontrol.ReadWord("DB14.56", 1).get(0)+"";
-// String A10=S7object.getinstance().plccontrol.ReadWord("DB14.58", 1).get(0)+"";
-// PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
-// List<EdgStorageCageDetails> list=hangzhouMesMapper.selectCacheOut();
-// boolean isOut=true;//鍏朵粬鎯呭喌鏉′欢 濡傦細鍚庣画璁惧鏁呴殰绂佹鐞嗙墖鍑虹墖 绛�
-// if (list.size()>0&&isOut) {
-// EdgStorageCageDetails item=list.get(0);
-// if(A09=="0"&&A10=="1"){
-// //鍑哄埌 A09
-// hangzhouMesMapper.insertCacheTask(item.getGlassid()+"","0","09","2");
-// S7object.getinstance().plccontrol.writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "1");
-// S7object.getinstance().plccontrol.writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
-// return true;
-// }else if(A09=="1"&&A10=="0"){
-// //鍑哄埌 A10
-// hangzhouMesMapper.insertCacheTask(item.getGlassid()+"","0","10","2");
-// S7object.getinstance().plccontrol.writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "2");
-// S7object.getinstance().plccontrol.writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
-// return true;
-// }else if(A09=="0"&&A10=="0"){
-// //閮藉厑璁� A09/A10 涓婁竴鐗囨槸鍚﹀拰姝ょ墖鐜荤拑灏哄灏哄鐩稿悓
-// String endcell="09";
-// String SendEndcell="1";
-// boolean If_=false;
-// GlassInfo glassInfo09= hangzhouMesMapper.selectLastOutCacheInfo("09");
-// GlassInfo glassInfo10= hangzhouMesMapper.selectLastOutCacheInfo("10");
-// if(glassInfo10!=null&&glassInfo10.getWidth()==item.getWidth()&&glassInfo10.getHeight()==item.getHeight()){
-// endcell="10";
-// SendEndcell="2";
-// }else if(glassInfo10!=null&&If_){
-// //鍏朵粬鏉′欢
-// }
-// hangzhouMesMapper.insertCacheTask(item.getGlassid()+"","0",endcell,"2");
-// S7object.getinstance().plccontrol.writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
-// S7object.getinstance().plccontrol.writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
-// return true;
-// }
-// }
-// //杩斿洖缁撴灉
-// return false;
-// }
-
-// //纾ㄨ竟 涓嶄氦浜� 鐞嗙墖鍜岀（杈规満鑷繁浜や簰
-// public void processMb(String Number){
-// //鏌ヨ浠诲姟
-// GlassInfo GlassInfo=hangzhouMesMapper.selectGlassId(Number);
-// PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
-// if(GlassInfo!=null){
-// //鍙戦�佷换鍔� ID 闀� 瀹� 鍘� 鍊掕 宸ヨ壓鍔熻兘绛�
-// S7object.getinstance().plccontrol.getinstance().writeString(plcmes.getPlcParameter("DB14.22").getAddress(),"N10000");
-// S7object.getinstance().plccontrol.getinstance().writeString(plcmes.getPlcParameter("DB14.24").getAddress(), "1000");
-// S7object.getinstance().plccontrol.getinstance().writeString(plcmes.getPlcParameter("DB14.26").getAddress(),"800");
-// S7object.getinstance().plccontrol.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(),"60");
-// S7object.getinstance().plccontrol.getinstance().writeString(plcmes.getPlcParameter("DB14.30").getAddress(), "2");
-// S7object.getinstance().plccontrol.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
-// }
-// //杩斿洖缁撴灉
-// }
-
- //鏌ヨ娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
- public boolean SelectMessageId(String num){
- //鏌ヨ鏄惁瀛樺湪
- GlassInfo glassInfo=hangzhouMesMapper.selectGlassId(num);
- if(glassInfo==null){
- return false;//杩斿洖 涓嶅瓨鍦�
- }
- return true;//杩斿洖 瀛樺湪
- }
- //鍒犻櫎娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
- public boolean DeleteMessageId(String num){
- //鏌ヨ鏄惁瀛樺湪
- GlassInfo glassInfo=hangzhouMesMapper.selectGlassId(num);
- if(glassInfo==null){
- return false;//杩斿洖 涓嶅瓨鍦�
- }
- return true;//杩斿洖 瀛樺湪
- }
-
- //鏄惁瀛樺湪姝ょ紪鍙风幓鐠�
- public boolean isExist(String num){
- //鏌ヨ鏄惁瀛樺湪
- GlassInfo glassInfo=hangzhouMesMapper.selectGlassId(num);
- if(glassInfo==null){
- return false;//杩斿洖 涓嶅瓨鍦�
- }
- return true;//杩斿洖 瀛樺湪
- }
-
-}
-
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/PpService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/PpService.java
deleted file mode 100644
index d6b8f14..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/PpService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mes.taskcache.service;
-
-
-import com.mes.taskcache.mapper.HangzhouMesMapper;
-import com.mes.taskcache.mapper.PpMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class PpService {
-
- @Autowired
- private PpMapper selectInfoMapper;
- @Autowired
- private HangzhouMesMapper hangzhouMesMapper;
-
- // public GlassInfo getUserInfo(String process_id){
- // return hangzhouMesMapper.selectGlassId(process_id);
- // }
-
-// public List<Tempered> selectTemperedTerritory(String process_id){
-// return selectInfoMapper.selectTemperedTerritory(process_id);
-// }
-
- //鍒囧壊鐗堝浘 褰撳墠璇嗗埆鐗堝浘
- public List<Map> selectCutTerritory() {
- //寰楀埌瑕佹樉绀虹殑 宸ョ▼ID 浠ュ強鐗堝浘ID
- //1.鍦℉angzhoumes鏁版嵁搴撻噷 寰楀埌鐩墠宸茬粡 棰嗗彇浣嗘湭瀹屾垚鐨� 宸ョ▼ID闆嗗悎
- //2.鎷垮伐绋嬮泦鍚堝幓PP鏁版嵁搴撻噷 寰楀埌瀵瑰簲鐨勫皬鐗囬泦鍚�
- //3.鎷垮搴旂殑灏忕墖闆嗗悎 涓� 缂撳瓨浠诲姟琛ㄨ繘琛屽姣� 鏌ユ壘涓嬩竴鐗堝浘鏄剧ず
- String process_id = "P24032204";
- String territory_id = "1";
- return selectInfoMapper.selectCutTerritory(process_id, territory_id);
- }
-
- //鍒囧壊鐗堝浘 鏍规嵁宸ョ▼鍙锋煡璇� 鎵�鏈夌増鍥惧皬鐗囨暟鎹�
- public List<Map> selectCutTerritory(String process_id) {
- return selectInfoMapper.selectCutTerritory(process_id);
- }
-
- //鍒囧壊鐗堝浘 鏍规嵁宸ョ▼鍙�,鐗堝浘缂栧彿鏌ヨ 鐗堝浘缂栧彿閲屾墍鏈夊皬鐗囨暟鎹�
- public List<Map> selectCutTerritory(String process_id, String TerritoryId) {
- return selectInfoMapper.selectCutTerritory(process_id, TerritoryId);
- }
-
-
-}
-
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
index 4698582..74fb475 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
@@ -15,24 +15,48 @@
*/
public interface TaskCacheService extends IService<TaskCache> {
- //娣诲姞鐞嗙墖绗间换鍔�
+ /**
+ * 娣诲姞鐞嗙墖绗间换鍔�
+ * @param taskCache
+ * @return
+ */
boolean insertTaskCache(TaskCache taskCache);
- //鏌ヨ纾ㄨ竟浠诲姟
+ /**
+ * 鏌ヨ纾ㄨ竟浠诲姟
+ * @param line
+ * @return
+ */
List<TaskCache> selectEdgInfo(String line);
- //鏌ヨ鐞嗙墖浠诲姟
+ /**
+ * 鏌ヨ鐞嗙墖浠诲姟
+ * @return
+ */
List<TaskCache> selectCacheInfo();
- //鏌ヨ鍏ㄩ儴浠诲姟
+ /**
+ * 鏌ヨ鍏ㄩ儴浠诲姟
+ * @return
+ */
List<TaskCache> selectAll();
- //鏌ヨ杩涚墖浠诲姟
+ /**
+ * 鏌ヨ杩涚墖浠诲姟
+ * @return
+ */
List<TaskCache> selectInputTaskCache();
- //鏌ヨ鍑虹墖浠诲姟
+ /**
+ * 鏌ヨ鍑虹墖浠诲姟
+ * @return
+ */
List<TaskCache> selectOutTaskCache();
- //鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ /**
+ * 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ * @param line
+ * @return
+ */
List<TaskCache> selectLastOutCacheInfo(String line);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
index 74d2904..6560f03 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
@@ -23,42 +23,70 @@
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
- //娣诲姞鐞嗙墖绗间换鍔�
+ /**
+ * 娣诲姞鐞嗙墖绗间换鍔�
+ * @param taskCache
+ * @return
+ */
@Override
public boolean insertTaskCache(TaskCache taskCache){
baseMapper.insert(taskCache);
return true;
}
- //鏌ヨ纾ㄨ竟浠诲姟
+
+ /**
+ * 鏌ヨ纾ㄨ竟浠诲姟
+ * @param line
+ * @return
+ */
@Override
public List<TaskCache> selectEdgInfo(String line) {
- return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line));
}
- //鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
+
+ /**
+ * 鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
+ * @return
+ */
@Override
public List<TaskCache> selectCacheInfo(){
- return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0));
}
- //鏌ヨ鍏ㄩ儴浠诲姟
+
+ /**
+ * 鏌ヨ鍏ㄩ儴浠诲姟
+ * @return
+ */
@Override
public List<TaskCache> selectAll() {
return baseMapper.selectList(null);
}
- //鏌ヨ寰呰繘鐗囦换鍔�
+
+ /**
+ * 鏌ヨ寰呰繘鐗囦换鍔�
+ * @return
+ */
@Override
public List<TaskCache> selectInputTaskCache(){
- return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",1));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",1));
}
- //鏌ヨ寰呭嚭鐗囦换鍔�
+ /**
+ * 鏌ヨ寰呭嚭鐗囦换鍔�
+ * @return
+ */
@Override
public List<TaskCache> selectOutTaskCache(){
- return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",2));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",2));
}
- //鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ /**
+ * 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ * @param line
+ * @return
+ */
@Override
public List<TaskCache> selectLastOutCacheInfo(String line){
- return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line).eq("taskstauts",1).orderByDesc("ID"));
+ return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_xxxxcell",line).eq("task_status",1).orderByDesc("ID"));
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
index 5e0bd43..adff7bf 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -11,6 +11,21 @@
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
+ pp:
+ url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
+ username: root
+ password: beibo.123/
+ driver-class-name: com.mysql.cj.jdbc.Driver
+# pp:
+# url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
+# username: root
+# password: beibo.123/
+# driver-class-name: com.mysql.cj.jdbc.Driver
+# salve_hangzhoumes:
+# url: jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes
+# username: sa
+# password: beibo.123/
+# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
cloud:
nacos:
discovery:
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
index 2cb20e5..53f728a 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -1,8 +1,11 @@
package com.mes;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
+import com.mes.pp.entity.OptimizeDetail;
+import com.mes.pp.mapper.OptimizeDetailMapper;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,6 +32,9 @@
@Autowired
EdgStorageCageDetailsService edgStorageCageDetailsService;
+ @Autowired
+ OptimizeDetailMapper optimizeDetailMapper;
+
@Test
public void testFindPath() {
log.info("瀹屾暣璺緞锛歿}", Arrays.asList("123"));
@@ -46,7 +52,18 @@
}
@Test
public void testScan() {
- List<Map> map= edgStorageCageDetailsService.selectCutTerritory();
+ List<OptimizeDetail> map= edgStorageCageDetailsService.selectCutTerritory();
log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
}
+
+ @Test
+ public void testPpOptimizeDetail() {
+ List<OptimizeDetail> optimizeDetail=optimizeDetailMapper.selectList(new QueryWrapper<OptimizeDetail>()
+ .eq("project_no", "P24032204")
+ .eq("stock_id",5)
+ );
+ log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅锛歿}", Arrays.asList(optimizeDetail));
+
+ }
+
}
--
Gitblit v1.8.0