Merge remote-tracking branch 'origin/meiteng-2.0' into meiteng-2.0

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -868,10 +868,12 @@ public class BChapterServiceImpl implements BChapterService {
         String[] lessonIds = ids.split(",");
         String batchUDID = "批量下载打包" + System.currentTimeMillis();
         //遍历每个id
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
         for (String id : lessonIds) {
             List<BFile> fileList = bFileRepository.getFileByLessonId(id);
             //batch是zip打包文件夹     bFile.getLessonId()替换形成name
-            String filePath = global.getBASE_UPLOAD_SERVER_LOCATION() + global.getCOURSE_LOCATION() + File.separator + batchUDID + File.separator + bLessonRepository.selectByPrimaryKey(id).getLessonName();
+            BLesson bLesson = bLessonRepository.selectByPrimaryKey(id);
+            String filePath = global.getBASE_UPLOAD_SERVER_LOCATION() + global.getCOURSE_LOCATION() + File.separator + batchUDID + File.separator + bLesson.getLessonName() + "-" + simpleDateFormat.format(bLesson.getCreateDate());
             File file = new File(filePath);
             if (fileList == null || fileList.size() < 1)
                 continue;

src/main/java/org/rcisoft/business/blabel/dao/BLabelRepository.java

 package org.rcisoft.business.blabel.dao;
 
 import org.apache.ibatis.annotations.*;
+import org.rcisoft.business.blabel.dto.QueryLabelResDTO;
 import org.rcisoft.business.blabel.entity.BLabel;
 import org.rcisoft.core.base.BaseMapper;
 import org.springframework.stereotype.Repository;
@@ -32,4 +33,15 @@ public interface BLabelRepository extends BaseMapper<BLabel> {
     @Update("UPDATE b_label SET del_flag='1' where business_id = #{businessId}")
     int removeLabel(@Param("businessId") String id);
 
+    /**
+     * 查询课程push标签
+     * @return
+     */
+    @Select("<script>" +
+            " select business_id businessId ,l_name lName " +
+            " from b_label where del_flag != 1 and flag = 1 " +
+            " and business_id in " +
+            "<foreach collection=\"list\" item=\"item\" open=\"(\" separator=\",\"  close=\")\" > #{item} </foreach>" +
+            "</script>")
+    List<QueryLabelResDTO> queryPushLabel(@Param("list") String[] list);
 }

src/main/java/org/rcisoft/business/blesson/dao/BLessonRepository.java

@@ -1340,7 +1340,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
      * @param type
      * @return
      */
-    @Select("select count(0) from b_user_lesson_look where user_id = #{userId} and lesson_id = #{lessonId} and type = #{type}")
+    @Select("select count(0) from b_user_lesson_look where user_id = #{userId} and lesson_id = #{lessonId}")
     int getCountByUserAndLesson(@Param("userId") String userId, @Param("lessonId") String lessonId, @Param("type") String type);
 
     /**

src/main/java/org/rcisoft/business/blesson/entity/BLesson.java

@@ -168,6 +168,8 @@ public class BLesson extends IdEntity<BLesson> {
     @Transient
     private String trainType;
 
+    @ApiModelProperty(value = "平台推荐自带标签")
+    private String pushLable;
 
     //-------------------------------------
 
@@ -292,8 +294,6 @@ public class BLesson extends IdEntity<BLesson> {
     @ApiModelProperty(value = "数据来源企业")
     private String fromCorp;
 
-    @ApiModelProperty(value = "平台推荐自带标签")
-    private String pushLable;
 
 
     public void initModel(){

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonPersonServiceImpl.java

@@ -494,6 +494,7 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
         for (BLessonPerson b : result) {
             //step 1 查询look表中是否有对应任何课程的点击记录
             int flag = bLessonRepository.getCountByUserAndLesson(userId, b.getBusinessId(), "0");
+            log.info("-----------addNew------课程查看状态2--" + b.getBusinessId() + "--" + userId + "--" + flag +"---------------");
             //step 2 存在则返回，不存在则判断时间 满足条件 setIsNew() flag <= 0 说明此用户未点击过该课程
             if (flag <= 0) {
                 //获取课程的 指派时间

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -16,6 +16,7 @@ import org.rcisoft.business.bfile.dao.BPFileRepository;
 import org.rcisoft.business.bfile.dao.BTrainFileRepository;
 import org.rcisoft.business.bfile.entity.BFile;
 import org.rcisoft.business.bfile.entity.BTrainFile;
+import org.rcisoft.business.blabel.dao.BLabelRepository;
 import org.rcisoft.business.blabel.dto.QueryLabelResDTO;
 import org.rcisoft.business.blesson.dao.*;
 import org.rcisoft.business.blesson.dto.*;
@@ -163,6 +164,9 @@ public class BLessonServiceImpl implements BLessonService {
     @Autowired
     BFileRepository bFileRepository;
 
+    @Autowired
+    BLabelRepository bLabelRepository;
+
     @Value("${upload.replaceHttp:false}")
     private String replaceHttp;
 
@@ -227,7 +231,6 @@ public class BLessonServiceImpl implements BLessonService {
             if(LessonSycnEnum.OPEN.getCode().equals(flag))
                 bLessonRepository.hotNumberReCount2(bLesson.getBusinessId());
         }
-
         return bLesson;
     }
 
@@ -1980,6 +1983,7 @@ public class BLessonServiceImpl implements BLessonService {
         for (BLesson b : result) {
             //step 1 查询look表中是否有对应任何课程的点击记录
             int flag = bLessonRepository.getCountByUserAndLesson(userId, b.getBusinessId(), "0");
+            log.info("-----------addNew------课程查看状态1--" + b.getBusinessId() + "--" + userId + "--" + flag + "---------------");
             //step 2 存在则返回，不存在则判断时间 满足条件 setIsNew() flag <= 0 说明此用户未点击过该课程
             if (flag <= 0) {
                 //获取课程的 发布时间

src/main/resources/mapper/business/blesson/mapper/BLessonMapper.xml

@@ -96,6 +96,7 @@
           <result column="value_gain" jdbcType="VARCHAR" property="valueGain"/>
           <result column="value_update_date" jdbcType="TIMESTAMP" property="valueUpdateDate"/>
           <result column="is_trans" jdbcType="VARCHAR" property="isTrans"/>
+          <result column="push_lable" jdbcType="VARCHAR" property="pushLable"/>
 
 
           <collection property="labelList" ofType="org.rcisoft.business.blabel.dto.QueryLabelResDTO"