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:
yjz
2023-11-17 09:31:13 +08:00
parent a74684973c
commit 9d0ffa8b3e
5 changed files with 83 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java
+18 -11
View File
@@ -1,30 +1,32 @@
package com.jero.modules.personal.controller;
import java.util.Arrays;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.personal.entity.LawsBrowsingHistory;
import com.jero.modules.personal.service.ILawsBrowsingHistoryService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
import org.apache.poi.ss.formula.functions.T;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Map;
/**
@@ -34,6 +36,7 @@ import org.apache.poi.ss.formula.functions.T;
* @Version: V1.0
*/
@Api(tags="浏览记录")
@ApiSupport(order = 206)
@RestController
@RequestMapping("/personal/lawsBrowsingHistory")
@Slf4j
@@ -47,6 +50,7 @@ public class LawsBrowsingHistoryController extends JeroController<LawsBrowsingHi
@AutoLog(value = "浏览记录-分页列表查询")
@ApiOperation(value="浏览记录-分页列表查询", notes="浏览记录-分页列表查询")
@GetMapping(value = "/page")
@ApiOperationSupport(order = 1)
public Result<IPage<LawsBrowsingHistory>> queryPageList(LawsBrowsingHistory lawsBrowsingHistory,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -63,6 +67,7 @@ public class LawsBrowsingHistoryController extends JeroController<LawsBrowsingHi
@AutoLog(value = "浏览记录-添加")
@ApiOperation(value="浏览记录-添加", notes="浏览记录-添加")
@PostMapping(value = "/add")
@ApiOperationSupport(order = 2)
public Result<T> add(@Validated @RequestBody LawsBrowsingHistory lawsBrowsingHistory) {
lawsBrowsingHistoryService.add(lawsBrowsingHistory);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
@@ -75,6 +80,7 @@ public class LawsBrowsingHistoryController extends JeroController<LawsBrowsingHi
@AutoLog(value = "浏览记录-清除浏览记录")
@ApiOperation(value="浏览记录-清除浏览记录", notes="浏览记录-清除浏览记录")
@PostMapping(value = "/delete")
@ApiOperationSupport(order = 3)
public Result<T> delete() {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LambdaQueryWrapper<LawsBrowsingHistory> wrapper = new LambdaQueryWrapper<>();
@@ -90,6 +96,7 @@ public class LawsBrowsingHistoryController extends JeroController<LawsBrowsingHi
@AutoLog(value = "浏览记录-批量删除")
@ApiOperation(value="浏览记录-批量删除", notes="浏览记录-批量删除")
@PostMapping(value = "/deleteBatch")
@ApiOperationSupport(order = 4)
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java
+23 -12
View File
@@ -1,36 +1,38 @@
package com.jero.modules.personal.controller;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
import com.jero.modules.personal.entity.LawsStandardCollection;
import com.jero.modules.personal.service.ILawsStandardCollectionService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import javax.servlet.http.HttpServletRequest;
import java.util.Map;
/**
@@ -40,6 +42,7 @@ import org.apache.poi.ss.formula.functions.T;
* @Version: V1.0
*/
@Api(tags="标准收藏")
@ApiSupport(order = 203)
@RestController
@RequestMapping("/personal/lawsStandardCollection")
@Slf4j
@@ -60,6 +63,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@AutoLog(value = "标准收藏-我的收藏分页列表查询")
@ApiOperation(value="标准收藏-分页列表查询", notes="标准收藏-我的收藏分页列表查询")
@GetMapping(value = "/page")
@ApiOperationSupport(order = 1)
public Result<IPage<LawsStandardCollection>> queryPageList(LawsStandardCollection lawsStandardCollection,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -75,6 +79,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@AutoLog(value = "标准收藏-国内收藏")
@ApiOperation(value="标准收藏-国内收藏", notes="标准收藏-国内收藏")
@PostMapping(value = "/domestic/add")
@ApiOperationSupport(order = 2)
public Result<T> domesticAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardCollection.getStandardId());
@@ -100,6 +105,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@AutoLog(value = "标准收藏-国内取消收藏")
@ApiOperation(value="标准收藏-国内取消收藏", notes="标准收藏-国内取消收藏")
@PostMapping(value = "/domestic/delete")
@ApiOperationSupport(order = 3)
public Result<T> domesticDelete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
@@ -115,6 +121,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@AutoLog(value = "标准收藏-海外收藏")
@ApiOperation(value="标准收藏-海外收藏", notes="标准收藏-海外收藏")
@PostMapping(value = "/overseas/add")
@ApiOperationSupport(order = 4)
public Result<T> overseasAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardCollection.getStandardId());
@@ -140,6 +147,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@AutoLog(value = "标准收藏-海外取消收藏")
@ApiOperation(value="标准收藏-海外取消收藏", notes="标准收藏-海外取消收藏")
@PostMapping(value = "/overseas/delete")
@ApiOperationSupport(order = 5)
public Result<T> overseasDelete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES));
@@ -155,6 +163,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@AutoLog(value = "标准收藏-企标收藏")
@ApiOperation(value="标准收藏-企标收藏", notes="标准收藏-企标收藏")
@PostMapping(value = "/enterprise/add")
@ApiOperationSupport(order = 6)
public Result<T> enterpriseAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LawsEnterpriseStandard standard = ILawsEnterpriseStandardService.getById(lawsStandardCollection.getStandardId());
@@ -180,6 +189,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@AutoLog(value = "标准收藏-企标取消收藏")
@ApiOperation(value="标准收藏-企标取消收藏", notes="标准收藏-企标取消收藏")
@PostMapping(value = "/enterprise/delete")
@ApiOperationSupport(order = 7)
public Result<T> enterpriseDelete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
@@ -195,6 +205,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@AutoLog(value = "标准收藏-我的收藏列表取消收藏")
@ApiOperation(value="标准收藏-我的收藏列表取消收藏", notes="标准收藏-我的收藏列表取消收藏")
@PostMapping(value = "/delete")
@ApiOperationSupport(order = 8)
public Result<T> delete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
+12 -1
View File
@@ -1,8 +1,11 @@
package com.jero.modules.personal.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.jero.common.api.dto.message.SendMessageDTO;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.api.vo.SendMessageAPI;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.constant.CommonConstant;
@@ -10,7 +13,6 @@ import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon;
import com.jero.modules.laws.common.util.CurrentUserUtil;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
@@ -49,6 +51,7 @@ import java.util.*;
* @Version: V1.0
*/
@Api(tags = "标准分享")
@ApiSupport(order = 204)
@RestController
@RequestMapping("/personal/lawsStandardSharing")
@Slf4j
@@ -76,6 +79,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@AutoLog(value = "标准分享-分页已发分享列表查询")
@ApiOperation(value = "标准分享-分页已发分享列表查询", notes = "标准分享-分页已发分享列表查询")
@GetMapping(value = "/issued/page")
@ApiOperationSupport(order = 1)
public Result<IPage<LawsStandardSharing>> issued(LawsStandardSharing lawsStandardSharing,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -94,6 +98,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@AutoLog(value = "标准分享-分页已收分享列表查询")
@ApiOperation(value = "标准分享-分页已收分享列表查询", notes = "标准分享-分页已收分享列表查询")
@GetMapping(value = "/received/page")
@ApiOperationSupport(order = 2)
public Result<IPage<LawsStandardSharing>> received(LawsStandardSharing lawsStandardSharing,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -112,6 +117,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@AutoLog(value = "标准分享-国内分享")
@ApiOperation(value = "标准分享-国内分享", notes = "标准分享-国内分享")
@PostMapping(value = "/domestic/add")
@ApiOperationSupport(order = 3)
public Result<T> domesticAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysUser user = sysUserService.getById(sysUser.getId());
@@ -166,6 +172,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@AutoLog(value = "标准分享-海外分享")
@ApiOperation(value = "标准分享-海外分享", notes = "标准分享-海外分享")
@PostMapping(value = "/overseas/add")
@ApiOperationSupport(order = 4)
public Result<T> overseasAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
// 发送消息
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -204,6 +211,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@AutoLog(value = "标准分享-企标分享")
@ApiOperation(value = "标准分享-企标分享", notes = "标准分享-企标分享")
@PostMapping(value = "/enterprise/add")
@ApiOperationSupport(order = 5)
public Result<T> enterpriseAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysUser user = sysUserService.getById(sysUser.getId());
@@ -239,6 +247,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@AutoLog(value = "标准分享-动态消息分享")
@ApiOperation(value = "标准分享-动态消息分享", notes = "标准分享-动态消息分享")
@PostMapping(value = "/dynamicMessages/add")
@ApiOperationSupport(order = 6)
public Result<T> dynamicMessages(@RequestBody LawsStandardSharing lawsStandardSharing) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysUser user = sysUserService.getById(sysUser.getId());
@@ -275,6 +284,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@ApiOperation(value = "标准分享-批量删除(已发分享)", notes = "标准分享-批量删除(已发分享)")
@PostMapping(value = "/deleteBatch")
@RequiresPermissions(value = "personalCenter:sentShare:batchDel")
@ApiOperationSupport(order = 7)
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
return judge(map);
}
@@ -296,6 +306,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@ApiOperation(value = "标准分享-批量删除(已收分享)", notes = "标准分享-批量删除(已收分享)")
@PostMapping(value = "/batchDel")
@RequiresPermissions(value = "personalCenter:receivedShare:batchDel")
@ApiOperationSupport(order = 8)
public Result<T> batchDel(@RequestBody Map<String, String> map) {
return judge(map);
}