From 3ca932ad348e06449c63a1eeda3e4d3f5c5f9f35 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期二, 13 八月 2024 14:13:54 +0800 Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java index c966ac5..2f2a7aa 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java @@ -1,7 +1,6 @@ package com.mes.downworkstation.controller; -import com.mes.common.utils.RedisUtil; import com.mes.downworkstation.entity.DownWorkstation; import com.mes.downworkstation.entity.request.DownWorkRequest; import com.mes.downworkstation.service.DownWorkstationService; @@ -12,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import java.util.List; import java.util.Map; @@ -34,8 +32,6 @@ private DownWorkstationService downWorkstationService; @Autowired private GlassInfoService glassInfoService; - @Resource - private RedisUtil redisUtil; @ApiOperation("鑾峰彇宸ヤ綅淇℃伅") @GetMapping("/getone") @@ -129,13 +125,6 @@ @ResponseBody public Result<String> closeAlarmSignal() { return Result.build(200, "鏇存崲鎴愬姛", downWorkstationService.closeAlarmSignal()); - } - - @ApiOperation("鏄惁鑷姩鎵撳嵃") - @PostMapping("/autoPrint") - public Result autoPrint(Boolean flag) { - downWorkstationService.autoPrint(flag); - return Result.build(200, "淇敼鎴愬姛", redisUtil.getCacheObject("autoPrint")); } -- Gitblit v1.8.0