Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventController.java
#	cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventPOService.java
#	cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
This commit is contained in:
huangzj
2023-09-20 15:38:07 +08:00
7 changed files with 149 additions and 16 deletions

View File

@@ -20,6 +20,7 @@ public enum AlgorithmResponseEnum {
NDID_ERROR("A00502","存在相同的ndid"),
DATA_ERROR("A00503","存在相同的数据"),
LINE_DATA_ERROR ("A00504","设备下监测点数据缺失"),
LINE_DATA_MISS ("A00504","设备下监测点数据缺失"),
POSITION_ERROR ("A00504","监测点位置数据缺失"),
ENGINEERING_DATA_ERROR ("A00505","工程数据数据缺失"),
ELEEPDPQD_DATA_ERROR ("A00506","统计指标据数据缺失"),