浏览代码

内蒙古蒙一贴二维码关闭掉,再次补发记录清理掉校验

yfh 12 小时之前
父节点
当前提交
821be32442

+ 10 - 1
fs-company/src/main/java/com/fs/company/controller/qw/QwSopLogsController.java

@@ -1,10 +1,12 @@
 package com.fs.company.controller.qw;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.core.redis.RedisCache;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
@@ -60,7 +62,8 @@ public class QwSopLogsController extends BaseController
 
     @Autowired
     private ICompanyUserService iCompanyUserService;
-
+    @Autowired
+    private RedisCache redisCache;
     @Autowired
     private CompanyDeptServiceImpl companyDeptService;
 
@@ -266,6 +269,12 @@ public class QwSopLogsController extends BaseController
     @PutMapping("/editCourseQwSopLogs/{ids}")
     public AjaxResult editCourseQwSopLogs(@PathVariable String[] ids)
     {
+       if (ObjectUtil.isNotEmpty(ids)){
+           for (String id : ids) {
+               String key = "qw:logs:pad:send:id:" + id;
+               redisCache.deleteObject(key);
+           }
+       }
         return toAjax(iQwSopLogsService.editCourseQwSopLogs(ids));
     }
 

+ 12 - 3
fs-service/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -14,6 +14,7 @@ import com.ecloud.sdk.ecs.v1.model.VmRebootRequest;
 import com.ecloud.sdk.ecs.v1.model.VmRebootResponse;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.utils.CloudHostUtils;
 import com.fs.common.utils.PubFun;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyUser;
@@ -23,6 +24,7 @@ import com.fs.company.service.ICompanyUserService;
 import com.fs.config.ai.AiHostProper;
 import com.fs.config.cloud.CloudHostProper;
 import com.fs.his.config.FsSysConfig;
+import com.fs.his.domain.FsDfAccount;
 import com.fs.his.utils.ConfigUtil;
 import com.fs.ipad.IpadSendUtils;
 import com.fs.ipad.param.WxSendAtMsgParam;
@@ -531,7 +533,10 @@ public class QwUserServiceImpl implements IQwUserService
         if (result.getData().flag){
             QwUser qwUser=new QwUser();
             qwUser.setAppKey(appKey);
-            qwUser.setLoginCodeUrl(result.getData().ipAddress);
+            if (!CloudHostUtils.hasCloudHostName("内蒙古一贴")) {
+                qwUser.setLoginCodeUrl(result.getData().ipAddress);
+            }
+//            qwUser.setLoginCodeUrl(result.getData().ipAddress);
 
             int i = qwUserMapper.updateQwUserByAppKeyToUrl(qwUser);
             if (i>0){
@@ -668,7 +673,9 @@ public class QwUserServiceImpl implements IQwUserService
                 if (result.getData().flag){
                     QwUser qwUser=new QwUser();
                     qwUser.setAppKey(appKey);
-                    qwUser.setLoginCodeUrl(result.getData().ipAddress);
+                    if (!CloudHostUtils.hasCloudHostName("内蒙古一贴")) {
+                        qwUser.setLoginCodeUrl(result.getData().ipAddress);
+                    }
 
                     int i = qwUserMapper.updateQwUserByAppKeyToUrl(qwUser);
                     if (i>0){
@@ -742,7 +749,9 @@ public class QwUserServiceImpl implements IQwUserService
                 if (result.getData().flag){
                     QwUser qwUser=new QwUser();
                     qwUser.setAppKey(appKey);
-                    qwUser.setLoginCodeUrl(result.getData().ipAddress);
+                    if (!CloudHostUtils.hasCloudHostName("内蒙古一贴")) {
+                        qwUser.setLoginCodeUrl(result.getData().ipAddress);
+                    }
 
                     int i = qwUserMapper.updateQwUserByAppKeyToUrl(qwUser);
                     if (i>0){