diff --git a/src/main/java/com/yj/earth/auth/AuthGenerator.java b/src/main/java/com/yj/earth/auth/AuthGenerator.java index 3d5f196..98da629 100644 --- a/src/main/java/com/yj/earth/auth/AuthGenerator.java +++ b/src/main/java/com/yj/earth/auth/AuthGenerator.java @@ -77,7 +77,7 @@ public class AuthGenerator { public static void main(String[] args) { try { // 生成加密的授权字符串 - String authContent = generateAuth("标准版", 1000, 365, "3A446222D1FE537F6C9EEF5C2AB3F957"); + String authContent = generateAuth("标准版", 1000, 7, "25F429FDA965007B72BB7A6B2C03535A"); // 定义授权文件路径(当前目录下的 yjearth.lic) Path licPath = Paths.get("yjearth.lic"); diff --git a/src/main/java/com/yj/earth/business/controller/TsEventController.java b/src/main/java/com/yj/earth/business/controller/TsEventController.java index 8b6a17d..59270b8 100644 --- a/src/main/java/com/yj/earth/business/controller/TsEventController.java +++ b/src/main/java/com/yj/earth/business/controller/TsEventController.java @@ -40,8 +40,8 @@ public class TsEventController { @PostMapping("/delete") @Operation(summary = "删除态势事件") - public ApiResponse delete(@Parameter(description = "态势事件ID") @RequestParam(required = true) String id) { - tsEventService.removeById(id); + public ApiResponse deletes(@Parameter(description = "态势事件ID列表") @RequestBody List ids) { + tsEventService.removeByIds(ids); return ApiResponse.success(null); } diff --git a/src/main/java/com/yj/earth/business/controller/TsSourceController.java b/src/main/java/com/yj/earth/business/controller/TsSourceController.java index 28381af..9b8a7ec 100644 --- a/src/main/java/com/yj/earth/business/controller/TsSourceController.java +++ b/src/main/java/com/yj/earth/business/controller/TsSourceController.java @@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; + import static com.yj.earth.common.constant.GlobalConstant.SHOW; @Tag(name = "态势资源管理") @@ -38,8 +40,8 @@ public class TsSourceController { @Operation(summary = "删除态势资源") @PostMapping("/delete") - public ApiResponse delete(@Parameter(description = "态势资源ID") @RequestParam(required = true) String id) { - tsSourceService.removeById(id); + public ApiResponse deletes(@Parameter(description = "态势资源ID列表") @RequestBody List ids) { + tsSourceService.removeByIds(ids); return ApiResponse.success(null); } diff --git a/src/main/java/com/yj/earth/business/domain/TsEvent.java b/src/main/java/com/yj/earth/business/domain/TsEvent.java index 998cf64..788352e 100644 --- a/src/main/java/com/yj/earth/business/domain/TsEvent.java +++ b/src/main/java/com/yj/earth/business/domain/TsEvent.java @@ -32,9 +32,9 @@ public class TsEvent implements Serializable { @Schema(description = "事件回调") private String callback; @Schema(description = "开始时间") - private LocalDateTime startTime; + private Long startTime; @Schema(description = "结束时间") - private LocalDateTime endTime; + private Long endTime; @Schema(description = "其他参数") private String detail; @Schema(description = "创建时间") diff --git a/src/main/java/com/yj/earth/design/TsEvent.java b/src/main/java/com/yj/earth/design/TsEvent.java index f638e24..6d38768 100644 --- a/src/main/java/com/yj/earth/design/TsEvent.java +++ b/src/main/java/com/yj/earth/design/TsEvent.java @@ -18,9 +18,9 @@ public class TsEvent { @Schema(description = "事件回调") private String callback; @Schema(description = "开始时间") - private LocalDateTime startTime; + private Long startTime; @Schema(description = "结束时间") - private LocalDateTime endTime; + private Long endTime; @Schema(description = "其他参数") private String detail; @Schema(description = "创建时间") diff --git a/src/main/java/com/yj/earth/dto/tsEvent/AddTsEventDto.java b/src/main/java/com/yj/earth/dto/tsEvent/AddTsEventDto.java index 01bc63c..a876dfe 100644 --- a/src/main/java/com/yj/earth/dto/tsEvent/AddTsEventDto.java +++ b/src/main/java/com/yj/earth/dto/tsEvent/AddTsEventDto.java @@ -18,9 +18,9 @@ public class AddTsEventDto { @Schema(description = "事件回调") private String callback; @Schema(description = "开始时间") - private LocalDateTime startTime; + private Long startTime; @Schema(description = "结束时间") - private LocalDateTime endTime; + private Long endTime; @Schema(description = "其他参数") private String detail; } diff --git a/src/main/java/com/yj/earth/dto/tsEvent/UpdateTsEventDto.java b/src/main/java/com/yj/earth/dto/tsEvent/UpdateTsEventDto.java index 10407a5..1820b44 100644 --- a/src/main/java/com/yj/earth/dto/tsEvent/UpdateTsEventDto.java +++ b/src/main/java/com/yj/earth/dto/tsEvent/UpdateTsEventDto.java @@ -18,9 +18,9 @@ public class UpdateTsEventDto { @Schema(description = "事件回调") private String callback; @Schema(description = "开始时间") - private LocalDateTime startTime; + private Long startTime; @Schema(description = "结束时间") - private LocalDateTime endTime; + private Long endTime; @Schema(description = "其他参数") private String detail; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index da2bb7c..3999805 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - host: 192.168.110.137 + host: 127.0.0.1 port: 8848 sdk: