diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java index 3e635490..000b3d1f 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.aspect.annotation.DictPoint; import com.jero.common.constant.CommonConstant; @@ -34,6 +36,7 @@ import java.util.Map; @RestController @RequestMapping("/sys/sysAnnouncementSend") @Slf4j +@ApiSupport(order = 202) public class SysAnnouncementSendController { @Autowired private ISysAnnouncementSendService sysAnnouncementSendService; @@ -48,6 +51,7 @@ public class SysAnnouncementSendController { * @return */ @GetMapping(value = "/page") + @ApiOperationSupport(order = 1) public Result> queryPageList(SysAnnouncementSend sysAnnouncementSend, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -77,6 +81,7 @@ public class SysAnnouncementSendController { * @return */ @PostMapping(value = "/add") + @ApiOperationSupport(order = 2) public Result add(@RequestBody SysAnnouncementSend sysAnnouncementSend) { try { sysAnnouncementSendService.save(sysAnnouncementSend); @@ -93,6 +98,7 @@ public class SysAnnouncementSendController { * @return */ @PostMapping(value = "/edit") + @ApiOperationSupport(order = 3) public Result edit(@RequestBody SysAnnouncementSend sysAnnouncementSend) { SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId()); if(sysAnnouncementSendEntity==null) { @@ -113,6 +119,7 @@ public class SysAnnouncementSendController { * @return */ @PostMapping(value = "/delete") + @ApiOperationSupport(order = 4) public Result delete(@RequestBody Map map) { String id = map.get("id"); if(StringUtils.isBlank(id)){ @@ -137,6 +144,7 @@ public class SysAnnouncementSendController { * @return */ @PostMapping(value = "/deleteBatch") + @ApiOperationSupport(order = 5) public Result deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); if(ids == null || "".equals(ids.trim())) { @@ -153,6 +161,7 @@ public class SysAnnouncementSendController { * @return */ @GetMapping(value = "/queryById") + @ApiOperationSupport(order = 6) public Result queryById(@RequestParam(name="id",required=true) String id) { SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); if(sysAnnouncementSend==null) { @@ -168,6 +177,7 @@ public class SysAnnouncementSendController { * @return */ @PostMapping(value = "/editByAnntIdAndUserId") + @ApiOperationSupport(order = 7) public Result editById(@RequestBody JSONObject json) { Result result = new Result<>(); String anntId = json.getString("anntId"); @@ -188,6 +198,7 @@ public class SysAnnouncementSendController { * @return */ @GetMapping(value = "/getMyAnnouncementSend") + @ApiOperationSupport(order = 8) public Result> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { @@ -206,6 +217,7 @@ public class SysAnnouncementSendController { @GetMapping(value = "/getDetailsById") @DictPoint + @ApiOperationSupport(order = 9) public Result getDetailsById(@RequestParam(name="id") String id) { AnnouncementSendModel announcementSendModel = sysAnnouncementSendService.getDetailsById(id); return Result.OK(announcementSendModel); @@ -216,6 +228,7 @@ public class SysAnnouncementSendController { * @return */ @PostMapping(value = "/readAll") + @ApiOperationSupport(order = 10) public Result readAll() { LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String userId = sysUser.getId(); diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index e2e2b17f..031999c8 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -6,7 +6,10 @@ 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.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.constant.enums.LanguageEnum; @@ -17,14 +20,13 @@ import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.compare.entity.SarFileCompareDetailVO; import com.jero.modules.compare.entity.SarFileCompareInfo; -import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.compare.enums.ReleaseConditionEnum; -import com.jero.common.api.vo.ResultCommon; +import com.jero.modules.compare.service.ISarFileCompareInfoService; 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.system.service.ISysUserService; import com.jero.modules.system.util.MyStringUtils; @@ -56,6 +58,7 @@ import java.util.stream.Collectors; * @Version: V1.0 */ @Api(tags = "文档对比信息表") +@ApiSupport(order = 306) @RestController @RequestMapping("/compare/sarFileCompareInfo") @Slf4j @@ -80,6 +83,7 @@ public class SarFileCompareInfoController extends JeroController queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "cut", defaultValue = "cn") String cut, @@ -256,6 +260,7 @@ public class SarFileCompareInfoController extends JeroController> queryList() { List list = sarFileCompareInfoService.queryList(); return Result.OK(list); @@ -270,6 +275,7 @@ public class SarFileCompareInfoController extends JeroController add(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { sarFileCompareInfoService.add(sarFileCompareInfo); return Result.OK("添加成功！"); @@ -284,6 +290,7 @@ public class SarFileCompareInfoController extends JeroController edit(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { sarFileCompareInfoService.editById(sarFileCompareInfo); return Result.OK("编辑成功!"); @@ -296,6 +303,7 @@ public class SarFileCompareInfoController extends JeroController delete(@RequestBody JSONObject object) { sarFileCompareInfoService.deleteById(object.getString("id")); return Result.OK("删除成功!"); @@ -308,6 +316,7 @@ public class SarFileCompareInfoController extends JeroController deleteBatch(@RequestBody JSONObject object) { this.sarFileCompareInfoService.deleteByIds(Arrays.asList(object.getString("ids").split(","))); return Result.OK("批量删除成功!"); @@ -322,6 +331,7 @@ public class SarFileCompareInfoController extends JeroController queryById(@RequestParam(name = "id", required = true) String id) { SarFileCompareInfo sarFileCompareInfo = sarFileCompareInfoService.queryById(id); if (sarFileCompareInfo == null) { @@ -364,6 +374,7 @@ public class SarFileCompareInfoController extends JeroController fullTextComparison(@RequestBody JSONObject json) { try { String leftStandard = json.get("leftStandard").toString(); @@ -394,6 +405,7 @@ public class SarFileCompareInfoController extends JeroController changeState(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { SarFileCompareInfo info = sarFileCompareInfoService.queryById(sarFileCompareInfo.getId()); if (ReleaseConditionEnum.DRAFT.getValue().equals(sarFileCompareInfo.getReleaseState())) { @@ -413,6 +425,7 @@ public class SarFileCompareInfoController extends JeroController getComparisonDetail(@RequestBody JSONObject json) { SarFileCompareDetailVO sarFileCompareDetailVO = sarFileCompareInfoService.getComparisonDetail(json.get("id").toString()); return Result.OK(sarFileCompareDetailVO); @@ -422,6 +435,7 @@ public class SarFileCompareInfoController extends JeroController editComments(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { SarFileCompareInfo info = sarFileCompareInfoService.getById(sarFileCompareInfo.getId()); info.setComments(sarFileCompareInfo.getComments()); diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java index 770413ea..25c64f84 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java @@ -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> 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 add(@Validated @RequestBody LawsBrowsingHistory lawsBrowsingHistory) { lawsBrowsingHistoryService.add(lawsBrowsingHistory); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); @@ -75,6 +80,7 @@ public class LawsBrowsingHistoryController extends JeroController delete() { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -90,6 +96,7 @@ public class LawsBrowsingHistoryController extends JeroController deleteBatch(@RequestBody Map map) { if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java index c7d04d8e..47224860 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java @@ -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> 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 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 domesticDelete(@RequestBody Map 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 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 overseasDelete(@RequestBody Map 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 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 enterpriseDelete(@RequestBody Map 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 delete(@RequestBody Map map) { if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java index fc7a739f..0223ac48 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java @@ -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> 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> 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 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 overseasAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { // 发送消息 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -204,6 +211,7 @@ public class LawsStandardSharingController extends JeroController 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 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 deleteBatch(@RequestBody Map map) { return judge(map); } @@ -296,6 +306,7 @@ public class LawsStandardSharingController extends JeroController batchDel(@RequestBody Map map) { return judge(map); }