控制台-可试用产品修改

diagbotman-service/src/main/java/com/diagbot/dto/GetConsoleOnTrialDTO.java

@@ -0,0 +1,10 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class GetConsoleOnTrialDTO {
+
+}

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.springframework.stereotype.Component;
 
+import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
 import com.diagbot.service.impl.OpenedProductsServiceImpl;
 import com.diagbot.util.UserUtils;
@@ -22,5 +23,9 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
         return baseMapper.getConsoleOpened(userId);
     }
 	
+    public List<GetConsoleOnTrialDTO> getConsoleOnTrial(){
+    	Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        return baseMapper.getConsoleOnTrial(userId);
+    }
 	
 }

diagbotman-service/src/main/java/com/diagbot/mapper/OpenedProductsMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
 import com.diagbot.entity.OpenedProducts;
 
@@ -40,4 +41,11 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      * @return
      */
     List<GetConsoleOpenedDTO> getConsoleOpened(Long userId);
+    
+    /**
+     * 控制台已开通产品查询
+     * @param userId
+     * @return
+     */
+    List<GetConsoleOnTrialDTO> getConsoleOnTrial(Long userId);
 }

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
 import com.diagbot.dto.ProductAuthProgressDTO;
 import com.diagbot.dto.RespDTO;
@@ -46,5 +47,11 @@ public class ProductOrderController {
 		return RespDTO.onSuc(openedProductsFacade.getConsoleOpened());
 	}
 	
+	@ApiOperation(value = "控制台-可试用产品",notes="控制台-可试用产品")
+	@PostMapping("/getConsoleOnTrial")
+	@SysLogger("getConsoleOnTrial")
+	public RespDTO<List<GetConsoleOnTrialDTO>> getConsoleOnTrial() {
+		return RespDTO.onSuc(openedProductsFacade.getConsoleOnTrial());
+	}
 
 }