增加面授课删除

servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java

@@ -2,11 +2,16 @@ package com.xboe.data.service.impl;
 
 import java.time.LocalDateTime;
 
+import javax.annotation.Resource;
 import javax.transaction.Transactional;
 
 import com.boe.feign.api.serverall.entity.UserData;
+import com.xboe.constants.CacheName;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.retry.annotation.Recover;
 import org.springframework.retry.annotation.Retryable;
 import org.springframework.stereotype.Service;
@@ -39,6 +44,9 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
     @Autowired
     TeacherDao teacherDao;
 
+    @Resource
+    private CacheManager cacheManager;
+
 
     @Override
     @Transactional
@@ -59,6 +67,8 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
                 a.setDeleted(user.getDeleted());
             }
             a.setLoginName(user.getCode());
+            a.setMobile(user.getMobile());
+            a.setEmail(user.getEmail());
             log.info("更新账号code");
             accountDao.update(a);
         } else {
@@ -71,14 +81,18 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
             a.setRegTime(LocalDateTime.now());
             a.setSysId(user.getKid());
             a.setStatus(1);
+            a.setMobile(user.getMobile());
+            a.setEmail(user.getEmail());
             accountDao.save(a);
             log.info("账号不存在，新添加账号【" + user.getId() + "】");
         }
+
         if (u != null) {
             //更新部分用户字段
             u.setDepartId(user.getDepartId());
             u.setDepartName(user.getDepartName());
             u.setName(user.getName());
+            u.setMobileNo(user.getMobile());
             //2022-12-8 去掉用户类型的更新，因为返回的数据都是学员，
             //u.setUserType(user.getUserType());
             if (user.getLearningDuration() > 0) { //不大于0才会更新
@@ -106,9 +120,17 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
             } else {
                 u.setShowHome(true);//band16以下，及其它无bandLevel的信息
             }
+            u.setMobileNo(user.getMobile());
             userDao.save(u);
             log.info("添加新用户");
         }
+
+        Cache cache = cacheManager.getCache(CacheName.NAME_USER);
+        if(cache != null) {
+            cache.evict(CacheName.KEY_ACCOUNT + user.getId());
+            cache.evict(CacheName.KEY_USER + user.getId());
+        }
+
         //对机构的判断，不为空时才会处理，为空时不处理
         if (StringUtils.isNotBlank(user.getDepartId())) {
             org = orgDao.get(user.getDepartId());

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java

@@ -314,8 +314,10 @@ public class CoursePortalApi extends ApiBaseController{
 			User user = userService.get(ct.getTeacherId());
 			if(t!=null) {
 				ct.setRemark(t.getDescription());
+				ct.setSupplier(t.getSupplier());
+				ct.setTeacherType(t.getTeacherType());
 				if(redisTemplate.opsForValue().get(ct.getTeacherId())!=null){
-					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
+					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null ||  t.getTeacherType() == 1)){
 						ct.setTeacherName("BOE教师");
 					}
 					teacherCourseDto.setCourseId(ct.getCourseId());
@@ -335,7 +337,7 @@ public class CoursePortalApi extends ApiBaseController{
 					List<String> list=new ArrayList<>();
 					list.add(ct.getTeacherId());
 					getTeacherInfo(request.getHeader("Xboe-Access-Token"),list);
-					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
+					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null ||  t.getTeacherType() == 1)){
 						ct.setTeacherName("BOE教师");
 					}
 					teacherCourseDto.setCourseId(ct.getCourseId());

servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java

@@ -49,4 +49,11 @@ public class CourseTeacher extends IdBaseEntity {
     @Transient
     private String code;
 
+    /**供应商*/
+    @Transient
+    private String supplier;
+
+    /**讲师类型 1 内部讲师  2外部讲师*/
+    @Transient
+    private Integer teacherType;
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java

@@ -341,8 +341,5 @@ public interface ICourseService {
     List<Course> mobiledelList(Integer num,CourseQueryDto courseQueryDto);
 
 
-
-
-
-
+    void deletedStudyResourceBatchByCourseIdAndType(String courseId,Integer courseType);
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xboe.module.course.service.impl;
 
+import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -19,6 +20,11 @@ import com.xboe.core.orm.*;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.hibernate.mapping.IdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -115,6 +121,9 @@ public class CourseServiceImpl implements ICourseService {
     @Autowired(required = false)
     private IEventDataSender eventSender;
 
+    @Resource
+    RestHighLevelClient restHighLevelClient;
+
 
   
     /**
@@ -448,6 +457,7 @@ public class CourseServiceImpl implements ICourseService {
         List<Course> paginate = paginate(listByFilters2, pageIndex, pageSize);
         PageList<Course> rs = new PageList<>();
         rs.setCount(listByFilters2.size());
+        rs.setPageSize(pageSize);
         rs.setList(paginate);
         return rs;
     }
@@ -853,12 +863,14 @@ public class CourseServiceImpl implements ICourseService {
                     log.error("未配置事件消息发送的实现");
                 }
             }
+
+            // 删除ES数据
+            deletedStudyResourceBatchByCourseIdAndType(id,c.getType());
         } else {
             //彻底删除，课件设置为无课程状态
             courseDao.setDeleted(id);
         }
         //记录删除日志信息
-
     }
 
     @Override
@@ -1978,5 +1990,17 @@ public class CourseServiceImpl implements ICourseService {
         return courseDao.findListByHql("Select new Course(id,studys,score) from Course where id in(?1)", ids);
     }
 
-
+    @Override
+    public void deletedStudyResourceBatchByCourseIdAndType(String courseId, Integer courseType) {
+        DeleteByQueryRequest request = new DeleteByQueryRequest("new_study_resource");
+        BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
+        boolQueryBuilder.must(QueryBuilders.matchQuery("courseId", courseId));
+        boolQueryBuilder.must(QueryBuilders.matchQuery("courseType", courseType));
+        request.setQuery(boolQueryBuilder);
+        try {
+            restHighLevelClient.deleteByQuery(request, RequestOptions.DEFAULT);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }

servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java

@@ -204,6 +204,8 @@ public class StudyCourseApi extends ApiBaseController{
 			Teacher t = teacherService.get(ct.getTeacherId());
 			if(t!=null) {
 				ct.setRemark(t.getDescription());
+				ct.setSupplier(t.getSupplier());
+				ct.setTeacherType(t.getTeacherType());
 			}
 			if(redisTemplate.opsForValue().get(ct.getTeacherId())==null){
 				List<String>list=new ArrayList<>();
@@ -212,11 +214,11 @@ public class StudyCourseApi extends ApiBaseController{
 				redisTemplate.opsForValue().set(teacherVo.get(0).getTeacherId(), teacherVo.get(0).getStatus());
 				//设置过期时间为1天
 				redisTemplate.expire(teacherVo.get(0).getTeacherId(), 24 * 60 * 60, TimeUnit.SECONDS);
-				if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
+				if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && (  t==null ||  t.getTeacherType() == 1)){
 					ct.setTeacherName("BOE教师");
 				}
 			}
-			if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
+			if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && (  t==null ||  t.getTeacherType() == 1)){
 				ct.setTeacherName("BOE教师");
 			}
 		}