diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java
index 8bbbe87..95d5f9b 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java
+++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java
@@ -86,8 +86,6 @@ public class StationEntity extends TenantEntity implements Serializable {
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss"
)
- @JsonDeserialize(using = LocalDateTimeDeserializer.class)
- @JsonSerialize(using = LocalDateTimeSerializer.class)
@ApiModelProperty("投运时间,用于计算安全运行天数")
private LocalDateTime commissionTime;
diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml
index 6c50243..4cb7a31 100644
--- a/hzims-service/operational/pom.xml
+++ b/hzims-service/operational/pom.xml
@@ -180,12 +180,6 @@
hutool-core
-
- com.fasterxml.jackson.datatype
- jackson-datatype-jsr310
- 2.13.2
-
-
org.java-websocket
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/config/WebDataConvertConfig.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/config/WebDataConvertConfig.java
index c6caf24..249eb5d 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/config/WebDataConvertConfig.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/config/WebDataConvertConfig.java
@@ -21,7 +21,7 @@ import java.util.List;
* @Serial 1.0
* @Date 2023/4/10 16:11
*/
-@Configuration
+//@Configuration
public class WebDataConvertConfig extends WebMvcConfigurationSupport {
@@ -31,7 +31,7 @@ public class WebDataConvertConfig extends WebMvcConfigurationSupport {
super.configureMessageConverters(converters);
}
- @Bean
+ //@Bean
public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter() {
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
ObjectMapper mapper = new ObjectMapper();
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java
index 770e9bb..9dfb795 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java
@@ -145,12 +145,7 @@ public class StationController extends BladeController {
@ApiOperationSupport(order = 40)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- // 刷新演示平台站点数量
- Executors.newSingleThreadExecutor().submit(() -> {
- dataServicel.saveStation();
- return "success";
- });
- return R.status(stationService.deleteLogic(Func.toLongList(ids)));
+ return R.status(stationService.removeStation(ids));
}
@GetMapping("/getStationByCode")
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
index 179b223..d97b91e 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
@@ -127,8 +127,8 @@ public class StationServiceImpl extends BaseServiceImpl {
+ if(this.deleteLogic(Func.toLongList(",",ids))) {
+ Func.toLongList(",",ids).forEach(id -> {
StationEntity stationEntity = this.getById(id);
// 删除数据平台项目
Result existProject = projectClient.getProjectByPid(stationEntity.getCode());