Skip to content

S
syzj
提交 37ce49fd authored 作者: renjianyu's avatar renjianyu
浏览文件
操作

--no commit message

上级 07d452ab
隐藏空白字符变更
内嵌 并排
正在显示 包含 199 行增加 和 45 行删除
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/workmanagement/WorkmanagementController.java
浏览文件 @ 37ce49fd
......@@ -5,6 +5,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
......@@ -83,7 +84,7 @@ public class WorkmanagementController {
@ApiOperation(value = "批量修改上下架", notes = "批量修改上下架")
@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_UPDOWN)
public CallBack<Boolean> update5(@RequestBody UpdateWorkForm form) {
public CallBack<Boolean> update(@RequestBody UpdateWorkForm form) {
if (form.getWorkStatus() != null && form.getIds().size() > 0) {// 上架操作
Example example = new Example(Ebook.class);
example.createCriteria().andIn("id", form.getIds());
......@@ -97,6 +98,19 @@ public class WorkmanagementController {
}
return CallBack.success();
}
@ApiOperation(value = "修改投票数", notes = "修改投票数")
@PostMapping(value = ResourceRequestPath.UPDATE)
public CallBack<Boolean> updateVote(@RequestBody SaveUpdateWorkForm form) {
if(StringUtils.isBlank(form.getId())){
throw new BusinessValidateException("资源id不能为空");
}
WorkManagement workManagement =new WorkManagement();
workManagement.setId(form.getId());
workManagement.setVoteNum(form.getVoteNum());
workmanagementService.updateByPrimaryKeySelective(workManagement);
return CallBack.success();
}
@ApiOperation(value = "批量删除", notes = "批量删除")
@PostMapping(value = ResourceRequestPath.BATCH_DELETE)
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/workmanagement/WorkManagementServiceImpl.java
浏览文件 @ 37ce49fd
......@@ -65,7 +65,7 @@ public class WorkManagementServiceImpl extends BaseServiceImpl<WorkManagement, S
pageParam.setPageNum(form.getPageNum());
pageParam.setPageSize(form.getPageSize());
if (pageParam.getOrderBy() == null) {
pageParam.setOrderBy(" uploadTime desc ");
pageParam.setOrderBy(" number asc ");
}
startPage(pageParam);
List<WorkmanagementListVo> list = workManagementMapper.page(form);
......
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/workmanagement/FgWorkmanagementController.java
浏览文件 @ 37ce49fd
package com.zrqx.resource.fg.controller.workmanagement;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -16,24 +15,14 @@ import org.springframework.web.bind.annotation.RestController;
import com.zrqx.core.constant.resource.ResourceRequestPath;
import com.zrqx.core.enums.BooleanStatusEnum;
import com.zrqx.core.exception.BusinessValidateException;
import com.zrqx.core.exception.ParameterValidateException;
import com.zrqx.core.form.resource.bg.ebook.UpdateEbookForm;
import com.zrqx.core.form.resource.bg.workmanagement.SaveUpdateWorkForm;
import com.zrqx.core.form.resource.bg.workmanagement.UpdateWorkForm;
import com.zrqx.core.form.resource.bg.workmanagement.WorkmanagementForm;
import com.zrqx.core.form.resource.fg.workmanagement.FgWorkAgreeForm;
import com.zrqx.core.form.resource.fg.workmanagement.FgUpdateWorkForm;
import com.zrqx.core.form.resource.fg.workmanagement.FgWorkmanagementForm;
import com.zrqx.core.model.resource.ebook.Ebook;
import com.zrqx.core.model.resource.ebook.EbookDiyType;
import com.zrqx.core.model.resource.ebook.EbookImage;
import com.zrqx.core.model.resource.membercollection.MemberCollection;
import com.zrqx.core.model.resource.resourcerelation.ResourceRelation;
import com.zrqx.core.model.resource.statistics.Statistics;
import com.zrqx.core.model.resource.workmanagement.WorkManagement;
import com.zrqx.core.model.resource.workmanagement.WorkManagementAgree;
import com.zrqx.core.model.resource.workmanagement.WorkManagementDiyType;
import com.zrqx.core.model.resource.workmanagement.WorkManagementImg;
import com.zrqx.core.model.resource.workmanagement.WorkManagementWork;
import com.zrqx.core.model.resource.workmanagement.WorkVote;
import com.zrqx.core.util.bean.BeanUtils;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
......@@ -42,14 +31,6 @@ import com.zrqx.core.vo.member.fg.workmanagement.FgWorkImgVo;
import com.zrqx.core.vo.member.fg.workmanagement.FgWorkManagementVo;
import com.zrqx.core.vo.member.fg.workmanagement.FgWorkManagementWorkVo;
import com.zrqx.core.vo.member.fg.workmanagement.FgWorkmanagementListVo;
import com.zrqx.core.vo.resource.workmanagement.WorkImgVo;
import com.zrqx.core.vo.resource.workmanagement.WorkManagementVo;
import com.zrqx.core.vo.resource.workmanagement.WorkManagementWorkVo;
import com.zrqx.core.vo.resource.workmanagement.WorkmanagementListVo;
import com.zrqx.resource.bg.service.workmanagement.WorkManagementDiyTypeService;
import com.zrqx.resource.bg.service.workmanagement.WorkManagementImgService;
import com.zrqx.resource.bg.service.workmanagement.WorkManagementService;
import com.zrqx.resource.bg.service.workmanagement.WorkManagementWorkService;
import com.zrqx.resource.commons.Redis;
import com.zrqx.resource.fg.mapper.workmanagement.FgWorkManagementAgreeMapper;
import com.zrqx.resource.fg.mapper.workmanagement.FgWorkManagementDiyTypeMapper;
......@@ -58,6 +39,7 @@ import com.zrqx.resource.fg.service.workmanagement.FgWorkManagementDiyTypeServic
import com.zrqx.resource.fg.service.workmanagement.FgWorkManagementImgService;
import com.zrqx.resource.fg.service.workmanagement.FgWorkManagementService;
import com.zrqx.resource.fg.service.workmanagement.FgWorkManagementWorkService;
import com.zrqx.resource.fg.service.workmanagement.FgWorkVoteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -90,13 +72,21 @@ public class FgWorkmanagementController {
private Redis redisManage;
@Autowired
private FgStatisticsService fgStatisticsService;
@Autowired
private FgWorkVoteService fgWorkVoteService;
@ApiOperation("查询作品列表")
@GetMapping(ResourceRequestPath.PAGE)
public CallBack<PageInfo<FgWorkmanagementListVo>> getBookList(FgWorkmanagementForm form, PageParam pageParam) {
return CallBack.success(workmanagementService.page(form, pageParam));
}
@ApiOperation("查询作品列表")
@GetMapping(ResourceRequestPath.LIST)
public CallBack<List<FgWorkmanagementListVo>> getWorkBookList(FgWorkmanagementForm form, PageParam pageParam) {
return CallBack.success(workmanagementService.list(form, pageParam));
}
@ApiOperation("根据id查找作品")
@GetMapping(ResourceRequestPath.OID)
......@@ -108,7 +98,7 @@ public class FgWorkmanagementController {
FgWorkManagementVo vo = new FgWorkManagementVo();
WorkManagement workManagement = workmanagementService.selectByPrimaryKey(oid);
BeanUtils.copyProperties(workManagement, vo);
if(vo.getFabulousNum()== null) {
if (vo.getFabulousNum() == null) {
vo.setFabulousNum(0);
}
// 设置是否已点赞
......@@ -166,7 +156,7 @@ public class FgWorkmanagementController {
} else {
vo.setWorkAbbImageList(workListvo);
}
//拼装分类，只拼一级
// 拼装分类，只拼一级
String diytype = fgWorkManagementDiyTypeMapper.getdiytype(oid);
// 组装自定义分类
// example = workManagementDiyTypeService.createExample();
......@@ -175,35 +165,64 @@ public class FgWorkmanagementController {
vo.setDiyType(diytype);
return CallBack.success(vo);
}
@ApiOperation(value = "分享总次数", notes = "")
@PostMapping(ResourceRequestPath.STATISTICS + ResourceRequestPath.SHARE)
public CallBack<Boolean> statisticsShare(){
//type 0取消评论，type 1 评论
Statistics statistics =new Statistics();
public CallBack<Boolean> statisticsShare() {
// type 0取消评论，type 1 评论
Statistics statistics = new Statistics();
statistics = fgStatisticsService.selectAll().get(0);
statistics.setShareCount(statistics.getShareCount()+1);
statistics.setShareCount(statistics.getShareCount() + 1);
return CallBack.success(fgStatisticsService.updateByPrimaryKeySelective(statistics));
}
@ApiOperation(value = "投票", notes = "投票")
@PostMapping(value = ResourceRequestPath.UPDATE + ResourceRequestPath.VOTE)
public CallBack<Boolean> updateVote(@RequestBody FgUpdateWorkForm form) {
if (redisManage.isExistMember()) {
} else {
throw new BusinessValidateException("请您先登录");
}
//今天是否投过票
fgWorkVoteService.selectWorkVote();
for (String id : form.getIds()) {
WorkManagement workManagement = workmanagementService.selectByPrimaryKey(id);
if (workManagement.getVoteNum() == null) {
workManagement.setVoteNum(0 + 1);
} else {
workManagement.setVoteNum(workManagement.getVoteNum() + 1);
}
workmanagementService.updateByPrimaryKeySelective(workManagement);
}
// 用户今天投票记录
WorkVote workVote = new WorkVote();
workVote.setUploadTime(new Date());
workVote.setMemberId(redisManage.getMember().getId());
fgWorkVoteService.insert(workVote);
return CallBack.success();
}
@ApiOperation(value = "活动总访问量", notes = "")
@PostMapping(ResourceRequestPath.STATISTICS + ResourceRequestPath.VISITCOUNT)
public CallBack<Boolean> statisticsVisitCount(){
//type 0取消评论，type 1 评论
Statistics statistics =new Statistics();
public CallBack<Boolean> statisticsVisitCount() {
// type 0取消评论，type 1 评论
Statistics statistics = new Statistics();
statistics = fgStatisticsService.selectAll().get(0);
statistics.setVisitCount(statistics.getVisitCount()+1);
statistics.setVisitCount(statistics.getVisitCount() + 1);
return CallBack.success(fgStatisticsService.updateByPrimaryKeySelective(statistics));
}
@ApiOperation(value = "总分享点击量", notes = "")
@PostMapping(ResourceRequestPath.STATISTICS + ResourceRequestPath.SHARE + ResourceRequestPath.COUNT)
public CallBack<Boolean> statisticsShareCount(){
//type 0取消评论，type 1 评论
Statistics statistics =new Statistics();
public CallBack<Boolean> statisticsShareCount() {
// type 0取消评论，type 1 评论
Statistics statistics = new Statistics();
statistics = fgStatisticsService.selectAll().get(0);
statistics.setShareClickCount(statistics.getShareClickCount()+1);
statistics.setShareClickCount(statistics.getShareClickCount() + 1);
return CallBack.success(fgStatisticsService.updateByPrimaryKeySelective(statistics));
}
......
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/workmanagement/FgWorkManagementMapper.java
浏览文件 @ 37ce49fd
......@@ -32,7 +32,7 @@ public interface FgWorkManagementMapper extends BaseMapper<WorkManagement>{
* @date 2020年7月15日 下午2:33:32
*/
@Select("<script>"
+ " select DISTINCT be.id,name,companytype,"
+ " select DISTINCT be.id,be.number,be.voteNum,name,companytype,"
+ " serieschinesename,"
+ " (select cover from res_work_management_img b where imgtype ='2' and b.workWorkId = (select id from res_work_management_work a where a.workId = be.id and imgsort = 1 ) LIMIT 1) cover "
+ " from res_work_management be LEFT JOIN res_work_management_diy_type bdt ON be.id = bdt.workId "
......
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/workmanagement/FgWorkVoteMapper.java 0 → 100644
浏览文件 @ 37ce49fd
package com.zrqx.resource.fg.mapper.workmanagement;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
import com.zrqx.core.form.resource.bg.ebook.QueryEbookInfoForm;
import com.zrqx.core.form.resource.bg.workmanagement.WorkmanagementForm;
import com.zrqx.core.form.resource.fg.workmanagement.FgWorkmanagementForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.resource.workmanagement.WorkManagement;
import com.zrqx.core.model.resource.workmanagement.WorkVote;
import com.zrqx.core.vo.member.fg.workmanagement.FgWorkmanagementListVo;
import com.zrqx.core.vo.resource.ebook.EbookListVO;
import com.zrqx.core.vo.resource.ebook.ExcelEbookListVo;
import com.zrqx.core.vo.resource.workmanagement.WorkmanagementListVo;
/**
* 作品投票记录是否投过标-mapper
* @author Conan
* @date 2020年7月13日上午10:03:52
*/
public interface FgWorkVoteMapper extends BaseMapper<WorkVote>{
/**
* 查询作品列表
* @date 2020年12月01日 下午2:33:32
*/
@Select("<script>"
+ " select * from res_work_vote where DATE_FORMAT(uploadTime,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')"
+ " memberId = #{form.memberId} "
+ "</script>")
WorkVote selectVote(@Param("memberId")Integer memberId);
}
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/workmanagement/FgWorkManagementService.java
浏览文件 @ 37ce49fd
package com.zrqx.resource.fg.service.workmanagement;
import java.text.ParseException;
import java.util.List;
import com.zrqx.core.form.resource.bg.ebook.QueryEbookInfoForm;
import com.zrqx.core.form.resource.bg.ebook.SaveUpdateEbookForm;
......@@ -30,6 +31,16 @@ public interface FgWorkManagementService extends BaseService<WorkManagement, Str
*/
PageInfo<FgWorkmanagementListVo> page(FgWorkmanagementForm form, PageParam pageParam);
/**
* 后台分页查询
* @param form
* @param pageParam
* @return
* @author rjy
* @date: 2020年07月13日 下午2:39:32
*/
List<FgWorkmanagementListVo> list(FgWorkmanagementForm form, PageParam pageParam);
boolean updateBrowseNum(String oid);
......
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/workmanagement/FgWorkManagementServiceImpl.java
浏览文件 @ 37ce49fd
......@@ -54,13 +54,21 @@ public class FgWorkManagementServiceImpl extends BaseServiceImpl<WorkManagement,
@Override
public PageInfo<FgWorkmanagementListVo> page(FgWorkmanagementForm form, PageParam pageParam) {
if (pageParam.getOrderBy() == null) {
pageParam.setOrderBy(" uploadTime desc ");
pageParam.setOrderBy(" number desc ");
}
startPage(pageParam);
List<FgWorkmanagementListVo> list = fgworkManagementMapper.page(form);
return new PageInfo<FgWorkmanagementListVo>(list);
}
@Override
public List<FgWorkmanagementListVo> list(FgWorkmanagementForm form, PageParam pageParam) {
List<FgWorkmanagementListVo> list = fgworkManagementMapper.page(form);
return list;
}
/**
......
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/workmanagement/FgWorkVoteService.java 0 → 100644
浏览文件 @ 37ce49fd
package com.zrqx.resource.fg.service.workmanagement;
import com.zrqx.core.model.resource.workmanagement.WorkVote;
import com.zrqx.core.service.BaseService;
/**
* 作品-service
*/
public interface FgWorkVoteService extends BaseService<WorkVote, String>{
//今天是否投票
WorkVote selectWorkVote();
}
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/workmanagement/FgWorkVoteServiceImpl.java 0 → 100644
浏览文件 @ 37ce49fd
package com.zrqx.resource.fg.service.workmanagement;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zrqx.core.exception.BusinessValidateException;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.resource.workmanagement.WorkVote;
import com.zrqx.core.service.BaseServiceImpl;
import com.zrqx.resource.commons.Redis;
import com.zrqx.resource.fg.mapper.workmanagement.FgWorkVoteMapper;
/**
* 作品记录每天用户是否投过票-serviceimpl
*
* @author Conan
* @date 2020年7月13日上午10:05:36
*/
@Service
public class FgWorkVoteServiceImpl extends BaseServiceImpl<WorkVote, String>
implements FgWorkVoteService {
@Autowired
private FgWorkVoteMapper fgWorkVoteMapper;
@Autowired
private Redis redisManage;
@Override
public BaseMapper<WorkVote> getMapper() {
return fgWorkVoteMapper;
}
@Override
public WorkVote selectWorkVote() {
WorkVote workvote = fgWorkVoteMapper.selectVote(redisManage.getMember().getId());
if(workvote != null) {
throw new BusinessValidateException("您已投票，请您明天在为您喜欢的作品投票");
}
return null;
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论