bonus
/
bonus-robot-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改机器人接口

This commit is contained in:
haozq 2025-08-06 09:39:04 +08:00
parent c10942f0ce
commit a4d4b6d4cb
7 changed files with 80 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-business/src/main/java/com/bonus/business/minio/MinioUtils.java
View File

@ -263,7 +263,7 @@ public class MinioUtils {
*
* @param bucketName
* @param imageBase64
* @param imageName
* @param
* @return
*/
public ObjectWriteResponse uploadImage(String bucketName, String imageBase64, String path) {

11
bonus-business/src/main/java/com/bonus/business/robot/Test.java
View File

@ -21,15 +21,14 @@ import java.util.Map;
public class Test {
public static void main(String[] args) {
String url="t1XVntv33PzUD1samSEmeyg8lT+msnCRwMU6sezhlQCgPwvsFsp5E/Ms4XUzOfbT3i0+xlMjn+C86e1TwXnYgUKZUi5Cd6uOG4tgG/mxh1xMW1ydk9PYt/wll630qUkeBxGqGSoFsbS346gft006En47WVGcwRmXTaJ4WIYSVfgT5+oxHbY02N9YZhsCuh8ctrtgwy1Ew0w8+SzsBqW8VQNmElrz+APAgRoWvAD3lQWVhIha4MeBVlci1yjW+Fk6Ju/wZSBTi+hnQEr6XIMQAWP3oD+76Ybxc0f+sn0ekMNXRemTpr0dHKRHlM9IRTIUJtdVgk65UEdIBSd1824ejeRs0WsInrOcUajGJ81qbW2GRZf0T76Sn+DxzTcWy+lwew6entW+PYRNugn3osAK0I5v+/NSA9W1zpjG0py4q2ir5hk1n+xMfbzR5wvUl1lWbVwvJ3nvTA0DOXBBY35WdybiyvF30/D0jwscCm26m9Mi1zUi6lphiuo/scmY3HpqViHE96rwDaJJLe3vPqsjn+yasJqv2PPaJzDRm8wnEVYEAvPaE+5xkQsMkHY1HJ45CARqTB1i/OhQMKOCKhxdDPinajUt8fSbR2CuzP6Tw02r5hk1n+xMfbzR5wvUl1lWbVwvJ3nvTA0DOXBBY35Wd5QgaeO15UJZM+pqRLk0SLV/rNKbI24GHedYEJ/wJH3ifsb+ZROgrb4sfrAK6FOoJd85JRUDpjiILsAuFI8CkepZfmHj5q52ac71XwJwIphL1OJZlubAiwljhC3BsMQvVZsNFT0+C+QTlFag2edImMc7oC3yAX8sAiVytFE7Ho8TtVpxD9R4Ok9juxyaaspA2TIwiEbGiaWuzKRN78fw4v8/ui9mgtFmEP0omgiYvhTJwHaOC14j7EmJ5eB76s4gAtljhvmKvgmxJkiYM55dJ0CwNr9VHZ6UjOf4J2NNzpw9an2LnXRjdqyiYW5N4krEDhAu1sQF2fQwOw4mpQwgnbn+yMAF3EI83HNrfy9vwFES2FadEXCHBF39Mw3nygykvmX6vs0m0dqMxiolDs/03m6XJPeMtw+tvQb9GQMFz2hyzfiLg0oQVSVg2CSrOq/VzAaIKbJ2fM5h2LFAtG+2ebpVQC7lxsf+c2NgJnAOtMTMuinlyGrCklItxevtrJ9Nxn9nx1z2hxnye5ylGiIQOT6VV8BJYyxh9B7MQKPy8AJmKxTW4esC4R5v3/YWZxWDho+I+7xN82HQicCig3vk4kegDYikiUrcyFOxIiqa3QCbIx8nrLjYwzVN+ohS+cq+wAyuKNfk2kFbNCE39UUgMEXmhRNN0gIJ2wrlr2mNbW5H7T/uNcqbweN/LpBawz4MAtz0QU/1JgnHOojIqJAlDYPEYbrZCjUThrU1IbAJml0vcjIbQJ5mjxTQjs1Ff6tZE5G06ORbWztTPNkWcbBWJN0PkNHNJR/IEk2XDfeCHgIcxMhE3gpY+Dwdp6ZTAYU4F9fZnjr2sV4HLxueVUCfNQKaKw4eOV9cVJnuK8sOWUdlm5SidwfdCNTlY8pe2qDeWZw0jMjJ3mh+qgEr9iscLbs=";
System.err.println(AesUtils.aesDecrypt(url));
File file=new File("http://112.31.70.193:9682/files/d/2025/07/02/14/20250702140034369_1751436030_1302.jpg");
String uuid= UUID.randomUUID().toString().replaceAll("-","");
//登录接口
String token=QxVideotape.login(TVideoConfigUtil.getMaps(),TVideoConfigUtil.Q2HTTPURL);
// String xmls= QxUtils.setVideoSource(XxmSendUtils.ROBOT_VIDEO_SOURCE,"33");
// String res33=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,"201115200268437643",xmls);
String xml= QxUtils.getParamData(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_MAP_IMAGE);
String res=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,"201115200268437643",xml);
System.err.println(res);
// //机器人 开启巡检
//// String xml2= QxUtils.getRobotStartTask(XxmSendUtils.CONTROLLER,XxmSendUtils.ROBOT_START_TASK,"WTBLS204766");
//// String res3=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,"201115200268437643",xml2);

1
bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java
View File

@ -63,6 +63,7 @@ public class RobotEventXmlServiceImpl implements IRobotEventXmlService {
@Override
public void xmlAnalysis(String xml) {
try{
Document doc=DocumentHelper.parseText(xml);
//获取根节点
Element root = doc.getRootElement();

3
bonus-business/src/main/java/com/bonus/business/service/impl/RobotServiceImpl.java
View File

@ -434,6 +434,9 @@ public class RobotServiceImpl implements IRobotService {
@Override
public AjaxResult updateTask(PatrolTask vo) {
try{
if(StringHelper.isNullOrEmptyString(vo.getRobotId())){
vo.setRobotId("BNS_ROBOT");
}
PatrolTask patrolTask=mapper.getTaskDetails(vo);
int version=Integer.parseInt(patrolTask.getVersion());
version=version+1;

55
bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java
View File

@ -2,6 +2,8 @@ package com.bonus.business.service.impl;
import com.bonus.business.mapper.SbdUserMapper;
import com.bonus.business.minio.FileServiceImpl;
import com.bonus.business.minio.MinioUtils;
import com.bonus.business.minio.config.MinioConfig;
import com.bonus.business.robot.util.IdUtils;
import com.bonus.business.robot.util.ImageResizer;
import com.bonus.business.service.ISbdUserService;
@ -42,6 +44,12 @@ public class SbdUserServiceImpl implements ISbdUserService {
private PersonFaceServiceImpl personFaceService;
@Autowired
private FileServiceImpl fileService;
@Autowired
private MinioUtils minioUtils;
@Autowired
private MinioConfig minioConfig;
@Override
public AjaxResult addSbdUser(SbdUserVo user, MultipartFile multipartFile) {
try{
@ -190,25 +198,42 @@ public class SbdUserServiceImpl implements ISbdUserService {
try{
// 1.查询每日作业人员数据
List<SbdUserVo> list=mapper.getGdWorker();
// 2.查询库里已存在的施工人员数据
List<SbdUserVo> existList=mapper.getExistGdWorker();
// 3.新增人员
List<SbdUserVo> missDataList = findMissingInB(existList, list);
// 4.已存在人员-更新即可
List<SbdUserVo> updateDataList = findExitInB(existList, list);
if(CollectionUtils.isNotEmpty(missDataList)){
log.info("新增施工人员数据:{}",missDataList.size());
mapper.addOrUpdateSbdUserInfo(missDataList,1);
}
if(CollectionUtils.isNotEmpty(updateDataList)){
log.info("更新施工人员数据:{}",updateDataList.size());
mapper.addOrUpdateSbdUserInfo(updateDataList,2);
if(list!=null && !list.isEmpty()){
//图片采集获取
for (SbdUserVo vo:list){
if(!StringHelper.isNullOrEmptyString(vo.getImage())){
String file= "/" + vo.getPrefix() + vo.getImage();
boolean b=minioUtils.isObjectExist(vo.getBucket(),file);
if(b){
String time= DateUtils.dateTime();
String ids=IdUtils.simpleuuid();
String path ="/"+"user"+"/"+time+"/" +ids + ".png" ;
minioUtils.copyFile(vo.getBucket(),file,minioConfig.getBucketName(),path);
vo.setImage(path);
if(!StringHelper.isNullOrEmptyString(vo.getUserImage())){
minioUtils.removeFile(minioConfig.getBucketName(), vo.getUserImage());
}
}
}
}
// 2.查询库里已存在的施工人员数据
List<SbdUserVo> existList=mapper.getExistGdWorker();
// 3.新增人员
List<SbdUserVo> missDataList = findMissingInB(existList, list);
// 4.已存在人员-更新即可
List<SbdUserVo> updateDataList = findExitInB(existList, list);
if(CollectionUtils.isNotEmpty(missDataList)){
log.info("新增施工人员数据:{}",missDataList.size());
mapper.addOrUpdateSbdUserInfo(missDataList,1);
}
if(CollectionUtils.isNotEmpty(updateDataList)){
log.info("更新施工人员数据:{}",updateDataList.size());
mapper.addOrUpdateSbdUserInfo(updateDataList,2);
}
}
/*if(list!=null && !list.isEmpty()){
mapper.replaceSbdUserInfo(list);
}*/
}catch (Exception e){
log.error(e.toString(),e);
}

21
bonus-business/src/main/java/com/bonus/business/vo/SbdUserVo.java
View File

@ -72,6 +72,27 @@ public class SbdUserVo {
*
*/
private String bast64;
/**
* 桶名称
*/
private String bucket;
/**
*
* 文件名称
*/
private String filename;
/**
* 文件名
*/
private String etag;
/**
* 存储路径
*/
private String prefix;
/**
* 存储图片
*/
private String userImage;
private String birthDate;

15
bonus-business/src/main/resources/mapper/robot/SbdUserMapper.xml
View File

@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)values
<foreach collection="list" item="item" separator=",">(
#{item.id}, #{item.dataSource},#{item.userName},#{item.sex},
#{item.idCard},#{item.post},#{item.workType},#{item.mobile},now(),now(),0,#{item.age},#{item.idCard},#{item.birthDate}
#{item.image},#{item.post},#{item.workType},#{item.mobile},now(),now(),0,#{item.age},#{item.idCard},#{item.birthDate}
)
</foreach>
</if>
@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
data_source=#{item.dataSource},
user_name=#{item.userName},
sex=#{item.sex},
image=#{item.idCard},
image=#{item.image},
post=#{item.post},
work_type=#{item.workType},
mobile=#{item.mobile},
@ -137,8 +137,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
limit 12
</select>
<select id="getGdWorker" resultType="com.bonus.business.vo.SbdUserVo">
select id,name userName,bak_ic idCard,birth_date AS birthDate,sex,age,mobile_phone mobile,'1' dataSource,
CASE sta_type
select gw.id,gw.name userName,gw.bak_ic idCard,gw.birth_date birthDate,gw.sex,gw.age,gw.mobile_phone mobile,'1' dataSource,
CASE gw.sta_type
WHEN 1 THEN '特种人员'
WHEN 2 THEN '其它技能人员'
WHEN 3 THEN '一般人员'
@ -157,8 +157,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHEN 9 THEN '班组骨干'
ELSE
'其他人员'
END AS 'post'
from gd_worker
END AS 'post',gw.image,sa.bucket,sa.filename,sa.etag,sa.prefix,rsu.image userImage
from gd_worker gw
left join system_attach sa on sa.id=gw.image
LEFT JOIN robot_sbd_user rsu on rsu.id=gw.id
WHERE DATE(gw.create_time)=CURRENT_DATE or DATE(gw.update_time)=CURRENT_DATE
</select>
<select id="getSbdUserList" resultType="com.bonus.business.vo.PersonVo">