Merge remote-tracking branch 'origin/master'

wu

2024-08-13 c7e6ef17c73feb1a3bf4bf0d6762d46f26fd4709

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java

@@ -1,6 +1,7 @@
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;
@@ -11,6 +12,7 @@
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;

@@ -32,6 +34,8 @@
    private DownWorkstationService downWorkstationService;
    @Autowired
    private GlassInfoService glassInfoService;
    @Resource
    private RedisUtil redisUtil;

    @ApiOperation("获取工位信息")
    @GetMapping("/getone")
@@ -127,6 +131,13 @@
        return Result.build(200, "更换成功", downWorkstationService.closeAlarmSignal());
    }

    @ApiOperation("是否自动打印")
    @PostMapping("/autoPrint")
    public Result autoPrint(Boolean flag) {
        downWorkstationService.autoPrint(flag);
        return Result.build(200, "修改成功", redisUtil.getCacheObject("autoPrint"));
    }


}