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/DeviceManagementController.java | 140 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 140 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceManagementController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceManagementController.java
new file mode 100644
index 0000000..c7a7c2d
--- /dev/null
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceManagementController.java
@@ -0,0 +1,140 @@
+package org.jeecg.modules.dnc.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.dnc.entity.DeviceManagement;
+import org.jeecg.modules.dnc.service.IDeviceManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+@Slf4j
+@Api(tags = "璁惧绫荤鐞嗕俊鎭�")
+@RestController
+@RequestMapping("/nc/deviceManagement")
+public class DeviceManagementController extends JeecgController<DeviceManagement, IDeviceManagementService> {
+
+ @Autowired
+ private IDeviceManagementService deviceManagementService;
+
+ /**
+ * 璁惧绫讳俊鎭垎椤垫煡璇�
+ * @param deviceManagement
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @AutoLog(value = "璁惧绫荤鐞嗕俊鎭�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧绫荤鐞嗕俊鎭�-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧绫荤鐞嗕俊鎭�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping("/query")
+ public Result<?> query(DeviceManagement deviceManagement, Integer pageNo, Integer pageSize){
+ return deviceManagementService.query(deviceManagement, pageNo, pageSize);
+ }
+
+
+ /**
+ * 鏂板璁惧绫�
+ * @param deviceManagement
+ * @return
+ */
+ @AutoLog(value = "璁惧绫荤鐞嗕俊鎭�-鏂板璁惧绫讳俊鎭�")
+ @ApiOperation(value = "璁惧绫荤鐞嗕俊鎭�-鏂板璁惧绫讳俊鎭�", notes = "璁惧绫荤鐞嗕俊鎭�-鏂板璁惧绫讳俊鎭�")
+ @PostMapping("/add")
+ public Result<?> add(@RequestBody DeviceManagement deviceManagement){
+ return deviceManagementService.add(deviceManagement);
+ }
+
+ /**
+ * 缂栬緫璁惧绫�
+ * @param deviceManagement
+ * @return
+ */
+ @AutoLog(value = "璁惧绫荤鐞嗕俊鎭�-缂栬緫璁惧绫讳俊鎭�")
+ @ApiOperation(value = "璁惧绫荤鐞嗕俊鎭�-缂栬緫璁惧绫讳俊鎭�", notes = "璁惧绫荤鐞嗕俊鎭�-缂栬緫璁惧绫讳俊鎭�")
+ @PutMapping("/edit")
+ public Result<?> edit(@RequestBody DeviceManagement deviceManagement){
+ return deviceManagementService.edit(deviceManagement);
+ }
+
+ /**
+ * 鏍规嵁id鍒犻櫎璁惧绫�
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧绫荤鐞嗕俊鎭�-鏍规嵁id鍒犻櫎璁惧绫讳俊鎭�")
+ @ApiOperation(value = "璁惧绫荤鐞嗕俊鎭�-鏍规嵁id鍒犻櫎璁惧绫讳俊鎭�", notes = "璁惧绫荤鐞嗕俊鎭�-鏍规嵁id鍒犻櫎璁惧绫讳俊鎭�")
+ @DeleteMapping("/delete")
+ public Result<?> delete(String id){
+ return deviceManagementService.delete(id);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎璁惧绫�
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "璁惧绫荤鐞嗕俊鎭�-鎵归噺鍒犻櫎璁惧绫讳俊鎭�")
+ @ApiOperation(value = "璁惧绫荤鐞嗕俊鎭�-鎵归噺鍒犻櫎璁惧绫讳俊鎭�", notes = "璁惧绫荤鐞嗕俊鎭�-鎵归噺鍒犻櫎璁惧绫讳俊鎭�")
+ @DeleteMapping("/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ return this.deviceManagementService.deleteBatch(Arrays.asList(ids.split(",")));
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏉冮檺鎷ユ湁鐨勮溅闂翠俊鎭�
+ * @return
+ */
+ @AutoLog(value = "璁惧绫荤鐞嗕俊鎭�-鑾峰彇鐢ㄦ埛鏉冮檺鎷ユ湁鐨勮溅闂翠俊鎭�")
+ @ApiOperation(value = "璁惧绫荤鐞嗕俊鎭�-鑾峰彇鐢ㄦ埛鏉冮檺鎷ユ湁鐨勮溅闂翠俊鎭�", notes = "璁惧绫荤鐞嗕俊鎭�-鑾峰彇鐢ㄦ埛鏉冮檺鎷ユ湁鐨勮溅闂翠俊鎭�")
+ @GetMapping("/getProductionIdsByUserId")
+ public Result<?> getProductionIdsByUserId(){
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ return Result.OK(deviceManagementService.getProductionIdsByUserId(user.getId()));
+ }
+
+ /**
+ * 閫氳繃杞﹂棿id鏌ヨ璁惧鍒楄〃淇℃伅
+ * @param productionId
+ * @param equipmentId
+ * @param equipmentName
+ * @return
+ */
+ @AutoLog(value = "璁惧绫荤鐞嗕俊鎭�-閫氳繃杞﹂棿id鏌ヨ璁惧鍒楄〃淇℃伅")
+ @ApiOperation(value = "璁惧绫荤鐞嗕俊鎭�-閫氳繃杞﹂棿id鏌ヨ璁惧鍒楄〃淇℃伅", notes = "璁惧绫荤鐞嗕俊鎭�-閫氳繃杞﹂棿id鏌ヨ璁惧鍒楄〃淇℃伅")
+ @GetMapping("/getEquipmentListByProductionId")
+ public Result<?> getEquipmentListByProductionId(String productionId,String equipmentId,String equipmentName,Integer pageNo,Integer pageSize){
+ return Result.OK(deviceManagementService.getEquipmentListByProductionId(productionId,equipmentId,equipmentName,pageNo,pageSize));
+ }
+
+ /**
+ * 閫氳繃杞﹂棿id鏌ヨ璁惧绫荤鐞嗗垪琛ㄤ俊鎭�
+ * @param productionId
+ * @return
+ */
+ @AutoLog(value = "璁惧绫荤鐞嗕俊鎭�-閫氳繃杞﹂棿id鏌ヨ璁惧绫荤鐞嗗垪琛ㄤ俊鎭�")
+ @ApiOperation(value = "璁惧绫荤鐞嗕俊鎭�-閫氳繃杞﹂棿id鏌ヨ璁惧绫荤鐞嗗垪琛ㄤ俊鎭�", notes = "璁惧绫荤鐞嗕俊鎭�-閫氳繃杞﹂棿id鏌ヨ璁惧绫荤鐞嗗垪琛ㄤ俊鎭�")
+ @GetMapping("/getDeviceManagementListByProductionId")
+ public Result<?> getDeviceManagementListByProductionId(String productionId){
+ return Result.OK(deviceManagementService.getDeviceManagementListByProductionId(productionId));
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ璁惧鍒楄〃淇℃伅
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧绫荤鐞嗕俊鎭�-閫氳繃id鏌ヨ璁惧鍒楄〃淇℃伅")
+ @ApiOperation(value = "璁惧绫荤鐞嗕俊鎭�-閫氳繃id鏌ヨ璁惧鍒楄〃淇℃伅", notes = "璁惧绫荤鐞嗕俊鎭�-閫氳繃id鏌ヨ璁惧鍒楄〃淇℃伅")
+ @GetMapping("/getEquipmentListById")
+ public Result<?> getEquipmentListByProductionId(String id){
+ return Result.OK(deviceManagementService.getEquipmentListById(id));
+ }
+
+}
--
Gitblit v1.9.3