From be1b20692e5f0b48cb6b31b1231ef3ac8660e6ea Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期二, 25 三月 2025 13:19:22 +0800
Subject: [PATCH] 移动端

---
 src/main/java/com/product/mobile/core/service/CommonMVCService.java             |   11 ++++++++++-
 src/main/java/com/product/mobile/core/controller/CommonMVCController.java       |   26 ++++++++++++++++++++++++++
 src/main/java/com/product/mobile/device/controller/DeviceManagerController.java |    2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/product/mobile/core/controller/CommonMVCController.java b/src/main/java/com/product/mobile/core/controller/CommonMVCController.java
index ad82496..209dde8 100644
--- a/src/main/java/com/product/mobile/core/controller/CommonMVCController.java
+++ b/src/main/java/com/product/mobile/core/controller/CommonMVCController.java
@@ -92,4 +92,30 @@
 	        return this.error(MobileCoreCode.GET_ROUTER_FAIL);
 	    }
     }
+    /**
+     * 鎵ц绉诲姩绔�佹潵鐨勮〃杈惧紡鍒版暟鎹簱涓墽琛岋紝寰楀埌缁撴灉杩斿洖
+     * 
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/excute-exp/{version}", method = RequestMethod.POST)
+    @ApiVersion(1)
+    public String excuteExp(HttpServletRequest request) {
+        FieldSetEntity fse = null;
+        Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
+        if (bean != null) {
+            RequestParameterEntity reqp = (RequestParameterEntity) bean;
+            fse = reqp.getFormData();
+        }
+        try {
+        	return result_OK_List(commonMVCService.excuteExp(fse.getString("exp")));
+	    } catch (BaseException e) {
+	    	e.printStackTrace();
+	        return this.error(e);
+	    } catch (Exception e) {
+	    	e.printStackTrace();
+	        return this.error(MobileCoreCode.GET_ROUTER_FAIL);
+	    }
+    }
+    
 }
diff --git a/src/main/java/com/product/mobile/core/service/CommonMVCService.java b/src/main/java/com/product/mobile/core/service/CommonMVCService.java
index f418f38..e43226a 100644
--- a/src/main/java/com/product/mobile/core/service/CommonMVCService.java
+++ b/src/main/java/com/product/mobile/core/service/CommonMVCService.java
@@ -114,5 +114,14 @@
     		throw new BaseException(MobileCoreCode.GET_ROUTER_FAIL);
     	}
     }
-   
+    /**
+     * 鎵ц琛ㄨ揪寮�
+     * @param exp
+     * @return
+     */
+    public FieldSetEntity excuteExp(String exp) {
+	   String sql="select "+exp+" expValue";
+	   FieldSetEntity fs=baseDao.getFieldSetBySQL(sql, null, false);
+	   return fs;
+    }
 }
diff --git a/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java b/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
index d8cb67b..d7210c6 100644
--- a/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
+++ b/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
@@ -344,7 +344,7 @@
                 return this.error(DeviceCode.SYSTEM_FORM_NODATA);
             }
 
-            String result=result_OK_List(deviceMainenanceService.findDeviceMaintenanceSetting(fse.getString(DeviceConst.UUID),fse.getString("type")));
+            String result=result_OK_List(deviceMainenanceService.findDeviceMaintenanceSetting(fse.getString(DeviceConst.DEVICE_UUID),fse.getString("type")));
             return result;
         } catch (BaseException e) {
             e.printStackTrace();

--
Gitblit v1.9.2