xzzn/emsback
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改site_id & device_id

Browse Source
This commit is contained in:
mashili
2025-06-29 10:55:05 +08:00
parent 177e235c0e
commit d1aa8dbd2c
50 changed files with 2142 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMapController.java
View File

@ -26,7 +26,7 @@ public class EmsSiteMapController extends BaseController{
* 获取某个站点基本信息
*/
@GetMapping("/getSingleSiteBaseInfo")
public AjaxResult getSingleSiteBaseInfo(@RequestParam Long siteId)
public AjaxResult getSingleSiteBaseInfo(@RequestParam String siteId)
{
return success(homePageService.getSingleSiteBaseInfo(siteId));
}

22
ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java
View File

@ -25,7 +25,7 @@ public class EmsSiteMonitorController extends BaseController{
* 获取单站首页数据
*/
@GetMapping("/homeView")
public AjaxResult getSingleSiteViewInfo(@RequestParam Long siteId)
public AjaxResult getSingleSiteViewInfo(@RequestParam String siteId)
{
return success(iSingleSiteService.getSiteMonitorDataVo(siteId));
}
@ -34,7 +34,7 @@ public class EmsSiteMonitorController extends BaseController{
* 单站监控-设备监控-实时运行头部数据
*/
@GetMapping("/runningHeadInfo")
public AjaxResult getRunningHeadInfo(@RequestParam Long siteId)
public AjaxResult getRunningHeadInfo(@RequestParam String siteId)
{
return success(iSingleSiteService.getSiteRunningHeadInfo(siteId));
}
@ -43,7 +43,7 @@ public class EmsSiteMonitorController extends BaseController{
* 单站监控-设备监控-实时运行曲线图数据
*/
@GetMapping("/runningGraph")
public AjaxResult getRunningGraph(@RequestParam Long siteId)
public AjaxResult getRunningGraph(@RequestParam String siteId)
{
return success(iSingleSiteService.getRunningGraph(siteId));
}
@ -52,7 +52,7 @@ public class EmsSiteMonitorController extends BaseController{
* 单站监控-设备监控-PCS
*/
@GetMapping("/getPcsDetailInfo")
public AjaxResult getPcsDetailInfo(@RequestParam Long siteId)
public AjaxResult getPcsDetailInfo(@RequestParam String siteId)
{
return success(iSingleSiteService.getPcsDetailInfo(siteId));
}
@ -61,7 +61,7 @@ public class EmsSiteMonitorController extends BaseController{
* 单站监控-设备监控-BMS总览
*/
@GetMapping("/getBMSOverView")
public AjaxResult getBMSOverView(@RequestParam Long siteId)
public AjaxResult getBMSOverView(@RequestParam String siteId)
{
return success(iSingleSiteService.getBMSOverView(siteId));
}
@ -70,7 +70,7 @@ public class EmsSiteMonitorController extends BaseController{
* 单站监控-设备监控-BMS电池簇
*/
@GetMapping("/getBMSBatteryCluster")
public AjaxResult getBMSBatteryCluster(@RequestParam Long siteId)
public AjaxResult getBMSBatteryCluster(@RequestParam String siteId)
{
return success(iSingleSiteService.getBMSBatteryCluster(siteId));
}
@ -79,7 +79,7 @@ public class EmsSiteMonitorController extends BaseController{
* 获取所有电池堆
*/
@GetMapping("/getStackNameList")
public AjaxResult getStackNameList(@RequestParam Long siteId)
public AjaxResult getStackNameList(@RequestParam String siteId)
{
return success(iEmsSiteService.getAllStackInfo(siteId));
}
@ -88,7 +88,7 @@ public class EmsSiteMonitorController extends BaseController{
* 获取所有电池簇
*/
@GetMapping("/getClusterNameList")
public AjaxResult getClusterNameList(@RequestParam Long stackDeviceId)
public AjaxResult getClusterNameList(@RequestParam String stackDeviceId)
{
return success(iEmsSiteService.getAllClusterInfo(stackDeviceId));
}
@ -97,7 +97,7 @@ public class EmsSiteMonitorController extends BaseController{
* 液冷设备参数
*/
@GetMapping("/getCoolingDataList")
public AjaxResult getCoolingDataList(@RequestParam Long siteId)
public AjaxResult getCoolingDataList(@RequestParam String siteId)
{
return success(iSingleSiteService.getCoolingDataList(siteId));
}
@ -106,7 +106,7 @@ public class EmsSiteMonitorController extends BaseController{
* 获取电池簇下面的单体电池数据
*/
@GetMapping("/getClusterDataInfoList")
public AjaxResult getClusterDataInfoList(@RequestParam Long clusterDeviceId)
public AjaxResult getClusterDataInfoList(@RequestParam String clusterDeviceId)
{
return success(iSingleSiteService.getClusterDataInfoList(clusterDeviceId));
}
@ -115,7 +115,7 @@ public class EmsSiteMonitorController extends BaseController{
* 电表数据
*/
@GetMapping("/getAmmeterDataList")
public AjaxResult getAmmeterDataList(@RequestParam Long siteId)
public AjaxResult getAmmeterDataList(@RequestParam String siteId)
{
return success(iSingleSiteService.getAmmeterDataList(siteId));
}

6
ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java
View File

@ -169,8 +169,8 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
data.setDataTimestamp(new Date());
// ID字段
data.setSiteId(Long.parseLong("021"));
data.setClusterDeviceId(Long.parseLong("021"));
data.setSiteId(("021"));
data.setClusterDeviceId(("021"));
emsBatteryDataService.insertEmsBatteryData(data);
@ -230,7 +230,7 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
// data.setUpdateBy(BigDecimal.ZERO);
// data.setUpdateTime(BigDecimal.ZERO);
// data.setRemark(BigDecimal.ZERO);
data.setSiteId(Long.parseLong("021"));
data.setSiteId(("021"));
data.setDeviceId(deviceId);
data.setDateMonth(Long.parseLong("6"));
data.setDateDay(Long.parseLong("28"));