diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java index bffce8c..22f00af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java @@ -38,7 +38,7 @@ @Autowired private WebSocket webSocket; @Resource - private IDetectorConfigService configService; + private IDetectorConfigService iDetectorConfigService; @Override @@ -97,9 +97,9 @@ psd.setDetectorId(uid); ConfigDTO configDTO =CacheUtil.get(RobotDictConstants.CACHE_SCHEMA, RobotDictConstants.KEY_CONFIG_PARAMS_ID + uid); if(null==configDTO){ - configDTO=configService.getConfig(uid); + configDTO=iDetectorConfigService.getConfig(uid); } - //设置psdx值 toDo:4096、100000 需要自动取 + //设置psdx值 toDo:4096 需要自动取 int psdx = (int) ((Qlong - Qshort) * 1.000 / Qlong * 4096); int mcax = (int) ((Qlong) * 1.00000 / configDTO.getPsdMax() * 4096); psd.setPsdx(psdx + ""); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java index bffce8c..22f00af 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/NeutronOptServiceImpl.java @@ -38,7 +38,7 @@ @Autowired private WebSocket webSocket; @Resource - private IDetectorConfigService configService; + private IDetectorConfigService iDetectorConfigService; @Override @@ -97,9 +97,9 @@ psd.setDetectorId(uid); ConfigDTO configDTO =CacheUtil.get(RobotDictConstants.CACHE_SCHEMA, RobotDictConstants.KEY_CONFIG_PARAMS_ID + uid); if(null==configDTO){ - configDTO=configService.getConfig(uid); + configDTO=iDetectorConfigService.getConfig(uid); } - //设置psdx值 toDo:4096、100000 需要自动取 + //设置psdx值 toDo:4096 需要自动取 int psdx = (int) ((Qlong - Qshort) * 1.000 / Qlong * 4096); int mcax = (int) ((Qlong) * 1.00000 / configDTO.getPsdMax() * 4096); psd.setPsdx(psdx + ""); diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index ff1251c..d1675b6 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,7 +6,7 @@ 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 username: root - password: 123456 + password: root jms: pub-sub-domain: true # session: