--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/note/FgNoteService.java

 package com.zrqx.resource.fg.service.note;
 
-
 import java.util.List;
 
+import com.zrqx.core.form.resource.fg.note.BatchDeleteForm;
+import com.zrqx.core.form.resource.fg.note.FgQueryNoteListForm;
 import com.zrqx.core.model.resource.note.Note;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.fg.note.ExcelNoteExportVo;
 
-public interface FgNoteService extends BaseService<Note, Integer> {
+/**
+ * 用户笔记
+ * @author ydm
+ */
+public interface FgNoteService extends BaseService<Note, String> {
+
+	/**
+	 * 新增笔记
+	 * @param note
+	 * @return
+	 */
+	Integer saveNote(Note note);
+
+	/**
+	 * 根据markId获取笔记列表
+	 * @param markId
+	 * @return
+	 */
+	PageInfo<Note> listByMarkid(FgQueryNoteListForm form, PageParam pageParam);
+
+	/**
+	 * 修改笔记
+	 * @param note
+	 * @return
+	 */
+	Integer updateNote(Note note);
+
+	/**
+	 * 批量删除笔记
+	 * @param form
+	 * @return
+	 */
+	Integer batchDelete(BatchDeleteForm form);
 
 	/**
 	 * 我的笔记
 	 * @param pageParam
 	 * @return
 	 */
-	PageInfo<Note> page(PageParam pageParam,String content);
+	PageInfo<Note> listMyNote(FgQueryNoteListForm form,PageParam pageParam);
 
 	/**
-	 * 根据文章id查询笔记
-	 * @param contentid
+	 * 名称列表
+	 * @param bookName
 	 * @return
 	 */
-	List<Note> selectBycontentid(String contentid);
+	List<String> listName(String bookName);
 
 	/**
-	 * 导出笔记
+	 * 
+	 * @param query
 	 * @return
 	 */
-	List<ExcelNoteExportVo> exportBook();
-
+	List<ExcelNoteExportVo> importNote(FgQueryNoteListForm query);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/note/FgNoteServiceImpl.java

 package com.zrqx.resource.fg.service.note;
 
+import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.solr.client.solrj.request.CollectionAdminRequest.Create;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.entity.Example.Criteria;
-
-import com.github.pagehelper.PageHelper;
+import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.exception.BusinessValidateException;
+import com.zrqx.core.form.member.fg.permissions.LoginMemberInfo;
+import com.zrqx.core.form.resource.fg.note.BatchDeleteForm;
+import com.zrqx.core.form.resource.fg.note.FgQueryNoteListForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.note.Note;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.fg.note.ExcelNoteExportVo;
-import com.zrqx.resource.commons.Redis;
-import com.zrqx.resource.fg.mapper.annexlibrary.FgAnnexLibraryMapper;
-import com.zrqx.resource.fg.mapper.articlelibrary.FgArticleLibraryMapper;
-import com.zrqx.resource.fg.mapper.audiolibrary.FgAudioLibraryMapper;
-import com.zrqx.resource.fg.mapper.ebook.FgBookMapper;
-import com.zrqx.resource.fg.mapper.ebook.FgEbookMapper;
-import com.zrqx.resource.fg.mapper.imagelibrary.FgImageLibraryMapper;
+import com.zrqx.resource.commons.redis.FgRedisManage;
 import com.zrqx.resource.fg.mapper.note.FgNoteMapper;
-import com.zrqx.resource.fg.mapper.videolibrary.FgVideoLibraryMapper;
 
 /**
- * 浏览记录
- * @author ycw
- * @date 2019年2月12日下午2:41:27
+ * 用户笔记
+ * @author ydm
  */
 @Service
-public class FgNoteServiceImpl extends BaseServiceImpl<Note, Integer>
-		implements FgNoteService {
+public class FgNoteServiceImpl extends BaseServiceImpl<Note, String> implements FgNoteService {
 	
-	@Autowired
-	private FgNoteMapper mapper;
+	private static final Logger logger = LoggerFactory.getLogger(FgNoteServiceImpl.class);
 	
 	@Autowired
-	private FgArticleLibraryMapper articleLibraryMapper;
-	@Autowired
-	private FgBookMapper bookMapper;
-	@Autowired
-	private FgEbookMapper ebookMapper;
-	@Autowired
-	private FgImageLibraryMapper imageLibraryMapper;
-	@Autowired
-	private FgVideoLibraryMapper videoLibraryMapper;
-	@Autowired
-	private FgAudioLibraryMapper audioLibraryMapper;
-	@Autowired
-	private FgAnnexLibraryMapper annexLibraryMapper;
-	
+	private FgNoteMapper mapper;
 	@Autowired
-	private Redis redis;
+	private FgRedisManage redisManage;
 
 	@Override
 	public BaseMapper<Note> getMapper() {
 		return mapper;
 	}
 
-	/**
-	 * 我的笔记
-	 */
 	@Override
-	public PageInfo<Note> page(PageParam pageParam,String content) {
-		Example example = this.createExample();
-		example.orderBy("createTime").desc();
-		Criteria cr = example.createCriteria();
-		if (StringUtils.isNotBlank(content)) {
-			cr.andLike("content", "%" + content + "%");
+	public Integer saveNote(Note note) {
+		note.setCreateTime(new Date());
+		LoginMemberInfo member = redisManage.getMember();
+		note.setCreater(member.getId()+"");
+		
+		mapper.insert(note);
+		
+		return 1;
 	}
-		cr.andEqualTo("memberid", redis.getMember().getId());
-		return new PageInfo<Note>(this.selectByExample(example));
+
+	@Override
+	public PageInfo<Note> listByMarkid(FgQueryNoteListForm form, PageParam pageParam) {
+		startPage(pageParam);
+		LoginMemberInfo member = redisManage.getMember();
+		if(member == null){
+			throw new BaseException("用户未登录");
+		}
+		List<Note> list = mapper.listByMarkId(form,member.getId());
+		
+		return new PageInfo<Note>(list);
+	}
+
+	@Override
+	public Integer updateNote(Note note) {
+		Note record = mapper.selectByPrimaryKey(note.getId());
+		if(record == null){
+			throw new BusinessValidateException("未找到笔记");
+		}
+		
+		record.setContent(note.getContent());
+		record.setContentTitle(note.getContentTitle());
+		
+		mapper.updateByPrimaryKeySelective(record);
+		
+		return 1;
 	}
 
 	@Override
-	public List<Note> selectBycontentid(String contentid) {
-		PageHelper.orderBy(" createTime desc");
-		Note note = new Note();
-		note.setBookid(contentid);
-		note.setMemberid(redis.getMember().getId());
-		return mapper.select(note);
+	public Integer batchDelete(BatchDeleteForm form) {
+		int result = 0;
+		List<String> ids = form.getIds();
+		for(String id : ids){
+			mapper.deleteByPrimaryKey(id);
+			result ++ ;
+		}
+		return result;
 	}
 
 	@Override
-	public List<ExcelNoteExportVo> exportBook() {
-		Integer memberid = redis.getMember().getId();
-		return mapper.exportBook(memberid);
+	public PageInfo<Note> listMyNote(FgQueryNoteListForm form,PageParam pageParam) {
+		startPage(pageParam);
+		LoginMemberInfo member = redisManage.getMember();
+		if(member == null){
+			throw new BaseException("用户未登录");
+		}
+		List<Note> list = mapper.listMyNote(form,member.getId());
+		return new PageInfo<Note>(list);
 	}
 
+	@Override
+	public List<String> listName(String bookName) {
+		LoginMemberInfo member = redisManage.getMember();
+		if(member == null){
+			throw new BaseException("用户未登录");
+		}
+		List<String> list = mapper.listName(bookName,member.getId());
+		return list;
+	}
 
+	@Override
+	public List<ExcelNoteExportVo> importNote(FgQueryNoteListForm query) {
+		LoginMemberInfo member = redisManage.getMember();
+		if(member == null){
+			throw new BaseException("用户未登录");
+		}
+		return mapper.importNote(query,member.getId());
+	}
 }