From b8045b11ca8af95cb5aeba464bff589e0b9f53b8 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 30 五月 2024 18:08:13 +0800 Subject: [PATCH] 光纤配置三层架构+辅助工时的审核与批准逻辑修改 --- cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java index 4110274..17cd875 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java @@ -4,13 +4,13 @@ import cn.hutool.core.lang.UUID; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.annotation.ValueAuth; +import com.yuanchu.mom.annotation.ValueClassify; +import com.yuanchu.mom.dto.DeviceDto; import com.yuanchu.mom.pojo.Device; import com.yuanchu.mom.service.DeviceService; import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.vo.Result; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; @@ -28,34 +28,33 @@ @RestController @RequestMapping("/deviceScope") public class DeviceController { - - @Resource private DeviceService deviceService; @Value("${file.path}") private String filePath; + @ValueClassify("璁惧") @ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃") @PostMapping("/selectDeviceParameter") public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception { Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); - Device itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Device.class); + DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class); return Result.success(deviceService.selectDeviceParameter(page, itemParameter)); } - + @ValueClassify("璁惧") @ApiOperation(value = "娣诲姞璁惧璇︽儏鍙傛暟") @PostMapping("/addDeviceParameter") public Result addDeviceParameter(@RequestBody Device itemParameter) { return Result.success(deviceService.addDeviceParameter(itemParameter)); } - + @ValueClassify("璁惧") @ApiOperation(value = "鍒犻櫎璁惧璇︽儏鍙傛暟") @PostMapping("/delDeviceParameter") public Result<?> delDeviceParameter(Integer id) { return Result.success(deviceService.delDeviceParameter(id)); } - + @ValueClassify("璁惧") @ApiOperation(value = "淇敼璁惧璇︽儏鍙傛暟") @PostMapping("/upDeviceParameter") public Result<?> upDeviceParameter(@RequestBody Device itemParameter) { @@ -86,6 +85,7 @@ //鍥剧墖涓婁紶 @ApiOperation(value = "璁惧鍥剧墖涓婁紶") @PostMapping("/uploadFile") + @ValueAuth public Result uploadFile(MultipartFile file) { String urlString; String pathName; -- Gitblit v1.9.3