Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

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

@@ -1,6 +1,5 @@
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;
@@ -8,9 +7,7 @@
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@@ -38,9 +35,15 @@
    }

    @ApiOperation("按照查询条件（设备id、流程卡、膜系）获取设备对应的笼子玻璃信息")
    @GetMapping("/querybigStorageCageDetail")
    public Result<List<BigStorageAndDetailsDTO>> querybigStorageCageDetail(BigStorageDetailsQueryVO query) {
    @PostMapping("/querybigStorageCageDetail")
    public Result<List<BigStorageAndDetailsDTO>> querybigStorageCageDetail(@RequestBody BigStorageDetailsQueryVO query) {
        return Result.build(200, "查询成功", bigStorageCageService.querybigStorageCageDetail(query));
    }
    @ApiOperation("复位：重置理片笼基础信息1清除笼内状态为0的脏数据、2将空格子的尺寸置为初始尺寸")
    @PostMapping("/resetCage")
    public Result<Boolean> resetCage() {
        return Result.build(200, "查询成功", bigStorageCageService.resetCage());
    }


}