wyh
/
dianci
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RadarStatusController.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RadarRealTimeDataServiceImpl.java
#	ruoyi-system/src/main/resources/mapper/system/PrimaryRadarDataMapper.xml
detached
zouyiqing 2024-01-30 20:11:14 +08:00
parent f81d48c84b 5f7925d721
commit 0821deef01
6 changed files with 67 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysDiscernController.java
View File

@ -60,10 +60,10 @@ public class SysDiscernController extends BaseController {
startPage();
List<PrimaryRadarData> list = primaryRadarDataService.selectRadarTable(primaryRadarData);
list.stream().forEach(primaryRadarData1 -> {
if (StringUtils.isNotEmpty(primaryRadarData1.getLadleNumber())){
if (primaryRadarData1.getLadleNumber().contains("车")){
if (StringUtils.isNotEmpty(primaryRadarData1.getType())){
if (("0").equals(primaryRadarData1.getType())){
primaryRadarData1.setType("车架");
primaryRadarData1.setType("铁包");
} else if (primaryRadarData1.getLadleNumber().contains("铁")) {
primaryRadarData1.setType("铁包");
}else {

4
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://39.104.15.118:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 12345678
password: Orderfood@2022
# 从库数据源
slave:
# 从数据源开关/默认关闭

3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/PrimaryRadarData.java
View File

@ -75,6 +75,8 @@ public class PrimaryRadarData extends BaseEntity
private String ladleNumber;
private String totalCount;
private Integer stationCode;
/**
* 雷达ip
*/
@ -244,6 +246,7 @@ public class PrimaryRadarData extends BaseEntity
.append("radarLocation",getRadarLocation())
.append("stationCode",getStationCode())
.append("ladleNumber",getLadleNumber())
.append("stationCode",getStationCode())
.append("radarIp",getRadarIp())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TsanaRadar.java
View File

@ -26,7 +26,7 @@ public class TsanaRadar {
}
public TsanaRadar(String radarCode, String labelCode, String locationIp, String labelNum, Date timeBegin, Date timeEnd, Integer timeCount) {
public TsanaRadar() {
this.radarCode = radarCode;
this.labelCode = labelCode;
this.locationIp = locationIp;

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/PrimaryRadarDataMapper.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.system.mapper;
import com.ruoyi.common.core.domain.entity.NormalIdentifier;
import com.ruoyi.common.core.domain.entity.PrimaryRadarData;
import com.ruoyi.common.core.domain.entity.RadarTableVO;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@ -21,6 +22,5 @@ public interface PrimaryRadarDataMapper
int updatePrimaryRadarData(PrimaryRadarData primaryRadarData);
List<PrimaryRadarData> selectPrimaryRadarDataList(PrimaryRadarData primaryRadarData);
List<PrimaryRadarData> selectRadarTable(PrimaryRadarData primaryRadarData);
}

61
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PrimaryRadarDataServiceImpl.java
View File

@ -1,9 +1,6 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.common.core.domain.entity.NormalIdentifier;
import com.ruoyi.common.core.domain.entity.PrimaryRadarData;
import com.ruoyi.common.core.domain.entity.RadarTableVO;
import com.ruoyi.common.core.domain.entity.SysRadar;
import com.ruoyi.common.core.domain.entity.*;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.system.mapper.NormalIdentifierMapper;
@ -17,6 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.validation.Validator;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.List;
import java.util.stream.Collectors;
@ -63,6 +64,12 @@ public class PrimaryRadarDataServiceImpl implements PrimaryRadarDataService
List<PrimaryRadarData> radarTableVOS = primaryRadarDataMapper.selectRadarTable(primaryRadarData);
// TsanaRadar tsanaRadar = new TsanaRadar();
// tsanaRadar.setLocationIp(primaryRadarData.getStationCode().toString());
// oracleInsert(tsanaRadar);
return radarTableVOS;
}
@ -74,4 +81,50 @@ public class PrimaryRadarDataServiceImpl implements PrimaryRadarDataService
private static void oracleInsert(TsanaRadar tsanaRadar) {
Connection connection = null;
PreparedStatement preparedStatement = null;
try {
Class.forName("oracle.jdbc.driver.OracleDriver");
String url = "jdbc:oracle:thin:@172.16.18.195:1523:xccb";
String user = "radartest";
String password = "radartest";
connection = DriverManager.getConnection(url,user,password);
System.out.println(" ============= 连接数据库成功 ==========");
String insertStatement = "INSERT INTO xccb.TS_ANARADAR (RADARCODE, LABELCODE, LOCATIONIP , LABELNUM , TIMEBEGIN , TIMEEND , TIMECOUNT) VALUES (?, ?, ?, ?, ?, ?, ?)";
preparedStatement = connection.prepareStatement(insertStatement);
preparedStatement.setString(1,tsanaRadar.getRadarCode());
preparedStatement.setString(2,tsanaRadar.getLabelCode());
preparedStatement.setString(3,tsanaRadar.getLocationIp());
preparedStatement.setString(4,tsanaRadar.getLabelNum());
preparedStatement.setDate(5,tsanaRadar.getTimeBegin());
preparedStatement.setDate(6,tsanaRadar.getTimeEnd());
preparedStatement.setInt(7,tsanaRadar.getTimeCount());
int i = preparedStatement.executeUpdate();
System.out.println("新增数据成功，新增数量： " + i);
}catch (Exception e){
System.out.println("连接异常======" + e);
}finally {
// 关闭连接和statement
if (preparedStatement != null) {
try {
preparedStatement.close();
} catch (SQLException e) {
e.printStackTrace();
}
}
if (connection != null) {
try {
connection.close();
} catch (SQLException e) {
e.printStackTrace();
}
}
}
}
}