src/main/java/com/product/mobile/core/controller/SignInController.java
@@ -45,9 +45,15 @@ fse = reqp.getFormData(); } //签到时,如果上传了uuid,表示,征对公司规定的考勤点的签到,否则表示不在公司规定的考勤点的签到(任意地点签到。) 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); } } } 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"))) { 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)); } } }