服务端管理

diagbotman-service/src/main/java/com/diagbot/entity/ServiceToken.java

@@ -52,7 +52,7 @@ public class ServiceToken implements Serializable {
     /**
      * 产品服务关联id
      */
-    private Long productSeviceId;
+    private Long productServiceId;
 
     /**
      * 服务调用id
@@ -138,12 +138,12 @@ public class ServiceToken implements Serializable {
         this.modifier = modifier;
     }
 
-    public Long getProductSeviceId() {
-        return productSeviceId;
+    public Long getProductServiceId() {
+        return productServiceId;
     }
 
-    public void setProductSeviceId(Long productSeviceId) {
-        this.productSeviceId = productSeviceId;
+    public void setProductServiceId(Long productServiceId) {
+        this.productServiceId = productServiceId;
     }
 
     public String getAppKeyId() {
@@ -211,7 +211,7 @@ public class ServiceToken implements Serializable {
         ", gmtModified=" + gmtModified +
         ", creator=" + creator +
         ", modifier=" + modifier +
-        ", productSeviceId=" + productSeviceId +
+        ", productServiceId=" + productServiceId +
         ", appKeyId=" + appKeyId +
         ", appKeySecret=" + appKeySecret +
         ", type=" + type +

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/ProductServiceWrapper.java

@@ -12,21 +12,12 @@ import com.diagbot.entity.ServiceToken;
  * @time: 2018/9/19 16:06
  */
 public class ProductServiceWrapper extends ProductService {
-    private ProductService productService;
     private LantoneProduct lantoneProduct;
     private OpenedProducts openedProducts;
     private ServiceInfo serviceInfo;
     private ServiceToken serviceToken;
     private Long userId;
 
-    public ProductService getProductService() {
-        return productService;
-    }
-
-    public void setProductService(ProductService productService) {
-        this.productService = productService;
-    }
-
     public LantoneProduct getLantoneProduct() {
         return lantoneProduct;
     }

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

@@ -13,6 +13,8 @@ import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ProductServiceServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
 import com.diagbot.util.GuidUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ProductServiceSaveVO;
@@ -87,13 +89,13 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         ServiceToken old_serviceToken = serviceTokenFacade.getByProductServiceId(productService.getId());
         //删除原有token
         if (old_serviceToken != null) {
-            serviceTokenFacade.deleteByProductServiceId(old_serviceToken.getProductSeviceId());
+            serviceTokenFacade.deleteByProductServiceId(old_serviceToken.getProductServiceId());
         }
 
         ServiceToken serviceToken = new ServiceToken();
         serviceToken.setCreator(userId.toString());
         serviceToken.setGmtCreate(new Date());
-        serviceToken.setProductSeviceId(productService.getId());
+        serviceToken.setProductServiceId(productService.getId());
         serviceToken.setType(productServiceSaveVO.getType());
         serviceToken.setAppKeyId(GuidUtil.App_key());
         serviceToken.setAppKeySecret(GuidUtil.App_screct());
@@ -108,10 +110,7 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
             serviceToken.setExpiringDate(old_serviceToken.getExpiringDate());
         } else if (productServiceSaveVO.getType().equals(TokenTypeEnum.Trial.getKey())) {
             serviceToken.setStartingDate(new Date());
-            calendar.clear();
-            calendar.setTime(new Date());
-            calendar.add(Calendar.DAY_OF_MONTH, 7);
-            serviceToken.setExpiringDate(calendar.getTime());
+            serviceToken.setExpiringDate(DateUtil.add(serviceToken.getStartingDate(), Calendar.DAY_OF_MONTH, 7));
         }
         serviceTokenFacade.save(serviceToken);
         productServiceDTO.setServiceToken(serviceToken);
@@ -148,23 +147,38 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
      */
     public IPage<ProductServiceWrapper> selectProductServiceByCurrentUserPage(Page<ProductServiceWrapper> page) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        //当前登录用户服务端列表
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("is_deleted", "N");
+        columnMap.put("user_id", userId);
+        List<ServiceInfo> serviceInfoList = (List) serviceInfoFacade.listByMap(columnMap);
+        Map<Long, ServiceInfo> serviceData = EntityUtil.makeEntityMap(serviceInfoList, "id");
+        //服务令牌列表
+        columnMap.clear();
+        columnMap.put("is_deleted", "N");
+        List<ServiceToken> serviceTokenList = (List) serviceTokenFacade.listByMap(columnMap);
+        Map<Long, ServiceToken> tokenData = EntityUtil.makeEntityMap(serviceTokenList, "productServiceId");
+        //产品列表
+        columnMap.clear();
+        columnMap.put("is_deleted", "N");
+        List<LantoneProduct> lantoneProductList = (List) lantoneProductFacade.listByMap(columnMap);
+        Map<Long, LantoneProduct> lantoneProductData = EntityUtil.makeEntityMap(lantoneProductList, "id");
+        //当前用户开通的产品列表
+        columnMap.clear();
+        columnMap.put("is_deleted", "N");
+        columnMap.put("user_id", userId);
+        List<OpenedProducts> openedProductsList = (List) openedProductsFacade.listByMap(columnMap);
+        Map<Long, OpenedProducts> openedProductData = EntityUtil.makeEntityMap(openedProductsList, "productId");
+
         ProductServiceWrapper productServiceVO = new ProductServiceWrapper();
         productServiceVO.setUserId(userId);
         IPage<ProductServiceWrapper> psPage = this.selectProductServiceByUserIdPage(page, productServiceVO);
         List<ProductServiceWrapper> psList = psPage.getRecords();
         for (ProductServiceWrapper productService : psList) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("userId", userId);
-            map.put("productId", productService.getProductId());
-            LantoneProduct lantoneProduct = lantoneProductFacade.getById(productService.getProductId());
-            List<OpenedProducts> openedProductsList = openedProductsFacade.selectOpenedProducts(map);
-            OpenedProducts openedProducts = openedProductsList.size() == 0 ? null : openedProductsList.get(0);
-            ServiceInfo serviceInfo = serviceInfoFacade.getById(productService.getServiceId());
-            ServiceToken serviceToken = serviceTokenFacade.getByProductServiceId(productService.getId());
-            productService.setLantoneProduct(lantoneProduct);
-            productService.setOpenedProducts(openedProducts);
-            productService.setServiceInfo(serviceInfo);
-            productService.setServiceToken(serviceToken);
+            productService.setLantoneProduct(lantoneProductData.get(productService.getProductId()));
+            productService.setOpenedProducts(openedProductData.get(productService.getProductId()));
+            productService.setServiceInfo(serviceData.get(productService.getServiceId()));
+            productService.setServiceToken(tokenData.get(productService.getId()));
         }
         psPage.setRecords(psList);
         return psPage;

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

@@ -49,7 +49,7 @@ public class ServiceTokenFacade extends ServiceTokenServiceImpl {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "appkey或secret错误，appkey=【" + appkey + "】," + "secret=【" + secret + "】");
         }
         if(TokenTypeEnum.Trial.getKey() == st.getType()) {
-            ProductService ps = productServiceFacade.getById(st.getProductSeviceId());
+            ProductService ps = productServiceFacade.getById(st.getProductServiceId());
             if (ps == null) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "无权限访问!");
             }

diagbotman-service/src/main/resources/mapper/ServiceTokenMapper.xml

@@ -10,7 +10,7 @@
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
-        <result column="product_sevice_id" property="productSeviceId" />
+        <result column="product_service_id" property="productServiceId" />
         <result column="app_key_id" property="appKeyId" />
         <result column="app_key_secret" property="appKeySecret" />
         <result column="type" property="type" />