From 32174429510dc5f2e816a6e217f515e37af07d9a Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期六, 08 二月 2025 11:09:20 +0800
Subject: [PATCH] 设备管理

---
 src/main/java/com/product/mobile/core/service/FaceMobileService.java            |    2 ++
 src/main/java/com/product/mobile/device/controller/DeviceManagerController.java |   10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/product/mobile/core/service/FaceMobileService.java b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
index 04ffadc..bb0f105 100644
--- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java
+++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
@@ -149,6 +149,7 @@
 				uuid.setType("String");
 				uuid.setTable(table_name);
 				uuid.setHidden("1");
+				uuid.setDisabled("1");
 				ls.add(uuid);
 			}
 
@@ -189,6 +190,7 @@
 			}
 			if ("uuid".equals(f.getString("field_name"))) {
 				uuid.setHidden("1");
+				uuid.setDisabled("1");
 			}
 			if ("userids".equals(f.getString("field_type")) || "orgUuids".equals(f.getString("field_type"))) {
 				uuid.setMultiple("1");
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 2b27001..d8cb67b 100644
--- a/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
+++ b/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
@@ -160,12 +160,12 @@
                  SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
                  return this.error(DeviceCode.SYSTEM_FORM_NODATA);
              }
-             if (StringUtils.isEmpty(fse.getString("uuid")) && StringUtils.isEmpty(fse.getString("device_number"))  ) {
-            	 SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
-                 return this.error(DeviceCode.SYSTEM_FORM_NODATA);
-             }
+//             if (StringUtils.isEmpty(fse.getString("uuid")) && StringUtils.isEmpty(fse.getString("device_number"))  ) {
+//            	 SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
+//                 return this.error(DeviceCode.SYSTEM_FORM_NODATA);
+//             }
              IDeviceRepairFaultService service = (IDeviceRepairFaultService) getProxyInstance(deviceRepairFaultService);
-             fse.remove("uuid");
+//             fse.remove("uuid");
              String uuid=service.deviceFaultReview(fse);
              System.out.println(uuid);
              return !StringUtils.isEmpty(uuid)? this.OK_Add(uuid):this.error(new BaseException(DeviceCode.DEVICE_MAINTENANCE_CONTENT_DEL_FAIL));

--
Gitblit v1.9.2