1修复若干bug

TwoParameterWeibullProbabilityPlotOutput.txt

@@ -1,25 +1,25 @@
 Two Parameter Weibull Probability Plot
 
-Sunday, 17 September 2023, 11.06
+Wednesday, 18 October 2023, 10.27
 
 Unweighted constrained simplex regression
 
-Gradient:  0.9984        s.e. 0.0139
-Intercept: 0.0096        s.e. 0.0754
+Gradient:  0.9724        s.e. 0.0118
+Intercept: 0.189         s.e. 0.0739
 
-Correlation Coefficient, r: 0.9841
-Critical Value for r:       0.0501
+Correlation Coefficient, r: 0.9783
+Critical Value for r:       0.0485
 Significance level used:    5.0%
-Sum of squares:             83.4102
+Sum of squares:             151.3739
 
 Best Estimates of the Parameters
-sigma:  5.5996      'pseudo-linear' s.e. 0.0334
-gamma:  2.4105      'pseudo-linear' s.e. 0.0389
+sigma:  6.4847      'pseudo-linear' s.e. 0.0324
+gamma:  2.451       'pseudo-linear' s.e. 0.0344
 
 The 'pseudo-linear' s.e.s are a lower limit to the s.e. and may significantly underestimate the s.e.
 See documentation, http://www.ee.ucl.ac.uk/~mflanaga/java/ProbabilityPlot.html, for details
 
 'Pseudo-linear' Parameter-Parameter Correlation Coefficients
         sigma       gamma       
-sigma   1.0         0.3407      
-gamma   0.3407      1.0         
+sigma   1.0         0.3379      
+gamma   0.3379      1.0         

wrdep-biz/pom.xml

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>3.0.0</version>
+            <version>3.2.4</version>
         </dependency>
 
         <dependency>
@@ -78,7 +78,11 @@
             <artifactId>commons-math3</artifactId>
             <version>3.6.1</version>
         </dependency>
-
+        <!-- spring-boot-thymeleaf -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
     </dependencies>
 
     <profiles>    <!--考虑到window 和linux环境 npm命令格式的问题，使用maven的profile实现动态指定命令-->
@@ -111,8 +115,7 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
-
-            <!--             插件maven-clean-plugin，用于在编译前，清除之前编译的文件、文件夹等，避免残留之前的内容 -->
+            <!-- 插件maven-clean-plugin，用于在编译前，清除之前编译的文件、文件夹等，避免残留之前的内容 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -125,11 +128,58 @@
                         </fileset>
                         <fileset>
                             <!-- 最终项目打包自动生成的package目录 -->
-                            <directory>../package/wrdep/${project.version}</directory>
+                            <directory>src/main/resources/templates</directory>
+                        </fileset>
+                        <fileset>
+                            <!-- 最终项目打包自动生成的package目录 -->
+                            <directory>src/main/resources/static</directory>
                         </fileset>
                     </filesets>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.7.10</version> <!-- 如果 spring.boot.version 版本修改，则这里也要跟着修改 -->
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                    <mainClass>com.jiayue.WrdepApplication</mainClass>
+                    <layout>ZIP</layout>
+                    <fork>true</fork>
+                    <includes>
+                        <!-- 不包含任何jar包 -->
+                        <include>
+                            <groupId>nothing</groupId>
+                            <artifactId>nothing</artifactId>
+                        </include>
+                    </includes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- third-party jar into lib directory -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -184,48 +234,52 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <id>copy static</id>
+                        <id>copy html</id>
                         <phase>generate-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
                             <!-- 复制前端打包文件到这里 -->
-                            <outputDirectory>../package/wrdep/${project.version}/vue</outputDirectory>
+                            <outputDirectory>src/main/resources/templates</outputDirectory>
                             <overwrite>true</overwrite>
                             <resources>
                                 <resource>
                                     <!-- 从前端打包的目录dist进行指定文件、文件夹内容的复制-->
-                                    <directory>../wrdep-ui</directory>
+                                    <directory>../wrdep-ui/dist</directory>
+
                                     <includes>
-                                        <!-- 具体根据实际前端代码、及目录结构进行配置-->
-                                        <include>dist/</include>
-                                        <include>nginx.conf</include>
+                                        <include>favicon.ico</include>
                                         <include>index.html</include>
                                         <include>robots.txt</include>
+                                        <include>simhei-normal.js</include>
+                                        <include>html</include>
+                                        <include>img</include>
                                     </includes>
                                 </resource>
                             </resources>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.1.7.RELEASE</version>
-                <configuration>
-                    <outputDirectory>../package/wrdep/${project.version}/java</outputDirectory>
-                    <!--控制是否启用支持Linux下service方式运行-->
-                    <executable>true</executable>
-                    <includeSystemScope>true</includeSystemScope>
-                </configuration>
-                <executions>
                     <execution>
+                        <id>copy static</id>
+                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>build-info</goal>
-                            <goal>repackage</goal>
+                            <goal>copy-resources</goal>
                         </goals>
+                        <configuration>
+                            <!-- 复制前端打包文件到这里 -->
+                            <outputDirectory>src/main/resources/</outputDirectory>
+                            <overwrite>true</overwrite>
+                            <resources>
+                                <resource>
+                                    <!-- 从前端打包的目录dist进行指定文件、文件夹内容的复制-->
+                                    <directory>../wrdep-ui/dist</directory>
+                                    <includes>
+                                        <include>static/</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

wrdep-biz/src/main/java/com/jiayue/biz/controller/DataRecalculationController.java

@@ -6,10 +6,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.io.FileSystem;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.entity.ContentType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,6 +36,7 @@ public class DataRecalculationController {
 
     /**
      * 修改为异步处理文件，避免文件过大前台长时间不响应
+     *
      * @param file
      * @param equipmentNo
      * @param recorderNo
@@ -48,9 +47,9 @@ public class DataRecalculationController {
         MultipartFile file1 = null;
 
         try {
-            String uploadfilePath = "."+  File.separator +"uploadfile"+  File.separator +file.getOriginalFilename();
+            String uploadfilePath = "." + File.separator + "uploadfile" + File.separator + file.getOriginalFilename();
             FileUtils.copyInputStreamToFile(file.getInputStream(), new File(uploadfilePath));
-            file1 = getMultipartFile( new File(uploadfilePath));
+            file1 = getMultipartFile(new File(uploadfilePath));
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -58,7 +57,7 @@ public class DataRecalculationController {
         Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
-                    dataRecalculationService.uploadFileAnalysis(finalFile, equipmentNo, recorderNo);
+                dataRecalculationService.uploadFileAnalysis(finalFile, equipmentNo, recorderNo);
             }
         });
         thread.start();
@@ -81,6 +80,7 @@ public class DataRecalculationController {
 
         return new CommonsMultipartFile(item);
     }
+
     @PostMapping("/dataCheck")
     public AjaxResult dataCheck(@RequestParam("startTime") Long startTime, @RequestParam("endTime") Long endTime, @RequestParam("equipmentNo") String equipmentNo) {
         return dataRecalculationService.dataCheck(new Date(startTime), new Date(endTime), equipmentNo);
@@ -88,6 +88,14 @@ public class DataRecalculationController {
 
     @PostMapping("/statisticsCheck")
     public AjaxResult statisticsCheck(@RequestParam("startTime") Long startTime, @RequestParam("endTime") Long endTime, @RequestParam("equipmentNo") String equipmentNo) {
-        return dataRecalculationService.statisticsCheck(new Date(startTime), new Date(endTime), equipmentNo);
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                dataRecalculationService.statisticsCheck(new Date(startTime), new Date(endTime), equipmentNo);
+            }
+        });
+        thread.start();
+
+        return AjaxResult.success("提交后台重算成功");
     }
 }

wrdep-biz/src/main/java/com/jiayue/biz/mapper/ProphaseWeatherDataMapper.java

@@ -4,11 +4,13 @@ import cn.hutool.db.Entity;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jiayue.biz.domain.ProphaseWeatherData;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.sql.Timestamp;
 import java.util.List;
-import java.util.Map;
 
 /**
  * ProphaseWeatherDataMapper
@@ -47,9 +49,10 @@ public interface ProphaseWeatherDataMapper extends BaseMapper<ProphaseWeatherDat
     @Select("SELECT t1.ts,t1.air_density FROM weather_${equipmentId} t1 where  t1.ts >= #{startTime} and t1.ts <= #{endTime}")
     List<ProphaseWeatherData> selectAir(@Param("equipmentId") String equipmentId, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime);
 
-    @Select("select first (ts) from nerp_db.weather_#{equipmentId}")
+    @Select("select first (ts) from weather_#{equipmentId}")
     List<Entity> getFirstData(@Param("equipmentId") String equipmentId);
-    @Select("select last (ts) from nerp_db.weather_#{equipmentId}")
+
+    @Select("select last (ts) from weather_#{equipmentId}")
     List<Entity> getLastData(@Param("equipmentId") String equipmentId);
 
 

wrdep-biz/src/main/java/com/jiayue/biz/service/impl/EmailImpl.java

@@ -245,11 +245,13 @@ public class EmailImpl extends ServiceImpl<EmailMapper, Email> implements EmailS
      */
     public String getSentDate(MimeMessage msg, String pattern) throws MessagingException {
         Date receivedDate = msg.getSentDate();
-        if (receivedDate == null)
+        if (receivedDate == null) {
             return "";
+        }
 
-        if (pattern == null || "".equals(pattern))
+        if (pattern == null || "".equals(pattern)) {
             pattern = "yyyy年MM月dd日 E HH:mm ";
+        }
 
         return new SimpleDateFormat(pattern).format(receivedDate);
     }

wrdep-biz/src/main/java/com/jiayue/biz/service/impl/HomePageServiceImpl.java

@@ -1,42 +1,30 @@
 package com.jiayue.biz.service.impl;
 
 import cn.hutool.core.date.DateTime;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Entity;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jiayue.biz.conf.RequestDataHelper;
 import com.jiayue.biz.domain.*;
 import com.jiayue.biz.dto.EquipmentDto;
 import com.jiayue.biz.dto.ProjectEvolveDto;
 import com.jiayue.biz.dto.ProjectInfoDto;
 import com.jiayue.biz.dto.SelectLabForVal;
 import com.jiayue.biz.eunms.WindDirectionEnum;
-import com.jiayue.biz.mapper.ProphaseAnemometryDataMapper;
-import com.jiayue.biz.mapper.ProphaseWeatherDataMapper;
 import com.jiayue.biz.mapper.WindTowerDataParentTableMapper;
 import com.jiayue.biz.service.*;
 import com.jiayue.biz.util.CalculationUtil;
 import com.jiayue.biz.util.DateTimeUtil;
-import com.jiayue.common.core.redis.RedisCache;
 import com.jiayue.common.utils.DateUtil;
-import com.jiayue.common.utils.spring.SpringUtils;
-import com.sun.corba.se.spi.ior.ObjectKey;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.Timestamp;
-import java.sql.Wrapper;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 首页Service业务层处理
@@ -159,7 +147,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         Date beginTime = DateUtil.offsetMonth(DateUtil.beginOfMonth(yearDay), 1);
         Map<String, Long> startAndEnd = prophaseWeatherDataService.getDataTimeStartAndEnd(equipmentId);
 
-        if(beginTime.getTime() < startAndEnd.get("startTime")){
+        if (beginTime.getTime() < startAndEnd.get("startTime")) {
             beginTime = new Date(startAndEnd.get("startTime"));
         }
         Date endTime = lastDataCalculation.getTime();
@@ -838,7 +826,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
             selectLabForVal.setValue(project.getId());
             ArrayList<EquipmentDto> equipmentDtoList = new ArrayList<>();
             EquipmentDto equipmentDto = new EquipmentDto();
-            if(project.getRelationEquipment().contains(",")){
+            if (project.getRelationEquipment().contains(",")) {
                 String[] equipments = project.getRelationEquipment().split(",");
                 for (String equipment : equipments) {
                     equipmentDto = new EquipmentDto();
@@ -849,7 +837,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
                     equipmentDto.setType(windTowerInfos.get(0).getType());
                     equipmentDtoList.add(equipmentDto);
                 }
-            }else{
+            } else {
                 List<WindTowerInfo> windTowerInfos = windTowerInfoList.stream().filter(w -> w.getEquipmentNo().equals(project.getRelationEquipment())).collect(Collectors.toList());
                 equipmentDto.setLabel(windTowerInfos.get(0).getName());
                 equipmentDto.setValue(project.getRelationEquipment());
@@ -1060,6 +1048,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
 
         return selectList;
     }
+
     /**
      * 光场站测风塔下拉框
      *
@@ -1075,7 +1064,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
                 SelectLabForVal selectLabForVal = new SelectLabForVal();
                 selectLabForVal.setLabel(stationInfo.getStationBasicInfo().getStationName());
                 selectLabForVal.setValue(stationInfo.getId());
-                if (stationInfo.getWeatherStationInfos() !=null && stationInfo.getWeatherStationInfos().size() > 0) {
+                if (stationInfo.getWeatherStationInfos() != null && stationInfo.getWeatherStationInfos().size() > 0) {
                     ArrayList<WeatherStationInfo> weatherStationList = new ArrayList<>();
                     //循环数据 放入测风塔id和测风塔名称
                     for (WeatherStationInfo weatherStationInfo : stationInfo.getWeatherStationInfos()) {

wrdep-biz/src/main/java/com/jiayue/biz/service/impl/RealTimeDisplayServiceImpl.java

@@ -1,35 +1,30 @@
 package com.jiayue.biz.service.impl;
 
 import cn.hutool.db.Entity;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jiayue.biz.domain.*;
+import com.jiayue.biz.domain.ProphaseAnemometryData;
+import com.jiayue.biz.domain.ProphaseWeatherData;
+import com.jiayue.biz.domain.WindTowerInfo;
 import com.jiayue.biz.eunms.WindDirectionEnum;
-import com.jiayue.biz.mapper.ProphaseAnemometryDataMapper;
-import com.jiayue.biz.mapper.ProphaseWeatherDataMapper;
-import com.jiayue.biz.mapper.WindTowerDataParentTableMapper;
 import com.jiayue.biz.service.*;
 import com.jiayue.biz.util.CalculationUtil;
 import com.jiayue.biz.util.DateTimeUtil;
-import com.jiayue.biz.util.SEDateUtil;
 import com.jiayue.common.core.redis.RedisCache;
 import com.jiayue.common.utils.DateUtil;
 import flanagan.analysis.ProbabilityPlot;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.sql.Array;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Service
 @AllArgsConstructor
+@Slf4j
 public class RealTimeDisplayServiceImpl implements RealTimeDisplayService {
 
 
@@ -396,20 +391,23 @@ public class RealTimeDisplayServiceImpl implements RealTimeDisplayService {
         for (WindTowerInfo windTowerInfo : windTowerInfoList) {
             HashMap<String, Object> hashMap = new HashMap<>();
             //获取最后一条数据
-            List<Entity> lastData = prophaseWeatherDataService.getLastData(windTowerInfo.getEquipmentNo());
-            if (lastData.size() > 0) {
-                Timestamp timeEnd = (Timestamp) lastData.get(0).get("last (ts)");
-                long lastDataTime = timeEnd.getTime();
-                long startTime = DateTimeUtil.getDayStartTime(lastDataTime - 86400000 * 7).getTime();
-                long endTime = DateTimeUtil.getDayLastTime(lastDataTime).getTime();
-                hashMap.put("equipmentId", windTowerInfo.getEquipmentNo());
-                hashMap.put("startTime", startTime);
-                hashMap.put("endTime", endTime);
-                list.add(hashMap);
+            try {
+                List<Entity> lastData = prophaseWeatherDataService.getLastData(windTowerInfo.getEquipmentNo());
+                if (lastData.size() > 0) {
+                    Timestamp timeEnd = (Timestamp) lastData.get(0).get("last (ts)");
+                    long lastDataTime = timeEnd.getTime();
+                    long startTime = DateTimeUtil.getDayStartTime(lastDataTime - 86400000 * 7).getTime();
+                    long endTime = DateTimeUtil.getDayLastTime(lastDataTime).getTime();
+                    hashMap.put("equipmentId", windTowerInfo.getEquipmentNo());
+                    hashMap.put("startTime", startTime);
+                    hashMap.put("endTime", endTime);
+                    list.add(hashMap);
+                }
+            } catch (Exception e) {
+                log.error("查询塔设备：{} 最后一条数据错误信息：{}", windTowerInfo.getEquipmentNo(), e);
             }
 
         }
-        //redisCache.setCacheObject("getStartTimeAndEndTime",list,1, TimeUnit.HOURS);
         return list;
     }
 

wrdep-biz/src/main/java/com/jiayue/biz/service/impl/WindTowerCalculationDataServiceImpl.java

@@ -84,7 +84,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
      */
     public ArrayList<WindTowerCalculationData> calculateWindPowerDensity(Long startTime, Long endTime, String eqNo, List<ProphaseAnemometryData> prophaseAnemometryDataList, List<ProphaseWeatherData> prophaseWeatherDataList, List<EquipmentAttribute> equipmentAttributeList, List<WindTowerCalculationData> windTowerCalculationDataList) {
         //获取对应测风塔数据
-        List<ProphaseAnemometryData> anemometryDataList = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startTime && p.getTs().getTime() <= endTime && null == p.getWsAve() && p.getWsAve() != -99).collect(Collectors.toList());
+        List<ProphaseAnemometryData> anemometryDataList = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startTime && p.getTs().getTime() <= endTime && null != p.getWsAve() && p.getWsAve() != -99).collect(Collectors.toList());
         List<ProphaseWeatherData> weatherDataList = prophaseWeatherDataList.stream().filter(p -> p.getTs().getTime() >= startTime && p.getTs().getTime() <= endTime && p.getAirDensity() != null && p.getAirDensity() >= 0).collect(Collectors.toList());
         long hour = 3600000L;
         List<WindTowerInfo> windTowerInfos = windTowerInfoService.lambdaQuery().eq(WindTowerInfo::getEquipmentNo, eqNo).list();
@@ -1471,7 +1471,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
                 for (long start1 = startHour; start1 < endHour; start1 = start1 + dayTime) {
                     long finalStart = start1;
                     List<ProphaseAnemometryData> anemometryDataList = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= finalStart && p.getTs().getTime() < finalStart + dayTime &&
-                            p.getLayerHeight().equals(h) && (p.getWsAve()==null?0:p.getWsAve()) > 14.5 && p.getWsAve() <= 15.5).collect(Collectors.toList());
+                            p.getLayerHeight().equals(h) && (p.getWsAve() == null ? 0 : p.getWsAve()) > 14.5 && p.getWsAve() <= 15.5).collect(Collectors.toList());
 
                     if (anemometryDataList.size() > 0) {
                         BigDecimal wsAve = anemometryDataList.stream().map(p -> {
@@ -1580,26 +1580,26 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
             for (String h : heights) {
                 //获取对应层高的属性
                 List<EquipmentAttribute> equipmentAttributes = equipmentAttributeList.stream().filter(w -> w.getFieldName().equals(h + "staDay")).collect(Collectors.toList());
-               if(null != equipmentAttributes && equipmentAttributes.size()>0) {
-                   //删除数据
-                   removeByStartTimeBetweenAndEquipmentIdAndEbId(startTime, endTime, equipmentId, equipmentAttributes.get(0).getId());
-                   //每天循环
-                   for (long time = startHour; time < endHour; time = time + Hour) {
-                       long startDate = time;
-                       //过滤一天的数据
-                       List<ProphaseAnemometryData> collect = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startDate && p.getTs().getTime() < startDate + Hour && p.getLayerHeight().equals(h)).collect(Collectors.toList());
-                       BigDecimal staSum = CalculationUtil.getBigDecimal(collect.stream().filter(c -> c.getWsSta() != null && c.getWsSta() != 0).mapToDouble(ProphaseAnemometryData::getWsSta).sum());
-                       if (collect.size() > 0) {
-                           WindTowerCalculationData windTowerCalculationData = new WindTowerCalculationData();
-                           windTowerCalculationData.setEquipmentId(equipmentId);
-                           windTowerCalculationData.setTime(new Date(startDate));
-                           windTowerCalculationData.setValue(staSum.divide(CalculationUtil.getBigDecimal(collect.size()), 2, RoundingMode.HALF_UP));
-                           windTowerCalculationData.setEbId(equipmentAttributes.get(0).getId());
-                           windTowerCalculationDataList.add(windTowerCalculationData);
-                           dataList.add(windTowerCalculationData);
-                       }
-                   }
-               }
+                if (null != equipmentAttributes && equipmentAttributes.size() > 0) {
+                    //删除数据
+                    removeByStartTimeBetweenAndEquipmentIdAndEbId(startTime, endTime, equipmentId, equipmentAttributes.get(0).getId());
+                    //每天循环
+                    for (long time = startHour; time < endHour; time = time + Hour) {
+                        long startDate = time;
+                        //过滤一天的数据
+                        List<ProphaseAnemometryData> collect = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startDate && p.getTs().getTime() < startDate + Hour && p.getLayerHeight().equals(h)).collect(Collectors.toList());
+                        BigDecimal staSum = CalculationUtil.getBigDecimal(collect.stream().filter(c -> c.getWsSta() != null && c.getWsSta() != 0).mapToDouble(ProphaseAnemometryData::getWsSta).sum());
+                        if (collect.size() > 0) {
+                            WindTowerCalculationData windTowerCalculationData = new WindTowerCalculationData();
+                            windTowerCalculationData.setEquipmentId(equipmentId);
+                            windTowerCalculationData.setTime(new Date(startDate));
+                            windTowerCalculationData.setValue(staSum.divide(CalculationUtil.getBigDecimal(collect.size()), 2, RoundingMode.HALF_UP));
+                            windTowerCalculationData.setEbId(equipmentAttributes.get(0).getId());
+                            windTowerCalculationDataList.add(windTowerCalculationData);
+                            dataList.add(windTowerCalculationData);
+                        }
+                    }
+                }
             }
         } catch (Exception e) {
             log.error("设备编号{}日平均风速标差计算失败^ ^", equipmentId);
@@ -1634,8 +1634,8 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
                 List<EquipmentAttribute> turList = equipmentAttributeList.stream().filter(equipmentAttribute -> equipmentAttribute.getFieldName().equals(h + turbulenceDay)).collect(Collectors.toList());
                 List<EquipmentAttribute> staList = equipmentAttributeList.stream().filter(equipmentAttribute -> equipmentAttribute.getFieldName().equals(h + staDay)).collect(Collectors.toList());
                 List<EquipmentAttribute> wsList = equipmentAttributeList.stream().filter(equipmentAttribute -> equipmentAttribute.getFieldName().equals(h + "awsDay")).collect(Collectors.toList());
-                if(null == turList || null == staList|| null == wsList||  turList.size()==0 ||staList.size()==0 ||wsList.size()==0 ){
-                    log.info("计算评价湍流数据异常：staList:{},wsList:{},:turList:{}",staList,wsList,turList);
+                if (null == turList || null == staList || null == wsList || turList.size() == 0 || staList.size() == 0 || wsList.size() == 0) {
+                    log.info("计算评价湍流数据异常：staList:{},wsList:{},:turList:{}", staList, wsList, turList);
                     continue;
                 }
 
@@ -2302,7 +2302,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
         //计算标差
         for (String height : heights) {
             List<EquipmentAttribute> equipmentAttributeList1 = equipmentAttributeList.stream().filter(e -> e.getFieldName().equals(height + "staMonth")).collect(Collectors.toList());
-            if (!collect.isEmpty() && null != equipmentAttributeList1 && equipmentAttributeList1.size()>0) {
+            if (!collect.isEmpty() && null != equipmentAttributeList1 && equipmentAttributeList1.size() > 0) {
                 BigDecimal sumSta = CalculationUtil.getBigDecimal(collect.stream().filter(c -> c.getWsSta() != null && c.getLayerHeight().equals(height)).mapToDouble(ProphaseAnemometryData::getWsSta).sum());
                 WindTowerCalculationData windTowerCalculationData = new WindTowerCalculationData();
                 windTowerCalculationData.setEbId(equipmentAttributeList1.get(0).getId());

wrdep-biz/src/main/java/com/jiayue/biz/service/impl/WindTowerInfoServiceImpl.java

@@ -3,19 +3,17 @@ package com.jiayue.biz.service.impl;
 import cn.hutool.core.util.StrUtil;
 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.jiayue.biz.domain.StatisticsSituation;
+import com.jiayue.biz.domain.WindTowerInfo;
+import com.jiayue.biz.mapper.WindTowerInfoMapper;
+import com.jiayue.biz.service.WindTowerInfoService;
 import com.jiayue.common.core.redis.RedisCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jiayue.biz.mapper.WindTowerInfoMapper;
-import com.jiayue.biz.domain.WindTowerInfo;
-import com.jiayue.biz.service.WindTowerInfoService;
 
-import java.sql.Struct;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -49,7 +47,7 @@ public class WindTowerInfoServiceImpl extends ServiceImpl<WindTowerInfoMapper, W
     }
 
     //获取所有测风塔信息
-    public List<WindTowerInfo> getAllWindTower(){
+    public List<WindTowerInfo> getAllWindTower() {
 
 
         return this.lambdaQuery().list();
@@ -68,7 +66,7 @@ public class WindTowerInfoServiceImpl extends ServiceImpl<WindTowerInfoMapper, W
     }
 
 
-    public boolean update(WindTowerInfo windTowerInfo){
+    public boolean update(WindTowerInfo windTowerInfo) {
         boolean b = this.updateById(windTowerInfo);
 
         return b;
@@ -81,10 +79,10 @@ public class WindTowerInfoServiceImpl extends ServiceImpl<WindTowerInfoMapper, W
      * @return
      */
     public boolean deleteWindTowerInfo(List<String> ids) {
-        for (String id : ids) {
+        /*for (String id : ids) {
             WindTowerInfo w = this.getById(id);
             baseMapper.deleteCalculationTable("wind_tower_calculation_data_" + w.getEquipmentNo());
-        }
+        }*/
         boolean b = this.removeByIds(ids);
         return b;
     }

wrdep-biz/src/main/resources/application-dev.yml

@@ -4,22 +4,12 @@ spring:
     multipart:
       max-file-size: 512MB
       max-request-size: 512MB
-  #  data:
-  #    mongodb:
-  ##      host: 49.4.78.194
-  ##      host: 10.124.252.246
-  #      host: 192.168.10.208
-  ##      port: 17142
-  #      port: 27017
-  #      database: neim
-  #      username: neimdb
-  #      password: 'neim123'
   datasource:
     dynamic:
       primary: mysql #设置默认的数据源或者数据源组,默认值即为master
       datasource:
         mysql:
-          url: jdbc:mysql://192.168.1.128:3306/wrdep?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://192.168.1.205:3306/wrdep_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
           password: '!QAZ2root'
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -66,10 +56,10 @@ spring:
                 config:
                   multi-statement-allow: true
         tdengine:
-          url: jdbc:TAOS://192.168.1.128:6030/nerp_db
+          url: jdbc:TAOS://192.168.1.114:6030/nerp_db
           username: root
-#          password: 123456
-          password: "!QAZ2root"
+          password: 123456
+          #password: "!QAZ2root"
           driver-class-name: com.taosdata.jdbc.TSDBDriver
           type: com.alibaba.druid.pool.DruidDataSource
           druid:
@@ -79,13 +69,9 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.1.128
-    #    host: 10.124.252.244
-    # 端口，默认为6379
+    host: 192.168.1.205
     port: 6379
-    #    port: 17137
-    # 数据库索引
-    database: 0
+    database: 7
     # 密码
     password: jiayue
     # 连接超时时间

wrdep-biz/src/main/resources/application-prod.yml

@@ -1,65 +1,85 @@
 # 数据源配置
 spring:
+  servlet:
+    multipart:
+      max-file-size: 512MB
+      max-request-size: 512MB
+  #  data:
+  #    mongodb:
+  ##      host: 49.4.78.194
+  ##      host: 10.124.252.246
+  #      host: 192.168.10.208
+  ##      port: 17142
+  #      port: 27017
+  #      database: neim
+  #      username: neimdb
+  #      password: 'neim123'
   datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.cj.jdbc.Driver
-    druid:
-      # 主库数据源
-      master:
-        url: jdbc:mysql://10.124.252.246:3306/nerp-db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true&rewriteBatchedStatements=true
-        username: root
-        password: '!QAZ2root'
-      # 从库数据源
-      slave:
-        # 从数据源开关/默认关闭
-        enabled: false
-        url:
-        username:
-        password:
-      # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
-      minIdle: 10
-      # 最大连接池数量
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      # 配置一个连接在池中最大生存的时间，单位是毫秒
-      maxEvictableIdleTimeMillis: 900000
-      # 配置检测连接是否有效
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 设置白名单，不填则允许所有访问
-        allow:
-        url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: nerp
-        login-password: nerp
-      filter:
-        stat:
-          enabled: true
-          # 慢SQL记录
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
+    dynamic:
+      primary: mysql #设置默认的数据源或者数据源组,默认值即为master
+      datasource:
+        mysql:
+          url: jdbc:mysql://127.0.0.1:3306/wrdep_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          username: root
+          password: '!QAZ2root'
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.alibaba.druid.pool.DruidDataSource
+          druid:
+            # 初始连接数
+            initial-size: 5
+            # 最小连接池数量
+            min-idle: 10
+            # 最大连接池数量
+            max-active: 20
+            # 配置获取连接等待超时的时间
+            max-wait: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            min-evictable-idle-time-millis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            max-evictable-idle-time-millis: 900000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            time-between-eviction-runs-millis: 60000
+            # 配置检测连接是否有效
+            test-while-idle: true
+            test-on-borrow: false
+            test-on-return: false
+            validation-query: select 1
+            validation-query-timeout: -1
+            webStatFilter:
+              enabled: true
+            statViewServlet:
+              enabled: true
+              # 设置白名单，不填则允许所有访问
+              allow:
+              url-pattern: /druid/*
+              # 控制台管理用户名和密码
+              login-username: nerp
+              login-password: nerp
+            filter:
+              stat:
+                enabled: true
+                # 慢SQL记录
+                log-slow-sql: true
+                slow-sql-millis: 1000
+                merge-sql: true
+              wall:
+                config:
+                  multi-statement-allow: true
+        tdengine:
+          url: jdbc:TAOS://127.0.0.1:6030/nerp_db
+          username: root
+          #          password: 123456
+          password: "!QAZ2root"
+          driver-class-name: com.taosdata.jdbc.TSDBDriver
+          type: com.alibaba.druid.pool.DruidDataSource
+          druid:
+            initial-size: 5
+            min-idle: 5
+            max-active: 5
   # redis 配置
   redis:
     # 地址
-    host: 10.124.252.244
-    # 端口，默认为6379
+    host: 127.0.0.1
     port: 6379
     # 数据库索引
     database: 0
@@ -77,7 +97,7 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
-#
+
 #mybatis-plus:
 #  configuration:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志

wrdep-biz/src/main/resources/application.yml

@@ -55,7 +55,7 @@ management:
 
 # 日志配置
 logging:
-  config: classpath:logback-nerp.xml
+  config: classpath:logback-wrdep.xml
 
 # Spring配置
 spring:
@@ -78,6 +78,11 @@ spring:
       # 热部署开关
       enabled: true
 
+  # 模板引擎
+  thymeleaf:
+    mode: HTML
+    encoding: utf-8
+    cache: false
 
 # token配置
 token:

wrdep-biz/src/main/resources/logback-nerp.xml → wrdep-biz/src/main/resources/logback-wrdep.xml

@@ -49,7 +49,7 @@
         <!-- 按照时间来 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${logbase}/%d{yyyy-MM}/neim.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${logbase}/%d{yyyy-MM}/wrdep.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>180</MaxHistory>
             <maxFileSize>10MB</maxFileSize>
@@ -65,33 +65,6 @@
         <append>false</append>
     </appender>
 
-
-    <!-- <appender name="TunnelLogFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-       &lt;!&ndash; 编码 &ndash;&gt;
-       &lt;!&ndash;<Encoding>UTF-8</Encoding>&ndash;&gt;
-       &lt;!&ndash; 按照时间来 &ndash;&gt;
-       <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-         &lt;!&ndash;日志文件输出的文件名&ndash;&gt;
-         <FileNamePattern>D://testlog//#TunnelName#.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-         &lt;!&ndash;日志文件保留天数&ndash;&gt;
-         <MaxHistory>180</MaxHistory>
-         <maxFileSize>10MB</maxFileSize>
-         <totalSizeCap>1024MB</totalSizeCap>
-         <cleanHistoryOnStart>true</cleanHistoryOnStart>
-       </rollingPolicy>
-       &lt;!&ndash; 布局 &ndash;&gt;
-       <encoder>
-         &lt;!&ndash;格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符&ndash;&gt;
-         <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-         <charset>UTF-8</charset>
-       </encoder>
-       <append>false</append>
-     </appender>
-
-     <logger name="TunnelLogger" level="debug" additivity="true">
-       <appender-ref ref="TunnelLogFile"/>
-     </logger>-->
-
     <logger name="com.jiayue" level="info" additivity="true">
         <appender-ref ref="logFile"/>
     </logger>

wrdep-biz/src/main/resources/static/css/chunk-1208fcbe.793cbdf1.css

@@ -1 +0,0 @@
-.icon-body[data-v-0273f142]{width:100%;padding:10px}.icon-body .icon-list[data-v-0273f142]{height:200px;overflow-y:scroll}.icon-body .icon-list div[data-v-0273f142]{height:30px;line-height:30px;margin-bottom:-5px;cursor:pointer;width:33%;float:left}.icon-body .icon-list span[data-v-0273f142]{display:inline-block;vertical-align:-.15em;fill:currentColor;overflow:hidden}

wrdep-biz/src/main/resources/static/css/chunk-171ca186.99047b9c.css

@@ -1 +0,0 @@
-.login{position:fixed;height:100%;width:100%;background-image:url(../../static/img/background.a568162c.svg);background-size:cover;background-color:#2d3a4b}.title{font-size:24px;font-weight:400;color:#eee;margin:0 auto 30px auto;text-align:center}.login-form{position:absolute;left:0;right:0;max-width:100%;margin:120px auto;border-radius:6px;width:355px;padding:25px 25px 5px 25px}.login-form .el-input{height:38px}.login-form .el-input input{height:38px;background:transparent;border:0;-webkit-appearance:none;border:1px solid hsla(0,0%,100%,.1);border-radius:5px;color:#eee}.login-form .el-input input:-webkit-autofill{-webkit-box-shadow:0 0 0 1000px #2d3a4b inset!important;-webkit-text-fill-color:#fff!important}.login-form .el-form-item{background:rgba(0,0,0,.1);color:#454545}.login-form .input-icon{height:39px;width:14px;margin-left:2px}.login-tip{font-size:13px;text-align:center;color:#bfbfbf}.login-code{width:33%;height:38px;float:right}.login-code img{cursor:pointer;vertical-align:middle}.el-login-footer{height:40px;line-height:40px;position:fixed;bottom:0;width:100%;text-align:center;color:#fff;font-family:Arial;font-size:12px;letter-spacing:1px}.login-code-img{height:38px}

wrdep-biz/src/main/resources/static/css/chunk-24c54c5f.25ee122e.css

@@ -1 +0,0 @@
-.logBox[data-v-7d89f008]{height:4vh;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around;color:#fff}.logTitle[data-v-7d89f008]{width:40%;margin-top:3%}.logTitle[data-v-7d89f008] .border-box-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.myTable[data-v-7d89f008]{width:95%;height:86vh;margin-left:2%}.tableBox[data-v-7d89f008] .el-table,.tableBox[data-v-7d89f008] .el-table__expanded-cell,[data-v-7d89f008] .el-table td,[data-v-7d89f008] .el-table th,[data-v-7d89f008] .el-table tr{color:#fff;background-color:transparent}[data-v-7d89f008] .tableBox tbody tr:hover>td{background-color:unset!important}

wrdep-biz/src/main/resources/static/css/chunk-28506e6c.1487a511.css

@@ -1 +0,0 @@
-.coolDowning{background:#cdcdcd;border-color:#cdcdcd}

wrdep-biz/src/main/resources/static/css/chunk-345dd7f2.bbc9fa95.css

@@ -1 +0,0 @@
-.errPage-container[data-v-f2e02586]{width:800px;max-width:100%;margin:100px auto}.errPage-container .pan-back-btn[data-v-f2e02586]{background:#008489;color:#fff;border:none!important}.errPage-container .pan-gif[data-v-f2e02586]{margin:0 auto;display:block}.errPage-container .pan-img[data-v-f2e02586]{display:block;margin:0 auto;width:100%}.errPage-container .text-jumbo[data-v-f2e02586]{font-size:60px;font-weight:700;color:#484848}.errPage-container .list-unstyled[data-v-f2e02586]{font-size:14px}.errPage-container .list-unstyled li[data-v-f2e02586]{padding-bottom:5px}.errPage-container .list-unstyled a[data-v-f2e02586]{color:#008489;text-decoration:none}.errPage-container .list-unstyled a[data-v-f2e02586]:hover{text-decoration:underline}

wrdep-biz/src/main/resources/static/css/chunk-3724ee0c.c7a6b184.css

@@ -1 +0,0 @@
-.box-card[data-v-47b1ec30]{height:90vh}.seachBox[data-v-47b1ec30]{display:-webkit-box;display:-ms-flexbox;display:flex;margin:.5%;height:10%}.conditionOne[data-v-47b1ec30],.conditionTwo[data-v-47b1ec30],.seachBtu[data-v-47b1ec30]{display:inline-block}.conditionTwo[data-v-47b1ec30],.seachBtu[data-v-47b1ec30]{margin-left:.5%}#TPChart[data-v-47b1ec30]{width:100%;height:calc(38vh - 10px)}.block[data-v-47b1ec30]{float:right}

wrdep-biz/src/main/resources/static/css/chunk-3ca6096f.9f7e2498.css

@@ -1 +0,0 @@
-.seachBox[data-v-42378e7e]{display:-webkit-box;display:-ms-flexbox;display:flex;margin:.5%}.conditionOne[data-v-42378e7e],.conditionTwo[data-v-42378e7e],.seachBtu[data-v-42378e7e]{display:inline-block}.conditionTwo[data-v-42378e7e],.seachBtu[data-v-42378e7e]{margin-left:.5%}.mainBox[data-v-42378e7e]{width:99%;margin-left:.5%}#tunInChart[data-v-42378e7e]{width:100%;height:calc(74vh - 5px)}.block[data-v-42378e7e]{float:right}

wrdep-biz/src/main/resources/static/css/chunk-444dbb2e.3e10cd59.css

@@ -1 +0,0 @@
-.icon-ul[data-v-2fa68d6e]{margin:0;padding:0;font-size:0}.icon-ul li[data-v-2fa68d6e]{list-style-type:none;text-align:center;font-size:14px;display:inline-block;width:16.66%;-webkit-box-sizing:border-box;box-sizing:border-box;height:108px;padding:15px 6px 6px 6px;cursor:pointer;overflow:hidden}.icon-ul li[data-v-2fa68d6e]:hover{background:#f2f2f2}.icon-ul li.active-item[data-v-2fa68d6e]{background:#e1f3fb;color:#7a6df0}.icon-ul li>i[data-v-2fa68d6e]{font-size:30px;line-height:50px}.icon-dialog[data-v-2fa68d6e] .el-dialog{border-radius:8px;margin-bottom:0;margin-top:4vh!important;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;max-height:92vh;overflow:hidden;-webkit-box-sizing:border-box;box-sizing:border-box}.icon-dialog[data-v-2fa68d6e] .el-dialog .el-dialog__header{padding-top:14px}.icon-dialog[data-v-2fa68d6e] .el-dialog .el-dialog__body{margin:0 20px 20px 20px;padding:0;overflow:auto}

wrdep-biz/src/main/resources/static/css/chunk-46876428.680532d0.css

@@ -1 +0,0 @@
-.box-card[data-v-1f688162]{height:90vh}.seachBox[data-v-1f688162]{display:-webkit-box;display:-ms-flexbox;display:flex;margin:.5%;height:10%}.conditionOne[data-v-1f688162],.conditionTwo[data-v-1f688162],.seachBtu[data-v-1f688162]{display:inline-block}.conditionTwo[data-v-1f688162],.seachBtu[data-v-1f688162]{margin-left:.5%}#TPChart[data-v-1f688162]{width:100%;height:calc(38vh - 10px)}.block[data-v-1f688162]{float:right}

wrdep-biz/src/main/resources/static/css/chunk-47fed2d0.f9e52dca.css

@@ -1 +0,0 @@
-.user-info-head[data-v-4c17c724]{position:relative;display:inline-block;height:120px}.user-info-head[data-v-4c17c724]:hover:after{content:"+";position:absolute;left:0;right:0;top:0;bottom:0;color:#eee;background:rgba(0,0,0,.5);font-size:24px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;cursor:pointer;line-height:110px;border-radius:50%}

wrdep-biz/src/main/resources/static/css/chunk-48223c1b.139f8fef.css

@@ -1 +0,0 @@
-.box-card[data-v-8644617c]{height:90vh}.seachBox[data-v-8644617c]{display:-webkit-box;display:-ms-flexbox;display:flex;margin:.5%;height:10%}.conditionOne[data-v-8644617c],.conditionTwo[data-v-8644617c],.seachBtu[data-v-8644617c]{display:inline-block}.conditionTwo[data-v-8644617c],.seachBtu[data-v-8644617c]{margin-left:.5%}#TPChart[data-v-8644617c]{width:100%;height:calc(38vh - 10px)}.block[data-v-8644617c]{float:right}

wrdep-biz/src/main/resources/static/css/chunk-55d183ec.4e8637e7.css

@@ -1 +0,0 @@
-.icons-container[data-v-101db740]{margin:10px 20px 0;overflow:hidden}.icons-container .icon-item[data-v-101db740]{margin:20px;height:85px;text-align:center;width:100px;float:left;font-size:30px;color:#24292e;cursor:pointer}.icons-container span[data-v-101db740]{display:block;font-size:16px;margin-top:10px}.icons-container .disabled[data-v-101db740]{pointer-events:none}

wrdep-biz/src/main/resources/static/css/chunk-59e3a2aa.db9979c1.css

@@ -1 +0,0 @@
-#map[data-v-5d53008e]{width:100%;height:83vh;border-radius:10px}.mapTitleBox[data-v-5d53008e]{height:4vh;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around}.mapTitle[data-v-5d53008e]{width:10%;color:#fff}.mapTitle[data-v-5d53008e] .border-box-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.tdt-top[data-v-5d53008e],[data-v-5d53008e] .tdt-bottom{display:none}

wrdep-biz/src/main/resources/static/css/chunk-5a5e4b3e.95f72f1d.css

@@ -1 +0,0 @@
-.box-card[data-v-5d2528c4]{height:90vh}.seachBox[data-v-5d2528c4]{display:-webkit-box;display:-ms-flexbox;display:flex;margin:.5%}.conditionOne[data-v-5d2528c4],.conditionThree[data-v-5d2528c4],.conditionTwo[data-v-5d2528c4],.seachBtu[data-v-5d2528c4]{display:inline-block}.conditionThree[data-v-5d2528c4],.conditionTwo[data-v-5d2528c4],.seachBtu[data-v-5d2528c4]{margin-left:.5%}#shearChart[data-v-5d2528c4]{display:inline-block;width:100%;height:calc(38vh - 10px)}.block[data-v-5d2528c4]{float:right}[data-v-5d2528c4] .el-descriptions-item__label.is-bordered-label{width:49.5%;color:#1f2d3d;text-align:center}[data-v-5d2528c4] .el-descriptions :not(.is-bordered) .el-descriptions-item__cell{text-align:center}

wrdep-biz/src/main/resources/static/css/chunk-5bcac654.179c4f24.css

@@ -1 +0,0 @@
-.seachBox[data-v-851b3c4c]{display:-webkit-box;display:-ms-flexbox;display:flex;margin:.5%}.conditionOne[data-v-851b3c4c],.conditionThree[data-v-851b3c4c],.conditionTwo[data-v-851b3c4c],.seachBtu[data-v-851b3c4c]{display:inline-block}.conditionThree[data-v-851b3c4c],.conditionTwo[data-v-851b3c4c],.seachBtu[data-v-851b3c4c]{margin-left:.5%}.tableDiv[data-v-851b3c4c]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around}.tableBox[data-v-851b3c4c]{width:49%}.block[data-v-851b3c4c]{float:right}#charts[data-v-851b3c4c]{width:100%;height:calc(74vh - 5px)}

wrdep-biz/src/main/resources/static/css/chunk-5e857f95.daa871e9.css

@@ -1 +0,0 @@
-.block[data-v-11fd29cc]{display:-webkit-box;display:-ms-flexbox;display:flex}.conOne[data-v-11fd29cc],.myButton[data-v-11fd29cc]{margin-left:.5%}.dialogFooter[data-v-11fd29cc]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-top:1.5%}.summaryBox[data-v-11fd29cc]{float:left;margin-top:.5%;left:1%}

wrdep-biz/src/main/resources/static/css/chunk-67417c65.43ccdbe8.css

@@ -1 +0,0 @@
-.seachBox[data-v-413a157a]{display:-webkit-box;display:-ms-flexbox;display:flex;margin:.5%}.conditionOne[data-v-413a157a],.conditionThree[data-v-413a157a],.conditionTwo[data-v-413a157a],.seachBtu[data-v-413a157a]{display:inline-block}.conditionThree[data-v-413a157a],.conditionTwo[data-v-413a157a],.seachBtu[data-v-413a157a]{margin-left:.5%}.tableDiv[data-v-413a157a]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around}.tableBox[data-v-413a157a]{width:49%}.block[data-v-413a157a]{float:right}#charts[data-v-413a157a]{width:100%;height:calc(74vh - 5px)}

wrdep-biz/src/main/resources/static/css/chunk-6ad04947.f9e52dca.css

@@ -1 +0,0 @@
-.user-info-head[data-v-4c17c724]{position:relative;display:inline-block;height:120px}.user-info-head[data-v-4c17c724]:hover:after{content:"+";position:absolute;left:0;right:0;top:0;bottom:0;color:#eee;background:rgba(0,0,0,.5);font-size:24px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;cursor:pointer;line-height:110px;border-radius:50%}

wrdep-biz/src/main/resources/static/css/chunk-7c4ca7cb.b3dde55f.css

@@ -1 +0,0 @@
-.pop_btn[data-v-62966b06]{text-align:center;margin-top:20px}.popup-main[data-v-62966b06]{position:relative;margin:10px auto;background:#fff;border-radius:5px;font-size:12px;overflow:hidden}.popup-title[data-v-62966b06]{overflow:hidden;line-height:34px;padding-top:6px;background:#f2f2f2}.popup-result[data-v-62966b06]{-webkit-box-sizing:border-box;box-sizing:border-box;line-height:24px;margin:25px auto;padding:15px 10px 10px;border:1px solid #ccc;position:relative}.popup-result .title[data-v-62966b06]{position:absolute;top:-28px;left:50%;width:140px;font-size:14px;margin-left:-70px;text-align:center;line-height:30px;background:#fff}.popup-result table[data-v-62966b06]{text-align:center;width:100%;margin:0 auto}.popup-result table span[data-v-62966b06]{display:block;width:100%;font-family:arial;line-height:30px;height:30px;white-space:nowrap;overflow:hidden;border:1px solid #e8e8e8}.popup-result-scroll[data-v-62966b06]{font-size:12px;line-height:24px;height:10em;overflow-y:auto}

wrdep-biz/src/main/resources/static/css/chunk-7ca6e6a6.2e9373c8.css

@@ -1 +0,0 @@
-.seachBox[data-v-9571f3ec]{display:-webkit-box;display:-ms-flexbox;display:flex;margin:.5%}.conditionOne[data-v-9571f3ec],.conditionThree[data-v-9571f3ec],.conditionTwo[data-v-9571f3ec],.seachBtu[data-v-9571f3ec]{display:inline-block}.conditionThree[data-v-9571f3ec],.conditionTwo[data-v-9571f3ec],.seachBtu[data-v-9571f3ec]{margin-left:.5%}#powerChart[data-v-9571f3ec],#roseChart[data-v-9571f3ec],#shearChart[data-v-9571f3ec],#tunInRoseChart[data-v-9571f3ec]{display:inline-block;width:50%;height:calc(38vh - 10px)}

wrdep-biz/src/main/resources/static/css/chunk-7d993ace.3a987f25.css

@@ -1 +0,0 @@
-.register{position:fixed;height:100%;width:100%;background-image:url(../../static/img/background.a568162c.svg);background-size:cover;background-color:#2d3a4b}.title{font-size:24px;font-weight:400;color:#eee;margin:0 auto 30px auto;text-align:center}.register-form{position:absolute;left:0;right:0;max-width:100%;margin:120px auto;border-radius:6px;width:355px;padding:25px 25px 5px 25px}.register-form .el-input{height:38px}.register-form .el-input input{height:38px;background:transparent;border:0;-webkit-appearance:none;border:1px solid hsla(0,0%,100%,.1);border-radius:5px;color:#eee}.register-form .el-input input:-webkit-autofill{-webkit-box-shadow:0 0 0 1000px #2d3a4b inset!important;-webkit-text-fill-color:#fff!important}.register-form .el-form-item{background:rgba(0,0,0,.1);color:#454545}.register-form .input-icon{height:39px;width:14px;margin-left:2px}.register-tip{font-size:13px;text-align:center;color:#bfbfbf}.register-code{width:33%;height:38px;float:right}.register-code img{cursor:pointer;vertical-align:middle}.el-register-footer{height:40px;line-height:40px;position:fixed;bottom:0;width:100%;text-align:center;color:#fff;font-family:Arial;font-size:12px;letter-spacing:1px}.register-code-img{height:38px}

wrdep-biz/src/main/resources/static/css/chunk-d58e2ee6.925aad09.css

@@ -1 +0,0 @@
-.seachBox[data-v-24db3be8]{display:-webkit-box;display:-ms-flexbox;display:flex;margin:.5%}.conditionOne[data-v-24db3be8],.conditionThree[data-v-24db3be8],.conditionTwo[data-v-24db3be8],.seachBtu[data-v-24db3be8]{display:inline-block}.conditionThree[data-v-24db3be8],.conditionTwo[data-v-24db3be8],.seachBtu[data-v-24db3be8]{margin-left:.5%}#frequeryChart[data-v-24db3be8]{width:100%;height:calc(74vh - 5px)}

wrdep-biz/src/main/resources/static/css/chunk-fc6a2dd6.38c474aa.css

@@ -1 +0,0 @@
-.seachBox[data-v-1d530a18]{display:-webkit-box;display:-ms-flexbox;display:flex;margin:.5%}.conditionOne[data-v-1d530a18],.conditionThree[data-v-1d530a18],.conditionTwo[data-v-1d530a18],.seachBtu[data-v-1d530a18]{display:inline-block}.conditionThree[data-v-1d530a18],.conditionTwo[data-v-1d530a18],.seachBtu[data-v-1d530a18]{margin-left:.5%}#frequeryChart[data-v-1d530a18]{width:100%;height:71vh}.chartBox[data-v-1d530a18]{font-weight:700;margin-left:.5%;margin-bottom:.3%}.chartText[data-v-1d530a18]{font-weight:700;color:#1ab394}

wrdep-biz/src/main/resources/static/js/chunk-210a75fa.07aa30da.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-210a75fa"],{"061b":function(t,e,n){"use strict";var i=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],style:"height:"+t.height},[n("iframe",{staticStyle:{width:"100%",height:"100%"},attrs:{src:t.src,frameborder:"no",scrolling:"auto"}})])},r=[],a={props:{src:{type:String,required:!0}},data:function(){return{height:document.documentElement.clientHeight-94.5+"px;",loading:!0,url:this.src}},mounted:function(){var t=this;setTimeout((function(){t.loading=!1}),300);var e=this;window.onresize=function(){e.height=document.documentElement.clientHeight-94.5+"px;"}}},o=a,l=n("2877"),u=Object(l["a"])(o,i,r,!1,null,null,null);e["a"]=u.exports},"06bd":function(t,e,n){"use strict";n.r(e);var i=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("i-frame",{attrs:{src:t.url}})},r=[],a=n("061b"),o={name:"LogFile",components:{iFrame:a["a"]},data:function(){return{url:"//actuator/logfile"}}},l=o,u=n("2877"),c=Object(u["a"])(l,i,r,!1,null,null,null);e["default"]=c.exports}}]);

wrdep-biz/src/main/resources/static/js/chunk-210ca3e9.14cdb213.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-210ca3e9"],{"061b":function(t,e,n){"use strict";var i=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],style:"height:"+t.height},[n("iframe",{staticStyle:{width:"100%",height:"100%"},attrs:{src:t.src,frameborder:"no",scrolling:"auto"}})])},r=[],a={props:{src:{type:String,required:!0}},data:function(){return{height:document.documentElement.clientHeight-94.5+"px;",loading:!0,url:this.src}},mounted:function(){var t=this;setTimeout((function(){t.loading=!1}),300);var e=this;window.onresize=function(){e.height=document.documentElement.clientHeight-94.5+"px;"}}},o=a,u=n("2877"),l=Object(u["a"])(o,i,r,!1,null,null,null);e["a"]=l.exports},5194:function(t,e,n){"use strict";n.r(e);var i=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("i-frame",{attrs:{src:t.url}})},r=[],a=n("061b"),o={name:"Druid",components:{iFrame:a["a"]},data:function(){return{url:"//druid/login.html"}}},u=o,l=n("2877"),c=Object(l["a"])(u,i,r,!1,null,null,null);e["default"]=c.exports}}]);

wrdep-biz/src/main/resources/static/js/chunk-210ce324.4abfccff.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-210ce324"],{"061b":function(e,t,n){"use strict";var i=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],style:"height:"+e.height},[n("iframe",{staticStyle:{width:"100%",height:"100%"},attrs:{src:e.src,frameborder:"no",scrolling:"auto"}})])},r=[],a={props:{src:{type:String,required:!0}},data:function(){return{height:document.documentElement.clientHeight-94.5+"px;",loading:!0,url:this.src}},mounted:function(){var e=this;setTimeout((function(){e.loading=!1}),300);var t=this;window.onresize=function(){t.height=document.documentElement.clientHeight-94.5+"px;"}}},o=a,u=n("2877"),c=Object(u["a"])(o,i,r,!1,null,null,null);t["a"]=c.exports},"4a49":function(e,t,n){"use strict";n.r(t);var i=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("i-frame",{attrs:{src:e.url}})},r=[],a=n("061b"),o={name:"Swagger",components:{iFrame:a["a"]},data:function(){return{url:"//swagger-ui/index.html"}}},u=o,c=n("2877"),l=Object(c["a"])(u,i,r,!1,null,null,null);t["default"]=l.exports}}]);