From f77a9d8f16bae6b4cf809891f037c038070e81ed Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期四, 19 六月 2025 17:12:50 +0800 Subject: [PATCH] 工单,数据中心用户查看数据的权限,合同考核每日,以及导出每日和按月 --- ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 77 ++++++++++++++++++++++++++++++++------ 1 files changed, 65 insertions(+), 12 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java index 6acfa37..9f4f2c3 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java @@ -2,15 +2,22 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.platform.domain.entity.WorkOrder; +import com.ycl.platform.domain.entity.WorkOrderAuditingRecord; +import com.ycl.platform.domain.entity.WorkOrderWhite; +import com.ycl.platform.domain.excel.PointExport; import com.ycl.platform.domain.form.*; import com.ycl.platform.domain.query.*; -import com.ycl.platform.domain.vo.DeviceInfoVO; -import com.ycl.platform.domain.vo.DistributeWorkOrderVO; +import com.ycl.platform.domain.vo.*; import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO; import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO; import com.ycl.system.Result; +import com.ycl.system.page.TableDataInfo; +import jakarta.servlet.http.HttpServletResponse; import org.bytedeco.javacv.FFmpegFrameGrabber; +import java.io.IOException; +import java.time.LocalDate; +import java.util.Date; import java.util.List; import java.util.Map; @@ -23,13 +30,12 @@ public interface WorkOrderService extends IService<WorkOrder> { /** - * 绯荤粺鍐呴儴鐨勬坊鍔狅紝涓嬪彂 + * 绯荤粺鍐呴儴鐨勬坊鍔� * * @param workOrderList * @return */ Boolean innerAddWorkOrder(List<WorkOrder> workOrderList); - /** * 娣诲姞 @@ -100,6 +106,7 @@ */ Result ywCondition(WorkOrderYWConditionForm form); + Result ywConditionList(WorkOrderYWConditionsForm form); /** * 杩愮淮缁撴灉 * @param form @@ -121,6 +128,7 @@ */ Result distributePage(DistributeWorkOrderQuery query); + List<WorkOrderVO> distributeList(); /** * 蹇�熶笅鍙� * @param data @@ -133,14 +141,14 @@ * @param workOrderNo 宸ュ崟鍙� * @return 宸ュ崟杩愮淮鎯呭喌 */ - Result selectYwConditionByYwId(String workOrderNo); + List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo); /** * 鑾峰彇宸ュ崟杩愮淮瀹℃牳璁板綍 * @param workOrderNo 宸ュ崟鍙� * @return 宸ュ崟杩愮淮瀹℃牳璁板綍 */ - Result selectYwAuditingListByYwId(String workOrderNo); + List<WorkOrderAuditingRecord> selectYwAuditingListByYwId(String workOrderNo); /** * 鎵归噺涓嬪彂 @@ -181,25 +189,70 @@ /** * 宸ュ崟璁惧鐐规挱鑾峰彇涓�甯у浘鐗� * - * @param deviceId 璁惧鍥芥爣鐮� - * @param channelId 璁惧閫氶亾缂栧彿 + * @param deviceId 鍥芥爣璁惧鍥芥爣鐮� + * @param channelId 璁惧閫氶亾缂栧彿锛堣澶囧浗鏍囩爜锛� + * @param workOrderNo 宸ュ崟鍙� * @return 鏁版嵁 */ - String getFrameImgByDevice(String deviceId, String channelId) throws FFmpegFrameGrabber.Exception; + String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo) throws Exception; /** - * 鏌ヨ宸ュ崟锛氬凡涓嬪彂銆佸凡澶勭悊銆佸凡瀹屾垚鐨勫伐鍗� + * 宸ュ崟璁惧鐐规挱鑾峰彇涓�甯у浘鐗囷紝骞朵繚瀛樺埌鏁版嵁搴� * + * @param deviceId 鍥芥爣璁惧鍥芥爣鐮� + * @param channelId 璁惧閫氶亾缂栧彿锛堣澶囧浗鏍囩爜锛� + * @param workOrderNo 宸ュ崟鍙� * @return 鏁版嵁 */ - List<DeviceInfoVO> hasErrorWorkOrderList(); + void saveFrameImgByDevice(String deviceId, String channelId, String workOrderNo); /** - * 鏌ヨ宸ュ崟锛氬凡涓嬪彂銆佸凡澶勭悊銆佸凡瀹屾垚鐨勫伐鍗� + * 鏌ヨ宸ュ崟锛氬緟瀹℃牳鐨勫伐鍗� + * + * @param start 寮�濮嬫椂闂� + * @param end 缁撴潫鏃堕棿 + * @return 鏁版嵁 + */ + List<DeviceInfoVO> hasErrorWorkOrderList(Date start, Date end); + + /** + * 鏇存柊宸ュ崟鍥剧墖 * * @param workOrderId 宸ュ崟ID * @param imgPath 鍥惧儚鍦板潃 * @return 鏁版嵁 */ void updateImgById(Integer workOrderId, String imgPath); + + /** + * 宸ュ崟杩囩▼鍥� + * + * @param workOrderNo + * @return + */ + Result processImg(String workOrderNo); + + /** + * 宸ュ崟璇︽儏 + * + * @param workOrderNo + * @return + */ + Result detailByNo(String workOrderNo); + + List<WorkOrderVO> export(WorkOrderExportQuery query); + + /** + * 妫�娴嬫寜閽� + * @param workOrderNo + * @return + */ + Result checkImage(String workOrderNo,String serialNumber); + + Result batchDeleteWorkOrder(List<String> workOrderNos); + + Result errorAll(); + + + } -- Gitblit v1.8.0