From 693d1fb5447ec25577ae90a048df4cded5c947aa Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 18 Mar 2024 16:00:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=A2=84=E8=AD=A6=20=E5=AE=9E=E6=96=BD?= =?UTF-8?q?=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsStandardEarlyWarningController.java | 37 +++++++++++++++++++ .../entity/LawsEnterpriseStandard.java | 3 ++ .../ILawsEnterpriseStandardService.java | 10 +++++ .../LawsEnterpriseStandardServiceImpl.java | 35 ++++++++++++++++++ 4 files changed, 85 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/controller/LawsStandardEarlyWarningController.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/controller/LawsStandardEarlyWarningController.java index 520d33b5..213c3108 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/controller/LawsStandardEarlyWarningController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/controller/LawsStandardEarlyWarningController.java @@ -1,13 +1,16 @@ package com.jero.modules.laws.localTool.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.modules.laws.localTool.entity.StandardEarlyWarning; import com.jero.modules.laws.localTool.service.ILawsStandardEarlyWarningService; import com.jero.modules.laws.standard.entity.LawsNewsFeed; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -15,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; + /** * @Author: liao * @Date: 2023/10/31 9:46 @@ -28,6 +33,9 @@ public class LawsStandardEarlyWarningController { @Autowired private ILawsStandardEarlyWarningService lawsStandardEarlyWarningService; + @Resource + private ILawsEnterpriseStandardService esService; + @AutoLog(value = "标准预警-新车型实施预警") @ApiOperation(value = "标准预警-新车型实施预警", notes = "标准预警-新车型实施预警") @GetMapping(value = "/newModelImplementation") @@ -50,4 +58,33 @@ public class LawsStandardEarlyWarningController { return Result.OK(pageList); } + + /** + * 标准预警-企标发布预警 + * + * @return + */ + @AutoLog(value = "标准预警-企标发布预警") + @ApiOperation(value = "标准预警-企标发布预警", notes = "标准预警-企标发布预警") + @GetMapping(value = "/latestReleaseEs") + @RequiresPermissions("standardWarning:search") + public Result latestReleaseEs(@RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { + return Result.OK(esService.latestReleaseEs(pageNo, pageSize)); + } + + /** + * 标准预警-企标实施预警 + * + * @return + */ + @AutoLog(value = "标准预警-企标实施预警") + @ApiOperation(value = "标准预警-企标实施预警", notes = "标准预警-企标实施预警") + @GetMapping(value = "/latestImplementEs") + @RequiresPermissions("standardWarning:search") + public Result latestImplementEs(@RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { + return Result.OK(esService.latestImplementEs(pageNo, pageSize)); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java index 5c6c2f07..4c43c7b0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java @@ -1,6 +1,7 @@ package com.jero.modules.laws.standard.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -123,12 +124,14 @@ public class LawsEnterpriseStandard implements Serializable { * 发布日期 */ @ApiModelProperty(value = "发布日期") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date releaseDate; /** * 实施日期 */ @ApiModelProperty(value = "实施日期") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date implementationDate; /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsEnterpriseStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsEnterpriseStandardService.java index 50280b03..51097557 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsEnterpriseStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsEnterpriseStandardService.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.standard.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; @@ -19,4 +20,13 @@ public interface ILawsEnterpriseStandardService extends IService latestReleaseEs(Integer pageNo, Integer pageSize); + + /** + * 最新实施的100条企标 + */ + IPage latestImplementEs(Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java index ec57352c..1beaf135 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java @@ -1,11 +1,17 @@ package com.jero.modules.laws.standard.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; +import com.jero.modules.activiti.process.common.enums.StandardStateEnum; +import com.jero.modules.laws.common.util.DateUtil; import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; +import com.jero.modules.laws.localTool.entity.StandardEarlyWarning; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.mapper.LawsEnterpriseStandardMapper; @@ -14,6 +20,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -41,6 +48,34 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl latestReleaseEs(Integer pageNo, Integer pageSize) { + return latestEs(pageNo, pageSize, "release_date"); + } + + public IPage latestEs(Integer pageNo, Integer pageSize, String field) { + QueryWrapper esWrapper = new QueryWrapper<>(); + esWrapper.le(field, LocalDate.now()); + esWrapper.orderByDesc(field); + esWrapper.last("limit 100"); + + List esList = this.list(esWrapper); + // 按照pageNo和pageSize进行分页 + if (!esList.isEmpty()) { + int fromIndex = (pageNo - 1) * pageSize; + int toIndex = Math.min(pageNo * pageSize, esList.size()); + List pageList = esList.subList(fromIndex, toIndex); + Page page = new Page<>(pageNo, pageSize, esList.size()); + return page.setRecords(pageList); + } + return new Page<>(); + } + + @Override + public IPage latestImplementEs(Integer pageNo, Integer pageSize) { + return latestEs(pageNo, pageSize, "implementation_date"); + } + @Override public List getSequenceNumbers(String esCodeDictValue, String esNameCodeDictValue, String categoryCodeDictValue) { // 已经存在的标准