已开通产品修改

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

@@ -0,0 +1,41 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class GetConsoleOpenedDTO {
+	
+	/**
+     * 已开通产品id
+     */
+    private Integer openId;
+	
+	 /**
+     * 产品id
+     */
+    private Integer productId;
+    
+    /**
+     * 产品名称
+     */
+    private String name;
+
+    /**
+     * 开通日期
+     */
+    private String startTime;
+
+    /**
+     * 结束日期
+     */
+    private String endTime;
+    
+    /**
+     * 当前用户的产品停用状态
+     */
+    private Integer serviceStatus;
+    
+
+}

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

@@ -1,8 +1,13 @@
 package com.diagbot.facade;
 
-import com.diagbot.service.impl.OpenedProductsServiceImpl;
+import java.util.List;
+
 import org.springframework.stereotype.Component;
 
+import com.diagbot.dto.GetConsoleOpenedDTO;
+import com.diagbot.service.impl.OpenedProductsServiceImpl;
+import com.diagbot.util.UserUtils;
+
 /**
  * @Description:已开通产品业务层
  * @author: zhaops
@@ -10,4 +15,12 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class OpenedProductsFacade extends OpenedProductsServiceImpl {
+	
+	
+    public List<GetConsoleOpenedDTO> getConsoleOpened(){
+    	Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        return baseMapper.getConsoleOpened(userId);
+    }
+	
+	
 }

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

@@ -1,13 +1,15 @@
 package com.diagbot.mapper;
 
+import java.util.List;
+import java.util.Map;
+
+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.GetConsoleOpenedDTO;
 import com.diagbot.entity.OpenedProducts;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -31,4 +33,11 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      * @return
      */
     List<OpenedProducts> selectOpenedProducts(Map<String,Object>map);
+    
+    /**
+     * 控制台已开通产品查询
+     * @param userId
+     * @return
+     */
+    List<GetConsoleOpenedDTO> getConsoleOpened(Long userId);
 }

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

@@ -8,8 +8,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetConsoleOpenedDTO;
 import com.diagbot.dto.ProductAuthProgressDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.facade.ProductOrderFacade;
 
 import io.swagger.annotations.Api;
@@ -27,6 +29,8 @@ public class ProductOrderController {
 
 	@Autowired
 	private ProductOrderFacade productOrderFacade;
+	@Autowired
+	private OpenedProductsFacade openedProductsFacade;
 
 	@ApiOperation(value = "控制台-产品认证进度",notes="控制台-产品认证进度")
 	@PostMapping("/productAuthProgress")
@@ -34,5 +38,13 @@ public class ProductOrderController {
 	public RespDTO<List<ProductAuthProgressDTO>> productAuthProgress() {
 		return RespDTO.onSuc(productOrderFacade.productAuthProgress());
 	}
+	
+	@ApiOperation(value = "控制台-已开通产品",notes="控制台-已开通产品")
+	@PostMapping("/getConsoleOpened")
+	@SysLogger("getConsoleOpened")
+	public RespDTO<List<GetConsoleOpenedDTO>> getConsoleOpened() {
+		return RespDTO.onSuc(openedProductsFacade.getConsoleOpened());
+	}
+	
 
 }

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

@@ -32,4 +32,18 @@
         and t.product_id=#{productId}
         </if>
     </select>
+    
+ 	<select id="getConsoleOpened" parameterType="long" resultType="com.diagbot.dto.GetConsoleOpenedDTO">
+    	SELECT
+			a.id as openId,
+			b.id as productId,
+			b.name as name,
+			DATE_FORMAT(a.start_time,'%Y-%m-%d') as startTime,
+			DATE_FORMAT(a.end_time,'%Y-%m-%d') as endTime,
+			a.service_status as serviceStatus
+		from diag_opened_products a join diag_lantone_product b on a.product_id=b.id
+		where a.is_deleted='N' and b.is_deleted='N' and a.user_id=#{userId};
+    </select>
+    
+    
 </mapper>