From dc7f1d12fa03f487232a00d62cdbec42fdd39d5a Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 18 四月 2024 14:40:54 +0800
Subject: [PATCH] 代码丢失重新提交
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 10
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 61 +++---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageMapper.java | 3
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 11
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 19 +
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 22 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java | 66 +++---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 40 ++--
hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml | 7
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java | 16 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/controller/uppattenusageController.java | 43 ++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java | 14
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 45 +++-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/InitUtil.java | 8
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 50 ++--
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 14 -
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java | 21 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java | 33 +++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 24 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java | 53 ++++
23 files changed, 400 insertions(+), 166 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java
index da046e0..e1eb378 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java
@@ -2,10 +2,12 @@
import lombok.extern.slf4j.Slf4j;
import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import com.mes.edgstoragecage.service.*;
/**
* @Author : zhoush
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/InitUtil.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/InitUtil.java
index 96b7996..5d4e79e 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/InitUtil.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/InitUtil.java
@@ -105,16 +105,16 @@
// Boolean[] values1 = { false, true, true, true, false, false, true, false,
// false, true ,true };
// List<Boolean> getplcvlues = new ArrayList<>(Arrays.asList(values1));
- List<Boolean> getplcvlues = S7object.getinstance().plccontrol.ReadBits(plcBitObject.getPlcAddressBegin(), plcBitObject.getPlcAddressLength());
- plcBitObject.setPlcBitList(getplcvlues);
+// List<Boolean> getplcvlues = S7object.getinstance().plccontrol.ReadBits(plcBitObject.getPlcAddressBegin(), plcBitObject.getPlcAddressLength());
+// plcBitObject.setPlcBitList(getplcvlues);
}
public static void readAndUpdateWordValues(PlcParameterObject plcParameterObject) {
// byte[] getplcvlues = {0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02};
- byte[] getplcvlues = S7object.getinstance().plccontrol.ReadByte(plcParameterObject.getPlcAddressBegin(), plcParameterObject.getPlcAddressLength());
- plcParameterObject.setPlcParameterList(getplcvlues);
+// byte[] getplcvlues = S7object.getinstance().plccontrol.ReadByte(plcParameterObject.getPlcAddressBegin(), plcParameterObject.getPlcAddressLength());
+// plcParameterObject.setPlcParameterList(getplcvlues);
}
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 020a22d..5e3bed7 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,9 +1,19 @@
package com.mes.edgstoragecage.controller;
+import com.mes.edgstoragecage.entity.EdgStorageCage;
+import com.mes.edgstoragecage.service.EdgStorageCageService;
+import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
+import com.mes.taskcache.entity.TaskCache;
+import com.mes.taskcache.service.impl.TaskCacheServiceImpl;
+import com.mes.utils.Result;
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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.awt.image.ImageProducer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -17,11 +27,38 @@
@RequestMapping("/edgStorageCage")
public class EdgStorageCageController {
- //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
- @ApiOperation("娴嬭瘯")
- @GetMapping("/index")
- public String index() {
- return "hello world";
+ @Autowired
+ private EdgStorageCageServiceImpl edgStorageCageServiceImpl;
+
+
+ //鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏
+ @PostMapping("/selectEdgStorageCage")
+ @ResponseBody
+ public Result selectEdgStorageCage () {
+ List<Map> list=edgStorageCageServiceImpl.selectEdgStorageCages();
+ return Result.build(200,"鎴愬姛",list);
+ }
+ //娣诲姞纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠�
+ @PostMapping("/insertEdgStorageCage")
+ @ResponseBody
+ public Result insertEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
+ boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage);
+ return Result.build(200,"娣诲姞鎴愬姛",1);
+ }
+ //淇敼纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭�
+ @PostMapping("/updateEdgStorageCage")
+ @ResponseBody
+ public Result updateEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
+ boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage);
+ return Result.build(200,"鏇存崲鎴愬姛",1);
+ }
+
+ //鍒犻櫎纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��
+ @PostMapping("/deleteEdgStorageCage")
+ @ResponseBody
+ public Result deleteEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
+ boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage);
+ return Result.build(200,"鍒犻櫎鎴愬姛",1);
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageMapper.java
index 743808f..7a83c6a 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageMapper.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageMapper.java
@@ -1,6 +1,7 @@
package com.mes.edgstoragecage.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
/**
@@ -11,6 +12,6 @@
* @author zhoush
* @since 2024-04-07
*/
-public interface EdgStorageCageMapper extends BaseMapper<EdgStorageCage> {
+public interface EdgStorageCageMapper extends MPJBaseMapper<EdgStorageCage> {
}
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 b3dee22..585741f 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
@@ -15,10 +15,13 @@
* @since 2024-04-07
*/
public interface EdgStorageCageDetailsService extends IService<EdgStorageCageDetails> {
- //鑾峰彇鍏ㄩ儴 纾ㄨ竟鍓嶇紦瀛樼淇℃伅
- public List<Map> getEdgStorageInfos();
- //淇敼 绗煎唴鏁版嵁
- public List<Map> setEdgStorageInfos();
+
+ //璇嗗埆 鐮存崯/鎷胯蛋
+ public boolean identWorn(String glassid,int ControlsId);
+ //鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ public List<Map> selectCutTerritory();
+ //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ public List<Map> 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 d49d07e..008cd26 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
@@ -18,20 +18,14 @@
public interface EdgStorageCageService extends IService<EdgStorageCage> {
//鏌ヨ绗煎唴绌烘牸
- List<EdgStorageCage> selectCacheEmpty();
+ List<Map> selectCacheEmpty();
//鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
- List<EdgStorageCage> selectCacheOut();
+ List<Map> selectCacheOut();
//鏌ヨ绗煎唴璇︽儏
- List<Map> selectCacheInfos();
-
- //娣诲姞鐞嗙墖绗间俊鎭� 浼犲叆glassid
- boolean insertCacheInfo(String glassid);
+ List<Map> selectEdgStorageCages();
//淇敼鐞嗙墖绗煎唴淇℃伅
- boolean updateCacheInfo(String cacheId);
-
- //鍒犻櫎鐞嗙墖绗煎唴淇℃伅
- boolean deleteCacheInfo(String cacheId);
+ 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 e19b2cc..f23de00 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,5 +1,6 @@
package com.mes.edgstoragecage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
@@ -29,22 +30,40 @@
private HangzhouMesMapper hangzhouMesMapper;
@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;
+ }
+ return false;
+ }
+ //鑾峰彇 鍒囧壊褰撳墠鐗堝浘
@Override
- public List<Map> getEdgStorageInfos(){
- List<Map> map=edgStorageCageDetailsMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
- .select("a.c","a.d")
- .leftJoin("ab a on t.id=a.id")
- .le("a.id","1")
+ 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 map;
- };
-
+ return list;
+ }
+ //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
@Override
- public List<Map> setEdgStorageInfos(){
- return hangzhouMesMapper.selectCachInfo();
+ 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;
};
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 97af910..c59ac0c 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
@@ -1,6 +1,7 @@
package com.mes.edgstoragecage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
@@ -30,48 +31,46 @@
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
@Override
- //鏌ヨ绗煎唴绌烘牸 EdgStorageCage as esc left join EdgStorageCageDetails as escd esc.device_id=escd.device_id
- public List<EdgStorageCage> selectCacheEmpty(){
- List<EdgStorageCage> listEdgStorageCage= edgStorageCageMapper.selectList(null);
- ;
- List<EdgStorageCageDetails> orderList = listEdgStorageCage.stream()
- .flatMap(user -> edgStorageCageDetailsMapper.selectList(
- new QueryWrapper<EdgStorageCageDetails>().eq("user_id", user.getId())).stream()
- )
- .collect(Collectors.toList());
-
- return listEdgStorageCage;
+ //鏌ヨ绗煎唴绌烘牸
+ public List<Map> selectCacheEmpty(){
+ List<Map> map=edgStorageCageMapper.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;
}
@Override
- //鏌ヨ绗煎唴鍑虹墖浠诲姟
- public List<EdgStorageCage> selectCacheOut(){
- List<EdgStorageCage> list= new ArrayList<EdgStorageCage>();
+ //鏌ヨ绗煎唴鍑虹墖浠诲姟 鎸夐挗鍖栫増鍥惧彿+鐗堝浘鍐呭簭鍙�
+ public List<Map> selectCacheOut(){
+ List<Map> list= edgStorageCageMapper.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")
+ .isNotNull("escd.slot")
+ .orderByAsc("escd.tempering_layout_id","escd.tempering_feed_sequence")
+ );
return list;
}
@Override
//鐞嗙墖缂撳瓨璇︽儏
- public List<Map> selectCacheInfos(){
- List<Map> mapList=new ArrayList<>();
- return mapList;
+ public List<Map> selectEdgStorageCages(){
+ List<Map> map=edgStorageCageMapper.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;
}
@Override
- //娣诲姞鐞嗙墖绗间俊鎭� 浼犲叆glassid
- public boolean insertCacheInfo(String glassid){
- return false;
+ //淇敼鐞嗙墖绗煎唴淇℃伅 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
+ public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage){
+ edgStorageCageMapper.updateById(edgStorageCage);
+ return true;
}
- @Override
- //淇敼鐞嗙墖绗煎唴淇℃伅
- public boolean updateCacheInfo(String cacheId){
- return false;
- }
-
- @Override
- //鍒犻櫎鐞嗙墖绗煎唴淇℃伅
- public boolean deleteCacheInfo(String cacheId){
- return false;
- }
}
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 6635c64..3144313 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
@@ -1,7 +1,17 @@
package com.mes.glassinfo.controller;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import com.mes.glassinfo.service.impl.GlassInfoServiceImpl;
+
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -15,5 +25,28 @@
@RequestMapping("/glassInfo")
public class GlassInfoController {
+ @Autowired
+ private GlassInfoServiceImpl GlassInfoServiceImpl;
+
+ @PostMapping("/selectId") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
+ @ResponseBody
+ public Result selectId(String ProcessId) {
+ List<GlassInfo> list = GlassInfoServiceImpl.selectId(ProcessId);
+ return Result.build(200,"鎴愬姛",list);
+ }
+
+ @PostMapping("/selectAll") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
+ @ResponseBody
+ public Result selectAll() {
+ List<GlassInfo> list = GlassInfoServiceImpl.selectAll();
+ return Result.build(200,"鎴愬姛",list);
+ }
+
+ @PostMapping("/selectFlowCardId") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
+ @ResponseBody
+ public Result selectFlowCardId(String flowCardId) {
+ List<GlassInfo> list = GlassInfoServiceImpl.selectFlowCardId(flowCardId);
+ return Result.build(200,"鎴愬姛",list);
+ }
}
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 56fe621..082c2b3 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
@@ -30,7 +30,7 @@
/**
* 娴佺▼鍗�
*/
- private String flowcardId;
+ private String flowCardId;
/**
* 娴佺▼鍗＄幓鐠冪被鍨�
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 678e9a2..ed5b84a 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
@@ -17,5 +17,5 @@
public List<GlassInfo> selectAll();
public List<GlassInfo> selectId(String glassId);
- public List<GlassInfo> selectFlowcardId(String flowcard_id);
+ 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 0ddcce1..cae494e 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
@@ -28,9 +28,7 @@
//鏍规嵁ID 鑾峰彇灏忕墖鏁版嵁
@Override
public List<GlassInfo> selectId(String glassId){
- QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<GlassInfo>();
- queryWrapper.eq("id",glassId);
- return glassInfoMapper.selectList(queryWrapper);
+ return glassInfoMapper.selectList(new QueryWrapper<GlassInfo>().eq("id",glassId));
};
//鑾峰彇鍏ㄩ儴灏忕墖鏁版嵁
@@ -41,9 +39,7 @@
//鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
@Override
- public List<GlassInfo> selectFlowcardId(String flowcardId){
- QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<GlassInfo>();
- queryWrapper.eq("flowcardId",flowcardId);
- return glassInfoMapper.selectList(queryWrapper);
+ public List<GlassInfo> selectFlowCardId(String flowCardId){
+ return glassInfoMapper.selectList(new QueryWrapper<GlassInfo>().eq("flowCardId",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 be55022..cb8fb57 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
@@ -1,5 +1,7 @@
package com.mes.taskcache.controller;
+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.utils.Result;
@@ -22,57 +24,53 @@
public class TaskCacheController {
@Autowired
- private PpService ppService;
+ private EdgStorageCageServiceImpl edgStorageCageServiceImpl;
+
+ @Autowired
+ private EdgStorageCageDetailsServiceImpl edgStorageCageDetailsServiceImpl;
@Autowired
private HangzhoumesService hangzhoumesService;
-// @GetMapping("/SelectTerritoryInfo") // 鏌ヨ閽㈠寲鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
-// @ResponseBody
-// public Result SelectTerritoryInfo(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
-// List<Tempered> h = ppService.selectTemperedTerritory(ProcessId);
-// return Result.seccess(h);
-// }
-
- @GetMapping("/CutTerritory") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
+ @PostMapping("/cutTerritory") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
@ResponseBody
- public Result CutTerritory(String ProcessId) {
- List<Map> h = ppService.selectCutTerritory(ProcessId);
+ public Result cutTerritory(String current) {
+ List<Map> h = edgStorageCageDetailsServiceImpl.selectCurrentCutTerritory(current);
return Result.build(200,"鎴愬姛",h);
}
- @GetMapping("/CurrentCutTerritory") // 璇嗗埆鏄剧ず 褰撳墠鐗堝浘
+ @PostMapping("/currentCutTerritory") // 璇嗗埆鏄剧ず 褰撳墠鐗堝浘
@ResponseBody
- public Result CurrentCutTerritory() {
- List<Map> h = ppService.selectCutTerritory();
- System.out.println(h);
+ public Result currentCutTerritory() {
+ List<Map> h = edgStorageCageDetailsServiceImpl.selectCutTerritory();
return Result.build(200,"鎴愬姛",h);
}
- @GetMapping("/SelectCutTerritory") // 璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘
+ @PostMapping("/selectCutTerritory") // 璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘
@ResponseBody
- public Result SelectCutTerritory(String TerritoryId) {
- List<Map> h = ppService.selectCutTerritory(TerritoryId);
+ public Result selectCutTerritory(String TerritoryId) {
+ List<Map> h = edgStorageCageDetailsServiceImpl.selectCutTerritory();
return Result.build(200,"鎴愬姛",h);
}
- @GetMapping("/IdentControls") // 璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D锛屽姛鑳絒0:鐮存崯锛�1锛氭嬁璧癩锛�
+ @PostMapping("/identControls") // 璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D锛屽姛鑳絒0:鐮存崯锛�1锛氭嬁璧癩锛�
@ResponseBody
- public Result Ident(@RequestParam(name = "IdentId", required = false) String ProcessId,@RequestParam(name = "ControlsId", required = false) String ControlsId) {
- List<Map> h = ppService.selectCutTerritory("P24032508");
- return Result.build(200,"鎴愬姛",h);
+ public Result identControls(@RequestParam(name = "identId", required = false) String identId,@RequestParam(name = "controlsId", required = false) int controlsId) {
+
+ boolean issucess = edgStorageCageDetailsServiceImpl.identWorn(identId,controlsId);
+ return Result.build(200,"鎴愬姛",issucess);
}
- @GetMapping("/SelectCageInfo") // 鏌ヨ绗煎唴淇℃伅
+ @PostMapping("/selectCageInfo") // 鏌ヨ绗煎唴淇℃伅
@ResponseBody
- public Result SelectCageInfo(String ProcessId) {
+ public Result selectCageInfo(String ProcessId) {
List<Map> h = hangzhoumesService.SelectCageInfo();
return Result.build(200,"鎴愬姛",h);
}
- @GetMapping("/SelectEdgTask") //纾ㄨ竟浠诲姟
+ @PostMapping("/selectEdgTask") //纾ㄨ竟浠诲姟
@ResponseBody
- public Result SelectEdgTask(String ProcessId) {
+ public Result selectEdgTask(String ProcessId) {
List<Map> EdgTasks = hangzhoumesService.SelectEdgInfo("1");
return Result.build(200,"鎴愬姛",EdgTasks);
}
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
index c4334cb..5dc3f77 100644
--- 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
@@ -4,7 +4,7 @@
import com.mes.common.PLCAutoMes;
import com.mes.common.PlcParameterObject;
-import com.mes.common.S7object;
+//import com.mes.common.S7object;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.taskcache.mapper.HangzhouMesMapper;
@@ -33,38 +33,38 @@
// }
// }
// }
- //鐞嗙墖 杩�
- 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 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(){
// //鏌ヨ浠诲姟
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 2d2bafc..4698582 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
@@ -16,23 +16,23 @@
public interface TaskCacheService extends IService<TaskCache> {
//娣诲姞鐞嗙墖绗间换鍔�
- public boolean insertTaskCache();
+ boolean insertTaskCache(TaskCache taskCache);
//鏌ヨ纾ㄨ竟浠诲姟
- public List<TaskCache> selectEdgInfo(String line);
+ List<TaskCache> selectEdgInfo(String line);
//鏌ヨ鐞嗙墖浠诲姟
- public List<TaskCache> selectCacheInfo();
+ List<TaskCache> selectCacheInfo();
//鏌ヨ鍏ㄩ儴浠诲姟
- public List<TaskCache> selectAll();
+ List<TaskCache> selectAll();
//鏌ヨ杩涚墖浠诲姟
- public List<TaskCache> selectInputTaskCache();
+ List<TaskCache> selectInputTaskCache();
//鏌ヨ鍑虹墖浠诲姟
- public List<TaskCache> selectOutTaskCache();
+ List<TaskCache> selectOutTaskCache();
//鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
- public boolean selectLastOutCacheInfo();
+ 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 811698b..0fc6b8b 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
@@ -1,9 +1,14 @@
package com.mes.taskcache.service.impl;
-import com.mes.taskcache.entity.TaskCache;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.mapper.TaskCacheMapper;
import com.mes.taskcache.service.TaskCacheService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -18,43 +23,38 @@
*/
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
-
//娣诲姞鐞嗙墖绗间换鍔�
- @Override
- public boolean insertTaskCache(){
- return false;
+ public boolean insertTaskCache(TaskCache taskCache){
+ return this.save(taskCache);
}
//鏌ヨ纾ㄨ竟浠诲姟
- @Override
- public List<TaskCache> selectEdgInfo(String line) {
- return null;
+ public List<TaskCache> selectEdgInfo(String line){
+
}
+
//鏌ヨ鐞嗙墖浠诲姟
- @Override
public List<TaskCache> selectCacheInfo(){
- return null;
+
}
+
//鏌ヨ鍏ㄩ儴浠诲姟
- @Override
- public List<TaskCache> selectAll() {
- return null;
+ public List<TaskCache> selectAll(){
+
}
+
//鏌ヨ杩涚墖浠诲姟
- @Override
public List<TaskCache> selectInputTaskCache(){
- return null;
+
}
//鏌ヨ鍑虹墖浠诲姟
- @Override
public List<TaskCache> selectOutTaskCache(){
- return null;
+
}
//鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
- @Override
- public boolean selectLastOutCacheInfo(){
- return false;
+ public List<TaskCache> selectLastOutCacheInfo(String line){
+
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/controller/uppattenusageController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/controller/uppattenusageController.java
new file mode 100644
index 0000000..a6e1a20
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/controller/uppattenusageController.java
@@ -0,0 +1,43 @@
+package com.mes.uppattenusage.controller;
+
+import com.mes.edgstoragecage.service.impl.EdgStorageCageDetailsServiceImpl;
+import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
+import com.mes.taskcache.service.HangzhoumesService;
+import com.mes.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-07
+ */
+@RestController
+@RequestMapping("/taskCache")
+public class uppattenusageController {
+
+ @Autowired
+ private EdgStorageCageServiceImpl edgStorageCageServiceImpl;
+
+ @Autowired
+ private EdgStorageCageDetailsServiceImpl edgStorageCageDetailsServiceImpl;
+
+ @Autowired
+ private HangzhoumesService hangzhoumesService;
+
+
+ @PostMapping("/selectEdgTask") //纾ㄨ竟浠诲姟
+ @ResponseBody
+ public Result selectEdgTask(String ProcessId) {
+ List<Map> EdgTasks = hangzhoumesService.SelectEdgInfo("1");
+ return Result.build(200,"鎴愬姛",EdgTasks);
+ }
+
+}
+
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
new file mode 100644
index 0000000..dba071e
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
@@ -0,0 +1,21 @@
+package com.mes.uppattenusage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
+@TableName("`up_patten_usage`")
+public class UpPattenUsage {
+ @TableId(type = IdType.AUTO)
+ private Integer id;//鍘熺墖浣跨敤鎯呭喌琛╥d
+ private Integer engineeringid;//宸ョ▼鍙�
+ private Integer filmsid;//鑶滅郴id
+ private Double width;//瀹�
+ private Double height;//楂�
+ private Double thickness;//鍘氬害
+ private Integer layoutsequence;//鍘熺墖鐗堝浘鐗囧簭
+ private Integer state;//鐘舵��
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
new file mode 100644
index 0000000..df3f669
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
@@ -0,0 +1,16 @@
+package com.mes.uppattenusage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-07
+ */
+public interface UpPattenUsageMapper extends BaseMapper<UpPattenUsage> {
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
new file mode 100644
index 0000000..5083b96
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -0,0 +1,19 @@
+package com.mes.uppattenusage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-07
+ */
+public interface UpPattenUsageService extends IService<UpPattenUsage> {
+
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
new file mode 100644
index 0000000..718c4e6
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -0,0 +1,24 @@
+package com.mes.uppattenusage.service.impl;
+
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
+import com.mes.uppattenusage.service.UpPattenUsageService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-07
+ */
+@Service
+public class UpPattenUsageServiceImpl extends ServiceImpl<UpPattenUsageMapper, UpPattenUsage> implements UpPattenUsageService {
+
+}
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 9593dcd..bfda445 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -1,12 +1,16 @@
package com.mes;
+import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
/**
* @Author : zhoush
@@ -18,9 +22,27 @@
@SpringBootTest(classes = CacheGlassModuleApplication.class)
public class CacheGlassModuleApplicationTest {
+ @Autowired
+ EdgStorageCageServiceImpl edgStorageCageServiceImpl;
@Test
public void testFindPath() {
log.info("瀹屾暣璺緞锛歿}", Arrays.asList("123"));
}
+
+ @Test
+ public void testCacheGlass() {
+ List<Map> map= edgStorageCageServiceImpl.selectEdgStorageCages();
+ log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map));
+ }
+ @Test
+ public void testselectCacheEmpty() {
+ List<Map> map= edgStorageCageServiceImpl.selectCacheEmpty();
+ log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
+ }
+ @Test
+ public void testScan() {
+ List<Map> map= edgStorageCageServiceImpl.selectEdgStorageCages();
+ log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
index cefd469..4b53602 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
@@ -10,7 +10,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cacheVerticalGlass</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.github.yulichang</groupId>
+ <artifactId>mybatis-plus-join</artifactId>
+ <version>1.1.6</version>
+ </dependency>
+ </dependencies>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
--
Gitblit v1.8.0