diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/BalanceServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/BalanceServiceImpl.java index 6fedc8971..af181af26 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/BalanceServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/BalanceServiceImpl.java @@ -71,13 +71,13 @@ public class BalanceServiceImpl implements BalanceService { List aList = balanceMapper.getFeatureAmplitude(PubUtils.beginTimeToLocalDateTime(advanceBaseParam.getStartTime()), PubUtils.endTimeToLocalDateTime(advanceBaseParam.getEndTime()), generalDeviceDTO.getLineIndexes()); Map map = aList.stream().collect(Collectors.toMap(AdvanceBaseDTO::getLineId, AdvanceBaseDTO::getValueA)); - List a90List = balanceMapper.getSarfi(PubUtils.beginTimeToLocalDateTime(advanceBaseParam.getStartTime()), PubUtils.endTimeToLocalDateTime(advanceBaseParam.getEndTime()), generalDeviceDTO.getLineIndexes(), 90f); + List a90List = balanceMapper.getSarfi(PubUtils.beginTimeToLocalDateTime(advanceBaseParam.getStartTime()), PubUtils.endTimeToLocalDateTime(advanceBaseParam.getEndTime()), generalDeviceDTO.getLineIndexes(), 0.9f); Map map90 = a90List.stream().collect(Collectors.toMap(AdvanceBaseDTO::getLineId, AdvanceBaseDTO::getValueB)); - List a50List = balanceMapper.getSarfi(PubUtils.beginTimeToLocalDateTime(advanceBaseParam.getStartTime()), PubUtils.endTimeToLocalDateTime(advanceBaseParam.getEndTime()), generalDeviceDTO.getLineIndexes(), 50f); + List a50List = balanceMapper.getSarfi(PubUtils.beginTimeToLocalDateTime(advanceBaseParam.getStartTime()), PubUtils.endTimeToLocalDateTime(advanceBaseParam.getEndTime()), generalDeviceDTO.getLineIndexes(), 0.5f); Map map50 = a50List.stream().collect(Collectors.toMap(AdvanceBaseDTO::getLineId, AdvanceBaseDTO::getValueB)); - List aSeverityList = balanceMapper.getSarfiSeverity(PubUtils.beginTimeToLocalDateTime(advanceBaseParam.getStartTime()), PubUtils.endTimeToLocalDateTime(advanceBaseParam.getEndTime()), generalDeviceDTO.getLineIndexes(), 50f); + List aSeverityList = balanceMapper.getSarfiSeverity(PubUtils.beginTimeToLocalDateTime(advanceBaseParam.getStartTime()), PubUtils.endTimeToLocalDateTime(advanceBaseParam.getEndTime()), generalDeviceDTO.getLineIndexes(), 0.5f); Map aSeverityListMap = aSeverityList.stream().collect(Collectors.toMap(AdvanceBaseDTO::getLineId, AdvanceBaseDTO::getValueA)); List listTem = new ArrayList<>(); diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/GetBalanceUtils.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/GetBalanceUtils.java index 196a4d9d4..d379d7962 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/GetBalanceUtils.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/GetBalanceUtils.java @@ -44,11 +44,16 @@ public class GetBalanceUtils { if (newList.size() > 0) { packageData(newList, qvvrDataStruct); JnaCallDllOrSo jnaCallDll = new JnaCallBalance("qvvr_balance.dll"); + System.out.println("路径>>>>>>>"+jnaCallDll.getStrpath()); + jnaCallDll.setPath(); + System.out.println("路径++++"+jnaCallDll.getStrpath()); // 计算暂降综合评估 try { JnaCallBalance.Balancelibrary INSTANTCE = JnaCallBalance.Balancelibrary.INSTANTCE; + + INSTANTCE.qvvr_fun_cause(qvvrDataStruct); } catch (Exception e) { e.printStackTrace(); diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallBalance.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallBalance.java index a18548586..55901fe46 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallBalance.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallBalance.java @@ -21,12 +21,16 @@ public class JnaCallBalance extends JnaCallDllOrSo{ @Override public void setPath() { JnaCallBalance.strpath = super.getStrpath(); + System.out.println("真实路径-----"+super.getStrpath()); } public interface Balancelibrary extends Library { // 加载Lib库 + + Balancelibrary INSTANTCE = (Balancelibrary) Native.loadLibrary(JnaCallBalance.strpath, Balancelibrary.class); + // 定义方法--->与C方法相对应 void qvvr_fun_cause(QvvrDataStruct data); } diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallDllOrSo.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallDllOrSo.java index 190147b23..a217fb83e 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallDllOrSo.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/JnaCallDllOrSo.java @@ -23,14 +23,17 @@ public class JnaCallDllOrSo { this.nameDll = name; try { - String os = System.getProperty("os.name"); // 获取当前操作系统的类型 - int beginIndex = os != null && os.startsWith("Windows") ? 1 : 0;// windows操作系统为1 否则为0 + // 获取当前操作系统的类型 + String os = System.getProperty("os.name"); + // windows操作系统为1 否则为0 + int beginIndex = os != null && os.startsWith("Windows") ? 1 : 0; if(beginIndex == 0){ //linux操作系统 this.path = URLDecoder.decode(this.getClass().getProtectionDomain().getCodeSource().getLocation().getPath(), "UTF-8"); }else { this.path = URLDecoder.decode(this.getClass().getProtectionDomain().getCodeSource().getLocation().getPath().replaceFirst("/", ""), "UTF-8"); } + System.out.println("初始化路径************"+this.path); } catch (UnsupportedEncodingException e) { log.error(e.getMessage()); @@ -49,8 +52,8 @@ public class JnaCallDllOrSo { pathPackage = pathPackage.replace('.', '/'); this.pathDll = packagePath(path + pathPackage); this.pathDll = path + pathPackage + "/" + this.nameDll; - - return path.endsWith(".jar");//如果dll在jar包内部返回true，否则返回true + //如果dll在jar包内部返回true，否则返回true + return path.endsWith(".jar"); } public boolean exitFile() {//判断dll文件是否存在 @@ -84,7 +87,7 @@ public class JnaCallDllOrSo { } public String getStrpath() { - if (judgeFileType()) { + /* if (judgeFileType()) { if (!exitFile()) { copyDll2Path(); } @@ -92,7 +95,10 @@ public class JnaCallDllOrSo { return packagePath(JnaCallDllOrSo.jarPath); } else { return this.pathDll; - } + }*/ + String aa = this.path+this.nameDll; + String bb= aa.replace("/", File.separator); + return bb; } public void setPath() { diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/qvvr_balance.dll b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/qvvr_balance.dll new file mode 100644 index 000000000..4a1ebabb3 Binary files /dev/null and b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/qvvr_balance.dll differ diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/filter/XssFilter.java b/pqs-common/common-web/src/main/java/com/njcn/web/filter/XssFilter.java index 27a181ab9..e2767f779 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/filter/XssFilter.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/filter/XssFilter.java @@ -12,7 +12,7 @@ import java.io.IOException; */ public class XssFilter implements Filter { - private static final String[] EXCLUSIONS_URLS = {".js", ".gif", ".jpg", ".png", ".css", ".ico"}; + private static final String[] EXCLUSIONS_URLS = {".js", ".gif", ".jpg", ".png", ".css", ".ico", ".dll", ".so"}; @Override diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java index 10f482727..494a7d66a 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java @@ -254,6 +254,13 @@ public class SupvPushGwServiceImpl implements SupvPushGwService { //TODO 调用上送接口 + for(SupvReportM supvReportM : supvReportMList){ + SupvReportM supvReportMPO = new SupvReportM(); + supvReportMPO.setMonthReportId(supvReportM.getMonthReportId()); + supvReportMPO.setIsUploadHead(1); + supvReportMMapper.updateById(supvReportMPO); + } + return true; } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java index bf755e2ee..7237888c0 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java @@ -249,7 +249,7 @@ public class SupvReportMServiceImpl extends MppServiceImpl