Skip to content

Commit 7119350

Browse files
YunaiVYunaiV
committed
【同步】jdk21 和 jdk8 的代码
1 parent de171c5 commit 7119350

File tree

103 files changed

+211
-169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+211
-169
lines changed

‎yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
import cn.hutool.core.util.StrUtil;
88
import cn.hutool.http.HttpRequest;
99
import cn.hutool.http.HttpResponse;
10-
import jakarta.servlet.http.HttpServletRequest;
10+
import lombok.SneakyThrows;
1111
import org.springframework.util.StringUtils;
1212
import org.springframework.web.util.UriComponents;
1313
import org.springframework.web.util.UriComponentsBuilder;
1414

15+
import javax.servlet.http.HttpServletRequest;
1516
import java.net.URI;
1617
import java.net.URLEncoder;
1718
import java.nio.charset.Charset;
@@ -31,8 +32,9 @@ public class HttpUtils {
3132
* @param value 参数
3233
* @return 编码后的参数
3334
*/
35+
@SneakyThrows
3436
public static String encodeUtf8(String value) {
35-
return URLEncoder.encode(value, StandardCharsets.UTF_8);
37+
return URLEncoder.encode(value, StandardCharsets.UTF_8.name());
3638
}
3739

3840
@SuppressWarnings("unchecked")

‎yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public static Map<String, String> getParamMap(HttpServletRequest request) {
117117
}
118118

119119
public static Map<String, String> getHeaderMap(HttpServletRequest request) {
120-
return JakartaServletUtil.getHeaderMap(request);
120+
return ServletUtil.getHeaderMap(request);
121121
}
122122

123123
}

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/IotDeviceUpstreamApi.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
44
import cn.iocoder.yudao.module.iot.api.device.dto.control.upstream.*;
55
import cn.iocoder.yudao.module.iot.enums.ApiConstants;
6-
import jakarta.validation.Valid;
76
import org.springframework.web.bind.annotation.PostMapping;
87
import org.springframework.web.bind.annotation.RequestBody;
98

9+
import javax.validation.Valid;
10+
1011
/**
1112
* 设备数据 Upstream 上行 API
1213
*

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDeviceConfigSetReqDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cn.iocoder.yudao.module.iot.api.device.dto.control.downstream;
22

3-
import jakarta.validation.constraints.NotNull;
43
import lombok.Data;
54

5+
import javax.validation.constraints.NotNull;
66
import java.util.Map;
77

88
/**

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDeviceDownstreamAbstractReqDTO.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package cn.iocoder.yudao.module.iot.api.device.dto.control.downstream;
22

3-
import jakarta.validation.constraints.NotEmpty;
43
import lombok.Data;
54

5+
import javax.validation.constraints.NotEmpty;
6+
67
/**
78
* IoT 设备下行的抽象 Request DTO
89
*

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDevicePropertyGetReqDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cn.iocoder.yudao.module.iot.api.device.dto.control.downstream;
22

3-
import jakarta.validation.constraints.NotEmpty;
43
import lombok.Data;
54

5+
import javax.validation.constraints.NotEmpty;
66
import java.util.List;
77

88
// TODO @芋艿：从 server => plugin => device 是否有必要？从阿里云 iot 来看，没有这个功能？！

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDevicePropertySetReqDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cn.iocoder.yudao.module.iot.api.device.dto.control.downstream;
22

3-
import jakarta.validation.constraints.NotEmpty;
43
import lombok.Data;
54

5+
import javax.validation.constraints.NotEmpty;
66
import java.util.Map;
77

88
/**

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDeviceServiceInvokeReqDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cn.iocoder.yudao.module.iot.api.device.dto.control.downstream;
22

3-
import jakarta.validation.constraints.NotEmpty;
43
import lombok.Data;
54

5+
import javax.validation.constraints.NotEmpty;
66
import java.util.Map;
77

88
/**

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceEmqxAuthReqDTO.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package cn.iocoder.yudao.module.iot.api.device.dto.control.upstream;
22

3-
import jakarta.validation.constraints.NotEmpty;
43
import lombok.Data;
54

5+
import javax.validation.constraints.NotEmpty;
6+
67
// TODO @芋艿：要不要继承 IotDeviceUpstreamAbstractReqDTO
78
// TODO @芋艿：@haohao：后续其它认证的设计
89
/**

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceEventReportReqDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cn.iocoder.yudao.module.iot.api.device.dto.control.upstream;
22

3-
import jakarta.validation.constraints.NotEmpty;
43
import lombok.Data;
54

5+
import javax.validation.constraints.NotEmpty;
66
import java.util.Map;
77

88
/**

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDevicePropertyReportReqDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cn.iocoder.yudao.module.iot.api.device.dto.control.upstream;
22

3-
import jakarta.validation.constraints.NotEmpty;
43
import lombok.Data;
54

5+
import javax.validation.constraints.NotEmpty;
66
import java.util.Map;
77

88
/**

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceRegisterSubReqDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cn.iocoder.yudao.module.iot.api.device.dto.control.upstream;
22

3-
import jakarta.validation.constraints.NotEmpty;
43
import lombok.Data;
54

5+
import javax.validation.constraints.NotEmpty;
66
import java.util.List;
77

88
/**

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceStateUpdateReqDTO.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import cn.iocoder.yudao.framework.common.validation.InEnum;
44
import cn.iocoder.yudao.module.iot.enums.device.IotDeviceStateEnum;
5-
import jakarta.validation.constraints.NotNull;
65
import lombok.Data;
76

7+
import javax.validation.constraints.NotNull;
8+
89
/**
910
* IoT 设备【状态】更新 Request DTO
1011
*

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceTopologyAddReqDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cn.iocoder.yudao.module.iot.api.device.dto.control.upstream;
22

3-
import jakarta.validation.constraints.NotEmpty;
43
import lombok.Data;
54

5+
import javax.validation.constraints.NotEmpty;
66
import java.util.List;
77

88
// TODO @芋艿：要写清楚，是来自设备网关，还是设备。

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceUpstreamAbstractReqDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import cn.iocoder.yudao.framework.common.util.json.databind.TimestampLocalDateTimeSerializer;
44
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
5-
import jakarta.validation.constraints.NotEmpty;
65
import lombok.Data;
76

7+
import javax.validation.constraints.NotEmpty;
88
import java.time.LocalDateTime;
99

1010
/**

‎yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotPluginInstanceHeartbeatReqDTO.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package cn.iocoder.yudao.module.iot.api.device.dto.control.upstream;
22

3-
import jakarta.validation.constraints.NotEmpty;
4-
import jakarta.validation.constraints.NotNull;
53
import lombok.Data;
64

5+
import javax.validation.constraints.NotEmpty;
6+
import javax.validation.constraints.NotNull;
7+
78
/**
89
* IoT 插件实例心跳 Request DTO
910
*

‎yudao-module-iot/yudao-module-iot-biz/pom.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,18 @@
9999
<type>pom</type>
100100
</dependency>
101101

102-
<!-- TODO @芋艿：bom 管理 -->
103-
<dependency>
104-
<groupId>org.graalvm.js</groupId>
105-
<artifactId>js</artifactId>
106-
<version>24.1.2</version>
107-
<type>pom</type>
108-
</dependency>
109-
<dependency>
110-
<groupId>org.graalvm.js</groupId>
111-
<artifactId>js-scriptengine</artifactId>
112-
<version>24.1.2</version>
113-
</dependency>
102+
<!-- TODO @芋艿：bom 管理 TODO @芋艿：不支持 jdk8 -->
103+
<!-- <dependency>-->
104+
<!-- <groupId>org.graalvm.js</groupId>-->
105+
<!-- <artifactId>js</artifactId>-->
106+
<!-- <version>24.1.2</version>-->
107+
<!-- <type>pom</type>-->
108+
<!-- </dependency>-->
109+
<!-- <dependency>-->
110+
<!-- <groupId>org.graalvm.js</groupId>-->
111+
<!-- <artifactId>js-scriptengine</artifactId>-->
112+
<!-- <version>24.1.2</version>-->
113+
<!-- </dependency>-->
114114

115115
<!-- TODO @芋艿：合理注释 -->
116116
<!-- IoT 数据桥梁的执行器所需消息队列。如果您只需要使用 rocketmq 那么则注释掉其它消息队列即可 -->

‎yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceUpstreamApiImpl.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
import cn.iocoder.yudao.module.iot.api.device.dto.control.upstream.*;
55
import cn.iocoder.yudao.module.iot.service.device.control.IotDeviceUpstreamService;
66
import cn.iocoder.yudao.module.iot.service.plugin.IotPluginInstanceService;
7-
import jakarta.annotation.Resource;
87
import org.springframework.validation.annotation.Validated;
98
import org.springframework.web.bind.annotation.RestController;
109

10+
import javax.annotation.Resource;
11+
1112
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
1213

1314
/**

‎yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
import io.swagger.v3.oas.annotations.Operation;
1717
import io.swagger.v3.oas.annotations.Parameter;
1818
import io.swagger.v3.oas.annotations.tags.Tag;
19-
import jakarta.annotation.Resource;
20-
import jakarta.servlet.http.HttpServletResponse;
21-
import jakarta.validation.Valid;
2219
import org.springframework.security.access.prepost.PreAuthorize;
2320
import org.springframework.validation.annotation.Validated;
2421
import org.springframework.web.bind.annotation.*;
2522
import org.springframework.web.multipart.MultipartFile;
2623

24+
import javax.annotation.Resource;
25+
import javax.servlet.http.HttpServletResponse;
26+
import javax.validation.Valid;
2727
import java.io.IOException;
2828
import java.util.Arrays;
2929
import java.util.Collection;

‎yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceGroupController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
import io.swagger.v3.oas.annotations.Operation;
1414
import io.swagger.v3.oas.annotations.Parameter;
1515
import io.swagger.v3.oas.annotations.tags.Tag;
16-
import jakarta.annotation.Resource;
17-
import jakarta.validation.Valid;
1816
import org.springframework.security.access.prepost.PreAuthorize;
1917
import org.springframework.validation.annotation.Validated;
2018
import org.springframework.web.bind.annotation.*;
2119

20+
import javax.annotation.Resource;
21+
import javax.validation.Valid;
2222
import java.util.List;
2323

2424
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

‎yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceLogController.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
import cn.iocoder.yudao.module.iot.service.device.data.IotDeviceLogService;
1010
import io.swagger.v3.oas.annotations.Operation;
1111
import io.swagger.v3.oas.annotations.tags.Tag;
12-
import jakarta.annotation.Resource;
13-
import jakarta.validation.Valid;
1412
import org.springframework.security.access.prepost.PreAuthorize;
1513
import org.springframework.validation.annotation.Validated;
1614
import org.springframework.web.bind.annotation.GetMapping;
1715
import org.springframework.web.bind.annotation.RequestMapping;
1816
import org.springframework.web.bind.annotation.RestController;
1917

18+
import javax.annotation.Resource;
19+
import javax.validation.Valid;
20+
2021
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
2122

2223
@Tag(name = "管理后台 - IoT 设备日志")

‎yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDevicePropertyController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
import io.swagger.v3.oas.annotations.Parameter;
1919
import io.swagger.v3.oas.annotations.Parameters;
2020
import io.swagger.v3.oas.annotations.tags.Tag;
21-
import jakarta.annotation.Resource;
22-
import jakarta.validation.Valid;
2321
import org.springframework.security.access.prepost.PreAuthorize;
2422
import org.springframework.validation.annotation.Validated;
2523
import org.springframework.web.bind.annotation.GetMapping;
2624
import org.springframework.web.bind.annotation.RequestMapping;
2725
import org.springframework.web.bind.annotation.RequestParam;
2826
import org.springframework.web.bind.annotation.RestController;
2927

28+
import javax.annotation.Resource;
29+
import javax.validation.Valid;
3030
import java.util.List;
3131
import java.util.Map;
3232

‎yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/control/IotDeviceDownstreamReqVO.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
import cn.iocoder.yudao.framework.common.validation.InEnum;
44
import cn.iocoder.yudao.module.iot.enums.device.IotDeviceMessageTypeEnum;
55
import io.swagger.v3.oas.annotations.media.Schema;
6-
import jakarta.validation.constraints.NotEmpty;
7-
import jakarta.validation.constraints.NotNull;
86
import lombok.Data;
97

8+
import javax.validation.constraints.NotEmpty;
9+
import javax.validation.constraints.NotNull;
10+
1011
@Schema(description = "管理后台 - IoT 设备下行 Request VO") // 服务调用、属性设置、属性获取等
1112
@Data
1213
public class IotDeviceDownstreamReqVO {

‎yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/control/IotDeviceUpstreamReqVO.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
import cn.iocoder.yudao.framework.common.validation.InEnum;
44
import cn.iocoder.yudao.module.iot.enums.device.IotDeviceMessageTypeEnum;
55
import io.swagger.v3.oas.annotations.media.Schema;
6-
import jakarta.validation.constraints.NotEmpty;
7-
import jakarta.validation.constraints.NotNull;
86
import lombok.Data;
97

8+
import javax.validation.constraints.NotEmpty;
9+
import javax.validation.constraints.NotNull;
10+
1011
@Schema(description = "管理后台 - IoT 设备上行 Request VO") // 属性上报、事件上报、状态变更等
1112
@Data
1213
public class IotDeviceUpstreamReqVO {

‎yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDeviceLogPageReqVO.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import cn.iocoder.yudao.framework.common.pojo.PageParam;
44
import io.swagger.v3.oas.annotations.media.Schema;
5-
import jakarta.validation.constraints.NotEmpty;
65
import lombok.Data;
76

7+
import javax.validation.constraints.NotEmpty;
8+
89
@Schema(description = "管理后台 - IoT 设备日志分页查询 Request VO")
910
@Data
1011
public class IotDeviceLogPageReqVO extends PageParam {

‎yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDevicePropertyHistoryPageReqVO.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import cn.iocoder.yudao.framework.common.pojo.PageParam;
44
import io.swagger.v3.oas.annotations.media.Schema;
5-
import jakarta.validation.constraints.NotEmpty;
6-
import jakarta.validation.constraints.NotNull;
7-
import jakarta.validation.constraints.Size;
85
import lombok.Data;
96
import org.springframework.format.annotation.DateTimeFormat;
107

8+
import javax.validation.constraints.NotEmpty;
9+
import javax.validation.constraints.NotNull;
10+
import javax.validation.constraints.Size;
1111
import java.time.LocalDateTime;
1212

1313
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

‎yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceImportExcelVO.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
import com.alibaba.excel.annotation.ExcelProperty;
44
import io.swagger.v3.oas.annotations.media.Schema;
5-
import jakarta.validation.constraints.NotEmpty;
65
import lombok.AllArgsConstructor;
76
import lombok.Builder;
87
import lombok.Data;
98
import lombok.NoArgsConstructor;
109
import lombok.experimental.Accessors;
1110

11+
import javax.validation.constraints.NotEmpty;
12+
1213
/**
1314
* 设备 Excel 导入 VO
1415
*/

‎yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceSaveReqVO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package cn.iocoder.yudao.module.iot.controller.admin.device.vo.device;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.constraints.Size;
54
import lombok.Data;
65

6+
import javax.validation.constraints.Size;
77
import java.util.Set;
88

99
@Schema(description = "管理后台 - IoT 设备新增/修改 Request VO")

‎yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceUpdateGroupReqVO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package cn.iocoder.yudao.module.iot.controller.admin.device.vo.device;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.constraints.NotEmpty;
54
import lombok.Data;
65

6+
import javax.validation.constraints.NotEmpty;
77
import java.util.Set;
88

99
@Schema(description = "管理后台 - IoT 设备更新分组 Request VO")

0 commit comments

Comments
 (0)