新增查询接口列表功能

main
田俊彪 5 months ago
parent 86f4e54eaa
commit 4a03939429

@ -3,9 +3,9 @@ package com.cuit.solarenergy.controller;
import com.cuit.solarenergy.base.annotation.AopLog; import com.cuit.solarenergy.base.annotation.AopLog;
import com.cuit.solarenergy.base.annotation.AuthToken; import com.cuit.solarenergy.base.annotation.AuthToken;
import com.cuit.solarenergy.entity.*; import com.cuit.solarenergy.entity.*;
import com.cuit.solarenergy.entity.vo.ret.ElementValueRet; import com.cuit.solarenergy.entity.vo.req.DataQueryGetVoReq;
import com.cuit.solarenergy.entity.vo.ret.RetResponse; import com.cuit.solarenergy.entity.vo.req.SiteListVoReq;
import com.cuit.solarenergy.entity.vo.ret.RetResult; import com.cuit.solarenergy.entity.vo.ret.*;
import com.cuit.solarenergy.exception.ParamsException; import com.cuit.solarenergy.exception.ParamsException;
import com.cuit.solarenergy.service.DataImportService; import com.cuit.solarenergy.service.DataImportService;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@ -17,6 +17,7 @@ import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -258,4 +259,29 @@ public class DataController {
return RetResponse.makeErrRsp("获取当前时间失败!"+e.getMessage()); return RetResponse.makeErrRsp("获取当前时间失败!"+e.getMessage());
} }
} }
@AopLog
@AuthToken
@ApiOperation("11、获取站点列表信息")
@PreAuthorize("hasAuthority('minio:upload')")
@RequestMapping(value = "/dataimport/getSiteListInfo", method = {RequestMethod.POST})
@ApiResponses({
@ApiResponse(code = 200, message = "成功"),
@ApiResponse(code = 401, message = "访问未经授权"),
@ApiResponse(code = 403, message = "访问被禁止的"),
@ApiResponse(code = 404, message = "未找到访问接口"),
@ApiResponse(code = 500, message = "服务器内部错误"),
@ApiResponse(code = 900, message = "失败")
})
public RetResult<PageVo<SiteListVoRet>> getSiteListInfo(@RequestBody SiteListVoReq siteListVoReq) {
PageVo<SiteListVoRet> statisticQueryVoRetPageVo;
try {
statisticQueryVoRetPageVo = dataImportService.getSiteListInfo(siteListVoReq);
return RetResponse.makeOKRsp(statisticQueryVoRetPageVo);
} catch (ParamsException paramsException) {
return RetResponse.makeErrRsp(paramsException.getMessage());
} catch (Exception e) {
e.printStackTrace();
return RetResponse.makeErrRsp("服务器异常.....");
}
}
} }

@ -1,76 +1,76 @@
//package com.cuit.solarenergy.controller; package com.cuit.solarenergy.controller;
//
//import com.cuit.solarenergy.base.annotation.AopLog; import com.cuit.solarenergy.base.annotation.AopLog;
//import com.cuit.solarenergy.base.annotation.AuthToken; import com.cuit.solarenergy.base.annotation.AuthToken;
//import com.cuit.solarenergy.entity.vo.req.DataQueryGetVoReq; import com.cuit.solarenergy.entity.vo.req.DataQueryGetVoReq;
//import com.cuit.solarenergy.entity.vo.ret.*; import com.cuit.solarenergy.entity.vo.ret.*;
//import com.cuit.solarenergy.exception.ParamsException; import com.cuit.solarenergy.exception.ParamsException;
//import com.cuit.solarenergy.service.DataManagerService; import com.cuit.solarenergy.service.DataManagerService;
//import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
//import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport;
//import io.swagger.annotations.Api; import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
//import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponse;
//import io.swagger.annotations.ApiResponses; import io.swagger.annotations.ApiResponses;
//import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
//import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
//import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
//import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
//import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
//import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
//
//import javax.annotation.Resource; import javax.annotation.Resource;
//
///** /**
// * @BelongsProject: railway * @BelongsProject: railway
// * @BelongsPackage: com.cuit.railway.controller * @BelongsPackage: com.cuit.railway.controller
// * @Author: Luolw * @Author: Luolw
// * @Date: 2023/8/4 9:45 * @Date: 2023/8/4 9:45
// * @Description: * @Description:
// */ */
//
//
//@Api(tags = "9、数据查询模块") @Api(tags = "9、数据查询模块")
//@ApiSupport(order = 9) @ApiSupport(order = 9)
//@Slf4j @Slf4j
//@RestController() @RestController()
//@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
//public class DataQueryController { public class DataQueryController {
// @Resource @Resource
// private DataManagerService dataManagerService; private DataManagerService dataManagerService;
//
// /** /**
// * @Description: 数据查询-采样点查询 * @Description: -
// * @Param: DataQueryGetVoReq * @Param: DataQueryGetVoReq
// * @return: DataManageGetVoRetList * @return: DataManageGetVoRetList
// * @Author: LuoSir * @Author: LuoSir
// * @Date: 2023/8/4 * @Date: 2023/8/4
// */ */
// @AuthToken @AuthToken
// @AopLog @AopLog
// @ApiOperationSupport(order = 1) @ApiOperationSupport(order = 1)
// @ApiOperation("1、数据查询-采样点查询接口") @ApiOperation("1、数据查询-采样点查询接口")
// @PreAuthorize("hasAuthority('data:query:getSamplePointData')") @PreAuthorize("hasAuthority('data:query:getSamplePointData')")
// @RequestMapping(value = "/data/query/getSamplePointData", method = {RequestMethod.POST}) @RequestMapping(value = "/data/query/getSamplePointData", method = {RequestMethod.POST})
// @ApiResponses({ @ApiResponses({
// @ApiResponse(code = 200, message = "成功"), @ApiResponse(code = 200, message = "成功"),
// @ApiResponse(code = 401, message = "访问未经授权"), @ApiResponse(code = 401, message = "访问未经授权"),
// @ApiResponse(code = 403, message = "访问被禁止的"), @ApiResponse(code = 403, message = "访问被禁止的"),
// @ApiResponse(code = 404, message = "未找到访问接口"), @ApiResponse(code = 404, message = "未找到访问接口"),
// @ApiResponse(code = 500, message = "服务器内部错误"), @ApiResponse(code = 500, message = "服务器内部错误"),
// @ApiResponse(code = 900, message = "失败") @ApiResponse(code = 900, message = "失败")
// }) })
// public RetResult<PageVo<StatisticQueryVoRet>> getSamplePointData(@RequestBody DataQueryGetVoReq dataQueryGetVoReq) { public RetResult<PageVo<StatisticQueryVoRet>> getSamplePointData(@RequestBody DataQueryGetVoReq dataQueryGetVoReq) {
// PageVo<StatisticQueryVoRet> statisticQueryVoRetPageVo; PageVo<StatisticQueryVoRet> statisticQueryVoRetPageVo;
// try { try {
// statisticQueryVoRetPageVo = dataManagerService.getSamplePointData(dataQueryGetVoReq); statisticQueryVoRetPageVo = dataManagerService.getSamplePointData(dataQueryGetVoReq);
// return RetResponse.makeOKRsp(statisticQueryVoRetPageVo); return RetResponse.makeOKRsp(statisticQueryVoRetPageVo);
// } catch (ParamsException paramsException) { } catch (ParamsException paramsException) {
// return RetResponse.makeErrRsp(paramsException.getMessage()); return RetResponse.makeErrRsp(paramsException.getMessage());
// } catch (Exception e) { } catch (Exception e) {
// e.printStackTrace(); e.printStackTrace();
// return RetResponse.makeErrRsp("服务器异常....."); return RetResponse.makeErrRsp("服务器异常.....");
// } }
// } }
//} }

@ -0,0 +1,40 @@
package com.cuit.solarenergy.entity.vo.req;
import com.cuit.solarenergy.base.BasePageQuery;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.format.annotation.DateTimeFormat;
import static com.cuit.solarenergy.utils.DateUtil.DATE_FORMAT;
/**
* @BelongsProject: railway
* @BelongsPackage: com.cuit.solarenergy.entity.vo.req
* @Author: Luolw
* @Date: 2023/8/4 10:01
* @Description:
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel(description = "站点详情类")
public class SiteListVoReq extends BasePageQuery {
@ApiModelProperty(value = "站点名")
private String siteName;
@ApiModelProperty(value = "数据类型")
private String dataType;
@ApiModelProperty(value = "开始时间")
@DateTimeFormat(pattern = DATE_FORMAT)
private String startTime;
@ApiModelProperty(value = "结束时间")
@DateTimeFormat(pattern = DATE_FORMAT)
private String endTime;
}

@ -0,0 +1,35 @@
package com.cuit.solarenergy.entity.vo.ret;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author: Tjb
* @CreateTime: 2023-07-15 14:37
* @Description:
* @Version: 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel(description = "站点信息返回类")
public class SiteListVoRet {
@ApiModelProperty("站点名称")
private String siteName;
@ApiModelProperty("类型")
private String dataType;
@ApiModelProperty("数据时间")
private String dataTime;
@ApiModelProperty("小时")
private String dataHour;
@ApiModelProperty("数据值")
private String dataValue;
}

@ -2,8 +2,10 @@ package com.cuit.solarenergy.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cuit.solarenergy.entity.ElementRet; import com.cuit.solarenergy.entity.ElementRet;
import com.cuit.solarenergy.entity.radi_chn_mul_hor; import com.cuit.solarenergy.entity.radi_chn_mul_hor;
import com.cuit.solarenergy.entity.vo.ret.SiteListVoRet;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
@ -22,6 +24,13 @@ public interface radi_chn_mul_horMapper extends BaseMapper<radi_chn_mul_hor> {
* @return * @return
*/ */
List<ElementRet> getElementInfo(); List<ElementRet> getElementInfo();
Page<SiteListVoRet> getSiteListInfo(Page<SiteListVoRet> page, String dataType);
Page<SiteListVoRet> getSiteListInfo1(Page<SiteListVoRet> page, String dataType);
Page<SiteListVoRet> getSiteListInfo2(Page<SiteListVoRet> page, String dataType);
Page<SiteListVoRet> getSiteListInfo3(Page<SiteListVoRet> page, String dataType);
Page<SiteListVoRet> getSiteListInfo4(Page<SiteListVoRet> page, String dataType);
Page<SiteListVoRet> getSiteListInfo5(Page<SiteListVoRet> page, String dataType);
} }

@ -2,7 +2,10 @@ package com.cuit.solarenergy.service;
import com.cuit.solarenergy.entity.*; import com.cuit.solarenergy.entity.*;
import com.cuit.solarenergy.entity.vo.req.SiteListVoReq;
import com.cuit.solarenergy.entity.vo.ret.ElementValueRet; import com.cuit.solarenergy.entity.vo.ret.ElementValueRet;
import com.cuit.solarenergy.entity.vo.ret.PageVo;
import com.cuit.solarenergy.entity.vo.ret.SiteListVoRet;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -139,4 +142,5 @@ public interface DataImportService {
*/ */
List<ElementValueRet> getElementStatus(String element); List<ElementValueRet> getElementStatus(String element);
PageVo<SiteListVoRet> getSiteListInfo(SiteListVoReq siteListVoReq);
} }

@ -8,10 +8,15 @@ import com.alibaba.excel.read.metadata.ReadSheet;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cuit.solarenergy.config.LayerDispConfig; import com.cuit.solarenergy.config.LayerDispConfig;
import com.cuit.solarenergy.config.MyGeoServerConfig; import com.cuit.solarenergy.config.MyGeoServerConfig;
import com.cuit.solarenergy.entity.*; import com.cuit.solarenergy.entity.*;
import com.cuit.solarenergy.entity.vo.req.SiteListVoReq;
import com.cuit.solarenergy.entity.vo.ret.ElementValueRet; import com.cuit.solarenergy.entity.vo.ret.ElementValueRet;
import com.cuit.solarenergy.entity.vo.ret.PageVo;
import com.cuit.solarenergy.entity.vo.ret.SiteListVoRet;
import com.cuit.solarenergy.entity.vo.ret.StatisticQueryVoRet;
import com.cuit.solarenergy.exception.ParamsException; import com.cuit.solarenergy.exception.ParamsException;
import com.cuit.solarenergy.mapper.TGeoserverinfoMapper; import com.cuit.solarenergy.mapper.TGeoserverinfoMapper;
import com.cuit.solarenergy.mapper.TSamplingDataDetailsMapper; import com.cuit.solarenergy.mapper.TSamplingDataDetailsMapper;
@ -619,6 +624,27 @@ public class DataImportServiceImpl implements DataImportService {
} }
} }
@Override
public PageVo<SiteListVoRet> getSiteListInfo(SiteListVoReq siteListVoReq) {
Page<SiteListVoRet> page = new Page<>(siteListVoReq.getCurrent(), siteListVoReq.getSize());
if (siteListVoReq.getDataType().equals("总辐射辐照度")) {
page = radichnmulhorMapper.getSiteListInfo1(page, siteListVoReq.getDataType());
}
if (siteListVoReq.getDataType().equals("净辐射辐照度")) {
page = radichnmulhorMapper.getSiteListInfo2(page, siteListVoReq.getDataType());
}
if (siteListVoReq.getDataType().equals("直接辐射辐照度")) {
page = radichnmulhorMapper.getSiteListInfo3(page, siteListVoReq.getDataType());
}
if (siteListVoReq.getDataType().equals("散射辐射辐照度")) {
page = radichnmulhorMapper.getSiteListInfo4(page, siteListVoReq.getDataType());
}
if (siteListVoReq.getDataType().equals("反射辐射辐照度")) {
page = radichnmulhorMapper.getSiteListInfo5(page, siteListVoReq.getDataType());
}
//将records数据取出来
return new PageVo<>(page);
}
private String getURL(TGeoserverinfo geoBasedatageoserverinfo) { private String getURL(TGeoserverinfo geoBasedatageoserverinfo) {
String url = ""; String url = "";
String geoServerURL = ""; String geoServerURL = "";

@ -93,4 +93,60 @@
SELECT V14311 AS '总辐射辐照度', V14312 AS '净辐射辐照度', V14313 AS '直接辐射辐照度', V14314 AS '散射辐射辐照度', V14315 AS '反射辐射辐照度' SELECT V14311 AS '总辐射辐照度', V14312 AS '净辐射辐照度', V14313 AS '直接辐射辐照度', V14314 AS '散射辐射辐照度', V14315 AS '反射辐射辐照度'
FROM radi_chn_mul_hor LIMIT 1 FROM radi_chn_mul_hor LIMIT 1
</select> </select>
<select id="getSiteListInfo" resultType="com.cuit.solarenergy.entity.vo.ret.SiteListVoRet">
<choose>
<when test="_parameter == '总辐射辐照度'">
SELECT Station_Id_C as siteName, "总辐射辐照度" as dataType, Concat(Year, '-', Mon, '-', Day) as dataTime, Hour as dataHour, V14311 AS dataValue
</when>
<when test="_parameter == '净辐射辐照度'">
SELECT Station_Id_C as siteName, "净辐射辐照度" as dataType, Concat(Year, '-', Mon, '-', Day) as dataTime, Hour as dataHour, V14312 AS dataValue
</when>
<when test="_parameter == '直接辐射辐照度'">
SELECT Station_Id_C as siteName, "直接辐射辐照度" as dataType, Concat(Year, '-', Mon, '-', Day) as dataTime, Hour as dataHour, V14313 AS dataValue
</when>
<when test="_parameter == '散射辐射辐照度'">
SELECT Station_Id_C as siteName, "散射辐射辐照度" as dataType, Concat(Year, '-', Mon, '-', Day) as dataTime, Hour as dataHour, V14314 AS dataValue
</when>
<when test="_parameter == '反射辐射辐照度'">
SELECT Station_Id_C as siteName, "反射辐射辐照度" as dataType, Concat(Year, '-', Mon, '-', Day) as dataTime, Hour as dataHour, V14315 AS dataValue
</when>
<otherwise>
SELECT Station_Id_C, Lat, Lon, V14311 AS ElementValue, V14312 AS ElementValue, V14313 AS ElementValue, V14314 AS ElementValue, V14315 AS ElementValue
</otherwise>
</choose>
FROM radi_chn_mul_hor
WHERE
Station_Id_C = "54511"
</select>
<select id="getSiteListInfo1" resultType="com.cuit.solarenergy.entity.vo.ret.SiteListVoRet">
SELECT Station_Id_C as siteName, "总辐射辐照度" as dataType, Concat(Year, '-', Mon, '-', Day) as dataTime, Hour as dataHour, V14311 AS dataValue
FROM radi_chn_mul_hor
WHERE
Station_Id_C = "54511"
</select>
<select id="getSiteListInfo2" resultType="com.cuit.solarenergy.entity.vo.ret.SiteListVoRet">
SELECT Station_Id_C as siteName, "净辐射辐照度" as dataType, Concat(Year, '-', Mon, '-', Day) as dataTime, Hour as dataHour, V14312 AS dataValue
FROM radi_chn_mul_hor
WHERE
Station_Id_C = "54511"
</select>
<select id="getSiteListInfo3" resultType="com.cuit.solarenergy.entity.vo.ret.SiteListVoRet">
SELECT Station_Id_C as siteName, "直接辐射辐照度" as dataType, Concat(Year, '-', Mon, '-', Day) as dataTime, Hour as dataHour, V14313 AS dataValue
FROM radi_chn_mul_hor
WHERE
Station_Id_C = "54511"
</select>
<select id="getSiteListInfo4" resultType="com.cuit.solarenergy.entity.vo.ret.SiteListVoRet">
SELECT Station_Id_C as siteName, "散射辐射辐照度" as dataType, Concat(Year, '-', Mon, '-', Day) as dataTime, Hour as dataHour, V14314 AS dataValue
FROM radi_chn_mul_hor
WHERE
Station_Id_C = "54511"
</select>
<select id="getSiteListInfo5" resultType="com.cuit.solarenergy.entity.vo.ret.SiteListVoRet">
SELECT Station_Id_C as siteName, "反射辐射辐照度" as dataType, Concat(Year, '-', Mon, '-', Day) as dataTime, Hour as dataHour, V14315 AS dataValue
FROM radi_chn_mul_hor
WHERE
Station_Id_C = "54511"
</select>
</mapper> </mapper>

Loading…
Cancel
Save