Merge branch 'feature/0803-im' of http://git.dayaedu.com/yonge/cooleshow into feature/0803-im

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ImGroupController.java

@@ -149,7 +149,10 @@ public class ImGroupController extends BaseController {
             //获取融云消息
             //List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
             info = imGroupService.getRongYunInfo(page,size);
+            //IM导入
             imGroupService.importInfo(info);
+            //为已导入数据更改标识
+            imGroupService.updateStatus(info);
         }
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ImGroupDao.java

@@ -33,6 +33,10 @@ public interface ImGroupDao extends BaseMapper<ImGroup> {
     //获取融云数据
     List<ImHistoryMessage> selectAll(@Param("result") int result, @Param("size") int size);
 
+    //查询总数据量
     int queryCount();
+
+    //更新状态
+    void updateStatus(@Param("info") List<ImHistoryMessage> info);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ImHistoryMessage.java

@@ -88,4 +88,8 @@ public class ImHistoryMessage implements Serializable {
     @TableField(value = "appId_")
     private String appId;
 
+    @ApiModelProperty("导入状态，1 （已导入）  0（未导入）")
+    @TableField(value = "status_")
+    private Integer status;
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ImGroupService.java

@@ -173,5 +173,11 @@ public interface ImGroupService extends IService<ImGroup> {
 
     int queryCount();
 
+    /**
+     * 更新已修改数据的状态
+     * @param info
+     */
+    void updateStatus(List<ImHistoryMessage> info);
+
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

@@ -919,6 +919,16 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
         }
     }
 
+    /**
+     * 更新已修改数据的状态
+     * @param info
+     */
+    @Override
+    public void updateStatus(List<ImHistoryMessage> info) {
+        getDao().updateStatus(info);
+    }
+
+
     private void groupTransfer(List<ImGroup> records) {
         String fansIcon = sysConfigService.findConfigValue(SysConfigConstant.ICON_FANS_GROUP_DEFAULT);
         String courseIcon = sysConfigService.findConfigValue(SysConfigConstant.ICON_COURSE_GROUP_DEFAULT);

cooleshow-user/user-biz/src/main/resources/config/mybatis/ImGroupMapper.xml

@@ -64,6 +64,12 @@
         SET member_num_ = igm.num_
         WHERE ig.id_ = igm.group_id_
     </update>
+    <update id="updateStatus">
+        update im_history_message set status_ = 1
+        where msgUID in <foreach collection="info" open="(" close=")" separator="," item="info">
+        #{info.msgUID}
+    </foreach>
+    </update>
     <select id="findAll" resultMap="BaseResultMap">
         SELECT ig.* FROM im_group ig
         LEFT JOIN im_group_member igm ON igm.group_id_ = ig.id_