zmy01

doctor-auth/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-gateway/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-file/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-gen/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java

@@ -32,4 +32,5 @@ public class HealthUserVideoController{
         return HealthR.ok(List);
     }
 
+
 }

doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java

@@ -1,40 +0,0 @@
-package doctor.controller;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import doctor.common.core.domain.R;
-import doctor.domain.entity.DoctorUser;
-import doctor.service.IDoctorUserService;
-import doctor.system.api.domain.SysUser;
-import doctor.system.api.model.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/doctor")
-@DS("master")
-public class SysDoctorController {
-
-    @Autowired
-    private IDoctorUserService iDoctorUserService;
-
-    @PostMapping("/getUser")
-    public R<LoginUser> getUser(String email) {
-        DoctorUser user = iDoctorUserService.getUser(email);
-        LoginUser loginUser = new LoginUser();
-        SysUser sysUser = new SysUser();
-        sysUser.setUserId(Long.valueOf(user.getId()));
-        sysUser.setNickName(user.getNickName());
-        sysUser.setUserName(user.getUserName());
-        sysUser.setPhonenumber(user.getPhone());
-        sysUser.setPassword(user.getPwd());
-        if (user.getSex()==0){
-            sysUser.setSex("男");
-        }else {
-            sysUser.setSex("女");
-        }
-        loginUser.setSysUser(sysUser);
-        return R.ok(loginUser);
-    }
-}

doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java

@@ -2,6 +2,8 @@ package doctor.mapper;
 
 
 import doctor.domain.dto.VideoDto;
+import doctor.domain.entity.UserVideoBuyEntity;
+import doctor.domain.entity.UserVideoCollectionEntity;
 import doctor.domain.entity.VideoCategoryEntity;
 import doctor.domain.entity.VideoEntity;
 import doctor.domain.vo.VideoCategoryVo;
@@ -13,4 +15,8 @@ public interface HealthUserVideoMapper {
     List<VideoCategoryEntity> findVideoCategoryList();
 
     List<VideoEntity> findVideoVoList(@Param("categoryId") Integer categoryId);
+
+    UserVideoCollectionEntity selectWhetherCollectionByUserIdAndVideoId(@Param("userId") Integer userId, @Param("id") Integer id);
+
+    UserVideoBuyEntity selectWhetherBuyByUserIdAndVideoId(@Param("userId") Integer userId, @Param("id") Integer id);
 }

doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java

@@ -1,10 +0,0 @@
-package doctor.mapper;
-
-import doctor.domain.entity.DoctorUser;
-import org.apache.ibatis.annotations.Param;
-import org.mybatis.spring.annotation.MapperScan;
-
-@MapperScan
-public interface IDoctorUserMapper {
-    DoctorUser selectDoctorUserByEmail(@Param("email") String email);
-}

doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java

@@ -1,8 +0,0 @@
-package doctor.service;
-
-import doctor.domain.entity.DoctorUser;
-import doctor.system.api.model.LoginUser;
-
-public interface IDoctorUserService {
-    DoctorUser getUser(String email);
-}

doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java

@@ -1,18 +1,25 @@
 package doctor.service.impl;
 
 
+import doctor.common.core.utils.JwtUtils;
+import doctor.common.security.service.TokenService;
+import doctor.common.security.utils.SecurityUtils;
 import doctor.domain.dto.VideoDto;
+import doctor.domain.entity.UserVideoBuyEntity;
+import doctor.domain.entity.UserVideoCollectionEntity;
 import doctor.domain.entity.VideoCategoryEntity;
 import doctor.domain.entity.VideoEntity;
 import doctor.domain.vo.VideoCategoryVo;
 import doctor.domain.vo.VideoVo;
 import doctor.mapper.HealthUserVideoMapper;
 import doctor.service.HealthUserVideoService;
+import doctor.system.api.model.LoginUser;
 import doctor.util.ConvertUtil;
 import io.netty.util.internal.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Service
@@ -20,6 +27,12 @@ public class HealthUserVideoServiceImpl implements HealthUserVideoService {
     @Autowired
     private HealthUserVideoMapper healthUserVideoMapper;
 
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private TokenService tokenService;
+
     @Override
     public List<VideoCategoryVo> findVideoCategoryList() {
 
@@ -32,6 +45,23 @@ public class HealthUserVideoServiceImpl implements HealthUserVideoService {
     public List<VideoVo> findVideoVoList(Integer categoryId) {
         List<VideoEntity> videoVoList = healthUserVideoMapper.findVideoVoList(categoryId);
         List<VideoVo> videoVos = ConvertUtil.entityToVoList(videoVoList, VideoVo.class);
+        String header = request.getHeader("token");
+        Integer userId = Integer.valueOf(JwtUtils.getUserId(header));
+        videoVos.forEach(video -> {
+            UserVideoCollectionEntity userVideoCollection = healthUserVideoMapper.selectWhetherCollectionByUserIdAndVideoId(userId,video.getId());
+            if(userVideoCollection!=null){
+                video.setWhetherCollection(1);
+            }else {
+                video.setWhetherCollection(2);
+            }
+            UserVideoBuyEntity userVideoBuy  = healthUserVideoMapper.selectWhetherBuyByUserIdAndVideoId(userId,video.getId());
+            if(userVideoBuy!=null){
+                video.setWhetherBuy(1);
+            }else {
+                video.setWhetherBuy(2);
+            }
+        });
+
         return videoVos;
     }
 }

doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java

@@ -1,19 +0,0 @@
-package doctor.service.impl;
-
-import doctor.mapper.IDoctorUserMapper;
-import doctor.domain.entity.DoctorUser;
-import doctor.service.IDoctorUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class IDoctorUserServiceImpl implements IDoctorUserService {
-    @Autowired
-    private IDoctorUserMapper iDoctorUserMapper;
-
-    @Override
-    public DoctorUser getUser(String email) {
-        DoctorUser doctorUser = iDoctorUserMapper.selectDoctorUserByEmail(email);
-        return doctorUser;
-    }
-}

doctor-modules/doctor-health/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml

@@ -11,5 +11,11 @@
     <select id="findVideoVoList" resultType="doctor.domain.entity.VideoEntity">
         select * from video where category_id=#{categoryId}
     </select>
+    <select id="selectWhetherCollectionByUserIdAndVideoId" resultType="doctor.domain.entity.UserVideoCollectionEntity">
+        select * from user_video_collection where user_id=#{userId} and video_id=#{id}
+    </select>
+    <select id="selectWhetherBuyByUserIdAndVideoId" resultType="doctor.domain.entity.UserVideoBuyEntity">
+        select * from user_video_buy where user_id=#{userId} and video_id=#{id}
+    </select>
 
 </mapper>

doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="doctor.mapper.IDoctorUserMapper">
-
-
-    <select id="selectDoctorUserByEmail" resultType="doctor.domain.entity.DoctorUser">
-        select * from user where email = #{email}
-    </select>
-</mapper>

doctor-modules/doctor-job/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-system/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37
+        namespace: 7e34f104-f333-4828-b36a-02146e521c9a
         # 配置文件格式
         file-extension: yml
         # 共享配置