Browse Source

查询激活信息修改

wangliang 3 years ago
parent
commit
127849f79d

+ 7 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/AuthInfoService.java

@@ -31,4 +31,11 @@ public interface AuthInfoService {
      * @param licenseData
      */
     void updateLicense(byte[] licenseData);
+
+    /**
+     * 查询授权信息
+     *
+     * @return
+     */
+    Long selectAuthInfo();
 }

+ 14 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/AuthInfoServiceImpl.java

@@ -114,6 +114,20 @@ public class AuthInfoServiceImpl implements AuthInfoService {
         saveAuthInfo(appInfo, AuthEnum.OFF_LINE, licenseData);
     }
 
+    /**
+     * 查询授权信息
+     *
+     * @return
+     */
+    @Override
+    public Long selectAuthInfo() {
+        Long expireTime = null;
+        if (Objects.nonNull(solarService.getAppControl())) {
+            expireTime = Objects.nonNull(solarService.getAppControl().getExpireTime()) ? solarService.getAppControl().getExpireTime() : -1;
+        }
+        return expireTime;
+    }
+
     /**
      * 保存鉴权信息
      *

+ 1 - 11
distributed-print/src/main/java/com/qmth/distributed/print/api/TSAuthController.java

@@ -8,7 +8,6 @@ import com.qmth.boot.core.solar.crypto.AppLicenseUtil;
 import com.qmth.boot.tools.signature.SignatureEntity;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.distributed.print.business.service.AuthInfoService;
-import com.qmth.teachcloud.common.bean.dto.AuthOrgInfoDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -79,16 +78,7 @@ public class TSAuthController {
     @ApiResponses({@ApiResponse(code = 200, message = "授权配置信息", response = Long.class)})
     @RequestMapping(value = "/select", method = RequestMethod.POST)
     public Result select() {
-        Long schoolId = SystemConstant.getHeadOrUserSchoolId();
-        Long expireTime = null;
-        if (Objects.nonNull(schoolId)) {
-            BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
-            AuthOrgInfoDto authOrgInfoDto = commonCacheService.authInfoCache(basicSchool.getCode());
-            if (Objects.nonNull(authOrgInfoDto) && Objects.nonNull(authOrgInfoDto.getControl())) {
-                expireTime = Objects.nonNull(authOrgInfoDto.getControl().getExpireTime()) ? authOrgInfoDto.getControl().getExpireTime() : -1L;
-            }
-        }
-        return ResultUtil.ok(expireTime);
+        return ResultUtil.ok(authInfoService.selectAuthInfo());
     }
 
     @ApiOperation(value = "测试推送信息给教研分析")