diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java index c9f8f8f..67fed10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java @@ -2,11 +2,13 @@ import lombok.Data; +import java.io.Serializable; + /** * psd报警DTO */ @Data -public class ConfigDTO { +public class ConfigDTO implements Serializable { /** *高速-波形甑别-E最大值 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java index c9f8f8f..67fed10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java @@ -2,11 +2,13 @@ import lombok.Data; +import java.io.Serializable; + /** * psd报警DTO */ @Data -public class ConfigDTO { +public class ConfigDTO implements Serializable { /** *高速-波形甑别-E最大值 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java index 79095ff..a33824b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java @@ -1,18 +1,26 @@ package com.casic.missiles.modular.robot.controller; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.common.WebSocket; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.dto.PointNextDTO; +import com.casic.missiles.modular.robot.dto.TaskEndMsg; import com.casic.missiles.modular.robot.model.DeviceInfo; +import com.casic.missiles.modular.robot.opt.enums.InstructStatusMsgEnums; +import com.casic.missiles.modular.robot.opt.instruct.base.WsMsgBaseDTO; import com.casic.missiles.modular.robot.service.IDeviceInfoService; import com.casic.missiles.modular.robot.vo.DeviceInfoVO; +import com.casic.missiles.util.WifiUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.List; /** @@ -41,7 +49,41 @@ QueryWrapper query = deviceInfoVO.genQuery(); return ResponseDataDTO.success(deviceInfoService.list(query)); } + @Resource + private WebSocket webSocket; + protected void sendTaskMsg(InstructStatusMsgEnums enums, String robotId, TaskEndMsg heatMap) { + try { + WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); + wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); + wsMsgBaseDTO.setData(heatMap); + String msg = JSON.toJSONString(wsMsgBaseDTO); + webSocket.sendOneMessage(robotId, msg); + } catch (Exception e) { + } + } + /** + * 云台设备信息管理列表 + */ + @ApiOperation(value = "列表查询") + @GetMapping(value = "/testSend") + public ResponseDataDTO> testSend(DeviceInfoVO deviceInfoVO) { + + TaskEndMsg endMsg = new TaskEndMsg(); + endMsg.setCode(1); + endMsg.setRobotId("1"); + PointNextDTO nextDTO = null; + endMsg.setCoordinate(nextDTO); + endMsg.setMessage("寻源结束"); + sendTaskMsg(InstructStatusMsgEnums.TASK_END, "1", endMsg); + return ResponseDataDTO.success(null); + } + @ApiOperation(value = "列表查询") + @GetMapping(value = "/testWifi") + public ResponseDataDTO> testWifi(DeviceInfoVO deviceInfoVO) { + WifiUtils.connectToWiFi("hid1831159","19881126"); + return ResponseDataDTO.success(null); + } /** * 云台设备信息管理分页列表 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java index c9f8f8f..67fed10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java @@ -2,11 +2,13 @@ import lombok.Data; +import java.io.Serializable; + /** * psd报警DTO */ @Data -public class ConfigDTO { +public class ConfigDTO implements Serializable { /** *高速-波形甑别-E最大值 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java index 79095ff..a33824b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java @@ -1,18 +1,26 @@ package com.casic.missiles.modular.robot.controller; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.common.WebSocket; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.dto.PointNextDTO; +import com.casic.missiles.modular.robot.dto.TaskEndMsg; import com.casic.missiles.modular.robot.model.DeviceInfo; +import com.casic.missiles.modular.robot.opt.enums.InstructStatusMsgEnums; +import com.casic.missiles.modular.robot.opt.instruct.base.WsMsgBaseDTO; import com.casic.missiles.modular.robot.service.IDeviceInfoService; import com.casic.missiles.modular.robot.vo.DeviceInfoVO; +import com.casic.missiles.util.WifiUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.List; /** @@ -41,7 +49,41 @@ QueryWrapper query = deviceInfoVO.genQuery(); return ResponseDataDTO.success(deviceInfoService.list(query)); } + @Resource + private WebSocket webSocket; + protected void sendTaskMsg(InstructStatusMsgEnums enums, String robotId, TaskEndMsg heatMap) { + try { + WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); + wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); + wsMsgBaseDTO.setData(heatMap); + String msg = JSON.toJSONString(wsMsgBaseDTO); + webSocket.sendOneMessage(robotId, msg); + } catch (Exception e) { + } + } + /** + * 云台设备信息管理列表 + */ + @ApiOperation(value = "列表查询") + @GetMapping(value = "/testSend") + public ResponseDataDTO> testSend(DeviceInfoVO deviceInfoVO) { + + TaskEndMsg endMsg = new TaskEndMsg(); + endMsg.setCode(1); + endMsg.setRobotId("1"); + PointNextDTO nextDTO = null; + endMsg.setCoordinate(nextDTO); + endMsg.setMessage("寻源结束"); + sendTaskMsg(InstructStatusMsgEnums.TASK_END, "1", endMsg); + return ResponseDataDTO.success(null); + } + @ApiOperation(value = "列表查询") + @GetMapping(value = "/testWifi") + public ResponseDataDTO> testWifi(DeviceInfoVO deviceInfoVO) { + WifiUtils.connectToWiFi("hid1831159","19881126"); + return ResponseDataDTO.success(null); + } /** * 云台设备信息管理分页列表 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java index d5ae18a..5679cf2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java @@ -54,7 +54,9 @@ @ApiModelProperty(value = "设置角速度", dataType = "BigDecimal") @TableField("conf_w") private BigDecimal confW; - + @ApiModelProperty(value = "寻源初始步长", dataType = "Integer") + @TableField("step_len") + private Integer stepLen; /** * 机器人名称 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java index c9f8f8f..67fed10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java @@ -2,11 +2,13 @@ import lombok.Data; +import java.io.Serializable; + /** * psd报警DTO */ @Data -public class ConfigDTO { +public class ConfigDTO implements Serializable { /** *高速-波形甑别-E最大值 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java index 79095ff..a33824b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java @@ -1,18 +1,26 @@ package com.casic.missiles.modular.robot.controller; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.common.WebSocket; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.dto.PointNextDTO; +import com.casic.missiles.modular.robot.dto.TaskEndMsg; import com.casic.missiles.modular.robot.model.DeviceInfo; +import com.casic.missiles.modular.robot.opt.enums.InstructStatusMsgEnums; +import com.casic.missiles.modular.robot.opt.instruct.base.WsMsgBaseDTO; import com.casic.missiles.modular.robot.service.IDeviceInfoService; import com.casic.missiles.modular.robot.vo.DeviceInfoVO; +import com.casic.missiles.util.WifiUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.List; /** @@ -41,7 +49,41 @@ QueryWrapper query = deviceInfoVO.genQuery(); return ResponseDataDTO.success(deviceInfoService.list(query)); } + @Resource + private WebSocket webSocket; + protected void sendTaskMsg(InstructStatusMsgEnums enums, String robotId, TaskEndMsg heatMap) { + try { + WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); + wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); + wsMsgBaseDTO.setData(heatMap); + String msg = JSON.toJSONString(wsMsgBaseDTO); + webSocket.sendOneMessage(robotId, msg); + } catch (Exception e) { + } + } + /** + * 云台设备信息管理列表 + */ + @ApiOperation(value = "列表查询") + @GetMapping(value = "/testSend") + public ResponseDataDTO> testSend(DeviceInfoVO deviceInfoVO) { + + TaskEndMsg endMsg = new TaskEndMsg(); + endMsg.setCode(1); + endMsg.setRobotId("1"); + PointNextDTO nextDTO = null; + endMsg.setCoordinate(nextDTO); + endMsg.setMessage("寻源结束"); + sendTaskMsg(InstructStatusMsgEnums.TASK_END, "1", endMsg); + return ResponseDataDTO.success(null); + } + @ApiOperation(value = "列表查询") + @GetMapping(value = "/testWifi") + public ResponseDataDTO> testWifi(DeviceInfoVO deviceInfoVO) { + WifiUtils.connectToWiFi("hid1831159","19881126"); + return ResponseDataDTO.success(null); + } /** * 云台设备信息管理分页列表 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java index d5ae18a..5679cf2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java @@ -54,7 +54,9 @@ @ApiModelProperty(value = "设置角速度", dataType = "BigDecimal") @TableField("conf_w") private BigDecimal confW; - + @ApiModelProperty(value = "寻源初始步长", dataType = "Integer") + @TableField("step_len") + private Integer stepLen; /** * 机器人名称 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java index 4f61954..8319857 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java @@ -81,6 +81,7 @@ } private AlgorithmResponse getAlgorithmResponse(PathInitDTO initDTO, List res) { + log.info("log:{}",res); //读取当前路径图片 File repetitionFileDir = new File(path + "\\" + initDTO.getTaskId() + "\\predicts"); File[] files = repetitionFileDir.listFiles((dir, name) -> name.endsWith(".txt") && name.startsWith("step")); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java index c9f8f8f..67fed10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java @@ -2,11 +2,13 @@ import lombok.Data; +import java.io.Serializable; + /** * psd报警DTO */ @Data -public class ConfigDTO { +public class ConfigDTO implements Serializable { /** *高速-波形甑别-E最大值 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java index 79095ff..a33824b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java @@ -1,18 +1,26 @@ package com.casic.missiles.modular.robot.controller; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.common.WebSocket; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.dto.PointNextDTO; +import com.casic.missiles.modular.robot.dto.TaskEndMsg; import com.casic.missiles.modular.robot.model.DeviceInfo; +import com.casic.missiles.modular.robot.opt.enums.InstructStatusMsgEnums; +import com.casic.missiles.modular.robot.opt.instruct.base.WsMsgBaseDTO; import com.casic.missiles.modular.robot.service.IDeviceInfoService; import com.casic.missiles.modular.robot.vo.DeviceInfoVO; +import com.casic.missiles.util.WifiUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.List; /** @@ -41,7 +49,41 @@ QueryWrapper query = deviceInfoVO.genQuery(); return ResponseDataDTO.success(deviceInfoService.list(query)); } + @Resource + private WebSocket webSocket; + protected void sendTaskMsg(InstructStatusMsgEnums enums, String robotId, TaskEndMsg heatMap) { + try { + WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); + wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); + wsMsgBaseDTO.setData(heatMap); + String msg = JSON.toJSONString(wsMsgBaseDTO); + webSocket.sendOneMessage(robotId, msg); + } catch (Exception e) { + } + } + /** + * 云台设备信息管理列表 + */ + @ApiOperation(value = "列表查询") + @GetMapping(value = "/testSend") + public ResponseDataDTO> testSend(DeviceInfoVO deviceInfoVO) { + + TaskEndMsg endMsg = new TaskEndMsg(); + endMsg.setCode(1); + endMsg.setRobotId("1"); + PointNextDTO nextDTO = null; + endMsg.setCoordinate(nextDTO); + endMsg.setMessage("寻源结束"); + sendTaskMsg(InstructStatusMsgEnums.TASK_END, "1", endMsg); + return ResponseDataDTO.success(null); + } + @ApiOperation(value = "列表查询") + @GetMapping(value = "/testWifi") + public ResponseDataDTO> testWifi(DeviceInfoVO deviceInfoVO) { + WifiUtils.connectToWiFi("hid1831159","19881126"); + return ResponseDataDTO.success(null); + } /** * 云台设备信息管理分页列表 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java index d5ae18a..5679cf2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java @@ -54,7 +54,9 @@ @ApiModelProperty(value = "设置角速度", dataType = "BigDecimal") @TableField("conf_w") private BigDecimal confW; - + @ApiModelProperty(value = "寻源初始步长", dataType = "Integer") + @TableField("step_len") + private Integer stepLen; /** * 机器人名称 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java index 4f61954..8319857 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java @@ -81,6 +81,7 @@ } private AlgorithmResponse getAlgorithmResponse(PathInitDTO initDTO, List res) { + log.info("log:{}",res); //读取当前路径图片 File repetitionFileDir = new File(path + "\\" + initDTO.getTaskId() + "\\predicts"); File[] files = repetitionFileDir.listFiles((dir, name) -> name.endsWith(".txt") && name.startsWith("step")); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java index 0bcb375..720713e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java @@ -72,6 +72,7 @@ private final IBaseRobotService baseRobotService; private final ITaskInfoImgService imgService; private final ITaskGridInfoService taskGridInfoService; + private final IRobotInfoService robotInfoService; /** * 初始化线程池 */ @@ -94,7 +95,7 @@ private Integer obstacle; private volatile AtomicInteger atomicInteger = new AtomicInteger(); - public TaskInfoServiceImpl(@Lazy IRouteInfoService routeInfoService, IRobotStatusInfoService statusInfoService, AbstractDictService dictService, @Lazy IAlarmRecordService recordService, @Lazy ITaskHeatMapService taskHeatMapService, IAlgorithmService algorithmService, IRobotCacheService cacheService, @Lazy IBaseRobotService baseRobotService, ITaskInfoImgService imgService, ITaskGridInfoService taskGridInfoService) { + public TaskInfoServiceImpl(@Lazy IRouteInfoService routeInfoService, IRobotStatusInfoService statusInfoService, AbstractDictService dictService, @Lazy IAlarmRecordService recordService, @Lazy ITaskHeatMapService taskHeatMapService, IAlgorithmService algorithmService, IRobotCacheService cacheService, @Lazy IBaseRobotService baseRobotService, ITaskInfoImgService imgService, ITaskGridInfoService taskGridInfoService, @Lazy IRobotInfoService robotInfoService) { this.routeInfoService = routeInfoService; this.statusInfoService = statusInfoService; this.dictService = dictService; @@ -105,6 +106,7 @@ this.baseRobotService = baseRobotService; this.imgService = imgService; this.taskGridInfoService = taskGridInfoService; + this.robotInfoService = robotInfoService; } /** @@ -152,7 +154,7 @@ wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); wsMsgBaseDTO.setData(heatMap); String msg = JSON.toJSONString(wsMsgBaseDTO); -// log.info("推送{}消息：{}", enums.getRemarks(), msg); + log.info("推送{}消息：{}", enums.getRemarks(), msg); webSocket.sendOneMessage(robotId, msg); } catch (Exception e) { log.error(e.getMessage()); @@ -227,12 +229,20 @@ isTask = 1; } RobotInfo robotInfo = cacheService.getRobotInfo(Convert.toLong(robotId)); + CacheUtil.put(RobotDictConstants.CACHE_SCHEMA, RobotDictConstants.KEY_IS_TASK + robotId, isTask); //添加任务记录 TaskInfo taskInfo = addTaskByStartTrack(robotInfo, request); //No.3 更新器人执行任务信息 // Long currRouteId = routeInfo.getId(); Long currTaskId = taskInfo.getId(); + //更新当前机器步长设置 + if (request.getStepLen() > 0) { + UpdateWrapper robotInfoUpdate = new UpdateWrapper<>(); + robotInfoUpdate.eq("id",request.getRobotId()); + robotInfoUpdate.set("step_len",request.getStepLen()); + robotInfoService.update(robotInfoUpdate); + } statusInfoService.updateCurrTask(robotId, currTaskId); //算法初始化标志创建 @@ -443,12 +453,12 @@ closeTask(null, robotId); TaskEndMsg endMsg = new TaskEndMsg(); - endMsg.setCode(response.getCoordinate()==null?0:1); + endMsg.setCode(response.getCoordinate() == null ? 1 : 0); endMsg.setRobotId(robotId); - PointNextDTO nextDTO = response.getCoordinate(); endMsg.setCoordinate(nextDTO); endMsg.setMessage("寻源结束"); + log.info("push end:{}", endMsg); sendTaskMsg(InstructStatusMsgEnums.TASK_END, robotId, endMsg); } } else { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java index c9f8f8f..67fed10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java @@ -2,11 +2,13 @@ import lombok.Data; +import java.io.Serializable; + /** * psd报警DTO */ @Data -public class ConfigDTO { +public class ConfigDTO implements Serializable { /** *高速-波形甑别-E最大值 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java index 79095ff..a33824b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java @@ -1,18 +1,26 @@ package com.casic.missiles.modular.robot.controller; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.common.WebSocket; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.dto.PointNextDTO; +import com.casic.missiles.modular.robot.dto.TaskEndMsg; import com.casic.missiles.modular.robot.model.DeviceInfo; +import com.casic.missiles.modular.robot.opt.enums.InstructStatusMsgEnums; +import com.casic.missiles.modular.robot.opt.instruct.base.WsMsgBaseDTO; import com.casic.missiles.modular.robot.service.IDeviceInfoService; import com.casic.missiles.modular.robot.vo.DeviceInfoVO; +import com.casic.missiles.util.WifiUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.List; /** @@ -41,7 +49,41 @@ QueryWrapper query = deviceInfoVO.genQuery(); return ResponseDataDTO.success(deviceInfoService.list(query)); } + @Resource + private WebSocket webSocket; + protected void sendTaskMsg(InstructStatusMsgEnums enums, String robotId, TaskEndMsg heatMap) { + try { + WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); + wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); + wsMsgBaseDTO.setData(heatMap); + String msg = JSON.toJSONString(wsMsgBaseDTO); + webSocket.sendOneMessage(robotId, msg); + } catch (Exception e) { + } + } + /** + * 云台设备信息管理列表 + */ + @ApiOperation(value = "列表查询") + @GetMapping(value = "/testSend") + public ResponseDataDTO> testSend(DeviceInfoVO deviceInfoVO) { + + TaskEndMsg endMsg = new TaskEndMsg(); + endMsg.setCode(1); + endMsg.setRobotId("1"); + PointNextDTO nextDTO = null; + endMsg.setCoordinate(nextDTO); + endMsg.setMessage("寻源结束"); + sendTaskMsg(InstructStatusMsgEnums.TASK_END, "1", endMsg); + return ResponseDataDTO.success(null); + } + @ApiOperation(value = "列表查询") + @GetMapping(value = "/testWifi") + public ResponseDataDTO> testWifi(DeviceInfoVO deviceInfoVO) { + WifiUtils.connectToWiFi("hid1831159","19881126"); + return ResponseDataDTO.success(null); + } /** * 云台设备信息管理分页列表 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java index d5ae18a..5679cf2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java @@ -54,7 +54,9 @@ @ApiModelProperty(value = "设置角速度", dataType = "BigDecimal") @TableField("conf_w") private BigDecimal confW; - + @ApiModelProperty(value = "寻源初始步长", dataType = "Integer") + @TableField("step_len") + private Integer stepLen; /** * 机器人名称 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java index 4f61954..8319857 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java @@ -81,6 +81,7 @@ } private AlgorithmResponse getAlgorithmResponse(PathInitDTO initDTO, List res) { + log.info("log:{}",res); //读取当前路径图片 File repetitionFileDir = new File(path + "\\" + initDTO.getTaskId() + "\\predicts"); File[] files = repetitionFileDir.listFiles((dir, name) -> name.endsWith(".txt") && name.startsWith("step")); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java index 0bcb375..720713e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java @@ -72,6 +72,7 @@ private final IBaseRobotService baseRobotService; private final ITaskInfoImgService imgService; private final ITaskGridInfoService taskGridInfoService; + private final IRobotInfoService robotInfoService; /** * 初始化线程池 */ @@ -94,7 +95,7 @@ private Integer obstacle; private volatile AtomicInteger atomicInteger = new AtomicInteger(); - public TaskInfoServiceImpl(@Lazy IRouteInfoService routeInfoService, IRobotStatusInfoService statusInfoService, AbstractDictService dictService, @Lazy IAlarmRecordService recordService, @Lazy ITaskHeatMapService taskHeatMapService, IAlgorithmService algorithmService, IRobotCacheService cacheService, @Lazy IBaseRobotService baseRobotService, ITaskInfoImgService imgService, ITaskGridInfoService taskGridInfoService) { + public TaskInfoServiceImpl(@Lazy IRouteInfoService routeInfoService, IRobotStatusInfoService statusInfoService, AbstractDictService dictService, @Lazy IAlarmRecordService recordService, @Lazy ITaskHeatMapService taskHeatMapService, IAlgorithmService algorithmService, IRobotCacheService cacheService, @Lazy IBaseRobotService baseRobotService, ITaskInfoImgService imgService, ITaskGridInfoService taskGridInfoService, @Lazy IRobotInfoService robotInfoService) { this.routeInfoService = routeInfoService; this.statusInfoService = statusInfoService; this.dictService = dictService; @@ -105,6 +106,7 @@ this.baseRobotService = baseRobotService; this.imgService = imgService; this.taskGridInfoService = taskGridInfoService; + this.robotInfoService = robotInfoService; } /** @@ -152,7 +154,7 @@ wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); wsMsgBaseDTO.setData(heatMap); String msg = JSON.toJSONString(wsMsgBaseDTO); -// log.info("推送{}消息：{}", enums.getRemarks(), msg); + log.info("推送{}消息：{}", enums.getRemarks(), msg); webSocket.sendOneMessage(robotId, msg); } catch (Exception e) { log.error(e.getMessage()); @@ -227,12 +229,20 @@ isTask = 1; } RobotInfo robotInfo = cacheService.getRobotInfo(Convert.toLong(robotId)); + CacheUtil.put(RobotDictConstants.CACHE_SCHEMA, RobotDictConstants.KEY_IS_TASK + robotId, isTask); //添加任务记录 TaskInfo taskInfo = addTaskByStartTrack(robotInfo, request); //No.3 更新器人执行任务信息 // Long currRouteId = routeInfo.getId(); Long currTaskId = taskInfo.getId(); + //更新当前机器步长设置 + if (request.getStepLen() > 0) { + UpdateWrapper robotInfoUpdate = new UpdateWrapper<>(); + robotInfoUpdate.eq("id",request.getRobotId()); + robotInfoUpdate.set("step_len",request.getStepLen()); + robotInfoService.update(robotInfoUpdate); + } statusInfoService.updateCurrTask(robotId, currTaskId); //算法初始化标志创建 @@ -443,12 +453,12 @@ closeTask(null, robotId); TaskEndMsg endMsg = new TaskEndMsg(); - endMsg.setCode(response.getCoordinate()==null?0:1); + endMsg.setCode(response.getCoordinate() == null ? 1 : 0); endMsg.setRobotId(robotId); - PointNextDTO nextDTO = response.getCoordinate(); endMsg.setCoordinate(nextDTO); endMsg.setMessage("寻源结束"); + log.info("push end:{}", endMsg); sendTaskMsg(InstructStatusMsgEnums.TASK_END, robotId, endMsg); } } else { diff --git a/casic-server/src/main/java/com/casic/missiles/util/WifiUtils.java b/casic-server/src/main/java/com/casic/missiles/util/WifiUtils.java new file mode 100644 index 0000000..db61281 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/util/WifiUtils.java @@ -0,0 +1,57 @@ +package com.casic.missiles.util; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; + +public class WifiUtils { + + //netsh wlan show profiles + //netsh wlan connect name="hid1831159" ssid="hid1831159" interface="19881126" + public static void connectToWiFi(String ssid, String password) { + try { + String command = String.format("netsh wlan connect name=\"%s\" ssid=\"%s\"", ssid, ssid); + Process process = Runtime.getRuntime().exec("cmd /c " + command); + int exitCode = process.waitFor(); + if (exitCode == 0) { + System.out.println("Connected to WiFi successfully!"); + } else { + System.out.println("Failed to connect to WiFi."); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void main(String[] args) { + connectToWiFi("hid1831159", "19881126"); + } + public static void connectToWiFi1(String ssid, String key) { + // 构建命令 + String command = String.format("netsh wlan connect ssid=\"%s\" interface=\"%s\"", ssid, key); + + // 使用ProcessBuilder执行命令 + ProcessBuilder processBuilder = new ProcessBuilder("cmd.exe", "/c", command); + try { + // 启动进程 + Process process = processBuilder.start(); + + // 等待命令执行完成 + int exitCode = process.waitFor(); + + if (exitCode == 0) { + System.out.println("Connected to WiFi successfully!"); + } else { + // 读取错误流，获取错误信息 + String line; + BufferedReader errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream())); + while ((line = errorReader.readLine()) != null) { + System.err.println(line); + } + } + + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + } + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java index c9f8f8f..67fed10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/ConfigDTO.java @@ -2,11 +2,13 @@ import lombok.Data; +import java.io.Serializable; + /** * psd报警DTO */ @Data -public class ConfigDTO { +public class ConfigDTO implements Serializable { /** *高速-波形甑别-E最大值 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java index 79095ff..a33824b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/DeviceInfoController.java @@ -1,18 +1,26 @@ package com.casic.missiles.modular.robot.controller; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.common.WebSocket; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.dto.PointNextDTO; +import com.casic.missiles.modular.robot.dto.TaskEndMsg; import com.casic.missiles.modular.robot.model.DeviceInfo; +import com.casic.missiles.modular.robot.opt.enums.InstructStatusMsgEnums; +import com.casic.missiles.modular.robot.opt.instruct.base.WsMsgBaseDTO; import com.casic.missiles.modular.robot.service.IDeviceInfoService; import com.casic.missiles.modular.robot.vo.DeviceInfoVO; +import com.casic.missiles.util.WifiUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.List; /** @@ -41,7 +49,41 @@ QueryWrapper query = deviceInfoVO.genQuery(); return ResponseDataDTO.success(deviceInfoService.list(query)); } + @Resource + private WebSocket webSocket; + protected void sendTaskMsg(InstructStatusMsgEnums enums, String robotId, TaskEndMsg heatMap) { + try { + WsMsgBaseDTO wsMsgBaseDTO = new WsMsgBaseDTO(); + wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); + wsMsgBaseDTO.setData(heatMap); + String msg = JSON.toJSONString(wsMsgBaseDTO); + webSocket.sendOneMessage(robotId, msg); + } catch (Exception e) { + } + } + /** + * 云台设备信息管理列表 + */ + @ApiOperation(value = "列表查询") + @GetMapping(value = "/testSend") + public ResponseDataDTO> testSend(DeviceInfoVO deviceInfoVO) { + + TaskEndMsg endMsg = new TaskEndMsg(); + endMsg.setCode(1); + endMsg.setRobotId("1"); + PointNextDTO nextDTO = null; + endMsg.setCoordinate(nextDTO); + endMsg.setMessage("寻源结束"); + sendTaskMsg(InstructStatusMsgEnums.TASK_END, "1", endMsg); + return ResponseDataDTO.success(null); + } + @ApiOperation(value = "列表查询") + @GetMapping(value = "/testWifi") + public ResponseDataDTO> testWifi(DeviceInfoVO deviceInfoVO) { + WifiUtils.connectToWiFi("hid1831159","19881126"); + return ResponseDataDTO.success(null); + } /** * 云台设备信息管理分页列表 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java index d5ae18a..5679cf2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java @@ -54,7 +54,9 @@ @ApiModelProperty(value = "设置角速度", dataType = "BigDecimal") @TableField("conf_w") private BigDecimal confW; - + @ApiModelProperty(value = "寻源初始步长", dataType = "Integer") + @TableField("step_len") + private Integer stepLen; /** * 机器人名称 */ diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java index 4f61954..8319857 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java @@ -81,6 +81,7 @@ } private AlgorithmResponse getAlgorithmResponse(PathInitDTO initDTO, List res) { + log.info("log:{}",res); //读取当前路径图片 File repetitionFileDir = new File(path + "\\" + initDTO.getTaskId() + "\\predicts"); File[] files = repetitionFileDir.listFiles((dir, name) -> name.endsWith(".txt") && name.startsWith("step")); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java index 0bcb375..720713e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java @@ -72,6 +72,7 @@ private final IBaseRobotService baseRobotService; private final ITaskInfoImgService imgService; private final ITaskGridInfoService taskGridInfoService; + private final IRobotInfoService robotInfoService; /** * 初始化线程池 */ @@ -94,7 +95,7 @@ private Integer obstacle; private volatile AtomicInteger atomicInteger = new AtomicInteger(); - public TaskInfoServiceImpl(@Lazy IRouteInfoService routeInfoService, IRobotStatusInfoService statusInfoService, AbstractDictService dictService, @Lazy IAlarmRecordService recordService, @Lazy ITaskHeatMapService taskHeatMapService, IAlgorithmService algorithmService, IRobotCacheService cacheService, @Lazy IBaseRobotService baseRobotService, ITaskInfoImgService imgService, ITaskGridInfoService taskGridInfoService) { + public TaskInfoServiceImpl(@Lazy IRouteInfoService routeInfoService, IRobotStatusInfoService statusInfoService, AbstractDictService dictService, @Lazy IAlarmRecordService recordService, @Lazy ITaskHeatMapService taskHeatMapService, IAlgorithmService algorithmService, IRobotCacheService cacheService, @Lazy IBaseRobotService baseRobotService, ITaskInfoImgService imgService, ITaskGridInfoService taskGridInfoService, @Lazy IRobotInfoService robotInfoService) { this.routeInfoService = routeInfoService; this.statusInfoService = statusInfoService; this.dictService = dictService; @@ -105,6 +106,7 @@ this.baseRobotService = baseRobotService; this.imgService = imgService; this.taskGridInfoService = taskGridInfoService; + this.robotInfoService = robotInfoService; } /** @@ -152,7 +154,7 @@ wsMsgBaseDTO.setMsgKey(enums.getMsgKey()); wsMsgBaseDTO.setData(heatMap); String msg = JSON.toJSONString(wsMsgBaseDTO); -// log.info("推送{}消息：{}", enums.getRemarks(), msg); + log.info("推送{}消息：{}", enums.getRemarks(), msg); webSocket.sendOneMessage(robotId, msg); } catch (Exception e) { log.error(e.getMessage()); @@ -227,12 +229,20 @@ isTask = 1; } RobotInfo robotInfo = cacheService.getRobotInfo(Convert.toLong(robotId)); + CacheUtil.put(RobotDictConstants.CACHE_SCHEMA, RobotDictConstants.KEY_IS_TASK + robotId, isTask); //添加任务记录 TaskInfo taskInfo = addTaskByStartTrack(robotInfo, request); //No.3 更新器人执行任务信息 // Long currRouteId = routeInfo.getId(); Long currTaskId = taskInfo.getId(); + //更新当前机器步长设置 + if (request.getStepLen() > 0) { + UpdateWrapper robotInfoUpdate = new UpdateWrapper<>(); + robotInfoUpdate.eq("id",request.getRobotId()); + robotInfoUpdate.set("step_len",request.getStepLen()); + robotInfoService.update(robotInfoUpdate); + } statusInfoService.updateCurrTask(robotId, currTaskId); //算法初始化标志创建 @@ -443,12 +453,12 @@ closeTask(null, robotId); TaskEndMsg endMsg = new TaskEndMsg(); - endMsg.setCode(response.getCoordinate()==null?0:1); + endMsg.setCode(response.getCoordinate() == null ? 1 : 0); endMsg.setRobotId(robotId); - PointNextDTO nextDTO = response.getCoordinate(); endMsg.setCoordinate(nextDTO); endMsg.setMessage("寻源结束"); + log.info("push end:{}", endMsg); sendTaskMsg(InstructStatusMsgEnums.TASK_END, robotId, endMsg); } } else { diff --git a/casic-server/src/main/java/com/casic/missiles/util/WifiUtils.java b/casic-server/src/main/java/com/casic/missiles/util/WifiUtils.java new file mode 100644 index 0000000..db61281 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/util/WifiUtils.java @@ -0,0 +1,57 @@ +package com.casic.missiles.util; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; + +public class WifiUtils { + + //netsh wlan show profiles + //netsh wlan connect name="hid1831159" ssid="hid1831159" interface="19881126" + public static void connectToWiFi(String ssid, String password) { + try { + String command = String.format("netsh wlan connect name=\"%s\" ssid=\"%s\"", ssid, ssid); + Process process = Runtime.getRuntime().exec("cmd /c " + command); + int exitCode = process.waitFor(); + if (exitCode == 0) { + System.out.println("Connected to WiFi successfully!"); + } else { + System.out.println("Failed to connect to WiFi."); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void main(String[] args) { + connectToWiFi("hid1831159", "19881126"); + } + public static void connectToWiFi1(String ssid, String key) { + // 构建命令 + String command = String.format("netsh wlan connect ssid=\"%s\" interface=\"%s\"", ssid, key); + + // 使用ProcessBuilder执行命令 + ProcessBuilder processBuilder = new ProcessBuilder("cmd.exe", "/c", command); + try { + // 启动进程 + Process process = processBuilder.start(); + + // 等待命令执行完成 + int exitCode = process.waitFor(); + + if (exitCode == 0) { + System.out.println("Connected to WiFi successfully!"); + } else { + // 读取错误流，获取错误信息 + String line; + BufferedReader errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream())); + while ((line = errorReader.readLine()) != null) { + System.err.println(line); + } + } + + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + } + } +} diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml index 67a0241..83bb076 100644 --- a/casic-web/src/main/resources/config/application-test.yml +++ b/casic-web/src/main/resources/config/application-test.yml @@ -4,9 +4,9 @@ spring: 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://192.168.83.40:3000/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: 123456 + password: root druid: max-active: 50 min-idle: 20 @@ -22,22 +22,11 @@ # 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: enable: false - hikSdk: D:\robot\hiklib\HCNetSDK.dll - hikPlay: D:\robot\hiklib\PlayCtrl.dll - algorithm: - path: D:\robot\path\ - initPathName: init.exe - planPathName: search.exe - doc: - temp: D:\robot\path\report.docx - config: - export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ - config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ logging: level.root: info level.com.casic: debug @@ -45,4 +34,4 @@ level.com.casic.missiles.modular.neutron: error level.org.springframework.web: info file: - path: D:\\robot\\logs \ No newline at end of file + path: D:\\logs \ No newline at end of file