diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java b/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java new file mode 100644 index 0000000..ce0dbe9 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java @@ -0,0 +1,23 @@ +package org.springnewfiber.dataadapter.xf; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.ThreadPoolExecutor; + +@Configuration +public class ThreadPoolExecutorConfig { + @Bean + public ThreadPoolTaskExecutor taskExecutor() { + ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); + taskExecutor.setCorePoolSize(5); + taskExecutor.setMaxPoolSize(50); + taskExecutor.setKeepAliveSeconds(150); + taskExecutor.setQueueCapacity(500); + taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardOldestPolicy()); + taskExecutor.initialize(); + taskExecutor.setThreadNamePrefix("spring-threadPoolExecutorConfig-savedb"); + return taskExecutor; + } +} \ No newline at end of file diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java b/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java new file mode 100644 index 0000000..ce0dbe9 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java @@ -0,0 +1,23 @@ +package org.springnewfiber.dataadapter.xf; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.ThreadPoolExecutor; + +@Configuration +public class ThreadPoolExecutorConfig { + @Bean + public ThreadPoolTaskExecutor taskExecutor() { + ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); + taskExecutor.setCorePoolSize(5); + taskExecutor.setMaxPoolSize(50); + taskExecutor.setKeepAliveSeconds(150); + taskExecutor.setQueueCapacity(500); + taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardOldestPolicy()); + taskExecutor.initialize(); + taskExecutor.setThreadNamePrefix("spring-threadPoolExecutorConfig-savedb"); + return taskExecutor; + } +} \ No newline at end of file diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 4488b4c..ae9b4a9 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -37,6 +37,7 @@ GwYsLData("GwYsLData","雨水管网水位监测数据"), GwWsQData("GwWsQData","污水管网流量监测数据"), GwWsLData("GwWsLData"," 污水管网水位监测数据"), + GwYsSZData("GwYsSZData"," 雨水管网水质监测数据"), ; private String code; private String remark; diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java b/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java new file mode 100644 index 0000000..ce0dbe9 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java @@ -0,0 +1,23 @@ +package org.springnewfiber.dataadapter.xf; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.ThreadPoolExecutor; + +@Configuration +public class ThreadPoolExecutorConfig { + @Bean + public ThreadPoolTaskExecutor taskExecutor() { + ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); + taskExecutor.setCorePoolSize(5); + taskExecutor.setMaxPoolSize(50); + taskExecutor.setKeepAliveSeconds(150); + taskExecutor.setQueueCapacity(500); + taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardOldestPolicy()); + taskExecutor.initialize(); + taskExecutor.setThreadNamePrefix("spring-threadPoolExecutorConfig-savedb"); + return taskExecutor; + } +} \ No newline at end of file diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 4488b4c..ae9b4a9 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -37,6 +37,7 @@ GwYsLData("GwYsLData","雨水管网水位监测数据"), GwWsQData("GwWsQData","污水管网流量监测数据"), GwWsLData("GwWsLData"," 污水管网水位监测数据"), + GwYsSZData("GwYsSZData"," 雨水管网水质监测数据"), ; private String code; private String remark; diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java index 7e80826..d1bff45 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -13,7 +13,9 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -32,6 +34,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import java.util.concurrent.ThreadPoolExecutor; import java.util.stream.Collectors; /** @@ -51,7 +54,6 @@ private final BladeRedis redis; @Value("${business.hankouSaveUrl}") private String hankouSaveUrl; - private final DataAccessRecordService dataAccessRecordService; @PostMapping("/xfInterface") @@ -129,7 +131,8 @@ else if(xfDataEnum == XfDataEnum.GwWsLData ||xfDataEnum == XfDataEnum.GwWsQData ||xfDataEnum == XfDataEnum.GwYsLData - ||xfDataEnum == XfDataEnum.GwYsQData){ + ||xfDataEnum == XfDataEnum.GwYsQData + ||xfDataEnum==XfDataEnum.GwYsSZData){ DTO = JSONObject.parseArray(data, WsLData.class); // DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); } @@ -324,7 +327,8 @@ else if(xfDataEnum == XfDataEnum.GwWsLData ||xfDataEnum == XfDataEnum.GwWsQData ||xfDataEnum == XfDataEnum.GwYsLData - ||xfDataEnum == XfDataEnum.GwYsQData){ + ||xfDataEnum == XfDataEnum.GwYsQData + ||xfDataEnum==XfDataEnum.GwYsSZData){ WsLData DTO = JSONObject.parseObject(data, WsLData.class); model = RealTimeSerializer.xfObjectToRealMap(DTO); // DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java b/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java new file mode 100644 index 0000000..ce0dbe9 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java @@ -0,0 +1,23 @@ +package org.springnewfiber.dataadapter.xf; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.ThreadPoolExecutor; + +@Configuration +public class ThreadPoolExecutorConfig { + @Bean + public ThreadPoolTaskExecutor taskExecutor() { + ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); + taskExecutor.setCorePoolSize(5); + taskExecutor.setMaxPoolSize(50); + taskExecutor.setKeepAliveSeconds(150); + taskExecutor.setQueueCapacity(500); + taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardOldestPolicy()); + taskExecutor.initialize(); + taskExecutor.setThreadNamePrefix("spring-threadPoolExecutorConfig-savedb"); + return taskExecutor; + } +} \ No newline at end of file diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 4488b4c..ae9b4a9 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -37,6 +37,7 @@ GwYsLData("GwYsLData","雨水管网水位监测数据"), GwWsQData("GwWsQData","污水管网流量监测数据"), GwWsLData("GwWsLData"," 污水管网水位监测数据"), + GwYsSZData("GwYsSZData"," 雨水管网水质监测数据"), ; private String code; private String remark; diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java index 7e80826..d1bff45 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -13,7 +13,9 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -32,6 +34,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import java.util.concurrent.ThreadPoolExecutor; import java.util.stream.Collectors; /** @@ -51,7 +54,6 @@ private final BladeRedis redis; @Value("${business.hankouSaveUrl}") private String hankouSaveUrl; - private final DataAccessRecordService dataAccessRecordService; @PostMapping("/xfInterface") @@ -129,7 +131,8 @@ else if(xfDataEnum == XfDataEnum.GwWsLData ||xfDataEnum == XfDataEnum.GwWsQData ||xfDataEnum == XfDataEnum.GwYsLData - ||xfDataEnum == XfDataEnum.GwYsQData){ + ||xfDataEnum == XfDataEnum.GwYsQData + ||xfDataEnum==XfDataEnum.GwYsSZData){ DTO = JSONObject.parseArray(data, WsLData.class); // DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); } @@ -324,7 +327,8 @@ else if(xfDataEnum == XfDataEnum.GwWsLData ||xfDataEnum == XfDataEnum.GwWsQData ||xfDataEnum == XfDataEnum.GwYsLData - ||xfDataEnum == XfDataEnum.GwYsQData){ + ||xfDataEnum == XfDataEnum.GwYsQData + ||xfDataEnum==XfDataEnum.GwYsSZData){ WsLData DTO = JSONObject.parseObject(data, WsLData.class); model = RealTimeSerializer.xfObjectToRealMap(DTO); // DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java index 32e8b2d..48e07df 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java @@ -28,4 +28,10 @@ @ApiModelProperty(value = "水深") @JsonProperty(value ="z") private BigDecimal ZB; + @JsonProperty(value ="nh4n") + @ApiModelProperty(value = "氨氮(毫克/升") + private BigDecimal NH4N; + @JsonProperty(value ="codmn") + @ApiModelProperty(value = "COD(毫克/升)") + private BigDecimal CODMN; } diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java b/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java new file mode 100644 index 0000000..ce0dbe9 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/xf/ThreadPoolExecutorConfig.java @@ -0,0 +1,23 @@ +package org.springnewfiber.dataadapter.xf; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.ThreadPoolExecutor; + +@Configuration +public class ThreadPoolExecutorConfig { + @Bean + public ThreadPoolTaskExecutor taskExecutor() { + ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); + taskExecutor.setCorePoolSize(5); + taskExecutor.setMaxPoolSize(50); + taskExecutor.setKeepAliveSeconds(150); + taskExecutor.setQueueCapacity(500); + taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardOldestPolicy()); + taskExecutor.initialize(); + taskExecutor.setThreadNamePrefix("spring-threadPoolExecutorConfig-savedb"); + return taskExecutor; + } +} \ No newline at end of file diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java index 4488b4c..ae9b4a9 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/XfDataEnum.java @@ -37,6 +37,7 @@ GwYsLData("GwYsLData","雨水管网水位监测数据"), GwWsQData("GwWsQData","污水管网流量监测数据"), GwWsLData("GwWsLData"," 污水管网水位监测数据"), + GwYsSZData("GwYsSZData"," 雨水管网水质监测数据"), ; private String code; private String remark; diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java index 7e80826..d1bff45 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/controller/MonitorDataController.java @@ -13,7 +13,9 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -32,6 +34,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import java.util.concurrent.ThreadPoolExecutor; import java.util.stream.Collectors; /** @@ -51,7 +54,6 @@ private final BladeRedis redis; @Value("${business.hankouSaveUrl}") private String hankouSaveUrl; - private final DataAccessRecordService dataAccessRecordService; @PostMapping("/xfInterface") @@ -129,7 +131,8 @@ else if(xfDataEnum == XfDataEnum.GwWsLData ||xfDataEnum == XfDataEnum.GwWsQData ||xfDataEnum == XfDataEnum.GwYsLData - ||xfDataEnum == XfDataEnum.GwYsQData){ + ||xfDataEnum == XfDataEnum.GwYsQData + ||xfDataEnum==XfDataEnum.GwYsSZData){ DTO = JSONObject.parseArray(data, WsLData.class); // DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); } @@ -324,7 +327,8 @@ else if(xfDataEnum == XfDataEnum.GwWsLData ||xfDataEnum == XfDataEnum.GwWsQData ||xfDataEnum == XfDataEnum.GwYsLData - ||xfDataEnum == XfDataEnum.GwYsQData){ + ||xfDataEnum == XfDataEnum.GwYsQData + ||xfDataEnum==XfDataEnum.GwYsSZData){ WsLData DTO = JSONObject.parseObject(data, WsLData.class); model = RealTimeSerializer.xfObjectToRealMap(DTO); // DTO = surgeTankDataList.stream().map(WrOutwamntRData::dtoToDto).collect(Collectors.toList()); diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java index 32e8b2d..48e07df 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/WsLData.java @@ -28,4 +28,10 @@ @ApiModelProperty(value = "水深") @JsonProperty(value ="z") private BigDecimal ZB; + @JsonProperty(value ="nh4n") + @ApiModelProperty(value = "氨氮(毫克/升") + private BigDecimal NH4N; + @JsonProperty(value ="codmn") + @ApiModelProperty(value = "COD(毫克/升)") + private BigDecimal CODMN; } diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java b/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java index 6cd49bd..073c1eb 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.Map; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springnewfiber.dataadapter.config.RequestDataHelper; import org.springnewfiber.dataadapter.xf.entity.DataAccessRecord; @@ -24,7 +25,7 @@ @Service @DS("access") public class DataAccessRecordService extends ServiceImpl { - + @Async public Integer save(EDataAccessType accessType, String dataType, String content){ RequestDataHelper.setRequestData(new HashMap() {{ int year=DateUtil.thisYear();