From 701d5ca0fb3da20fb336d66e08f4aa3c6b85c731 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 29 十一月 2024 09:37:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/RegionTopPowerResponse.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminCenterDataVO.java | 45 ++++
server/visits/dmvisit_service/src/main/resources/application-dev.yml | 12
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmEventDataVO.java | 36 +++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataVO.java | 24 ++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmDataVO.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java | 31 +++
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/DeviceNumByTypeVO.java | 39 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 206 +++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 19 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/YearDeviceDataVO.java | 2
server/system_gateway/src/main/resources/application-dev.yml | 12
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java | 95 +++------
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 8
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageRequest.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 12 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminBoardVO.java | 4
21 files changed, 478 insertions(+), 88 deletions(-)
diff --git a/server/system_gateway/src/main/resources/application-dev.yml b/server/system_gateway/src/main/resources/application-dev.yml
index e702b3b..413edec 100644
--- a/server/system_gateway/src/main/resources/application-dev.yml
+++ b/server/system_gateway/src/main/resources/application-dev.yml
@@ -1,12 +1,12 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
- username: doumee
- password: rtjgfEr@&0c0m
-# url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-# username: root
-# password: Atwl@2024
+# url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+# username: doumee
+# password: rtjgfEr@&0c0m
+ url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ username: root
+ password: Atwl@2024
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index a879505..f36958d 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -3036,6 +3036,12 @@
calendar.add(Calendar.DATE, days);//
return calendar.getTime();
}
+ public static Date addMonthToDate(Date date, int month) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.add(Calendar.MONTH, month);//
+ return calendar.getTime();
+ }
public static String afterDateToStr(Integer days){
Date date = new Date();
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
index 2e38c37..04171cd 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
@@ -48,8 +48,6 @@
-
-
@LoginNoRequired
@ApiOperation("鐢ㄧ數鎬昏兘鑰楀悓姣斻�佺幆姣斿拰鍖哄煙鐢ㄧ數閲忛泦鍚�")
@GetMapping("/energyRegionData")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
index f580103..29baf7c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
@@ -3,11 +3,18 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
+import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.FireDevStatusTotalRequest;
+import com.doumee.core.haikang.model.param.respose.FireDevStatusListResponse;
+import com.doumee.core.haikang.model.param.respose.MonthDataByMeterTypeResponse;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.PlatformLogMapper;
import com.doumee.dao.business.model.PlatformLog;
import com.doumee.dao.web.response.platformReport.*;
+import com.doumee.service.business.third.BoardService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -33,94 +40,56 @@
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/fightingAdmin")
public class FightingAdminController extends BaseController {
-
+ @Autowired
+ private BoardService boardService;
@LoginNoRequired
@ApiOperation("涓績鏁版嵁")
@GetMapping("/centerData")
- public ApiResponse<FightingAdminBoardVO> centerData() {
- FightingAdminBoardVO data = new FightingAdminBoardVO();
- Random random = new Random();
- data.setOfflineDeviceNum(random.nextInt(20));
- data.setOnlineDeviceNum(random.nextInt(20));
- data.setErrDeviceNum(random.nextInt(20));
- data.setShieldDeviceNum(random.nextInt(20));
- data.setTodayDangerNum(random.nextInt(20));
- data.setDealDangerNum(random.nextInt(20));
+ public ApiResponse<FightingAdminCenterDataVO> centerData() {
+ FightingAdminCenterDataVO data = boardService.centerFightingAdminData();
return ApiResponse.success(data);
- }
-
-
- @LoginNoRequired
- @ApiOperation("浠婃棩鍚勭郴缁熻澶囩姸鎬佸強鍛婅鏁伴噺")
- @GetMapping("/deviceAlarmData")
- public ApiResponse<List<DeviceAlarmDataVO>> deviceAlarmData() {
- List<DeviceAlarmDataVO> deviceAlarmDataVOList = new ArrayList<>();
- Random random = new Random();
- for (int i = 1; i <= 5; i++) {
- DeviceAlarmDataVO deviceAlarmDataVO = new DeviceAlarmDataVO();
- deviceAlarmDataVO.setDeviceTypeName("璁惧鍚嶇О_"+i);
- deviceAlarmDataVO.setAlarmNum(random.nextInt(20));
- deviceAlarmDataVO.setErrNum(random.nextInt(20));
- deviceAlarmDataVO.setOfflineNum(random.nextInt(20));
- deviceAlarmDataVO.setShieldNum(random.nextInt(20));
- deviceAlarmDataVO.setStatusTotal(deviceAlarmDataVO.getAlarmNum() + deviceAlarmDataVO.getErrNum() + deviceAlarmDataVO.getOfflineNum() + deviceAlarmDataVO.getShieldNum());
- deviceAlarmDataVOList.add(deviceAlarmDataVO);
- }
- return ApiResponse.success(deviceAlarmDataVOList);
}
@LoginNoRequired
@ApiOperation("鎶ヨ淇℃伅")
@GetMapping("/alarmData")
- public ApiResponse<AlarmDataVO> alarmData() {
- AlarmDataVO alarmDataVO = new AlarmDataVO();
- Random random = new Random();
- alarmDataVO.setTotalNum(random.nextInt(30));
- alarmDataVO.setRealNum(random.nextInt(alarmDataVO.getTotalNum()));
- alarmDataVO.setErrNum(random.nextInt(alarmDataVO.getRealNum()));
- alarmDataVO.setLiftNum(random.nextInt(alarmDataVO.getErrNum()));
- alarmDataVO.setProcessingNum(random.nextInt(alarmDataVO.getErrNum()));
+ public ApiResponse<AlarmDataVO> alarmDataSumByCate() {
+ AlarmDataVO alarmDataVO = boardService.alarmDataSumByCate();
return ApiResponse.success(alarmDataVO);
}
+ @LoginNoRequired
+ @ApiOperation("鍛婅淇℃伅闆嗗悎")
+ @GetMapping("/alarmDataList")
+ public ApiResponse<List<AlarmEventDataVO>> alarmDataList() {
+ List<AlarmEventDataVO> data = boardService.fightingAdminAlertList();
+ return ApiResponse.success(data);
+ }
+ @LoginNoRequired
+ @ApiOperation("妫�娴嬫暟鎹泦鍚�")
+ @GetMapping("/monitorDataList")
+ public ApiResponse<List<MonitorDataVO>> monitorDataList() {
+ List<MonitorDataVO> data = boardService.monitorDataList();
+ return ApiResponse.success(data);
+ }
@LoginNoRequired
- @ApiOperation("鍛婅澶勭悊鍒嗘瀽")
+ @ApiOperation("鍛婅澶勭悊鍒嗘瀽闆嗗悎")
@GetMapping("/alarmHandleData")
- public ApiResponse<List<AlarmHandleDataVO>> alarmHandleData(@RequestParam Integer type) {
- List<AlarmHandleDataVO> alarmHandleDataVOList = new ArrayList<>();
- Random random = new Random();
- for (int i = 1; i <= 12; i++) {
- AlarmHandleDataVO alarmHandleDataVO = new AlarmHandleDataVO();
- alarmHandleDataVO.setMonthStr(i+"鏈�");
- alarmHandleDataVO.setAlarmNum(random.nextInt(20));
- alarmHandleDataVO.setErrNum(random.nextInt(20));
- alarmHandleDataVO.setLiftNum(random.nextInt(20));
- alarmHandleDataVO.setProcessingNum(random.nextInt(20));
- alarmHandleDataVOList.add(alarmHandleDataVO);
- }
+ public ApiResponse<List<AlarmDataVO>> alarmHandleData() {
+ List<AlarmDataVO> alarmHandleDataVOList = boardService.fightingAlarmHandleData();
return ApiResponse.success(alarmHandleDataVOList);
}
-
-
@LoginNoRequired
- @ApiOperation("鏈勾娑堥槻璁惧/璁炬柦缁存姢鎯呭喌")
+ @ApiOperation("鏈勾鍜屾湰鏈堟柊澧炴秷闃茶澶�/璁炬柦缁存姢鎯呭喌")
@GetMapping("/yearDeviceData")
public ApiResponse<YearDeviceDataVO> yearDeviceData() {
- Random random = new Random();
- YearDeviceDataVO yearDeviceDataVO = new YearDeviceDataVO();
- yearDeviceDataVO.setMonthAddNum(random.nextInt(100));
- yearDeviceDataVO.setPlanProtectTotal(random.nextInt(1000));
- yearDeviceDataVO.setProtectNum(yearDeviceDataVO.getPlanProtectTotal());
+ YearDeviceDataVO yearDeviceDataVO = boardService.yearFightingAdminDeviceData();
return ApiResponse.success(yearDeviceDataVO);
}
-
-
-
-
}
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 9dc10e9..2df12af 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: pro
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 532b31e..da546e4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -157,11 +157,13 @@
String[] energyTodayLoadData= new String[]{"/api/v1/exhibition/energy/getTodayLoadData","鑳借�楃湅鏉�-5.鍥尯瀹炴椂璐熻嵎鏇茬嚎"};//鑳借�楃湅鏉�-5.鍥尯瀹炴椂璐熻嵎鏇茬嚎
String[] energyTrend= new String[]{"/api/v1/report/energyTrend","鑳借�楃湅鏉�-6鎸夋湀鏌ヨ杩�12涓湀鐨勭敤鐢垫�婚噺鏁版嵁"};//鑳借�楃湅鏉�-6鎸夋湀鏌ヨ杩�12涓湀鐨勭敤鐢垫�婚噺鏁版嵁
String[] fireStatistic= new String[]{"/api/v1/fireStatistic","娑堥槻缁翠繚缁熻"};//娑堥槻缁翠繚缁熻
+ String[] fireStatisticMonth= new String[]{"/api/v1/fireStatisticMonth","娑堥槻缁翠繚缁熻姣忔湀鏂板"};//娑堥槻缁翠繚缁熻姣忔湀鏂板
String[] getFireDevStatusTotal= new String[]{"/api/dataBoardService/v2/getFireDevStatusTotal","娑堥槻鐪嬫澘-娑堥槻璁惧鍦ㄧ绾�1"};//娑堥槻鐪嬫澘-娑堥槻璁惧鍦ㄧ绾�1
String[] getFireDevStatusList= new String[]{"/api/dataBoardService/v2/getFireDevStatusList","娑堥槻鐪嬫澘-鍚勭被鍨嬭澶囧湪绾跨巼2"};//娑堥槻鐪嬫澘-鍚勭被鍨嬭澶囧湪绾跨巼2
String[] findAlarmBaseDataStatistic= new String[]{"/api/v1/alarm/findAlarmBaseDataStatistic","娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻"};//娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻
String[] findHomeAlarmInfoPage= new String[]{"/api/v1/alarm/findHomeAlarmInfoPage","瀹夐槻鐪嬫澘-- 鍒嗛〉鏌ヨ鏈鐞嗘姤璀︿俊鎭�6"};//瀹夐槻鐪嬫澘-- 鍒嗛〉鏌ヨ鏈鐞嗘姤璀︿俊鎭�6
- String[] minitorDataSearch= new String[]{"/api/fem/v1/minitor/data/search","鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁"};//鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
+ String[] minitorDataSearchV1= new String[]{"/api/fem/v1/minitor/data/search","鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁"};//鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
+ String[] minitorDataSearch= new String[]{"/api/fpms/v2/minitor/data/search"};//鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
}
/**
* 闄勫綍A.55娑堥槻璁惧绫诲瀷
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 349e5ff..e033aac 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -791,6 +791,14 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.fireStatistic,body);
}
/**
+ * 娑堥槻缁翠繚姣忔湀鏂板缁熻
+ * @param body
+ * @return
+ */
+ public static String fireStatisticMonth(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireStatisticMonth,body);
+ }
+ /**
* 娑堥槻鐪嬫澘-娑堥槻璁惧鍦ㄧ绾�1
* @param body
* @return
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageRequest.java
index 06fbb2b..655fae6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageRequest.java
@@ -6,6 +6,7 @@
public class BaseListPageRequest {
private String userId;// Head String true 鐢ㄦ埛ID
private Integer pageNo ;//integer True 椤电爜,pageNo鈮�1
+ private Integer page ;//integer True 椤电爜,pageNo鈮�1
private Integer pageSize;// integer True 鍒嗛〉澶у皬
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/RegionTopPowerResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/RegionTopPowerResponse.java
index b3ab95d..56005b9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/RegionTopPowerResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/RegionTopPowerResponse.java
@@ -12,5 +12,5 @@
@ApiModelProperty(value = "鍊�")
private BigDecimal value ;//Number false 鍊�
@ApiModelProperty(value = "鍗犳瘮")
- private BigDecimal percent ;//Number false 鍗犳瘮
+ private BigDecimal percent ;//Number false 鍗犳瘮
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 6bc3a8d..fe7905c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -1767,6 +1767,25 @@
return null;
}
/**
+ *鏈湀鏂板缁翠繚璁惧鏁�
+ * api_fire_statistic_month
+ * @return
+ */
+ public static BaseResponse<FireStatisticResponse> fireStatisticMonth(FireStatisticRequest param){
+ log.info("銆愭捣搴锋秷闃茬淮淇濈粺璁℃瘡鏈堟柊澧炪��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.fireStatisticMonth(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<FireStatisticResponse>>(){};
+ BaseResponse<FireStatisticResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍娑堥槻缁翠繚缁熻姣忔湀鏂板");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋秷闃茬淮淇濈粺璁℃瘡鏈堟柊澧炪��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
*娑堥槻鐪嬫澘-娑堥槻璁惧鍦ㄧ绾�1
* @return
*/
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmDataVO.java
index cfcd27f..40ccf43 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmDataVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmDataVO.java
@@ -27,6 +27,10 @@
@ApiModelProperty(value = "澶勭悊涓暟閲�")
private Integer processingNum;
+ @ApiModelProperty(value = "缁熻鏃堕棿寮�濮�")
+ private String startDate;
+ @ApiModelProperty(value = "缁熻鏃堕棿缁撴潫")
+ private String endDate;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmEventDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmEventDataVO.java
new file mode 100644
index 0000000..7a14036
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/AlarmEventDataVO.java
@@ -0,0 +1,36 @@
+package com.doumee.dao.web.response.platformReport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鏈勾娑堥槻璁惧/璁炬柦缁存姢鎯呭喌
+ *
+ * @Author : Rk
+ * @create 2024/10/25 14:26
+ */
+@Data
+public class AlarmEventDataVO {
+
+
+ @ApiModelProperty(value = "鎶ヨ婧愯缁嗗湴鍧�")
+ private String location;
+ @ApiModelProperty(value = "鎶ヨ婧愬悕绉�")
+ private String alarmName;
+ @ApiModelProperty(value = "鍖哄煙鍚嶇О")
+ private String regionName;
+ @ApiModelProperty(value = "鍖哄煙缂栫爜")
+ private String regionIndexCode;
+ @ApiModelProperty(value = "鎶ヨ鏃堕棿 鏃堕棿鏍煎紡yyyy-MM-dd HH:mm:ss")
+ private String alarmTime;
+ @ApiModelProperty(value = "鎶ヨ婧愯祫婧愬悕绉�")
+ private String resourceName;
+ @ApiModelProperty(value = "鎶ヨ鐘舵��")
+ private String handleStatus;
+ @ApiModelProperty(value = "鎶ヨ绫诲瀷鍚嶇О")
+ private String alarmTypeName;
+
+
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/DeviceNumByTypeVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/DeviceNumByTypeVO.java
new file mode 100644
index 0000000..e5410dd
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/DeviceNumByTypeVO.java
@@ -0,0 +1,39 @@
+package com.doumee.dao.web.response.platformReport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 娑堥槻绠℃帶澶у睆
+ *
+ * @Author : Rk
+ * @create 2024/10/25 13:53
+ */
+@Data
+public class DeviceNumByTypeVO {
+
+
+ @ApiModelProperty(value = "璁惧绫诲瀷鍚嶇О")
+ private String typeName;
+ @ApiModelProperty(value = "鍦ㄧ嚎璁惧鏁伴噺")
+ private Integer onlineDeviceNum;
+
+ @ApiModelProperty(value = "鎶ヨ璁惧鏁伴噺")
+ private Integer alarmDeviceNum;
+
+ @ApiModelProperty(value = "鏁呴殰璁惧鏁伴噺")
+ private Integer errDeviceNum;
+ @ApiModelProperty(value = "鎬昏澶囨暟")
+ private Integer totalDeviceNum;
+
+ @ApiModelProperty(value = "绂荤嚎璁惧鏁伴噺")
+ private Integer offlineDeviceNum;
+
+ @ApiModelProperty(value = "灞忚斀璁惧鏁伴噺")
+ private Integer shieldDeviceNum;
+
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminBoardVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminBoardVO.java
index 77b5a38..14994f1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminBoardVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminBoardVO.java
@@ -15,6 +15,8 @@
public class FightingAdminBoardVO {
+ @ApiModelProperty(value = "璁惧绫诲瀷鍚嶇О")
+ private String typeName;
@ApiModelProperty(value = "鍦ㄧ嚎璁惧鏁伴噺")
private Integer onlineDeviceNum;
@@ -23,6 +25,8 @@
@ApiModelProperty(value = "鏁呴殰璁惧鏁伴噺")
private Integer errDeviceNum;
+ @ApiModelProperty(value = "鎬昏澶囨暟")
+ private Integer totalDeviceNum;
@ApiModelProperty(value = "绂荤嚎璁惧鏁伴噺")
private Integer offlineDeviceNum;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminCenterDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminCenterDataVO.java
new file mode 100644
index 0000000..8d31449
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminCenterDataVO.java
@@ -0,0 +1,45 @@
+package com.doumee.dao.web.response.platformReport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 娑堥槻绠℃帶澶у睆
+ *
+ * @Author : Rk
+ * @create 2024/10/25 13:53
+ */
+@Data
+public class FightingAdminCenterDataVO {
+
+
+ @ApiModelProperty(value = "鍦ㄧ嚎璁惧鏁伴噺")
+ private Integer onlineDeviceNum;
+
+ @ApiModelProperty(value = "鎶ヨ璁惧鏁伴噺")
+ private Integer alarmDeviceNum;
+
+ @ApiModelProperty(value = "鏁呴殰璁惧鏁伴噺")
+ private Integer errDeviceNum;
+ @ApiModelProperty(value = "鎬昏澶囨暟")
+ private Integer totalDeviceNum;
+
+ @ApiModelProperty(value = "绂荤嚎璁惧鏁伴噺")
+ private Integer offlineDeviceNum;
+
+ @ApiModelProperty(value = "灞忚斀璁惧鏁伴噺")
+ private Integer shieldDeviceNum;
+ @ApiModelProperty(value = "闅愭偅鎬绘暟")
+ private Integer dangerTotalNum;
+ @ApiModelProperty(value = "浠婃棩闅愭偅澶勭悊閲�")
+ private Integer dangerDealedNum;
+
+
+ @ApiModelProperty(value = "鎸夎澶囧垎绫荤粺璁″懙鍛�" , hidden = true)
+ private List<DeviceNumByTypeVO> deviceTypeList;
+
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java
new file mode 100644
index 0000000..ea6fc86
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataInfoVO.java
@@ -0,0 +1,31 @@
+package com.doumee.dao.web.response.platformReport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鏈勾娑堥槻璁惧/璁炬柦缁存姢鎯呭喌
+ *
+ * @Author : Rk
+ * @create 2024/10/25 14:26
+ */
+@Data
+public class MonitorDataInfoVO {
+
+ @ApiModelProperty(value = "鐩戞祴绫诲瀷")
+ private String typeCode ;//String false 鐩戞祴绫诲瀷锛屽弬鑰僛闄勫綍A.70 娑堥槻鐩戞祴绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.70 娑堥槻鐩戞祴绫诲瀷]涓被鍨嬪ぇ绫�
+ @ApiModelProperty(value = "鐩戞祴鍚嶇О")
+ private String typeName ;//String false 鐩戞祴鍚嶇О
+ @ApiModelProperty(value = "鎶ヨ婧愯缁嗗湴鍧�")
+ private String location;
+ @ApiModelProperty(value = "鐩戞祴鍊�")
+ private String value;
+ @ApiModelProperty(value = "灏忕被鍚嶇О")
+ private String cateName;
+ @ApiModelProperty(value = "灏忕被缂栧彿")
+ private String cateCode;
+
+
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataVO.java
new file mode 100644
index 0000000..5e0daa7
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/MonitorDataVO.java
@@ -0,0 +1,24 @@
+package com.doumee.dao.web.response.platformReport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鏈勾娑堥槻璁惧/璁炬柦缁存姢鎯呭喌
+ *
+ * @Author : Rk
+ * @create 2024/10/25 14:26
+ */
+@Data
+public class MonitorDataVO {
+
+
+ @ApiModelProperty(value = "璁惧鎴栬�呬紶鎰熷櫒鍚嶇О")
+ private String name;
+ @ApiModelProperty(value = "鐩戞祴鏁版嵁闆嗗悎")
+ private List<MonitorDataInfoVO> dataList;
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/YearDeviceDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/YearDeviceDataVO.java
index 04a7a8c..0923b20 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/YearDeviceDataVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/YearDeviceDataVO.java
@@ -21,6 +21,8 @@
@ApiModelProperty(value = "鏈湀鏂板缁翠繚")
private Integer monthAddNum;
+ @ApiModelProperty(value = "鏈湀缁翠繚鎬绘暟")
+ private Integer monthTotalNum;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index dcabfe6..8886314 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -29,8 +29,10 @@
import com.doumee.service.business.third.BoardService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -48,6 +50,8 @@
public class BoardServiceImpl implements BoardService {
@Autowired
private PlatformLogMapper platformLogMapper;
+ @Autowired
+ private HiddenDangerMapper hiddenDangerMapper;
@Autowired
private PlatformWaterGasMapper platformWaterGasMapper;
@Autowired
@@ -401,11 +405,11 @@
List<EnergyDataVO> loadCurveList = new ArrayList<>();
try {
BaseResponse<List<EnergyTodayLoadDataResponse>> response = HKService.energyTodayLoadData();
- if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
for (EnergyTodayLoadDataResponse model :response.getData()) {
EnergyDataVO data = new EnergyDataVO();
data.setTimeData(model.getName());
- data.setEnergy(new BigDecimal(model.getName()));
+ data.setEnergy(new BigDecimal(StringUtils.defaultString(model.getValue(),"0")));
loadCurveList.add(data);
}
}
@@ -434,6 +438,192 @@
return oilDataVOList;
}
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鏈勾鍜屾湰鏈堟柊澧炴秷闃茶澶�/璁炬柦缁存姢鎯呭喌
+ * @return
+ *
+ */
+ @Override
+ public List<AlarmEventDataVO> fightingAdminAlertList(){
+ List<AlarmEventDataVO> data = new ArrayList<>();
+
+ //鏌ヨ24灏忔椂鍐呯殑
+ FindHomeAlarmInfoPageRequest param = new FindHomeAlarmInfoPageRequest();
+ param.setHour(24);
+ param.setPage(1);
+ param.setAlarmStartTime(DateUtil.getPlusTime2(DateUtil.addDaysToDate(new Date(),-1)));
+ param.setAlarmEndTime(DateUtil.getPlusTime2(new Date()));
+ param.setPageSize(20);
+ BaseResponse<BaseListPageResponse<FindHomeAlarmInfoPageResponse>> response = HKService.findHomeAlarmInfoPage(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && response.getData()!=null
+ &&response.getData().getList()!=null) {
+ for(FindHomeAlarmInfoPageResponse r : response.getData().getList()){
+ AlarmEventDataVO t = new AlarmEventDataVO();
+ BeanUtils.copyProperties(r,t);
+ data.add(t);
+ }
+ }
+ return data;
+
+ }
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-瀹炴椂鐩戞祴鏁版嵁
+ * @return
+ *
+ */
+ @Override
+ public List<MonitorDataVO> monitorDataList(){
+ List<MonitorDataVO> list = new ArrayList<>();
+ MinitorDataSearchRequest param = new MinitorDataSearchRequest();
+ param.setResourceTypeCodes(new String[]{});
+ param.setRegionIndexCode("root0001");
+ param.setIncludeDown("1");
+ param.setUserId("admin");
+ BaseResponse<BaseListPageResponse<MonitorDataSearchResponse>> response = HKService.minitorDataSearch(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && response.getData()!=null ) {
+ List<MonitorDataSearchResponse> r = response.getData().getList();
+ if(r!= null){
+ for(MonitorDataSearchResponse model : r){
+ MonitorDataVO m = new MonitorDataVO();
+ m.setName(model.getName());
+ m.setDataList(new ArrayList<>());
+ if(model.getValues()!=null){
+ for(MonitorDataValResponse v : model.getValues()){
+ MonitorDataInfoVO vm = new MonitorDataInfoVO();
+ vm.setValue(v.getMonitorValue());
+ vm.setCateName(v.getMonitorSpecificName());
+ vm.setCateCode(v.getMonitorTypeKey());
+ vm.setTypeCode(v.getMonitorTypeCode());
+ vm.setTypeName(v.getMonitorTypeName());
+ }
+ }
+ }
+ }
+ }
+ return list;
+ }
+
+
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鍛婅澶勭悊鍒嗘瀽闆嗗悎
+ * @return
+ *
+ */
+ @Override
+ public List<AlarmDataVO> fightingAlarmHandleData(){
+ List<AlarmDataVO> alarmHandleDataVOList = new ArrayList<>();
+ Date now = DateUtil.getStartOfDay(new Date());
+ for (int i = 1; i < 12; i++) {
+ Date start = DateUtil.addMonthToDate(now,-12+i);
+ Date end = DateUtil.addMonthToDate(now,-11+i);
+ AlarmDataVO t = getAlertDataByStartEndTime(DateUtil.getPlusTime2(start),DateUtil.getPlusTime2(end));
+ alarmHandleDataVOList.add(t);
+ }
+ return alarmHandleDataVOList;
+ }
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鍛婅淇℃伅闆嗗悎
+ *
+ * @return
+ *
+ */
+ @Override
+ public AlarmDataVO alarmDataSumByCate(){
+ AlarmDataVO alarmDataVO = getAlertDataByStartEndTime(DateUtil.getPlusTime2(DateUtil.addDaysToDate(new Date(),-1))
+ ,(DateUtil.getPlusTime2(new Date())));
+ return alarmDataVO;
+ }
+
+ public static AlarmDataVO getAlertDataByStartEndTime(String start,String end){
+ AlarmDataVO alarmDataVO = new AlarmDataVO();
+ FindAlarmBaseDataStatisticRequest param = new FindAlarmBaseDataStatisticRequest();
+ param.setAlarmStartTime(start);
+ param.setAlarmEndTime(end);
+ param.setUserId("admin");
+ BaseResponse<FindAlarmBaseDataStatisticResponse> response = HKService.findAlarmBaseDataStatistic(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && response.getData()!=null ) {
+ alarmDataVO.setTotalNum(Constants.formatIntegerNum(response.getData().getTotalAlarmNum()));
+ alarmDataVO.setRealNum(Constants.formatIntegerNum(response.getData().getTotalAlarmNum()));
+ alarmDataVO.setErrNum(Constants.formatIntegerNum(response.getData().getMisReportAlarmNum()));
+ alarmDataVO.setLiftNum(Constants.formatIntegerNum(response.getData().getHandledAlarmNum()));
+ alarmDataVO.setProcessingNum(Constants.formatIntegerNum(response.getData().getUnHandedAlarmNum()));
+ alarmDataVO.setStartDate(start);
+ alarmDataVO.setEndDate(end);
+ }
+ return alarmDataVO;
+ }
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鏈勾鍜屾湰鏈堟柊澧炴秷闃茶澶�/璁炬柦缁存姢鎯呭喌
+ * @return
+ */
+ @Override
+ public YearDeviceDataVO yearFightingAdminDeviceData(){
+ YearDeviceDataVO data = new YearDeviceDataVO();
+
+ FireStatisticRequest param = new FireStatisticRequest();
+ param.setIndexCode("api_fire_statistic");
+ BaseResponse<FireStatisticResponse> response = HKService.fireStatistic(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ) {
+ data.setProtectNum(Constants.formatIntegerNum(response.getData().getMaintenanceNum()));
+ data.setPlanProtectTotal(Constants.formatIntegerNum(response.getData().getDeviceTotalNum()));
+ }
+
+ param = new FireStatisticRequest();
+ param.setIndexCode("api_fire_statistic_month");
+ BaseResponse<FireStatisticResponse> response1 = HKService.fireStatisticMonth(param);
+ if(response1 != null && StringUtils.equals(response1.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && response1.getData()!=null ) {
+ data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNum()));
+ data.setMonthTotalNum(Constants.formatIntegerNum(response1.getData().getDeviceTotalNum()));
+ }
+ return data;
+
+ }
+
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鍒嗙被鍜屾眹鎬荤殑鍚勭姸鎬佽澶囨暟閲�
+ * @return
+ */
+ @Override
+ public FightingAdminCenterDataVO centerFightingAdminData(){
+ FightingAdminCenterDataVO data = new FightingAdminCenterDataVO();
+ List<DeviceNumByTypeVO> list = new ArrayList<>();
+ FireDevStatusTotalRequest param = new FireDevStatusTotalRequest();
+ param.setIncludeBool(1);
+ param.setRegionIds(new String[]{"root000000"});
+ BaseResponse<List<FireDevStatusListResponse>> response = HKService.getFireDevStatusList(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ for(FireDevStatusListResponse r :response.getData()){
+ DeviceNumByTypeVO t = new DeviceNumByTypeVO();
+ t.setTypeName(r.getDevTypeName());
+ t.setOfflineDeviceNum(Constants.formatIntegerNum(r.getOfflineFireDevCount()));
+ t.setAlarmDeviceNum(Constants.formatIntegerNum(r.getAlarmFireDevCount()));
+ t.setOnlineDeviceNum(Constants.formatIntegerNum(r.getOnlineFireDevCount()));
+ t.setErrDeviceNum(Constants.formatIntegerNum(r.getFaultFireDevCount()));
+ t.setTotalDeviceNum(Constants.formatIntegerNum(r.getTotalFireDevCount()));
+ list.add(t);
+ data.setOfflineDeviceNum(Constants.formatIntegerNum( data.getOfflineDeviceNum())+Constants.formatIntegerNum(r.getOfflineFireDevCount()));
+ data.setAlarmDeviceNum(Constants.formatIntegerNum( data.getAlarmDeviceNum())+Constants.formatIntegerNum(r.getAlarmFireDevCount()));
+ data.setOnlineDeviceNum(Constants.formatIntegerNum( data.getOnlineDeviceNum())+Constants.formatIntegerNum(r.getOnlineFireDevCount()));
+ data.setErrDeviceNum(Constants.formatIntegerNum( data.getErrDeviceNum())+Constants.formatIntegerNum(r.getFaultFireDevCount()));
+ data.setTotalDeviceNum(Constants.formatIntegerNum( data.getTotalDeviceNum())+Constants.formatIntegerNum(r.getTotalFireDevCount()));
+ }
+ }
+ data.setDeviceTypeList(list);
+ Long totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
+ .eq(HiddenDanger::getIsdeleted,Constants.ZERO )
+ .apply("to_day(create_data) = to_days(now())" ) );
+ data.setDangerTotalNum(totalNum !=null?totalNum.intValue():0);//浠婃棩闅愭偅鏁伴噺
+ totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
+ .eq(HiddenDanger::getIsdeleted,Constants.ZERO )
+ .in(HiddenDanger::getStatus,Constants.ONE,Constants.TWO )
+ .apply("to_day(check_date) = to_days(now())" ) );
+ data.setDangerDealedNum(totalNum !=null?totalNum.intValue():0);//浠婃棩澶勭悊闅愭偅鏁伴噺
+ return data;
+ }
/**
* 鐢ㄧ數鎬昏兘鑰楀悓姣斻�佺幆姣斿拰鍖哄煙鐢ㄧ數閲忛泦鍚�
* @return
@@ -473,7 +663,7 @@
Date month0 = DateUtil.getDateFromString(firstDate);
Date month1 = DateUtil.increaseMonth(month0,-1);//涓婃湀
Date month2 = DateUtil.increaseMonth(month0,-2);//涓婁笂鏈�
- Date month3 = DateUtil.increaseMonth(month0,-12);//鍘诲勾鍚屾湀
+ Date month3 = DateUtil.increaseMonth(month0,-13);//鍘诲勾鍚屾湀
List<PlatformWaterGas> list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
.lambda()
@@ -494,10 +684,10 @@
data.getGasQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
}
if(model.getTimeInfo().getTime() == month2.getTime()){
- data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
}
if(model.getTimeInfo().getTime() == month3.getTime()){
- data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
}
}else if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
@@ -509,10 +699,10 @@
data.getWaterQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
}
if(model.getTimeInfo().getTime() == month2.getTime()){
- data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getWaterQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
}
if(model.getTimeInfo().getTime() == month3.getTime()){
- data.getWaterQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
}
}
}
@@ -557,7 +747,7 @@
* @param data
*/
private void getLastMonthElectricityData(EnergyModelDataVO data) {
- BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
+ BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0"));
data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0"));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
index a465b65..fe0d750 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
@@ -69,4 +69,16 @@
RegionEnergyListResponse energyRegionData();
EnergyBoardVO centerEnergyData();
+
+ FightingAdminCenterDataVO centerFightingAdminData();
+
+ YearDeviceDataVO yearFightingAdminDeviceData();
+
+ List<AlarmEventDataVO> fightingAdminAlertList();
+
+ AlarmDataVO alarmDataSumByCate();
+
+ List<AlarmDataVO> fightingAlarmHandleData();
+
+ List<MonitorDataVO> monitorDataList();
}
diff --git a/server/visits/dmvisit_service/src/main/resources/application-dev.yml b/server/visits/dmvisit_service/src/main/resources/application-dev.yml
index 98d9c9a..0221f4a 100644
--- a/server/visits/dmvisit_service/src/main/resources/application-dev.yml
+++ b/server/visits/dmvisit_service/src/main/resources/application-dev.yml
@@ -1,12 +1,12 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
- username: doumee
- password: rtjgfEr@&0c0m
-# url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-# username: root
-# password: Atwl@2024
+# url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+# username: doumee
+# password: rtjgfEr@&0c0m
+ url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ username: root
+ password: Atwl@2024
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
redis:
--
Gitblit v1.9.3