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 844b01c..e49a5bd 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 @@ -13,7 +13,23 @@ import java.util.List; @Slf4j public class QxUtils { - + public static String setLightModel(String opeId,String value){ + StringBuilder builder=new StringBuilder(); + try{ + builder.append(""); + builder.append(""); + builder.append(""); + builder.append(""); + builder.append(""); + builder.append(""); + builder.append(""); + builder.append(""); + builder.append(""); + }catch (Exception e){ + log.error(e.toString(),e); + } + return builder.toString(); + } public static String setVideoSource(String opeId,String value){ StringBuilder builder=new StringBuilder(); try{ @@ -30,8 +46,6 @@ public class QxUtils { log.error(e.toString(),e); } return builder.toString(); - - } public static String getStartVideo(String type,String opeId,String id,String loop,String enable){ @@ -130,6 +144,9 @@ public class QxUtils { return builder.toString(); } + + + /** * 机器人状态 * @param type 指令类型 diff --git a/bonus-business/src/main/java/com/bonus/business/robot/util/XxmSendUtils.java b/bonus-business/src/main/java/com/bonus/business/robot/util/XxmSendUtils.java index f1a2d28..9343f73 100644 --- a/bonus-business/src/main/java/com/bonus/business/robot/util/XxmSendUtils.java +++ b/bonus-business/src/main/java/com/bonus/business/robot/util/XxmSendUtils.java @@ -117,7 +117,14 @@ public class XxmSendUtils { */ public static String ROBOT_TASK_IMAGE="C_IVS_QueryIVSPayload"; - + /** + *警报灯 + */ + public static String ROBOT_LIGHT_MODE="F_ST_AlarmLightMode"; + /** + * 2.8 启用低电量自动回充 + */ + public static String ROBOT_AUTO_CHARGE="F_ST_RobotAutoCharge"; /** * 机器人-播放 */ 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 b22fe7e..cd84925 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 @@ -305,6 +305,16 @@ 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); return AjaxResult.success(XmlUtils.getSuccess(res)); + }else if("19".equals(robotVo.getType())){ + //设置警报灯 + String xml=QxUtils.setLightModel(XxmSendUtils.ROBOT_LIGHT_MODE,robotVo.getValue()); + String res= QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + return AjaxResult.success(XmlUtils.getSuccess(res)); + }else if("20".equals(robotVo.getType())){ + //设置警报灯 + String xml=QxUtils.setLightModel(XxmSendUtils.ROBOT_AUTO_CHARGE,robotVo.getValue()); + String res= QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,robotVo.getPuId(),xml); + return AjaxResult.success(XmlUtils.getSuccess(res)); } diff --git a/bonus-business/src/main/java/com/bonus/business/vo/RobotVo.java b/bonus-business/src/main/java/com/bonus/business/vo/RobotVo.java index 0400f07..edeec00 100644 --- a/bonus-business/src/main/java/com/bonus/business/vo/RobotVo.java +++ b/bonus-business/src/main/java/com/bonus/business/vo/RobotVo.java @@ -73,4 +73,7 @@ public class RobotVo { private String sound; + private String value; + + } diff --git a/bonus-business/src/main/resources/application-druid.yml b/bonus-business/src/main/resources/application-druid.yml index 85494d4..93597f1 100644 --- a/bonus-business/src/main/resources/application-druid.yml +++ b/bonus-business/src/main/resources/application-druid.yml @@ -16,18 +16,18 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver druid: # 主库数据源 -# master: -# url: jdbc:mysql://192.168.0.14:4417/sbd_robot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: root -# password: Bonus@admin123! -# master: -# url: jdbc:mysql://127.0.0.1:3306/wunan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true -# username: root -# password: ccw1998@yyt1999 master: - url: jdbc:mysql://127.0.0.1:23306/wunan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true + url: jdbc:mysql://192.168.0.14:4417/sbd_robot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: youotech123# + password: Bonus@admin123! +# master: +# url: jdbc:mysql://127.0.0.1:3306/sbd_robot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: mroot +# password: bonus@admin123 +# master: +# url: jdbc:mysql://127.0.0.1:23306/wunan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: root +# password: youotech123# # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -77,15 +77,20 @@ spring: merge-sql: true wall: config: - multi-statement-allow: false + multi-statement-allow: true #minio: # endpoint: http://127.0.0.1:9001 # accessKey: root # secretKey: bonus@admin123 # bucketName: robot +#minio: +# endpoint: http://10.138.55.114:9000 +# accessKey: minioadmin +# secretKey: minioadmin +# bucketName: robot minio: - endpoint: http://10.138.55.114:9000 - accessKey: minioadmin - secretKey: minioadmin + endpoint: http://192.168.0.14:9090 + accessKey: minio + secretKey: bonus@admin123 bucketName: robot \ No newline at end of file