Merge remote-tracking branch 'origin/master'

wu

2024-12-23 b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java

@@ -1,27 +1,26 @@
package com.mes.bigstorage.controller;

import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO;
import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
 * 大理片笼信息
 * 前端控制器
 * </p>
 *
 * @author zhoush
 * @since 2024-03-27
 */
@ApiModel("大理片笼信息")
@Api(tags = "理片笼信息")
@RestController
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {
@@ -29,20 +28,17 @@
    @Autowired
    private BigStorageCageService bigStorageCageService;

//    public Result<BigStorageCageDetails> feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails){
//
//    }

    @ApiOperation("理片笼信息")
    @GetMapping("/bigStorageCage")
    public Result<List<BigStorageCage>> querybigStorageCageDetail() {
        return Result.success(bigStorageCageService.querybigStorageCageDetail());
    @ApiOperation("理片笼启用禁用")
    @GetMapping("/updateStorageCageDisabled")
    public Result updateStorageCageDisabled(int slot, int enableState) {
        bigStorageCageService.updateStorageCageDisabled(slot, enableState);
        return Result.build(200, "启用/禁用成功", 1);
    }

    @ApiOperation("手动完成任务")
    @PostMapping("/finishTask")
    public Result<String> finishTask(int type, int id) {
        //    bigStorageCageDetailsService.FinishTask();
        return Result.success("success");
    @ApiOperation("按照查询条件（设备id、流程卡、膜系）获取设备对应的笼子玻璃信息")
    @PostMapping("/querybigStorageCageDetail")
    public Result<List<BigStorageAndDetailsDTO>> querybigStorageCageDetail(@RequestBody BigStorageDetailsQueryVO query) {
        return Result.build(200, "查询成功", bigStorageCageService.querybigStorageCageDetail(query));
    }

}