From df862609e46d9a695364cf63bf6a373ba9124ba6 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 27 Aug 2025 09:27:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E5=99=A8=E4=BA=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/robot/RobotController.java | 4 +- .../java/com/bonus/business/robot/Test.java | 13 +++-- .../business/robot/util/ImageResizer.java | 9 +-- .../bonus/business/robot/util/QxUtils.java | 2 +- .../service/impl/PersonFaceServiceImpl.java | 2 - .../impl/RobotEventXmlServiceImpl.java | 1 - .../service/impl/RobotServiceImpl.java | 41 ++++++++++++- .../service/impl/SbdUserServiceImpl.java | 57 ++++++++++++++----- .../bonus/business/vo/RobotLocationPoint.java | 2 +- .../mapper/robot/RobotEventMapper.xml | 2 +- .../resources/mapper/robot/SbdUserMapper.xml | 6 +- 11 files changed, 99 insertions(+), 40 deletions(-) diff --git a/bonus-business/src/main/java/com/bonus/business/controller/robot/RobotController.java b/bonus-business/src/main/java/com/bonus/business/controller/robot/RobotController.java index 1653e85..1a2d6c8 100644 --- a/bonus-business/src/main/java/com/bonus/business/controller/robot/RobotController.java +++ b/bonus-business/src/main/java/com/bonus/business/controller/robot/RobotController.java @@ -104,7 +104,7 @@ public class RobotController extends BaseController { @PostMapping("sedXml") public AjaxResult getDetails(@RequestBody RobotVo robotVo) { - log.info("机器人puid：{}",robotVo.getPuId()); + return service.getDetails(robotVo); } @@ -115,7 +115,7 @@ public class RobotController extends BaseController { */ @PostMapping("addPoint") public AjaxResult addPoint(@RequestBody RobotLocationPoint vo) { - return service.addPoint(vo); + return service.addPoint(vo); } /** diff --git a/bonus-business/src/main/java/com/bonus/business/robot/Test.java b/bonus-business/src/main/java/com/bonus/business/robot/Test.java index 8d45281..2e57b85 100644 --- a/bonus-business/src/main/java/com/bonus/business/robot/Test.java +++ b/bonus-business/src/main/java/com/bonus/business/robot/Test.java @@ -13,19 +13,20 @@ import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.utils.AesUtils; import com.bonus.common.utils.DateUtils; import com.bonus.common.utils.uuid.UUID; +import lombok.extern.slf4j.Slf4j; import java.io.File; import java.util.List; import java.util.Map; - +@Slf4j public class Test { public static void main(String[] args) { - - String xm=QxUtils.setLightModel(XxmSendUtils.ROBOT_LIGHT_MODE,"OFF"); - System.err.println(xm); - - + String token=QxVideotape.login(TVideoConfigUtil.getMaps(),TVideoConfigUtil.Q2HTTPURL); + String xml= QxUtils.getParamData(XxmSendUtils.QUERY,XxmSendUtils.ROBOT_STATUS); + log.info("状态查询xml--->{}",xml); + String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,"201115203440576651",xml); + log.info("返回结果--->{}",res); } diff --git a/bonus-business/src/main/java/com/bonus/business/robot/util/ImageResizer.java b/bonus-business/src/main/java/com/bonus/business/robot/util/ImageResizer.java index 4aa2ba4..83366f2 100644 --- a/bonus-business/src/main/java/com/bonus/business/robot/util/ImageResizer.java +++ b/bonus-business/src/main/java/com/bonus/business/robot/util/ImageResizer.java @@ -127,13 +127,8 @@ public class ImageResizer { String path="/temp/"; Path thisPath = Paths.get(filePath+path); if (!Files.exists(thisPath)) { - try { - // 创建文件夹（包括所有必需但不存在的父文件夹） - Files.createDirectories(thisPath); - System.out.println("文件夹创建成功: " + thisPath); - } catch (IOException e) { - System.err.println("创建文件夹时出错: " + e.getMessage()); - } + Files.createDirectories(thisPath); + System.out.println("文件夹创建成功: " + thisPath); } else { System.out.println("文件夹已存在: " + thisPath); } diff --git a/bonus-business/src/main/java/com/bonus/business/robot/util/QxUtils.java b/bonus-business/src/main/java/com/bonus/business/robot/util/QxUtils.java index e49a5bd..57e4c1b 100644 --- a/bonus-business/src/main/java/com/bonus/business/robot/util/QxUtils.java +++ b/bonus-business/src/main/java/com/bonus/business/robot/util/QxUtils.java @@ -338,7 +338,7 @@ public class QxUtils { // builder.append("PositionID=\"").append(vo.getPositionId()).append("\" "); builder.append("Theta=\"").append(vo.getTheta()).append("\" "); builder.append("Height=\"0\" "); - builder.append("Preset=\"0\" "); + builder.append("Preset=\"").append(vo.getPreset()).append("\" "); builder.append("PTZX=\"").append(vo.getPtzx()).append("\" "); builder.append("PTZY=\"").append(vo.getPtzy()).append("\" "); builder.append("PTZZ=\"").append(vo.getPtzz()).append("\" >"); diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/PersonFaceServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/PersonFaceServiceImpl.java index 73bbea7..eabcbea 100644 --- a/bonus-business/src/main/java/com/bonus/business/service/impl/PersonFaceServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/business/service/impl/PersonFaceServiceImpl.java @@ -124,8 +124,6 @@ public class PersonFaceServiceImpl implements IPersonFaceService { int n = 0; StringBuilder sb = new StringBuilder(); for (PersonVo personVo : list) { - - String addResult = IntelligentLibraryUtil.addPerson(personVo); JSONObject addEntries = JSONUtil.parseObj(addResult); if (addEntries.getInt("code") == 0) { diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java index 45344cb..e29b747 100644 --- a/bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java @@ -125,7 +125,6 @@ public class RobotEventXmlServiceImpl implements IRobotEventXmlService { String userName=desc.attributeValue("Name"); RobotUserInfoVo vo=new RobotUserInfoVo(uuid,puid,path1,idCard,path2,userName,"1"); mapper.addTaskUserInfo(vo); - } } } diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/RobotServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/RobotServiceImpl.java index cd84925..d3c519a 100644 --- a/bonus-business/src/main/java/com/bonus/business/service/impl/RobotServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/business/service/impl/RobotServiceImpl.java @@ -205,90 +205,122 @@ public class RobotServiceImpl implements IRobotService { redisService.set("qx:token",token,60*60); } try{ + log.info("机器人puid：{}",robotVo.getPuId()); + log.info("指令类型->type===={}",robotVo.getType()); if("1".equals(robotVo.getType())){ + //查询机器人状态 String xml= QxUtils.getParamData(XxmSendUtils.QUERY,XxmSendUtils.ROBOT_STATUS); + log.info("状态查询xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); Map map= XmlUtils.getRobotStatus(res); return AjaxResult.success(map); }else if("2".equals(robotVo.getType())){ //机器人定位 String xml= QxUtils.getParamData(XxmSendUtils.QUERY,XxmSendUtils.ROBOT_LOCATION); + log.info("机器人定位----xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); Map map= XmlUtils.getRobotLocation(res); return AjaxResult.success(map); }else if("3".equals(robotVo.getType())){ //地图图层 String xml= QxUtils.getParamData(XxmSendUtils.QUERY,XxmSendUtils.ROBOT_MAP); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); Map map= XmlUtils.getRobotMap(res); return AjaxResult.success(map); }else if("4".equals(robotVo.getType())){ //机器人 使用的地图 String xml= QxUtils.getParamData(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_MAP_IMAGE); + log.info("使用的地图----xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); Map map= XmlUtils.getRobotMap(res); return AjaxResult.success(map); }else if("5".equals(robotVo.getType())){ //机器人 前进 String xml= QxUtils.getControllerParam(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_MAP_FORWARD,robotVo.getSpeed()); - String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); - return AjaxResult.success(XmlUtils.getSuccess(res)); + log.info("前进----xml--->{}",xml); + String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); + return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("6".equals(robotVo.getType())){ //机器人 后退 String xml= QxUtils.getControllerParam(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_MAP_BACK,robotVo.getSpeed()); + log.info("后退----xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("7".equals(robotVo.getType())){ //机器人 左转 String xml= QxUtils.getControllerParam(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_MAP_LEFT,robotVo.getSpeed()); + log.info("左转----xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("8".equals(robotVo.getType())){ //机器人 右转 String xml= QxUtils.getControllerParam(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_MAP_RIGHT,robotVo.getSpeed()); + log.info("右转----xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("9".equals(robotVo.getType())){ //机器人 停止 String xml= QxUtils.getParamData(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_ALL_STOP); + log.info("停止----xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("10".equals(robotVo.getType())){ //机器人 去充电 String xml= QxUtils.getParamData(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_GOTO_CHARGE); + log.info("去充电----xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("11".equals(robotVo.getType())){ //机器人 去充电 String xml= QxUtils.getParamData(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_GOTO_CHARGE); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); return AjaxResult.success(XmlUtils.getSuccess(res)); + }else if("12".equals(robotVo.getType())){ //机器人 前往指定位置 String xml= QxUtils.getRobotGoLocation(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_GO_LOCATION,robotVo.getSpeed(),robotVo.getX(),robotVo.getY(),robotVo.getTheta()); + log.info("前往指定位置----xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("13".equals(robotVo.getType())){ //机器人 开启巡检 String xml= QxUtils.getRobotStartTask(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_START_TASK,robotVo.getTaskId()); + log.info("开启巡检----xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("14".equals(robotVo.getType())){ //机器人 停止巡检 String xml= QxUtils.getParamData(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_STOP_TASK); + log.info("停止巡检----xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("15".equals(robotVo.getType())){ //机器人 暂停巡检 String xml= QxUtils.getParamData(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_ZT_TASK); + log.info("暂停巡检----xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("16".equals(robotVo.getType())){ //机器人 继续巡检 String xml= QxUtils.getParamData(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_GO_TASK); + log.info("继续巡检----xml--->{}",xml); String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("17".equals(robotVo.getType())){ //设置声音大小 @@ -304,16 +336,21 @@ public class RobotServiceImpl implements IRobotService { //设置声音大小 String xml= QxUtils.setVideoSource(XxmSendUtils.ROBOT_VIDEO_SOURCE,robotVo.getSound()); String res= QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("19".equals(robotVo.getType())){ //设置警报灯 String xml=QxUtils.setLightModel(XxmSendUtils.ROBOT_LIGHT_MODE,robotVo.getValue()); + log.info("设置警报灯----xml--->{}",xml); String res= QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); return AjaxResult.success(XmlUtils.getSuccess(res)); }else if("20".equals(robotVo.getType())){ //设置警报灯 String xml=QxUtils.setLightModel(XxmSendUtils.ROBOT_AUTO_CHARGE,robotVo.getValue()); + log.info("设置警报灯----xml--->{}",xml); String res= QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + log.info("返回结果--->{}",res); return AjaxResult.success(XmlUtils.getSuccess(res)); } diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java index 638c424..a3b8642 100644 --- a/bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java @@ -16,6 +16,7 @@ import com.bonus.common.config.RuoYiConfig; import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.utils.DateUtils; import com.bonus.common.utils.StringUtils; +import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.hibernate.validator.internal.util.StringHelper; @@ -292,17 +293,16 @@ public class SbdUserServiceImpl implements ISbdUserService { List idList=new ArrayList<>(); List list; String path= RuoYiConfig.getUploadPath(); - String url= minioConfig.getEndpoint(); + PageHelper.startPage(1, 10); + //全部下发 if("ALL".equals(vo.getIds())){ list=mapper.getSbdUserList(null); for (PersonVo personVo:list){ String bast64=minioUtils.getMinioBast64(minioConfig.getBucketName(),personVo.getImage()); String lastPath=ImageResizer.transImageByJpg(path,bast64); -// File file=new File(path+personVo.getImage()); -// String lastPath=ImageResizer.transImageByJpg(url,file); personVo.setImage(lastPath); - idList.add(personVo.getId()); + } }else{ List ids=Arrays.asList(vo.getIds().split(",")); @@ -310,19 +310,41 @@ public class SbdUserServiceImpl implements ISbdUserService { for (PersonVo personVo:list){ String bast64=minioUtils.getMinioBast64(minioConfig.getBucketName(),personVo.getImage()); String lastPath=ImageResizer.transImageByJpg(path,bast64); -// File file=new File(path+personVo.getImage()); -// String lastPath=ImageResizer.transImageByJpg(path,file); personVo.setImage(lastPath); - idList.add(personVo.getId()); } } - //获取人员图片 - AjaxResult ajaxResult=personFaceService.addPerson(list); - Object code=ajaxResult.get("code"); - if(code!=null && "200".equals(code.toString())){ - mapper.updateSbdUserStatus(idList); - } - return ajaxResult; + List pushList=new ArrayList<>(); + for (int i = 0; i 删除状态"+del); + } + + + return AjaxResult.success("下发成功"); } }catch (Exception e){ log.error(e.toString(),e); @@ -330,4 +352,11 @@ public class SbdUserServiceImpl implements ISbdUserService { return AjaxResult.error("下发失败"); } + + + + + + + } diff --git a/bonus-business/src/main/java/com/bonus/business/vo/RobotLocationPoint.java b/bonus-business/src/main/java/com/bonus/business/vo/RobotLocationPoint.java index 060aa6d..096fb7b 100644 --- a/bonus-business/src/main/java/com/bonus/business/vo/RobotLocationPoint.java +++ b/bonus-business/src/main/java/com/bonus/business/vo/RobotLocationPoint.java @@ -31,7 +31,7 @@ public class RobotLocationPoint { /** * 编码 */ - private String preset; + private String preset="0"; /** * 球机角度 */ diff --git a/bonus-business/src/main/resources/mapper/robot/RobotEventMapper.xml b/bonus-business/src/main/resources/mapper/robot/RobotEventMapper.xml index ebef721..8742f01 100644 --- a/bonus-business/src/main/resources/mapper/robot/RobotEventMapper.xml +++ b/bonus-business/src/main/resources/mapper/robot/RobotEventMapper.xml @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"