feat(file-upload): 集成新疆油田OSS文件上传功能并优化设备管理
- 集成XjOssUtil实现新疆油田平台OSS文件上传下载功能 - 添加XjOssConfig配置类从Nacos读取OSS相关配置信息 - 实现OAuth2 client_credentials鉴权机制并缓存token到Redis - 支持.tar文件强制使用MyUpload上传,其他文件根据oss_flag配置选择上传方式 - 在WatchDeviceController中禁用移动端解绑手表功能并添加删除设备时的绑定检查 - 添加/sys/upload/down/**和/sys/upload/show/**匿名访问权限支持文件下载预览 - 实现文件下载预览接口支持IOSP平台文件服务并添加安全校验机制 - 在CareUserDetailsParam中添加年份字段默认为当前年份
This commit is contained in:
+7
-1
@@ -207,7 +207,9 @@ public class WatchDeviceController extends JeecgController<WatchDevice, IWatchDe
|
||||
@Operation(summary = "移动端解绑设备(手表)", description = "移动端解绑设备(手表)")
|
||||
@GetMapping("/app/unbundleDevice")
|
||||
public Result unbundleDevice(@RequestParam(name = "watchNo") String watchNo) {
|
||||
return watchDeviceService.unbundleDevice(watchNo);
|
||||
//移动端暂不允许解绑手表
|
||||
return Result.error("请联系健康管理员解绑");
|
||||
// return watchDeviceService.unbundleDevice(watchNo);
|
||||
}
|
||||
|
||||
|
||||
@@ -356,6 +358,10 @@ public class WatchDeviceController extends JeecgController<WatchDevice, IWatchDe
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
WatchDevice watchDevice = watchDeviceService.getById(id);
|
||||
// 已绑定用户的手表不允许删除
|
||||
if (StringUtils.hasLength(watchDevice.getBindUserId())) {
|
||||
return Result.error("该手表已绑定用户,请先解绑后再删除!");
|
||||
}
|
||||
watchDeviceService.removeById(id);
|
||||
// 删除开关
|
||||
LambdaQueryWrapper<WatchDeviceSwitch> queryWrapper = new LambdaQueryWrapper<>();
|
||||
|
||||
Reference in New Issue
Block a user