@ -25,7 +25,7 @@ public class DataResultController {
@SysLogger ( value = "中央空调" , optDesc = "数据分析查询" )
@SysLogger ( value = "中央空调" , optDesc = "数据分析查询" )
@PostMapping ( value = "/query" )
@PostMapping ( value = "/query" )
public HttpResult queryDataResult ( @RequestParam ( value = "projectID " , required = false ) String projectID ,
public HttpResult queryDataResult ( @RequestParam ( value = "projectId " , required = false ) String projectId ,
@RequestParam ( value = "startDate" , required = false ) String startDate ,
@RequestParam ( value = "startDate" , required = false ) String startDate ,
@RequestParam ( value = "endDate" , required = false ) String endDate ,
@RequestParam ( value = "endDate" , required = false ) String endDate ,
@RequestParam ( value = "deviceType" , required = false ) String deviceType ,
@RequestParam ( value = "deviceType" , required = false ) String deviceType ,
@ -34,8 +34,8 @@ public class DataResultController {
try {
try {
int count = dataResultService . getDataResultCount ( projectID , startDate , endDate , deviceType , page , limit ) ;
int count = dataResultService . getDataResultCount ( projectId , startDate , endDate , deviceType , page , limit ) ;
List < DataResultEntity > records = dataResultService . queryDataResult ( projectID , startDate , endDate , deviceType , page , limit ) ;
List < DataResultEntity > records = dataResultService . queryDataResult ( projectId , startDate , endDate , deviceType , page , limit ) ;
return HttpResult . ok ( count , records ) ;
return HttpResult . ok ( count , records ) ;
} catch ( Exception e ) {
} catch ( Exception e ) {
@ -46,44 +46,44 @@ public class DataResultController {
@SysLogger ( value = "中央空调" , optDesc = "能耗分析按小时查询" )
@SysLogger ( value = "中央空调" , optDesc = "能耗分析按小时查询" )
@PostMapping ( value = "/hour" )
@PostMapping ( value = "/hour" )
public HttpResult queryDataResultMi ( @RequestParam ( value = "projectID " , required = false ) String projectID ,
public HttpResult queryDataResultMi ( @RequestParam ( value = "projectId " , required = false ) String projectId ,
@RequestParam ( value = "dateType" , required = false ) String dateType ,
@RequestParam ( value = "dateType" , required = false ) String dateType ,
@RequestParam ( value = "curDate" , required = false ) String curDate ,
@RequestParam ( value = "curDate" , required = false ) String curDate ,
@RequestParam ( value = "page" , required = false ) int page ,
@RequestParam ( value = "page" , required = false ) int page ,
@RequestParam ( value = "limit" , required = false ) int limit ) {
@RequestParam ( value = "limit" , required = false ) int limit ) {
try {
try {
if ( projectID ! = null & & projectID . length ( ) > 0 ) {
if ( projectId ! = null & & projectId . length ( ) > 0 ) {
String startDate = "" ;
String startDate = "" ;
curDate = curDate . substring ( 0 , 16 ) + ":00" ;
curDate = curDate . substring ( 0 , 16 ) + ":00" ;
if ( dateType . equals ( "1小时" ) ) {
if ( dateType . equals ( "1小时" ) ) {
startDate = ExchangeStringUtil . dateRoll ( 1 , curDate ) ;
startDate = ExchangeStringUtil . dateRoll ( 1 , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultMi ( projectID , startDate , curDate , page , limit , 0 ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultMi ( projectId , startDate , curDate , page , limit , 0 ) ;
int count = dataResultService . dataResultOneMiCount ( projectID , startDate , curDate ) ;
int count = dataResultService . dataResultOneMiCount ( projectId , startDate , curDate ) ;
return HttpResult . ok ( count , records ) ;
return HttpResult . ok ( count , records ) ;
} else if ( dateType . equals ( "2小时" ) ) {
} else if ( dateType . equals ( "2小时" ) ) {
startDate = ExchangeStringUtil . dateRoll ( 2 , curDate ) ;
startDate = ExchangeStringUtil . dateRoll ( 2 , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultMi ( projectID , startDate , curDate , page , limit , 0 ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultMi ( projectId , startDate , curDate , page , limit , 0 ) ;
int count = dataResultService . dataResultOneMiCount ( projectID , startDate , curDate ) ;
int count = dataResultService . dataResultOneMiCount ( projectId , startDate , curDate ) ;
return HttpResult . ok ( count , records ) ;
return HttpResult . ok ( count , records ) ;
} else if ( dateType . equals ( "8小时" ) ) {
} else if ( dateType . equals ( "8小时" ) ) {
startDate = ExchangeStringUtil . dateRoll ( 8 , curDate ) ;
startDate = ExchangeStringUtil . dateRoll ( 8 , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultMi ( projectID , startDate , curDate , page , limit , 1 ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultMi ( projectId , startDate , curDate , page , limit , 1 ) ;
int count = dataResultService . dataResultFiveMiCount ( projectID , startDate , curDate ) ;
int count = dataResultService . dataResultFiveMiCount ( projectId , startDate , curDate ) ;
return HttpResult . ok ( count , records ) ;
return HttpResult . ok ( count , records ) ;
} else if ( dateType . equals ( "12小时" ) ) {
} else if ( dateType . equals ( "12小时" ) ) {
startDate = ExchangeStringUtil . dateRoll ( 12 , curDate ) ;
startDate = ExchangeStringUtil . dateRoll ( 12 , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultMi ( projectID , startDate , curDate , page , limit , 1 ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultMi ( projectId , startDate , curDate , page , limit , 1 ) ;
int count = dataResultService . dataResultFiveMiCount ( projectID , startDate , curDate ) ;
int count = dataResultService . dataResultFiveMiCount ( projectId , startDate , curDate ) ;
return HttpResult . ok ( count , records ) ;
return HttpResult . ok ( count , records ) ;
} else if ( dateType . equals ( "24小时" ) ) {
} else if ( dateType . equals ( "24小时" ) ) {
startDate = ExchangeStringUtil . dateRoll ( 24 , curDate ) ;
startDate = ExchangeStringUtil . dateRoll ( 24 , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultMi ( projectID , startDate , curDate , page , limit , 2 ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultMi ( projectId , startDate , curDate , page , limit , 2 ) ;
int count = dataResultService . dataResultFifteenMiCount ( projectID , startDate , curDate ) ;
int count = dataResultService . dataResultFifteenMiCount ( projectId , startDate , curDate ) ;
return HttpResult . ok ( count , records ) ;
return HttpResult . ok ( count , records ) ;
} else { //1小时
} else { //1小时
startDate = ExchangeStringUtil . dateRoll ( 1 , curDate ) ;
startDate = ExchangeStringUtil . dateRoll ( 1 , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultMi ( projectID , startDate , curDate , page , limit , 0 ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultMi ( projectId , startDate , curDate , page , limit , 0 ) ;
int count = dataResultService . dataResultOneMiCount ( projectID , startDate , curDate ) ;
int count = dataResultService . dataResultOneMiCount ( projectId , startDate , curDate ) ;
return HttpResult . ok ( count , records ) ;
return HttpResult . ok ( count , records ) ;
}
}
} else {
} else {
@ -97,7 +97,7 @@ public class DataResultController {
@SysLogger ( value = "中央空调" , optDesc = "能耗分析按分钟查询" )
@SysLogger ( value = "中央空调" , optDesc = "能耗分析按分钟查询" )
@PostMapping ( value = "/minute" )
@PostMapping ( value = "/minute" )
public HttpResult queryDataResultSec ( @RequestParam ( value = "projectID " , required = false ) String projectID ,
public HttpResult queryDataResultSec ( @RequestParam ( value = "projectId " , required = false ) String projectId ,
@RequestParam ( value = "dateType" , required = false ) String dateType ,
@RequestParam ( value = "dateType" , required = false ) String dateType ,
@RequestParam ( value = "curDate" , required = false ) String curDate ,
@RequestParam ( value = "curDate" , required = false ) String curDate ,
@RequestParam ( value = "page" , required = false ) int page ,
@RequestParam ( value = "page" , required = false ) int page ,
@ -111,7 +111,7 @@ public class DataResultController {
curDate = curDate . substring ( 0 , 16 ) + ":00" ;
curDate = curDate . substring ( 0 , 16 ) + ":00" ;
if ( dateType . equals ( "1分钟" ) ) {
if ( dateType . equals ( "1分钟" ) ) {
startDate = ExchangeStringUtil . dateTime ( 1 , curDate ) ;
startDate = ExchangeStringUtil . dateTime ( 1 , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultSec ( projectID , startDate , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultSec ( projectId , startDate , curDate ) ;
String deviceAddr = records . get ( 0 ) . getDeviceAddr ( ) ;
String deviceAddr = records . get ( 0 ) . getDeviceAddr ( ) ;
String projectName = records . get ( 0 ) . getProjectName ( ) ;
String projectName = records . get ( 0 ) . getProjectName ( ) ;
@ -139,7 +139,7 @@ public class DataResultController {
} else if ( dateType . equals ( "2分钟" ) ) {
} else if ( dateType . equals ( "2分钟" ) ) {
startDate = ExchangeStringUtil . dateTime ( 2 , curDate ) ;
startDate = ExchangeStringUtil . dateTime ( 2 , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultSec ( projectID , startDate , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultSec ( projectId , startDate , curDate ) ;
String deviceAddr = records . get ( 0 ) . getDeviceAddr ( ) ;
String deviceAddr = records . get ( 0 ) . getDeviceAddr ( ) ;
String projectName = records . get ( 0 ) . getProjectName ( ) ;
String projectName = records . get ( 0 ) . getProjectName ( ) ;
//Date date=df.parse(startDate);//顺序
//Date date=df.parse(startDate);//顺序
@ -165,7 +165,7 @@ public class DataResultController {
return HttpResult . ok ( 120 , listMap ) ;
return HttpResult . ok ( 120 , listMap ) ;
} else if ( dateType . equals ( "5分钟" ) ) {
} else if ( dateType . equals ( "5分钟" ) ) {
startDate = ExchangeStringUtil . dateTime ( 5 , curDate ) ;
startDate = ExchangeStringUtil . dateTime ( 5 , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultSec ( projectID , startDate , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultSec ( projectId , startDate , curDate ) ;
String deviceAddr = records . get ( 0 ) . getDeviceAddr ( ) ;
String deviceAddr = records . get ( 0 ) . getDeviceAddr ( ) ;
String projectName = records . get ( 0 ) . getProjectName ( ) ;
String projectName = records . get ( 0 ) . getProjectName ( ) ;
String s = startDate . substring ( 18 , 19 ) ;
String s = startDate . substring ( 18 , 19 ) ;
@ -200,7 +200,7 @@ public class DataResultController {
return HttpResult . ok ( 60 , listMap ) ;
return HttpResult . ok ( 60 , listMap ) ;
} else if ( dateType . equals ( "15分钟" ) ) {
} else if ( dateType . equals ( "15分钟" ) ) {
startDate = ExchangeStringUtil . dateTime ( 15 , curDate ) ;
startDate = ExchangeStringUtil . dateTime ( 15 , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultSec ( projectID , startDate , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultSec ( projectId , startDate , curDate ) ;
String deviceAddr = records . get ( 0 ) . getDeviceAddr ( ) ;
String deviceAddr = records . get ( 0 ) . getDeviceAddr ( ) ;
String projectName = records . get ( 0 ) . getProjectName ( ) ;
String projectName = records . get ( 0 ) . getProjectName ( ) ;
String s = startDate . substring ( 18 , 19 ) ;
String s = startDate . substring ( 18 , 19 ) ;
@ -235,7 +235,7 @@ public class DataResultController {
return HttpResult . ok ( 180 , listMap ) ;
return HttpResult . ok ( 180 , listMap ) ;
} else if ( dateType . equals ( "30分钟" ) ) {
} else if ( dateType . equals ( "30分钟" ) ) {
startDate = ExchangeStringUtil . dateTime ( 30 , curDate ) ;
startDate = ExchangeStringUtil . dateTime ( 30 , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultSec ( projectID , startDate , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultSec ( projectId , startDate , curDate ) ;
String deviceAddr = records . get ( 0 ) . getDeviceAddr ( ) ;
String deviceAddr = records . get ( 0 ) . getDeviceAddr ( ) ;
String projectName = records . get ( 0 ) . getProjectName ( ) ;
String projectName = records . get ( 0 ) . getProjectName ( ) ;
String s = startDate . substring ( 18 , 19 ) ;
String s = startDate . substring ( 18 , 19 ) ;
@ -269,7 +269,7 @@ public class DataResultController {
return HttpResult . ok ( 180 , listMap ) ;
return HttpResult . ok ( 180 , listMap ) ;
} else { //1分钟
} else { //1分钟
startDate = ExchangeStringUtil . dateTime ( 1 , curDate ) ;
startDate = ExchangeStringUtil . dateTime ( 1 , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultSec ( projectID , startDate , curDate ) ;
List < DataResultChEntity > records = dataResultService . queryDataResultSec ( projectId , startDate , curDate ) ;
String deviceAddr = records . get ( 0 ) . getDeviceAddr ( ) ;
String deviceAddr = records . get ( 0 ) . getDeviceAddr ( ) ;
String projectName = records . get ( 0 ) . getProjectName ( ) ;
String projectName = records . get ( 0 ) . getProjectName ( ) ;
//Date date=df.parse(startDate);
//Date date=df.parse(startDate);
@ -305,15 +305,15 @@ public class DataResultController {
@PostMapping ( value = "/dataNow" )
@PostMapping ( value = "/dataNow" )
public HttpResult selectDataResultNow ( @RequestParam ( value = "deviceAddr" , required = false ) String deviceAddr ,
public HttpResult selectDataResultNow ( @RequestParam ( value = "deviceAddr" , required = false ) String deviceAddr ,
@RequestParam ( value = "deviceType" , required = false ) String deviceType ,
@RequestParam ( value = "deviceType" , required = false ) String deviceType ,
@RequestParam ( value = "projectID " , required = false ) String projectID ) {
@RequestParam ( value = "projectId " , required = false ) String projectId ) {
List < DataResultChEntity > dataNow = dataResultService . selectDataResultNow ( deviceAddr , deviceType , projectID ) ;
List < DataResultChEntity > dataNow = dataResultService . selectDataResultNow ( deviceAddr , deviceType , projectId ) ;
return HttpResult . ok ( "success" , dataNow ) ;
return HttpResult . ok ( "success" , dataNow ) ;
}
}
@SysLogger ( value = "中央空调" , optDesc = "查询冷水机参数值" )
@SysLogger ( value = "中央空调" , optDesc = "查询冷水机参数值" )
@PostMapping ( value = "/dataChiller" )
@PostMapping ( value = "/dataChiller" )
public HttpResult queryDataResultChiller ( @RequestParam ( "projectID" ) String projectID ,
public HttpResult queryDataResultChiller ( @RequestParam ( "projectId" ) String projectId ,
@RequestParam ( "deviceAddr" ) String deviceAddr ,
@RequestParam ( "deviceAddr" ) String deviceAddr ,
@RequestParam ( "registerName" ) String registerName ,
@RequestParam ( "registerName" ) String registerName ,
@RequestParam ( value = "startDate" , required = false ) String startDate ,
@RequestParam ( value = "startDate" , required = false ) String startDate ,
@ -321,8 +321,8 @@ public class DataResultController {
@RequestParam ( "page" ) int page ,
@RequestParam ( "page" ) int page ,
@RequestParam ( "limit" ) int limit ) {
@RequestParam ( "limit" ) int limit ) {
int count = dataResultService . dataResultChillerCount ( projectID , deviceAddr , registerName , startDate , curDate ) ;
int count = dataResultService . dataResultChillerCount ( projectId , deviceAddr , registerName , startDate , curDate ) ;
List < DataResultChEntity > dataChiller = dataResultService . queryDataResultChiller ( projectID , deviceAddr , registerName , startDate , curDate , page , limit ) ;
List < DataResultChEntity > dataChiller = dataResultService . queryDataResultChiller ( projectId , deviceAddr , registerName , startDate , curDate , page , limit ) ;
return HttpResult . ok ( count , dataChiller ) ;
return HttpResult . ok ( count , dataChiller ) ;
}
}
}
}