diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysDiscernController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysDiscernController.java index 7b0f065..4d7b5c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysDiscernController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysDiscernController.java @@ -60,10 +60,10 @@ public class SysDiscernController extends BaseController { startPage(); List 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 { diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 6d3a469..2d13b8d 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -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: # 从数据源开关/默认关闭 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/PrimaryRadarData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/PrimaryRadarData.java index fd65ad6..7be7307 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/PrimaryRadarData.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/PrimaryRadarData.java @@ -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()) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TsanaRadar.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TsanaRadar.java index d5f7fe6..b39a81c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TsanaRadar.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TsanaRadar.java @@ -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; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PrimaryRadarDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PrimaryRadarDataMapper.java index 4636c75..9970b84 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PrimaryRadarDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PrimaryRadarDataMapper.java @@ -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 selectPrimaryRadarDataList(PrimaryRadarData primaryRadarData); - List selectRadarTable(PrimaryRadarData primaryRadarData); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PrimaryRadarDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PrimaryRadarDataServiceImpl.java index 5084663..fd8099b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PrimaryRadarDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PrimaryRadarDataServiceImpl.java @@ -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 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(); + } + } + } + } + }