From 3ef2e9d87847763b7b2cae55fe52f75d5ef7f65f Mon Sep 17 00:00:00 2001
From: DYL <Dn1332079466>
Date: 星期一, 10 二月 2025 11:05:22 +0800
Subject: [PATCH] 电能负荷分析
---
zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java | 10 ++--
/dev/null | 5 --
zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java | 12 +-----
zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java | 20 +++------
zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricLoadServiceImpl.java | 44 ++++++++-------------
zhitan-system/src/main/java/com/zhitan/model/domain/EnergyIndex.java | 27 -------------
6 files changed, 32 insertions(+), 86 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java
index 3e4d5c9..b20411c 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricLoadController.java
@@ -4,10 +4,8 @@
import com.zhitan.common.constant.CommonConst;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
-import com.zhitan.energyMonitor.domain.EnergyUnitToDevice;
import com.zhitan.energyMonitor.domain.vo.ListElectricLoadVO;
import com.zhitan.energyMonitor.service.IElectricLoadService;
-import com.zhitan.energyMonitor.service.IEnergyUnitToDeviceService;
import com.zhitan.model.domain.EnergyIndex;
import com.zhitan.model.service.IEnergyIndexService;
import io.swagger.annotations.Api;
@@ -31,8 +29,6 @@
@Slf4j
public class ElectricLoadController extends BaseController {
@Autowired
- private IEnergyUnitToDeviceService energyUnitToDeviceService;
- @Autowired
private IElectricLoadService electricLoadService;
@Autowired
private IEnergyIndexService energyIndexService;
@@ -40,23 +36,21 @@
/**
* 鏍规嵁鐢佃〃id鑾峰彇璐熻嵎鍒嗘瀽鏁版嵁
*
- * @param energyUnitId 鐢ㄨ兘鍗曞厓id
- * @param meterId 鐢佃〃id
- * @param timeType 鏃堕棿绫诲瀷 DAY/MONTH/YEAR
- * @param timeCode 鏃堕棿鍊� 涓庢椂闂寸被鍨嬪搴旓細2022-03-21/2022-03/2022
- * @return
+ * @param nodeId 鐢ㄨ兘鍗曞厓id
+ * @param meterId 鐢佃〃id
+ * @param timeType 鏃堕棿绫诲瀷 DAY/MONTH/YEAR
+ * @param timeCode 鏃堕棿鍊� 涓庢椂闂寸被鍨嬪搴旓細2022-03-21/2022-03/2022
*/
@Log(title = "鏍规嵁鐢佃〃id鑾峰彇璐熻嵎鍒嗘瀽鏁版嵁")
@ApiOperation(value = "鏍规嵁鐢佃〃id鑾峰彇璐熻嵎鍒嗘瀽鏁版嵁", notes = "鏍规嵁鐢佃〃id鑾峰彇璐熻嵎鍒嗘瀽鏁版嵁")
@GetMapping(value = "/detail")
- public AjaxResult list(@RequestParam(name = "energyUnitId") String energyUnitId,
+ public AjaxResult list(@RequestParam(name = "nodeId") String nodeId,
@RequestParam(name = "meterId") String meterId,
@RequestParam(name = "timeType") String timeType,
@RequestParam(name = "timeCode") String timeCode) {
- EnergyIndex energyIndex = energyIndexService.getDeviceIndexByCode(energyUnitId, meterId, CommonConst.TAG_CODE_ZYGGL);
+ EnergyIndex energyIndex = energyIndexService.getDeviceIndexByCode(nodeId, meterId, CommonConst.TAG_CODE_ZYGGL);
- EnergyUnitToDevice energyUnitToDevice = energyUnitToDeviceService.getEnergyUnitToDeviceById(energyUnitId, meterId);
- ListElectricLoadVO vo = electricLoadService.list(timeType, timeCode, energyIndex, energyUnitToDevice);
+ ListElectricLoadVO vo = electricLoadService.list(timeType, timeCode, energyIndex);
return AjaxResult.success(vo);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/energyMonitor/domain/ElectricLoadEntity.java b/zhitan-system/src/main/java/com/zhitan/energyMonitor/domain/ElectricLoadEntity.java
deleted file mode 100644
index 0d089e2..0000000
--- a/zhitan-system/src/main/java/com/zhitan/energyMonitor/domain/ElectricLoadEntity.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zhitan.energyMonitor.domain;
-
-import lombok.Data;
-
-/**
- * @Description: TODO
- * @author: yxw
- * @date: 2022骞�04鏈�24鏃� 15:58
- */
-@Data
-public class ElectricLoadEntity {
-}
diff --git a/zhitan-system/src/main/java/com/zhitan/energyMonitor/domain/EnergyUnitToDevice.java b/zhitan-system/src/main/java/com/zhitan/energyMonitor/domain/EnergyUnitToDevice.java
deleted file mode 100644
index bf35d02..0000000
--- a/zhitan-system/src/main/java/com/zhitan/energyMonitor/domain/EnergyUnitToDevice.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.zhitan.energyMonitor.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zhitan.common.annotation.Excel;
-import com.zhitan.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-/**
- * @Description: 鐢ㄨ兘鍗曞厓鍏宠仈鐨勫钩鍙版ā鏉夸腑浠〃鐨勭晫闈㈤�昏緫鍏崇郴 涓嶅惈鏈� 閲囬泦銆佽绠椾俊鎭�
- * @Author: jeecg-boot
- * @Date: 2022-01-26
- * @Version: V1.0
- */
-@Data
-@TableName("energy_unit_to_device")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="energy_unit_to_device瀵硅薄", description="鐢ㄨ兘鍗曞厓鍏宠仈鐨勫钩鍙版ā鏉夸腑浠〃鐨勭晫闈㈤�昏緫鍏崇郴 涓嶅惈鏈� 閲囬泦銆佽绠椾俊鎭�")
-public class EnergyUnitToDevice extends BaseEntity {
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "鏂颁富閿�")
- @TableId(type = IdType.ASSIGN_ID)
- private String newId;
-
- /**涓婚敭*/
- @ApiModelProperty(value = "涓婚敭")
- private String id;
-
- /**鍏宠仈浠〃鍚嶇О*/
- @Excel(name = "鍏宠仈浠〃鍚嶇О", width = 15)
- @ApiModelProperty(value = "鍏宠仈浠〃鍚嶇О")
- private String name;
-
- /**鍏宠仈浠〃缂栫爜*/
- @Excel(name = "鍏宠仈浠〃缂栫爜", width = 15)
- @ApiModelProperty(value = "鍏宠仈浠〃缂栫爜")
- private String code;
-
- /**鑳芥簮绫诲瀷锛堟按琛ㄣ�佺數琛ㄣ�佹皵琛ㄧ瓑锛�*/
- @Excel(name = "鑳芥簮绫诲瀷锛堟按琛ㄣ�佺數琛ㄣ�佹皵琛ㄧ瓑锛�", width = 15)
- @ApiModelProperty(value = "鑳芥簮绫诲瀷锛堟按琛ㄣ�佺數琛ㄣ�佹皵琛ㄧ瓑锛�")
- private String deviceType;
-
- /**鐢ㄨ兘鍗曞厓涓婚敭*/
- @Excel(name = "鐢ㄨ兘鍗曞厓涓婚敭", width = 15)
- @ApiModelProperty(value = "鐢ㄨ兘鍗曞厓涓婚敭")
- private String energyUnitId;
-
- /**绉熸埛涓婚敭*/
- @Excel(name = "绉熸埛涓婚敭", width = 15)
- @ApiModelProperty(value = "绉熸埛涓婚敭")
- private Integer tenantId;
-
- @ApiModelProperty(value = "鍙備笌璁￠噺")
- private String partMeasurement;
-
- @ApiModelProperty(value = "瀹夎浣嶇疆")
- private String installPosition;
-
- @ApiModelProperty(value = "鍒嗘憡姣斾緥")
- private BigDecimal shareRatio;
-}
diff --git a/zhitan-system/src/main/java/com/zhitan/energyMonitor/mapper/ElectricLoadMapper.java b/zhitan-system/src/main/java/com/zhitan/energyMonitor/mapper/ElectricLoadMapper.java
deleted file mode 100644
index 8bd0ba4..0000000
--- a/zhitan-system/src/main/java/com/zhitan/energyMonitor/mapper/ElectricLoadMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.zhitan.energyMonitor.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhitan.energyMonitor.domain.ElectricLoadEntity;
-
-/**
- * @Description: sensor_alarm_item
- * @Author: jeecg-boot
- * @Date: 2022-04-19
- * @Version: V1.0
- */
-public interface ElectricLoadMapper extends BaseMapper<ElectricLoadEntity> {
-
-}
diff --git a/zhitan-system/src/main/java/com/zhitan/energyMonitor/mapper/EnergyUnitToDeviceMapper.java b/zhitan-system/src/main/java/com/zhitan/energyMonitor/mapper/EnergyUnitToDeviceMapper.java
deleted file mode 100644
index 32edd1e..0000000
--- a/zhitan-system/src/main/java/com/zhitan/energyMonitor/mapper/EnergyUnitToDeviceMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.zhitan.energyMonitor.mapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhitan.energyMonitor.domain.EnergyUnitToDevice;
-import com.zhitan.energyMonitor.domain.vo.EnergyCalculateCalcTV;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @Description: 鐢ㄨ兘鍗曞厓鍏宠仈鐨勫钩鍙版ā鏉夸腑浠〃鐨勭晫闈㈤�昏緫鍏崇郴 涓嶅惈鏈� 閲囬泦銆佽绠椾俊鎭�
- * @Author: jeecg-boot
- * @Date: 2022-01-26
- * @Version: V1.0
- */
-public interface EnergyUnitToDeviceMapper extends BaseMapper<EnergyUnitToDevice> {
-
- /**
- * 鏍规嵁璁＄畻鐐逛綅涓婚敭鍜岀敤鑳藉崟鍏冧富閿� 鏌ヨ 浣跨敤鐨� 閲囬泦鐐瑰強浠〃淇℃伅
- *
- * @param calculateIndexId
- * @param energyUnitId
- * @return
- */
- public List<EnergyCalculateCalcTV> getCalculateDevices(@Param("calculateIndexId") String calculateIndexId,
- @Param("energyUnitId") String energyUnitId,
- @Param("tenantId") String tenantId);
-
- /**
- * 涓-鏍规嵁绉熸埛id闆嗗悎鏌ヨ璁￠噺鍣ㄥ叿id
- *
- * @param unitIds
- * @return
- */
- @InterceptorIgnore(tenantLine = "true")
- List<String> listDeviceByTenantIds(@Param("unitIds") List<String> unitIds);
-}
diff --git a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java b/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java
index 9b32577..f3c4448 100644
--- a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java
+++ b/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IElectricLoadService.java
@@ -1,8 +1,5 @@
package com.zhitan.energyMonitor.service;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhitan.energyMonitor.domain.ElectricLoadEntity;
-import com.zhitan.energyMonitor.domain.EnergyUnitToDevice;
import com.zhitan.energyMonitor.domain.vo.ListElectricLoadVO;
import com.zhitan.model.domain.EnergyIndex;
@@ -12,15 +9,10 @@
* @Date: 2022-04-19
* @Version: V1.0
*/
-public interface IElectricLoadService extends IService<ElectricLoadEntity> {
+public interface IElectricLoadService {
/**
* 鑾峰彇璐熻嵎鍒嗘瀽鏁版嵁
- *
- * @param timeType
- * @param timeCode
- * @param energyIndex
- * @return
*/
- ListElectricLoadVO list(String timeType, String timeCode, EnergyIndex energyIndex, EnergyUnitToDevice energyUnitToDevice);
+ ListElectricLoadVO list(String timeType, String timeCode, EnergyIndex energyIndex);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IEnergyUnitToDeviceService.java b/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IEnergyUnitToDeviceService.java
deleted file mode 100644
index 30bb563..0000000
--- a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/IEnergyUnitToDeviceService.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.zhitan.energyMonitor.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhitan.energyMonitor.domain.EnergyUnitToDevice;
-import com.zhitan.energyMonitor.domain.vo.ListElectricityMeterVO;
-import com.zhitan.energyMonitor.domain.vo.UnitToDeviceRelationVO;
-
-import java.util.List;
-
-/**
- * @Description: 鐢ㄨ兘鍗曞厓鍏宠仈鐨勫钩鍙版ā鏉夸腑浠〃鐨勭晫闈㈤�昏緫鍏崇郴 涓嶅惈鏈� 閲囬泦銆佽绠椾俊鎭�
- * @Author: jeecg-boot
- * @Date: 2022-01-26
- * @Version: V1.0
- */
-public interface IEnergyUnitToDeviceService extends IService<EnergyUnitToDevice> {
-
- /**
- * 鏍规嵁鐢ㄨ兘鍗曞厓ID鑾峰彇绉熸埛涓嬫湁鏁堢殑浠〃闆嗗悎
- * @param unitId
- * @return
- */
- List<EnergyUnitToDevice> queryTenantUnitDeviceByUnitId(String unitId);
-
- /**
- * 鏍规嵁鐢ㄨ兘鍗曞厓ID鑾峰彇绉熸埛涓嬫墍鏈夋湁鏁堢殑瀹炰綋琛ㄩ泦鍚�
- * @param unitId
- * @return
- */
- List<EnergyUnitToDevice> queryTenantEntityMeterByUnitId(String unitId);
-
- /**
- * 鏍规嵁鐢ㄨ兘鍗曞厓id鑾峰彇绉熸埛涓嬫湁鏁堢殑浠〃id闆嗗悎
- *
- * @param unitId 鐢ㄨ兘鍗曞厓id
- * @return 浠〃id闆嗗悎
- */
- List<String> getEnergyUnitDeviceIdByUnitId(String unitId);
-
- /**
- * 鏍规嵁鐢ㄨ兘鍗曞厓id闆嗗悎鑾峰彇绉熸埛涓嬫湁鏁堢殑浠〃id闆嗗悎
- *
- * @param unitIds 鐢ㄨ兘鍗曞厓id
- */
- List<String> getEnergyUnitDeviceIdByUnitIds(List<String> unitIds);
-
- /**
- * 鏍规嵁鐢ㄨ兘鍗曞厓id闆嗗悎+鑳芥簮绫诲瀷鑾峰彇绉熸埛涓嬫湁鏁堢殑浠〃id闆嗗悎
- *
- * @param unitIds 鐢ㄨ兘鍗曞厓id闆嗗悎
- * @return
- */
- List<String> getDeviceIdByUnitIds(List<String> unitIds);
-
- /**
- * 鏇存柊鑳藉崟鍏僫d鑾峰彇绉熸埛涓嬫湁鏁堢殑浠〃id闆嗗悎
- *
- * @param unitId 鐢ㄨ兘鍗曞厓id
- * @return 浠〃id闆嗗悎
- */
- List<String> updateEnergyUnitDeviceIdByUnitId(String unitId);
-
- /**
- * 鍒犻櫎鑳藉崟鍏僫d鑾峰彇绉熸埛涓嬫湁鏁堢殑浠〃id闆嗗悎
- * @param unitId 鐢ㄨ兘鍗曞厓id
- * @return 浠〃id闆嗗悎
- */
- void deleteEnergyUnitDeviceIdByUnitId(String unitId);
-
- /**
- * 鏍规嵁鐢ㄨ兘鍗曞厓ID鑾峰彇绉熸埛涓嬫湁鏁堢殑鐢佃〃闆嗗悎
- * @param unitId
- * @return
- */
- List<ListElectricityMeterVO> listElectricityMeter(String unitId);
-
- /**
- * 鑾峰彇绉熸埛涓嬫湁鏁堢殑琛ㄩ泦鍚�
- * @return
- */
- List<EnergyUnitToDevice> listAllMeter();
-
- /**
- * 鏍规嵁璁￠噺鍣ㄥ叿id鍜岀敤鑳藉崟鍏僫d鏌ヨ琛ㄥ叧绯�
- *
- * @param unitId 鐢ㄨ兘鍗曞厓id
- * @param id id
- * @return EnergyUnitToDevice瀹炰綋
- */
- EnergyUnitToDevice getEnergyUnitToDeviceById(String unitId, String id);
-
- /**
- * 鏍规嵁璁￠噺鍣ㄥ叿id闆嗗悎鏌ヨ涓庣敤鑳界殑鍏崇郴
- *
- * @param unitIds
- * @return
- */
- List<UnitToDeviceRelationVO> listDeviceByUnitIds(List<String> unitIds);
-}
diff --git a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricLoadServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricLoadServiceImpl.java
index 2eb8560..a01fd03 100644
--- a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricLoadServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricLoadServiceImpl.java
@@ -1,7 +1,8 @@
package com.zhitan.energyMonitor.service.impl;
import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhitan.basicdata.domain.MeterImplement;
+import com.zhitan.basicdata.mapper.MeterImplementMapper;
import com.zhitan.common.constant.CommonConst;
import com.zhitan.common.constant.TimeTypeConst;
import com.zhitan.common.enums.CollectionModes;
@@ -10,12 +11,9 @@
import com.zhitan.common.utils.DateTimeUtil;
import com.zhitan.common.utils.DoubleUtil;
import com.zhitan.common.utils.StringUtil;
-import com.zhitan.energyMonitor.domain.ElectricLoadEntity;
-import com.zhitan.energyMonitor.domain.EnergyUnitToDevice;
import com.zhitan.energyMonitor.domain.vo.ListElectricLoadDetail;
import com.zhitan.energyMonitor.domain.vo.ListElectricLoadItem;
import com.zhitan.energyMonitor.domain.vo.ListElectricLoadVO;
-import com.zhitan.energyMonitor.mapper.ElectricLoadMapper;
import com.zhitan.energyMonitor.service.IElectricLoadService;
import com.zhitan.model.domain.EnergyIndex;
import com.zhitan.realtimedata.domain.TagValue;
@@ -26,6 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -37,12 +36,14 @@
* @Version: V1.0
*/
@Service
-public class ElectricLoadServiceImpl extends ServiceImpl<ElectricLoadMapper, ElectricLoadEntity> implements IElectricLoadService {
+public class ElectricLoadServiceImpl implements IElectricLoadService {
@Autowired
private RealtimeDatabaseService realtimeDatabaseService;
+ @Resource
+ private MeterImplementMapper meterImplementMapper;
@Override
- public ListElectricLoadVO list(String timeType, String timeCode, EnergyIndex energyIndex, EnergyUnitToDevice energyUnitToDevice) {
+ public ListElectricLoadVO list(String timeType, String timeCode, EnergyIndex energyIndex) {
ListElectricLoadVO vo = new ListElectricLoadVO();
List<ListElectricLoadItem> itemList = new ArrayList<>();
vo.setItemList(itemList);
@@ -54,16 +55,19 @@
detail.setAvg(CommonConst.DOUBLE_MINUS_SIGN);
detail.setRate(CommonConst.DOUBLE_MINUS_SIGN);
vo.setDetail(detail);
- if (ObjectUtil.isEmpty(energyIndex) || ObjectUtil.isEmpty(energyUnitToDevice)) {
+
+ MeterImplement meterImplement = meterImplementMapper.selectById(energyIndex.getMeterId());
+
+ if (ObjectUtil.isEmpty(meterImplement)) {
return vo;
}
List<Date> dateList = new ArrayList<>();
ChartUtils.generateDateList(timeType, timeCode, dateList);
// 鍥犱负influxdb娌℃湁鎸夌収鏈堝垎缁勫彇鏁版嵁锛屽彧鑳芥寜鐓ф棩鏈熷惊鐜彇鏁版嵁
if (TimeTypeConst.TIME_TYPE_YEAR.equals(timeType)) {
- getYearData(timeType, dateList, energyIndex, energyUnitToDevice, detail, itemList);
+ getYearData(timeType, dateList, energyIndex, meterImplement.getMeterName(), itemList);
} else {
- getDayAndMonthData(timeType, timeCode, energyIndex, energyUnitToDevice, detail, itemList);
+ getDayAndMonthData(timeType, timeCode, energyIndex, meterImplement.getMeterName(), itemList);
}
if (!StringUtil.isEmptyOrNull(energyIndex.getCode())) {
Date start = ChartUtils.getDateTime(timeType, timeCode);
@@ -113,15 +117,8 @@
/**
* 鑾峰彇鏈堝拰澶╂暟鎹�,鍥犱负influxdb鍙互鎸夌収鍒嗐�傛椂銆傚ぉ鍒嗙粍鍙栨暟锛屼笉鍙互鎸夌収鏈堝垎缁勫彇鏁帮紝鎵�浠ュ垎鎴愪袱涓柟娉曟潵鍐�
- *
- * @param timeType
- * @param timeCode
- * @param energyIndex
- * @param energyUnitToDevice
- * @param detail
- * @param itemList
*/
- private void getDayAndMonthData(String timeType, String timeCode, EnergyIndex energyIndex, EnergyUnitToDevice energyUnitToDevice, ListElectricLoadDetail detail, List<ListElectricLoadItem> itemList) {
+ private void getDayAndMonthData(String timeType, String timeCode, EnergyIndex energyIndex, String meterName, List<ListElectricLoadItem> itemList) {
String tagCodes = energyIndex.getCode();
List<TagValue> maxList = new ArrayList<>();
List<TagValue> minList = new ArrayList<>();
@@ -165,7 +162,7 @@
for (Date date : dateList) {
ListElectricLoadItem temp = new ListElectricLoadItem();
temp.setTimeCode(ChartUtils.getTimeCode(timeType, date));
- temp.setName(ObjectUtils.isNotEmpty(energyUnitToDevice) ? energyUnitToDevice.getName() : "");
+ temp.setName(ObjectUtils.isNotEmpty(meterName) ? meterName : "");
temp.setMax(CommonConst.DOUBLE_MINUS_SIGN);
temp.setMin(CommonConst.DOUBLE_MINUS_SIGN);
temp.setAvg(CommonConst.DOUBLE_MINUS_SIGN);
@@ -219,15 +216,8 @@
/**
* 鑾峰彇骞存暟鎹�
- *
- * @param timeType
- * @param dateList
- * @param energyIndex
- * @param energyUnitToDevice
- * @param detail
- * @param itemList
*/
- private void getYearData(String timeType, List<Date> dateList, EnergyIndex energyIndex, EnergyUnitToDevice energyUnitToDevice, ListElectricLoadDetail detail, List<ListElectricLoadItem> itemList) {
+ private void getYearData(String timeType, List<Date> dateList, EnergyIndex energyIndex, String meterName, List<ListElectricLoadItem> itemList) {
String tagCode = StringUtil.ifEmptyOrNullReturnValue(energyIndex.getCode());
for (Date date : dateList) {
ListElectricLoadItem temp = new ListElectricLoadItem();
@@ -253,7 +243,7 @@
temp.setTimeCode(ChartUtils.getTimeCode(timeType, date));
temp.setTimeCodeChart(ChartUtils.getTimeCodeChart(timeType, date));
- temp.setName(StringUtil.ifEmptyOrNullReturnValue(energyUnitToDevice.getName()));
+ temp.setName(StringUtil.ifEmptyOrNullReturnValue(meterName));
temp.setRate(CommonConst.DOUBLE_MINUS_SIGN);
temp.setValue(CommonConst.DOUBLE_MINUS_SIGN);
if (!temp.getMax().equals(CommonConst.DOUBLE_MINUS_SIGN) && Double.parseDouble(temp.getMax()) != CommonConst.DIGIT_DOUBLE_0) {
diff --git a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/EnergyUnitToDeviceServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/EnergyUnitToDeviceServiceImpl.java
deleted file mode 100644
index 5df3d47..0000000
--- a/zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/EnergyUnitToDeviceServiceImpl.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package com.zhitan.energyMonitor.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhitan.common.constant.CommonConst;
-import com.zhitan.energyMonitor.domain.EnergyUnitToDevice;
-import com.zhitan.energyMonitor.domain.vo.ListElectricityMeterVO;
-import com.zhitan.energyMonitor.domain.vo.UnitToDeviceRelationVO;
-import com.zhitan.energyMonitor.mapper.EnergyUnitToDeviceMapper;
-import com.zhitan.energyMonitor.service.IEnergyUnitToDeviceService;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 鐢ㄨ兘鍗曞厓鍏宠仈鐨勫钩鍙版ā鏉夸腑浠〃鐨勭晫闈㈤�昏緫鍏崇郴 涓嶅惈鏈� 閲囬泦銆佽绠椾俊鎭�
- * @Author: jeecg-boot
- * @Date: 2022-01-26
- * @Version: V1.0
- */
-@Service
-public class EnergyUnitToDeviceServiceImpl extends ServiceImpl<EnergyUnitToDeviceMapper, EnergyUnitToDevice>
- implements IEnergyUnitToDeviceService {
-
-
-// @Autowired
-// private IMeasuringInstrumentsService meterService;
-
-
- /**
- * 鏍规嵁鐢ㄨ兘鍗曞厓id鑾峰彇绉熸埛涓嬬殑鍏朵笅鐨勪华琛ㄥ垪琛�
- *
- * @param unitId
- * @return
- */
- @Override
- public List<EnergyUnitToDevice> queryTenantUnitDeviceByUnitId(String unitId) {
-
- QueryWrapper<EnergyUnitToDevice> queryWrapper = new QueryWrapper<EnergyUnitToDevice>();
-// .eq(TableColumnConst.TABLE_COLUMN_ENERGY_UNIT_ID, unitId);
- return baseMapper.selectList(queryWrapper);
- }
-
- /**
- * 鏍规嵁鐢ㄨ兘鍗曞厓ID鑾峰彇绉熸埛涓嬫墍鏈夋湁鏁堢殑瀹炰綋琛ㄩ泦鍚�
- *
- * @param unitId
- * @return
- */
- @Override
- public List<EnergyUnitToDevice> queryTenantEntityMeterByUnitId(String unitId) {
-
- List<EnergyUnitToDevice> unitToDeviceList = baseMapper.selectList(Wrappers.<EnergyUnitToDevice>lambdaQuery()
- .eq(EnergyUnitToDevice::getEnergyUnitId, unitId)
- );
-// if (CollectionUtils.isNotEmpty(unitToDeviceList)) {
-// List<String> meterIds = unitToDeviceList.stream().map(EnergyUnitToDevice::getId).collect(Collectors.toList());
-// // 杩囨护鍑哄疄浣撹〃
-// Integer applianceType = EquipmentInformationEnum.MEASURING_INSTRUMENT_TYPE.ENTITY.getValue();
-// List<Meter> meterList = meterService.list(Wrappers.<Meter>lambdaQuery()
-// .select(Meter::getId).in(Meter::getId, meterIds)
-// .eq(Meter::getApplianceType, applianceType)
-// );
-// List<String> newMeterIds = meterList.stream().map(Meter::getId).collect(Collectors.toList());
-// unitToDeviceList = unitToDeviceList.stream().filter(li -> newMeterIds.contains(li.getId())).collect(Collectors.toList());
-// }
- return unitToDeviceList;
- }
-
- /**
- * 鏍规嵁鐢ㄨ兘鍗曞厓id鑾峰彇绉熸埛涓嬫湁鏁堢殑浠〃id闆嗗悎
- *
- * @param unitId 鐢ㄨ兘鍗曞厓id
- * @return 浠〃id闆嗗悎
- */
- @Override
-// @Cacheable(value = CacheConstant.ENERGY_UNIT_DEVICE_ID_CACHE, key = "#unitId", unless = "#result == null")
- public List<String> getEnergyUnitDeviceIdByUnitId(String unitId) {
-
- if (StringUtils.isEmpty(unitId)) {
- return Collections.emptyList();
- }
- List<EnergyUnitToDevice> energyUnitToDevices = baseMapper.selectList(Wrappers.<EnergyUnitToDevice>lambdaQuery()
- .select(EnergyUnitToDevice::getId).eq(EnergyUnitToDevice::getEnergyUnitId, unitId)
- );
- if (CollectionUtils.isEmpty(energyUnitToDevices)) {
- return Collections.emptyList();
- }
- return energyUnitToDevices.stream().map(EnergyUnitToDevice::getId).collect(Collectors.toList());
- }
-
- /**
- * 鏍规嵁鐢ㄨ兘鍗曞厓id闆嗗悎鑾峰彇绉熸埛涓嬫湁鏁堢殑浠〃id闆嗗悎
- *
- * @param unitIds 鐢ㄨ兘鍗曞厓id
- */
- @Override
- public List<String> getEnergyUnitDeviceIdByUnitIds(List<String> unitIds) {
- if (CollectionUtils.isEmpty(unitIds)) {
- return Collections.emptyList();
- }
- List<String> deviceIdList = new ArrayList<>();
- for (String unitId : unitIds) {
- List<String> unitDeviceIdByUnitId = this.getEnergyUnitDeviceIdByUnitId(unitId);
- if (CollectionUtils.isNotEmpty(unitDeviceIdByUnitId)) {
- deviceIdList.addAll(unitDeviceIdByUnitId);
- }
- }
- return deviceIdList;
- }
-
- /**
- * 鏍规嵁鐢ㄨ兘鍗曞厓id闆嗗悎+鑳芥簮绫诲瀷鑾峰彇绉熸埛涓嬫湁鏁堢殑浠〃id闆嗗悎
- *
- * @param unitIds 鐢ㄨ兘鍗曞厓id闆嗗悎
- * @return
- */
- @Override
- public List<String> getDeviceIdByUnitIds(List<String> unitIds) {
- if (CollectionUtils.isEmpty(unitIds)) {
- return Collections.emptyList();
- }
-
- return baseMapper.listDeviceByTenantIds(unitIds);
- }
-
- /**
- * 鏇存柊鑳藉崟鍏僫d鑾峰彇绉熸埛涓嬫湁鏁堢殑浠〃id闆嗗悎
- *
- * @param unitId 鐢ㄨ兘鍗曞厓id
- * @return 浠〃id闆嗗悎
- */
- @Override
-// @CachePut(value = CacheConstant.ENERGY_UNIT_DEVICE_ID_CACHE, key = "#unitId", unless = "#result == null")
- public List<String> updateEnergyUnitDeviceIdByUnitId(String unitId) {
-
- if (StringUtils.isEmpty(unitId)) {
- return Collections.emptyList();
- }
- List<EnergyUnitToDevice> energyUnitToDevices = baseMapper.selectList(Wrappers.<EnergyUnitToDevice>lambdaQuery()
- .select(EnergyUnitToDevice::getId).eq(EnergyUnitToDevice::getEnergyUnitId, unitId)
- );
- if (CollectionUtils.isEmpty(energyUnitToDevices)) {
- return Collections.emptyList();
- }
- return energyUnitToDevices.stream().map(EnergyUnitToDevice::getId).collect(Collectors.toList());
- }
-
- /**
- * 鍒犻櫎鑳藉崟鍏僫d鑾峰彇绉熸埛涓嬫湁鏁堢殑浠〃id闆嗗悎
- *
- * @param unitId 鐢ㄨ兘鍗曞厓id
- */
- @Override
-// @CacheEvict(value = CacheConstant.ENERGY_UNIT_DEVICE_ID_CACHE, key = "#unitId")
- public void deleteEnergyUnitDeviceIdByUnitId(String unitId) {
- }
-
- @Override
- public List<ListElectricityMeterVO> listElectricityMeter(String unitId) {
-
- LambdaQueryWrapper<EnergyUnitToDevice> queryWrapper = new LambdaQueryWrapper<EnergyUnitToDevice>()
- .eq(EnergyUnitToDevice::getEnergyUnitId, unitId);
-// .eq(EnergyUnitToDevice::getDeviceType, EnergyTypeConst.ELECTRICITY);
- List<EnergyUnitToDevice> models = baseMapper.selectList(queryWrapper);
-
- List<ListElectricityMeterVO> resultList = new ArrayList<>();
- for (EnergyUnitToDevice model : models) {
- ListElectricityMeterVO temp = new ListElectricityMeterVO();
- temp.setCode(model.getId());
- temp.setLabel(model.getName());
- resultList.add(temp);
- }
- return resultList;
- }
-
- @Override
- public List<EnergyUnitToDevice> listAllMeter() {
- QueryWrapper<EnergyUnitToDevice> queryWrapper = new QueryWrapper<EnergyUnitToDevice>();
- return baseMapper.selectList(queryWrapper);
- }
-
- @Override
- public EnergyUnitToDevice getEnergyUnitToDeviceById(String unitId, String id) {
- if (StringUtils.isEmpty(id)) {
- return null;
- }
- LambdaQueryWrapper<EnergyUnitToDevice> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(EnergyUnitToDevice::getEnergyUnitId, unitId);
- lambdaQueryWrapper.eq(EnergyUnitToDevice::getId, id);
- List<EnergyUnitToDevice> energyUnitToDevices = baseMapper.selectList(lambdaQueryWrapper);
- if (CollectionUtils.isNotEmpty(energyUnitToDevices)) {
- return energyUnitToDevices.get(CommonConst.DIGIT_0);
- }
- return null;
- }
-
- /**
- * 鏍规嵁璁￠噺鍣ㄥ叿id闆嗗悎鏌ヨ涓庣敤鑳界殑鍏崇郴
- *
- * @param unitIds
- * @return
- */
- @Override
- public List<UnitToDeviceRelationVO> listDeviceByUnitIds(List<String> unitIds) {
- List<UnitToDeviceRelationVO> relationList = new ArrayList<>();
- if (CollectionUtils.isEmpty(unitIds)) {
- return relationList;
- }
- List<EnergyUnitToDevice> unitToDeviceList = baseMapper.selectList(Wrappers.<EnergyUnitToDevice>lambdaQuery()
- .select(EnergyUnitToDevice::getId, EnergyUnitToDevice::getEnergyUnitId, EnergyUnitToDevice::getName)
- .in(EnergyUnitToDevice::getEnergyUnitId, unitIds)
- );
- if (CollectionUtils.isNotEmpty(unitToDeviceList)) {
- unitToDeviceList.forEach(li -> {
- UnitToDeviceRelationVO vo = new UnitToDeviceRelationVO();
- vo.setDeviceId(li.getId());
- vo.setUnitId(li.getEnergyUnitId());
- vo.setDeviceName(li.getName());
- relationList.add(vo);
- });
- }
- return relationList;
- }
-}
diff --git a/zhitan-system/src/main/java/com/zhitan/model/domain/EnergyIndex.java b/zhitan-system/src/main/java/com/zhitan/model/domain/EnergyIndex.java
index 140689e..c9af73f 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/domain/EnergyIndex.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/domain/EnergyIndex.java
@@ -75,6 +75,7 @@
@ApiModelProperty(value = "琛ㄨid")
private String meterId;
+
@ApiModelProperty(value = "椤哄簭鍙�")
@Excel(name = "椤哄簭鍙�")
private int orderNum;
@@ -85,35 +86,9 @@
@ApiModelProperty(value = "id")
private String energyId;
- /**
- * 鐢ㄨ兘鍗曞厓id
- */
- private String energyUnitId;
-
- /**
- * 鍗曞厓鍒拌澶囩殑id
- */
- private String energyUnitToDeviceId;
-
@Transient
@TableField(exist = false)
private String meterName;
-
- public String getEnergyUnitId() {
- return energyUnitId;
- }
-
- public String getEnergyUnitToDeviceId() {
- return energyUnitToDeviceId;
- }
-
- public void setEnergyUnitId(String energyUnitId) {
- this.energyUnitId = energyUnitId;
- }
-
- public void setEnergyUnitToDeviceId(String energyUnitToDeviceId) {
- this.energyUnitToDeviceId = energyUnitToDeviceId;
- }
public void setIndexId(String indexId) {
this.indexId = indexId;
diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
index 8269d9d..47e57ca 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
@@ -321,15 +321,15 @@
/**
* 鏍规嵁鐢ㄨ兘鍗曞厓id鍜岃澶噄d锛屼互鍙婄偣浣嶇紪鐮佽幏鍙栫偣浣�
*
- * @param energyUnitId 鐢ㄨ兘鍗曞厓id
+ * @param nodeId 鑺傜偣id
* @param meterId 璁惧id
* @param indexCode 鐐逛綅缂栫爜鎴栬�呯偣浣嶇紪鐮佺殑涓�閮ㄥ垎
* @return
*/
@Override
- public EnergyIndex getDeviceIndexByCode(String energyUnitId, String meterId, String indexCode) {
+ public EnergyIndex getDeviceIndexByCode(String nodeId, String meterId, String indexCode) {
- List<EnergyIndex> energyIndexList = listDeviceIndexByCode(energyUnitId, meterId, indexCode);
+ List<EnergyIndex> energyIndexList = listDeviceIndexByCode(nodeId, meterId, indexCode);
EnergyIndex energyIndex = energyIndexList.stream().findFirst().orElse(null);
if (ObjectUtils.isEmpty(energyIndex)) {
energyIndex = new EnergyIndex();
@@ -347,8 +347,8 @@
*/
public List<EnergyIndex> listDeviceIndexByCode(String energyUnitId, String meterId, String indexCode) {
return energyIndexMapper.selectList(Wrappers.<EnergyIndex>lambdaQuery()
- .eq(EnergyIndex::getEnergyUnitId, energyUnitId)
- .eq(EnergyIndex::getEnergyUnitToDeviceId, meterId)
+ .eq(EnergyIndex::getNodeId, energyUnitId)
+ .eq(EnergyIndex::getMeterId, meterId)
.like(EnergyIndex::getCode, indexCode));
}
}
diff --git a/zhitan-system/src/main/resources/mapper/energyMonitor/ElectricLoadMapper.xml b/zhitan-system/src/main/resources/mapper/energyMonitor/ElectricLoadMapper.xml
deleted file mode 100644
index fa624b8..0000000
--- a/zhitan-system/src/main/resources/mapper/energyMonitor/ElectricLoadMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhitan.energyMonitor.mapper.ElectricLoadMapper">
-
-</mapper>
\ No newline at end of file
--
Gitblit v1.9.3