diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java index daff643..4e98ca9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java @@ -12,11 +12,9 @@ import com.casic.missiles.core.cache.CacheUtil; import com.casic.missiles.modular.constants.RobotDictConstants; import com.casic.missiles.modular.neutron.dao.PsdMapper; -import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; -import com.casic.missiles.modular.neutron.dto.PsdDataDTO; -import com.casic.missiles.modular.neutron.dto.PsdTxtDTO; -import com.casic.missiles.modular.neutron.dto.PsdTxtExportDTO; +import com.casic.missiles.modular.neutron.dto.*; import com.casic.missiles.modular.neutron.model.Psd; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; import com.casic.missiles.modular.neutron.service.IPsdService; import com.casic.missiles.modular.robot.dto.PointNextDTO; import com.casic.missiles.modular.robot.model.AlarmRecord; @@ -62,7 +60,8 @@ private WebSocket webSocket; @Autowired private IBaseExportService iBaseExportService; - + @Autowired + private IDetectorConfigService iDetectorConfigService; //记录推送次数 private static volatile long times = 0; @@ -230,6 +229,9 @@ @Override public void psdExport(Long robotId,String startTime,String endTime, Long psdX1, Long psdX2, HttpServletResponse response) { + + + Map resultMap = new HashMap<>(); //构造第一列数据 List list1 = new ArrayList<>(); @@ -263,10 +265,15 @@ // Long robotId = taskInfo.getRobotId(); // Date startTime1 = DateUtil.parseDateTime(startTime); // Date endTime1 = DateUtil.parseDateTime(endTime); + + ConfigDTO configDTO = iDetectorConfigService.getConfig(robotId); + Double mcaCutOffValue = configDTO.getMcaCutOffValue(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("DETECTOR_ID", robotId); queryWrapper.ge(ObjectUtil.isNotEmpty(startTime), "CREATE_TIME", startTime); queryWrapper.le(ObjectUtil.isNotEmpty(endTime), "CREATE_TIME", endTime); + queryWrapper.ge(ObjectUtil.isNotEmpty(mcaCutOffValue), "MCAX", mcaCutOffValue); + queryWrapper.le("MCAX", 4096); List psdList = list(queryWrapper); for (Psd psd : psdList) { if (ObjectUtil.isNotEmpty(psd.getPsd())) { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java index daff643..4e98ca9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java @@ -12,11 +12,9 @@ import com.casic.missiles.core.cache.CacheUtil; import com.casic.missiles.modular.constants.RobotDictConstants; import com.casic.missiles.modular.neutron.dao.PsdMapper; -import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; -import com.casic.missiles.modular.neutron.dto.PsdDataDTO; -import com.casic.missiles.modular.neutron.dto.PsdTxtDTO; -import com.casic.missiles.modular.neutron.dto.PsdTxtExportDTO; +import com.casic.missiles.modular.neutron.dto.*; import com.casic.missiles.modular.neutron.model.Psd; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; import com.casic.missiles.modular.neutron.service.IPsdService; import com.casic.missiles.modular.robot.dto.PointNextDTO; import com.casic.missiles.modular.robot.model.AlarmRecord; @@ -62,7 +60,8 @@ private WebSocket webSocket; @Autowired private IBaseExportService iBaseExportService; - + @Autowired + private IDetectorConfigService iDetectorConfigService; //记录推送次数 private static volatile long times = 0; @@ -230,6 +229,9 @@ @Override public void psdExport(Long robotId,String startTime,String endTime, Long psdX1, Long psdX2, HttpServletResponse response) { + + + Map resultMap = new HashMap<>(); //构造第一列数据 List list1 = new ArrayList<>(); @@ -263,10 +265,15 @@ // Long robotId = taskInfo.getRobotId(); // Date startTime1 = DateUtil.parseDateTime(startTime); // Date endTime1 = DateUtil.parseDateTime(endTime); + + ConfigDTO configDTO = iDetectorConfigService.getConfig(robotId); + Double mcaCutOffValue = configDTO.getMcaCutOffValue(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("DETECTOR_ID", robotId); queryWrapper.ge(ObjectUtil.isNotEmpty(startTime), "CREATE_TIME", startTime); queryWrapper.le(ObjectUtil.isNotEmpty(endTime), "CREATE_TIME", endTime); + queryWrapper.ge(ObjectUtil.isNotEmpty(mcaCutOffValue), "MCAX", mcaCutOffValue); + queryWrapper.le("MCAX", 4096); List psdList = list(queryWrapper); for (Psd psd : psdList) { if (ObjectUtil.isNotEmpty(psd.getPsd())) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 7b5edb4..789eaa6 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -5,9 +5,9 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://localhost:3306/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true - url: jdbc:mysql://111.198.10.15:11336/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://192.168.43.65:3306/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: Casic203 + password: 123456 druid: max-active: 50 min-idle: 20 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java index daff643..4e98ca9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java @@ -12,11 +12,9 @@ import com.casic.missiles.core.cache.CacheUtil; import com.casic.missiles.modular.constants.RobotDictConstants; import com.casic.missiles.modular.neutron.dao.PsdMapper; -import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; -import com.casic.missiles.modular.neutron.dto.PsdDataDTO; -import com.casic.missiles.modular.neutron.dto.PsdTxtDTO; -import com.casic.missiles.modular.neutron.dto.PsdTxtExportDTO; +import com.casic.missiles.modular.neutron.dto.*; import com.casic.missiles.modular.neutron.model.Psd; +import com.casic.missiles.modular.neutron.service.IDetectorConfigService; import com.casic.missiles.modular.neutron.service.IPsdService; import com.casic.missiles.modular.robot.dto.PointNextDTO; import com.casic.missiles.modular.robot.model.AlarmRecord; @@ -62,7 +60,8 @@ private WebSocket webSocket; @Autowired private IBaseExportService iBaseExportService; - + @Autowired + private IDetectorConfigService iDetectorConfigService; //记录推送次数 private static volatile long times = 0; @@ -230,6 +229,9 @@ @Override public void psdExport(Long robotId,String startTime,String endTime, Long psdX1, Long psdX2, HttpServletResponse response) { + + + Map resultMap = new HashMap<>(); //构造第一列数据 List list1 = new ArrayList<>(); @@ -263,10 +265,15 @@ // Long robotId = taskInfo.getRobotId(); // Date startTime1 = DateUtil.parseDateTime(startTime); // Date endTime1 = DateUtil.parseDateTime(endTime); + + ConfigDTO configDTO = iDetectorConfigService.getConfig(robotId); + Double mcaCutOffValue = configDTO.getMcaCutOffValue(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("DETECTOR_ID", robotId); queryWrapper.ge(ObjectUtil.isNotEmpty(startTime), "CREATE_TIME", startTime); queryWrapper.le(ObjectUtil.isNotEmpty(endTime), "CREATE_TIME", endTime); + queryWrapper.ge(ObjectUtil.isNotEmpty(mcaCutOffValue), "MCAX", mcaCutOffValue); + queryWrapper.le("MCAX", 4096); List psdList = list(queryWrapper); for (Psd psd : psdList) { if (ObjectUtil.isNotEmpty(psd.getPsd())) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 7b5edb4..789eaa6 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -5,9 +5,9 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://localhost:3306/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true - url: jdbc:mysql://111.198.10.15:11336/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://192.168.43.65:3306/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: Casic203 + password: 123456 druid: max-active: 50 min-idle: 20 diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 14112dc..bfb58b4 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -42,8 +42,8 @@ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒 no-login-urls: /user/login,/kaptcha,/config/baseConfig - hikSdk: D:\workspace\server\keti\casic-robot-inspection\doc\hiklib\HCNetSDK.dll - hikPlay: D:\workspace\server\keti\casic-robot-inspection\doc\hiklib\PlayCtrl.dll + hikSdk: D:\code\robot\casic-robot-inspection\doc\hiklib\HCNetSDK.dll + hikPlay: D:\code\robot\casic-robot-inspection\doc\hiklib\PlayCtrl.dll algorithm: path: D:\robot\path\ initPathName: init.exe