From 673553e2123b1516abeb4d7484c7505e22e233d5 Mon Sep 17 00:00:00 2001 From: Jinyuanyuan <1197651512@qq.com> Date: Fri, 21 Jun 2024 17:10:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E6=9C=9F=E5=88=8A=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=86=E9=A1=B5=E3=80=81=E4=BF=AE=E6=94=B91.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HuzhouPeriodicallabController.java | 12 ++--- .../HuzhouPeriodicallabCountController.java | 15 +----- .../huzhou/dao/HuzhouPeriodicallabMapper.java | 2 +- .../dao/mapping/HuzhouPeriodicallabMapper.xml | 24 --------- .../huzhou/entity/HuzhouPeriodicallab.java | 6 --- .../entity/HuzhouPeriodicallabCount.java | 2 +- .../IHuzhouPeriodicallabCountService.java | 10 +--- .../service/IHuzhouPeriodicallabService.java | 5 +- .../HuzhouPeriodicallabCountServiceImpl.java | 54 +++++-------------- .../impl/HuzhouPeriodicallabServiceImpl.java | 33 ++++-------- .../huzhou/vo/PeriodicallabCountOV.java | 17 +----- .../huzhou/vo/PeriodicallabPageOV.java | 26 +++++++++ 12 files changed, 62 insertions(+), 144 deletions(-) delete mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPeriodicallabMapper.xml create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PeriodicallabPageOV.java diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPeriodicallabController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPeriodicallabController.java index 8a332f7..ac65eb1 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPeriodicallabController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPeriodicallabController.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.easy.admin.common.api.vo.Result; import com.easy.admin.common.core.exception.EasyException; import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallab; +import com.easy.admin.modules.huzhou.entity.HuzhouRegulationlab; import com.easy.admin.modules.huzhou.service.IHuzhouPeriodicallabService; import com.easy.admin.modules.huzhou.vo.PeriodicallabCountPage; +import com.easy.admin.modules.huzhou.vo.PeriodicallabPageOV; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -100,13 +102,5 @@ public class HuzhouPeriodicallabController { public void batchdownloadPeriodicallabFiles(HuzhouPeriodicallab periodicallab, HttpServletResponse response){ periodicallabService.batchdownloadPeriodicallabFiles(periodicallab,response); } - //统计分页 - @GetMapping("/countPeriodicallabPage") - public Result countPeriodicallabPage(PeriodicallabCountPage periodicallab, - @RequestParam(name="sortOrder", defaultValue="desc") String sortOrder, - @RequestParam(name="current", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize){ - IPage pageList = periodicallabService.countPeriodicallabPage(periodicallab,sortOrder, pageNo, pageSize); - return Result.ok(pageList); - } + } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPeriodicallabCountController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPeriodicallabCountController.java index aba7837..8c624fd 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPeriodicallabCountController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPeriodicallabCountController.java @@ -1,20 +1,13 @@ package com.easy.admin.modules.huzhou.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.easy.admin.common.api.vo.Result; import com.easy.admin.common.core.exception.EasyException; -import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallab; import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallabCount; import com.easy.admin.modules.huzhou.service.IHuzhouPeriodicallabCountService; -import com.easy.admin.modules.huzhou.service.IHuzhouPeriodicallabService; -import com.easy.admin.modules.huzhou.vo.PeriodicallabCountOV; -import com.easy.admin.modules.huzhou.vo.PeriodicallabCountPage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; @RestController @@ -32,10 +25,11 @@ public class HuzhouPeriodicallabCountController { */ @GetMapping("/periodicallabCountPageList") public Result periodicallabCountPageList(HuzhouPeriodicallabCount periodicallabCount, + @RequestParam(name="sortOrder",defaultValue="") String orderDir, @RequestParam(name="current", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize){ - Page pageList = periodicallabCountService.getPeriodicallabCountPageList(periodicallabCount, pageNo, pageSize); + Page pageList = periodicallabCountService.getPeriodicallabCountPageList(periodicallabCount, orderDir,pageNo, pageSize); return Result.ok(pageList); } @@ -52,8 +46,6 @@ public class HuzhouPeriodicallabCountController { /** * 添加月度期刊 - * @param file - * @param periodicallab * @return * @throws IOException */ @@ -65,8 +57,6 @@ public class HuzhouPeriodicallabCountController { /** * 修改阅读期刊 - * @param file - * @param periodicallab * @return * @throws IOException */ @@ -81,7 +71,6 @@ public class HuzhouPeriodicallabCountController { /** * 删除阅读期刊 - * @param periodicallab * @return * @throws IOException */ diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPeriodicallabMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPeriodicallabMapper.java index 6dd3c8b..60dbdf2 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPeriodicallabMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPeriodicallabMapper.java @@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Param; public interface HuzhouPeriodicallabMapper extends BaseMapper { - IPage getPeriodicalCountPage(Page page, @Param("info") PeriodicallabCountPage info, @Param("orderBy") String orderBy); + } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPeriodicallabMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPeriodicallabMapper.xml deleted file mode 100644 index 2f6bf30..0000000 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPeriodicallabMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPeriodicallab.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPeriodicallab.java index 7060c79..e81fd1b 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPeriodicallab.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPeriodicallab.java @@ -16,8 +16,6 @@ import java.util.Date; * @since 2024-02-29 11:03:40 */ @Data -@Accessors(chain = true) -@Builder(toBuilder = true) public class HuzhouPeriodicallab extends BaseEntity implements Serializable { private static final long serialVersionUID = -50005828024123796L; /** @@ -62,10 +60,6 @@ public class HuzhouPeriodicallab extends BaseEntity implements Serializable { */ private String status; - private String workplace; - - private String adminDivision; - } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPeriodicallabCount.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPeriodicallabCount.java index 74e7fc6..9b99cda 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPeriodicallabCount.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPeriodicallabCount.java @@ -28,7 +28,7 @@ public class HuzhouPeriodicallabCount extends BaseEntity implements Serializable */ private String id; - private String workplace; + private String dutyWorkplace; private String adminDivision; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPeriodicallabCountService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPeriodicallabCountService.java index 90e3cfd..be8cfdc 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPeriodicallabCountService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPeriodicallabCountService.java @@ -1,19 +1,11 @@ package com.easy.admin.modules.huzhou.service; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallab; import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallabCount; -import com.easy.admin.modules.huzhou.vo.PeriodicallabCountOV; -import com.easy.admin.modules.huzhou.vo.PeriodicallabCountPage; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; public interface IHuzhouPeriodicallabCountService extends IService { - Page getPeriodicallabCountPageList(HuzhouPeriodicallabCount periodicallabCount, Integer pageNo, + Page getPeriodicallabCountPageList(HuzhouPeriodicallabCount periodicallabCount, String orderDir,Integer pageNo, Integer pageSize); Boolean addPeriodicallabCount(HuzhouPeriodicallabCount periodicallabCount); Boolean modifyPeriodicallabCount(HuzhouPeriodicallabCount periodicallabCount); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPeriodicallabService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPeriodicallabService.java index cb5aa27..ad92d97 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPeriodicallabService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPeriodicallabService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallab; import com.easy.admin.modules.huzhou.entity.HuzhouRegulationlab; import com.easy.admin.modules.huzhou.vo.PeriodicallabCountPage; +import com.easy.admin.modules.huzhou.vo.PeriodicallabPageOV; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -13,7 +14,7 @@ import java.io.IOException; public interface IHuzhouPeriodicallabService extends IService { Page getPeriodicallabPageList(HuzhouPeriodicallab periodicallab, Integer pageNo, - Integer pageSize); + Integer pageSize); void addPeriodicallab(MultipartFile file,HuzhouPeriodicallab periodicallab) throws IOException; Boolean modifyPeriodicallab(MultipartFile file, HuzhouPeriodicallab periodicallab) throws IOException; @@ -21,5 +22,5 @@ public interface IHuzhouPeriodicallabService extends IService countPeriodicallabPage(PeriodicallabCountPage periodicallab, String sortOrder, Integer pageNo, Integer pageSize); + } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabCountServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabCountServiceImpl.java index 5d1bf0b..d2c2926 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabCountServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabCountServiceImpl.java @@ -1,39 +1,17 @@ package com.easy.admin.modules.huzhou.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.easy.admin.auth.model.SysUser; -import com.easy.admin.common.util.CommonUtils; import com.easy.admin.modules.huzhou.dao.HuzhouPeriodicallabCountMapper; -import com.easy.admin.modules.huzhou.dao.HuzhouPeriodicallabMapper; -import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallab; import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallabCount; import com.easy.admin.modules.huzhou.service.IHuzhouPeriodicallabCountService; -import com.easy.admin.modules.huzhou.service.IHuzhouPeriodicallabService; -import com.easy.admin.modules.huzhou.vo.PeriodicallabCountOV; -import com.easy.admin.modules.huzhou.vo.PeriodicallabCountPage; -import com.easy.admin.util.ShiroUtil; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.springframework.util.FileCopyUtils; -import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; import java.util.List; -import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; +import java.util.Objects; @Service public class HuzhouPeriodicallabCountServiceImpl extends ServiceImpl implements IHuzhouPeriodicallabCountService { @@ -41,30 +19,22 @@ public class HuzhouPeriodicallabCountServiceImpl extends ServiceImpl getPeriodicallabCountPageList(HuzhouPeriodicallabCount periodicallabCount, Integer pageNo, Integer pageSize) { + public Page getPeriodicallabCountPageList(HuzhouPeriodicallabCount periodicallabCount,String orderDir, Integer pageNo, Integer pageSize) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); Page page = new Page<>(pageNo, pageSize); - String workplace = periodicallabCount.getWorkplace(); + String workplace = periodicallabCount.getDutyWorkplace(); String adminDivision = periodicallabCount.getAdminDivision(); - queryWrapper.like(StringUtils.isNotBlank(workplace),HuzhouPeriodicallabCount::getWorkplace,workplace); + queryWrapper.like(StringUtils.isNotBlank(workplace),HuzhouPeriodicallabCount::getDutyWorkplace,workplace); queryWrapper.eq(StringUtils.isNotBlank(adminDivision),HuzhouPeriodicallabCount::getAdminDivision,adminDivision); - - Page periodicallabCountPage = this.page(page, queryWrapper); - List records = periodicallabCountPage.getRecords(); - List newRecords=new ArrayList<>(); - for(HuzhouPeriodicallabCount r:records){ - PeriodicallabCountOV ov = new PeriodicallabCountOV(); - BeanUtils.copyProperties(r,ov); - if(r.getEditNumber() == null){ - ov.setShowNumber(r.getCountNumber()); - }else { - ov.setShowNumber(r.getEditNumber()); - } - newRecords.add(ov); + if(Objects.equals(orderDir, "descend")){ + queryWrapper.orderByDesc(HuzhouPeriodicallabCount::getCountNumber); + } else if (Objects.equals(orderDir, "ascend")){ + queryWrapper.orderByAsc(HuzhouPeriodicallabCount::getCountNumber); } - Page result=new Page<>(); - result.setRecords(newRecords).setTotal(periodicallabCountPage.getTotal()).setCurrent(periodicallabCountPage.getCurrent()).setSize(periodicallabCountPage.getSize()); + + Page result = this.page(page, queryWrapper); + return result; } @@ -88,7 +58,7 @@ public class HuzhouPeriodicallabCountServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); - query.eq(StringUtils.isNotBlank(workplace),HuzhouPeriodicallabCount::getWorkplace,workplace); + query.eq(StringUtils.isNotBlank(workplace),HuzhouPeriodicallabCount::getDutyWorkplace,workplace); List result = periodicallabCountMapper.selectObjs(query); return result == null || result.isEmpty() ? null : (String) result.get(0); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabServiceImpl.java index 8138a3a..45c73fc 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPeriodicallabServiceImpl.java @@ -9,9 +9,11 @@ import com.easy.admin.common.util.CommonUtils; import com.easy.admin.modules.huzhou.dao.HuzhouPeriodicallabMapper; import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallab; import com.easy.admin.modules.huzhou.entity.HuzhouPeriodicallabCount; +import com.easy.admin.modules.huzhou.entity.HuzhouRegulationlab; import com.easy.admin.modules.huzhou.service.IHuzhouPeriodicallabCountService; import com.easy.admin.modules.huzhou.service.IHuzhouPeriodicallabService; import com.easy.admin.modules.huzhou.vo.PeriodicallabCountPage; +import com.easy.admin.modules.huzhou.vo.PeriodicallabPageOV; import com.easy.admin.util.ShiroUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -43,19 +45,20 @@ public class HuzhouPeriodicallabServiceImpl extends ServiceImpl getPeriodicallabPageList(HuzhouPeriodicallab periodicallab, - Integer pageNo, - Integer pageSize) { + Integer pageNo, + Integer pageSize) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); Page huzhouPeriodicallabPage = new Page<>(pageNo, pageSize); String periodicallabName = periodicallab.getName(); - String documentName = periodicallab.getDocumentName(); - - String periodicallabPeriods = periodicallab.getPeriods(); - queryWrapper.like(StringUtils.isNotBlank(periodicallabName),HuzhouPeriodicallab::getName,periodicallabName); - queryWrapper.eq(StringUtils.isNotBlank(periodicallabPeriods),HuzhouPeriodicallab::getPeriods,periodicallabPeriods); + String periods = periodicallab.getPeriods(); + Date publishTime = periodicallab.getPublishTime(); - queryWrapper.like(StringUtils.isNotBlank(documentName),HuzhouPeriodicallab::getDocumentName,documentName); + queryWrapper.like(StringUtils.isNotBlank(periodicallabName),HuzhouPeriodicallab::getName,periodicallabName); + queryWrapper.eq(StringUtils.isNotBlank(periods),HuzhouPeriodicallab::getPeriods,periods); + if(publishTime!=null){ + queryWrapper.eq(HuzhouPeriodicallab::getPublishTime,publishTime); + } Page page = this.page(huzhouPeriodicallabPage, queryWrapper); return page; } @@ -64,10 +67,6 @@ public class HuzhouPeriodicallabServiceImpl extends ServiceImpl countPeriodicallabPage(PeriodicallabCountPage periodicallab, String sortOrder, Integer pageNo, Integer pageSize) { - Page page = new Page<>(pageNo, pageSize); - IPage result = periodicallabMapper.getPeriodicalCountPage(page, periodicallab, sortOrder); - return result; - } private void addFile(MultipartFile file,HuzhouPeriodicallab periodicallab) throws IOException { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PeriodicallabCountOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PeriodicallabCountOV.java index 63822b2..be6ff7b 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PeriodicallabCountOV.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PeriodicallabCountOV.java @@ -6,20 +6,7 @@ import lombok.Data; import lombok.experimental.Accessors; @Data +@Accessors(chain = true) +@Builder(toBuilder = true) public class PeriodicallabCountOV { - /** - - * id - */ - private String id; - - private String workplace; - - private String adminDivision; - - private Integer countNumber; - - private Integer editNumber; - - private Integer showNumber; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PeriodicallabPageOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PeriodicallabPageOV.java new file mode 100644 index 0000000..bbf48d4 --- /dev/null +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/PeriodicallabPageOV.java @@ -0,0 +1,26 @@ +package com.easy.admin.modules.huzhou.vo; + + +import lombok.Builder; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.Date; + +@Data +@Accessors(chain = true) +@Builder(toBuilder = true) +public class PeriodicallabPageOV { + private String id; + + /** + * 期刊名称 + */ + private String name; + /** + * 期数 + */ + private String periods; + + private Date publishTime; +}