From 5d88b298cc2c223ccc6c1f6a2e81d1498061f550 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 19 四月 2024 09:55:36 +0800
Subject: [PATCH] 去除uppattenusage 提到公告类

---
 hangzhoumesParent/moduleService/CacheGlassModule/pom.xml                                                                                 |   14 ++--
 /dev/null                                                                                                                                |   24 --------
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java |   52 +++++++++--------
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java        |   56 +++++++++---------
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageMapper.java                   |    1 
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java          |    3 
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java                 |    3 
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java           |   24 +++++---
 8 files changed, 83 insertions(+), 94 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
index 192058e..3c9daa9 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
@@ -17,16 +17,16 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.github.yulichang</groupId>
-            <artifactId>mybatis-plus-join</artifactId>
-            <version>1.1.6</version>
-        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>com.github.yulichang</groupId>-->
-<!--            <artifactId>mybatis-plus-join-boot-starter</artifactId>-->
-<!--            <version>1.4.12</version>-->
+<!--            <artifactId>mybatis-plus-join</artifactId>-->
+<!--            <version>1.1.6</version>-->
 <!--        </dependency>-->
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-boot-starter</artifactId>
+            <version>1.4.12</version>
+        </dependency>
     </dependencies>
 
     <properties>
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 6e46c68..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
@@ -2,11 +2,16 @@
 
 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.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;
 
@@ -23,35 +28,36 @@
 public class EdgStorageCageController {
 
     @Autowired
-    private EdgStorageCageService edgStorageCageService;
+    private EdgStorageCageServiceImpl edgStorageCageServiceImpl;
 
-    @ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏")
+
+    //鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏
     @PostMapping("/selectEdgStorageCage")
     @ResponseBody
     public Result selectEdgStorageCage () {
-        List<Map> list=edgStorageCageService.selectEdgStorageCages();
+        List<Map> list=edgStorageCageServiceImpl.selectEdgStorageCages();
         return Result.build(200,"鎴愬姛",list);
     }
-    @ApiOperation("娣诲姞纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠�")
+    //娣诲姞纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭�   鍔熻兘锛氱鍐呯粦瀹氱幓鐠�
     @PostMapping("/insertEdgStorageCage")
     @ResponseBody
     public Result insertEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
-        boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
+        boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage);
         return Result.build(200,"娣诲姞鎴愬姛",1);
     }
-    @ApiOperation("淇敼纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭�   鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭�")
+    //淇敼纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭�   鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭�
     @PostMapping("/updateEdgStorageCage")
     @ResponseBody
     public Result updateEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
-        boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
+        boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage);
         return Result.build(200,"鏇存崲鎴愬姛",1);
     }
 
-    @ApiOperation("鍒犻櫎纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭�   鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��")
+    //鍒犻櫎纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭�   鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��
     @PostMapping("/deleteEdgStorageCage")
     @ResponseBody
     public Result deleteEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
-        boolean isSucess=edgStorageCageService.updateEdgStorageCage(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 5fa9cda..bfc7ed2 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
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.github.yulichang.interfaces.MPJBaseJoin;
 import com.mes.edgstoragecage.entity.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 5dc7252..af0ffe8 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
@@ -1,6 +1,7 @@
 package com.mes.edgstoragecage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
 import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
 
 import java.util.List;
@@ -14,7 +15,7 @@
  * @author zhoush
  * @since 2024-04-07
  */
-public interface EdgStorageCageDetailsService extends IService<EdgStorageCageDetails> {
+public interface EdgStorageCageDetailsService extends MPJBaseService<EdgStorageCageDetails> {
 
     /**
      * 璇嗗埆 鐮存崯/鎷胯蛋
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 5d2f575..4e16726 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
@@ -1,6 +1,7 @@
 package com.mes.edgstoragecage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
 import com.mes.edgstoragecage.entity.EdgStorageCage;
 
 import java.util.List;
@@ -14,7 +15,7 @@
  * @author zhoush
  * @since 2024-04-07
  */
-public interface EdgStorageCageService extends IService<EdgStorageCage> {
+public interface EdgStorageCageService extends MPJBaseService<EdgStorageCage> {
 
     //鏌ヨ绗煎唴绌烘牸
     List<Map> selectCacheEmpty();
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 48ae3fc..45cf60f 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
@@ -2,6 +2,7 @@
 
 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.mes.edgstoragecage.entity.EdgStorageCageDetails;
 import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
@@ -22,47 +23,50 @@
  * @since 2024-04-07
  */
 @Service
-public class EdgStorageCageDetailsServiceImpl extends ServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
+public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
     //鑾峰彇鍏ㄩ儴鏁版嵁
     @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;
-        }
+//        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> 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 list;
+//        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 list;
+
+        return null;
     }
 
     //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
     @Override
     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;
+//        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;
+        return null;
     }
 
     ;
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 2d5282b..e956e06 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,8 +1,11 @@
 package com.mes.edgstoragecage.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
 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;
 import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
 import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
 import com.mes.edgstoragecage.service.EdgStorageCageService;
@@ -12,6 +15,7 @@
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -22,7 +26,7 @@
  * @since 2024-04-07
  */
 @Service
-public class EdgStorageCageServiceImpl extends ServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
+public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
 
     @Autowired
     EdgStorageCageMapper edgStorageCageMapper;
@@ -34,42 +38,40 @@
     @Override
     //鏌ヨ绗煎唴绌烘牸
     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")
-        );
-//        List<Map> map=baseMapper.selectJoinList(Map.class,JoinWrappers.lambda(EdgStorageCage.class)
-//                .selectAll(EdgStorageCage.class)
-//                .select(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails::getFlowCardId,EdgStorageCageDetails::getWidth,EdgStorageCageDetails::getHeight)//鏌ヨuser_address tel 瀛楁
-//                .leftJoin(EdgStorageCageDetails.class,EdgStorageCageDetails::getSlot,EdgStorageCage::getSlot)
-//                .isNull(EdgStorageCageDetails::getSlot));
-        return map;
+//        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;
+        return null;
     }
 
     @Override
     //鏌ヨ绗煎唴鍑虹墖浠诲姟   鎸夐挗鍖栫増鍥惧彿+鐗堝浘鍐呭簭鍙�
     public List<Map> selectCacheOut(){
-        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")
-                        .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;
+//        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")
+//                        .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 null;
     }
 
     @Override
     //鐞嗙墖缂撳瓨璇︽儏
     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;
+//        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;
+        return null;
     }
 
     @Override
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
deleted file mode 100644
index 280fa38..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.mes.uppattenusage.controller;
-
-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.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("/upPattenUsage")
-public class UpPattenUsageController {
-
-    @Autowired
-    private EdgStorageCageService edgStorageCageService;
-
-    @Autowired
-    private EdgStorageCageDetailsService edgStorageCageDetailsService;
-
-    @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
deleted file mode 100644
index dba071e..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
+++ /dev/null
@@ -1,21 +0,0 @@
-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浠g爜 瀹炰綋绫荤殑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
deleted file mode 100644
index b6efc63..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mes.uppattenusage.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.mes.uppattenusage.entity.UpPattenUsage;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
- */
-public interface UpPattenUsageMapper extends MPJBaseMapper<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
deleted file mode 100644
index 5083b96..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 718c4e6..0000000
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-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 {
-
-}

--
Gitblit v1.8.0