Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
11f519d6 由 张雷
选项

药剂分析组件接口开发

1 个父辈 44d441e0
内嵌 并排
正在显示 6 个修改的文件 包含 111 行增加 和 29 行删除
sk-module-biz/src/main/java/com/skua/modules/algorithm/service/impl/ReportItemvService.java
......@@ -363,4 +363,21 @@ public class ReportItemvService {
sql += " ) bbb ";
return sql ;
}
public List<FRportlCommandCenterVO> statisticsByYh(String departIds, String startDate, String endDate) {
String startDateTb = DateUtils.getTbDate(startDate);
String endDateTb = DateUtils.getTbDate(endDate);
String startDateHb = DateUtils.getHbDate(startDate);
String endDateHb = DateUtils.getHbDate(endDate);
//药剂SQL
String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, ReportConstant.fieldYj, departIds, startDate, endDate);
String dataViewName3a24Tb = ReportViewUtil.buildView(ReportConstant.view3a24, ReportConstant.fieldYj, departIds, startDateTb, endDateTb);
String dataViewName3a24Hb = ReportViewUtil.buildView(ReportConstant.view3a24, ReportConstant.fieldYj, departIds, startDateHb, endDateHb);
//处理水量
String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119, ReportConstant.fieldClsl, departIds, startDate, endDate);
String dataViewName2119Tb = ReportViewUtil.buildView(ReportConstant.view2119, ReportConstant.fieldClsl, departIds, startDateTb, endDateTb);
String dataViewName2119Hb = ReportViewUtil.buildView(ReportConstant.view2119, ReportConstant.fieldClsl, departIds, startDateHb, endDateHb);
return null;
}
}
......
sk-module-biz/src/main/java/com/skua/modules/dataAnalysis/controller/SysCommandCentreController.java
......@@ -57,16 +57,20 @@ public class SysCommandCentreController {
@AutoLog(value = "指挥中心-水量查询")
@ApiOperation(value="指挥中心-水量查询", notes="指挥中心-水量查询")
@GetMapping(value = "/statisticsByWaterData")
public Result<List<FRportlCommandCenterVO>> statisticsByWaterData(ReportItemvParam reportItemvParam) throws Exception{
public Result<List<FRportlCommandCenterVO>> statisticsByWaterData(ReportItemvParam reportItemvParam) {
Result<List<FRportlCommandCenterVO> > result = new Result<>();
List<FRportlCommandCenterVO> fReportItemvList = new ArrayList<>();//返回集合对象
DateVO dateVO = new DateVO(reportItemvParam.getStartDate());
String departIds = BaseContextHandler.getDeparts();
if(reportItemvParam.getDepartIds()!=null){
departIds = reportItemvParam.getDepartIds();
}
//本月数据
String monthCSL = reportItemvService.getSumCSL(BaseContextHandler.getDeparts(), dateVO.getNowMonthStartDate(), dateVO.getNowMonthEndDate());
String monthCSL = reportItemvService.getSumCSL(departIds, dateVO.getNowMonthStartDate(), dateVO.getNowMonthEndDate());
//环比 上月数据
String lastMonthCSL = reportItemvService.getSumCSL(BaseContextHandler.getDeparts(), dateVO.getNowMonthStartDate(), dateVO.getNowMonthEndDate());
String lastMonthCSL = reportItemvService.getSumCSL(departIds, dateVO.getNowMonthStartDate(), dateVO.getNowMonthEndDate());
//同比 去年数据
String lastYearCSL = reportItemvService.getSumCSL(BaseContextHandler.getDeparts(), dateVO.getLastYearMonthStartTime(), dateVO.getLastYearMonthEndTime());
String lastYearCSL = reportItemvService.getSumCSL(departIds, dateVO.getLastYearMonthStartTime(), dateVO.getLastYearMonthEndTime());
long nowDifferDay = DateUtils.differenceDay(dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
long lastMonthDifferDay = DateUtils.differenceDay(dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
......@@ -93,9 +97,12 @@ public class SysCommandCentreController {
@ApiOperation(value="指挥中心-运行负荷率分析", notes="指挥中心-运行负荷率分析")
//指挥中心-运行负荷率分析
@GetMapping(value = "/statisticsByLoadRate")
public Result<DepartLoadRateResultVO > statisticsByLoadRate(ReportItemvParam reportItemvParam) throws Exception {
public Result<DepartLoadRateResultVO > statisticsByLoadRate(ReportItemvParam reportItemvParam) {
Result<DepartLoadRateResultVO > result = new Result<>();
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
if(reportItemvParam.getDepartIds()!=null){
departIds = reportItemvParam.getDepartIds();
}
Integer loadRateType = reportItemvParam.getLoadRateType();
if(loadRateType == null ) loadRateType = 1;
DepartLoadRateResultVO departLoadRateResultVO = reportItemvService.statisticsByLoadRate( departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate(), loadRateType);
......@@ -110,31 +117,25 @@ public class SysCommandCentreController {
@GetMapping("/getCLSLXQ")
public Result<List<WaterTreatmentVO>> getCLSLXQ(ReportItemvParam reportItemvParam){
Result<List<WaterTreatmentVO>> result = new Result<>();
List<WaterTreatmentVO> waterTrendVOList = commandCentreService.statisticsCLSLXQ(reportItemvParam.getStartDate(),reportItemvParam.getEndDate(), BaseContextHandler.getDeparts());
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
if(reportItemvParam.getDepartIds()!=null){
departIds = reportItemvParam.getDepartIds();
}
List<WaterTreatmentVO> waterTrendVOList = commandCentreService.statisticsCLSLXQ(reportItemvParam.getStartDate(),reportItemvParam.getEndDate(), departIds);
result.setResult(waterTrendVOList );
return result;
}
/* @AutoLog(value = "指挥中心-运行负荷率分析")
@ApiOperation(value="指挥中心-运行负荷率分析---列表详情", notes="指挥中心-运行负荷率分析----列表详情")
//指挥中心-运行负荷率分析
@GetMapping(value = "/statisticsByLoadRateList")
public Result< List<DepartLoadRateVO> > statisticsByLoadRateList(String startDate , String endDate) throws Exception {
Result< List<DepartLoadRateVO> > result = new Result<>();
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
List<DepartLoadRateVO> departLoadRateResultVO = reportItemvService.statisticsByLoadRateList( departIds,startDate , endDate,null);
result.setSuccess(true);
result.setResult(departLoadRateResultVO);
return result;
}*/
//cement水泥 electricity
@AutoLog(value = "指挥中心-泥量统计")
@ApiOperation(value="指挥中心-泥量统计", notes="指挥中心-泥量统计")
@GetMapping(value = "/statisticsByCement")
public Result<List<FRportlCommandCenterVO>> statisticsByCement(ReportItemvParam reportItemvParam) throws Exception {
public Result<List<FRportlCommandCenterVO>> statisticsByCement(ReportItemvParam reportItemvParam) {
Result<List<FRportlCommandCenterVO>> result = new Result();
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
if(reportItemvParam.getDepartIds()!=null){
departIds = reportItemvParam.getDepartIds();
}
List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByCement(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
result.setResult(dataList );
return result;
......@@ -143,9 +144,12 @@ public class SysCommandCentreController {
@ApiOperation(value="指挥中心-泥量统计--详情列表", notes="指挥中心-泥量统计--详情列表")
//指挥中心-泥量统计--详情列表
@GetMapping(value = "/statisticsByCementList")
public Result<List<ReportItemVO>> statisticsByCementList(ReportItemvParam reportItemvParam) throws Exception {
public Result<List<ReportItemVO>> statisticsByCementList(ReportItemvParam reportItemvParam) {
Result<List<ReportItemVO>> result = new Result();
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
if(reportItemvParam.getDepartIds()!=null){
departIds = reportItemvParam.getDepartIds();
}
List<ReportItemVO> dataList = reportItemvService.statisticsByCementList(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
result.setResult(dataList );
return result;
......@@ -156,34 +160,57 @@ public class SysCommandCentreController {
@AutoLog(value = "指挥中心-能耗分析")
@ApiOperation(value="指挥中心-能耗分析", notes="指挥中心-能耗分析")
@GetMapping(value = "/statisticsByElectricity")
public Result<List<FRportlCommandCenterVO>> statisticsByElectricity(ReportItemvParam reportItemvParam) throws Exception {
public Result<List<FRportlCommandCenterVO>> statisticsByElectricity(ReportItemvParam reportItemvParam) {
Result<List<FRportlCommandCenterVO>> result = new Result();
String departId = BaseContextHandler.getDeparts();
if(reportItemvParam.getDepartIds()!=null){
departId = reportItemvParam.getDepartIds();
}
List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByElectricity(departId,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
result.setResult(dataList );
return result;
}
@AutoLog(value = "指挥中心-药耗分析")
@ApiOperation(value="指挥中心-药耗分析", notes="指挥中心-药耗分析")
@GetMapping(value = "/statisticsByYh")
public Result<List<FRportlCommandCenterVO>> statisticsByYh(ReportItemvParam reportItemvParam) {
Result<List<FRportlCommandCenterVO>> result = new Result();
String departId = BaseContextHandler.getDeparts();
if(reportItemvParam.getDepartIds()!=null){
departId = reportItemvParam.getDepartIds();
}
List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByYh(departId,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
result.setResult(dataList);
return result;
}
@AutoLog(value = "指挥中心-能耗分析")
@ApiOperation(value="指挥中心-能耗分析--详情列表", notes="指挥中心-能耗分析--详情列表")
@GetMapping(value = "/statisticsByElectricityList")
public Result<List<ReportItemVO>> statisticsByElectricityList(ReportItemvParam reportItemvParam) throws Exception {
public Result<List<ReportItemVO>> statisticsByElectricityList(ReportItemvParam reportItemvParam) {
Result<List<ReportItemVO>> result = new Result();
String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
if(reportItemvParam.getDepartIds()!=null){
departIds = reportItemvParam.getDepartIds();
}
List<ReportItemVO> dataList = reportItemvService.statisticsByElectricityList(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
result.setResult(dataList );
return result;
}
//cement水泥 electricity
@AutoLog(value = "指挥中心-水量电耗趋势")
@ApiOperation(value="指挥中心-水量电耗趋势", notes="指挥中心-水量电耗趋势")
@GetMapping(value = "/statisticsBySewage")
public Result<StackedAreaChartDataVO> statisticsBySewage(ReportItemvParam reportItemvParam) throws Exception {
public Result<StackedAreaChartDataVO> statisticsBySewage(ReportItemvParam reportItemvParam) {
List<String > dateList = new ArrayList<>();//日期数据
List<String> electricityList = new ArrayList<>();//电能数据数据；
List<String> waterList = new ArrayList<>();// 水集合
List<String> consumeList = new ArrayList<>();//电耗集合
String departIds = BaseContextHandler.getDeparts();
if(reportItemvParam.getDepartIds()!=null){
departIds = reportItemvParam.getDepartIds();
}
List<ReportDateTrendVO> dlhjDateList = reportItemvService.getDayDateFieldList(ReportConstant.view3a24, "DLHJ", departIds, reportItemvParam.getStartDate(), reportItemvParam.getEndDate());
List<ReportDateTrendVO> cslDateList = reportItemvService.getDayDateFieldList(ReportConstant.view2119, "CSL", departIds, reportItemvParam.getStartDate(), reportItemvParam.getEndDate());
......@@ -250,6 +277,9 @@ public class SysCommandCentreController {
reportItemvParam.setStartDate( DateUtils.formatDate(startDate ,"YYYY-MM"));
reportItemvParam.setEndDate( DateUtils.formatDate(endDate ,"YYYY-MM"));
String departIds = BaseContextHandler.getDeparts();
if(reportItemvParam.getDepartIds()!=null){
departIds = reportItemvParam.getDepartIds();
}
reportItemvParam.setDepartIds( JSUtils.quoteEach(departIds,","));
List<ReportDateTrendVO> fyDataList = commandCentreService.getFyData(reportItemvParam);
......@@ -259,7 +289,6 @@ public class SysCommandCentreController {
List<String> fyList = new ArrayList<>();//电能数据数据；
List<String> waterList = new ArrayList<>();// 水集合
String electricity = null; String water = null;
List<String> dateTimeList = getMonthsBetween(startDate,endDate);
for(String dateTime : dateTimeList){
if(fyDataList != null ){
......
sk-module-biz/src/main/resources/application-test.yml
......@@ -89,13 +89,13 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
url: jdbc:mysql://113.249.91.27:3306/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
username: root
password: jkauto@123
driver-class-name: com.mysql.jdbc.Driver
# 恩菲数据同步
nf-db:
url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
url: jdbc:mysql://113.249.91.27:3306/zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
username: root
password: jkauto@123
driver-class-name: com.mysql.jdbc.Driver
......
sk-module-datafill/src/main/java/com/skua/modules/custom/service/IFCustomReportDatasetService.java
......@@ -151,4 +151,6 @@ public interface IFCustomReportDatasetService extends IService<FCustomReportData
List<Map<String, Object>> queryHjtjReport(String dataViewName9bff,String dataViewName3a24,String dataViewName2119,
String startTime, String endTime, String departId);
List<ResultNumberVO> statisticsByXjl(String departIds, String startDate, String endDate);
}
......
sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
......@@ -500,6 +500,25 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
return list;
}
@Override
public List<ResultNumberVO> statisticsByXjl(String departIds, String startDate, String endDate) {
List<ResultNumberVO> reduceStatisticsList = new ArrayList<>(4);
String startDateTb = DateUtils.getTbDate(startDate);
String endDateTb = DateUtils.getTbDate(endDate);
String startDateHb = DateUtils.getHbDate(startDate);
String endDateHb = DateUtils.getHbDate(endDate);
//头部统计数据
JnhbReportData nowMonthData = getJnhbReportSumDataByResultNumber(departIds, startDate, endDate);
JnhbReportData lastMonthData = getJnhbReportSumDataByResultNumber(departIds, startDateHb, endDateHb);
JnhbReportData lastYearMonthData = getJnhbReportSumDataByResultNumber(departIds, startDateTb, endDateTb);
//ResultNumberVO(tring name, String unit, String value, String valueTb, String valueHb)
reduceStatisticsList.add( new ResultNumberVO( "COD", "吨",nowMonthData.getCodxjl(),lastMonthData.getCodxjl(),lastYearMonthData.getCodxjl() ) );//COD消减量（吨） codxjl
reduceStatisticsList.add( new ResultNumberVO( "NH₃-N","吨",nowMonthData.getAdxjl(),lastMonthData.getAdxjl(),lastYearMonthData.getAdxjl() ));//NH3-N消减量（吨）adxjl
reduceStatisticsList.add( new ResultNumberVO( "TP","吨",nowMonthData.getTpxjl(),lastMonthData.getTpxjl(),lastYearMonthData.getTpxjl() ));//TP消减量（吨）tpxjl
reduceStatisticsList.add( new ResultNumberVO( "TN","吨",nowMonthData.getTnxjl(),lastMonthData.getTnxjl(),lastYearMonthData.getTnxjl() ));//TN消减量（吨）tnxjl
return reduceStatisticsList;
}
/**转换为Map<部门编号,JnhbReportData> */
private Map<String,JnhbReportData> convertJnhbReportDataMap(List<JnhbReportData> dataList){// Map<部门编号,JnhbReportData>
Map<String,JnhbReportData> dataMap = new HashMap<>();
......
sk-module-datafill/src/main/java/com/skua/modules/report/controller/ReportDataController.java
......@@ -12,6 +12,7 @@ import com.skua.modules.custom.service.IFCustomReportDatasetService;
import com.skua.modules.report.service.IReportDataService;
import com.skua.modules.report.vo.JnhbLargeScreenVO;
import com.skua.modules.report.vo.JnhbReportData;
import com.skua.modules.report.vo.ReportItemvParam;
import com.skua.modules.report.vo.largeScreen.ResultNumberVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -237,4 +238,18 @@ public class ReportDataController {
result.setResult(dataLIst);
return result;
}
@AutoLog(value = "节能环保-大屏展示")
@ApiOperation(value = "节能环保-消减量", notes = "节能环保-消减量")
@GetMapping(value = "/statisticsByXjl")
public Result<List<ResultNumberVO>> statisticsByXjl(ReportItemvParam reportItemvParam) { //time
Result<List<ResultNumberVO>> result = new Result<>();
String departIds = BaseContextHandler.getDeparts();
if(reportItemvParam.getDepartIds()!=null){
departIds = reportItemvParam.getDepartIds();
}
List<ResultNumberVO> dataLIst = fCustomReportDatasetService.statisticsByXjl(departIds,reportItemvParam.getStartDate(),reportItemvParam.getEndDate());
result.setResult(dataLIst);
return result;
}
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!