Browse Source

1、修改iot数据源

develop
bobol 7 months ago
parent
commit
8f64b78361
  1. 2
      lzbi-admin/src/main/resources/application-test.yml
  2. 4
      lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiHisReportController.java

2
lzbi-admin/src/main/resources/application-test.yml

@ -94,7 +94,7 @@ spring:
workDB: workDB:
driverClassName: org.postgresql.Driver driverClassName: org.postgresql.Driver
#type: com.alibaba.druid.pool.DruidDataSource #type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:postgresql://10.10.10.56:5432/dctestdb?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai url: jdbc:postgresql://10.10.10.59:5432/dcdatabase?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: postgres username: postgres
password: 123456 password: 123456
primary: master primary: master

4
lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiHisReportController.java

@ -17,6 +17,7 @@ import com.lzbi.common.utils.StringUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -218,6 +219,7 @@ public class DcBusiHisReportController extends BaseController {
* "生产设备参数统计明细表导出功能 * "生产设备参数统计明细表导出功能
*/ */
@ApiOperation("生产设备参数统计明细表导出功能--时间纵向") @ApiOperation("生产设备参数统计明细表导出功能--时间纵向")
@PreAuthorize("@ss.hasPermi('report:iot:export')")
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, LogTimeThreeQueryParamVo queryVo) throws IOException { public void export(HttpServletResponse response, LogTimeThreeQueryParamVo queryVo) throws IOException {
List<Map<String, Object>> mapList = getExcellData(queryVo, 2); List<Map<String, Object>> mapList = getExcellData(queryVo, 2);
@ -225,6 +227,7 @@ public class DcBusiHisReportController extends BaseController {
} }
@ApiOperation("生产设备参数统计明细表导出功能-时间横向") @ApiOperation("生产设备参数统计明细表导出功能-时间横向")
@PreAuthorize("@ss.hasPermi('report:iot:export')")
@PostMapping("/export2") @PostMapping("/export2")
public void export2(HttpServletResponse response, LogTimeThreeQueryParamVo queryVo) throws IOException { public void export2(HttpServletResponse response, LogTimeThreeQueryParamVo queryVo) throws IOException {
List<Map<String, Object>> mapList = getExcellData(queryVo, 1); List<Map<String, Object>> mapList = getExcellData(queryVo, 1);
@ -290,6 +293,7 @@ public class DcBusiHisReportController extends BaseController {
} }
@ApiOperation("天气报表") @ApiOperation("天气报表")
@PreAuthorize("@ss.hasPermi('report:iot:export')")
@PostMapping("/exportWeather") @PostMapping("/exportWeather")
public void exportWeather(HttpServletResponse response, ExportWeatherReq exportWeatherReq) throws IOException { public void exportWeather(HttpServletResponse response, ExportWeatherReq exportWeatherReq) throws IOException {
List<WeatherReportVO> weatherReport = logTimesacleHistoryThreeService.getWeatherReport(exportWeatherReq); List<WeatherReportVO> weatherReport = logTimesacleHistoryThreeService.getWeatherReport(exportWeatherReq);

Loading…
Cancel
Save