"异常点位计算"

hnls-dc/src/main/resources/bootstrap.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: loc
+    active: pro

hnls-mis/hnls-mis-boot/src/main/java/com/tofly/xrtymis/XrtyMisApplication.java

@@ -10,6 +10,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @ToflyWebColudApplication
 @EnableFeignClients(basePackages ={"com.tofly.api"},defaultConfiguration = {FeignConfig.class})
 public class XrtyMisApplication {
+
     public static void main(String[] args) {
         SpringApplication.run(XrtyMisApplication.class, args);
     }

hnls-scada/hnls-scada-api/pom.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>hnls-scada</artifactId>
+        <groupId>com.tofly</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>hnls-scada-api</artifactId>
+    <version>1.0.0</version>
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

hnls-scada/hnls-scada-api/src/main/java/com/tofly/api/ScadaClient.java

@@ -0,0 +1,22 @@
+package com.tofly.api;
+
+import com.tofly.common.core.entity.ResultRespone;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author JF
+ */
+@FeignClient(name = "tofly-scada",contextId="ScadaClient")
+public interface ScadaClient {
+
+    /**
+     * 手动更新异常点位虚拟数据
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @return
+     */
+    @PostMapping("/scada/syncAbnormalPointData")
+    ResultRespone syncAbnormalPointData(@RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate);
+
+}

hnls-scada/hnls-scada-boot/pom.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.tofly</groupId>
+        <artifactId>hnls-scada</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>hnls-scada-boot</artifactId>
+    <version>1.0.0</version>
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>hnls-admin-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-redis</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>5.3.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

hnls-scada/src/main/java/com/tofly/scada/common/FeignConfig.java

@@ -18,9 +18,7 @@ public class FeignConfig implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate requestTemplate) {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        if (attributes == null) {
-            return;
-        }
+        assert attributes != null;
         HttpServletRequest request = attributes.getRequest();
         //添加token
         requestTemplate.header("Authorization", request.getHeader("Authorization"));

hnls-scada/hnls-scada-boot/src/main/java/com/tofly/scada/common/ScheduledTask.java

@@ -0,0 +1,55 @@
+package com.tofly.scada.common;
+
+import com.tofly.scada.service.StatisticsScadaService;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * @author fcl
+ * @date 2021/6/16 15:54
+ */
+@EnableScheduling   // 1.开启定时任务
+@EnableAsync        // 2.开启多线程
+@Slf4j
+@Component
+public class ScheduledTask {
+
+    @Autowired
+    private StatisticsScadaService statisticsScadaService;
+
+    /**
+     *
+     * 	同步前两小时的异常点位模拟数据
+     */
+    @Async
+    @Scheduled(cron = "0 2,12,22,32,42,52 * * * ? ")
+    @SneakyThrows
+    public void syncAbnormalPointData(){
+        log.info("========================================开始手动同步同步前两小时的异常点位模拟数据========================================");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.HOUR, -1);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        Date end = calendar.getTime();
+        calendar.add(Calendar.HOUR, -1);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        Date start = calendar.getTime();
+        String startDate = sdf.format(start);
+        String endDate = sdf.format(end);
+        statisticsScadaService.syncAbnormalPointData(startDate, endDate);
+        log.info("========================================手动同步同步前两小时的异常点位模拟数据结束========================================");
+    }
+
+}

hnls-scada/src/main/java/com/tofly/scada/controller/ScadaController.java

@@ -4,22 +4,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
 import com.tofly.scada.common.BaseController;
-import com.tofly.scada.entity.Scada;
 import com.tofly.scada.entity.dto.DeviceQuery;
 import com.tofly.scada.entity.dto.ScadaMoreQuery;
 import com.tofly.scada.entity.dto.ScadaQuery;
 import com.tofly.scada.service.ScadaService;
 import com.tofly.scada.service.StatisticsScadaService;
 import io.swagger.annotations.*;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author HaiQiu
@@ -163,7 +158,7 @@ public class ScadaController extends BaseController {
 
     @ToFlyAppLog(title = "手动更新异常点位虚拟数据")
     @ApiOperation(value = "手动更新异常点位虚拟数据")
-    @PutMapping("/syncAbnormalPointData")
+    @PostMapping("/syncAbnormalPointData")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startDate", value = "开始时间（yyyy-MM-dd HH:mm:ss）", required = true, dataType = "String"),
             @ApiImplicitParam(name = "endDate", value = "结束时间（yyyy-MM-dd HH:mm:ss）", required = true, dataType = "String"),

hnls-scada/src/main/java/com/tofly/scada/entity/ScadaIoserverHis.java

@@ -14,8 +14,6 @@ import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
 
 
 /**

hnls-scada/src/main/java/com/tofly/scada/entity/vo/IOSever/IOServerParDto.java

@@ -1,6 +1,5 @@
 package com.tofly.scada.entity.vo.IOSever;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

hnls-scada/src/main/java/com/tofly/scada/entity/vo/IOSever/IOServerResultVo.java

@@ -1,16 +1,9 @@
 package com.tofly.scada.entity.vo.IOSever;
 
-import cn.hutool.json.JSONArray;
-import com.baomidou.mybatisplus.annotation.*;
-import com.tofly.scada.entity.Scada;
-import com.tofly.scada.entity.ScadaReport;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 
 /**
  *

hnls-scada/src/main/java/com/tofly/scada/entity/vo/StatisticsScadaVo.java

@@ -1,9 +1,7 @@
 package com.tofly.scada.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.tofly.scada.entity.ScadaReport;
 import io.swagger.annotations.ApiModelProperty;

hnls-scada/src/main/java/com/tofly/scada/mapper/DmatableMapper.java

@@ -5,13 +5,8 @@
 package com.tofly.scada.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import com.tofly.scada.entity.Dmatable;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-import java.util.List;
 
 /**
  * 区域表管理信息表：TF_YWPN_DMATABLE_W

hnls-scada/src/main/java/com/tofly/scada/mapper/ScadaIoserverHisMapper.java

@@ -6,10 +6,7 @@ package com.tofly.scada.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tofly.scada.entity.ScadaIoserverHis;
-import org.apache.ibatis.annotations.Param;
 
-
-import java.util.List;
 /**
  * IOServer监测设备数据记录表
  *

hnls-scada/src/main/java/com/tofly/scada/mapper/ScadaMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.scada.entity.Allocation;
 import com.tofly.scada.entity.Scada;
 import com.tofly.scada.entity.dto.ScadaQuery;
 import com.tofly.scada.entity.vo.NetCumulativeFlow;

hnls-scada/src/main/java/com/tofly/scada/mapper/StatisticsScadaMapper.java

@@ -16,7 +16,6 @@ import org.apache.ibatis.annotations.Select;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
 * @author haiqiu

hnls-scada/src/main/java/com/tofly/scada/service/IOServerService.java

@@ -1,7 +1,5 @@
 package com.tofly.scada.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.tofly.scada.entity.Allocation;
 import com.tofly.scada.entity.vo.IOSever.IOServerDataInfoVo;
 import com.tofly.scada.entity.vo.IOSever.IOServerParObjsDto;
 

hnls-scada/src/main/java/com/tofly/scada/service/ScadaService.java

@@ -1,9 +1,7 @@
 package com.tofly.scada.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.tofly.scada.entity.Dmatable;
 import com.tofly.scada.entity.Scada;
 import com.tofly.scada.entity.dto.DeviceQuery;
 import com.tofly.scada.entity.dto.ScadaQuery;

hnls-scada/src/main/java/com/tofly/scada/service/StatisticsScadaService.java

@@ -2,7 +2,6 @@ package com.tofly.scada.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.tofly.scada.entity.Scada;
 import com.tofly.scada.entity.StatisticsScada;
 import com.tofly.scada.entity.dto.ScadaMoreQuery;
 import com.tofly.scada.entity.dto.ScadaQuery;

hnls-scada/src/main/java/com/tofly/scada/service/impl/IOServerServiceImpl.java

@@ -2,10 +2,8 @@ package com.tofly.scada.service.impl;
 
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.tofly.common.core.util.DateUtil;
 import com.tofly.common.core.util.StringUtil;
 import com.tofly.common.oauth.util.SecurityUtils;
 import com.tofly.scada.entity.*;
@@ -13,14 +11,12 @@ import com.tofly.scada.entity.vo.IOSever.IOServerDataInfoVo;
 import com.tofly.scada.entity.vo.IOSever.IOServerParObjsDto;
 import com.tofly.scada.entity.vo.IOSever.IOServerResultVo;
 import com.tofly.scada.mapper.ScadaMapper;
-import com.tofly.scada.mapper.ScadaMonitorMapper;
 import com.tofly.scada.service.*;
 import com.tofly.scada.util.HttpClientUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

hnls-scada/src/main/java/com/tofly/scada/service/impl/StatisticsScadaServiceImpl.java

@@ -2,11 +2,9 @@ package com.tofly.scada.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.tofly.scada.common.FlowConstant;
 import com.tofly.scada.entity.*;
 import com.tofly.scada.entity.dto.ScadaMoreQuery;
 import com.tofly.scada.entity.dto.ScadaQuery;
@@ -17,15 +15,11 @@ import com.tofly.scada.mapper.AllocationMapper;
 import com.tofly.scada.mapper.ScadaReportMapper;
 import com.tofly.scada.mapper.StatisticsScadaMapper;
 import com.tofly.scada.service.ScadaMonitorService;
-import com.tofly.scada.service.ScadaService;
 import com.tofly.scada.service.StatisticsScadaService;
-import lombok.SneakyThrows;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -524,26 +518,6 @@ public class StatisticsScadaServiceImpl extends ServiceImpl<StatisticsScadaMappe
 //        logger.info("-----------------异常点位的指标数据新增scada历史数据完成------------------");
 //    }
 
-    /**
-     * 更新异常点位实时数据
-     *
-     */
-    @Async
-    @Scheduled(cron = "0 10 0/1 * * ? ")
-    @SneakyThrows
-    public void timeAbnormalPointData() {
-        Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.HOUR, -1);
-        calendar.set(Calendar.MINUTE, 59);
-        calendar.set(Calendar.SECOND, 59);
-        Date endTime = calendar.getTime();
-        calendar.add(Calendar.HOUR, -1);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        Date startTime = calendar.getTime();
-        syncAbnormalPointData(DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss"), DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"));
-    }
-
     /**
      * 更新异常点位实时数据
      *

hnls-scada/src/main/java/com/tofly/scada/util/SendTidingsUtil.java

@@ -17,7 +17,6 @@ import com.tofly.scada.service.UsertaskWService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.Date;
 import java.util.List;