From 9b5da188281e5ae4b6fb6219c8813e2e02a2e617 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期四, 09 一月 2025 10:49:49 +0800
Subject: [PATCH] 打卡 设备清单
---
src/main/java/com/product/mobile/core/controller/SignInController.java | 24 +++++++++--
src/main/java/com/product/mobile/core/service/FaceMobileService.java | 4 +
src/main/java/com/product/mobile/device/controller/DeviceManagerController.java | 37 ++++++++++++++++++
3 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/product/mobile/core/controller/SignInController.java b/src/main/java/com/product/mobile/core/controller/SignInController.java
index a6cd22a..de7750c 100644
--- a/src/main/java/com/product/mobile/core/controller/SignInController.java
+++ b/src/main/java/com/product/mobile/core/controller/SignInController.java
@@ -45,9 +45,15 @@
fse = reqp.getFormData();
}
//绛惧埌鏃讹紝濡傛灉涓婁紶浜唘uid锛岃〃绀猴紝寰佸鍏徃瑙勫畾鐨勮�冨嫟鐐圭殑绛惧埌锛屽惁鍒欒〃绀轰笉鍦ㄥ叕鍙歌瀹氱殑鑰冨嫟鐐圭殑绛惧埌(浠绘剰鍦扮偣绛惧埌銆�)
-
- signInService.signIn(fse);
- return this.OK();
+ try {
+ signInService.signIn(fse);
+ return this.OK();
+ } catch (BaseException e) {
+ return this.error(e);
+ } catch (Exception e) {
+
+ return this.error(MobileCoreCode.SIGN_IN_FAIL);
+ }
}
/**
@@ -89,7 +95,15 @@
RequestParameterEntity reqp = (RequestParameterEntity) bean;
fse = reqp.getFormData();
}
- //鑾峰彇褰撳墠浜虹殑鍏徃
- return this.OK_List(signInService.signInSites(SpringMVCContextHolder.getCurrentUser().getCurrentCompany().getUUID()));
+ try {
+ //鑾峰彇褰撳墠浜虹殑鍏徃
+ return this.OK_List(signInService.signInSites(SpringMVCContextHolder.getCurrentUser().getCurrentCompany().getUUID()));
+
+ } catch (BaseException e) {
+ return this.error(e);
+ } catch (Exception e) {
+
+ return this.error(MobileCoreCode.SIGN_IN_FAIL);
+ }
}
}
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 8570b5f..0fe11ac 100644
--- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java
+++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
@@ -188,7 +188,9 @@
FieldSetEntity f = dte.getFieldSetEntity(j);
if ("pk".equals(f.getString("field_type"))
|| "updated_by".equals(f.getString("field_name"))
- || "updated_utc_datetime".equals(f.getString("field_name"))) {
+ || "updated_utc_datetime".equals(f.getString("field_name"))
+ || "flowsign".equals(f.getString("field_type"))
+ ) {
continue;
}
if ("uuid".equals(f.getString("field_name"))) {
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 b663a7c..2b27001 100644
--- a/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
+++ b/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
@@ -495,4 +495,41 @@
return error(new BaseException(e));
}
}
+ /**
+ * 璁惧鍙拌处
+ * @throws IOException
+ */
+ @RequestMapping(value = "/list/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String listDevcie(HttpServletRequest request) {
+
+ try {
+ FieldSetEntity fse = null;
+ Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
+ if (bean != null) {
+ RequestParameterEntity reqp = (RequestParameterEntity) bean;
+ fse = reqp.getFormData();
+ }
+ if (bean == null || fse == null) {
+ SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
+ return this.error(DeviceCode.SYSTEM_FORM_NODATA);
+ }
+ // 鍒ゆ柇鍒嗛〉鍙傛暟鏄惁姝ｅ父
+ if (StringUtils.isEmpty(fse.getString(MobileCoreConst.PAGESIZE))
+ || StringUtils.isEmpty(fse.getString(MobileCoreConst.CPAGE))) {
+
+ SpringMVCContextHolder.getSystemLogger().error(MobileCoreCode.SYSTEM_FORM_COUNT.getValue(), MobileCoreCode.SYSTEM_FORM_COUNT.getText());
+ return this.error(MobileCoreCode.SYSTEM_FORM_COUNT.getValue(), MobileCoreCode.SYSTEM_FORM_COUNT.getText());
+ }
+ return this.OK_List(deviceManagerService.deviceList(fse.getString("searchKey"),fse.getInteger(MobileCoreConst.PAGESIZE),fse.getInteger(MobileCoreConst.CPAGE)));
+
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(new BaseException(e));
+ }
+ }
+
}
--
Gitblit v1.9.2