Skip to content

W
wj-datacenter-platform
Commit 55cc714a authored by duanruiming's avatar duanruiming
Browse files
Options

[add] 国产化

parent 19db6e88
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 25 deletions
pom.xml
View file @ 55cc714a
......@@ -57,6 +57,18 @@
<!-- 依赖声明 -->
<dependencyManagement>
<dependencies>
<!-- 瀚高数据库-->
<dependency>
<groupId>com.highgo</groupId>
<artifactId>HgdbJdbc</artifactId>
<version>6.2.2</version>
</dependency>
<!-- 中创中间件inforsuite-->
<dependency>
<groupId>com.cvicse.embedded</groupId>
<artifactId>spring-boot-starter-inforsuite</artifactId>
<version>10.0.2.5</version>
</dependency>
<!-- 自定义feign远程调用-->
<dependency>
<groupId>net.wanji</groupId>
......@@ -69,6 +81,10 @@
<artifactId>spring-boot-starter-log4j2</artifactId>
<version>2.2.2.RELEASE</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
......
wj-datacenter-service/pom.xml
View file @ 55cc714a
......@@ -23,6 +23,14 @@
</properties>
<dependencies>
<dependency>
<groupId>com.highgo</groupId>
<artifactId>HgdbJdbc</artifactId>
</dependency>
<dependency>
<groupId>com.cvicse.embedded</groupId>
<artifactId>spring-boot-starter-inforsuite</artifactId>
</dependency>
<!-- alibaba fastjson 依赖 -->
<dependency>
<groupId>com.alibaba</groupId>
......@@ -83,12 +91,6 @@
<artifactId>wj-databus</artifactId>
<version>0.0.3</version>
</dependency>
<!-- 数据库驱动 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.33</version>
</dependency>
<!--Nacos 配置中心-->
<dependency>
<groupId>com.alibaba.cloud</groupId>
......
wj-datacenter-service/src/main/java/net/wanji/datacenter/kafka/CrossStrategyOptConsumerHandler.java
View file @ 55cc714a
......@@ -37,7 +37,7 @@ public class CrossStrategyOptConsumerHandler implements KafkaListenerErrorHandle
* @param acknowledgment
* @throws Exception
*/
@KafkaListener(topics = {"${kafka-consumer.phaseEmptyTopic}"}, groupId = "group")
@KafkaListener(topics = {"${kafka-consumer.phaseEmptyTopic}"}, groupId = "group0510")
public void receivePhaseEmptyData(ConsumerRecord<Object, Object> record, Acknowledgment acknowledgment) throws Exception {
try {
String message = String.valueOf(record.value());
......@@ -58,7 +58,7 @@ public class CrossStrategyOptConsumerHandler implements KafkaListenerErrorHandle
* @param acknowledgment
* @throws Exception
*/
@KafkaListener(topics = {"${kafka-consumer.imbalanceAlgorithmResultTopic}"}, groupId = "group")
@KafkaListener(topics = {"${kafka-consumer.imbalanceAlgorithmResultTopic}"}, groupId = "group0510")
public void receiveImbalanceData(ConsumerRecord<Object, Object> record, Acknowledgment acknowledgment) throws Exception {
String message = String.valueOf(record.value());
try {
......@@ -77,7 +77,7 @@ public class CrossStrategyOptConsumerHandler implements KafkaListenerErrorHandle
acknowledgment.acknowledge();
}
@KafkaListener(topics = {"${kafka-consumer.overflowAlgorithmResultTopic}"}, groupId = "group")
@KafkaListener(topics = {"${kafka-consumer.overflowAlgorithmResultTopic}"}, groupId = "group0510")
public void receiveOverFlowData(ConsumerRecord<Object, Object> record, Acknowledgment acknowledgment) throws Exception {
try {
String message = String.valueOf(record.value());
......
wj-datacenter-service/src/main/java/net/wanji/datacenter/kafka/EventDataConsumerHandler.java
View file @ 55cc714a
......@@ -25,7 +25,7 @@ public class EventDataConsumerHandler implements KafkaListenerErrorHandler {
@Resource
private EventDataService eventDataService;
@KafkaListener(topics = {"${kafka-consumer.eventDataTopic}"}, groupId = "group")
@KafkaListener(topics = {"${kafka-consumer.eventDataTopic}"}, groupId = "group0510")
public void receiveEventData(ConsumerRecord<Object, Object> record, Acknowledgment acknowledgment) throws Exception {
try {
String message = String.valueOf(record.value());
......
wj-datacenter-service/src/main/java/net/wanji/datacenter/kafka/GreenBeltDataConsumerHandler.java
View file @ 55cc714a
......@@ -37,7 +37,7 @@ public class GreenBeltDataConsumerHandler implements KafkaListenerErrorHandler {
* @param acknowledgment
* @throws Exception
*/
@KafkaListener(topics = {"${kafka-consumer.greenBeltInfoDataTopic}"}, groupId = "group")
@KafkaListener(topics = {"${kafka-consumer.greenBeltInfoDataTopic}"}, groupId = "group0510")
public void receiveGreenBeltInfoData(ConsumerRecord<Object, Object> record, Acknowledgment acknowledgment) throws Exception {
try {
String message = String.valueOf(record.value());
......@@ -59,7 +59,7 @@ public class GreenBeltDataConsumerHandler implements KafkaListenerErrorHandler {
* @param acknowledgment
* @throws Exception
*/
@KafkaListener(topics = {"${kafka-consumer.greenWavePeriodTopic}"}, groupId = "group")
@KafkaListener(topics = {"${kafka-consumer.greenWavePeriodTopic}"}, groupId = "group0510")
public void receiveGreenPeriodData(ConsumerRecord<Object, Object> record, Acknowledgment acknowledgment) throws Exception {
String originalData = String.valueOf(record.value());
try {
......
wj-datacenter-service/src/main/java/net/wanji/datacenter/kafka/PeriodDataConsumerHandler.java
View file @ 55cc714a
......@@ -25,7 +25,7 @@ public class PeriodDataConsumerHandler implements KafkaListenerErrorHandler {
@Resource
private DataProcessService dataProcessService;
@KafkaListener(topics = {"${kafka-consumer.lanePeriodicDataTopic}"}, groupId = "group")
@KafkaListener(topics = {"${kafka-consumer.lanePeriodicDataTopic}"}, groupId = "group0510")
public void receiveLanePeriodicData(ConsumerRecord<Object, Object> record, Acknowledgment acknowledgment) throws Exception {
String originalData = String.valueOf(record.value());
try {
......@@ -37,7 +37,7 @@ public class PeriodDataConsumerHandler implements KafkaListenerErrorHandler {
acknowledgment.acknowledge();
}
@KafkaListener(topics = {"${kafka-consumer.crossPeriodicDataTopic}"}, groupId = "group")
@KafkaListener(topics = {"${kafka-consumer.crossPeriodicDataTopic}"}, groupId = "group0510")
public void receiveCrossPeriodicData(ConsumerRecord<Object, String> record, Acknowledgment acknowledgment) throws Exception {
String originalData = String.valueOf(record.value());
try {
......@@ -49,7 +49,7 @@ public class PeriodDataConsumerHandler implements KafkaListenerErrorHandler {
acknowledgment.acknowledge();
}
@KafkaListener(topics = {"${kafka-consumer.dirPeriodicDataTopic}"}, groupId = "group-dir")
@KafkaListener(topics = {"${kafka-consumer.dirPeriodicDataTopic}"}, groupId = "group0510")
public void receiveDirPeriodicData(ConsumerRecord<Object, Object> record, Acknowledgment acknowledgment) throws Exception {
String originalData = String.valueOf(record.value());
try {
......@@ -61,7 +61,7 @@ public class PeriodDataConsumerHandler implements KafkaListenerErrorHandler {
acknowledgment.acknowledge();
}
@KafkaListener(topics = {"${kafka-consumer.turnPeriodicDataTopic}"}, groupId = "group")
@KafkaListener(topics = {"${kafka-consumer.turnPeriodicDataTopic}"}, groupId = "group0510")
public void receiveTurnPeriodicData(ConsumerRecord<Object, Object> record, Acknowledgment acknowledgment) throws Exception {
String originalData = String.valueOf(record.value());
try {
......
wj-datacenter-service/src/main/java/net/wanji/datacenter/service/EventDataServiceImpl.java
View file @ 55cc714a
......@@ -13,12 +13,12 @@ import net.wanji.datacenter.mapper.EventInfoMapper;
import net.wanji.datacenter.pojo.dto.EventDataDTO;
import net.wanji.datacenter.pojo.po.EventInfoPO;
import org.apache.ignite.transactions.TransactionRollbackException;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.sql.SQLTransactionRollbackException;
import java.text.SimpleDateFormat;
import java.util.*;
......@@ -95,7 +95,6 @@ public class EventDataServiceImpl implements EventDataService {
}
}
@NotNull
private static EventInfoPO getEventInfoPO(EventDataDTO eventDataDTO) throws Exception{
ObjectMapper mapper = JacksonUtils.getInstance();
Map<String, Integer> crossIdGreenIdMap = CrossGreenWaveInfoCache.crossIdGreenIdMap;
......
wj-datacenter-service/src/main/java/net/wanji/datacenter/service/impl/CrossStrategyOptServiceImpl.java
View file @ 55cc714a
......@@ -12,9 +12,9 @@ import net.wanji.datacenter.pojo.dto.ImbalanceAlgorithmDTO;
import net.wanji.datacenter.pojo.dto.PhaseEmptyDataDTO;
import net.wanji.datacenter.pojo.entity.CrossStrategyResultEntity;
import net.wanji.datacenter.service.CrossStrategyOptService;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
......
wj-datacenter-service/src/main/java/net/wanji/datacenter/service/impl/DataProcessServiceImpl.java
View file @ 55cc714a
......@@ -14,6 +14,7 @@ import net.wanji.datacenter.pojo.dto.CrossPeriodLaneDTO;
import net.wanji.datacenter.pojo.dto.CrossPeriodTurnDTO;
import net.wanji.datacenter.pojo.po.EventInfoPO;
import net.wanji.datacenter.service.DataProcessService;
//import org.apache.ignite.transactions.TransactionRollbackException;
import org.apache.ignite.transactions.TransactionRollbackException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
......
wj-datacenter-service/src/main/java/net/wanji/datacenter/task/LaneSnapShotDataDelTask.java
View file @ 55cc714a
......@@ -17,7 +17,7 @@ import java.util.Date;
* @author duanruiming
* @date 2023/10/27 17:11
*/
@Component
//@Component
@Slf4j
public class LaneSnapShotDataDelTask {
......
wj-datacenter-service/src/main/resources/bootstrap-greencity.yml
View file @ 55cc714a
......@@ -6,9 +6,11 @@ spring:
cloud:
nacos:
config:
server-addr: 37.12.182.29:8848
server-addr: 37.8.219.227:28848
file-extension: yaml
group: wanji
namespace: wanji
username: nacos
password: nacos
\ No newline at end of file
password: Nacos@2025
inforsuite:
license-path: D:\license
\ No newline at end of file
wj-datacenter-service/src/main/resources/mapper/EventInfoMapper.xml
View file @ 55cc714a
......@@ -149,15 +149,15 @@
, #{unbalanceIndex}
, #{spilloverIndex}
)
ON DUPLICATE KEY UPDATE
end_time = values(end_time)
ON CONFLICT(event_serial_number, start_time, dt)
do update set end_time = excluded.end_time
</insert>
<select id="selectLastEventInfo" parameterType="java.lang.String" resultType="net.wanji.datacenter.pojo.po.EventInfoPO">
select <include refid="Base_Column_List"/> from t_event_info
where event_serial_number =
(select event_serial_number from t_event_info where cross_id = #{crossId}
and dt = CURDATE() order by start_time desc limit 1)
and dt = cast(to_char(now(), 'YYYYMMDD') as INTEGER) order by start_time desc limit 1)
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment