diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java index a18d759..3b37575 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java @@ -69,8 +69,7 @@ @ApiOperation("psd导出4列数据接口,需传taskId;psdX1,psdX2为框选psd横坐标的起止值") - @GetMapping("/psdExport") - @ResponseBody + @PostMapping("/psdExport") public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { iPsdService.psdExport(taskId, psdX1, psdX2, response); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java index a18d759..3b37575 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java @@ -69,8 +69,7 @@ @ApiOperation("psd导出4列数据接口,需传taskId;psdX1,psdX2为框选psd横坐标的起止值") - @GetMapping("/psdExport") - @ResponseBody + @PostMapping("/psdExport") public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { iPsdService.psdExport(taskId, psdX1, psdX2, response); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java index 0a8461f..86a676d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java @@ -30,7 +30,7 @@ private static final long serialVersionUID = 1L; - @ExcelProperty(value = "第一列0~4096值", order = 1) + @ExcelProperty(value = "第一列0~4095值", order = 1) private Integer x; @ExcelProperty(value = "第二列MCA值", order = 2) diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java index a18d759..3b37575 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java @@ -69,8 +69,7 @@ @ApiOperation("psd导出4列数据接口,需传taskId;psdX1,psdX2为框选psd横坐标的起止值") - @GetMapping("/psdExport") - @ResponseBody + @PostMapping("/psdExport") public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { iPsdService.psdExport(taskId, psdX1, psdX2, response); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java index 0a8461f..86a676d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java @@ -30,7 +30,7 @@ private static final long serialVersionUID = 1L; - @ExcelProperty(value = "第一列0~4096值", order = 1) + @ExcelProperty(value = "第一列0~4095值", order = 1) private Integer x; @ExcelProperty(value = "第二列MCA值", order = 2) 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 41fd9a0..9322ae0 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.8\n", + "1", "设置高压", "set set_voltage 5 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", diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java index a18d759..3b37575 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java @@ -69,8 +69,7 @@ @ApiOperation("psd导出4列数据接口,需传taskId;psdX1,psdX2为框选psd横坐标的起止值") - @GetMapping("/psdExport") - @ResponseBody + @PostMapping("/psdExport") public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { iPsdService.psdExport(taskId, psdX1, psdX2, response); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java index 0a8461f..86a676d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java @@ -30,7 +30,7 @@ private static final long serialVersionUID = 1L; - @ExcelProperty(value = "第一列0~4096值", order = 1) + @ExcelProperty(value = "第一列0~4095值", order = 1) private Integer x; @ExcelProperty(value = "第二列MCA值", order = 2) 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 41fd9a0..9322ae0 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.8\n", + "1", "设置高压", "set set_voltage 5 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", diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 2f8934c..c122d8d 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -22,7 +22,7 @@ # redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources,/Neutron/psdExport #flowable数据源和多数据源配置 db: init: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java index a18d759..3b37575 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java @@ -69,8 +69,7 @@ @ApiOperation("psd导出4列数据接口,需传taskId;psdX1,psdX2为框选psd横坐标的起止值") - @GetMapping("/psdExport") - @ResponseBody + @PostMapping("/psdExport") public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { iPsdService.psdExport(taskId, psdX1, psdX2, response); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java index 0a8461f..86a676d 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java @@ -30,7 +30,7 @@ private static final long serialVersionUID = 1L; - @ExcelProperty(value = "第一列0~4096值", order = 1) + @ExcelProperty(value = "第一列0~4095值", order = 1) private Integer x; @ExcelProperty(value = "第二列MCA值", order = 2) 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 41fd9a0..9322ae0 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.8\n", + "1", "设置高压", "set set_voltage 5 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", diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 2f8934c..c122d8d 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -22,7 +22,7 @@ # redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources,/Neutron/psdExport #flowable数据源和多数据源配置 db: init: diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 05c3633..035cb1f 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\casic-web\src\main\resources\config\hiklib\HCNetSDK.dll - hikPlay: D:\workspace\server\keti\casic-robot-inspection\casic-web\src\main\resources\config\hiklib\PlayCtrl.dll + hikSdk: D:\code\robot\casic-robot-inspection\casic-web\src\main\resources\config\hiklib\HCNetSDK.dll + hikPlay: D:\code\robot\casic-robot-inspection\casic-web\src\main\resources\config\hiklib\PlayCtrl.dll algorithm: path: D:\workspace\server\keti\casic-robot-inspection\casic-web\src\main\resources\config\path\ initPathName: init.exe