修改冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/MonitorFanIndicatorMapper.java

@@ -19,12 +19,12 @@ public interface MonitorFanIndicatorMapper extends BaseMapper<MonitorFanIndicato
    //批量修改
    void UpdateMonitorFanIndicator(@Param(value = "list") List<IndexDto> list);
 
-    Integer queryByPageTotal(@Param("fanCode") String fanCode,
+    Integer queryByPageTotal(@Param("equipmentNumber") String equipmentNumber,
                              @Param("gateway") String gateway,
                              @Param("frontModule") String frontModule);
 
-    Page<MonitorFanIndicator> queryByPage(@Param("size") long size,
-                                          @Param("fanCode") String fanCode,
+    List<MonitorFanIndicator> queryByPage(@Param("size") long size,
+                                          @Param("equipmentNumber") String equipmentNumber,
                                           @Param("gateway") String gateway,
                                           @Param("frontModule") String frontModule,
                                           @Param("offset") int offset);

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

@@ -39,8 +39,8 @@
     <select id="queryByPage" resultType="com.yeejoin.amos.boot.module.jxiop.api.entity.MonitorFanIndicator">
         select * from monitor_fan_indicator
         <where>
-            <if test="fanCode != null and fanCode !=''">
-                fan_code like concat('%', #{fanCode},'%')
+            <if test="equipmentNumber != null and equipmentNumber !=''">
+                equipment_number = #{equipmentNumber}
             </if>
             <if test="gateway != null and gateway !=''">
                 AND gateway = #{gateway}
@@ -55,8 +55,8 @@
     <select id="queryByPageTotal" resultType="java.lang.Integer">
         select count(1) from monitor_fan_indicator
         <where>
-            <if test="fanCode != null and fanCode !=''">
-                fan_code like concat('%', #{fanCode},'%')
+            <if test="equipmentNumber != null and equipmentNumber !=''">
+                equipment_number = #{equipmentNumber}
             </if>
             <if test="gateway != null and gateway !=''">
                 AND gateway = #{gateway}

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/controller/MonitorFanIdxController.java

@@ -34,14 +34,14 @@ public class MonitorFanIdxController extends BaseController {
 
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "根据风机编码、网关ID、前段展示模块查询表数据")
+    @ApiOperation(value = "根据设备编号、网关ID、前段展示模块查询表数据")
     @GetMapping("/getFanIdxInfoByPage")
-    public ResponseModel<IPage<MonitorFanIndicator>> getFanIdxInfoByPage(@RequestParam(value = "fanCode", required = false) String fanCode,
+    public ResponseModel<IPage<MonitorFanIndicator>> getFanIdxInfoByPage(@RequestParam(value = "equipmentNumber", required = false) String equipmentNumber,
                                                                          @RequestParam(value = "gateway", required = false) String gateway,
                                                                          @RequestParam(value = "frontModule", required = false) String frontModule,
                                                                          @RequestParam(value = "current", required = false) int current,
                                                                          @RequestParam(value = "size", required = false) int size) {
-        return ResponseHelper.buildResponse(monitorFanIndicator.getFanIdxInfoByPage(fanCode, gateway, frontModule, current, size));
+        return ResponseHelper.buildResponse(monitorFanIndicator.getFanIdxInfoByPage(equipmentNumber, gateway, frontModule, current, size));
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)

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

@@ -51,12 +51,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     }
 
-    public IPage<MonitorFanIndicator> getFanIdxInfoByPage(String fanCode, String gateway, String frontModule, int current, int size) {
+    public IPage<MonitorFanIndicator> getFanIdxInfoByPage(String equipmentNumber, String gateway, String frontModule, int current, int size) {
         Page<MonitorFanIndicator> page = new Page<>(current, size);
-        Integer integer = monitorFanIndicatorregionMapper.queryByPageTotal(fanCode, gateway, frontModule);
-        Page<MonitorFanIndicator> monitorFanIndicators = monitorFanIndicatorregionMapper.queryByPage(page.getSize(), fanCode, gateway, frontModule, (current - 1) * size);
-        monitorFanIndicators.setTotal(integer);
-        return monitorFanIndicators;
+        Integer integer = monitorFanIndicatorregionMapper.queryByPageTotal(equipmentNumber, gateway, frontModule);
+        List<MonitorFanIndicator> monitorFanIndicators = monitorFanIndicatorregionMapper.queryByPage(page.getSize(), equipmentNumber, gateway, frontModule, (current - 1) * size);
+        page.setTotal(integer);
+        page.setRecords(monitorFanIndicators);
+        return page;
     }
 
     public TreeDto getTreeInfo(String sequenceNbr) {

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>