培训系统

src/main/java/com/ssj/api/controller/ApiTrainController.java

@@ -1,5 +1,6 @@
 package com.ssj.api.controller;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -418,18 +419,21 @@ public class ApiTrainController extends BaseController {
             Page<Map<String,Object>> page = videoFileService.findVideoFileByPage(params, initPage(requestVO.getPageNo(), requestVO.getPageSize()));
             List<Map<String,Object>> videoFiles=page.getContent();
             Map<String, Object> dataMap=null;
+        	SimpleDateFormat formatter1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        	SimpleDateFormat formatter2 = new SimpleDateFormat("yyyy.MM.dd");
             for (Map<String, Object> map : videoFiles) {
             	dataMap=new HashMap<String, Object>();
             	dataMap.put("roleType", map.get("role_type"));
             	dataMap.put("roleName", defaultRoleTypeNames.get(Integer.parseInt(map.get("role_type").toString())-1));
             	dataMap.put("name", map.get("title"));
+            	dataMap.put("module", map.get("module"));
             	dataMap.put("format", map.get("format"));
             	dataMap.put("url", map.get("url"));
-            	dataMap.put("createTime", map.get("create_time"));
+            	dataMap.put("createTime", formatter2.format(formatter1.parse(map.get("create_time").toString())));
             	list.add(dataMap);
 			}
-            
             data.put("pages", page.getTotalPages());
+            data.put("totals", page.getTotalElements());
             data.put("pageNo", requestVO.getPageNo());
             data.put("pageSize", requestVO.getPageSize());
             data.put("list", list);

src/main/java/com/ssj/dao/sys/train/dao/TrainQueryDao.java

@@ -22,6 +22,8 @@ public interface TrainQueryDao {
 	
 	public List<Map<String, Object>> findVideoFileByType();
 	
+	public Page<Map<String, Object>> findVideoFileBySysPage(Map<String, Object> params, Pageable pageable);
+	
 	public Page<Map<String, Object>> findVideoFileByPage(Map<String, Object> params, Pageable pageable);
 
 }

src/main/java/com/ssj/dao/sys/train/dao/impl/TrainQueryDaoImpl.java

@@ -203,7 +203,7 @@ public class TrainQueryDaoImpl  implements TrainQueryDao {
 	}
 
 	@Override
-	public Page<Map<String, Object>> findVideoFileByPage(Map<String, Object> params, Pageable pageable) {
+	public Page<Map<String, Object>> findVideoFileBySysPage(Map<String, Object> params, Pageable pageable) {
 		StringBuilder sb = new StringBuilder();
 		List<Object> param = new ArrayList<>();
         sb.append(" SELECT * from tr_video_file t WHERE t.`status`=1  ");
@@ -226,6 +226,32 @@ public class TrainQueryDaoImpl  implements TrainQueryDao {
         sb.append("  ORDER BY t.type ASC,t.create_time DESC ");
         return dao.findPage(sb.toString(),param.toArray(),pageable);
 	}
+	
+	@Override
+	public Page<Map<String, Object>> findVideoFileByPage(Map<String, Object> params, Pageable pageable) {
+		StringBuilder sb = new StringBuilder();
+		List<Object> param = new ArrayList<>();
+        sb.append(" SELECT * from tr_video_file t WHERE t.`status`=1  ");
+        if(params.get("type")!=null && StringUtils.isNotEmpty(params.get("type").toString())) {
+       	 	sb.append(" AND t.type=?  ");
+       	 	param.add(params.get("type"));
+        }
+        if(params.get("roleType")!=null && StringUtils.isNotEmpty(params.get("roleType").toString())) {
+       	 	sb.append(" AND t.role_type=?  ");
+       	 	param.add(params.get("roleType"));
+        }
+        if(params.get("module")!=null && StringUtils.isNotEmpty(params.get("module").toString())) {
+        	sb.append(" AND t.module=?  ");
+        	param.add(params.get("module"));
+        }
+        if(params.get("name")!=null && StringUtils.isNotEmpty(params.get("name").toString())) {
+       	  	sb.append(" AND t.title like concat('%',?,'%')  ");
+       	  	param.add(params.get("name"));
+        }
+        sb.append("  ORDER BY t.create_time DESC ");
+        return dao.findPage(sb.toString(),param.toArray(),pageable);
+	}
+
 
 	
 	

src/main/java/com/ssj/service/sys/train/service/VideoFileService.java

@@ -14,6 +14,8 @@ public interface VideoFileService extends BaseService<VideoFile, String> {
 
 	public List<Map<String, Object>> findVideoFileByType();
 	
+	public Page<Map<String, Object>> findVideoFileBySysPage(Map<String, Object> params, Pageable pageable);
+	
 	public Page<Map<String, Object>> findVideoFileByPage(Map<String, Object> params, Pageable pageable) ;
 	 
 }

src/main/java/com/ssj/service/sys/train/service/impl/VideoFileServiceImpl.java

@@ -36,12 +36,17 @@ public class VideoFileServiceImpl extends BaseServiceImpl<VideoFile, String> imp
 	public List<Map<String, Object>> findVideoFileByType() {
 		return trainQueryDao.findVideoFileByType();
 	}
+	
+	@Override
+	public Page<Map<String, Object>> findVideoFileBySysPage(Map<String, Object> params, Pageable pageable) {
+		return trainQueryDao.findVideoFileBySysPage(params, pageable);
+	}
     
 	@Override
 	public Page<Map<String, Object>> findVideoFileByPage(Map<String, Object> params, Pageable pageable) {
 		return trainQueryDao.findVideoFileByPage(params, pageable);
 	}
 
-    
+	
 }
 

src/main/java/com/ssj/sys/controller/TrainController.java

@@ -99,6 +99,7 @@ public class TrainController extends BaseController {
 	    	videoInfo.setRoleType(param.getRoleType());
 	    	videoInfo.setStatus(param.getStatus());
 	    	videoInfo.setTitle(param.getTitle());
+	    	videoInfo.setUrl(param.getUrl());
 	    	videoInfo.setUpdateTime(new Date());
 	    	videoInfoService.save(videoInfo);
     	}else {
@@ -262,7 +263,7 @@ public class TrainController extends BaseController {
         sp.setPageNo(pageNo);
         sp.setPageSize(pageSize);
         sp.setParams(params);
-        Page<Map<String,Object>> page = videoFileService.findVideoFileByPage(params, initPage(pageNo, pageSize));
+        Page<Map<String,Object>> page = videoFileService.findVideoFileBySysPage(params, initPage(pageNo, pageSize));
         List<Map<String,Object>> list=page.getContent();
        
         sp.setRowCnt((int) page.getTotalElements());