医健宝功能新增

fs-service/src/main/java/com/fs/core/config/WxMaConfiguration.java

@@ -9,11 +9,13 @@ import cn.binarywang.wx.miniapp.message.WxMaMessageHandler;
 import cn.binarywang.wx.miniapp.message.WxMaMessageRouter;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fs.common.utils.spring.SpringUtils;
 import com.fs.course.config.CourseMaConfig;
 import com.fs.course.domain.FsCoursePlaySourceConfig;
 import com.fs.course.mapper.FsCoursePlaySourceConfigMapper;
+import com.fs.course.service.IFsCoursePlaySourceConfigService;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.mapper.SysConfigMapper;
 import com.google.common.collect.Lists;
@@ -45,6 +47,7 @@ public class WxMaConfiguration {
 
     private static final Map<String, WxMaMessageRouter> routers = Maps.newHashMap();
     private static Map<String, WxMaService> maServices;
+    private static IFsCoursePlaySourceConfigService fsCoursePlaySourceConfigService;
 
     @Autowired
     public WxMaConfiguration(SysConfigMapper sysConfigMapper, FsCoursePlaySourceConfigMapper configMapper) {
@@ -65,14 +68,15 @@ public class WxMaConfiguration {
 //            c.add(config2);
 //        }
         //看课小程序加载
-        SysConfig sysConfig3 = sysConfigMapper.selectConfigByConfigKey("courseMa.config");
-        List<CourseMaConfig> courseMaConfigs = JSON.parseArray(sysConfig3.getConfigValue(), CourseMaConfig.class);
-        if (courseMaConfigs!=null&& !courseMaConfigs.isEmpty()){
-            for (CourseMaConfig courseMaConfig : courseMaConfigs) {
+//        SysConfig sysConfig3 = sysConfigMapper.selectConfigByConfigKey("courseMa.config");
+//        List<CourseMaConfig> courseMaConfigs = JSON.parseArray(sysConfig3.getConfigValue(), CourseMaConfig.class);
+        List<FsCoursePlaySourceConfig> list = fsCoursePlaySourceConfigService.list(new QueryWrapper<FsCoursePlaySourceConfig>().ne("type", 2).eq("is_del", 0));
+        if (list!=null&& !list.isEmpty()){
+            for (FsCoursePlaySourceConfig courseMaConfig : list) {
                 if (appid.equals(courseMaConfig.getAppid())) {
                     continue;
                 }
-                if (courseMaConfig.getType() != null && courseMaConfig.getType().equals("1")){
+                if (courseMaConfig.getType() != null && courseMaConfig.getType() == 1){
                     WxMaConfig.Config wxMaConfig = new WxMaConfig.Config();
                     BeanUtils.copyProperties(courseMaConfig, wxMaConfig);
                     c.add(wxMaConfig);

fs-service/src/main/java/com/fs/course/service/impl/FsCourseLinkServiceImpl.java

@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
@@ -24,6 +25,7 @@ import com.fs.course.mapper.FsUserCourseVideoMapper;
 import com.fs.course.param.FsCourseLinkCreateParam;
 import com.fs.course.param.FsCourseLinkRoomParam;
 import com.fs.course.service.IFsCourseLinkService;
+import com.fs.course.service.IFsCoursePlaySourceConfigService;
 import com.fs.course.service.IFsUserCourseService;
 import com.fs.his.config.FsSysConfig;
 import com.fs.his.utils.ConfigUtil;
@@ -87,6 +89,8 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
     private FsCourseLinkMapper fsCourseLinkMapper;
     @Autowired
     private ISysConfigService configService;
+    @Autowired
+    private IFsCoursePlaySourceConfigService fsCoursePlaySourceConfigService;
 
     @Autowired
     private FsCourseDomainNameMapper fsCourseDomainNameMapper;
@@ -850,11 +854,11 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
                 query = URLEncoder.encode(query, StandardCharsets.UTF_8.toString());
 
 
-
-                SysConfig sysConfig3 = sysConfigMapper.selectConfigByConfigKey("courseMa.config");
-                List<CourseMaConfig> courseMaConfigs = JSON.parseArray(sysConfig3.getConfigValue(), CourseMaConfig.class);
-                if (courseMaConfigs!=null&& !courseMaConfigs.isEmpty()){
-                    for (CourseMaConfig courseMaConfig : courseMaConfigs) {
+                List<FsCoursePlaySourceConfig> list = fsCoursePlaySourceConfigService.list(new QueryWrapper<FsCoursePlaySourceConfig>().ne("type", 2).eq("is_del", 0));
+//                SysConfig sysConfig3 = sysConfigMapper.selectConfigByConfigKey("courseMa.config");
+//                List<CourseMaConfig> courseMaConfigs = JSON.parseArray(sysConfig3.getConfigValue(), CourseMaConfig.class);
+                if (list!=null&& !list.isEmpty()){
+                    for (FsCoursePlaySourceConfig courseMaConfig : list) {
                         if (appId.equals(courseMaConfig.getAppid())) {
 
                             //获取微信token

fs-user-app/src/main/java/com/fs/app/controller/course/CourseQwLoginController.java

@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.hutool.core.date.DateTime;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fs.app.controller.AppBaseController;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
@@ -11,6 +12,8 @@ import com.fs.common.param.LoginParam;
 import com.fs.core.config.WxMaConfiguration;
 import com.fs.course.config.CourseMaConfig;
 import com.fs.app.utils.JwtUtils;
+import com.fs.course.domain.FsCoursePlaySourceConfig;
+import com.fs.course.service.IFsCoursePlaySourceConfigService;
 import com.fs.his.domain.FsUser;
 import com.fs.his.domain.FsUserWx;
 import com.fs.his.mapper.FsUserLoginLogMapper;
@@ -58,6 +61,8 @@ public class CourseQwLoginController extends AppBaseController {
     @Autowired
     JwtUtils jwtUtils;
     @Autowired
+    IFsCoursePlaySourceConfigService fsCoursePlaySourceConfigService;
+    @Autowired
     RedisCache redisCache;
 
 
@@ -65,13 +70,12 @@ public class CourseQwLoginController extends AppBaseController {
     @PostMapping("/courseLogin")
     @Transactional
     public R courseLogin(@RequestBody LoginParam param) {
-        SysConfig sysConfig3 = sysConfigMapper.selectConfigByConfigKey("courseMa.config");
-        List<CourseMaConfig> courseMaConfigs = JSON.parseArray(sysConfig3.getConfigValue(), CourseMaConfig.class);
-        if (courseMaConfigs.isEmpty()){
+        List<FsCoursePlaySourceConfig> list = fsCoursePlaySourceConfigService.list(new QueryWrapper<FsCoursePlaySourceConfig>().ne("type", 2).eq("is_del", 0));
+        if (list.isEmpty()){
             return R.error("小程序配置为空");
         }
         // 根据appId匹配配置
-        CourseMaConfig matchedConfig = courseMaConfigs.stream()
+        FsCoursePlaySourceConfig matchedConfig = list.stream()
                 .filter(config -> param.getAppId().equals(config.getAppid()))
                 .findFirst()
                 .orElse(null);