修改频率说明

修改包名

.gitignore

@@ -1,3 +1,4 @@
 .idea
 target\
-target/
+target/
+/WindDataTrans.iml

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

@@ -3,6 +3,8 @@ package com.dskj.znzn.transData.common.base;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
+import java.util.Collection;
+
 @ApiModel(description = "返回结果")
 @Data
 public class R<T> {
@@ -10,42 +12,47 @@ public class R<T> {
     private int code;
     private String message;
     private T datas;
+    private long total;
 
-    public R(int code, T datas) {
+    public R(int code, String message, T datas) {
         this.code = code;
         this.message = message;
         this.datas = datas;
     }
 
-    public R(int code, String message, T datas) {
+    public R(int code, String message, T datas,long total) {
         this.code = code;
         this.message = message;
         this.datas = datas;
+        this.total = total;
     }
 
     public static R ok() {
-        return new R(200, "success", null);
+        return ok(200, "success", null);
     }
 
     public static <T> R<T> ok(T datas) {
-        return new R(200, "success", datas);
+        return ok(200, "success", datas);
     }
 
     public static <T> R<T> ok(String message, T datas) {
-        return new R(200, message, datas);
+        return ok(200, message, datas);
     }
 
 
     public static <T> R<T> ok(int code, String message, T datas) {
+        if (datas instanceof Collection) {
+            return new R(code, message, datas,((Collection) datas).size());
+        }
         return new R(code, message, datas);
     }
 
     public static R error() {
-        return new R(500, "fail", null);
+        return error(500, "fail");
     }
 
     public static R error(String message) {
-        return new R(500, message, null);
+        return error(500, message);
     }
 
 

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

@@ -1,10 +1,10 @@
 
-package com.dskj.znzn.transData.web.WaveData.controller;
+package com.dskj.znzn.transData.web.waveData.controller;
 
 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.service.IWaveDataService;
+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.service.IWaveDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

src/main/java/com/dskj/znzn/transData/web/WaveData/entity/WaveData.java → src/main/java/com/dskj/znzn/transData/web/waveData/entity/WaveData.java

@@ -1,5 +1,5 @@
 
-package com.dskj.znzn.transData.web.WaveData.entity;
+package com.dskj.znzn.transData.web.waveData.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -31,7 +31,7 @@ public class WaveData implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date timeStamp;
 
-    @ApiModelProperty("采样频率")
+    @ApiModelProperty("分析频率")
     private String samplingFrequency;
 
     @ApiModelProperty("测点名称")

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

@@ -1,5 +1,5 @@
 
-package com.dskj.znzn.transData.web.WaveData.indata;
+package com.dskj.znzn.transData.web.waveData.indata;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,7 +1,7 @@
-package com.dskj.znzn.transData.web.WaveData.mapper;
+package com.dskj.znzn.transData.web.waveData.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dskj.znzn.transData.web.WaveData.entity.WaveData;
+import com.dskj.znzn.transData.web.waveData.entity.WaveData;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

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

@@ -1,8 +1,8 @@
-package com.dskj.znzn.transData.web.WaveData.service;
+package com.dskj.znzn.transData.web.waveData.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-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.entity.WaveData;
+import com.dskj.znzn.transData.web.waveData.indata.GetMesureDataInData;
 
 import java.util.List;
 

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

@@ -1,12 +1,12 @@
 
-package com.dskj.znzn.transData.web.WaveData.service.impl;
+package com.dskj.znzn.transData.web.waveData.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.mapper.WaveDataMapper;
-import com.dskj.znzn.transData.web.WaveData.service.IWaveDataService;
+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.mapper.WaveDataMapper;
+import com.dskj.znzn.transData.web.waveData.service.IWaveDataService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/resources/mapper/WaveDataMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dskj.znzn.transData.web.WaveData.mapper.WaveDataMapper">
 
-    <select id="getMesureData" resultType="com.dskj.znzn.transData.web.WaveData.entity.WaveData">
+    <select id="getMesureData" resultType="com.dskj.znzn.transData.web.waveData.entity.WaveData">
 
         select id,wind_turbine_number,wind_turbine_name,time_stamp,sampling_frequency,mesure_point_name from
         ${windCode}
@@ -19,7 +19,7 @@
         order by time_stamp asc
 
     </select>
-    <select id="getById" resultType="com.dskj.znzn.transData.web.WaveData.entity.WaveData">
+    <select id="getById" resultType="com.dskj.znzn.transData.web.waveData.entity.WaveData">
         select *
         from ${windCode}
         where id = #{id}