From 2a89423eb05874c62bf82daf86fc49173ab247b8 Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Tue, 11 Apr 2023 16:21:46 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E5=BA=8F=E5=88=97=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=20#=20=E7=AB=99=E7=82=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/operational/station/entity/StationEntity.java   | 2 --
 hzims-service/operational/pom.xml                                  | 6 ------
 .../hnac/hzims/operational/main/config/WebDataConvertConfig.java   | 4 ++--
 .../hzims/operational/station/controller/StationController.java    | 7 +------
 .../hzims/operational/station/service/impl/StationServiceImpl.java | 4 ++--
 5 files changed, 5 insertions(+), 18 deletions(-)

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 @@
             <artifactId>hutool-core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.13.2</version>
-        </dependency>
-
         <!--WebSocket核心依赖包-->
         <dependency>
             <groupId>org.java-websocket</groupId>
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<StationMapper, StationEn
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean removeStation(String ids) {
-		if(this.deleteLogic(Func.toLongList(ids,","))) {
-			Func.toLongList(ids,",").forEach(id -> {
+		if(this.deleteLogic(Func.toLongList(",",ids))) {
+			Func.toLongList(",",ids).forEach(id -> {
 				StationEntity stationEntity = this.getById(id);
 				// 删除数据平台项目
 				Result<ProjectVO> existProject = projectClient.getProjectByPid(stationEntity.getCode());