Merge remote-tracking branch 'origin/master'

fs-common/src/main/java/com/fs/common/utils/DictUtils.java

@@ -44,7 +44,7 @@ public class DictUtils
         if (StringUtils.isNotNull(cacheObj))
         {
             List<SysDictData> dictDatas = StringUtils.cast(cacheObj);
-            log.info("获取缓存 key: {} values: {}",key,dictDatas);
+//            log.info("获取缓存 key: {} values: {}",key,dictDatas);
             return dictDatas;
         }
         return null;

fs-company-app/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -206,7 +206,7 @@ public class FsUserCourseVideoController extends AppBaseController {
     @GetMapping("/todayCourseList")
     @ApiOperation("今日课程")
     public ResponseResult<PageInfo<FsUserCourseVideoPageListVO>> todayCourseList(@RequestParam(defaultValue = "1") Integer pageNum,
-                                                                                 @RequestParam(defaultValue = "10") Integer pageSize) {
+                                                                                 @RequestParam(defaultValue = "10") Integer pageSize, String keyword) {
         Long companyId = getCompanyId();
         if (Objects.isNull(companyId)) {
             ResponseResult.fail(400, "未获取到公司ID,请重新登录后再试");
@@ -216,6 +216,7 @@ public class FsUserCourseVideoController extends AppBaseController {
         params.put("companyId", companyId);
 //        params.put("dayDate", LocalDate.now());
         params.put("companyUserId", Long.parseLong(getUserId()));
+        params.put("keyword", keyword);
 
         PageHelper.startPage(pageNum, pageSize);
         List<FsUserCourseVideoPageListVO> list = fsUserCourseVideoService.selectCourseVideoListByMap(params);

fs-company/src/main/java/com/fs/company/controller/qw/SopUserLogsInfoController.java

@@ -71,7 +71,6 @@ public class SopUserLogsInfoController extends BaseController
     public TableDataInfo list(SopUserLogsInfo sopUserLogsInfo) {
         startPage();
         if (sopUserLogsInfo.getFilterMode() == 1) {
-            startPage();
             List<SopUserLogsInfo> list = sopUserLogsInfoService.selectSopUserLogsInfoList(sopUserLogsInfo);
 
             if (!list.isEmpty()) {

fs-qwhook-sop/src/main/java/com/fs/framework/config/MyBatisConfig.java

@@ -1,5 +1,6 @@
 package com.fs.framework.config;
 
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import com.fs.common.utils.StringUtils;
 import org.apache.ibatis.io.VFS;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -27,7 +28,7 @@ import java.util.List;
 
 /**
  * Mybatis支持*匹配扫描包
- * 
+ *
 
  */
 @Configuration
@@ -115,18 +116,18 @@ public class MyBatisConfig
     }
 
     @Bean
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
+    public SqlSessionFactory sqlSessionFactorys(DataSource dataSource) throws Exception
     {
-        String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
-        String mapperLocations = env.getProperty("mybatis.mapperLocations");
-        String configLocation = env.getProperty("mybatis.configLocation");
+        String typeAliasesPackage = env.getProperty("mybatis-plus.typeAliasesPackage");
+        String mapperLocations = env.getProperty("mybatis-plus.mapperLocations");
+        String configLocation = env.getProperty("mybatis-plus.configLocation");
         typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
         VFS.addImplClass(SpringBootVFS.class);
 
-        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
         sessionFactory.setDataSource(dataSource);
         sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
-        sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(mapperLocations));
         sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
         return sessionFactory.getObject();
     }

fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -317,11 +317,12 @@ public class CompanyUserServiceImpl implements ICompanyUserService
             user.setUserName(userCodeParam.getUserName());
             user.setSex(userCodeParam.getSex());
             user.setStatus("1");
-            user.setDept(userCodeParam.getDept());
+            user.setDeptId(userCodeParam.getDeptId());
+            user.setPhonenumber(userCodeParam.getPhonenumber());
             user.setRoleIds(userCodeParam.getRoleIds());
             user.setAddressId(userCodeParam.getAddressId());
             user.setCompanyId(userCodeParam.getCompanyId());
-            user.setCreateBy(userCodeParam.getQwUserId());
+            user.setCreateBy(userCodeParam.getQwUserIdByStr());
             user.setPassword(SecurityUtils.encryptPassword(userCodeParam.getPassword()));
             user.setCreateTime(new Date());
             user.setUserType("01");//一般用户

fs-service/src/main/java/com/fs/qw/domain/QwCompany.java

@@ -79,4 +79,6 @@ public class QwCompany extends BaseEntity
     private String msgPrivateKey;
 
     private String miniAppId;
+
+    private Integer companyServerNum;
 }

fs-service/src/main/java/com/fs/qw/service/impl/QwCompanyServiceImpl.java

@@ -81,7 +81,8 @@ public class QwCompanyServiceImpl implements IQwCompanyService
     public int insertQwCompany(QwCompany qwCompany)
     {
         qwCompany.setCreateTime(DateUtils.getNowDate());
-        return qwCompanyMapper.insertQwCompany(qwCompany);
+        int i = qwCompanyMapper.insertQwCompany(qwCompany);
+        return i;
     }
 
     /**
@@ -94,7 +95,13 @@ public class QwCompanyServiceImpl implements IQwCompanyService
     public int updateQwCompany(QwCompany qwCompany)
     {
         qwCompany.setUpdateTime(DateUtils.getNowDate());
-        return qwCompanyMapper.updateQwCompany(qwCompany);
+        int i = qwCompanyMapper.updateQwCompany(qwCompany);
+
+        if (i>0){
+            redisCache.setCacheObject("qwCompany:"+qwCompany.getCorpId() ,JSON.toJSONString(qwCompany),1, TimeUnit.HOURS);
+        }
+
+        return i;
     }
 
     /**

fs-service/src/main/resources/application-config-druid-nmgyt.yml

@@ -42,8 +42,8 @@ wx:
       port: 6379
       timeout: 2000
     configs:
-      - appId:   # 第一个公众号的appid
-        secret:  # 公众号的appsecret
+      - appId: wx616d84b7356534e1  # 第一个公众号的appid
+        secret: 38ba67a4b748b96a797c3d2d5aa85087 # 公众号的appsecret
         token: PPKOdAlCoMO # 接口配置里的Token值
         aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
   open:

fs-service/src/main/resources/mapper/course/FsUserCourseVideoMapper.xml

@@ -265,7 +265,8 @@
         fcpd.id,
         if(ccut.start_date_time is null, fcpd.start_date_time, ccut.start_date_time) as startDateTime,
         if(ccut.end_date_time is null, fcpd.end_date_time, ccut.end_date_time) as endDateTime,
-        course.project as projectId
+        course.project as projectId,
+        fcp.max_view_num as maxViewNum
         FROM `fs_user_course_video` video
         left join fs_user_course_period_days fcpd on fcpd.video_id = video.video_id
         left join fs_user_course_period fcp on fcp.period_id = fcpd.period_id
@@ -282,6 +283,8 @@
         <if test="keyword != null and keyword !='' ">
             AND video.title LIKE concat('%',#{keyword},'%')
         </if>
+        <!-- 营销提前查看天数逻辑 -->
+        AND DATE_SUB(fcpd.day_date, INTERVAL fcp.max_view_num DAY) &lt;= now()
         order by video.course_sort
     </select>
 
@@ -335,6 +338,9 @@
         <if test="params.dayDate != null">
             and fcpd.day_date = #{params.dayDate}
         </if>
+        <if test="params.keyword != null and params.keyword !='' ">
+            AND video.title LIKE concat('%',#{params.keyword},'%')
+        </if>
         and (
         (fcpd.start_date_time &lt;=  CONCAT( CURDATE(), ' 23:59:59' ) and fcpd.end_date_time >= CONCAT( CURDATE(), ' 00:00:00' ))
         or (ccut.start_date_time &lt;=  CONCAT( CURDATE(), ' 23:59:59' ) and ccut.end_date_time >= CONCAT( CURDATE(), ' 00:00:00' ))