服务端管理

diagbotman-service/src/main/java/com/diagbot/facade/ProductServiceFacade.java

@@ -19,6 +19,7 @@ import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
@@ -58,7 +59,7 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
             productServiceRespDTO.setMsg("当前登录用户没有关联服务端【" + serviceInfo.getName() + "】");
             return productServiceRespDTO;
         }
-        //接入方式
+
         Map<String, Object> map = new HashMap<>();
         map.put("productId", productServiceSaveVO.getProductId());
         map.put("serviceId", productServiceSaveVO.getServiceId());
@@ -79,39 +80,46 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         // 生成令牌
         // 如果已有令牌，先删除原令牌，再重新生成
         // 试用产品 type=3 需生成7天有效期，重新生成令牌，有效期继承，超出有效期不允许再生成令牌
+        // 接入方式 accessType=3 online模式不需要生成令牌
         ServiceToken old_serviceToken = serviceTokenFacade.getByProductServiceId(productService.getId());
         //删除原有token
         if (old_serviceToken != null) {
             serviceTokenFacade.deleteByProductServiceId(old_serviceToken.getProductSeviceId());
         }
-        ServiceToken serviceToken = new ServiceToken();
-        serviceToken.setCreator(userId.toString());
-        serviceToken.setGmtCreate(new Date());
-        serviceToken.setProductSeviceId(productService.getId());
-        serviceToken.setType(productServiceSaveVO.getType());
-        serviceToken.setAppKeyId(GuidUtil.App_key());
-        serviceToken.setAppKeySecret(GuidUtil.App_screct());
-        serviceToken.setStatus(1);
-        if (old_serviceToken != null && old_serviceToken.getType().equals(TokenTypeEnum.Trial)) {
-            //如果试用已过期，不允许再生成
-            if (calendar.after(old_serviceToken.getExpiringDate())) {
-                productServiceRespDTO.setMsg("当前试用账号已过期，不允许再生成令牌");
-                return productServiceRespDTO;
+
+        String[] accessType = lantoneProduct.getAccessType().split(",");
+        if (accessType.length == 1 && accessType[0].equals("3")) {
+            productServiceRespDTO.setMsg("online模式不需要生成令牌！");
+        } else {
+            ServiceToken serviceToken = new ServiceToken();
+            serviceToken.setCreator(userId.toString());
+            serviceToken.setGmtCreate(new Date());
+            serviceToken.setProductSeviceId(productService.getId());
+            serviceToken.setType(productServiceSaveVO.getType());
+            serviceToken.setAppKeyId(GuidUtil.App_key());
+            serviceToken.setAppKeySecret(GuidUtil.App_screct());
+            serviceToken.setStatus(1);
+            if (old_serviceToken != null && old_serviceToken.getType().equals(TokenTypeEnum.Trial)) {
+                //如果试用已过期，不允许再生成
+                if (calendar.after(old_serviceToken.getExpiringDate())) {
+                    productServiceRespDTO.setMsg("当前试用账号已过期，不允许再生成令牌");
+                    return productServiceRespDTO;
+                }
+                serviceToken.setStartingDate(old_serviceToken.getStartingDate());
+                serviceToken.setExpiringDate(old_serviceToken.getExpiringDate());
+            } else if (productServiceSaveVO.getType().equals(TokenTypeEnum.Trial)) {
+                serviceToken.setStartingDate(new Date());
+                calendar.clear();
+                calendar.setTime(new Date());
+                calendar.add(Calendar.DAY_OF_MONTH, 7);
+                serviceToken.setExpiringDate(calendar.getTime());
             }
-            serviceToken.setStartingDate(old_serviceToken.getStartingDate());
-            serviceToken.setExpiringDate(old_serviceToken.getExpiringDate());
-        } else if (productServiceSaveVO.getType().equals(TokenTypeEnum.Trial)) {
-            serviceToken.setStartingDate(new Date());
-            calendar.clear();
-            calendar.setTime(new Date());
-            calendar.add(Calendar.DAY_OF_MONTH, 7);
-            serviceToken.setExpiringDate(calendar.getTime());
+            serviceTokenFacade.save(serviceToken);
+            productServiceRespDTO.setServiceToken(serviceToken);
+            productServiceRespDTO.setMsg("令牌生成成功！");
         }
-        serviceTokenFacade.save(serviceToken);
 
         productServiceRespDTO.setProductService(productService);
-        productServiceRespDTO.setServiceToken(serviceToken);
-        productServiceRespDTO.setMsg("令牌生成成功！");
         return productServiceRespDTO;
     }