--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/resource/VideoLibraryMapper.java

@@ -19,10 +19,12 @@ import com.zrqx.core.vo.sysuser.bg.statistics.UserStatisticsListVo;
 public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
 	
 	@Select("<script>" 
-			+ "select a.id, a.name, a.source, a.timeLength,a.size,a.video,a.image,a.uploadTime,a.status,a.userId,a.resourceType, user.userName,user.name realName "
+			+ "select a.id, a.name, a.source, a.timeLength,a.size,a.video,a.image,a.uploadTime,a.status,a.userId,a.resourceType, user.userName,user.name realName,d.departmentName  "
 			+ "from res_Video_Library a "
 			+ "left join sys_user user on a.userId = user.userid "
-			+ "where 1=1 "
+			+ "LEFT JOIN sys_user_department ud ON a.userid = ud.userid "
+			+ "LEFT JOIN sys_department d ON ud.departmentid = d.departmentid "
+			+ "where 1=1  AND d.departmentName LIKE '%采集点%' "
 			+ "<if test='" + NOTBLANK + "(id)'>"  
 		    + " and a.id = #{id} "
 		    + "</if>" 

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/resource/ImageLibrarySerivceImpl.java

@@ -11,7 +11,7 @@ import com.zrqx.sysuser.bg.mapper.resource.ImageLibraryMapper;
  * 图片库
  */
 @Service
-public class ImageLibrarySerivceImpl extends BaseServiceImpl<ImageLibrary,Integer> implements ImageLibraryService {
+public class ImageLibrarySerivceImpl extends BaseServiceImpl<ImageLibrary,String> implements ImageLibraryService {
 
 	@Autowired
 	private ImageLibraryMapper imageMapper;

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/resource/ImageLibraryService.java

@@ -5,5 +5,5 @@ import com.zrqx.core.service.BaseService;
 /**
  * 图片库
  */
-public interface ImageLibraryService extends BaseService<ImageLibrary,Integer>{
+public interface ImageLibraryService extends BaseService<ImageLibrary,String>{
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/permissions/FgPermissionsController.java

@@ -25,6 +25,7 @@ import com.zrqx.core.constant.sysuser.SysUserRequestPath;
 import com.zrqx.core.enums.StatusEnum;
 import com.zrqx.core.enums.sysuser.UserTypeEnum;
 import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.exception.BusinessValidateException;
 import com.zrqx.core.form.sysuser.fg.user.LoginForm;
 import com.zrqx.core.form.sysuser.fg.user.LoginUserInfo;
 import com.zrqx.core.model.sysuser.role.Role;
@@ -103,4 +104,21 @@ public class FgPermissionsController {
 	}
 	
 
+	@ApiOperation(value = "前台用户切换角色", notes = "前台用户切换角色;1：无该权限；2：系统错误")
+	@GetMapping(value = SysUserRequestPath.SWITCH + SysUserRequestPath.ROLE)
+	public CallBack<Boolean> switchRole(Integer userType) throws IOException {
+		LoginUserInfo user = redis.getMember();
+		// userType漠然按照最大权限角色登录
+		List<Role> roleList = roleService.queryByUserId(user.getUserId());
+		if(ArrayUtils.isNotEmpty(roleList)){
+			List<String> roleNameList = roleList.stream().map(Role :: getRoleName).collect(Collectors.toList());
+			if(roleNameList.contains(UserTypeEnum.getName(userType))){
+				user.setUserType(userType);
+				stringRedisTemplate.opsForValue().set(user.getToken(), JsonUtil.bean2Json(user),60*60*24*7,TimeUnit.SECONDS);
+			} else {
+				throw new BusinessValidateException(1, "无该权限");
+			}
+		}
+		throw new BusinessValidateException(2, "系统错误");
+	}
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/resource/FgResourceLibraryController.java

 package com.zrqx.sysuser.fg.controller.resource;
 
-import java.util.Date;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,11 +31,11 @@ import com.zrqx.core.form.resource.fg.videolibrary.FgQueryVideoLibraryForm;
 import com.zrqx.core.form.resource.fg.videolibrary.FgSaveResourceForm;
 import com.zrqx.core.form.sysuser.fg.comment.FgSaveCommentForm;
 import com.zrqx.core.form.sysuser.fg.user.LoginUserInfo;
+import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
 import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
 import com.zrqx.core.model.sysuser.content.SignLanguage;
 import com.zrqx.core.model.sysuser.content.SignLanguageRelation;
 import com.zrqx.core.model.sysuser.content.SignLanguageUserRelation;
-import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.videolibrary.FgVideoLibraryListVO;
@@ -43,6 +45,7 @@ import com.zrqx.sysuser.fg.service.comment.FgCommentService;
 import com.zrqx.sysuser.fg.service.content.FgSignLanguageRelationService;
 import com.zrqx.sysuser.fg.service.content.FgSignLanguageService;
 import com.zrqx.sysuser.fg.service.content.FgSignLanguageUserRelationService;
+import com.zrqx.sysuser.fg.service.resource.FgImageLibrarySerivce;
 import com.zrqx.sysuser.fg.service.resource.FgVideoLibraryService;
 
 /**
@@ -57,6 +60,8 @@ public class FgResourceLibraryController {
 	@Autowired
 	private FgVideoLibraryService service;
 	@Autowired
+	private FgImageLibrarySerivce imageLibraryService;
+	@Autowired
 	private FgCommentService commentService;
 	@Autowired
 	private FgSignLanguageService signLanguageService;
@@ -129,9 +134,9 @@ public class FgResourceLibraryController {
 	@ApiOperation(value = "导入视频" , notes ="导入视频")
 	@PostMapping(value = ResourceRequestPath.IMPORT)
 	public CallBack<Boolean> save(@RequestBody FgSaveResourceForm form){
-		if(ArrayUtils.empty(form.getResourceList())){
+		/*if(ArrayUtils.empty(form.getResourceList())){
 			throw new BusinessValidateException("数据不能为空");
-		}
+		}*/
 		if(!service.batchInsert(form)){
 			throw new BusinessValidateException("操作失败");
 		}
@@ -351,4 +356,5 @@ public class FgResourceLibraryController {
 			}
 		}
 	}
+	
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/resource/ImageLibraryMapper.java → com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/resource/FgImageLibraryMapper.java

@@ -3,6 +3,6 @@ package com.zrqx.sysuser.fg.mapper.resource;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
 
-public interface ImageLibraryMapper extends BaseMapper<ImageLibrary> {
+public interface FgImageLibraryMapper extends BaseMapper<ImageLibrary> {
 
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/resource/FgImageLibrarySerivce.java

+package com.zrqx.sysuser.fg.service.resource;
+
+import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
+import com.zrqx.core.service.BaseService;
+
+public interface FgImageLibrarySerivce extends BaseService<ImageLibrary, String> {
+
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/resource/FgImageLibrarySerivceImpl.java

+package com.zrqx.sysuser.fg.service.resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.sysuser.fg.mapper.resource.FgImageLibraryMapper;
+
+@Service
+public class FgImageLibrarySerivceImpl extends BaseServiceImpl<ImageLibrary, String> implements FgImageLibrarySerivce {
+
+	@Autowired
+	private FgImageLibraryMapper mapper;
+	
+	@Override
+	public BaseMapper<ImageLibrary> getMapper() {
+		return mapper;
+	}
+
+	
+
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/resource/FgVideoLibrarySerivceImpl.java

@@ -16,6 +16,7 @@ import com.zrqx.core.form.resource.fg.videolibrary.FgQueryVideoLibraryForm;
 import com.zrqx.core.form.resource.fg.videolibrary.FgSaveResourceForm;
 import com.zrqx.core.form.sysuser.fg.user.LoginUserInfo;
 import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
 import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
 import com.zrqx.core.model.sysuser.comment.Comment;
 import com.zrqx.core.service.BaseServiceImpl;
@@ -30,6 +31,7 @@ import com.zrqx.core.vo.resource.videolibrary.FgVideoLibraryOneVO;
 import com.zrqx.sysuser.commons.redis.Redis;
 import com.zrqx.sysuser.fg.client.file.FgFileInfoClient;
 import com.zrqx.sysuser.fg.mapper.comment.FgCommentMapper;
+import com.zrqx.sysuser.fg.mapper.resource.FgImageLibraryMapper;
 import com.zrqx.sysuser.fg.mapper.resource.FgVideoLibraryMapper;
 
 @Service
@@ -38,6 +40,8 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Stri
 	@Autowired
 	private FgVideoLibraryMapper mapper;
 	@Autowired
+	private FgImageLibraryMapper imageLibraryMapper;
+	@Autowired
 	private FgCommentMapper commentMapper;
 	@Autowired
 	private Redis redis;
@@ -59,9 +63,7 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Stri
 	@Override
 	public boolean batchInsert(FgSaveResourceForm form) {
 		LoginUserInfo member = redis.getMember();
-		List<VideoLibrary> list = BeanUtils.copyList(form.getResourceList(), VideoLibrary.class, li -> {
-			li.setSignLanguageId(form.getSignLanguageId());
-			li.setContentId(form.getContentId());
+		VideoLibrary obj = BeanUtils.copy(form, VideoLibrary.class, li -> {
 			li.setStatus(LibraryStatusEnum.STATUS_3.getCode());
 			li.setStatus_1(LibraryStatusEnum.STATUS_3.getCode());
 			li.setUploadTime(new Date());
@@ -69,9 +71,21 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Stri
 			li.setUserId(member.getUserId());
 			li.setArea_adminId(member.getArea_adminId());
 		});
-		list.stream().forEach(li -> mapper.insert(li));
+		mapper.insert(obj);
 		//批量插入视频
 		//mapper.insertList(list);
+		//添加图组
+		if(ArrayUtils.isNotEmpty(form.getImgList())) {
+			List<ImageLibrary> ls = new ArrayList<ImageLibrary>();
+			form.getImgList().stream().forEach(li -> {
+				ImageLibrary img = new ImageLibrary();
+				img.setImage(li);
+				img.setVideoId(obj.getId());
+				img.setUploadTime(new Date());
+				ls.add(img);
+			});
+			imageLibraryMapper.insertUuidList(ls);
+		}
 		return true;
 	}