Skip to content

A
amos-boot-biz
Commit 0c4bda43 authored by wujiang's avatar wujiang
Browse files
Options

添加信号曲线接口

parent bf1a96c7
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 36 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpInvertorElecHistoryAllDto.java
View file @ 0c4bda43
......@@ -25,27 +25,21 @@ public class JpInvertorElecHistoryAllDto extends BaseDto {
private String snCode;
@ApiModelProperty(value = "U交流电压")
@TableField("U_AC_voltage")
private Double uAcVoltage;
@ApiModelProperty(value = "V交流电压")
@TableField("V_AC_voltage")
private Double vAcVoltage;
@ApiModelProperty(value = "W交流电压")
@TableField("W_AC_voltage")
private Double wAcVoltage;
@ApiModelProperty(value = "U交流电流")
@TableField("U_AC_current")
private Double uAcCurrent;
@ApiModelProperty(value = "V交流电流")
@TableField("V_AC_current")
private Double vAcCurrent;
@ApiModelProperty(value = "W交流电流")
@TableField("W_AC_current")
private Double wAcCurrent;
@ApiModelProperty(value = "第三方电站id")
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpInvertorElecHistoryMonthDto.java
View file @ 0c4bda43
......@@ -25,27 +25,21 @@ public class JpInvertorElecHistoryMonthDto extends BaseDto {
private String snCode;
@ApiModelProperty(value = "U交流电压")
@TableField("U_AC_voltage")
private Double uAcVoltage;
@ApiModelProperty(value = "V交流电压")
@TableField("V_AC_voltage")
private Double vAcVoltage;
@ApiModelProperty(value = "W交流电压")
@TableField("W_AC_voltage")
private Double wAcVoltage;
@ApiModelProperty(value = "U交流电流")
@TableField("U_AC_current")
private Double uAcCurrent;
@ApiModelProperty(value = "V交流电流")
@TableField("V_AC_current")
private Double vAcCurrent;
@ApiModelProperty(value = "W交流电流")
@TableField("W_AC_current")
private Double wAcCurrent;
@ApiModelProperty(value = "第三方电站id")
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpInvertorElecHistoryYearDto.java
View file @ 0c4bda43
......@@ -25,27 +25,21 @@ public class JpInvertorElecHistoryYearDto extends BaseDto {
private String snCode;
@ApiModelProperty(value = "U交流电压")
@TableField("U_AC_voltage")
private Double uAcVoltage;
@ApiModelProperty(value = "V交流电压")
@TableField("V_AC_voltage")
private Double vAcVoltage;
@ApiModelProperty(value = "W交流电压")
@TableField("W_AC_voltage")
private Double wAcVoltage;
@ApiModelProperty(value = "U交流电流")
@TableField("U_AC_current")
private Double uAcCurrent;
@ApiModelProperty(value = "V交流电流")
@TableField("V_AC_current")
private Double vAcCurrent;
@ApiModelProperty(value = "W交流电流")
@TableField("W_AC_current")
private Double wAcCurrent;
@ApiModelProperty(value = "第三方电站id")
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/TdHygfJpCollectorHistoryMapper.java
View file @ 0c4bda43
......@@ -5,6 +5,9 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorHistoryAllDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorHistoryMonthDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorHistoryYearDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpCollectorHistoryDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpCollectorHistory;
......@@ -20,12 +23,12 @@ public interface TdHygfJpCollectorHistoryMapper extends BaseMapper<TdHygfJpColle
@Param("thirdStationId") String thirdStationId, @Param("startTime") long startTime,
@Param("endTime") long endTime);
List<TdHygfJpCollectorHistoryDto> monthList(@Param("snCode") String snCode,
List<JpCollectorHistoryMonthDto> monthList(@Param("snCode") String snCode,
@Param("thirdStationId") String thirdStationId, @Param("month") String month);
List<TdHygfJpCollectorHistoryDto> yearList(@Param("snCode") String snCode,
List<JpCollectorHistoryYearDto> yearList(@Param("snCode") String snCode,
@Param("thirdStationId") String thirdStationId, @Param("year") String year);
List<TdHygfJpCollectorHistoryDto> allList(@Param("snCode") String snCode,
List<JpCollectorHistoryAllDto> allList(@Param("snCode") String snCode,
@Param("thirdStationId") String thirdStationId);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpCollectorHistoryMapper.xml
View file @ 0c4bda43
......@@ -15,7 +15,7 @@
</if>
</where>
</select>
<select id="monthList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpCollectorHistoryMonthDto">
<select id="monthList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorHistoryMonthDto">
SELECT * FROM house_pv_data.td_hygf_jp_collector_history_month
<where>
<if test="snCode!=null">
......@@ -29,8 +29,8 @@
</if>
</where>
</select>
<select id="yearList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpCollectorHistoryYearDto">
SELECT * FROM house_pv_data.td_hygf_jp_collector_history_month
<select id="yearList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorHistoryYearDto">
SELECT * FROM house_pv_data.td_hygf_jp_collector_history_year
<where>
<if test="snCode!=null">
AND `sn_code` = #{snCode}
......@@ -43,8 +43,8 @@
</if>
</where>
</select>
<select id="yearList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpCollectorHistoryAllDto">
SELECT * FROM house_pv_data.td_hygf_jp_collector_history_month
<select id="allList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorHistoryAllDto">
SELECT * FROM house_pv_data.td_hygf_jp_collector_history_all
<where>
<if test="snCode!=null">
AND `sn_code` = #{snCode}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpCollectorHistoryController.java
View file @ 0c4bda43
......@@ -23,8 +23,10 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorHistoryAllDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorHistoryMonthDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorHistoryYearDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpCollectorHistoryDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpCollectorHistory;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.TdHygfJpCollectorHistoryServiceImpl;
import io.swagger.annotations.Api;
......@@ -140,7 +142,7 @@ public class TdHygfJpCollectorHistoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "户用光伏监盘采集器历史表列表全部数据查询", notes = "户用光伏监盘采集器历史表列表全部数据查询")
@GetMapping(value = "/list/month")
public ResponseModel<List<TdHygfJpCollectorHistoryDto>> monthList(@RequestParam(value = "id") long id,
public ResponseModel<List<JpCollectorHistoryMonthDto>> monthList(@RequestParam(value = "id") long id,
@RequestParam(value = "month") @DateTimeFormat(pattern = "yyyy-MM") Date month) {
return ResponseHelper.buildResponse(tdHygfJpCollectorHistoryServiceImpl.monthList(id, month));
}
......@@ -153,7 +155,7 @@ public class TdHygfJpCollectorHistoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "户用光伏监盘采集器历史表列表全部数据查询", notes = "户用光伏监盘采集器历史表列表全部数据查询")
@GetMapping(value = "/list/year")
public ResponseModel<List<TdHygfJpCollectorHistoryDto>> yearList(@RequestParam(value = "id") long id,
public ResponseModel<List<JpCollectorHistoryYearDto>> yearList(@RequestParam(value = "id") long id,
@RequestParam(value = "year") @DateTimeFormat(pattern = "yyyy") Date year) {
return ResponseHelper.buildResponse(tdHygfJpCollectorHistoryServiceImpl.yearList(id, year));
}
......@@ -166,7 +168,7 @@ public class TdHygfJpCollectorHistoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "户用光伏监盘采集器历史表列表全部数据查询", notes = "户用光伏监盘采集器历史表列表全部数据查询")
@GetMapping(value = "/list/all")
public ResponseModel<List<TdHygfJpCollectorHistoryDto>> allList(@RequestParam(value = "id") long id) {
public ResponseModel<List<JpCollectorHistoryAllDto>> allList(@RequestParam(value = "id") long id) {
return ResponseHelper.buildResponse(tdHygfJpCollectorHistoryServiceImpl.allList(id));
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/TdHygfJpCollectorHistoryServiceImpl.java
View file @ 0c4bda43
......@@ -9,13 +9,13 @@ import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorHistoryAllDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorHistoryMonthDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorHistoryYearDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpCollectorHistoryDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.JpCollector;
import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpCollectorHistory;
import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpCollectorHistoryService;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.JpCollectorHistoryAllMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.JpCollectorHistoryMonthMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.JpCollectorHistoryYearMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpCollectorHistoryMapper;
import com.yeejoin.amos.boot.module.hygf.api.util.TimeUtil;
......@@ -57,7 +57,7 @@ public class TdHygfJpCollectorHistoryServiceImpl
/**
* 列表查询 示例
*/
public List<TdHygfJpCollectorHistoryDto> monthList(long id, Date month) {
public List<JpCollectorHistoryMonthDto> monthList(long id, Date month) {
JpCollector collector = jpCollectorServiceImpl.getById(id);
if (collector != null) {
......@@ -70,7 +70,7 @@ public class TdHygfJpCollectorHistoryServiceImpl
/**
* 列表查询 示例
*/
public List<TdHygfJpCollectorHistoryDto> yearList(long id, Date year) {
public List<JpCollectorHistoryYearDto> yearList(long id, Date year) {
JpCollector collector = jpCollectorServiceImpl.getById(id);
if (collector != null) {
......@@ -83,7 +83,7 @@ public class TdHygfJpCollectorHistoryServiceImpl
/**
* 列表查询 示例
*/
public List<TdHygfJpCollectorHistoryDto> allList(long id) {
public List<JpCollectorHistoryAllDto> allList(long id) {
JpCollector collector = jpCollectorServiceImpl.getById(id);
if (collector != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment