From d8de240603a375241fe85aa2329a957189cfbfbf Mon Sep 17 00:00:00 2001 From: 王彪总 Date: Sat, 28 Feb 2026 10:27:05 +0800 Subject: [PATCH] feat(garden): 添加员工打卡记录功能并修复道路查询部门字段 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/device/DeviceClockRecordServiceImpl.java | 4 ++-- urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserImportExcelVO.java | 3 +++ urbanops-server/src/main/resources/application-dev.yaml | 3 ++- urbanops-server/src/main/resources/application-prod.yaml | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/device/DeviceClockRecordServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/device/DeviceClockRecordServiceImpl.java index 4fd4d26..6e9ba4c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/device/DeviceClockRecordServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/device/DeviceClockRecordServiceImpl.java @@ -68,7 +68,7 @@ public class DeviceClockRecordServiceImpl implements DeviceClockRecordService { private void validateDeviceClockRecordExists(Integer id) { if (deviceClockRecordMapper.selectById(id) == null) { - throw exception(DEVICE_CLOCK_RECORD_NOT_EXISTS); + // throw exception(DEVICE_CLOCK_RECORD_NOT_EXISTS); } } @@ -82,4 +82,4 @@ public class DeviceClockRecordServiceImpl implements DeviceClockRecordService { return deviceClockRecordMapper.selectPage(pageReqVO); } -} \ No newline at end of file +} diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserImportExcelVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserImportExcelVO.java index fad3d2e..db721df 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserImportExcelVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserImportExcelVO.java @@ -41,4 +41,7 @@ public class UserImportExcelVO { @DictFormat(DictTypeConstants.COMMON_STATUS) private Integer status; + @ExcelProperty("业务线") + private String busiLine; + } diff --git a/urbanops-server/src/main/resources/application-dev.yaml b/urbanops-server/src/main/resources/application-dev.yaml index 4bcaf6b..c760e6d 100644 --- a/urbanops-server/src/main/resources/application-dev.yaml +++ b/urbanops-server/src/main/resources/application-dev.yaml @@ -200,7 +200,8 @@ justauth: type: REDIS prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 - + http-config: + timeout: 30000 # sso: client: switchState: on diff --git a/urbanops-server/src/main/resources/application-prod.yaml b/urbanops-server/src/main/resources/application-prod.yaml index 5cd9670..b76511d 100644 --- a/urbanops-server/src/main/resources/application-prod.yaml +++ b/urbanops-server/src/main/resources/application-prod.yaml @@ -237,7 +237,8 @@ justauth: type: REDIS prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 - + http-config: + timeout: 30000 # sso: client: switchState: on -- libgit2 0.21.4