From 2b91b242113bd10f1be241d19ab154e9ad6506cd Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期二, 10 六月 2025 14:18:00 +0800 Subject: [PATCH] 国际化命名 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 88 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 75 insertions(+), 13 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 577e794..046d2bb 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,14 +1,18 @@ package com.mes.edgstoragecage.service; +import cn.hutool.json.JSONObject; import com.github.yulichang.base.MPJBaseService; +import com.mes.damage.entity.request.DamageRequest; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; +import com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO; +import com.mes.largenscreen.entity.PieChartVO; import java.util.List; import java.util.Map; /** * <p> - * 鏈嶅姟绫� + * 鏈嶅姟绫� * </p> * * @author zhoush @@ -17,39 +21,97 @@ public interface EdgStorageCageDetailsService extends MPJBaseService<EdgStorageCageDetails> { /** - * 璇嗗埆 鐮存崯/鎷胯蛋 - * @param glassId - * @param ControlsId + * 鎸夌収璁惧鍙婄嚎璺紝鑾峰彇褰撳墠绾胯矾姝e湪鍒囧壊鐨勭増鍥句俊鎭� + * @param deviceId + * @param stationCell * @return */ - boolean identWorn(String glassId,int ControlsId); + JSONObject queryCurrentCutDrawing(int deviceId, int stationCell); /** - * 鑾峰彇 鍒囧壊褰撳墠鐗堝浘 + * 鎸夌収宸ョ▼id鍙婄増搴忚幏鍙栧垏鍓茬増鍥� 榛樿鐗堝簭涓�1 + * @param engineerId + * @param patternSequence * @return */ - List<Map<String, Object>> selectCutTerritory(); + Map<String, Object> queryCutDrawingByEngineerId(String engineerId, int patternSequence); /** - * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘 + * 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘 + * * @param current * @return */ - List<Map<String, Object>> selectCurrentCutTerritory(String current); + 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 poor + * @param threshold * @return */ - EdgStorageCageDetails selectOutGlass(String glassId, int poor); + EdgStorageCageDetails selectOutGlass(String glassId, int threshold); + + /** + * 璇嗗埆 鎷胯蛋:9/鐮存崯:8 + * + * @param request + * @return + */ + String identControls(DamageRequest request); + + /** + * 纾ㄨ竟妯″潡姹囨姤鐜荤拑鐘舵�� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆� + * + * @param request + * @return + */ + String edgReportStatus(DamageRequest request); + + /** + * 杩涚墖 鎵爜ID楠岃瘉閲嶅 + * + * @param glassId + * @return + */ + boolean inToVerify(String glassId); + + /** + * 鎸夌収灏哄 + * + * @param deviceId + * @param width + * @param height + * @param cell + * @param maxThickness + * @return + */ + EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height, int cell, int maxThickness); + + /** + * 鎸夌収灏哄,绾胯矾銆佺嚎璺渶澶ф渶灏忓昂瀵歌幏鍙栫鍚堣姹傜殑鐜荤拑灏忕墖鏁版嵁 + * + * @param deviceId + * @param width + * @param height + * @param maxThickness + * @return + */ + EdgStorageCageDetails queryEdgStorageDetailsByLimitSize(int deviceId, Integer currentCell, double width, double height, int cell, int minOneFirstLength, int minOneSecondLength, int maxTwoFirstLength, int maxTwoSecondLength, int maxThickness); + + String edgDetailsOperate(DamageRequest request); + + List<EdgSlotRemainVO> querySlotRemainWidth(int cellLength, int glassGap); + + List<PieChartVO> queryPieChart(); } -- Gitblit v1.8.0