添加震动相关接口(健康模块)

src/main/java/com/dskj/znzn/transData/common/base/PageR.java

@@ -35,4 +35,9 @@ public class PageR<T> {
         return new PageR(page.getPages(), page.getTotal(), datas);
     }
 
+
+    public static <T> PageR<T> page(IPage<T> page) {
+        return new PageR(page.getPages(), page.getTotal(), page.getRecords());
+    }
+
 }

src/main/java/com/dskj/znzn/transData/common/filter/AppInterceptor.java

@@ -33,8 +33,8 @@ import java.util.UUID;
 @Slf4j
 public class AppInterceptor implements HandlerInterceptor {
 
-    @Resource
-    private RedisService redisService;
+//    @Resource
+//    private RedisService redisService;
 
     private static final String BEGIN_REQUEST_TIME = "BEGIN_REQUEST_TIME";
     private static final String TRACE_ID = "TRACE_ID";
@@ -91,11 +91,11 @@ public class AppInterceptor implements HandlerInterceptor {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            String result = redisService.get(String.format("zhzn_energy_system_user_login_info:%s", userName));
-            if (StringUtils.isNotBlank(result) && result.equals(token)) {
-                currentUser.setUserId(userId);
-                currentUser.setUserName(userName);
-            }
+//            String result = redisService.get(String.format("zhzn_energy_system_user_login_info:%s", userName));
+//            if (StringUtils.isNotBlank(result) && result.equals(token)) {
+//                currentUser.setUserId(userId);
+//                currentUser.setUserName(userName);
+//            }
         }
 
         boolean loginFlag = true;

src/main/java/com/dskj/znzn/transData/crontab/UpdadePlatformData.java

@@ -1,25 +1,25 @@
-package com.dskj.znzn.transData.crontab;
-
-import com.dskj.znzn.transData.web.dataTransfer.mapper.WindFarmDayCountMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-@RequiredArgsConstructor(onConstructor = @__({@Autowired}))
-@Slf4j
-public class UpdadePlatformData {
-
-    private final WindFarmDayCountMapper windFarmDayCountMapper;
-
-//    @Scheduled(cron = "0 0 1 * * ?")
-//    public void updateTime() {
+//package com.dskj.znzn.transData.crontab;
 //
-//        List<PlatformAutoAnalysisTimeOutData> datas = windFarmDayCountMapper.platformAutoAnalysisTime();
+//import com.dskj.znzn.transData.web.dataTransfer.mapper.WindFarmDayCountMapper;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
 //
-//        System.out.println(JSON.toJSON(datas));
-//        if (!datas.isEmpty()) {
-//        }
-//    }
-}
+//@Component
+//@RequiredArgsConstructor(onConstructor = @__({@Autowired}))
+//@Slf4j
+//public class UpdadePlatformData {
+//
+//    private final WindFarmDayCountMapper windFarmDayCountMapper;
+//
+////    @Scheduled(cron = "0 0 1 * * ?")
+////    public void updateTime() {
+////
+////        List<PlatformAutoAnalysisTimeOutData> datas = windFarmDayCountMapper.platformAutoAnalysisTime();
+////
+////        System.out.println(JSON.toJSON(datas));
+////        if (!datas.isEmpty()) {
+////        }
+////    }
+//}

src/main/java/com/dskj/znzn/transData/web/dataTransfer/inData/HistoryDataSummaryInData.java

@@ -19,4 +19,18 @@ public class HistoryDataSummaryInData {
 
     @ApiModelProperty("结束时间")
     private String endDate;
+
+    public String getBeginDate() {
+        if (null == beginDate || beginDate.isEmpty()) {
+            return null;
+        }
+        return beginDate + " 00:00:00";
+    }
+
+    public String getEndDate() {
+        if (null == endDate || endDate.isEmpty()) {
+            return null;
+        }
+        return endDate + " 23:59:59";
+    }
 }

src/main/java/com/dskj/znzn/transData/web/dataTransfer/service/impl/WindFarmDayCountServiceImpl.java

@@ -49,6 +49,7 @@ public class WindFarmDayCountServiceImpl extends ServiceImpl<WindFarmDayCountMap
         queryWrapper.eq(WindFarmDayCount::getAddDate, dateFormat.format(new Date()));
         queryWrapper.eq(WindFarmDayCount::getDelStatus, 0);
         queryWrapper.eq(WindFarmDayCount::getSyncStatus, 0);
+        queryWrapper.orderByDesc(WindFarmDayCount::getWindFarmCode);
         List<WindFarmDayCount> datas = list(queryWrapper);
         for (WindFarmDayCount data : datas) {
             data.setTypeName(sysConfService.getValueByType("trans_type", data.getType()));

src/main/java/com/dskj/znzn/transData/web/transConf/controller/TransConfController.java

@@ -31,7 +31,6 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/transConf")
-@NeedLogin
 @RequiredArgsConstructor(onConstructor = @__({@Autowired}))
 @Api(tags = "点检表接口")
 public class TransConfController {

src/main/java/com/dskj/znzn/transData/web/waveData/controller/WaveDataController.java

@@ -1,9 +1,11 @@
 
 package com.dskj.znzn.transData.web.waveData.controller;
 
+import com.dskj.znzn.transData.common.base.PageR;
 import com.dskj.znzn.transData.common.base.R;
 import com.dskj.znzn.transData.web.waveData.entity.WaveData;
 import com.dskj.znzn.transData.web.waveData.indata.GetMesureDataInData;
+import com.dskj.znzn.transData.web.waveData.indata.GetMesureWithSFDataInData;
 import com.dskj.znzn.transData.web.waveData.service.IWaveDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,9 +29,22 @@ public class WaveDataController {
         return R.ok(this.waveDataService.getMesureData(inData));
     }
 
+    @PostMapping({"getMesureDataWithSF"})
+    @ApiOperation("获取测点数据-添加采样频率")
+    public PageR<WaveData> getMesureDataWithSF(@RequestBody @Valid GetMesureWithSFDataInData inData) {
+        return this.waveDataService.getMesureDataWithSF(inData);
+    }
+
+
     @GetMapping({"/{windCode}/{id}"})
     @ApiOperation("根据ID获取测点数据")
     public R<WaveData> getById(@PathVariable String windCode, @PathVariable Integer id) {
         return R.ok(this.waveDataService.getById(windCode, id));
     }
+
+    @GetMapping("/getAllSamplingFrequency/{windCode}")
+    @ApiOperation("获取风场所有采样频率")
+    public R<List<String>> getAllSamplingFrequency(@PathVariable String windCode) {
+        return R.ok(waveDataService.getAllSamplingFrequency(windCode));
+    }
 }

src/main/java/com/dskj/znzn/transData/web/waveData/indata/GetMesureDataInData.java

@@ -32,5 +32,4 @@ public class GetMesureDataInData {
     @ApiModelProperty("测点,数组")
     @NotEmpty(message = "必须选择测点")
     private List<String> mesureNameList;
-
 }

src/main/java/com/dskj/znzn/transData/web/waveData/indata/GetMesureWithSFDataInData.java

@@ -0,0 +1,40 @@
+
+package com.dskj.znzn.transData.web.waveData.indata;
+
+import com.dskj.znzn.transData.common.base.PageInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@ApiModel
+@Data
+public class GetMesureWithSFDataInData extends PageInfo {
+
+    @ApiModelProperty("风场编号")
+    @NotBlank(message = "风场编号不能为空")
+    private String windCode;
+
+    @ApiModelProperty("风机编号,数组")
+    @NotEmpty(message = "必须选择风机")
+    private List<String> windTurbineNumberList;
+
+    @ApiModelProperty("开始时间,yyyy-MM-dd HH:mm:ss")
+    @NotBlank(message = "开始时间不能为空")
+    private String startTime;
+
+    @ApiModelProperty("结束时间,yyyy-MM-dd hh:mm:ss")
+    @NotBlank(message = "结束时间不能为空")
+    private String endTime;
+
+    @ApiModelProperty("测点,数组")
+    @NotEmpty(message = "必须选择测点")
+    private List<String> mesureNameList;
+
+    @ApiModelProperty("采样频率")
+    @NotBlank(message = "采样频率不能为空")
+    private String samplingFrequency;
+}

src/main/java/com/dskj/znzn/transData/web/waveData/mapper/WaveDataMapper.java

@@ -1,7 +1,9 @@
 package com.dskj.znzn.transData.web.waveData.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dskj.znzn.transData.web.waveData.entity.WaveData;
+import com.dskj.znzn.transData.web.waveData.indata.GetMesureWithSFDataInData;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -12,4 +14,8 @@ public interface WaveDataMapper extends BaseMapper<WaveData> {
     List<WaveData> getMesureData(String windCode, List<String> windTurbineNumberList, String startTime, String endTime, List<String> mesureNameList);
 
     WaveData getById(String windCode, Integer id);
+
+    Page<WaveData> getMesureDataWithSF(Page<WaveData> page, GetMesureWithSFDataInData inData);
+
+    List<String> getAllSamplingFrequency(String windCode);
 }

src/main/java/com/dskj/znzn/transData/web/waveData/service/IWaveDataService.java

@@ -1,8 +1,10 @@
 package com.dskj.znzn.transData.web.waveData.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dskj.znzn.transData.common.base.PageR;
 import com.dskj.znzn.transData.web.waveData.entity.WaveData;
 import com.dskj.znzn.transData.web.waveData.indata.GetMesureDataInData;
+import com.dskj.znzn.transData.web.waveData.indata.GetMesureWithSFDataInData;
 
 import java.util.List;
 
@@ -10,4 +12,8 @@ public interface IWaveDataService extends IService<WaveData> {
     List<WaveData> getMesureData(GetMesureDataInData inData);
 
     WaveData getById(String windCode, Integer id);
+
+    PageR<WaveData> getMesureDataWithSF(GetMesureWithSFDataInData inData);
+
+    List<String> getAllSamplingFrequency(String windCode);
 }

src/main/java/com/dskj/znzn/transData/web/waveData/service/impl/WaveDataServiceImpl.java

@@ -1,10 +1,13 @@
 
 package com.dskj.znzn.transData.web.waveData.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dskj.znzn.transData.common.base.PageR;
 import com.dskj.znzn.transData.common.exception.BusinessException;
 import com.dskj.znzn.transData.web.waveData.entity.WaveData;
 import com.dskj.znzn.transData.web.waveData.indata.GetMesureDataInData;
+import com.dskj.znzn.transData.web.waveData.indata.GetMesureWithSFDataInData;
 import com.dskj.znzn.transData.web.waveData.mapper.WaveDataMapper;
 import com.dskj.znzn.transData.web.waveData.service.IWaveDataService;
 import lombok.RequiredArgsConstructor;
@@ -34,4 +37,27 @@ public class WaveDataServiceImpl extends ServiceImpl<WaveDataMapper, WaveData> i
             return this.waveDataMapper.getById(windCode + "_wave", id);
         }
     }
+
+    @Override
+    public PageR<WaveData> getMesureDataWithSF(GetMesureWithSFDataInData inData) {
+        if (inData.getWindCode().contains(" ")) {
+            throw new BusinessException("风场参数异常");
+        } else {
+            Page<WaveData> queryPage = Page.of(inData.getPageNo(), inData.getPageSize());
+            inData.setWindCode(inData.getWindCode() + "_wave");
+            Page<WaveData> pageData = this.waveDataMapper.getMesureDataWithSF(queryPage, inData);
+            return PageR.page(pageData);
+        }
+    }
+
+    @Override
+    public List<String> getAllSamplingFrequency(String windCode) {
+
+        if (windCode.contains(" ")) {
+            throw new BusinessException("风场参数异常");
+        } else {
+            windCode = windCode + "_wave";
+            return waveDataMapper.getAllSamplingFrequency(windCode);
+        }
+    }
 }

src/main/resources/application-huadian.yml

@@ -0,0 +1,44 @@
+server:
+  port: 9002
+
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1:4000/energy_data?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false
+    username: root
+    password: 123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    druid:
+      initial-size: 30
+      log-abandoned: false
+      max-active: 300
+      max-wait: 600000
+      min-idle: 20
+      pool-prepared-statements: false
+      remove-abandoned: false
+      remove-abandoned-timeout-millis: 3000
+      stat:
+        log-slow-sql: true
+        merge-sql: true
+        slow-sql-millis: 2000
+      test-on-borrow: false
+      test-on-return: false
+      test-while-idle: true
+      time-between-eviction-runs-millis: 60000
+      validation-query: SELECT 'x'
+
+
+knife4j:
+  enable: true
+  setting:
+    language: zh-CN
+    swagger-model-name: 模型
+  basic:
+    enable: true
+    username: znzn
+    password: znzn_prod
+
+logging:
+  level:
+    com.dskj.znzn.transData.web.transConf.mapper: debug
+    com.dskj.znzn.transData.web.waveData.mapper: debug
+  config: classpath:logback-prod.xml

src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 9001
 spring:
   profiles:
-    active: dev
+    active: prod
 
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -26,7 +26,6 @@ spring:
       validation-query: SELECT 'x'
 
 
-
 logging:
   level:
     com.dskj.znzn.transData.web.transConf.mapper: debug

src/main/resources/logback-prod.xml

@@ -5,7 +5,7 @@
     <property name="CHARSET" value="utf-8"/>
     <property name="MAX_FILE_SIZE" value="200MB"/>
     <property name="MAX_HISTORY" value="30"/>
-    <property name="BASE_LOG_PATH" value="/data/logs"/>
+    <property name="BASE_LOG_PATH" value="/home/trans/project/logs"/>
     <property name="SERVICE_NAME" value="WindDataTrans"/>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">

src/main/resources/mapper/WaveDataMapper.xml

@@ -25,4 +25,28 @@
         from ${windCode}
         where id = #{id}
     </select>
+    <select id="getMesureDataWithSF" resultType="com.dskj.znzn.transData.web.waveData.entity.WaveData">
+
+        select id,wind_turbine_number,wind_turbine_name,time_stamp,rotational_speed,sampling_frequency,mesure_point_name
+        from
+        ${inData.windCode}
+        where
+        time_stamp between #{inData.startTime} and #{inData.endTime}
+        and wind_turbine_number in
+        <foreach collection="inData.windTurbineNumberList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and mesure_point_name in
+        <foreach collection="inData.mesureNameList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and sampling_frequency = #{inData.samplingFrequency}
+        order by time_stamp asc
+
+    </select>
+
+    <select id="getAllSamplingFrequency" resultType="java.lang.String">
+        select distinct sampling_frequency
+        from ${windCode}
+    </select>
 </mapper>

src/main/resources/mapper/WindFarmDayCountMapper.xml

@@ -64,6 +64,7 @@
         t.wind_farm_name,
         t.type,
         a.param_value
+        ORDER BY t.wind_farm_code,t.type
     </select>
 
     <select id="getIndexOnlineData"
@@ -82,7 +83,7 @@
                 AND t.sync_status = 1
                 AND t.del_status = 0
               GROUP BY t.wind_farm_code, t.wind_farm_name, t.type, a.param_value) b
-        GROUP BY b.wind_farm_code, b.wind_farm_name;
-
+        GROUP BY b.wind_farm_code, b.wind_farm_name
+        ORDER BY b.wind_farm_code
     </select>
 </mapper>