From f184e371f07bba76450152be9218f4a04940d67f Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 16 May 2024 09:33:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3json=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-advance/advance-api/pom.xml | 2 +- pqs-advance/advance-boot/pom.xml | 12 ++++++- .../model/responsibility/HIKSDKStructure.java | 31 ++++++++++++++++++ .../model/responsibility/HKDataStruct.java | 3 +- .../model/responsibility/PDataStruct.java | 4 ++- .../model/responsibility/QvvrStruct.java | 10 +++--- .../impl/RespDataServiceImpl.java | 23 +++++++++---- .../src/main/resources/harm_response.dll | Bin 249344 -> 249344 bytes pqs-device/device-boot/pom.xml | 14 ++++---- pqs-gateway/src/main/resources/bootstrap.yml | 1 + .../impl/HistoryResultServiceImpl.java | 3 +- .../com/njcn/influx/imapper/IDataIMapper.java | 5 ++- .../device/QuitRunningDeviceController.java | 4 +-- .../device/IQuitRunningDeviceService.java | 2 +- .../impl/QuitRunningDeviceServiceImpl.java | 3 +- 15 files changed, 87 insertions(+), 30 deletions(-) create mode 100644 pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/HIKSDKStructure.java diff --git a/pqs-advance/advance-api/pom.xml b/pqs-advance/advance-api/pom.xml index d214d0de5..dcc9f55f9 100644 --- a/pqs-advance/advance-api/pom.xml +++ b/pqs-advance/advance-api/pom.xml @@ -48,7 +48,7 @@ net.java.dev.jna jna - 5.8.0 + 5.5.0 com.njcn diff --git a/pqs-advance/advance-boot/pom.xml b/pqs-advance/advance-boot/pom.xml index edb7775be..d09840e6d 100644 --- a/pqs-advance/advance-boot/pom.xml +++ b/pqs-advance/advance-boot/pom.xml @@ -56,6 +56,12 @@ com.njcn event-api ${project.version} + + + com.sun.jna + jna + + com.njcn @@ -67,7 +73,11 @@ jackson-datatype-jsr310 - + + net.java.dev.jna + jna + 5.5.0 + diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/HIKSDKStructure.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/HIKSDKStructure.java new file mode 100644 index 000000000..50718dda9 --- /dev/null +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/HIKSDKStructure.java @@ -0,0 +1,31 @@ +package com.njcn.advance.model.responsibility; + +import com.sun.jna.Structure; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; + +/** + * @author: tw + * @date: 2022/1/12 10:57 + */ +public class HIKSDKStructure extends Structure { + protected List getFieldOrder(){ + List fieldOrderList = new ArrayList(); + for (Class cls = getClass(); + !cls.equals(HIKSDKStructure.class); + cls = cls.getSuperclass()) { + Field[] fields = cls.getDeclaredFields(); + int modifiers; + for (Field field : fields) { + modifiers = field.getModifiers(); + if (Modifier.isStatic(modifiers) || !Modifier.isPublic(modifiers)) { + continue; + } + fieldOrderList.add(field.getName()); + } + } + return fieldOrderList; + } +} \ No newline at end of file diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/HKDataStruct.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/HKDataStruct.java index ef1f86862..1ec0db6d1 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/HKDataStruct.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/HKDataStruct.java @@ -3,6 +3,7 @@ package com.njcn.advance.model.responsibility; import com.sun.jna.Structure; import java.io.Serializable; +import java.util.Collections; import java.util.List; public class HKDataStruct extends Structure implements Serializable { @@ -13,7 +14,7 @@ public class HKDataStruct extends Structure implements Serializable { @Override protected List getFieldOrder() { - return null; + return Collections.singletonList("hk"); } public HKDataStruct(double[] hk) { diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/PDataStruct.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/PDataStruct.java index fdf67a23d..34bd887c8 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/PDataStruct.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/PDataStruct.java @@ -4,6 +4,7 @@ import com.sun.jna.Structure; import java.io.Serializable; import java.util.Arrays; +import java.util.Collections; import java.util.List; @@ -15,7 +16,8 @@ public class PDataStruct extends Structure implements Serializable { @Override protected List getFieldOrder() { - return null; +// return null; + return Collections.singletonList("p"); } public PDataStruct(double[] p) { diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/QvvrStruct.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/QvvrStruct.java index 037cd23db..0225caa1b 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/QvvrStruct.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/model/responsibility/QvvrStruct.java @@ -6,7 +6,7 @@ import java.io.Serializable; import java.util.Arrays; import java.util.List; -public class QvvrStruct extends Structure implements Serializable { +public class QvvrStruct extends HIKSDKStructure implements Serializable { public static final int MAX_P_NODE= 200; //功率节点个数限制，按200个限制 public static final int MAX_P_NUM= 96 * 100; //功率数据按15分钟间隔，100天处理 public static final int MAX_HARM_NUM= 1440 * 100; //谐波数据按一分钟间隔，100天处理 @@ -193,8 +193,8 @@ public class QvvrStruct extends Structure implements Serializable { this.sim_data = sim_data; } - @Override - protected List getFieldOrder() { - return Arrays.asList(new String[]{"sumFKdata", "sumHKdata"}); - } +// @Override +// protected List getFieldOrder() { +// return Arrays.asList(new String[]{"sumFKdata", "sumHKdata"}); +// } } diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/responsibility/impl/RespDataServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/responsibility/impl/RespDataServiceImpl.java index 34be3716d..86d843b3a 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/responsibility/impl/RespDataServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/responsibility/impl/RespDataServiceImpl.java @@ -166,7 +166,7 @@ public class RespDataServiceImpl extends ServiceImpl i harmNum = pNum; //至此基础数据组装完毕，开始组装功率数据和谐波数据 //先做谐波数据，理论上到这步的时候，谐波数据是满足完整性并已经补充完整性到100%，此处需要将谐波数据与功率数据长度匹配上 - RespHarmData respHarmData = getRespHarmData(responsibilityCalculateParam,lineInterval); + RespHarmData respHarmData = getRespHarmData(responsibilityCalculateParam, lineInterval); //harmData填充完毕后，开始组装功率数据 //首先获取当前时间内的各个用户的数据 Map> originalPData = new HashMap<>(); @@ -200,7 +200,12 @@ public class RespDataServiceImpl extends ServiceImpl i } } //至此功率数据也组装完毕，调用友谊提供的接口 - QvvrStruct qvvrStruct = new QvvrStruct(); + QvvrStruct qvvrStruct = null; + try { + qvvrStruct = new QvvrStruct(); + } catch (Exception exception) { + exception.printStackTrace(); + } qvvrStruct.cal_flag = 0; qvvrStruct.p_node = pNode; qvvrStruct.p_num = pNum; @@ -212,7 +217,11 @@ public class RespDataServiceImpl extends ServiceImpl i ResponsibilityCallDllOrSo responsibilityCallDllOrSo = new ResponsibilityCallDllOrSo("harm_response"); responsibilityCallDllOrSo.setPath(); ResponsibilityCallDllOrSo.ResponsibilityLibrary responsibilityLibrary = ResponsibilityCallDllOrSo.ResponsibilityLibrary.INSTANTCE; - responsibilityLibrary.harm_response(qvvrStruct); + try { + responsibilityLibrary.harm_response(qvvrStruct); + } catch (Exception exception) { + exception.printStackTrace(); + } //至此接口调用结束，开始组装动态责任数据和用户责任量化结果 //首先判断cal_ok的标识位是否为1，为0表示程序没有计算出结果 if (qvvrStruct.cal_ok == 0) { @@ -863,14 +872,14 @@ public class RespDataServiceImpl extends ServiceImpl i pNum = dateStr.size() * 48; finalData = dealFinalDataByLineInterval(finalData); } - return new RespCommon(pNum, userIntervalTime,lineInterval); + return new RespCommon(pNum, userIntervalTime, lineInterval); } /*** * 获取责任需要的谐波数据 */ - private RespHarmData getRespHarmData(ResponsibilityCalculateParam responsibilityCalculateParam, int lineInterval){ + private RespHarmData getRespHarmData(ResponsibilityCalculateParam responsibilityCalculateParam, int lineInterval) { HarmHistoryDataDTO data = harmDataFeignClient.getHistoryHarmData(new HistoryHarmParam(responsibilityCalculateParam.getSearchBeginTime(), responsibilityCalculateParam.getSearchEndTime(), responsibilityCalculateParam.getLineId(), responsibilityCalculateParam.getType(), responsibilityCalculateParam.getTime())).getData(); List historyData = data.getHistoryData(); historyData = getDataWithLineInterval(historyData, lineInterval); @@ -881,12 +890,12 @@ public class RespDataServiceImpl extends ServiceImpl i for (int i = 0; i < historyData.size(); i++) { Float value = historyData.get(i).getValue(); if (value != null) { - value = value * 1000; +// value = value * 1000; } harmData[i] = value; harmTime.add(PubUtils.instantToDate(historyData.get(i).getTime()).getTime()); } - return new RespHarmData(harmData,harmTime,data.getOverLimit()); + return new RespHarmData(harmData, harmTime, data.getOverLimit()); } } diff --git a/pqs-advance/advance-boot/src/main/resources/harm_response.dll b/pqs-advance/advance-boot/src/main/resources/harm_response.dll index 09eb4881e0d1a6f3f115f9699c5b5500107aec43..6f12364445d9dd91261d9c357b1f3b41c3709adf 100644 GIT binary patch delta 11613 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 SXLX+UU5kvm3lErIUGQ)89_vQ{ diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml index f4089bc9b..6e6756b5e 100644 --- a/pqs-device/device-boot/pom.xml +++ b/pqs-device/device-boot/pom.xml @@ -21,16 +21,16 @@ - - - com.njcn - pms-device-boot - ${project.version} - + + + + + + com.njcn diff --git a/pqs-gateway/src/main/resources/bootstrap.yml b/pqs-gateway/src/main/resources/bootstrap.yml index 65e944b8b..966817ea4 100644 --- a/pqs-gateway/src/main/resources/bootstrap.yml +++ b/pqs-gateway/src/main/resources/bootstrap.yml @@ -231,6 +231,7 @@ whitelist: - /system-boot/** - /supervision-boot/** - /user-boot/** + - /harmonic-boot/** - /user-boot/user/listAllUserByDeptId diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java index 875da1dbc..b0baabae5 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java @@ -1153,7 +1153,8 @@ public class HistoryResultServiceImpl implements HistoryResultService { //以时间分组时，需要加上时间间隔，比如此处需要加上监测点的采样间隔 .groupBy("time(" + lineDetailData.getInterval() + "m)") .timeAsc(); - historyData = dataIMapper.getIHistoryData(influxQueryWrapper); + String string = influxQueryWrapper.generateSql(); + historyData = dataIMapper.getIHistoryData(string); if (CollectionUtils.isEmpty(historyData)) { //如果数据为空，则提示给用户暂无数据 throw new BusinessException(HarmonicResponseEnum.NO_DATA); diff --git a/pqs-influx/src/main/java/com/njcn/influx/imapper/IDataIMapper.java b/pqs-influx/src/main/java/com/njcn/influx/imapper/IDataIMapper.java index 37c9512f7..45e9b9f85 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/imapper/IDataIMapper.java +++ b/pqs-influx/src/main/java/com/njcn/influx/imapper/IDataIMapper.java @@ -18,7 +18,10 @@ public interface IDataIMapper extends InfluxDbBaseMapper { DataI getMeanAllTimesData(InfluxQueryWrapper influxQueryWrapper); - List getIHistoryData(InfluxQueryWrapper influxQueryWrapper); +// List getIHistoryData(InfluxQueryWrapper influxQueryWrapper); + + @Select(value = "#{sql}",resultType = HarmData.class) + List getIHistoryData(@Param("sql")String sql); List getStatisticsByWraper(InfluxQueryWrapper influxQueryWrapper); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java index 8fc42d711..d0db54941 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java @@ -63,9 +63,9 @@ public class QuitRunningDeviceController extends BaseController { @PostMapping("/update") @ApiOperation("更新设备退运") @ApiImplicitParam(name = "quitRunningDeviceUpdateParam", value = "实体参数", required = true) - public HttpResult quitRunningDeviceUpdate(@RequestBody @Validated QuitRunningDeviceParam.QuitRunningDeviceUpdateParam quitRunningDeviceUpdateParam) { + public HttpResult updateQuitRunningDevice(@RequestBody @Validated QuitRunningDeviceParam.QuitRunningDeviceUpdateParam quitRunningDeviceUpdateParam) { String methodDescribe = getMethodDescribe("quitRunningDeviceUpdateParam"); - String runningDeviceId = quitRunningDeviceService.quitRunningDeviceUpdate(quitRunningDeviceUpdateParam); + String runningDeviceId = quitRunningDeviceService.updateQuitRunningDevice(quitRunningDeviceUpdateParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, runningDeviceId, methodDescribe); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java index 1638cff34..44236d228 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java @@ -18,7 +18,7 @@ import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO; public interface IQuitRunningDeviceService extends IService { String addRunningDevice(QuitRunningDeviceParam quitRunningDeviceParam); - String quitRunningDeviceUpdate(QuitRunningDeviceParam.QuitRunningDeviceUpdateParam quitRunningDeviceUpdateParam); + String updateQuitRunningDevice(QuitRunningDeviceParam.QuitRunningDeviceUpdateParam quitRunningDeviceUpdateParam); Page getQuitRunningDevice(QuitRunningDeviceParam.QuitRunningDeviceQueryParam quitRunningDeviceQueryParam); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java index 7e83a7623..ea71b4c7d 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java @@ -87,7 +87,7 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl