From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 25 六月 2025 11:51:38 +0800 Subject: [PATCH] Merge branch 'mdc_hyjs_master' --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocRelativeController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocRelativeController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocRelativeController.java new file mode 100644 index 0000000..177f4b2 --- /dev/null +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocRelativeController.java @@ -0,0 +1,47 @@ +package org.jeecg.modules.dnc.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.modules.dnc.entity.DocRelative; +import org.jeecg.modules.dnc.response.CommonCode; +import org.jeecg.modules.dnc.response.QueryListResponseResult; +import org.jeecg.modules.dnc.response.ResponseResult; +import org.jeecg.modules.dnc.service.IDocRelativeService; +import org.jeecg.modules.mdc.entity.MdcEquipment; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Collections; +import java.util.List; + +@Slf4j +@Api(tags = "璁惧鍏宠仈鏂囨。琛�") +@RestController +@RequestMapping("/doc/relative") +public class DocRelativeController extends JeecgController<DocRelative, IDocRelativeService> { + @Autowired + private IDocRelativeService relativeService; + + @AutoLog(value = "璁惧鍏宠仈鏂囨。琛�-鍒犻櫎璁惧涓嬬殑鏂囨。鎺ュ彛") + @ApiOperation(value = "璁惧鍏宠仈鏂囨。琛�-鍒犻櫎璁惧涓嬬殑鏂囨。鎺ュ彛", notes = "璁惧鍏宠仈鏂囨。琛�-鍒犻櫎璁惧涓嬬殑鏂囨。鎺ュ彛") + @DeleteMapping("/delete/device/{docId}/{deviceId}") + public ResponseResult deleteDocByDeviceId(@PathVariable("docId") String docId, @PathVariable("deviceId") String deviceId) { + boolean b = relativeService.deleteDocByAttr(docId, 7, deviceId); + if(b) + return new ResponseResult(CommonCode.SUCCESS); + return new ResponseResult(CommonCode.FAIL); + } + + @AutoLog(value = "璁惧鍏宠仈鏂囨。琛�-鏌ヨ鏂囨。涓嬬殑鎵�鏈夊叧鑱旇澶囦俊鎭�") + @ApiOperation(value = "璁惧鍏宠仈鏂囨。琛�-鏌ヨ鏂囨。涓嬬殑鎵�鏈夊叧鑱旇澶囦俊鎭�", notes = "璁惧鍏宠仈鏂囨。琛�-鏌ヨ鏂囨。涓嬬殑鎵�鏈夊叧鑱旇澶囦俊鎭�") + @GetMapping("/get/device/{docId}") + public QueryListResponseResult<MdcEquipment> findDeviceByDocId(@PathVariable("docId") String docId) { + List<MdcEquipment> list = relativeService.findDeviceByDocId(docId); + if(list == null) + list = Collections.emptyList(); + return new QueryListResponseResult<>(CommonCode.SUCCESS, list); + } +} -- Gitblit v1.9.3