Merge remote-tracking branch 'origin/dev/one' into dev/one

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

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description: 用户已开通产品出参
+ * @author wangfeng
+ * @date 2018年9月21日 上午10:32:52
+ */
+
+@Getter
+@Setter
+public class UserAndProdutDTO {
+	
+	private Long  Id;//开通的id
+	private Long  productId;//产品Id
+	private Long userId;//用户Id
+	private Date startTime;//开通时间
+	private Date endTime;//结束时间
+	private Integer serviceStatus;//启用状态
+	private Integer accessType;//接入方式
+	private Integer chargeType;//结算方式
+	private String  productName;//产品名称
+
+}

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

@@ -10,6 +10,7 @@ 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.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 
 /**
@@ -71,4 +72,14 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      * @return
      */
     int getConsoleOnTrialCount(Long userId);
+    
+    //根据用户id查询已开通的功能
+    public List<UserAndProdutDTO> getInformationAvailableByUserId(Long userId);
+    //根据用户id和产品id，启用和停用功能
+    public boolean startAndendByuserId(OpenedProducts openedProducts);
+	  //根据用户id和产品id，删除开通信息", notes = "删除开通信息")
+    public boolean delInformationAvailable(OpenedProducts openedProducts);
+     //根据用户id和产品id，修改开通时间", notes = "修改开通时间")
+    public boolean modifyOpeningTime(OpenedProducts openedProducts);
+
 }

diagbotman-service/src/main/java/com/diagbot/service/OpenedProductsService.java

@@ -3,6 +3,7 @@ package com.diagbot.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 
 import java.util.List;
@@ -38,5 +39,14 @@ public interface OpenedProductsService extends IService<OpenedProducts> {
      * @Date: 2018/9/20 15:23
      */
     List<OpenedProducts> getByAppkeyAndSecret(Map<String,Object> map);
+    
+    //根据用户id查询已开通的功能
+    public List<UserAndProdutDTO> getInformationAvailableByUserId(Long userId);
+    //根据用户id和产品id，启用和停用功能
+    public boolean startAndendByuserId(OpenedProducts openedProducts);
+	  //根据用户id和产品id，删除开通信息", notes = "删除开通信息")
+    public boolean delInformationAvailable(OpenedProducts openedProducts);
+     //根据用户id和产品id，修改开通时间", notes = "修改开通时间")
+    public boolean modifyOpeningTime(OpenedProducts openedProducts);
 
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/OpenedProductsServiceImpl.java

@@ -3,6 +3,7 @@ package com.diagbot.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.mapper.OpenedProductsMapper;
 import com.diagbot.service.OpenedProductsService;
@@ -44,4 +45,28 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
     public List<OpenedProducts> getByAppkeyAndSecret(Map<String, Object> map) {
         return openedProductsMapper.getByAppkeyAndSecret(map);
     }
+
+	@Override
+	public List<UserAndProdutDTO> getInformationAvailableByUserId(Long userId) {
+		// TODO Auto-generated method stub
+		return openedProductsMapper.getInformationAvailableByUserId(userId);
+	}
+
+	@Override
+	public boolean startAndendByuserId(OpenedProducts openedProducts) {
+		// TODO Auto-generated method stub
+		return openedProductsMapper.startAndendByuserId(openedProducts);
+	}
+
+	@Override
+	public boolean delInformationAvailable(OpenedProducts openedProducts) {
+		// TODO Auto-generated method stub
+		return openedProductsMapper.delInformationAvailable(openedProducts);
+	}
+
+	@Override
+	public boolean modifyOpeningTime(OpenedProducts openedProducts) {
+		// TODO Auto-generated method stub
+		return openedProductsMapper.modifyOpeningTime(openedProducts);
+	}
 }

diagbotman-service/src/main/java/com/diagbot/vo/ModifyOpeningTimeVO.java

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description: 据用户id和产品id，修改启用时间入参
+ * @author wangfeng
+ * @date 2018年9月21日 上午10:57:03
+ */
+@Getter
+@Setter
+public class ModifyOpeningTimeVO {
+	
+	private Date startTime;
+	private Date endTime;
+	private Long userId;
+	private Long productId;
+
+}

diagbotman-service/src/main/java/com/diagbot/vo/StartAndendByUserIdVO.java

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description: 据用户id和产品id，启用和停用功能入参
+ * @author wangfeng
+ * @date 2018年9月21日 上午10:57:03
+ */
+@Getter
+@Setter
+public class StartAndendByUserIdVO {
+	
+	private Integer serviceStatus;
+	private Long userId;
+	private Long productId;
+
+}

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

@@ -91,6 +91,60 @@
 		and c.user_id=#{userId}
 		and a.id not in (SELECT product_id FROM diag_opened_products where user_id=#{userId})
     </select>
+<select id="getInformationAvailableByUserId" parameterType = "long" resultType = "com.diagbot.dto.UserAndProdutDTO">
 
+	SELECT
+	a.id as Id,
+	a.product_id as productId,
+	a.user_id as userId,
+	a.start_time as startTime,
+	a.end_time as endTime,
+	a.service_status as serviceStatus,
+	a.access_type as accessType,
+	a.charge_type as chargeType,
+	b.name as  productName
+	FROM diag_opened_products a JOIN diag_lantone_product b 
+	ON a.product_id=b.id 
+	WHERE 
+	a.is_deleted = "N"
+	AND  a.user_id = #{userId} 
+</select>
+
+<update id="startAndendByuserId" parameterType = "com.diagbot.entity.OpenedProducts">
+	UPDATE diag_opened_products a 
+	<trim prefix="set" suffixOverrides=",">
+	<if test="gmtModified !=null">a.gmt_modified=#{gmtModified},</if>
+	<if test="modifier != null">a.modifier=#{modifier},</if>
+	<if test="serviceStatus != null">a.service_status =#{serviceStatus}</if>
+	</trim>
+	WHERE 
+	a.user_id = #{userId} 
+	AND a.product_id = #{productId}
+</update>
+
+<update id="delInformationAvailable" parameterType = "com.diagbot.entity.OpenedProducts" >
+	UPDATE diag_opened_products a 
+	<trim prefix="set" suffixOverrides=",">
+	a.is_deleted = "Y",
+	<if test="gmtModified !=null">a.gmt_modified=#{gmtModified},</if>
+	<if test="modifier != null">a.modifier=#{modifier}</if>
+	</trim>
+	WHERE 
+	a.user_id = #{userId} 
+	AND a.product_id = #{productId}
+</update>
+
+<update id="modifyOpeningTime" parameterType="com.diagbot.entity.OpenedProducts">
+	UPDATE diag_opened_products a 
+	<trim prefix="set" suffixOverrides=",">
+	<if test="gmtModified !=null">a.gmt_modified=#{gmtModified},</if>
+	<if test="modifier != null">a.modifier=#{modifier}</if>
+	<if test="startTime != null">a.start_time = #{startTime},</if>
+	<if test="endTime != null">a.end_time = #{endTime} </if>
+	</trim>
+	WHERE 
+	a.user_id = #{userId} 
+	AND a.product_id = #{productId}
+</update>
 
 </mapper>