From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期五, 28 三月 2025 08:28:26 +0800 Subject: [PATCH] 修改报表,界面添加查询流程卡个数,调整推送数据到前端的间隔 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 75 ++++++++++++++++++++++++++++++------- 1 files changed, 60 insertions(+), 15 deletions(-) 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 6f1479f..43d2024 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,18 +1,15 @@ package com.mes.edgstoragecage.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.github.yulichang.base.MPJBaseService; -import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.mes.edgglasstask.entity.request.IdentWornRequest; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; -import com.mes.pp.entity.OptimizeDetail; -import com.mes.taskcache.entity.TaskCache; import java.util.List; import java.util.Map; /** * <p> - * 鏈嶅姟绫� + * 鏈嶅姟绫� * </p> * * @author zhoush @@ -20,32 +17,80 @@ */ public interface EdgStorageCageDetailsService extends MPJBaseService<EdgStorageCageDetails> { - /** - * 璇嗗埆 鐮存崯/鎷胯蛋 - * @param glassId - * @param ControlsId - * @return - */ - boolean identWorn(String glassId,int ControlsId); +// boolean identWorn(Map<String, Object> arguments); /** * 鑾峰彇 鍒囧壊褰撳墠鐗堝浘 + * * @return */ List<Map<String, Object>> selectCutTerritory(); /** * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘 + * * @param current * @return */ - List<Map<String, Object>> selectCurrentCutTerritory(String current); + List<List<Map<String, Object>>> selectCurrentCutTerritory(String current); + + /** + * 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘 + * + * @param current + * @return + */ + List<Map<String, Object>> selectTemperingTerritory(String current); /** * 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿 + * * @param glassId - * @param poor + * @param threshold * @return */ - EdgStorageCageDetails selectConformGlass(String glassId, int poor); + EdgStorageCageDetails selectConformGlass(String glassId, int threshold); + + /** + * 鑾峰彇鍑虹墖淇℃伅鏁版嵁 + * + * @param glassId + * @param threshold + * @return + */ + EdgStorageCageDetails selectOutGlass(String glassId, int threshold); + + /** + * 璇嗗埆 鎷胯蛋:9/鐮存崯:8 + * + * @param request + * @return + */ + String identControls(IdentWornRequest request); + + /** + * 纾ㄨ竟妯″潡姹囨姤鐜荤拑鐘舵�� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆� + * + * @param request + * @return + */ + String edgReportStatus(IdentWornRequest request); + + /** + * 杩涚墖 鎵爜ID楠岃瘉閲嶅 + * + * @param glassId + * @return + */ + boolean inToVerify(String glassId); + + /** + * 鎸夌収灏哄 + * + * @param deviceId + * @param width + * @param height + * @return + */ + EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height); } -- Gitblit v1.8.0