瀏覽代碼

忽略租户

lipenghui 2 月之前
父節點
當前提交
4a74bfc911

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

@@ -64,8 +64,7 @@ public class InspectCreateOrderJob implements JobHandler {
     private void deal(IotInspectPlanDO plan, Date date) {
     private void deal(IotInspectPlanDO plan, Date date) {
         Date date1 = new Date();
         Date date1 = new Date();
         if ("hour".equals(plan.getPlanUnit())){
         if ("hour".equals(plan.getPlanUnit())){
-            //todo
-            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){
             if (date1.compareTo(dateTime) > 0){
                 iotInspectOrderService.createPlan(plan);
                 iotInspectOrderService.createPlan(plan);
             }
             }

+ 2 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.security.config.SecurityProperties;
 import cn.iocoder.yudao.framework.security.config.SecurityProperties;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*;
 import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*;
 import cn.iocoder.yudao.module.system.controller.admin.socail.vo.user.SocialUserBindReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.socail.vo.user.SocialUserBindReqVO;
 import cn.iocoder.yudao.module.system.convert.auth.AuthConvert;
 import cn.iocoder.yudao.module.system.convert.auth.AuthConvert;
@@ -76,6 +77,7 @@ public class AuthController {
 
 
     @PostMapping("/simple/login/{id}")
     @PostMapping("/simple/login/{id}")
     @PermitAll
     @PermitAll
+    @TenantIgnore
     public CommonResult<AuthLoginRespVO> simpleLogin(@PathVariable("id") Long id) {
     public CommonResult<AuthLoginRespVO> simpleLogin(@PathVariable("id") Long id) {
         return success(authService.simpleLogin(id));
         return success(authService.simpleLogin(id));
     }
     }

+ 1 - 0
yudao-server/src/main/resources/application.yaml

@@ -290,6 +290,7 @@ yudao:
       - /admin-api/system/dict-data/page
       - /admin-api/system/dict-data/page
       - /admin-api/rq/iot-tree/simple-list
       - /admin-api/rq/iot-tree/simple-list
       - /system/auth/social-login
       - /system/auth/social-login
+      - /system/auth/simple/login/*
       - /admin-api/rq/deviceTD/runningTsData #查询时序数据库设备参数
       - /admin-api/rq/deviceTD/runningTsData #查询时序数据库设备参数
       - /admin-api/rq/deviceTD/runningSpanData #查询时序数据库设备参数
       - /admin-api/rq/deviceTD/runningSpanData #查询时序数据库设备参数
     ignore-tables:
     ignore-tables: