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

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

@@ -67,6 +67,8 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
     private ServiceInfoFacade serviceInfoFacade;
     @Autowired
     private UserRenewalsFacade userRenewalsFacade;
+    @Autowired
+    private ProductServiceFacade productServiceFacade;
 
     /**
      * 产品线管理添加产品
@@ -194,6 +196,10 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "产品删除失败");
         }
+        if(!productServiceFacade.deleteByProductId(updateProductVO.getId())){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "产品令牌删除失败");
+        }
         return true;
     }
 

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

@@ -167,7 +167,7 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
                     "获取用户和机构信息失败");
         }
         Map<Long, UserOrgDTO> dataMap = mapRespDTO.data;
-        List<UserAndProdutDTO> openedProductTime =openedProductsFacade.getInformationAvailableByUserIds(list1);
+        List<UserAndProdutDTO> openedProductTime =openedProductsFacade.getInformationAvailableByUserIdsB(list1);
         for(OrderDetialsDTO bean : list) {
             UserOrgDTO uo = dataMap.get(bean.getUserId());
             if(uo != null) {

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

@@ -40,8 +40,6 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
     private ServiceInfoFacade serviceInfoFacade;
     @Autowired
     private LantoneProductFacade lantoneProductFacade;
-    @Autowired
-    private OpenedProductsFacade openedProductsFacade;
 
     /**
      * 建立产品服务端关联并生成令牌

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

@@ -115,6 +115,13 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      */
     public List<UserAndProdutDTO> getInformationAvailableByUserIds(List<Long> userIds);
 
+    /**
+     *
+     * @param  userIds
+     * @return
+     */
+    public List<UserAndProdutDTO> getInformationAvailableByUserIdsB(List<Long> userIds);
+
     /**
      * 根据用户id查询是否有开通产品
      * @param userId

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

@@ -79,6 +79,13 @@ public interface OpenedProductsService extends IService<OpenedProducts> {
      */
     public List<UserAndProdutDTO> getInformationAvailableByUserIds(List<Long> userIds);
 
+    /**
+     *
+     * @param userIds
+     * @return
+     */
+    public List<UserAndProdutDTO> getInformationAvailableByUserIdsB(List<Long> userIds);
+
 
     /**
      * 根据用户id查询是否有开通产品

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

@@ -89,6 +89,11 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
     	return baseMapper.getInformationAvailableByUserIds(userIds);
     }
 
+    @Override
+    public List<UserAndProdutDTO> getInformationAvailableByUserIdsB(List<Long> userIds){
+        return baseMapper.getInformationAvailableByUserIdsB(userIds);
+    }
+
     @Override
     public List<Long> getOpendCountByUserId(Long userId) {
         return baseMapper.getOpendCountByUserId(userId);

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

@@ -242,6 +242,27 @@
         </foreach>
     </select>
 
+    <select id="getInformationAvailableByUserIdsB" parameterType="java.util.List" 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,
+        b.access_type as accessType,
+        b.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 in
+        <foreach collection="list" item="ids" open="(" close=")" separator=",">
+            #{ids}
+        </foreach>
+    </select>
+
     <select id="getOpendCountByUserId" resultType="java.lang.Long">
         SELECT a.product_id FROM diag_opened_products a WHERE a.is_deleted ='N' and a.user_id = #{userId}
     </select>

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

@@ -47,7 +47,6 @@
         and c.is_deleted='N'
         and d.is_deleted='N'
         and e.is_deleted='N'
-        and b.service_status=1
         and e.type=2
         and (find_in_set('1',d.access_type) or FIND_IN_SET('2',d.access_type))
         <if test="productService.userId != null and productService.userId != '' ">

gateway-service/src/main/java/com/diagbot/entity/ServiceFilter.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 public class ServiceFilter implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    private String name;
+    private String serviceName;
     private Long productId;
 
 

gateway-service/src/main/java/com/diagbot/filter/GlobalGatewayFilter.java

@@ -3,6 +3,7 @@ package com.diagbot.filter;
 import com.diagbot.client.DiagbotmanServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.HasPermissionDTO;
+import com.diagbot.entity.ServiceFilter;
 import com.diagbot.entity.ServiceToken;
 import com.diagbot.entity.SysLog;
 import com.diagbot.enums.SysTypeEnum;
@@ -110,7 +111,10 @@ public class GlobalGatewayFilter implements GlobalFilter {
             sysLog.setGmtCreate(new Date());
             sysLog.setIp(request.getRemoteAddress().toString());
             sysLog.setMethod(requestUri);
-            sysLog.setOperation(serviceName);
+            ServiceFilter serviceFilter = new ServiceFilter();
+            serviceFilter.setServiceName(serviceName);
+            serviceFilter.setProductId(productId);
+            sysLog.setOperation(GsonUtil.toJson(serviceFilter));
             sysLog.setParams(requestUri);
             sysLog.setSysType(SysTypeEnum.APPKEY.getKey());
             sysLog.setUsername(res.data.getUserId());