监盘地图接口调整

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -143,7 +143,7 @@
         WHERE
         station_basic.sequence_nbr = #{sequence_nbr}
     </select>
-    <select id="getStationBasicDtoList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto">
+    <select id="getStationBasicDtoList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationTaksDto">
         SELECT
         station_number stationNumber,
         gateway_id gateway

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/config/ClusterDbConfig.java

@@ -43,7 +43,7 @@ public class ClusterDbConfig {
     private String driverClassName;
 
 
-    @Bean(name = "clusterDataSource")   //声明其为Bean实例
+    @Bean(name = "clusterDataSource2")   //声明其为Bean实例
     public DataSource clusterDataSource() {
         DruidDataSource datasource = new DruidDataSource();
 
@@ -60,7 +60,7 @@ public class ClusterDbConfig {
     }
 
     @Bean(name = "clusterSqlSessionFactory")
-    public SqlSessionFactory clusterSqlSessionFactory(@Qualifier("clusterDataSource") DataSource culsterDataSource)
+    public SqlSessionFactory clusterSqlSessionFactory(@Qualifier("clusterDataSource2") DataSource culsterDataSource)
             throws Exception {
         final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
         sessionFactory.setDataSource(culsterDataSource);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java

@@ -80,6 +80,8 @@ public class MonitoringServiceImpl {
                 });
                 regionNationWideDto.setFengdian(fengdian.toString());
                 regionNationWideDto.setGuangfu(guangfu.toString());
+                regionNationWideDto.setGuangfuMW(guangfuMW.toString());
+                regionNationWideDto.setFengdianMV(fengdianMW.toString());
                 regionNationWideDto.setName(region.getRegionName());
                 regionNationWideDtoList.add(regionNationWideDto);
             }
@@ -94,7 +96,7 @@ public class MonitoringServiceImpl {
                 regionNationWideDto.setStaitionType(stationBasic.getStationType());
                 String speendOrirradiate = "";
                 if(stationBasic.getStationType().equals("FDZ")){
-                    speendOrirradiate = (String) getIndicatoralueAvage(stationBasic.getGatewayId(),"30秒平均风速");
+                    speendOrirradiate = String.valueOf( getIndicatoralueAvage(stationBasic.getGatewayId(),"30秒平均风速"));
                     regionNationWideDto.setSpeendOrirradiate(speendOrirradiate);
                 }else{
                     regionNationWideDto.setSpeendOrirradiate(String.valueOf(Math.random()*1000));

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/SjglZsjZsbtzServiceImpl.java

@@ -57,6 +57,6 @@ public class SjglZsjZsbtzServiceImpl   {
         return sjglZsjZsbtzList;
     }
    public Double getStationCapactityByStationWerks(String WERKS){
-        return  this.sjglZsjZsbtzMapper.getStationCapactityByStationWerks(WERKS);
+        return  sjglZsjZsbtzMapper.getStationCapactityByStationWerks(WERKS);
    }
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper.cluster/SjglZsjZsbtzMapper.xml → amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper">
-
+    <select id="getStationCapactityByStationWerks" resultType="Double">
+        select SUM(CAPACITYL) from sjgl_zsj_zsbtz where WERKS = #{WERKS}
+    </select>
 </mapper>