From 339515558253d776769dc2e2560bbb4a0450c989 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 29 十一月 2024 09:44:44 +0800
Subject: [PATCH] 将码云版本提交至gitlab -- 20241129

---
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java
old mode 100644
new mode 100755
index fdb5f5a..74860c4
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java
@@ -30,6 +30,7 @@
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -50,6 +51,7 @@
 @RestController
 @RequestMapping("/dry/dryOpcDevice")
 @Slf4j
+@ConditionalOnProperty(name = "kangaroohy.milo.enabled", havingValue = "true")
 public class DryOpcDeviceController extends JeecgController<DryOpcDevice, IDryOpcDeviceService> {
 	@Autowired
 	private IDryOpcDeviceService dryOpcDeviceService;
@@ -58,7 +60,7 @@
 	@Autowired
 	private MiloService miloService;
 
-	
+
 	/**
 	 * 鍒嗛〉鍒楄〃鏌ヨ
 	 *
@@ -99,7 +101,7 @@
 		 return Result.OK(list);
 	 }
 
-	
+
 	/**
 	 *   娣诲姞
 	 *
@@ -114,7 +116,7 @@
 		dryOpcDeviceService.save(dryOpcDevice);
 		return Result.OK("娣诲姞鎴愬姛锛�");
 	}
-	
+
 	/**
 	 *  缂栬緫
 	 *
@@ -129,7 +131,7 @@
 		dryOpcDeviceService.updateById(dryOpcDevice);
 		return Result.OK("缂栬緫鎴愬姛!");
 	}
-	
+
 	/**
 	 *   閫氳繃id鍒犻櫎
 	 *
@@ -144,7 +146,7 @@
 		dryOpcDeviceService.removeById(id);
 		return Result.OK("鍒犻櫎鎴愬姛!");
 	}
-	
+
 	/**
 	 *  鎵归噺鍒犻櫎
 	 *
@@ -159,7 +161,7 @@
 		this.dryOpcDeviceService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
 	}
-	
+
 	/**
 	 * 閫氳繃id鏌ヨ
 	 *

--
Gitblit v1.9.3