From b40c5f72be4fe45cdc660128782f04e45d9475dc Mon Sep 17 00:00:00 2001 From: zmyYYDS <864398951@qq.com> Date: Sun, 14 Jan 2024 16:27:58 +0800 Subject: [PATCH] zmy01 --- doctor-auth/src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../controller/HealthUserVideoController.java | 1 + .../controller/SysDoctorController.java | 40 ------------------- .../doctor/mapper/HealthUserVideoMapper.java | 6 +++ .../java/doctor/mapper/IDoctorUserMapper.java | 10 ----- .../doctor/service/IDoctorUserService.java | 8 ---- .../impl/HealthUserVideoServiceImpl.java | 30 ++++++++++++++ .../service/impl/IDoctorUserServiceImpl.java | 19 --------- .../src/main/resources/bootstrap.yml | 4 +- .../mapper/HealthUserVideoMapper.xml | 6 +++ .../doctor/IDoctorUserServiceMapper.xml | 11 ----- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- 17 files changed, 59 insertions(+), 104 deletions(-) delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java delete mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml diff --git a/doctor-auth/src/main/resources/bootstrap.yml b/doctor-auth/src/main/resources/bootstrap.yml index 7f241e4..343a2f2 100644 --- a/doctor-auth/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/doctor-gateway/src/main/resources/bootstrap.yml b/doctor-gateway/src/main/resources/bootstrap.yml index e0b9071..2eaa492 100644 --- a/doctor-gateway/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml index 400e098..0ecdb89 100644 --- a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml index 9b8484d..823a6a8 100644 --- a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java index 490eb78..a1f6684 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java @@ -32,4 +32,5 @@ public class HealthUserVideoController{ return HealthR.ok(List); } + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java deleted file mode 100644 index 746fd64..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java +++ /dev/null @@ -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 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); - } -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java index 7120dfb..3ada04b 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java +++ b/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 findVideoCategoryList(); List 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); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java deleted file mode 100644 index 8d7f5e3..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java +++ /dev/null @@ -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); -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java deleted file mode 100644 index b967765..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java +++ /dev/null @@ -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); -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java index b5e36d9..a8db3e4 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java +++ b/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 findVideoCategoryList() { @@ -32,6 +45,23 @@ public class HealthUserVideoServiceImpl implements HealthUserVideoService { public List findVideoVoList(Integer categoryId) { List videoVoList = healthUserVideoMapper.findVideoVoList(categoryId); List 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; } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java deleted file mode 100644 index 193c931..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java +++ /dev/null @@ -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; - } -} diff --git a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml index 691386c..205fb38 100644 --- a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml index 8e1c34c..3746683 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml @@ -11,5 +11,11 @@ + + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml deleted file mode 100644 index 41b82ff..0000000 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml index 687623f..0bffaa1 100644 --- a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml index 632b0bd..d48b98a 100644 --- a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml +++ b/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 # 共享配置 diff --git a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml index f378a98..ed199de 100644 --- a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml +++ b/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 # 共享配置