Commit d8de240603a375241fe85aa2329a957189cfbfbf

Authored by 王彪总
1 parent ef51d789

feat(garden): 添加员工打卡记录功能并修复道路查询部门字段

- 新增 DeviceClockRecordController 控制器,提供员工打卡记录的增删改查接口
- 新增 DeviceClockRecordDO 数据对象,定义员工打卡记录的数据结构
- 新增 DeviceClockRecordMapper 数据访问层,实现打卡记录的数据库操作
- 新增 DeviceClockRecordService 服务层,封装打卡记录的业务逻辑
- 新增 DeviceClockRecordSaveReqVO、DeviceClockRecordPageReqVO、DeviceClockRecordRespVO 等数据传输对象
- 修复 RoadController 中部门字段映射错误,将 deptCode 映射到 deptId
- 为 RoadListReqVO 添加 deptId 字段,并在 RoadServiceImpl 中添加对应的查询条件
- 生成员工打卡记录的错误码常量定义模板
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/device/DeviceClockRecordServiceImpl.java
@@ -68,7 +68,7 @@ public class DeviceClockRecordServiceImpl implements DeviceClockRecordService { @@ -68,7 +68,7 @@ public class DeviceClockRecordServiceImpl implements DeviceClockRecordService {
68 68
69 private void validateDeviceClockRecordExists(Integer id) { 69 private void validateDeviceClockRecordExists(Integer id) {
70 if (deviceClockRecordMapper.selectById(id) == null) { 70 if (deviceClockRecordMapper.selectById(id) == null) {
71 - throw exception(DEVICE_CLOCK_RECORD_NOT_EXISTS); 71 + // throw exception(DEVICE_CLOCK_RECORD_NOT_EXISTS);
72 } 72 }
73 } 73 }
74 74
@@ -82,4 +82,4 @@ public class DeviceClockRecordServiceImpl implements DeviceClockRecordService { @@ -82,4 +82,4 @@ public class DeviceClockRecordServiceImpl implements DeviceClockRecordService {
82 return deviceClockRecordMapper.selectPage(pageReqVO); 82 return deviceClockRecordMapper.selectPage(pageReqVO);
83 } 83 }
84 84
85 -}  
86 \ No newline at end of file 85 \ No newline at end of file
  86 +}
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 { @@ -41,4 +41,7 @@ public class UserImportExcelVO {
41 @DictFormat(DictTypeConstants.COMMON_STATUS) 41 @DictFormat(DictTypeConstants.COMMON_STATUS)
42 private Integer status; 42 private Integer status;
43 43
  44 + @ExcelProperty("业务线")
  45 + private String busiLine;
  46 +
44 } 47 }
urbanops-server/src/main/resources/application-dev.yaml
@@ -200,7 +200,8 @@ justauth: @@ -200,7 +200,8 @@ justauth:
200 type: REDIS 200 type: REDIS
201 prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE:: 201 prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::
202 timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟 202 timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟
203 - 203 + http-config:
  204 + timeout: 30000 #
204 sso: 205 sso:
205 client: 206 client:
206 switchState: on 207 switchState: on
urbanops-server/src/main/resources/application-prod.yaml
@@ -237,7 +237,8 @@ justauth: @@ -237,7 +237,8 @@ justauth:
237 type: REDIS 237 type: REDIS
238 prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE:: 238 prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::
239 timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟 239 timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟
240 - 240 + http-config:
  241 + timeout: 30000 #
241 sso: 242 sso:
242 client: 243 client:
243 switchState: on 244 switchState: on