Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/InspectCreateOrderJob.java

@@ -30,7 +30,6 @@ public class InspectCreateOrderJob implements JobHandler {
 
 
     @Override
-    @TenantJob
     @Transactional(rollbackFor = Exception.class)
     @DataPermission(enable = false)
     @TenantIgnore
@@ -63,7 +62,7 @@ public class InspectCreateOrderJob implements JobHandler {
     private void deal(IotInspectPlanDO plan, Date date) {
         Date date1 = new Date();
         if ("hour".equals(plan.getPlanUnit())){
-            DateTime dateTime = DateUtil.offsetMinute(date, Integer.parseInt(StringUtils.substringBeforeLast(String.valueOf(plan.getPlanCycle()),".")));
+            DateTime dateTime = DateUtil.offsetHour(date, Integer.parseInt(StringUtils.substringBeforeLast(String.valueOf(plan.getPlanCycle()),".")));
             if (date1.compareTo(dateTime) > 0){
                 iotInspectOrderService.createPlan(plan);
             }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/MapLngLatJob.java

@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.module.pms.job;
 
 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
+import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
 import cn.iocoder.yudao.module.pms.ThingsModelDTO;
 import cn.iocoder.yudao.module.pms.controller.admin.TableDataInfo;
@@ -16,6 +18,7 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Component
 public class MapLngLatJob implements JobHandler {
@@ -25,7 +28,8 @@ public class MapLngLatJob implements JobHandler {
     private RestTemplate restTemplate;
 
     @Override
-    @TenantJob
+    @TenantIgnore
+    @DataPermission(enable = false)
     public String execute(String param) throws Exception {
         List<IotDeviceDO> iotDeviceDOS = iotDeviceMapper.selectDataCollect();
         iotDeviceDOS.forEach(deviceDO -> {