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 d7c72ff..082843a 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 @@ -103,7 +103,7 @@ psd.setPsdx(psdx + ""); psd.setMcax(mcax + ""); //存缓存 - CacheUtils.PSD_DATA_MAP.put(uid+"_"+psd.getCreateTime(),psd.getPsd()); + CacheUtils.PSD_DATA_MAP.put(uid+"_"+psd.getCreateTime()+"_"+System.currentTimeMillis(),psd.getPsd()); //根据是否启动,向前端推送hs曲线数值 if (hsFlag) { HsDTO hsDTO = new HsDTO(psdx, 1, mcax, 1); 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 d7c72ff..082843a 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 @@ -103,7 +103,7 @@ psd.setPsdx(psdx + ""); psd.setMcax(mcax + ""); //存缓存 - CacheUtils.PSD_DATA_MAP.put(uid+"_"+psd.getCreateTime(),psd.getPsd()); + CacheUtils.PSD_DATA_MAP.put(uid+"_"+psd.getCreateTime()+"_"+System.currentTimeMillis(),psd.getPsd()); //根据是否启动,向前端推送hs曲线数值 if (hsFlag) { HsDTO hsDTO = new HsDTO(psdx, 1, mcax, 1); diff --git a/casic-server/src/main/java/com/casic/missiles/netty/InstructCode.java b/casic-server/src/main/java/com/casic/missiles/netty/InstructCode.java index 4c4d896..41fd9a0 100644 --- a/casic-server/src/main/java/com/casic/missiles/netty/InstructCode.java +++ b/casic-server/src/main/java/com/casic/missiles/netty/InstructCode.java @@ -10,7 +10,7 @@ * 设备初始化时需要依次发送1~16号指令 */ public static String[] InitCodeArr = { - "1", "设置高压", "set set_voltage 6 1.2\n", + "1", "设置高压", "set set_voltage 6 1.8\n", "2", "复位adc", "cmd set_adc_delay_rst 1 0\n", "3", "逻辑复位", "cmd set_logic_rst 1 0\n", "4", "设置波形采样触发方式为下降沿", "cmd set_raw_trig_sel_adc2 3 0\n",