修复bug

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/robot/RobotGenericsStatusApiImpl.java

@@ -49,10 +49,9 @@ public class RobotGenericsStatusApiImpl implements RobotGenericsStatusApi {
         RobotStatusDataPoseDTO robotStatusDataPoseDTO= JSONUtil.toBean((String)object, RobotStatusDataPoseDTO.class);
         String batSoc = robotStatusData.getHwStates().getBatSoc();
         if (ObjectUtil.isNotEmpty(batSoc)) {
-            BigDecimal a = new BigDecimal(batSoc);
+            String[] split = batSoc.split("\\.");
-            BigDecimal b = new BigDecimal("100");
+            batSoc = split[1].substring(0,2);
-            BigDecimal multiply = a.multiply(b);
+            robotStatusDataPoseDTO.setBatSoc(batSoc);
-            robotStatusDataPoseDTO.setBatSoc(multiply.toString());
         }
 
         redisUtil.set(pose2dKey,JSON.toJSONString(robotStatusDataPoseDTO),robotPositionCacheTime);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/config/aop/SystemRateLimiterAspect.java

@@ -75,7 +75,7 @@ public class SystemRateLimiterAspect {
             obj = joinPoint.proceed();
         } else {
             // 请求过于频繁
-            logger.info("请求过于频繁 ：{}", key);
+//            logger.info("请求过于频繁 ：{}", key);
         }
         return obj;
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationSaveReqVO.java

@@ -41,12 +41,14 @@ public class DeviceInformationSaveReqVO {
     private Integer deviceType;
 
     @Schema(description = "设备编号")
+    @Size(min = 0, max = 50 ,message = "设备编号长度超过限制")
     private String deviceNo;
 
     @Schema(description = "设备位置")
     private String deviceLocation;
 
     @Schema(description = "mac地址")
+    @Size(min = 0, max = 50 ,message = "Mac地址长度超过限制")
     private String macAddress;
 
     @Schema(description = "设备在地图上图标")
@@ -77,9 +79,11 @@ public class DeviceInformationSaveReqVO {
     private Integer deviceAttribute;
 
     @Schema(description = "设备IP")
+    @Size(min = 0, max = 20 ,message = "设备IP长度超过限制")
     private String deviceIp;
 
     @Schema(description = "端口")
+    @Size(min = 0, max = 10 ,message = "端口长度超过限制")
     private String devicePort;
 
     @Schema(description = "最后使用者")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/enums/robot/task/RobotTaskStageEnum.java

@@ -13,7 +13,8 @@ public enum RobotTaskStageEnum {
     RELEASEING(4L,"放货中"),
     DONE(5L,"结束"),
     MOVE(6L,"移动中"),
-    CHARGEING(7L,"待执行正在充电");
+    CHARGEING(7L,"待执行正在充电"),
+    CLOSE(8L,"任务已取消");
     /**
      * 类型
      */

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationServiceImpl.java

@@ -143,6 +143,12 @@ public class DeviceInformationServiceImpl extends ServiceImpl<DeviceInformationM
         validateInformationExists(id);
         // 删除
         informationMapper.deleteById(id);
+
+        DeviceInformationDO deviceInformationDO = informationMapper.selectById(id);
+        UserOperationLogSaveReqVO operationLog = UserOperationLogSaveReqVO.builder()
+                .operateAction("删除设备 " + deviceInformationDO.getDeviceNo())
+                .nickName(SecurityFrameworkUtils.getLoginUserNickname()).build();
+        userOperationLogService.createUserOperationLog(operationLog);
     }
 
     private void validateInformationExists(Long id) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotInformationServiceImpl.java

@@ -610,12 +610,12 @@ public class RobotInformationServiceImpl extends ServiceImpl<RobotInformationMap
         if (ObjectUtil.isNotEmpty(o)) {
             // 化作列表
             List<RobotInformationVO> list = JSONUtil.toList(o.toString(), RobotInformationVO.class);
-            return list.stream().collect(Collectors.toMap(RobotInformationVO::getMacAddress, Function.identity()));
+            return list.stream().collect(Collectors.toMap(RobotInformationVO::getMacAddress, Function.identity(), (v1, v2) -> v1));
         } else {
             List<RobotInformationDO> allRobotInfoList = this.list();
             List<RobotInformationVO> list = BeanUtil.copyToList(allRobotInfoList, RobotInformationVO.class);
             redisUtil.set(key, JSONUtil.toJsonStr(list));
-            return list.stream().collect(Collectors.toMap(RobotInformationVO::getMacAddress, Function.identity()));
+            return list.stream().collect(Collectors.toMap(RobotInformationVO::getMacAddress, Function.identity(), (v1, v2) -> v1));
         }
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotTaskServiceImpl.java

@@ -50,6 +50,7 @@ import cn.iocoder.yudao.module.system.enums.robot.*;
 import cn.iocoder.yudao.module.system.enums.robot.charge.ChargeTaskStatusEnum;
 import cn.iocoder.yudao.module.system.enums.robot.task.RobotCommandTypeEnum;
 //import cn.iocoder.yudao.module.system.service.robot.job.RobotCommonTaskService;
+import cn.iocoder.yudao.module.system.enums.robot.task.RobotTaskStageEnum;
 import cn.iocoder.yudao.module.system.enums.wait.WaitStatusEnum;
 import cn.iocoder.yudao.module.system.service.information.DeviceInformationService;
 import cn.iocoder.yudao.module.system.service.log.UserOperationLogService;
@@ -389,6 +390,7 @@ public class RobotTaskServiceImpl extends ServiceImpl<RobotTaskMapper, RobotTask
             }
             //后期需做状态映射
             taskDetailDO.setTaskStatus(updateReqVO.getTaskStatus());
+            taskDetailDO.setTaskStage(RobotTaskStageEnum.CLOSE.getType());
 
             if (RobotTaskTypeEnum.CHARGE.getType().equals(taskDetailDO.getTaskType())
                     && RobotTaskTypeEnum.PARK.getType().equals(taskDetailDO.getTaskType())) {

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/robot/RobotTaskMapper.xml

@@ -264,12 +264,13 @@
             t1.task_status,
             t1.task_stage,
             t1.start_time,
-            t1.end_time
+            t1.end_time,
+            t1.create_time
         from
-            robot_task t1 left join robot_task_detail t2
+        robot_task t1 left join robot_task_detail t2
-            on t1.id = t2.robot_task_id
+        on t1.id = t2.robot_task_id
         <where>
-             t1.deleted = '0'
+            t1.deleted = '0'
             and t2.deleted = '0'
             <if test="pageReqVO.taskNo != null and pageReqVO.taskNo != ''">
                 and t1.task_no like concat('%', #{pageReqVO.taskNo}, '%')