更新到23年版本

.gitignore

@@ -1,28 +1,3 @@
-# ---> Java
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-replay_pid*
 HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar
@@ -54,5 +29,3 @@ build/
 
 ### VS Code ###
 .vscode/
-
-

pom.xml

@@ -274,7 +274,7 @@
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>
-			<version>2.3.0</version>
+			<version>${quartz.version}</version>
 		</dependency>
 		<!-- 外部依赖 -->
 		<dependency>

src/main/java/com/chenxuan/base/entity/CustomQuartzJobBean.java

@@ -3,11 +3,9 @@ package com.chenxuan.base.entity;
 import com.chenxuan.entity.model.ScheduleJob;
 import com.chenxuan.utils.ScheduleRunnable;
 import lombok.extern.slf4j.Slf4j;
-import org.quartz.DisallowConcurrentExecution;
+import org.quartz.*;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.quartz.PersistJobDataAfterExecution;
 import org.springframework.scheduling.quartz.QuartzJobBean;
+
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -30,7 +28,9 @@ public class CustomQuartzJobBean extends QuartzJobBean {
     @Override
     protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
         //任务开始时间
-        ScheduleJob scheduleJob = (ScheduleJob) context.getMergedJobDataMap().get( JobConstant.JOB_PARAM_KEY );
+        JobDataMap jobDataMap = context.getMergedJobDataMap();
+        ScheduleJob scheduleJob = (ScheduleJob)jobDataMap.get( JobConstant.JOB_PARAM_KEY );
+
         //任务开始时间
         long startTime = System.currentTimeMillis();
         try {

src/main/java/com/chenxuan/bean/config/CORSConfig.java

@@ -0,0 +1,29 @@
+package com.chenxuan.bean.config;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+/**
+ * 跨域配置
+ * @author: newzhong
+ * @create: 2020-2
+ **/
+@Configuration
+public class CORSConfig {
+    @Bean
+    public WebMvcConfigurer corsConfigurer() {
+        return new WebMvcConfigurerAdapter() {
+            @Override
+            public void addCorsMappings(CorsRegistry registry) {
+                registry.addMapping("/**")
+                        .allowedOrigins("*")
+                        .allowedMethods("GET", "HEAD", "POST", "PUT", "PATCH", "DELETE", "OPTIONS", "TRACE");
+            }
+        };
+    }
+}
+

src/main/java/com/chenxuan/bean/datasource/DynamicDataSourceContextHolder.java

@@ -51,7 +51,7 @@ public class DynamicDataSourceContextHolder {
     public static String getDataSourceType() {
         String db = CONTEXT_HOLDER.get();
         if(null == db){
-            log.error( "未获取到数据源........" );
+         //   log.debug( "未获取到数据源........" );
             db = DataSourceType.MASTER.name();
         }
         return db;

src/main/java/com/chenxuan/constants/BusiUrlConstants.java

@@ -26,9 +26,12 @@ public class BusiUrlConstants {
 	//振动装置阈值配置
 	public static final String BUSI_AMPLI_THRESHOLD_CONF = HEADER + "busiAmpliThresholdConfController";
 
-	//中心点电流阈值配置
+	//中性点电流阈值配置
 	public static final String BUSI_CENTER_THRESHOLD_CONF = HEADER + "busiCenterThresholdConfController";
 
+	//环境监测阈值配置
+	public static final String BUSI_ENVIRONMENT_THRESHOLD_CONF = HEADER + "busiEnvironmentThresholdConfController";
+
 	//噪声装置阈值配置
 	public static final String BUSI_NOISE_THRESHOLD_CONF = HEADER + "busiNoiseThresholdConfController";
 
@@ -41,9 +44,12 @@ public class BusiUrlConstants {
     //原副边电流电压实时数据
     public static final String BUSI_TRANSFORMER_REAL = HEADER + "busiTransformerRealController";
 
-    //中心点实时数据
+    //中性点实时数据
     public static final String BUSI_CENTER_REAL = HEADER + "busiCenterRealController";
 
+	//环境监测实时数据
+	public static final String BUSI_ENVIRONMENT_REAL = HEADER + "busiEnvironmentRealController";
+
     //噪声实时数据
     public static final String BUSI_NOISE_REAL = HEADER + "busiNoiseRealController";
 
@@ -76,4 +82,7 @@ public class BusiUrlConstants {
 
 	//IED参数绑定
 	public static final String  BUSI_PARAM_BIND  = HEADER + "busiParamBindController";
+
+	//主变装置信息
+	public static final String MODBUS_BIND = HEADER + "modbusAndBindController";
 }

src/main/java/com/chenxuan/controller/BusiAmpliRealController.java

@@ -4,6 +4,7 @@ import com.chenxuan.base.controller.BaseController;
 import com.chenxuan.base.entity.AjaxResult;
 import com.chenxuan.bean.annotation.LogAnnotation;
 import com.chenxuan.constants.BusiUrlConstants;
+import com.chenxuan.entity.dto.BusiAmpliDatDto;
 import com.chenxuan.entity.dto.BusiAmpliRealDto;
 import com.chenxuan.entity.model.BusiAmpliReal;
 import com.chenxuan.enums.OperateType;
@@ -54,8 +55,17 @@ public class BusiAmpliRealController extends BaseController {
      */
     @ApiOperation(value = "根据条件加载振动实时数据详细信息")
     @PostMapping(value = "/getShockRealDetailsByCondition")
-    public AjaxResult getShockRealDetailsByCondition(@RequestBody BusiAmpliRealDto busiAmpliRealDto) {
+    public AjaxResult getShockRealDetailsByCondition(@RequestBody BusiAmpliDatDto busiAmpliDatDto) {
-        return AjaxResult.success(busiAmpliRealService.getShockRealDetailsByCondition(busiAmpliRealDto));
+        return AjaxResult.success(busiAmpliRealService.getShockRealDetailsByCondition(busiAmpliDatDto));
+    }
+
+    /**
+     * 根据主变id加载振动实时数据详细信息
+     */
+    @ApiOperation(value = "根据条件加载振动实时数据录播文件")
+    @PostMapping(value = "/getShockRealDetailsByConditionDat")
+    public AjaxResult getShockRealDetailsByConditionDat(@RequestBody BusiAmpliRealDto busiAmpliRealDto) {
+        return AjaxResult.success(busiAmpliRealService.getShockRealDetailsByConditionDat(busiAmpliRealDto));
     }
 
     /**
@@ -67,6 +77,17 @@ public class BusiAmpliRealController extends BaseController {
         return AjaxResult.success(busiAmpliRealService.getShockRealChartByInfo(busiAmpliRealDto));
     }
 
+    /**
+     * 根据主变id以及对应装置信息加载振动装置振幅和频率谱图信息
+     * 根据主变id以及对应装置信息加载振动装置振幅和频率谱图信息
+     */
+    @ApiOperation(value = "根据主变id以及对应装置信息加载振动装置日增长率和月增长率")
+    @PostMapping(value = "/queryShockRealChartByDayOrMonthInfo")
+    public AjaxResult queryShockRealChartByDayOrMonthInfo(@RequestBody BusiAmpliRealDto busiAmpliRealDto) {
+        return AjaxResult.success(busiAmpliRealService.getShockRealChartByDayOrMonthInfo(busiAmpliRealDto));
+    }
+
+
     /**
      * 根据主变id以及对应装置信息加载振动装置振幅和频率三维图信息
      */
@@ -76,15 +97,6 @@ public class BusiAmpliRealController extends BaseController {
         return AjaxResult.success(busiAmpliRealService.getAmpliRealThreeChart(busiAmpliRealDto));
     }
 
-    /**
-     * 三级界面重新计算接口
-     */
-    @ApiOperation(value = "三级界面重新计算接口")
-    @PostMapping(value = "/recountData")
-    public AjaxResult recountData(@RequestBody BusiAmpliRealDto busiAmpliRealDto) {
-        return AjaxResult.success(busiAmpliRealService.recount(busiAmpliRealDto));
-    }
-
     /**
      * 二级页面跳转详情加载三级页面
      */

src/main/java/com/chenxuan/controller/BusiCenterRealController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@Api(tags = "中心点实时数据")
+@Api(tags = "中性点实时数据")
 @RestController
 @RequestMapping(value = BusiUrlConstants.BUSI_CENTER_REAL)
 public class BusiCenterRealController extends BaseController {
@@ -31,46 +31,46 @@ public class BusiCenterRealController extends BaseController {
     private BusiExportDataService busiExportDataService;
 
     /**
-     * 新增中心点实时数据信息
+     * 新增中性点实时数据信息
      */
-    @ApiOperation(value = "新增中心点实时数据信息")
+    @ApiOperation(value = "新增中性点实时数据信息")
-    @LogAnnotation(module = "中心点实时数据", operateType = OperateType.INSERT)
+    @LogAnnotation(module = "中性点实时数据", operateType = OperateType.INSERT)
     @PostMapping(value = "/add")
     public AjaxResult add(@RequestBody List<BusiCenterReal> busiCenterRealList) {
         return returnAjax(busiCenterRealService.insertCenterReal(busiCenterRealList));
     }
 
     /**
-     * 根据主变id加载中心点实时数据信息
+     * 根据主变id加载中性点实时数据信息
      */
-    @ApiOperation(value = "根据主变id加载中心点实时数据信息")
+    @ApiOperation(value = "根据主变id加载中性点实时数据信息")
     @GetMapping(value = "/getCenterRealByMainId/{mainId}")
     public AjaxResult getCenterRealByMainId(@PathVariable("mainId") String mainId) {
         return AjaxResult.success(busiCenterRealService.selectCenterRealByMainId(mainId));
     }
 
     /**
-     * 根据主变id及当天时间加载中心点谱图信息
+     * 根据主变id及当天时间加载中性点谱图信息
      */
-    @ApiOperation(value = "根据主变id及当天时间加载中心点谱图信息")
+    @ApiOperation(value = "根据主变id及当天时间加载中性点谱图信息")
     @PostMapping(value = "/queryCenterRealChartByInfo")
     public AjaxResult queryCenterRealChartByInfo(@RequestBody BusiCenterRealDto busiCenterRealDto) {
         return AjaxResult.success(busiCenterRealService.findCenterRealChartByInfo(busiCenterRealDto));
     }
 
     /**
-     * 根据主变id和时间加载中心点实时数据信息
+     * 根据主变id和时间加载中性点实时数据信息
      */
-    @ApiOperation(value = "根据主变id和时间加载中心点实时数据信息")
+    @ApiOperation(value = "根据主变id和时间加载中性点实时数据信息")
     @PostMapping(value = "/getCenterRealByMainIdAndCreateTime")
     public AjaxResult getCenterRealByMainIdAndCreateTime(@RequestBody BusiCenterRealVo busiCenterRealVo) {
         return AjaxResult.success(busiCenterRealService.selectCenterRealByMainIdAndCreateTime(busiCenterRealVo));
     }
 
     /**
-     * 根据主变id加载中心点实时数据详细信息
+     * 根据主变id加载中性点实时数据详细信息
      */
-    @ApiOperation(value = "根据主变id加载中心点实时数据详细信息")
+    @ApiOperation(value = "根据主变id加载中性点实时数据详细信息")
     @PostMapping(value = "/getCenterRealDetailsByMainId")
     public AjaxResult getCenterRealDetailsByMainId(@RequestBody BusiCenterRealDto dto) {
         Page<BusiCenterRealDetailsVo> centerRealDetailsByMainId = busiCenterRealService.getCenterRealDetailsByMainId(dto);
@@ -78,18 +78,30 @@ public class BusiCenterRealController extends BaseController {
     }
 
     /**
-     * 导出中心点实时数据详细信息Excel
+     * 根据主变id加载中性点实时数据详细信息
      */
-    @ApiOperation(value = "导出中心点实时数据详细信息Excel")
+    @ApiOperation(value = "根据主变id加载中性点实时数据详细信息1")
+    @PostMapping(value = "/getCenterRealDetailsByMainId1")
+    public AjaxResult getCenterRealDetailsByMainId1(@RequestBody BusiCenterRealDto dto) {
+        Page<BusiCenterRealDetailsVo> centerRealDetailsByMainId = busiCenterRealService.getCenterRealDetailsByMainId1(dto);
+        return AjaxResult.success(centerRealDetailsByMainId);
+    }
+
+
+
+    /**
+     * 导出中性点实时数据详细信息Excel
+     */
+    @ApiOperation(value = "导出中性点实时数据详细信息Excel")
     @PostMapping(value = "/exportCenterRealDetails")
     public AjaxResult exportCenterRealDetails(@RequestBody BusiCenterRealDto dto) {
         return busiExportDataService.exportCenterRealDetails(dto);
     }
 
     /**
-     * 导出中心点实时数据
+     * 导出中性点实时数据
      */
-    @ApiOperation(value = "导出中心点实时数据")
+    @ApiOperation(value = "导出中性点实时数据")
     @PostMapping(value = "/exportCenterRealByMainId")
     public AjaxResult exportCenterRealByMainId(@RequestBody BusiCenterRealDto dto) {
         return busiExportDataService.exportCenterReal(dto);

src/main/java/com/chenxuan/controller/BusiCenterThresholdConfController.java

@@ -15,7 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-@Api(tags = "中心点电流阈值配置")
+@Api(tags = "中性点电流阈值配置")
 @RestController
 @RequestMapping(value = BusiUrlConstants.BUSI_CENTER_THRESHOLD_CONF)
 public class BusiCenterThresholdConfController extends BaseController {
@@ -24,11 +24,11 @@ public class BusiCenterThresholdConfController extends BaseController {
     private BusiCenterThresholdConfService busiCenterThresholdConfService;
 
     /**
-     * @Description: 获取中心点电流阈值配置列表
+     * @Description: 获取中性点电流阈值配置列表
      * @Param:
      * @Return: TableDataInfo
      **/
-    @ApiOperation(value = "获取中心点电流阈值配置列表")
+    @ApiOperation(value = "获取中性点电流阈值配置列表")
     @PostMapping(value = "/page")
     public AjaxResult page(@RequestBody BusiCenterThresholdConfDto busiCenterThresholdConfDto) {
         Page<BusiCenterThresholdConfVo> page = busiCenterThresholdConfService.page(busiCenterThresholdConfDto);
@@ -36,49 +36,49 @@ public class BusiCenterThresholdConfController extends BaseController {
     }
 
     /**
-     * 新增中心点电流阈值配置信息
+     * 新增中性点电流阈值配置信息
      */
-    @ApiOperation(value = "新增中心点电流阈值配置信息")
+    @ApiOperation(value = "新增中性点电流阈值配置信息")
-    @LogAnnotation(module = "中心点电流阈值配置", operateType = OperateType.INSERT)
+    @LogAnnotation(module = "中性点电流阈值配置", operateType = OperateType.INSERT)
     @PostMapping(value = "/add")
     public AjaxResult add(@RequestBody BusiCenterThresholdConf busiCenterThresholdConf) {
         return busiCenterThresholdConfService.insertThresholdConf(busiCenterThresholdConf);
     }
 
     /**
-     * 修改中心点电流阈值配置信息
+     * 修改中性点电流阈值配置信息
      */
-    @ApiOperation(value = "修改中心点电流阈值配置信息")
+    @ApiOperation(value = "修改中性点电流阈值配置信息")
-    @LogAnnotation(module = "中心点电流阈值配置", operateType = OperateType.UPDATE)
+    @LogAnnotation(module = "中性点电流阈值配置", operateType = OperateType.UPDATE)
     @PutMapping(value = "/update")
     public AjaxResult update(@RequestBody BusiCenterThresholdConf busiCenterThresholdConf) {
         return busiCenterThresholdConfService.updateThresholdConf(busiCenterThresholdConf);
     }
 
     /**
-     * 根据主变id加载中心点电流阈值配置信息
+     * 根据主变id加载中性点电流阈值配置信息
      */
-    @ApiOperation(value = "根据主变id加载中心点电流阈值配置信息")
+    @ApiOperation(value = "根据主变id加载中性点电流阈值配置信息")
     @GetMapping(value = "/getCenterThresholdConfByMainId/{mainId}")
     public AjaxResult getCenterThresholdConfByMainId(@PathVariable("mainId") String mainId) {
         return AjaxResult.success(busiCenterThresholdConfService.selectCenterThresholdConfByMainId(mainId));
     }
 
     /**
-     * 根据主变id删除中心点电流阈值配置信息
+     * 根据主变id删除中性点电流阈值配置信息
      */
-    @ApiOperation(value = "根据主变id删除中心点电流阈值配置信息")
+    @ApiOperation(value = "根据主变id删除中性点电流阈值配置信息")
-    @LogAnnotation(module = "中心点电流阈值配置", operateType = OperateType.DELETE)
+    @LogAnnotation(module = "中性点电流阈值配置", operateType = OperateType.DELETE)
     @DeleteMapping(value = "/deleteByMainId/{mainId}")
     public AjaxResult remove(@RequestParam("mainId") String mainId) {
         return returnAjax(busiCenterThresholdConfService.deleteThresholdConfByMainId(mainId));
     }
 
     /**
-     * 根据中心点电流阈值配置id删除其配置信息
+     * 根据中性点电流阈值配置id删除其配置信息
      */
-    @ApiOperation(value = "根据中心点电流阈值配置id删除其配置信息")
+    @ApiOperation(value = "根据中性点电流阈值配置id删除其配置信息")
-    @LogAnnotation(module = "中心点电流阈值配置", operateType = OperateType.DELETE)
+    @LogAnnotation(module = "中性点电流阈值配置", operateType = OperateType.DELETE)
     @DeleteMapping(value = "/delete")
     public AjaxResult delete(@RequestParam("id") String id) {
         return returnAjax(busiCenterThresholdConfService.delete(id));

src/main/java/com/chenxuan/controller/BusiCommunicationParametersController.java

@@ -45,7 +45,7 @@ public class BusiCommunicationParametersController extends BaseController {
      * 新增通信参数信息
      */
     @ApiOperation(value = "新增通信参数信息")
-//  @LogAnnotation(module = "通信参数设置", operateType = OperateType.INSERT)
+    @LogAnnotation(module = "通信参数设置", operateType = OperateType.INSERT)
     @PostMapping(value = "/add")
     public AjaxResult add(@RequestBody BusiCommunicationParameters busiCommunicationParameters) {
         return returnAjax(busiCommunicationParametersService.insertBusiCommunicationParameters(busiCommunicationParameters));
@@ -74,7 +74,7 @@ public class BusiCommunicationParametersController extends BaseController {
      * 删除主变信息
      */
     @ApiOperation(value = "删除通信参数信息")
-//    @LogAnnotation(module = "通信参数设置", operateType = OperateType.DELETE)
+    @LogAnnotation(module = "通信参数设置", operateType = OperateType.DELETE)
     @DeleteMapping(value = "/delete/{id}")
     public AjaxResult remove(@RequestParam("id") String id) {
         return returnAjax(busiCommunicationParametersService.deleteById(id));
@@ -82,9 +82,22 @@ public class BusiCommunicationParametersController extends BaseController {
 
 
     @ApiOperation(value = "根据通信协议类型加载通信参数信息")
-    @GetMapping(value = "/getBusiCommunicationParametersByProtocol/{protocol}")
+    @PostMapping(value = "/getBusiCommunicationParametersByProtocol")
-    public AjaxResult getBusiCommunicationParametersByProtocol(@PathVariable("protocol") String protocol) {
+    public AjaxResult getBusiCommunicationParametersByProtocol(@RequestBody BusiCommunicationParameters entity) {
-        return AjaxResult.success(busiCommunicationParametersService.selectBusiCommunicationParametersByProtocol(protocol));
+        return AjaxResult.success(busiCommunicationParametersService.selectBusiCommunicationParametersByProtocol(entity));
+    }
+
+    /**
+     * 启用禁用协议
+     *
+     * @param busiCommunicationParameters
+     * @return
+     */
+    @ApiOperation(value = "启用禁用协议")
+    @LogAnnotation(module = "启用禁用协议", operateType = OperateType.UPDATE)
+    @PostMapping(value = "/enable")
+    public AjaxResult enableAndDisable(@RequestBody BusiCommunicationParameters busiCommunicationParameters) {
+        return returnAjax(busiCommunicationParametersService.enableAndDisable(busiCommunicationParameters));
     }
 
 }

src/main/java/com/chenxuan/controller/BusiEnvironmentRealController.java

@@ -0,0 +1,97 @@
+package com.chenxuan.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chenxuan.base.controller.BaseController;
+import com.chenxuan.base.entity.AjaxResult;
+import com.chenxuan.bean.annotation.LogAnnotation;
+import com.chenxuan.constants.BusiUrlConstants;
+import com.chenxuan.entity.dto.BusiEnvironmentRealDto;
+import com.chenxuan.entity.model.BusiEnvironmentReal;
+import com.chenxuan.entity.vo.BusiEnvironmentRealDetailsVo;
+import com.chenxuan.entity.vo.BusiEnvironmentRealVo;
+import com.chenxuan.enums.OperateType;
+import com.chenxuan.service.BusiEnvironmentRealService;
+import com.chenxuan.service.BusiExportDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "环境监测实时数据")
+@RestController
+@RequestMapping(value = BusiUrlConstants.BUSI_ENVIRONMENT_REAL)
+public class BusiEnvironmentRealController extends BaseController {
+
+    @Autowired
+    private BusiEnvironmentRealService busiEnvironmentRealService;
+
+    @Autowired
+    private BusiExportDataService busiExportDataService;
+
+    /**
+     * 新增环境监测实时数据信息
+     */
+    @ApiOperation(value = "新增环境监测实时数据信息")
+    @LogAnnotation(module = "环境监测实时数据", operateType = OperateType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResult add(@RequestBody List<BusiEnvironmentReal> busiEnvironmentRealList) {
+        return returnAjax(busiEnvironmentRealService.insertEnvironmentReal(busiEnvironmentRealList));
+    }
+
+    /**
+     * 根据主变id加载环境监测实时数据信息
+     */
+    @ApiOperation(value = "根据主变id加载环境监测实时数据信息")
+    @GetMapping(value = "/getEnvironmentRealByMainId/{mainId}")
+    public AjaxResult getEnvironmentRealByMainId(@PathVariable("mainId") String mainId) {
+        return AjaxResult.success(busiEnvironmentRealService.selectEnvironmentRealByMainId(mainId));
+    }
+
+    /**
+     * 根据主变id及当天时间加载环境监测谱图信息
+     */
+    @ApiOperation(value = "根据主变id及当天时间加载环境监测谱图信息")
+    @PostMapping(value = "/queryEnvironmentRealChartByInfo")
+    public AjaxResult queryEnvironmentRealChartByInfo(@RequestBody BusiEnvironmentRealDto busiEnvironmentRealDto) {
+        return AjaxResult.success(busiEnvironmentRealService.findEnvironmentRealChartByInfo(busiEnvironmentRealDto));
+    }
+
+    /**
+     * 根据主变id和时间加载环境监测实时数据信息
+     */
+    @ApiOperation(value = "根据主变id和时间加载环境监测实时数据信息")
+    @PostMapping(value = "/getEnvironmentRealByMainIdAndCreateTime")
+    public AjaxResult getEnvironmentRealByMainIdAndCreateTime(@RequestBody BusiEnvironmentRealVo busiEnvironmentRealVo) {
+        return AjaxResult.success(busiEnvironmentRealService.selectEnvironmentRealByMainIdAndCreateTime(busiEnvironmentRealVo));
+    }
+
+    /**
+     * 根据主变id加载环境监测实时数据详细信息
+     */
+    @ApiOperation(value = "根据主变id加载环境监测实时数据详细信息")
+    @PostMapping(value = "/getEnvironmentRealDetailsByMainId")
+    public AjaxResult getEnvironmentRealDetailsByMainId(@RequestBody BusiEnvironmentRealDto dto) {
+        Page<BusiEnvironmentRealDetailsVo> EnvironmentRealDetailsByMainId = busiEnvironmentRealService.getEnvironmentRealDetailsByMainId(dto);
+        return AjaxResult.success(EnvironmentRealDetailsByMainId);
+    }
+
+    /**
+     * 导出环境监测实时数据详细信息Excel
+     */
+    @ApiOperation(value = "导出环境监测实时数据详细信息Excel")
+    @PostMapping(value = "/exportEnvironmentRealDetails")
+    public AjaxResult exportEnvironmentRealDetails(@RequestBody BusiEnvironmentRealDto dto) {
+        return busiExportDataService.exportEnvironmentRealDetails(dto);
+    }
+
+    /**
+     * 导出环境监测实时数据
+     */
+    @ApiOperation(value = "导出环境监测实时数据")
+    @PostMapping(value = "/exportEnvironmentRealByMainId")
+    public AjaxResult exportEnvironmentRealByMainId(@RequestBody BusiEnvironmentRealDto dto) {
+        return busiExportDataService.exportEnvironmentReal(dto);
+    }
+}

src/main/java/com/chenxuan/controller/BusiEnvironmentThresholdConfController.java

@@ -0,0 +1,86 @@
+package com.chenxuan.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chenxuan.base.controller.BaseController;
+import com.chenxuan.base.entity.AjaxResult;
+import com.chenxuan.bean.annotation.LogAnnotation;
+import com.chenxuan.constants.BusiUrlConstants;
+import com.chenxuan.entity.dto.BusiEnvironmentThresholdConfDto;
+import com.chenxuan.entity.model.BusiEnvironmentThresholdConf;
+import com.chenxuan.entity.vo.BusiEnvironmentThresholdConfVo;
+import com.chenxuan.enums.OperateType;
+import com.chenxuan.service.BusiEnvironmentThresholdConfService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "环境监测阈值配置")
+@RestController
+@RequestMapping(value = BusiUrlConstants.BUSI_ENVIRONMENT_THRESHOLD_CONF)
+public class BusiEnvironmentThresholdConfController extends BaseController {
+
+    @Autowired
+    private BusiEnvironmentThresholdConfService busiEnvironmentThresholdConfService;
+
+    /**
+     * @Description: 获取环境阈值配置列表
+     * @Param:
+     * @Return: TableDataInfo
+     **/
+    @ApiOperation(value = "获取环境阈值配置列表")
+    @PostMapping(value = "/page")
+    public AjaxResult page(@RequestBody BusiEnvironmentThresholdConfDto busiEnvironmentThresholdConfDto) {
+        Page<BusiEnvironmentThresholdConfVo> page = busiEnvironmentThresholdConfService.page(busiEnvironmentThresholdConfDto);
+        return AjaxResult.success(page);
+    }
+
+    /**
+     * 新增环境阈值配置信息
+     */
+    @ApiOperation(value = "新增环境阈值配置信息")
+    @LogAnnotation(module = "环境阈值配置", operateType = OperateType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResult add(@RequestBody BusiEnvironmentThresholdConf busiEnvironmentThresholdConf) {
+        return busiEnvironmentThresholdConfService.insertThresholdConf(busiEnvironmentThresholdConf);
+    }
+
+    /**
+     * 修改环境阈值配置信息
+     */
+    @ApiOperation(value = "修改环境阈值配置信息")
+    @LogAnnotation(module = "环境阈值配置", operateType = OperateType.UPDATE)
+    @PutMapping(value = "/update")
+    public AjaxResult update(@RequestBody BusiEnvironmentThresholdConf busiEnvironmentThresholdConf) {
+        return busiEnvironmentThresholdConfService.updateThresholdConf(busiEnvironmentThresholdConf);
+    }
+
+    /**
+     * 根据主变id加载环境阈值配置信息
+     */
+    @ApiOperation(value = "根据主变id加载环境阈值配置信息")
+    @GetMapping(value = "/getEnvironmentThresholdConfByMainId/{mainId}")
+    public AjaxResult getEnvironmentThresholdConfByMainId(@PathVariable("mainId") String mainId) {
+        return AjaxResult.success(busiEnvironmentThresholdConfService.selectEnvironmentThresholdConfByMainId(mainId));
+    }
+
+    /**
+     * 根据主变id删除环境阈值配置信息
+     */
+    @ApiOperation(value = "根据主变id删除环境阈值配置信息")
+    @LogAnnotation(module = "环境阈值配置", operateType = OperateType.DELETE)
+    @DeleteMapping(value = "/deleteByMainId/{mainId}")
+    public AjaxResult remove(@RequestParam("mainId") String mainId) {
+        return returnAjax(busiEnvironmentThresholdConfService.deleteThresholdConfByMainId(mainId));
+    }
+
+    /**
+     * 根据环境阈值配置id删除其配置信息
+     */
+    @ApiOperation(value = "根据环境阈值配置id删除其配置信息")
+    @LogAnnotation(module = "环境阈值配置", operateType = OperateType.DELETE)
+    @DeleteMapping(value = "/delete")
+    public AjaxResult delete(@RequestParam("id") String id) {
+        return returnAjax(busiEnvironmentThresholdConfService.delete(id));
+    }
+}

src/main/java/com/chenxuan/controller/BusiFrequencyConfController.java

@@ -86,4 +86,13 @@ public class BusiFrequencyConfController extends BaseController {
         return returnAjax( busiFrequencyConfService.deleteFrequencyConfById( id ) );
     }
 
+
+    /**
+     * 根据id加载振动装置频率配置信息
+     */
+    @ApiOperation(value = "查询所有振动频率")
+    @GetMapping(value = "/selectFrequency")
+    public AjaxResult selectFrequency() {
+        return AjaxResult.success( busiFrequencyConfService.selectFrequency() );
+    }
 }

src/main/java/com/chenxuan/controller/BusiMainDeviceController.java

@@ -8,8 +8,10 @@ import com.chenxuan.constants.BusiUrlConstants;
 import com.chenxuan.entity.dto.BusiMainDeviceDto;
 import com.chenxuan.entity.model.BusiMainDevice;
 import com.chenxuan.entity.vo.BusiMainDeviceVo;
+import com.chenxuan.entity.vo.DeviceNumVo;
 import com.chenxuan.entity.vo.PercentageVo;
 import com.chenxuan.enums.OperateType;
+import com.chenxuan.mapper.BusiMainDeviceMapper;
 import com.chenxuan.service.BusiMainDeviceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +27,9 @@ public class BusiMainDeviceController extends BaseController {
 
     @Autowired
     private BusiMainDeviceService busiMainDeviceService;
+
+    @Autowired
+    private BusiMainDeviceMapper busiMainDeviceMapper;
     /**
      * @Description: 获取主变压器信息列表
      * @Param:
@@ -105,11 +110,23 @@ public class BusiMainDeviceController extends BaseController {
      * @Param:
      * @Return:
      **/
-    @ApiOperation(value = "获取设备总数")
+    @ApiOperation(value = "获取运行正常设备总数")
-    @GetMapping(value = "/selectNormalDevice")
+    @GetMapping(value = "/selectCountDevice")
-    public AjaxResult selectNormalDevice() {
+    public AjaxResult selectCountDevice() {
-        PercentageVo percentageVo = busiMainDeviceService.selectNormalDevice();
+        DeviceNumVo deviceNumVo = busiMainDeviceService.selectCountDevice();
-        return AjaxResult.success(percentageVo);
+        return AjaxResult.success(deviceNumVo);
+    }
+
+    /**
+     * @Description: 获取数据上传间隔
+     * @Param:
+     * @Return:
+     **/
+    @ApiOperation(value = "获取数据上传间隔")
+    @GetMapping(value = "/findInterval")
+    public AjaxResult findInterval() {
+        Integer interval = busiMainDeviceMapper.findInterval();
+        return AjaxResult.success(interval);
     }
 
     /**
@@ -117,7 +134,7 @@ public class BusiMainDeviceController extends BaseController {
      * @Param:
      * @Return:
      **/
-    @ApiOperation(value = "获取设备总数")
+    @ApiOperation(value = "获取运行异常设备总数")
     @GetMapping(value = "/selectCountEcpDevice")
     public AjaxResult selectCountEcpDevice() {
         PercentageVo percentageVo = busiMainDeviceService.selectCountEcpDevice();

src/main/java/com/chenxuan/controller/BusiNoiseRealController.java

@@ -76,6 +76,17 @@ public class BusiNoiseRealController extends BaseController {
         return AjaxResult.success(pageList);
     }
 
+
+    /**
+     * 根据主变id加载噪声实时数据详细信息
+     */
+    @ApiOperation(value = "根据主变id加载噪声实时数据详细信息1")
+    @PostMapping(value = "/getNoiseRealDetailsByMainId1")
+    public AjaxResult getNoiseRealDetailsByMainId1(@RequestBody BusiNoiseRealDto dto) {
+        Page<BusiNoiseRealDetailsVo> pageList = busiNoiseRealService.getNoiseRealDetailsByMainId1(dto);
+        return AjaxResult.success(pageList);
+    }
+
     /**
      * 导出噪声实时数据详细信息Excel
      */

src/main/java/com/chenxuan/controller/BusiParamBindController.java

@@ -28,8 +28,7 @@ public class BusiParamBindController extends BaseController {
     @ApiOperation(value = "新增ied参数信息")
     @LogAnnotation(module = "ied参数信息", operateType = OperateType.INSERT)
     @PostMapping(value = "/addParamBind")
-    public AjaxResult addParamBind(@RequestBody BusiParamBind busiParamBind) {
+    public AjaxResult addParamBind(@RequestBody BusiParamBind busiParamBind){
-//        return busiParamBindService.addParamBind(busiParamBind);
         return returnAjax(busiParamBindService.addParamBind(busiParamBind));
     }
 
@@ -50,12 +49,10 @@ public class BusiParamBindController extends BaseController {
         return AjaxResult.success(page);
     }
 
-
-
     /**
-     * 删除用户
+     * 删除绑定关系
      */
-    @LogAnnotation(module = "用户管理", operateType = OperateType.DELETE)
+    @LogAnnotation(module = "删除绑定关系", operateType = OperateType.DELETE)
     @DeleteMapping(value = "/delParamBind")
     public AjaxResult delParamBind(@RequestParam("iedIds") int[] iedIds) {
         return returnAjax(busiParamBindService.delParamBind(iedIds) > 0 ? true : false);

src/main/java/com/chenxuan/controller/BusiSubDeviceController.java

@@ -93,13 +93,6 @@ public class BusiSubDeviceController extends BaseController {
     public AjaxResult querySubDeviceByMainId(@PathVariable("mainId") String mainId) {
         return AjaxResult.success(busiSubDeviceService.querySubDeviceByMainId(mainId));
     }
-//    @ApiOperation(value = "根据通信协议类型加载通信参数信息")
-//    @GetMapping(value = "/getBusiCommunicationParametersByProtocol/{protocol}")
-//    public AjaxResult getBusiCommunicationParametersByProtocol(@PathVariable("protocol") String protocol) {
-//        return AjaxResult.success(busiCommunicationParametersService.selectBusiCommunicationParametersByProtocol(protocol));
-//    }
-
-
 
     /**
      * 根据主变id删除主变装置信息
@@ -121,4 +114,13 @@ public class BusiSubDeviceController extends BaseController {
         return returnAjax(busiSubDeviceService.delete(id));
     }
 
+
+
+
+    @ApiOperation(value = "获取主变压器装置信息列表")
+    @PostMapping(value = "/querySubDevice")
+    public AjaxResult querySubDevice(@RequestBody BusiSubDeviceDto dto) {
+        List<BusiSubDeviceVo> page = busiSubDeviceService.querySubDevice(dto);
+        return AjaxResult.success(page);
+    }
 }

src/main/java/com/chenxuan/controller/BusiTransformerConfController.java

@@ -59,7 +59,7 @@ public class BusiTransformerConfController extends BaseController {
      * 修改电流电压配置
      */
     @ApiOperation(value = "修改电流电压配置")
-//    @LogAnnotation(module = "电流电压设置", operateType = OperateType.UPDATE)
+    @LogAnnotation(module = "电流电压设置", operateType = OperateType.UPDATE)
     @PostMapping(value = "/update")
     public AjaxResult update(@RequestBody List<BusiTransformerConf> busiTransformerConfList) {
         return returnAjax(busiTransformerConfService.updateConfigs(busiTransformerConfList));

src/main/java/com/chenxuan/controller/BusiWarningController.java

@@ -34,7 +34,7 @@ public class BusiWarningController extends BaseController {
     @PostMapping(value = "/page")
     public AjaxResult page(@RequestBody BusiWarningDto dto) {
         Page<BusiWarningVo> page;
-        if (StringUtils.isNotBlank(dto.getWarnType())) {
+        if (StringUtils.isNotBlank(dto.getWarnType()) && dto.getWarnType().equals("11")) {
             page = busiWarningService.getPage(dto);
         } else {
             page = busiWarningService.page(dto);

src/main/java/com/chenxuan/controller/IedController.java

@@ -7,7 +7,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -19,8 +18,14 @@ public class IedController {
     private BusiIedparamService busiIedparamService;
 
     @ApiOperation(value = "加载对应主变的原副边电流电压实时数据信息")
-    @GetMapping(value = "/quereyIcdById/{id}")
+    @GetMapping(value = "/quereyIcdById")
-    public AjaxResult quereyIcdById(@PathVariable("id") String id) {
+    public AjaxResult quereyIcdById(String id,String deviceType) {
-        return AjaxResult.success(busiIedparamService.quereyIcdById(id) );
+        return AjaxResult.success(busiIedparamService.quereyIcdById(id,deviceType) );
+    }
+
+    @ApiOperation(value = "加载对应主变的原副边电流电压实时数据信息")
+    @GetMapping(value = "/queryParamsName")
+    public AjaxResult queryParamsName(String deviceType) {
+        return AjaxResult.success(busiIedparamService.queryParamsName(deviceType));
     }
 }

src/main/java/com/chenxuan/controller/ModbusAndBindController.java

@@ -0,0 +1,55 @@
+package com.chenxuan.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chenxuan.base.controller.BaseController;
+import com.chenxuan.base.entity.AjaxResult;
+import com.chenxuan.bean.annotation.LogAnnotation;
+import com.chenxuan.constants.BusiUrlConstants;
+import com.chenxuan.entity.dto.BusiModbusParamBindDto;
+import com.chenxuan.entity.model.BusiModbusParamBind;
+import com.chenxuan.entity.vo.BusiModbusParamBindVo;
+import com.chenxuan.enums.OperateType;
+import com.chenxuan.service.ModbusAndBindService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping(value = BusiUrlConstants.MODBUS_BIND)
+public class ModbusAndBindController extends BaseController {
+
+    @Autowired
+    private ModbusAndBindService modbusAndBindService;
+
+
+    @ApiOperation(value = "根据类型查询模板")
+    @GetMapping(value = "/queryModbusTemplateByDeviceType")
+    public AjaxResult queryModbusTemplateByDeviceType(String deviceType) {
+        return AjaxResult.success(modbusAndBindService.queryModbusTemplateByDeviceType(deviceType));
+    }
+    @ApiOperation(value = "新增修改modbus参数绑定")
+    @LogAnnotation(module = "新增修改modbus参数绑定", operateType = OperateType.INSERT)
+    @PostMapping(value = "/addModbusParamBind")
+    public AjaxResult addModbusParamBind(@RequestBody BusiModbusParamBind busiModbusParamBind) {
+        return AjaxResult.success(modbusAndBindService.addModbusParamBind(busiModbusParamBind));
+    }
+
+
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping(value = "/queryModbusParamBind")
+    public AjaxResult queryModbusParamBind(@RequestBody BusiModbusParamBindDto busiModbusParamBindDto) {
+        Page<BusiModbusParamBindVo> page = modbusAndBindService.queryModbusParamBind(busiModbusParamBindDto);
+        return AjaxResult.success(page);
+    }
+
+    /**
+     * 删除绑定关系
+     */
+    @LogAnnotation(module = "删除绑定关系", operateType = OperateType.DELETE)
+    @DeleteMapping(value = "/delBusiModbusParamBind")
+    public AjaxResult delBusiModbusParamBind(@RequestParam("modbusIds") int[] modbusIds) {
+        return returnAjax(modbusAndBindService.delBusiModbusParamBind(modbusIds) > 0 ? true : false);
+    }
+
+}

src/main/java/com/chenxuan/controller/SysLoginController.java

@@ -53,8 +53,7 @@ public class SysLoginController {
      * @return com.chenxuan.domain.AjaxResult
      */
     @PostMapping("/login")
-    public AjaxResult login(String username, String password, String code, String uuid)
+    public AjaxResult login(String username, String password, String code, String uuid) throws Exception {
-    {
         AjaxResult ajax = AjaxResult.success();
         String token = loginService.login(username, password, code, uuid);
         ajax.put(Constants.TOKEN, token);

src/main/java/com/chenxuan/controller/remote/SysLoginRemoteController.java

@@ -46,8 +46,7 @@ public class SysLoginRemoteController {
      * @Description 登录方法
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody SysUser sysUser) {
+    public AjaxResult login(@RequestBody SysUser sysUser) throws Exception {
-
         AjaxResult ajax = AjaxResult.success();
         String token = loginService.remoteLogin(sysUser.getUserName(), sysUser.getPassword());
         ajax.put(Constants.TOKEN, token);

src/main/java/com/chenxuan/entity/dto/BusiAmpliDatDto.java

@@ -0,0 +1,52 @@
+package com.chenxuan.entity.dto;
+
+import com.chenxuan.base.entity.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * @ClassName：BusiAmpliRealDto
+ * @Description： 振动实时数据表Dto
+ * @Author：Jordan_Li
+ * @CreatTime：6/22/2020 - 16:20 PM
+ * @Version V1.0
+ */
+@Data
+public class BusiAmpliDatDto extends Query implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 录播文件id
+     */
+    @ApiModelProperty(value = "录播文件id", name = "fileId")
+    private String fileId;
+
+    /**
+     * 主变id
+     */
+    @ApiModelProperty(value = "主变id", name = "mainId")
+    private String mainId;
+
+    /**
+     * 原副边 (P: 原边 S:副边,仅当device_type=1时有效)
+     */
+    @ApiModelProperty(value = "原副边 (P: 原边 S:副边,仅当device_type=1时有效)", name = "side")
+    private String side;
+
+    /**
+     * 相位 (A:A相 B:B相  C:C相  Q:全相;,仅当device_type=1时有效)
+     */
+    @ApiModelProperty(value = "相位 (A:A相 B:B相  C:C相  Q:全相;,仅当device_type=1时有效)", name = "phase")
+    private String phase;
+
+    /**
+     * 上下侧或进出侧(I:上侧/进口侧 O:下侧/出口侧)
+     */
+    @ApiModelProperty(value = "上下侧或进出侧(I:上侧/进口侧 O:下侧/出口侧)", name = "inOut")
+    private String inOut;
+
+}

src/main/java/com/chenxuan/entity/dto/BusiAmpliRealDto.java

@@ -22,7 +22,7 @@ public class BusiAmpliRealDto extends Query implements Serializable {
     public static final String D = "day"; //日
 	public static final String W = "week"; //周
 	public static final String M = "month"; //月
-
+    public static final String O = "other";
     /**
      * id
      */
@@ -89,6 +89,12 @@ public class BusiAmpliRealDto extends Query implements Serializable {
     @ApiModelProperty(value = "创建时间", name = "insTime")
     private String insTime;
 
+    /**
+     * 数据插入时间
+     */
+    @ApiModelProperty(value = "数据插入时间", name = "dTime")
+    private String dTime;
+
     /**
      * hbase中的rowkey
      */

src/main/java/com/chenxuan/entity/dto/BusiCalcParamConfDto.java

@@ -1,5 +1,6 @@
 package com.chenxuan.entity.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.chenxuan.base.entity.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -121,6 +122,12 @@ public class BusiCalcParamConfDto extends Query implements Serializable {
     @ApiModelProperty(name = "sortNum", value = "排序")
     private Integer sortNum;
 
+    /**
+     * 频率
+     */
+    @TableField("frequency")
+    private String frequency;
+
     /**
      * 下级计算指标列表
      */

src/main/java/com/chenxuan/entity/dto/BusiCenterRealDto.java

@@ -40,11 +40,17 @@ public class BusiCenterRealDto extends Query implements Serializable {
     @ApiModelProperty(name = "frequency", value = "振动频率")
     private String frequency;
 
+
+    /**
+     *温度
+     */
+    @ApiModelProperty(name = "temp", value = "温度")
+    private String temp;
     /**
-     * 最大振幅
+     * 湿度
      */
-    @ApiModelProperty(name = "maxAmplitude", value = "最大振幅")
+    @ApiModelProperty(name = "humidity", value = "湿度")
-    private String maxAmplitude;
+    private String humidity;
 
     /**
      * 创建时间

src/main/java/com/chenxuan/entity/dto/BusiCenterThresholdConfDto.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 
 /**
  * @ClassName：BusiCenterThresholdConfVo
- * @Description： 中心点电流阈值配置表Vo
+ * @Description： 中性点电流阈值配置表Vo
  * @Author：Jordan_Li
  * @CreatTime：6/8/2020 - 13:15 PM
  * @Version V1.0
@@ -56,21 +56,21 @@ public class BusiCenterThresholdConfDto extends Query implements Serializable {
     private String negative;
 
     /**
-     * 中心点电流日增长率(%)
+     * 中性点电流日增长率(%)
      */
-    @ApiModelProperty(name = "dayRate", value = "中心点电流日增长率(%)")
+    @ApiModelProperty(name = "dayRate", value = "中性点电流日增长率(%)")
     private String dayRate;
 
     /**
-     * 中心点电流月增长率(%)
+     * 中性点电流月增长率(%)
      */
-    @ApiModelProperty(name = "monthRate", value = "中心点电流月增长率(%)")
+    @ApiModelProperty(name = "monthRate", value = "中性点电流月增长率(%)")
     private String monthRate;
 
     /**
-     * 中心点电流月偏差率(%)
+     * 中性点电流月偏差率(%)
      */
-    @ApiModelProperty(name = "deviationRate", value = "中心点电流月偏差率(%)")
+    @ApiModelProperty(name = "deviationRate", value = "中性点电流月偏差率(%)")
     private String deviationRate;
 
     /**

src/main/java/com/chenxuan/entity/dto/BusiEnvironmentRealDto.java

@@ -0,0 +1,82 @@
+package com.chenxuan.entity.dto;
+
+import com.chenxuan.base.entity.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Carrey Zheng
+ * @create 2020-06-22 3:01 PM
+ **/
+@Data
+public class BusiEnvironmentRealDto extends Query implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(name = "id", value = "主键id")
+    private String id;
+
+    /**
+     * 主变id
+     */
+    @ApiModelProperty(name = "mainId", value = "主变id")
+    private String mainId;
+
+    /**
+     * 设备名称
+     */
+    @ApiModelProperty(name = "deviceName", value = "设备名称")
+    private String deviceName;
+
+    /**
+     *温度
+     */
+    @ApiModelProperty(name = "temp", value = "温度")
+    private String temp;
+
+    /**
+     * 湿度
+     */
+    @ApiModelProperty(name = "humidity", value = "湿度")
+    private String humidity;
+
+    /**
+     * 负载类型
+     */
+    @ApiModelProperty(name = "loadType", value = "负载类型")
+    private String loadType;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "insTime", value = "创建时间")
+    private String insTime;
+
+    /**
+     * hbase中的rowkey
+     */
+    @ApiModelProperty(name = "hbaseRowkey", value = "hbase中的rowkey")
+    private String hbaseRowkey;
+    /**
+     * 统计时间
+     */
+    @ApiModelProperty(name = "createTime", value = "统计时间")
+    private String createTime;
+
+    /**
+     * 开始日期
+     */
+    @ApiModelProperty(name = "startTime", value = "开始日期")
+    private String startTime;
+
+    /**
+     * 结束日期
+     */
+    @ApiModelProperty(name = "endTime", value = "结束日期")
+    private String endTime;
+}

src/main/java/com/chenxuan/entity/dto/BusiEnvironmentThresholdConfDto.java

@@ -0,0 +1,111 @@
+package com.chenxuan.entity.dto;
+
+import com.chenxuan.base.entity.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * @ClassName：BusiCenterThresholdConfVo
+ * @Description： 中性点电流阈值配置表Vo
+ * @Author：Jordan_Li
+ * @CreatTime：6/8/2020 - 13:15 PM
+ * @Version V1.0
+ */
+@Data
+public class BusiEnvironmentThresholdConfDto extends Query implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(name = "id", value = "主键id")
+    private String id;
+
+    /**
+     * 主变id
+     */
+    @ApiModelProperty(name = "mainId", value = "主变id")
+    private String mainId;
+
+    /**
+     * 主变装置id
+     */
+    @ApiModelProperty(name = "subId", value = "主变装置id")
+    private String subId;
+
+    /**
+     * 主变名称
+     */
+    @ApiModelProperty(name = "deviceName", value = "主变名称")
+    private String deviceName;
+
+    /**
+     * 温度
+     */
+    @ApiModelProperty(name = "temp", value = "温度")
+    private String temp;
+
+    /**
+     * 湿度
+     */
+    @ApiModelProperty(name = "humidity", value = "湿度")
+    private String humidity;
+
+    /**
+     * 温度日增长率(%)
+     */
+    @ApiModelProperty(name = "dayRate", value = "温度日增长率(%)")
+    private String dayRate;
+
+    /**
+     * 温度月增长率(%)
+     */
+    @ApiModelProperty(name = "monthRate", value = "温度月增长率(%)")
+    private String monthRate;
+
+    /**
+     * 温度月偏差率(%)
+     */
+    @ApiModelProperty(name = "deviationRate", value = "温度月偏差率(%)")
+    private String deviationRate;
+
+    /**
+     * 湿度日增长率(%)
+     */
+    @ApiModelProperty(name = "dayRateHumidity", value = "湿度日增长率(%)")
+    private String dayRateHumidity;
+
+    /**
+     * 湿度月增长率(%)
+     */
+    @ApiModelProperty(name = "monthRateHumidity", value = "湿度月增长率(%)")
+    private String monthRateHumidity;
+
+    /**
+     * 湿度月偏差率(%)
+     */
+    @ApiModelProperty(name = "deviationRateHumidity", value = "湿度月偏差率(%)")
+    private String deviationRateHumidity;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "insTime", value = "创建时间")
+    private String insTime;
+
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty(name = "startTime", value = "开始时间")
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty(name = "endTime", value = "结束时间")
+    private String endTime;
+}

src/main/java/com/chenxuan/entity/dto/BusiIedparamDto.java

@@ -28,4 +28,10 @@ public class BusiIedparamDto extends Query implements Serializable {
      */
     @ApiModelProperty(value="振动类型", name="nodeType")
     private String nodeType;
+
+    /**
+     * 装置类别: 1振动装置，2噪声装置,3中心点装置
+     */
+    @ApiModelProperty(value="装置类别: 1振动装置，2噪声装置,3中心点装置", name="deviceType")
+    private String deviceType;
 }

src/main/java/com/chenxuan/entity/dto/BusiModbusParamBindDto.java

@@ -0,0 +1,102 @@
+package com.chenxuan.entity.dto;
+
+import com.chenxuan.base.entity.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class BusiModbusParamBindDto extends Query implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(name = "id", value = "主键id")
+    private String id;
+
+    /**
+     * 状态 Y:启用 N:禁用/预留
+     */
+    @ApiModelProperty(value = "状态 Y:启用 N:禁用/预留", name = "state")
+    private String state;
+
+    /**
+     * 主变ID
+     */
+    @ApiModelProperty(value = "主变ID", name = "mainId")
+    private String mainId;
+
+    /**
+     * 主变名称
+     */
+    @ApiModelProperty(value = "主变ID", name = "mainName")
+    private String mainName;
+
+
+    /**
+     * 装置ID
+     */
+    @ApiModelProperty(value = "主变ID", name = "subId")
+    private String subId;
+
+    /**
+     * 装置名称
+     */
+    @ApiModelProperty(value = "主变ID", name = "subName")
+    private String subName;
+
+    /**
+     * Sensor编码
+     */
+    @ApiModelProperty(value = "Sensor编码", name = "sensorCode")
+    private String sensorCode;
+
+    /**
+     * P:原边 S:副边
+     */
+    @ApiModelProperty(value = "P:原边 S:副边", name = "side")
+    private String side;
+
+    /**
+     * 相位 A:B:C:O:全相
+     */
+    @ApiModelProperty(value = "相位 A:B:C:O:全相", name = "phase")
+    private String phase;
+
+    /**
+     * 上下侧 U:上侧 D:下侧
+     */
+    @ApiModelProperty(value = "上下侧 U:上侧 D:下侧", name = "inOut")
+    private String inOut;
+
+    /**
+     * 上下侧 U:上侧 D:下侧
+     */
+    @ApiModelProperty(value = "上下侧 U:上侧 D:下侧", name = "frequency")
+    private String frequency;
+
+    /**
+     * 装置类别 1:振动装置 2:噪声装置 3:中心点装置 4:其他
+     */
+    @ApiModelProperty(value = "装置类别 1:振动装置 2:噪声装置 3:中心点装置 4:其他", name = "deviceType")
+    private String deviceType;
+
+    /**
+     * 寄存器地址
+     */
+    @ApiModelProperty(value = "寄存器地址", name = "addr")
+    private int addr;
+
+    /**
+     * 寄存器类型 EX:异常检测 ST:状态量YX; MX:模拟量YC; SE:控制量
+     */
+    @ApiModelProperty(value = "寄存器类型 EX:异常检测 ST:状态量YX; MX:模拟量YC; SE:控制量", name = "addrType")
+    private String addrType;
+
+    /**
+     * 寄存器类型 EX:异常检测 ST:状态量YX; MX:模拟量YC; SE:控制量
+     */
+    @ApiModelProperty(value = "寄存器描述", name = "adrdesc")
+    private String adrdesc;
+}

src/main/java/com/chenxuan/entity/dto/BusiModbusTemplateDto.java

@@ -0,0 +1,41 @@
+package com.chenxuan.entity.dto;
+
+import com.chenxuan.base.entity.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class BusiModbusTemplateDto extends Query implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(name = "id", value = "主键id")
+    private String id;
+
+    /**
+     * 寄存器地址
+     */
+    @ApiModelProperty(value = "寄存器地址", name = "addr")
+    private int addr;
+
+    /**
+     * 寄存器类型
+     */
+    @ApiModelProperty(value = "寄存器类型, EX: 自检量 ST:状态量YX; MX:模拟量YC; SE:控制量; TM:时钟", name = "addrType")
+    private String addrType;
+
+    /**
+     * 寄存器描述
+     */
+    @ApiModelProperty(value = "寄存器描述", name = "adrdesc")
+    private String adrdesc;
+
+    /**
+     * 装置类型：1振动装置，2噪声装置,3中心点装置,4其他
+     */
+    @ApiModelProperty(value = "装置类型：1振动装置，2噪声装置,3中心点装置,4其他", name = "deviceType")
+    private String deviceType;
+}

src/main/java/com/chenxuan/entity/dto/BusiParamBindDto.java

@@ -51,7 +51,11 @@ public class BusiParamBindDto extends Query implements Serializable {
      */
     @ApiModelProperty(value="频率(Hz)", name="frequency")
     private String frequency;
-
+    /**
+     * 监测类型: 1=振动监测 2=振动告警 3=噪声监测 4=噪声告警 5=中心点监测 6=中心点告警
+     */
+    @ApiModelProperty(value="监测类型: 1=振动监测 2=振动告警 3=噪声监测 4=噪声告警 5=中心点监测 6=中心点告警 7:环境监测 8:环境告警", name="monitype")
+    private String monitype;
     /**
      * 设备名称
      */
@@ -64,4 +68,11 @@ public class BusiParamBindDto extends Query implements Serializable {
     @ApiModelProperty(name = "subDeviceName", value = "装置名称")
     private String subDeviceName;
 
+
+    /**
+     * 装置类别: 1振动装置，2噪声装置,3中心点装置
+     */
+    @ApiModelProperty(value="装置类别: 1振动装置，2噪声装置,3中心点装置", name="deviceType")
+    private String deviceType;
+
 }

src/main/java/com/chenxuan/entity/dto/BusiWarningDto.java

@@ -41,8 +41,9 @@ public class BusiWarningDto extends Query implements Serializable {
 
     /**
      * 告警分类 1:通信异常告警 2:装置自检异常告警 3:信号异常告警 4:供电异常告警 5:振动阈值告警
-     * 6:噪声阈值告警 7:中心点阈值告警 8:日增长率告警 9:月增长率告警 10:月偏差率告警
+     * 6:噪声阈值告警 7:中性点阈值告警 8:日增长率告警 9:月增长率告警 10:月偏差率告警
-     * 11:服务器与IED通信异常 12:传感器振动告警 13:传感器噪声告警 14:传感器中心点告警
+     * 11:服务器与IED通信异常 12:传感器振动告警 13:传感器噪声告警 14:传感器中性点告警 20:未知监测单元
+     * 21:采样板通信异常 22:采样板传感器故障异常
      */
     @ApiModelProperty(name = "warnType", value = "告警分类")
     private String warnType;

src/main/java/com/chenxuan/entity/model/BusiAmpliDayIncrease.java

@@ -1,6 +1,5 @@
 package com.chenxuan.entity.model;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -28,7 +27,7 @@ public class BusiAmpliDayIncrease extends Model<BusiAmpliDayIncrease> {
      * id
      */
     @ApiModelProperty(value = "主键", name = "id")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id")
     private String id;
 
     /**

src/main/java/com/chenxuan/entity/model/BusiAssessParameter.java

@@ -43,4 +43,28 @@ public class BusiAssessParameter extends Model<BusiAssessParameter> {
     @ApiModelProperty(value="创建时间", name="insTime")
     @TableField("ins_time")
     private Date insTime;
+
+    /**
+     * 高压侧
+     */
+    @TableField(exist = false)
+    private String highPoint ;
+
+    /**
+     * 底压侧
+     */
+    @TableField(exist = false)
+    private String lowPoint ;
+
+    /**
+     * 中心
+     */
+    @TableField(exist = false)
+    private String centerPoint ;
+
+    /**
+     * 噪声
+     */
+    @TableField(exist = false)
+    private String noisePoint;
 }

src/main/java/com/chenxuan/entity/model/BusiCalcParamConf.java

@@ -111,6 +111,12 @@ public class BusiCalcParamConf {
     @TableField("create_user")
     private String createUser;
 
+    /**
+     * 频率
+     */
+    @TableField("frequency")
+    private String frequency;
+
     /**
      * 排序
      */

src/main/java/com/chenxuan/entity/model/BusiCenterIncrease.java

@@ -1,12 +1,12 @@
 package com.chenxuan.entity.model;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.Date;
 
 /**
@@ -18,7 +18,7 @@ import java.util.Date;
 public class BusiCenterIncrease extends Model<BusiCenterIncrease> {
 
     @ApiModelProperty(value = "主键", name = "id")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id")
     private String id;
 
     /**

src/main/java/com/chenxuan/entity/model/BusiCenterReal.java

@@ -12,7 +12,7 @@ import java.util.Date;
 
 /**
  * @ClassName：BusiCenterReal
- * @Description： 中心点实时数据表
+ * @Description： 中性点实时数据表
  * @Author：Jordan_Li
  * @CreatTime：6/16/2020 - 13:50 PM
  * @Version V1.0
@@ -45,6 +45,21 @@ public class BusiCenterReal extends Model<BusiCenterReal> {
     @TableField("max_amplitude")
     private String maxAmplitude;
 
+    /**
+     * 温度
+     */
+    @ApiModelProperty(value="温度", name="temp")
+    @TableField(exist = false)
+    private String temp;
+
+
+    /**
+     * 湿度
+     */
+    @ApiModelProperty(value="湿度", name="humidity")
+    @TableField(exist = false)
+    private String humidity;
+
     /**
      * 创建时间
      */

src/main/java/com/chenxuan/entity/model/BusiCenterThresholdConf.java

@@ -14,7 +14,7 @@ import java.util.Date;
 
 /**
  * @ClassName：BusiCenterThresholdConf
- * @Description： 中心点电流阈值配置表
+ * @Description： 中性点电流阈值配置表
  * @Author：Jordan_Li
  * @CreatTime：6/8/2020 - 13:15 PM
  * @Version V1.0
@@ -61,23 +61,23 @@ public class BusiCenterThresholdConf extends Model<BusiCenterThresholdConf> {
     private String negative;
 
     /**
-     * 中心点电流日增长率(%)
+     * 中性点电流日增长率(%)
      */
-    @ApiModelProperty(value="中心点电流日增长率(%)", name="dayRate")
+    @ApiModelProperty(value="中性点电流日增长率(%)", name="dayRate")
     @TableField("day_rate")
     private String dayRate;
 
     /**
-     * 中心点电流月增长率(%)
+     * 中性点电流月增长率(%)
      */
-    @ApiModelProperty(value="中心点电流月增长率(%)", name="monthRate")
+    @ApiModelProperty(value="中性点电流月增长率(%)", name="monthRate")
     @TableField("month_rate")
     private String monthRate;
 
     /**
-     * 中心点电流月偏差率(%)
+     * 中性点电流月偏差率(%)
      */
-    @ApiModelProperty(value="中心点电流月偏差率(%)", name="deviationRate")
+    @ApiModelProperty(value="中性点电流月偏差率(%)", name="deviationRate")
     @TableField("deviation_rate")
     private String deviationRate;
 

src/main/java/com/chenxuan/entity/model/BusiCommunicationParameters.java

@@ -81,11 +81,11 @@ public class BusiCommunicationParameters extends Model<BusiCommunicationParamete
     private String stopBit;
 
     /**
-     * IP地址，当protocol为2起效
+     * 主变id
      */
-    @ApiModelProperty(value="子装置ID", name="subDeviceId")
+    @ApiModelProperty(value="主变id", name="mainId")
-    @TableField("sub_device_id")
+    @TableField("main_id")
-    private String subDeviceId;
+    private String mainId;
 
     /**
      * IP地址，当protocol为2起效
@@ -115,6 +115,18 @@ public class BusiCommunicationParameters extends Model<BusiCommunicationParamete
     @TableField("confirm_password")
     private String confirmPassword;
 
+    /**
+     * IED通道配置
+     */
+    @ApiModelProperty(value="IED通道配置", name="iedChannel")
+    @TableField("ied_channel")
+    private String iedChannel;
+
 
     private List<DeviceInfo> deviceArray;
+
+    /**
+     * 标识位 0：禁用，1：启用
+     */
+    private String status;
 }

src/main/java/com/chenxuan/entity/model/BusiControlConfig.java

@@ -76,9 +76,9 @@ public class BusiControlConfig extends Model<BusiControlConfig> {
     private String aloneTest;
 
     /**
-     * 校时(0:手动校时 1:自动校时)
+     * 是否修改 1:修改 0:未修改
      */
-    @ApiModelProperty(value="校时(0:手动校时 1:自动校时)", name="updateTime")
+    @ApiModelProperty(value="是否修改 1:修改 0:未修改", name="updateTime")
     @TableField("update_time")
     private String updateTime;
 

src/main/java/com/chenxuan/entity/model/BusiEnvironmentReal.java

@@ -0,0 +1,92 @@
+package com.chenxuan.entity.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ * @ClassName：BusiEnvironmentReal
+ * @Description： 环境监测实时数据表
+ * @Author：Jordan_Li
+ * @CreatTime：6/16/2020 - 13:50 PM
+ * @Version V1.0
+ */
+@Data
+@TableName("busi_environment_real")
+public class BusiEnvironmentReal extends Model<BusiEnvironmentReal> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ApiModelProperty(value="主键", name="id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private String id;
+
+    /**
+     * 主变id
+     */
+    @ApiModelProperty(value="主设备ID,源自表busi_main_device.id", name="mainId")
+    @TableField("main_id")
+    private String mainId;
+
+
+    /**
+     * 电流值
+     */
+    @ApiModelProperty(value="负载类型", name="loadType")
+    @TableField("load_type")
+    private String loadType;
+
+    /**
+     * 温度
+     */
+    @ApiModelProperty(value="温度", name="temp")
+    @TableField("temp")
+    private String temp;
+
+
+    /**
+     * 湿度
+     */
+    @ApiModelProperty(value="湿度", name="humidity")
+    @TableField("humidity")
+    private String humidity;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value="创建时间", name="insTime")
+    @TableField("ins_time")
+    private Date insTime;
+
+
+    /**
+     * 数据库插入时间
+     */
+    @ApiModelProperty(value="数据库插入时间", name="dTime")
+    @TableField("d_time")
+    private Date dTime;
+
+    /**
+     * hbase中的rowkey
+     */
+    @ApiModelProperty(value="hbase中的rowkey", name="hbaseRowkey")
+    @TableField("hbase_rowkey")
+    private String hbaseRowkey;
+
+    /**
+     * 是否上传报文（0/null 未上传， 1 已上传）
+     */
+    @ApiModelProperty(value="是否上传报文（0/null 未上传， 1 已上传）", name="isupload")
+    @TableField("isupload")
+    private int isupload;
+}

src/main/java/com/chenxuan/entity/model/BusiEnvironmentRealStatistics.java

@@ -0,0 +1,63 @@
+package com.chenxuan.entity.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Carrey Zheng
+ * @create 2020-07-06 5:38 PM
+ **/
+@Data
+@TableName("busi_environment_real_statistics")
+public class BusiEnvironmentRealStatistics extends Model<BusiEnvironmentRealStatistics> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "主键", name = "id")
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 主变id
+     */
+    @ApiModelProperty(value = "主设备ID,源自表busi_main_device.id", name = "mainId")
+    @TableField("main_id")
+    private String mainId;
+
+    /**
+     * 温度
+     */
+    @ApiModelProperty(value = "温度", name = "temp")
+    @TableField("temp")
+    private String temp;
+
+    /**
+     * 湿度
+     */
+    @ApiModelProperty(value = "湿度", name = "humidity")
+    @TableField("humidity")
+    private String humidity;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", name = "insTime")
+    @TableField("ins_time")
+    private Date insTime;
+
+    /**
+     * hbase中的rowkey
+     */
+    @ApiModelProperty(value = "hbase中的rowkey", name = "hbaseRowkey")
+    @TableField("hbase_rowkey")
+    private String hbaseRowkey;
+}

src/main/java/com/chenxuan/entity/model/BusiEnvironmentThresholdConf.java

@@ -0,0 +1,112 @@
+package com.chenxuan.entity.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ * @ClassName：BusiCenterThresholdConf
+ * @Description： 中性点电流阈值配置表
+ * @Author：Jordan_Li
+ * @CreatTime：6/8/2020 - 13:15 PM
+ * @Version V1.0
+ */
+@Data
+@TableName("busi_environment_threshold_conf")
+public class BusiEnvironmentThresholdConf extends Model<BusiEnvironmentThresholdConf> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ApiModelProperty(value="主键", name="id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private String id;
+
+    /**
+     * 主变id
+     */
+    @ApiModelProperty(value="主设备ID,源自表busi_main_device.id", name="mainId")
+    @TableField("main_id")
+    private String mainId;
+
+    /**
+     * 装置ID,源自表busi_sub_device.id
+     */
+    @ApiModelProperty(value="装置ID,源自表busi_sub_device.id", name="subId")
+    @TableField("sub_id")
+    private String subId;
+
+    /**
+     * 温度
+     */
+    @ApiModelProperty(value="温度", name="temp")
+    @TableField("temp")
+    private String temp;
+
+    /**
+     * 湿度
+     */
+    @ApiModelProperty(value="湿度", name="humidity")
+    @TableField("humidity")
+    private String humidity;
+
+    /**
+     * 温度日增长率(%)
+     */
+    @ApiModelProperty(value="温度日增长率(%)", name="dayRate")
+    @TableField("day_rate")
+    private String dayRate;
+
+    /**
+     * 温度月增长率(%)
+     */
+    @ApiModelProperty(value="温度月增长率(%)", name="monthRate")
+    @TableField("month_rate")
+    private String monthRate;
+
+    /**
+     * 温度月偏差率(%)
+     */
+    @ApiModelProperty(value="温度月偏差率(%)", name="deviationRate")
+    @TableField("deviation_rate")
+    private String deviationRate;
+
+    /**
+     * 湿度月增长率(%)
+     */
+    @ApiModelProperty(value="湿度月增长率(%)", name="monthRateHumidity")
+    @TableField("month_rate_humidity")
+    private String monthRateHumidity;
+
+    /**
+     * 湿度日增长率(%)
+     */
+    @ApiModelProperty(value="湿度日增长率(%)", name="dayRateHumidity")
+    @TableField("day_rate_humidity")
+    private String dayRateHumidity;
+
+    /**
+     * 湿度月偏差率(%)
+     */
+    @ApiModelProperty(value="湿度月偏差率(%)", name="deviationRateHumidity")
+    @TableField("deviation_rate_humidity")
+    private String deviationRateHumidity;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value="创建时间", name="insTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("ins_time")
+    private Date insTime;
+}

src/main/java/com/chenxuan/entity/model/BusiIedparam.java

@@ -32,4 +32,11 @@ public class BusiIedparam extends Model<BusiIedparam> {
     @ApiModelProperty(value="振动类型", name="nodeType")
     @TableField("node_type")
     private String nodeType;
+
+    /**
+     * 装置类别: 1振动装置，2噪声装置,3中心点装置
+     */
+    @ApiModelProperty(value="装置类别: 1振动装置，2噪声装置,3中心点装置", name="deviceType")
+    @TableField("device_type")
+    private String deviceType;
 }

src/main/java/com/chenxuan/entity/model/BusiMainDevice.java

@@ -61,6 +61,13 @@ public class BusiMainDevice extends Model<BusiMainDevice> {
     @TableField("device_model")
     private String deviceModel;
 
+    /**
+     * 设备类型
+     */
+    @ApiModelProperty(value="设备类型", name="deviceType")
+    @TableField("device_type")
+    private String deviceType;
+
     /**
      * 制造厂家名称
      */

src/main/java/com/chenxuan/entity/model/BusiModbusParamBind.java

@@ -0,0 +1,106 @@
+package com.chenxuan.entity.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+@TableName("busi_modbus_param_bind")
+public class BusiModbusParamBind implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(name = "id", value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private String id;
+
+    /**
+     * 状态 Y:启用 N:禁用/预留
+     */
+    @ApiModelProperty(value = "状态 Y:启用 N:禁用/预留", name = "state")
+    @TableField("state")
+    private String state;
+
+    /**
+     * 主变ID
+     */
+    @ApiModelProperty(value = "主变ID", name = "mainId")
+    @TableField("main_id")
+    private String mainId;
+
+    /**
+     * 装置ID
+     */
+    @ApiModelProperty(value = "主变ID", name = "subId")
+    @TableField("sub_id")
+    private String subId;
+
+    /**
+     * Sensor编码
+     */
+    @ApiModelProperty(value = "Sensor编码", name = "sensorCode")
+    @TableField("sensor_code")
+    private String sensorCode;
+
+    /**
+     * P:原边 S:副边
+     */
+    @ApiModelProperty(value = "P:原边 S:副边", name = "side")
+    @TableField("side")
+    private String side;
+
+    /**
+     * 相位 A:B:C:O:全相
+     */
+    @ApiModelProperty(value = "相位 A:B:C:O:全相", name = "phase")
+    @TableField("phase")
+    private String phase;
+
+    /**
+     * 上下侧 U:上侧 D:下侧
+     */
+    @ApiModelProperty(value = "上下侧 U:上侧 D:下侧", name = "inOut")
+    @TableField("in_out")
+    private String inOut;
+
+    /**
+     * 上下侧 U:上侧 D:下侧
+     */
+    @ApiModelProperty(value = "上下侧 U:上侧 D:下侧", name = "frequency")
+    @TableField("frequency")
+    private String frequency;
+
+    /**
+     * 装置类别 1:振动装置 2:噪声装置 3:中心点装置 4:其他
+     */
+    @ApiModelProperty(value = "装置类别 1:振动装置 2:噪声装置 3:中心点装置 4:其他", name = "deviceType")
+    @TableField("device_type")
+    private String deviceType;
+
+    /**
+     * 寄存器地址
+     */
+    @ApiModelProperty(value = "寄存器地址", name = "addr")
+    @TableField("addr")
+    private int addr;
+
+    /**
+     * 寄存器类型 EX:异常检测 ST:状态量YX; MX:模拟量YC; SE:控制量
+     */
+    @ApiModelProperty(value = "寄存器类型 EX:异常检测 ST:状态量YX; MX:模拟量YC; SE:控制量", name = "addrType")
+    @TableField("addr_type")
+    private String addrType;
+
+    /**
+     * 寄存器类型 EX:异常检测 ST:状态量YX; MX:模拟量YC; SE:控制量
+     */
+    @ApiModelProperty(value = "寄存器描述", name = "adrdesc")
+    @TableField("adrdesc")
+    private String adrdesc;
+}

src/main/java/com/chenxuan/entity/model/BusiModbusTemplate.java

@@ -0,0 +1,50 @@
+package com.chenxuan.entity.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+@TableName("busi_modbus_template")
+public class BusiModbusTemplate implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(name = "id", value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private String id;
+
+    /**
+     * 寄存器地址
+     */
+    @ApiModelProperty(value = "寄存器地址", name = "addr")
+    @TableField("addr")
+    private int addr;
+
+    /**
+     * 寄存器类型
+     */
+    @ApiModelProperty(value = "寄存器类型, EX: 自检量 ST:状态量YX; MX:模拟量YC; SE:控制量; TM:时钟", name = "addrType")
+    @TableField("addr_type")
+    private String addrType;
+
+    /**
+     * 寄存器描述
+     */
+    @ApiModelProperty(value = "寄存器描述", name = "adrdesc")
+    @TableField("adrdesc")
+    private String adrdesc;
+
+    /**
+     * 装置类型：1振动装置，2噪声装置,3中心点装置,4其他
+     */
+    @ApiModelProperty(value = "装置类型：1振动装置，2噪声装置,3中心点装置,4其他", name = "deviceType")
+    @TableField("device_type")
+    private String deviceType;
+}

src/main/java/com/chenxuan/entity/model/BusiNoiseIncrease.java

@@ -1,12 +1,12 @@
 package com.chenxuan.entity.model;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.Date;
 
 /**
@@ -17,7 +17,7 @@ import java.util.Date;
 @TableName("busi_noise_increase")
 public class BusiNoiseIncrease extends Model<BusiNoiseIncrease> {
     @ApiModelProperty(value = "主键", name = "id")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id")
     private String id;
 
     /**

src/main/java/com/chenxuan/entity/model/BusiParamBind.java

@@ -61,4 +61,20 @@ public class BusiParamBind  extends Model<BusiParamBind> {
     @ApiModelProperty(value="频率(Hz)", name="frequency")
     @TableField("frequency")
     private String frequency;
+
+    /**
+     * 监测类型: 1=振动监测 2=振动告警 3=噪声监测 4=噪声告警 5=中心点监测 6=中心点告警
+     */
+    @ApiModelProperty(value="监测类型: 1=振动监测 2=振动告警 3=噪声监测 4=噪声告警 5=中心点监测 6=中心点告警 7:环境监测 8:环境告警", name="monitype")
+    @TableField("monitype")
+    private String monitype;
+
+
+    /**
+     * 装置类别: 1振动装置，2噪声装置,3中心点装置
+     */
+    @ApiModelProperty(value="装置类别: 1振动装置，2噪声装置,3中心点装置", name="deviceType")
+    @TableField("device_type")
+    private String deviceType;
+
 }

src/main/java/com/chenxuan/entity/model/BusiWarning.java

@@ -1,6 +1,5 @@
 package com.chenxuan.entity.model;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -29,7 +28,7 @@ public class BusiWarning extends Model<BusiWarning> {
      * 主键id
      */
     @ApiModelProperty(value="主键id", name="id")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id")
     private String id;
 
     /**
@@ -69,6 +68,13 @@ public class BusiWarning extends Model<BusiWarning> {
     @TableField("sample_value")
     private String sampleValue;
 
+    /**
+     * 告警阈值
+     */
+    @ApiModelProperty(value="告警阈值", name="threadval")
+    @TableField("threadval")
+    private String threadval;
+
     /**
      * 采样值单位(A)(db)(mm/s2)
      */
@@ -118,6 +124,13 @@ public class BusiWarning extends Model<BusiWarning> {
     @TableField("process_time")
     private Date processTime;
 
+    /**
+     * 增长率
+     */
+    @ApiModelProperty(value="增长率", name="growthRate")
+    @TableField("growth_rate")
+    private String growthRate;
+
     /**
      * hbase同步主键
      */

src/main/java/com/chenxuan/entity/model/DeviceInfo.java

@@ -1,34 +1,14 @@
 package com.chenxuan.entity.model;
 
+import lombok.Data;
+
 /**
  * @author buck_guo
  */
+@Data
 public class DeviceInfo {
     private String device;
     private String ip;
     private String port;
-
+    private String iedChannel;
-    public String getDevice() {
-        return device;
-    }
-
-    public void setDevice(String device) {
-        this.device = device;
-    }
-
-    public String getIp() {
-        return ip;
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    public String getPort() {
-        return port;
-    }
-
-    public void setPort(String port) {
-        this.port = port;
-    }
 }

src/main/java/com/chenxuan/entity/vo/BusiAmpliDatList1Vo.java

@@ -0,0 +1,36 @@
+package com.chenxuan.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @ClassName：BusiAmpliDatListVo
+ * @Description： 录播文件Vo
+ * @Author：vent
+ * @CreatTime：3/24/2023 - 13:50 PM
+ * @Version V1.0
+ */
+@Data
+public class BusiAmpliDatList1Vo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * busiAmpliDatListVos
+	 */
+	@ApiModelProperty(value = "busiAmpliDatListVos", name = "busiAmpliDatListVos")
+	private List<BusiAmpliDatListVo> busiAmpliDatListVos;
+
+
+	/**
+	 * 开始日期
+	 */
+	@ApiModelProperty(value = "开始日期", name = "startTime")
+	private String startTime;
+
+
+}

src/main/java/com/chenxuan/entity/vo/BusiAmpliDatListVo.java

@@ -0,0 +1,39 @@
+package com.chenxuan.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName：BusiAmpliDatListVo
+ * @Description： 录播文件Vo
+ * @Author：vent
+ * @CreatTime：3/24/2023 - 13:50 PM
+ * @Version V1.0
+ */
+@Data
+public class BusiAmpliDatListVo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * 录播文件id
+	 */
+	@ApiModelProperty(value = "录播文件id", name = "fileId")
+	private String fileId;
+
+	/**
+	 * 主变id
+	 */
+	@ApiModelProperty(value = "主变id", name = "mainId")
+    private String mainId;
+
+
+	/**
+	 * 录波文件名称
+	 */
+	@ApiModelProperty(value = "录波文件名称", name = "fileName")
+	private String fileName;
+}

src/main/java/com/chenxuan/entity/vo/BusiAmpliDayIncreaseRateVo.java

@@ -0,0 +1,103 @@
+package com.chenxuan.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class BusiAmpliDayIncreaseRateVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ApiModelProperty(value="主键id", name="id")
+    private String id;
+
+    /**
+     * 录播文件记录id
+     */
+    @ApiModelProperty(value="录播文件记录id", name="fileId")
+    private String fileId;
+
+    /**
+     * 主变id
+     */
+    @ApiModelProperty(value="主变id", name="mainId")
+    private String mainId;
+
+    /**
+     * 装置id
+     */
+    @ApiModelProperty(value="装置id", name="subId")
+    private String subId;
+
+    /**
+     * 频率
+     */
+    @ApiModelProperty(value="频率", name="frequency")
+    private String frequency;
+
+    /**
+     * 振幅阈值(mm/s2)
+     */
+    @ApiModelProperty(value="振幅阈值(mm/s2)", name="amplitude")
+    private String amplitude;
+
+    /**
+     * 日增长率(%)
+     */
+    @ApiModelProperty(value="日增长率(%)", name="dayRate")
+    private String dayRate;
+
+    /**
+     * 振动幅值月增长率(%)
+     */
+    @ApiModelProperty(value="振动幅值月增长率(%)", name="monthRate")
+    private String monthRate;
+
+    /**
+     * 振动幅值月偏差率(%)
+     */
+    @ApiModelProperty(value="振动幅值月偏差率(%)", name="deviationRate")
+    private String deviationRate;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value="创建时间", name="dTime")
+    private String dTime;
+
+    /**
+     * 负载类型 1:空载 2:负载
+     */
+    @ApiModelProperty(value="负载类型", name="loadType")
+    private String loadType;
+
+    /**
+     * 频率集合
+     */
+    @ApiModelProperty(value="频率集合", name="frequencyList")
+    private List<String> frequencyList;
+
+    /**
+     * 日增长率集合
+     */
+    @ApiModelProperty(value="日增长率集合", name="dayRateList")
+    private List<String> dayRateList;
+
+    /**
+     * 振动幅值月增长率集合
+     */
+    @ApiModelProperty(value="振动幅值月增长率集合", name="monthRateList")
+    private List<String> monthRateList;
+
+    /**
+     * 振动幅值月偏差率集合
+     */
+    @ApiModelProperty(value="振动幅值月偏差率集合", name="deviationRateList")
+    private List<String> deviationRateList;
+}

src/main/java/com/chenxuan/entity/vo/BusiAmpliReaPageVo.java

@@ -0,0 +1,36 @@
+package com.chenxuan.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @ClassName：BusiAmpliRealVo
+ * @Description： 振动实时数据表Vo
+ * @Author：Jordan_Li
+ * @CreatTime：6/17/2020 - 15:50 PM
+ * @Version V1.0
+ */
+@Data
+public class BusiAmpliReaPageVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+
+
+	/**
+	 * busiAmpliRealVo
+	 */
+	@ApiModelProperty(value = "busiAmpliRealVo", name = "busiAmpliRealVo")
+	private BusiAmpliRealVo busiAmpliRealVo;
+
+	/**
+	 * records
+	 */
+	@ApiModelProperty(value = "records", name = "records")
+	private List<BusiAmpliRealDetailsVo> records;
+
+}

src/main/java/com/chenxuan/entity/vo/BusiAmpliRealDetailsVo.java

@@ -84,6 +84,12 @@ public class BusiAmpliRealDetailsVo implements Serializable {
 	@ApiModelProperty(value = "创建时间", name = "insTime")
     private String insTime;
 
+	/**
+	 * 数据插入时间
+	 */
+	@ApiModelProperty(value = "数据插入时间", name = "dTime")
+	private String dTime;
+
 	/**
 	 * hbase中的rowkey
 	 */
@@ -137,4 +143,10 @@ public class BusiAmpliRealDetailsVo implements Serializable {
 	 */
 	@ApiModelProperty(value = "最大幅值集合", name = "maxAmplitudeList")
 	private List<String> maxAmplitudeList;
+
+	/**
+	 * 录波文件名称
+	 */
+	@ApiModelProperty(value = "录波文件名称", name = "fileName")
+	private String fileName;
 }

src/main/java/com/chenxuan/entity/vo/BusiAmpliRealVo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName：BusiAmpliRealVo
@@ -114,4 +115,42 @@ public class BusiAmpliRealVo implements Serializable {
 	 */
 	@ApiModelProperty(value = "时间集合", name = "timeList")
 	private List<String> timeList;
+
+	/**
+	 * 日增长率集合
+	 */
+	@ApiModelProperty(value = "日增长率集合", name = "dayRateList")
+	private List<String> dayRateList;
+
+	/**
+	 * 月增长率集合
+	 */
+	@ApiModelProperty(value = "月增长率集合", name = "monthRateList")
+	private List<String> monthRateList;
+
+	/**
+	 * 开始日期
+	 */
+	@ApiModelProperty(value = "开始日期", name = "startTime")
+	private String startTime;
+
+	/**
+	 * 终止日期
+	 */
+	@ApiModelProperty(value = "终止日期", name = "endTime")
+	private String endTime;
+
+
+	/**
+	 * 月增长率数据
+	 */
+	@ApiModelProperty(value = "日增长率集合", name = "月增长率数据")
+	private Map<String,List <BusiAmpliDayIncreaseRateVo>> dayMonthRateList;
+
+	/**
+	 * 月增长率日期
+	 */
+	@ApiModelProperty(value = "月增长率日期", name = "dateList")
+	private List<String> dateList;
+
 }

src/main/java/com/chenxuan/entity/vo/BusiCalcParamConfVo.java

@@ -1,5 +1,6 @@
 package com.chenxuan.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -124,6 +125,12 @@ public class BusiCalcParamConfVo implements Serializable {
     @ApiModelProperty(name = "sortNum", value = "排序")
     private Integer sortNum;
 
+    /**
+     * 频率
+     */
+    @TableField("frequency")
+    private String frequency;
+
     /**
      * 下级计算指标列表
      */

src/main/java/com/chenxuan/entity/vo/BusiCenterRealDetailsVo.java

@@ -1,5 +1,6 @@
 package com.chenxuan.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,7 +10,7 @@ import java.util.List;
 
 /**
  * @ClassName：BusiCenterRealDetailsVo
- * @Description： 中心点实时数据明细Vo
+ * @Description： 中性点实时数据明细Vo
  * @Author：Jordan_Li
  * @CreatTime：6/19/2020 - 13:50 PM
  * @Version V1.0
@@ -44,10 +45,19 @@ public class BusiCenterRealDetailsVo implements Serializable {
     private String frequency;
 
 	/**
-	 * 最大振幅
+	 * 温度
 	 */
-	@ApiModelProperty(name = "maxAmplitude", value = "最大振幅")
+	@ApiModelProperty(value="温度", name="temp")
-    private String maxAmplitude;
+	@TableField("temp")
+	private String temp;
+
+
+	/**
+	 * 湿度
+	 */
+	@ApiModelProperty(value="湿度", name="humidity")
+	@TableField("humidity")
+	private String humidity;
 
 	/**
 	 * 创建时间
@@ -67,12 +77,17 @@ public class BusiCenterRealDetailsVo implements Serializable {
 	@ApiModelProperty(name = "gatherTimeList", value = "统计时间集合")
     private List<String> gatherTimeList;
 
+	/**
+	 * 最大幅值集合
+	 */
+	@ApiModelProperty(name = "maxAmplitude", value = "最大幅值")
+	private String maxAmplitude;
+
 	/**
 	 * 最大幅值集合
 	 */
 	@ApiModelProperty(name = "maxAmplitudeList", value = "最大幅值集合")
     private List<String> maxAmplitudeList;
-
 	/**
 	 * 统计时间
 	 */

src/main/java/com/chenxuan/entity/vo/BusiCenterRealVo.java

@@ -1,5 +1,6 @@
 package com.chenxuan.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,7 +10,7 @@ import java.util.List;
 
 /**
  * @ClassName：BusiCenterRealVo
- * @Description： 中心点实时数据Vo
+ * @Description： 中性点实时数据Vo
  * @Author：Jordan_Li
  * @CreatTime：6/19/2020 - 13:50 PM
  * @Version V1.0
@@ -43,6 +44,22 @@ public class BusiCenterRealVo implements Serializable {
 	@ApiModelProperty(name = "frequency", value = "振动频率")
     private String frequency;
 
+
+	/**
+	 * 温度
+	 */
+	@ApiModelProperty(value="温度", name="temp")
+	@TableField("temp")
+	private List<String> temp;
+
+
+	/**
+	 * 湿度
+	 */
+	@ApiModelProperty(value="湿度", name="humidity")
+	@TableField("humidity")
+	private List<String> humidity;
+
 	/**
 	 * 最大振幅
 	 */
@@ -78,4 +95,17 @@ public class BusiCenterRealVo implements Serializable {
 	 */
 	@ApiModelProperty(name = "createTime", value = "统计时间")
     private String createTime;
+
+
+	/**
+	 * 开始时间
+	 */
+	@ApiModelProperty(name = "startTime", value = "开始时间")
+	private String startTime;
+
+	/**
+	 * 结束时间
+	 */
+	@ApiModelProperty(name = "endTime", value = "结束时间")
+	private String endTime;
 }

src/main/java/com/chenxuan/entity/vo/BusiCenterThresholdConfVo.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 
 /**
  * @ClassName：BusiCenterThresholdConfVo
- * @Description： 中心点电流阈值配置表Vo
+ * @Description： 中性点电流阈值配置表Vo
  * @Author：Jordan_Li
  * @CreatTime：6/8/2020 - 13:15 PM
  * @Version V1.0
@@ -54,21 +54,21 @@ public class BusiCenterThresholdConfVo implements Serializable {
     private String negative;
 
 	/**
-	 * 中心点电流日增长率(%)
+	 * 中性点电流日增长率(%)
 	 */
-	@ApiModelProperty(name = "dayRate", value = "中心点电流日增长率(%)")
+	@ApiModelProperty(name = "dayRate", value = "中性点电流日增长率(%)")
     private String dayRate;
 
 	/**
-	 * 中心点电流月增长率(%)
+	 * 中性点电流月增长率(%)
 	 */
-	@ApiModelProperty(name = "monthRate", value = "中心点电流月增长率(%)")
+	@ApiModelProperty(name = "monthRate", value = "中性点电流月增长率(%)")
     private String monthRate;
 
 	/**
-	 * 中心点电流月偏差率(%)
+	 * 中性点电流月偏差率(%)
 	 */
-	@ApiModelProperty(name = "deviationRate", value = "中心点电流月偏差率(%)")
+	@ApiModelProperty(name = "deviationRate", value = "中性点电流月偏差率(%)")
     private String deviationRate;
 
 	/**

src/main/java/com/chenxuan/entity/vo/BusiEnvironmentRealDetailsVo.java

@@ -0,0 +1,77 @@
+package com.chenxuan.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * @ClassName：BusiEnvironmentRealDetailsVo
+ * @Description： 中性点实时数据明细Vo
+ * @Author：Jordan_Li
+ * @CreatTime：6/19/2020 - 13:50 PM
+ * @Version V1.0
+ */
+@Data
+public class BusiEnvironmentRealDetailsVo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@ApiModelProperty(name = "id", value = "主键id")
+    private String id;
+
+	/**
+	 * 主变id
+	 */
+	@ApiModelProperty(name = "mainId", value = "主变id")
+    private String mainId;
+
+	/**
+	 * 设备名称
+	 */
+	@ApiModelProperty(name = "deviceName", value = "设备名称")
+	private String deviceName;
+
+	/**
+	 * 温度
+	 */
+	@ApiModelProperty(value="温度", name="temp")
+	@TableField("temp")
+	private String temp;
+
+	/**
+	 * 湿度
+	 */
+	@ApiModelProperty(value="湿度", name="humidity")
+	@TableField("humidity")
+	private String humidity;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(name = "insTime", value = "创建时间")
+    private String insTime;
+
+	/**
+	 * hbase中的rowkey
+	 */
+	@ApiModelProperty(name = "hbaseRowkey", value = "hbase中的rowkey")
+    private String hbaseRowkey;
+
+	/**
+	 * 统计时间
+	 */
+	@ApiModelProperty(name = "createTime", value = "统计时间")
+    private String createTime;
+
+	/**
+	 * 负载类型
+	 */
+	@ApiModelProperty(name = "loadType", value = "负载类型")
+    private String loadType;
+}

src/main/java/com/chenxuan/entity/vo/BusiEnvironmentRealVo.java

@@ -0,0 +1,84 @@
+package com.chenxuan.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * @ClassName：BusiEnvironmentRealVo
+ * @Description： 中性点实时数据Vo
+ * @Author：Jordan_Li
+ * @CreatTime：6/19/2020 - 13:50 PM
+ * @Version V1.0
+ */
+@Data
+public class BusiEnvironmentRealVo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@ApiModelProperty(name = "id", value = "主键id")
+    private String id;
+
+	/**
+	 * 主变id
+	 */
+	@ApiModelProperty(name = "mainId", value = "主变id")
+    private String mainId;
+
+	/**
+	 * 设备名称
+	 */
+	@ApiModelProperty(name = "deviceName", value = "设备名称")
+	private String deviceName;
+
+	/**
+	 * 温度
+	 */
+	@ApiModelProperty(value="温度", name="temp")
+	@TableField("temp")
+	private List<String> temp;
+
+	/**
+	 * 湿度
+	 */
+	@ApiModelProperty(value="湿度", name="humidity")
+	@TableField("humidity")
+	private List<String> humidity;
+
+	/**
+	 * 统计时间集合
+	 */
+	@ApiModelProperty(name = "gatherTimeList", value = "统计时间集合")
+	private List<String> gatherTimeList;
+
+	/**
+	 * 负载类型
+	 */
+	@ApiModelProperty(name = "loadType", value = "负载类型")
+	private String loadType;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(name = "insTime", value = "创建时间")
+    private String insTime;
+
+	/**
+	 * hbase中的rowkey
+	 */
+	@ApiModelProperty(name = "hbaseRowkey", value = "hbase中的rowkey")
+    private String hbaseRowkey;
+
+	/**
+	 * 统计时间
+	 */
+	@ApiModelProperty(name = "createTime", value = "统计时间")
+    private String createTime;
+}

src/main/java/com/chenxuan/entity/vo/BusiEnvironmentThresholdConfVo.java

@@ -0,0 +1,109 @@
+package com.chenxuan.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName：BusiCenterThresholdConfVo
+ * @Description： 中性点电流阈值配置表Vo
+ * @Author：Jordan_Li
+ * @CreatTime：6/8/2020 - 13:15 PM
+ * @Version V1.0
+ */
+@Data
+public class BusiEnvironmentThresholdConfVo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@ApiModelProperty(name = "id", value = "主键id")
+    private String id;
+
+	/**
+	 * 主变id
+	 */
+	@ApiModelProperty(name = "mainId", value = "主变id")
+    private String mainId;
+
+	/**
+	 * 主变装置id
+	 */
+	@ApiModelProperty(name = "subId", value = "主变装置id")
+    private String subId;
+
+	/**
+	 * 主变名称
+	 */
+	@ApiModelProperty(name = "deviceName", value = "主变名称")
+    private String deviceName;
+
+	/**
+	 * 温度
+	 */
+	@ApiModelProperty(name = "temp", value = "温度")
+    private String temp;
+
+	/**
+	 * 湿度
+	 */
+	@ApiModelProperty(name = "humidity", value = "湿度")
+    private String humidity;
+
+	/**
+	 * 温度日增长率(%)
+	 */
+	@ApiModelProperty(name = "dayRate", value = "温度日增长率(%)")
+    private String dayRate;
+
+	/**
+	 * 温度月增长率(%)
+	 */
+	@ApiModelProperty(name = "monthRate", value = "温度月增长率(%)")
+    private String monthRate;
+
+	/**
+	 * 温度月偏差率(%)
+	 */
+	@ApiModelProperty(name = "deviationRate", value = "温度月偏差率(%)")
+    private String deviationRate;
+
+	/**
+	 * 湿度日增长率(%)
+	 */
+	@ApiModelProperty(name = "dayRateHumidity", value = "湿度日增长率(%)")
+	private String dayRateHumidity;
+
+	/**
+	 * 湿度月增长率(%)
+	 */
+	@ApiModelProperty(name = "monthRateHumidity", value = "湿度月增长率(%)")
+	private String monthRateHumidity;
+
+	/**
+	 * 湿度月偏差率(%)
+	 */
+	@ApiModelProperty(name = "deviationRateHumidity", value = "湿度月偏差率(%)")
+	private String deviationRateHumidity;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(name = "insTime", value = "创建时间")
+    private String insTime;
+
+	/**
+	 * 开始时间
+	 */
+	@ApiModelProperty(name = "startTime", value = "开始时间")
+    private String startTime;
+
+	/**
+	 * 结束时间
+	 */
+	@ApiModelProperty(name = "endTime", value = "结束时间")
+    private String endTime;
+}

src/main/java/com/chenxuan/entity/vo/BusiIedparamVo.java

@@ -28,4 +28,10 @@ public class BusiIedparamVo extends Query implements Serializable {
      */
     @ApiModelProperty(value="振动类型", name="nodeType")
     private String nodeType;
+
+    /**
+     * 装置类别: 1振动装置，2噪声装置,3中心点装置
+     */
+    @ApiModelProperty(value="装置类别: 1振动装置，2噪声装置,3中心点装置", name="deviceType")
+    private String deviceType;
 }

src/main/java/com/chenxuan/entity/vo/BusiMainDeviceVo.java

@@ -48,6 +48,12 @@ public class BusiMainDeviceVo implements Serializable {
 	@ApiModelProperty(value = "设备型号", name = "deviceModel")
     private String deviceModel;
 
+	/**
+	 * 设备类型
+	 */
+	@ApiModelProperty(value = "设备类型", name = "deviceType")
+	private String deviceType;
+
 	/**
 	 * 制造厂家名称
 	 */

src/main/java/com/chenxuan/entity/vo/BusiModbusParamBindVo.java

@@ -0,0 +1,101 @@
+package com.chenxuan.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class BusiModbusParamBindVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(name = "id", value = "主键id")
+    private String id;
+
+    /**
+     * 状态 Y:启用 N:禁用/预留
+     */
+    @ApiModelProperty(value = "状态 Y:启用 N:禁用/预留", name = "state")
+    private String state;
+
+    /**
+     * 主变ID
+     */
+    @ApiModelProperty(value = "主变ID", name = "mainId")
+    private String mainId;
+
+    /**
+     * 主变名称
+     */
+    @ApiModelProperty(value = "主变ID", name = "mainName")
+    private String mainName;
+
+
+    /**
+     * 装置ID
+     */
+    @ApiModelProperty(value = "主变ID", name = "subId")
+    private String subId;
+
+    /**
+     * 装置名称
+     */
+    @ApiModelProperty(value = "主变ID", name = "subName")
+    private String subName;
+
+    /**
+     * Sensor编码
+     */
+    @ApiModelProperty(value = "Sensor编码", name = "sensorCode")
+    private String sensorCode;
+
+    /**
+     * P:原边 S:副边
+     */
+    @ApiModelProperty(value = "P:原边 S:副边", name = "side")
+    private String side;
+
+    /**
+     * 相位 A:B:C:O:全相
+     */
+    @ApiModelProperty(value = "相位 A:B:C:O:全相", name = "phase")
+    private String phase;
+
+    /**
+     * 上下侧 U:上侧 D:下侧
+     */
+    @ApiModelProperty(value = "上下侧 U:上侧 D:下侧", name = "inOut")
+    private String inOut;
+
+    /**
+     * 上下侧 U:上侧 D:下侧
+     */
+    @ApiModelProperty(value = "上下侧 U:上侧 D:下侧", name = "frequency")
+    private String frequency;
+
+    /**
+     * 装置类别 1:振动装置 2:噪声装置 3:中心点装置 4:其他
+     */
+    @ApiModelProperty(value = "装置类别 1:振动装置 2:噪声装置 3:中心点装置 4:其他", name = "deviceType")
+    private String deviceType;
+
+    /**
+     * 寄存器地址
+     */
+    @ApiModelProperty(value = "寄存器地址", name = "addr")
+    private int addr;
+
+    /**
+     * 寄存器类型 EX:异常检测 ST:状态量YX; MX:模拟量YC; SE:控制量
+     */
+    @ApiModelProperty(value = "寄存器类型 EX:异常检测 ST:状态量YX; MX:模拟量YC; SE:控制量", name = "addrType")
+    private String addrType;
+
+    /**
+     * 寄存器类型 EX:异常检测 ST:状态量YX; MX:模拟量YC; SE:控制量
+     */
+    @ApiModelProperty(value = "寄存器描述", name = "adrdesc")
+    private String adrdesc;
+}

src/main/java/com/chenxuan/entity/vo/BusiModbusTemplateVo.java

@@ -0,0 +1,40 @@
+package com.chenxuan.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class BusiModbusTemplateVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(name = "id", value = "主键id")
+    private String id;
+
+    /**
+     * 寄存器地址
+     */
+    @ApiModelProperty(value = "寄存器地址", name = "addr")
+    private int addr;
+
+    /**
+     * 寄存器类型
+     */
+    @ApiModelProperty(value = "寄存器类型, EX: 自检量 ST:状态量YX; MX:模拟量YC; SE:控制量; TM:时钟", name = "addrType")
+    private String addrType;
+
+    /**
+     * 寄存器描述
+     */
+    @ApiModelProperty(value = "寄存器描述", name = "adrdesc")
+    private String adrdesc;
+
+    /**
+     * 装置类型：1振动装置，2噪声装置,3中心点装置,4其他
+     */
+    @ApiModelProperty(value = "装置类型：1振动装置，2噪声装置,3中心点装置,4其他", name = "deviceType")
+    private String deviceType;
+}

src/main/java/com/chenxuan/entity/vo/BusiNoiseRealVo.java

@@ -72,9 +72,16 @@ public class BusiNoiseRealVo implements Serializable {
 	@ApiModelProperty(value = "最大幅值集合", name = "maxAmplitudeList")
     private List<String> maxAmplitudeList;
 
+	/**
+	 * startTime
+	 */
+	@ApiModelProperty(value = "startTime", name = "startTime")
+    private String startTime;
+
 	/**
 	 * 统计时间
+	 *         
 	 */
-	@ApiModelProperty(value = "统计时间", name = "createTime")
+	@ApiModelProperty(value = "endtime", name = "endtime")
-    private String createTime;
+	private String endtime;
 }

src/main/java/com/chenxuan/entity/vo/BusiParamBindVo.java

@@ -62,4 +62,16 @@ public class BusiParamBindVo implements Serializable {
      */
     @ApiModelProperty(value="频率(Hz)", name="subDeviceName")
     private String subDeviceName;
+    /**
+     * 监测类型: 1=振动监测 2=振动告警 3=噪声监测 4=噪声告警 5=中心点监测 6=中心点告警
+     */
+    @ApiModelProperty(value="监测类型: 1=振动监测 2=振动告警 3=噪声监测 4=噪声告警 5=中心点监测 6=中心点告警", name="monitype")
+    private String monitype;
+
+    /**
+     * 装置类别: 1振动装置，2噪声装置,3中心点装置
+     */
+    @ApiModelProperty(value="装置类别: 1振动装置，2噪声装置,3中心点装置", name="deviceType")
+    private String deviceType;
+
 }

src/main/java/com/chenxuan/entity/vo/BusiWarningVo.java

@@ -133,6 +133,18 @@ public class BusiWarningVo implements Serializable {
     @ApiModelProperty(name = "currentThreshold", value = "电流阈值")
     private String currentThreshold;
 
+    /**
+     * 温度阈值
+     */
+    @ApiModelProperty(name = "tempThreshold", value = "温度阈值")
+    private String tempThreshold;
+
+    /**
+     * 湿度阈值
+     */
+    @ApiModelProperty(name = "humidityThreshold", value = "湿度阈值")
+    private String humidityThreshold;
+
     /**
      * 电流增长率
      */

src/main/java/com/chenxuan/entity/vo/DeviceNumVo.java

@@ -0,0 +1,46 @@
+package com.chenxuan.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author plus wang
+ * @create 2021-11-18 3:24 PM
+ **/
+@Data
+public class DeviceNumVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 总数
+     */
+    @ApiModelProperty(name = "total", value = "总数")
+    private int total;
+
+    /**
+     * 正常数
+     */
+    @ApiModelProperty(name = "normal", value = "正常数")
+    private int normal;
+
+    /**
+     * 故障数
+     */
+    @ApiModelProperty(name = "gzNum", value = "故障数")
+    private int gzNum;
+
+    /**
+     * 历史故障数
+     */
+    @ApiModelProperty(name = "totalGZNum", value = "历史故障数")
+    private int totalGZNum;
+
+    /**
+     * 异常数
+     */
+    @ApiModelProperty(name = "ycNum", value = "异常数")
+    private int ycNum;
+}

src/main/java/com/chenxuan/mapper/BusiAmpliDayIncreaseMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chenxuan.entity.dto.BusiAmpliRealDto;
 import com.chenxuan.entity.model.BusiAmpliDayIncrease;
+import com.chenxuan.entity.vo.BusiAmpliDayIncreaseRateVo;
 import com.chenxuan.entity.vo.BusiAmpliDayIncreaseVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -54,6 +55,8 @@ public interface BusiAmpliDayIncreaseMapper extends BaseMapper<BusiAmpliDayIncre
      */
     List<BusiAmpliDayIncreaseVo> getCurrentData(@Param("bean") BusiAmpliRealDto dto);
 
+    List<BusiAmpliDayIncreaseRateVo> getCurrentDataRate(@Param("bean") BusiAmpliRealDto dto);
+
     /**
      * 通过主变ID查询主变装置信息
      *
@@ -78,5 +81,15 @@ public interface BusiAmpliDayIncreaseMapper extends BaseMapper<BusiAmpliDayIncre
      */
     int delete(String id);
 
+    /**
+     * 根据装置和时间和频率查询数据
+     *
+     * @param subId
+     * @param dTime
+     * @param frequency
+     * @return
+     */
+    BusiAmpliDayIncreaseVo getIncrease(String subId, String dTime, String frequency);
+
 
 }

src/main/java/com/chenxuan/mapper/BusiAmpliRealMapper.java

@@ -2,6 +2,7 @@ package com.chenxuan.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chenxuan.entity.dto.BusiAmpliDatDto;
 import com.chenxuan.entity.dto.BusiAmpliRealDto;
 import com.chenxuan.entity.model.BusiAmpliReal;
 import com.chenxuan.entity.model.ExportData;
@@ -47,6 +48,8 @@ public interface BusiAmpliRealMapper extends BaseMapper<BusiAmpliReal> {
      */
     List<BusiAmpliRealDetailsVo> findShockRealDetailsByCondition(Page<BusiAmpliRealDetailsVo> page, @Param("bean") BusiAmpliRealDto busiAmpliRealDto);
 
+
+    List<BusiAmpliRealDetailsVo> findShockRealDetailsByConditionByDat( @Param("bean") BusiAmpliDatDto busiAmpliDatDto);
     /**
      * 通过条件查询振动实时数据信息
      *
@@ -99,4 +102,12 @@ public interface BusiAmpliRealMapper extends BaseMapper<BusiAmpliReal> {
      * @return
      */
     List<BusiAmpliReal> getTodayAmpliReal(@Param("bean") BusiAmpliRealDto dto);
+
+    /**
+     * 获取最新的时间
+     *
+     * @param dtov
+     * @return
+     */
+    BusiAmpliRealDetailsVo getLatestTime(@Param("bean") BusiAmpliRealDto dtov);
 }

src/main/java/com/chenxuan/mapper/BusiAmpliStatisticsMapper.java

@@ -25,4 +25,14 @@ public interface BusiAmpliStatisticsMapper extends BaseMapper<BusiAmpliStatistic
      * @return 中心点实时数据信息
      */
     List<BusiAmpliReal> findAmpliStatisticsByMainIdAndCreateTime(@Param("bean") BusiAmpliRealDto busiAmpliRealDto);
+
+    /**
+     * 根据时间和主变id获取数据
+     *
+     * @param subId
+     * @param insTime
+     * @param frequency
+     * @return
+     */
+    BusiAmpliStatistics getRealStatisticsByInsTime(String subId, String insTime, String frequency);
 }

src/main/java/com/chenxuan/mapper/BusiAmpliThresholdConfMapper.java

@@ -71,5 +71,14 @@ public interface BusiAmpliThresholdConfMapper extends BaseMapper<BusiAmpliThresh
      */
     int delete(String id);
 
+    /**
+     * 根据装置id和频率查询数据
+     *
+     * @param subId
+     * @param frequency
+     * @return
+     */
+    BusiAmpliThresholdConfVo getAmpliThresholdConf(String subId, String frequency);
+
 
 }

src/main/java/com/chenxuan/mapper/BusiCalcParamConfMapper.java

@@ -70,4 +70,21 @@ public interface BusiCalcParamConfMapper extends BaseMapper<BusiCalcParamConf> {
      * @return
      */
     List<BusiCalcParamConfVo> getCalcParamByMainId(String mainId);
+
+    /**
+     * 获取一级设备分析参数列表
+     *
+     * @param mainId
+     * @return
+     */
+    List<BusiCalcParamConfVo> findFirstLevelDatas(@Param("mainId") String mainId);
+
+    /**
+     * 获取分析参数的子分类列表
+     *
+     * @param mainId
+     * @param pname
+     * @return
+     */
+    List<BusiCalcParamConfVo> findSubDatas(@Param("mainId") String mainId, @Param("pname") String pname);
 }

src/main/java/com/chenxuan/mapper/BusiCenterIncreaseMapper.java

@@ -3,6 +3,7 @@ package com.chenxuan.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.chenxuan.entity.model.BusiCenterIncrease;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author xuan
@@ -11,4 +12,22 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BusiCenterIncreaseMapper extends BaseMapper<BusiCenterIncrease> {
 
+    /**
+     * 根据装置和时间和频率查询数据
+     *
+     * @param subId
+     * @param dTime
+     * @return
+     */
+    BusiCenterIncrease getCenterIncrease(String subId, String dTime);
+
+    /**
+     * 根据时间查询增长率
+     *
+     * @param mainId
+     * @param dTime
+     * @return
+     */
+    BusiCenterIncrease getCenterByTime(@Param("mainId") String mainId, @Param("dTime") String dTime);
+
 }

src/main/java/com/chenxuan/mapper/BusiCenterRealMapper.java

@@ -65,6 +65,9 @@ public interface BusiCenterRealMapper extends BaseMapper<BusiCenterReal> {
      */
     List<BusiCenterRealDetailsVo> findCenterRealDetailsByMainId(Page<BusiCenterRealDetailsVo> page, @Param("bean") BusiCenterRealDto dto);
 
+
+    List<BusiCenterRealDetailsVo> findCenterRealDetailsByMainId1(Page<BusiCenterRealDetailsVo> page, @Param("bean") BusiCenterRealDto dto);
+
     /**
      * 导出中心点实时数据详细信息列表
      *
@@ -78,4 +81,12 @@ public interface BusiCenterRealMapper extends BaseMapper<BusiCenterReal> {
      * @return
      */
     List<BusiCenterReal> selectMainDeviceList();
+
+    /**
+     * 获取最近一条数据的时间
+     *
+     * @param mainId
+     * @return
+     */
+    String getLatestTime(@Param("mainId") String mainId);
 }

src/main/java/com/chenxuan/mapper/BusiCenterRealStatisticsMapper.java

@@ -12,5 +12,14 @@ import java.util.List;
 @Mapper
 public interface BusiCenterRealStatisticsMapper extends BaseMapper<BusiCenterRealStatistics> {
 
+
     List<BusiCenterRealStatistics> selectMainDeviceList();
+
+    /**
+     * 根据时间和主变id获取数据
+     *
+     * @param mainId
+     * @param insTime
+     */
+    BusiCenterRealStatistics getRealStatisticsByInsTime(String mainId, String insTime);
 }

src/main/java/com/chenxuan/mapper/BusiCenterThresholdConfMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chenxuan.entity.dto.BusiCenterThresholdConfDto;
 import com.chenxuan.entity.model.BusiCenterThresholdConf;
 import com.chenxuan.entity.vo.BusiCenterThresholdConfVo;
+import com.chenxuan.entity.vo.BusiEnvironmentThresholdConfVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -53,7 +54,7 @@ public interface BusiCenterThresholdConfMapper extends BaseMapper<BusiCenterThre
      * @param mainId 主变ID
      * @return 中心点电流阈值配置信息
      */
-    public BusiCenterThresholdConfVo findThresholdConfByMainId(String mainId);
+    BusiCenterThresholdConfVo findThresholdConfByMainId(String mainId);
 
     /**
      * 通过主变ID删除对应的中心点电流阈值配置信息
@@ -80,5 +81,5 @@ public interface BusiCenterThresholdConfMapper extends BaseMapper<BusiCenterThre
     int delete(String id);
 
 
-
+    BusiEnvironmentThresholdConfVo findEnvironmentThresholdConfByMainId(String mainId);
 }

src/main/java/com/chenxuan/mapper/BusiCommunicationParametersMapper.java

@@ -22,7 +22,6 @@ public interface BusiCommunicationParametersMapper extends BaseMapper<BusiCommun
 
     /**
      * @Description: 分页
-     *
      * @Param page
      * @Param params
      * @Return: 配置集合信息
@@ -31,6 +30,7 @@ public interface BusiCommunicationParametersMapper extends BaseMapper<BusiCommun
 
     /**
      * 保存通信参数信息
+     *
      * @param busiCommunicationParameters 通信参数对象
      * @return 结果
      */
@@ -38,6 +38,7 @@ public interface BusiCommunicationParametersMapper extends BaseMapper<BusiCommun
 
     /**
      * 更新通信参数信息
+     *
      * @param busiCommunicationParameters 通信参数对象
      * @return 结果
      */
@@ -49,7 +50,7 @@ public interface BusiCommunicationParametersMapper extends BaseMapper<BusiCommun
      * @param id 通信参数ID
      * @return 通信参数信息
      */
-    public BusiCommunicationParameters findBusiCommunicationParametersById(String id);
+    BusiCommunicationParameters findBusiCommunicationParametersById(String id);
 
     /**
      * 通过ID删除配置信息
@@ -62,9 +63,19 @@ public interface BusiCommunicationParametersMapper extends BaseMapper<BusiCommun
     /**
      * 通过通信参数ID查询通信参数信息
      *
-     * @param protocol  通信协议类型
+     * @param entity 通信协议类型
      * @return 通信参数信息
      */
-    public List<BusiCommunicationParameters> findBusiCommunicationParametersByProtocol(String protocol);
+    List<BusiCommunicationParameters> findBusiCommunicationParametersByProtocol(BusiCommunicationParameters entity);
+
+    /**
+     * 启用禁用
+     *
+     * @param communicationInterface
+     * @param protocol
+     * @return
+     */
+    int enableAndDisable(@Param("communicationInterface") String communicationInterface,
+                     @Param("protocol") String protocol);
 
 }

src/main/java/com/chenxuan/mapper/BusiEnvironmentRealMapper.java

@@ -0,0 +1,89 @@
+package com.chenxuan.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chenxuan.entity.dto.BusiEnvironmentRealDto;
+import com.chenxuan.entity.model.BusiEnvironmentReal;
+import com.chenxuan.entity.model.ExportData;
+import com.chenxuan.entity.vo.BusiEnvironmentRealDetailsVo;
+import com.chenxuan.entity.vo.BusiEnvironmentRealVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * @ClassName：BusiEnvironmentRealMapper
+ * @Description： 环境监测实时数据信息Mapper接口.
+ * @Author： Jordan_Li
+ * @CreatTime：6/16/2020 14:55 PM
+ * @Version V1.0
+ */
+
+@Mapper
+public interface BusiEnvironmentRealMapper extends BaseMapper<BusiEnvironmentReal> {
+
+    /**
+     * 保存环境监测实时数据信息
+     *
+     * @param busiEnvironmentRealList 环境监测实时数据对象
+     * @return 结果
+     */
+    int saveEnvironmentReal(List<BusiEnvironmentReal> busiEnvironmentRealList);
+
+    /**
+     * 通过主变ID查询环境监测实时数据信息
+     *
+     * @param mainId
+     * @return
+     */
+    List<BusiEnvironmentReal> findEnvironmentRealByMainId(String mainId, String insTime);
+
+    /**
+     * 通过条件查询环境监测实时数据信息
+     *
+     * @param busiEnvironmentRealDto
+     * @return
+     */
+    List<BusiEnvironmentReal> findEnvironmentRealChartByInfo(@Param("bean") BusiEnvironmentRealDto busiEnvironmentRealDto);
+
+    /**
+     * 通过主变ID和日期查询环境监测实时数据信息
+     *
+     * @param busiEnvironmentRealVo
+     * @return
+     */
+    List<BusiEnvironmentReal> findEnvironmentRealByMainIdAndCreateTime(@Param("bean") BusiEnvironmentRealVo busiEnvironmentRealVo);
+
+    /**
+     * 通过主变ID查询环境监测实时数据详细信息
+     *
+     * @param page
+     * @param dto
+     * @return
+     */
+    List<BusiEnvironmentRealDetailsVo> findEnvironmentRealDetailsByMainId(Page<BusiEnvironmentRealDetailsVo> page, @Param("bean") BusiEnvironmentRealDto dto);
+
+    /**
+     * 导出环境监测实时数据详细信息列表
+     *
+     * @param page
+     * @param dto
+     * @return
+     */
+    List<ExportData> exportEnvironmentRealDetails(Page<ExportData> page, @Param("bean") BusiEnvironmentRealDto dto);
+
+    /**
+     * @return
+     */
+    List<BusiEnvironmentReal> selectMainDeviceList();
+
+    /**
+     * 获取最近一条数据的时间
+     *
+     * @param mainId
+     * @return
+     */
+    String getLatestTime(@Param("mainId") String mainId);
+}

src/main/java/com/chenxuan/mapper/BusiEnvironmentThresholdConfMapper.java

@@ -0,0 +1,77 @@
+package com.chenxuan.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chenxuan.entity.dto.BusiEnvironmentThresholdConfDto;
+import com.chenxuan.entity.model.BusiEnvironmentThresholdConf;
+import com.chenxuan.entity.vo.BusiEnvironmentThresholdConfVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * @ClassName：BusiCenterThresholdConfMapper
+ * @Description：  环境阈值配置Mapper接口.
+ * @Author： Jordan_Li
+ * @CreatTime：6/8/2020 15:12 PM
+ * @Version V1.0
+ */
+
+@Mapper
+public interface BusiEnvironmentThresholdConfMapper extends BaseMapper<BusiEnvironmentThresholdConf> {
+
+    /**
+     * @Description: 分页
+     *
+     * @Param page
+     * @Param params
+     * @Return: 环境阈值配置集合信息
+     **/
+    List<BusiEnvironmentThresholdConfVo> selectPages(Page<BusiEnvironmentThresholdConfVo> page, @Param("params") BusiEnvironmentThresholdConfDto dto);
+
+    /**
+     * 保存环境阈值配置信息
+     *
+     * @param busiEnvironmentThresholdConf
+     * @return
+     */
+    int saveThresholdConf(BusiEnvironmentThresholdConf busiEnvironmentThresholdConf);
+
+    /**
+     * 更新环境阈值配置信息
+     *
+     * @param busiEnvironmentThresholdConf
+     * @return
+     */
+    int updateThresholdConf(BusiEnvironmentThresholdConf busiEnvironmentThresholdConf);
+
+    /**
+     * 通过主变ID删除对应的环境阈值配置信息
+     *
+     * @param mainId 主变ID
+     * @return 结果
+     */
+    int deleteThresholdConfByMainId(String mainId);
+
+    /**
+     * 通过主变ID删除对应的环境阈值配置关系
+     *
+     * @param mainId
+     * @return
+     */
+    int deleteThresholdConfRelation(String mainId);
+
+    /**
+     * 通过id删除环境阈值配置信息
+     *
+     * @param id 环境阈值配置ID
+     * @return 结果
+     */
+    int delete(String id);
+
+    BusiEnvironmentThresholdConfVo findEnvironmentThresholdConfByMainId(String mainId);
+
+    BusiEnvironmentThresholdConfVo findThresholdConfByMainId(String mainId);
+}

src/main/java/com/chenxuan/mapper/BusiIedparamMapper.java

@@ -8,6 +8,6 @@ import java.util.List;
 
 @Mapper
 public interface BusiIedparamMapper {
-
+    List<BusiIedparamVo> quereyIcdById(@Param("nodeId") String nodeId,@Param("deviceType") String deviceType);
-    List<BusiIedparamVo> quereyIcdById(@Param("nodeId") String nodeId);
+    List<BusiIedparamVo> queryParamsName(@Param("deviceType") String deviceType);
 }

src/main/java/com/chenxuan/mapper/BusiMainDeviceMapper.java

@@ -91,4 +91,13 @@ public interface BusiMainDeviceMapper extends BaseMapper<BusiMainDevice> {
      */
     List<BusiMainDeviceVo> getAllMainDevice();
 
+
+
+    Integer findInterval();
+
+    Integer selectGZDevice(String endTime, String startTime);
+
+    Integer selectYCDevice(String endTime, String startTime);
+
+    Integer selectTotalGZDevice();
 }

src/main/java/com/chenxuan/mapper/BusiModbusParamBindMapper.java

@@ -0,0 +1,17 @@
+package com.chenxuan.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chenxuan.entity.dto.BusiModbusParamBindDto;
+import com.chenxuan.entity.model.BusiModbusParamBind;
+import com.chenxuan.entity.vo.BusiModbusParamBindVo;
+import org.apache.ibatis.annotations.Param;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BusiModbusParamBindMapper extends BaseMapper<BusiModbusParamBind> {
+    int addModbusParamBind(BusiModbusParamBind busiModbusParamBind);
+    List<BusiModbusParamBindVo> queryModbusParamBind(Page<BusiModbusParamBindVo> page, @Param("params") BusiModbusParamBindDto dto);
+}

src/main/java/com/chenxuan/mapper/BusiModbusTemplateMapper.java

@@ -0,0 +1,16 @@
+package com.chenxuan.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chenxuan.entity.dto.BusiModbusTemplateDto;
+import com.chenxuan.entity.model.BusiModbusTemplate;
+import com.chenxuan.entity.vo.BusiModbusTemplateVo;
+import org.apache.ibatis.annotations.Param;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BusiModbusTemplateMapper extends BaseMapper<BusiModbusTemplate> {
+     List<BusiModbusTemplateVo> queryModbusTemplate(@Param("param") BusiModbusTemplateDto param);
+     public int delBusiModbusParamBind(int[] ids);
+}

src/main/java/com/chenxuan/mapper/BusiNoiseIncreaseMapper.java

@@ -3,6 +3,7 @@ package com.chenxuan.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.chenxuan.entity.model.BusiNoiseIncrease;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author Carrey Zheng
@@ -11,4 +12,22 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BusiNoiseIncreaseMapper extends BaseMapper<BusiNoiseIncrease> {
 
+    /**
+     * 根据装置和时间和频率查询数据
+     *
+     * @param subId
+     * @param dTime
+     * @return
+     */
+    BusiNoiseIncrease getNoiseIncrease(String subId, String dTime);
+
+    /**
+     * 根据时间查询增长率
+     *
+     * @param mainId
+     * @param dTime
+     * @return
+     */
+    BusiNoiseIncrease getNoiseByTime(@Param("mainId") String mainId, @Param("dTime") String dTime);
+
 }

src/main/java/com/chenxuan/mapper/BusiNoiseRealMapper.java

@@ -63,6 +63,8 @@ public interface BusiNoiseRealMapper extends BaseMapper<BusiNoiseReal> {
      */
     List<BusiNoiseRealDetailsVo> findNoiseRealDetailsByMainId(Page<BusiNoiseRealDetailsVo> page, @Param("bean") BusiNoiseRealDto dto);
 
+    List<BusiNoiseRealDetailsVo> findNoiseRealDetailsByMainId1(Page<BusiNoiseRealDetailsVo> page, @Param("bean") BusiNoiseRealDto dto);
+
     /**
      * 导出噪声实时数据详细信息列表
      *
@@ -73,4 +75,12 @@ public interface BusiNoiseRealMapper extends BaseMapper<BusiNoiseReal> {
     List<ExportData> exportNoiseRealDetails(Page<ExportData> page, @Param("bean") BusiNoiseRealDto dto);
 
     List<BusiNoiseReal> selectMainDeviceList();
+
+    /**
+     * 获取最近一条数据的时间
+     *
+     * @param mainId
+     * @return
+     */
+    String getLatestTime(@Param("mainId") String mainId);
 }

src/main/java/com/chenxuan/mapper/BusiNoiseRealStatisticsMapper.java

@@ -3,6 +3,7 @@ package com.chenxuan.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.chenxuan.entity.model.BusiNoiseRealStatistics;
 import org.apache.ibatis.annotations.Mapper;
+
 import java.util.List;
 
 /**
@@ -13,4 +14,12 @@ import java.util.List;
 public interface BusiNoiseRealStatisticsMapper extends BaseMapper<BusiNoiseRealStatistics> {
 
     List<BusiNoiseRealStatistics> selectMainDeviceList();
+
+    /**
+     * 根据时间和主变id获取数据
+     *
+     * @param mainId
+     * @param insTime
+     */
+    BusiNoiseRealStatistics getRealStatisticsByInsTime(String mainId, String insTime);
 }

src/main/java/com/chenxuan/mapper/BusiSubDeviceMapper.java

@@ -30,6 +30,10 @@ public interface BusiSubDeviceMapper extends BaseMapper<BusiSubDevice> {
      **/
     List<BusiSubDeviceVo> selectPages(Page<BusiSubDeviceVo> page, @Param("params") BusiSubDeviceDto dto);
 
+    List<BusiSubDeviceVo> querySubDevice(@Param("params") BusiSubDeviceDto dto);
+
+
+
     /**
      * 主变装置集合信息
       * @return
@@ -114,5 +118,4 @@ public interface BusiSubDeviceMapper extends BaseMapper<BusiSubDevice> {
      */
     int delete(String id);
 
-
 }

src/main/java/com/chenxuan/runner/ScheduleJobInitRunner.java

@@ -0,0 +1,28 @@
+package com.chenxuan.runner;
+
+import com.chenxuan.service.ScheduleJobService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+/**
+ * @ClassName: ScheduleJobInitRunner
+ * @Description: 监听容器启动,并开始从数据库加在定时任务.
+ * @Author: Arno
+ * @Date:  2023/8/12 19:29
+ * @version V1.0
+ */
+@Slf4j
+@Component
+public class ScheduleJobInitRunner implements CommandLineRunner {
+
+    @Autowired
+    private ScheduleJobService scheduleJobService ;
+
+    @Override
+    public void run(String... args) throws Exception {
+        log.info("--------加载定时任务--------");
+        scheduleJobService.timingTask();
+    }
+}

src/main/java/com/chenxuan/security/service/LoginService.java

@@ -11,8 +11,10 @@ import com.chenxuan.manager.factory.AsyncFactory;
 import com.chenxuan.security.LoginUser;
 import com.chenxuan.service.SysUserService;
 import com.chenxuan.utils.Md5;
+import com.chenxuan.utils.RsaUtils;
 import com.chenxuan.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.HashSet;
@@ -41,6 +43,9 @@ public class LoginService {
     @Autowired
     private CustomPermissionService customPermissionService;
 
+    @Value("${rsa.private_key}")
+    private String privateKey;
+
     /**
      * @param username 用户名
      * @param password 密码
@@ -49,7 +54,7 @@ public class LoginService {
      * @return java.lang.String
      * @description 登录验证
      */
-    public String login(String username, String password, String code, String uuid) {
+    public String login(String username, String password, String code, String uuid) throws Exception {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
         String captcha = redisCacheService.getCacheObject(verifyKey);
         redisCacheService.deleteObject(verifyKey);
@@ -63,7 +68,9 @@ public class LoginService {
             throw new CustomException("验证码错误", HttpStatusCode.ERROR);
         }
         // 生成token
-        return jwtTokenService.createToken(getLoginUser(username, password));
+        // 20230509 前端加密，后端先解密再进行逻辑判断
+        String decryptPassword = RsaUtils.decryptByPrivateKey(privateKey, password);
+        return jwtTokenService.createToken(getLoginUser(username, decryptPassword));
     }
 
 
@@ -73,9 +80,11 @@ public class LoginService {
      * @param password  密码
      * @return
      */
-    public String remoteLogin(String username, String password) {
+    public String remoteLogin(String username, String password) throws Exception {
         // 生成token
-        return jwtTokenService.createToken(getLoginUser(username, password));
+        // 解密前端密码
+        String decryptPassword = RsaUtils.decryptByPrivateKey(privateKey, password);
+        return jwtTokenService.createToken(getLoginUser(username, decryptPassword));
     }
 
     /**

src/main/java/com/chenxuan/service/BusiAmpliRealService.java

@@ -1,18 +1,17 @@
 package com.chenxuan.service;
 
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.chenxuan.entity.dto.BusiAmpliDatDto;
 import com.chenxuan.entity.dto.BusiAmpliRealDto;
 import com.chenxuan.entity.model.BusiAmpliReal;
-import com.chenxuan.entity.vo.BusiAmpliRealDetailsVo;
+import com.chenxuan.entity.vo.BusiAmpliDatList1Vo;
+import com.chenxuan.entity.vo.BusiAmpliReaPageVo;
 import com.chenxuan.entity.vo.BusiAmpliRealVo;
 import com.chenxuan.entity.vo.TableVo;
 
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * @ClassName：BusiAmpliRealService
  * @Description： 振动实时数据服务类.
@@ -44,7 +43,9 @@ public interface BusiAmpliRealService extends IService<BusiAmpliReal> {
      * @param busiAmpliRealDto
      * @return
      */
-    Page<BusiAmpliRealDetailsVo> getShockRealDetailsByCondition(BusiAmpliRealDto busiAmpliRealDto);
+    BusiAmpliReaPageVo getShockRealDetailsByCondition(BusiAmpliDatDto busiAmpliDatDto);
+
+    BusiAmpliDatList1Vo getShockRealDetailsByConditionDat(BusiAmpliRealDto busiAmpliRealDto);
 
     /**
      * 根据条件查询振动实时数据谱图信息
@@ -55,20 +56,20 @@ public interface BusiAmpliRealService extends IService<BusiAmpliReal> {
     BusiAmpliRealVo getShockRealChartByInfo(BusiAmpliRealDto busiAmpliRealDto);
 
     /**
-     * 根据条件查询振动实时数据三维图信息
+     * 根据条件查询振动日和月增长率数据谱图信息
      *
      * @param busiAmpliRealDto
      * @return
      */
-    BusiAmpliRealVo getAmpliRealThreeChart(BusiAmpliRealDto busiAmpliRealDto);
+    BusiAmpliRealVo getShockRealChartByDayOrMonthInfo(BusiAmpliRealDto busiAmpliRealDto);
 
     /**
-     * 加载振动实时数据详细信息明细三级界面
+     * 根据条件查询振动实时数据三维图信息
      *
      * @param busiAmpliRealDto
      * @return
      */
-    Page<BusiAmpliRealDetailsVo> showShockRealDetailsPages(BusiAmpliRealDto busiAmpliRealDto);
+    BusiAmpliRealVo getAmpliRealThreeChart(BusiAmpliRealDto busiAmpliRealDto);
 
     /**
      * 加载详情
@@ -79,24 +80,9 @@ public interface BusiAmpliRealService extends IService<BusiAmpliReal> {
     Map<String, Object> loadingDetails(BusiAmpliRealDto dto);
 
     /**
-     * 重新计算
+     * 查询主变列表
-     *
-     * @param dto
-     * @return
-     */
-    Map<String, Object> recount(BusiAmpliRealDto dto);
-
-    /**
-     * 获取频率
      *
-     * @param mainId
      * @return
      */
-    List<BusiAmpliReal> selectShockRealFrequencyByMainId(String mainId);
-
     List<BusiAmpliReal> selectMainDeviceList();
-
-    List<BusiAmpliReal> selectShockRealDataByMainId(String mainId);
-
-    List<BusiAmpliReal> selectShockRealDataByMainIdAndParseAndSideAndInout(String mainId, String P, String A, String U);
 }

src/main/java/com/chenxuan/service/BusiCenterRealService.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * @ClassName：BusiCenterRealService
- * @Description： 中心点实时数据服务类.
+ * @Description： 中性点实时数据服务类.
  * @Author： Jordan_Li
  * @CreatTime：6/16/2020 14:35 PM
  * @Version V1.0
@@ -21,15 +21,16 @@ import java.util.List;
 public interface BusiCenterRealService extends IService<BusiCenterReal> {
 
     /**
-     * 根据主变ID查询中心点实时数据信息
+     * 根据主变ID查询中性点实时数据信息
      *
      * @param mainId
      * @return
      */
     List<TableVo> selectCenterRealByMainId(String mainId);
 
+
     /**
-     * 新增中心点实时数据信息
+     * 新增中性点实时数据信息
      *
      * @param busiCenterRealList
      * @return
@@ -37,7 +38,7 @@ public interface BusiCenterRealService extends IService<BusiCenterReal> {
     boolean insertCenterReal(List<BusiCenterReal> busiCenterRealList);
 
     /**
-     * 通过条件查询中心点实时数据信息
+     * 通过条件查询中性点实时数据信息
      *
      * @param busiCenterRealDto
      * @return
@@ -45,7 +46,7 @@ public interface BusiCenterRealService extends IService<BusiCenterReal> {
     BusiCenterRealVo findCenterRealChartByInfo(BusiCenterRealDto busiCenterRealDto);
 
     /**
-     * 根据主变ID和日期查询中心点实时数据信息
+     * 根据主变ID和日期查询中性点实时数据信息
      *
      * @param busiCenterRealVo
      * @return
@@ -53,7 +54,7 @@ public interface BusiCenterRealService extends IService<BusiCenterReal> {
     BusiCenterRealVo selectCenterRealByMainIdAndCreateTime(BusiCenterRealVo busiCenterRealVo);
 
     /**
-     * 根据主变ID查询中心点实时数据分页信息
+     * 根据主变ID查询中性点实时数据分页信息
      *
      * @param dto
      * @return
@@ -62,13 +63,16 @@ public interface BusiCenterRealService extends IService<BusiCenterReal> {
 
 
     /**
-     * 根据主变ID查询中心点实时数据详细信息
+     * 根据主变ID查询中性点实时数据详细信息
      *
      * @param dto
      * @return
      */
     Page<BusiCenterRealDetailsVo> getCenterRealDetailsByMainId(BusiCenterRealDto dto);
 
+
+    Page<BusiCenterRealDetailsVo> getCenterRealDetailsByMainId1(BusiCenterRealDto dto);
+
     List<BusiCenterReal> selectMainDeviceList();
 
     List<BusiCenterReal> selectCenterRealDataByMainId(String mainId);

src/main/java/com/chenxuan/service/BusiCenterThresholdConfService.java

@@ -6,10 +6,11 @@ import com.chenxuan.base.entity.AjaxResult;
 import com.chenxuan.entity.dto.BusiCenterThresholdConfDto;
 import com.chenxuan.entity.model.BusiCenterThresholdConf;
 import com.chenxuan.entity.vo.BusiCenterThresholdConfVo;
+import com.chenxuan.entity.vo.BusiEnvironmentThresholdConfVo;
 
 /**
  * @ClassName：BusiCenterThresholdConfService
- * @Description： 中心点电流阈值配置服务类.
+ * @Description： 中性点电流阈值配置服务类.
  * @Author： Jordan_Li
  * @CreatTime：6/8/2020 14:41 PM
  * @Version V1.0
@@ -27,7 +28,7 @@ public interface BusiCenterThresholdConfService extends IService<BusiCenterThres
      * 根据主变ID查询阈值配置信息
      *
      * @param mainId 主变ID
-     * @return 中心点电流阈值配置信息
+     * @return 中性点电流阈值配置信息
      */
     BusiCenterThresholdConfVo selectCenterThresholdConfByMainId(String mainId);
 
@@ -43,7 +44,7 @@ public interface BusiCenterThresholdConfService extends IService<BusiCenterThres
     /**
      * 修改阈值配置信息
      *
-     * @param busiCenterThresholdConf 中心点电流阈值信息
+     * @param busiCenterThresholdConf 中性点电流阈值信息
      * @return 结果
      */
     AjaxResult updateThresholdConf(BusiCenterThresholdConf busiCenterThresholdConf);
@@ -64,4 +65,5 @@ public interface BusiCenterThresholdConfService extends IService<BusiCenterThres
       */
       boolean delete(String id);
 
+    BusiEnvironmentThresholdConfVo selectEnvironmentThresholdConfByMainId(String mainId);
 }