From afae558d8eb1832769b6621d0d9c30103f7fdd89 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期五, 18 四月 2025 16:48:43 +0800
Subject: [PATCH] Merge pull request #70 from zhitan-cloud/wt_from_develop1.0
---
zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterController.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterController.java
index df3d84f..7bf5cc1 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterController.java
@@ -26,9 +26,8 @@
* @Version: 1.0
* @Since: JDK1.8
*/
-
-@Slf4j
@Api("閲囬泦璁￠噺琛ㄦ暟鎹鐞�")
+@Slf4j
@RestController
@RequestMapping("/meters")
public class MeterController extends BaseController {
@@ -37,14 +36,12 @@
private IMetersService iMeterservice;
-
-
@ApiOperation("鑾峰彇璁￠噺琛ㄦ暟鎹�")
@GetMapping("/listMeterData")
- public R<List<MeterImplements>> listMeterData(@RequestParam String meterType){
+ public R<List<MeterImplements>> listMeterData(@RequestParam String meterType) {
log.info("寮�濮嬭幏鍙栬閲忚〃鏁版嵁......");
List<MeterImplements> meterImplementList = iMeterservice.listMeterData(meterType);
- if (meterImplementList != null || meterImplementList .size() > 0) {
+ if (meterImplementList != null || meterImplementList.size() > 0) {
return R.ok(meterImplementList);
} else {
return R.fail("鑾峰彇璁￠噺琛ㄦ暟鎹け璐�");
@@ -56,8 +53,8 @@
public R<List<MeterParam>> listConfigurationData(@RequestParam String meterType, @RequestParam String indexType) {
log.info("寮�濮嬭幏鍙栫偣浣嶉厤缃俊鎭�......");
- List<MeterParam> meterParams = iMeterservice.listConfigurationData(meterType,indexType);
- if (meterParams != null || meterParams .size() > 0) {
+ List<MeterParam> meterParams = iMeterservice.listConfigurationData(meterType, indexType);
+ if (meterParams != null || meterParams.size() > 0) {
return (R.ok(meterParams));
} else {
return R.fail("鑾峰彇鐐逛綅閰嶇疆淇℃伅澶辫触");
@@ -82,12 +79,9 @@
@ApiOperation("鏂板淇濆瓨閰嶇疆鏁版嵁")
@GetMapping("/addConfigurationData")
- public R<T> addConfigurationData(){
- log.info("鎵ц鏂板淇濆瓨閰嶇疆鏁版嵁......");
-
+ public R<T> addConfigurationData() {
return R.ok();
}
-
}
--
Gitblit v1.9.3