ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 首页企标发布预警 实施预警

Browse Source
This commit is contained in:
mzaxd
2024-03-18 16:00:56 +08:00
parent 5bef80ce76
commit 693d1fb544
4 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/localTool/controller/LawsStandardEarlyWarningController.java
+37
View File
@@ -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));
}
}
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java
+3
View File
@@ -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;
/**
laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsEnterpriseStandardService.java
+10
View File
@@ -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<LawsEnterpriseS
*/
LawsEnterpriseStandard queryByStandardNumber(String standardNumber);
/**
* 最新发布的100条企标
*/
IPage<LawsEnterpriseStandard> latestReleaseEs(Integer pageNo, Integer pageSize);
/**
* 最新实施的100条企标
*/
IPage<LawsEnterpriseStandard> latestImplementEs(Integer pageNo, Integer pageSize);
}
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
+35
View File
@@ -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<LawsEnterpris
return getOne(wrapper);
}
@Override
public IPage<LawsEnterpriseStandard> latestReleaseEs(Integer pageNo, Integer pageSize) {
return latestEs(pageNo, pageSize, "release_date");
}
public IPage<LawsEnterpriseStandard> latestEs(Integer pageNo, Integer pageSize, String field) {
QueryWrapper<LawsEnterpriseStandard> esWrapper = new QueryWrapper<>();
esWrapper.le(field, LocalDate.now());
esWrapper.orderByDesc(field);
esWrapper.last("limit 100");
List<LawsEnterpriseStandard> esList = this.list(esWrapper);
// 按照pageNo和pageSize进行分页
if (!esList.isEmpty()) {
int fromIndex = (pageNo - 1) * pageSize;
int toIndex = Math.min(pageNo * pageSize, esList.size());
List<LawsEnterpriseStandard> pageList = esList.subList(fromIndex, toIndex);
Page<LawsEnterpriseStandard> page = new Page<>(pageNo, pageSize, esList.size());
return page.setRecords(pageList);
}
return new Page<>();
}
@Override
public IPage<LawsEnterpriseStandard> latestImplementEs(Integer pageNo, Integer pageSize) {
return latestEs(pageNo, pageSize, "implementation_date");
}
@Override
public List<String> getSequenceNumbers(String esCodeDictValue, String esNameCodeDictValue, String categoryCodeDictValue) {
// 已经存在的标准