docs: 完善文档注释
This commit is contained in:
+16
-13
@@ -30,8 +30,11 @@ 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;
|
||||
import com.jero.modules.system.vo.IdMapBody;
|
||||
import com.jero.modules.system.vo.IdsMapBody;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
@@ -84,12 +87,12 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
|
||||
@ApiOperation(value = "文档对比信息表-分页列表查询", notes = "文档对比信息表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
@ApiOperationSupport(order = 1)
|
||||
public Result<?> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
@RequestParam(name = "cut", defaultValue = "cn") String cut,
|
||||
@RequestParam(name = "serialNumber", defaultValue = "") String serialNumber,
|
||||
@RequestParam(name = "title", defaultValue = "") String title,
|
||||
@RequestParam(name = "releaseState", defaultValue = "") String releaseState,
|
||||
public Result<?> queryPageList(@ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
@ApiParam("国际化") @RequestParam(name = "cut", defaultValue = "cn") String cut,
|
||||
@ApiParam("标准号") @RequestParam(name = "serialNumber", defaultValue = "") String serialNumber,
|
||||
@ApiParam("标题") @RequestParam(name = "title", defaultValue = "") String title,
|
||||
@ApiParam("发布状态") @RequestParam(name = "releaseState", defaultValue = "") String releaseState,
|
||||
HttpServletRequest req) {
|
||||
LambdaQueryWrapper<SarFileCompareInfo> queryWrapper = new LambdaQueryWrapper<>();
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
@@ -304,8 +307,8 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
|
||||
@ApiOperation(value = "文档对比信息表-通过id删除", notes = "文档对比信息表-通过id删除")
|
||||
@PostMapping(value = "/delete")
|
||||
@ApiOperationSupport(order = 5)
|
||||
public Result<?> delete(@RequestBody JSONObject object) {
|
||||
sarFileCompareInfoService.deleteById(object.getString("id"));
|
||||
public Result<?> delete(@RequestBody IdMapBody mapBody) {
|
||||
sarFileCompareInfoService.deleteById(mapBody.getId());
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
@@ -317,8 +320,8 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
|
||||
@ApiOperation(value = "文档对比信息表-批量删除", notes = "文档对比信息表-批量删除")
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
@ApiOperationSupport(order = 6)
|
||||
public Result<?> deleteBatch(@RequestBody JSONObject object) {
|
||||
this.sarFileCompareInfoService.deleteByIds(Arrays.asList(object.getString("ids").split(",")));
|
||||
public Result<?> deleteBatch(@RequestBody IdsMapBody mapBody) {
|
||||
this.sarFileCompareInfoService.deleteByIds(Arrays.asList(mapBody.getIds().split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -332,7 +335,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
|
||||
@ApiOperation(value = "文档对比信息表-通过id查询", notes = "文档对比信息表-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
@ApiOperationSupport(order = 7)
|
||||
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
public Result<?> queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) {
|
||||
SarFileCompareInfo sarFileCompareInfo = sarFileCompareInfoService.queryById(id);
|
||||
if (sarFileCompareInfo == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
@@ -375,7 +378,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
|
||||
@ApiOperation(value = "文档对比信息表-发起文档对比", notes = "文档对比信息表-发起文档对比")
|
||||
@RequestMapping(value = "/fullTextComparison", method = RequestMethod.POST)
|
||||
@ApiOperationSupport(order = 8)
|
||||
public Result<?> fullTextComparison(@RequestBody JSONObject json) {
|
||||
public Result<?> fullTextComparison(@ApiParam("JSONObject格式数据") @RequestBody JSONObject json) {
|
||||
try {
|
||||
String leftStandard = json.get("leftStandard").toString();
|
||||
String rightStandard = json.get("rightStandard").toString();
|
||||
@@ -427,7 +430,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
|
||||
@RequestMapping(value = "/getComparisonDetail", method = RequestMethod.POST)
|
||||
@ApiOperationSupport(order = 10)
|
||||
@RequiresPermissions("documentComparison:edit")
|
||||
public Result<?> getComparisonDetail(@RequestBody JSONObject json) {
|
||||
public Result<?> getComparisonDetail(@ApiParam("JSONObject格式数据") @RequestBody JSONObject json) {
|
||||
SarFileCompareDetailVO sarFileCompareDetailVO = sarFileCompareInfoService.getComparisonDetail(json.get("id").toString());
|
||||
return Result.OK(sarFileCompareDetailVO);
|
||||
}
|
||||
|
||||
+17
-15
@@ -1,6 +1,5 @@
|
||||
package com.jero.modules.compare.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@@ -11,8 +10,11 @@ import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.compare.entity.SarFileCompareItemComment;
|
||||
import com.jero.modules.compare.entity.SarFileCompareResultVO;
|
||||
import com.jero.modules.compare.service.ISarFileCompareItemCommentService;
|
||||
import com.jero.modules.system.vo.IdMapBody;
|
||||
import com.jero.modules.system.vo.IdsMapBody;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.authz.annotation.Logical;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
@@ -53,8 +55,8 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
|
||||
@ApiOperation(value = "文档对比信息条款评论表-分页列表查询", notes = "文档对比信息条款评论表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(SarFileCompareItemComment sarFileCompareItemComment,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
@ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<SarFileCompareItemComment> queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareItemComment, req.getParameterMap());
|
||||
Page<SarFileCompareItemComment> page = new Page<SarFileCompareItemComment>(pageNo, pageSize);
|
||||
@@ -125,8 +127,8 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
|
||||
@AutoLog(value = "文档对比信息条款评论表-通过id删除")
|
||||
@ApiOperation(value = "文档对比信息条款评论表-通过id删除", notes = "文档对比信息条款评论表-通过id删除")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestBody JSONObject object) {
|
||||
sarFileCompareItemCommentService.deleteById(object.getString("id"));
|
||||
public Result<?> delete(@RequestBody IdMapBody mapBody) {
|
||||
sarFileCompareItemCommentService.deleteById(mapBody.getId());
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
@@ -136,8 +138,8 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
|
||||
@AutoLog(value = "文档对比信息条款评论表-批量删除")
|
||||
@ApiOperation(value = "文档对比信息条款评论表-批量删除", notes = "文档对比信息条款评论表-批量删除")
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestBody JSONObject object) {
|
||||
this.sarFileCompareItemCommentService.deleteByIds(Arrays.asList(object.getString("ids").split(",")));
|
||||
public Result<?> deleteBatch(@RequestBody IdsMapBody mapBody) {
|
||||
this.sarFileCompareItemCommentService.deleteByIds(Arrays.asList(mapBody.getIds().split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@@ -150,7 +152,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
|
||||
@AutoLog(value = "文档对比信息条款评论表-通过id查询")
|
||||
@ApiOperation(value = "文档对比信息条款评论表-通过id查询", notes = "文档对比信息条款评论表-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
public Result<?> queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) {
|
||||
SarFileCompareItemComment sarFileCompareItemComment = sarFileCompareItemCommentService.queryById(id);
|
||||
if (sarFileCompareItemComment == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
@@ -167,8 +169,8 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
|
||||
@AutoLog(value = "文档对比信息条款评论表-查询对比结果")
|
||||
@ApiOperation(value = "文档对比信息条款评论表-查询对比结果", notes = "文档对比信息条款评论表-查询对比结果")
|
||||
@GetMapping(value = "/queryCompareResult")
|
||||
public Result<SarFileCompareResultVO> queryCompareResult(@RequestParam(name = "infoId", required = true) String infoId,
|
||||
@RequestParam(name = "comment", required = false) String comment) {
|
||||
public Result<SarFileCompareResultVO> queryCompareResult(@ApiParam("文档对比id") @RequestParam(name = "infoId", required = true) String infoId,
|
||||
@ApiParam("评论") @RequestParam(name = "comment", required = false) String comment) {
|
||||
SarFileCompareResultVO res = sarFileCompareItemCommentService.queryCompareResult(infoId,comment);
|
||||
return Result.OK(res);
|
||||
}
|
||||
@@ -177,12 +179,12 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
|
||||
@AutoLog(value = "文档对比信息条款评论表-导出结果")
|
||||
@ApiOperation(value = "文档对比信息条款评论表-导出结果", notes = "文档对比信息条款评论表-导出结果")
|
||||
@GetMapping(value = "/exportResXls")
|
||||
public void exportResXls(@RequestParam(name = "infoId", required = true) String infoId,
|
||||
@RequestParam(name = "selectIds", required = false) String selectIds,
|
||||
@RequestParam(name = "includeComments", required = true) boolean includeComments,
|
||||
@RequestParam(name = "cut", required = true) String cut,
|
||||
public void exportResXls(@ApiParam("文档对比id")@RequestParam(name = "infoId", required = true) String infoId,
|
||||
@ApiParam("选择id") @RequestParam(name = "selectIds", required = false) String selectIds,
|
||||
@ApiParam("include 注释") @RequestParam(name = "includeComments", required = true) boolean includeComments,
|
||||
@ApiParam("国际化") @RequestParam(name = "cut", required = true) String cut,
|
||||
HttpServletResponse response,HttpServletRequest request,
|
||||
@RequestParam(name = "comment", required = false) String comment) {
|
||||
@ApiParam("评论") @RequestParam(name = "comment", required = false) String comment) {
|
||||
sarFileCompareItemCommentService.exportResXls(request,response, infoId, selectIds, includeComments, cut,comment);
|
||||
}
|
||||
|
||||
|
||||
+8
-7
@@ -11,6 +11,7 @@ import com.jero.modules.compare.entity.SarFileCompareItem;
|
||||
import com.jero.modules.compare.service.ISarFileCompareItemService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -51,8 +52,8 @@ public class SarFileCompareItemController extends JeroController<SarFileCompareI
|
||||
@ApiOperation(value="文档对比信息条款表-分页列表查询", notes="文档对比信息条款表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(SarFileCompareItem sarFileCompareItem,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
@ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<SarFileCompareItem> queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareItem, req.getParameterMap());
|
||||
Page<SarFileCompareItem> page = new Page<SarFileCompareItem>(pageNo, pageSize);
|
||||
@@ -110,7 +111,7 @@ public class SarFileCompareItemController extends JeroController<SarFileCompareI
|
||||
@AutoLog(value = "文档对比信息条款表-通过id删除")
|
||||
@ApiOperation(value="文档对比信息条款表-通过id删除", notes="文档对比信息条款表-通过id删除")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||
public Result<?> delete(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
|
||||
sarFileCompareItemService.deleteById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -124,7 +125,7 @@ public class SarFileCompareItemController extends JeroController<SarFileCompareI
|
||||
@AutoLog(value = "文档对比信息条款表-批量删除")
|
||||
@ApiOperation(value="文档对比信息条款表-批量删除", notes="文档对比信息条款表-批量删除")
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
public Result<?> deleteBatch(@ApiParam("ids") @RequestParam(name="ids",required=true) String ids) {
|
||||
this.sarFileCompareItemService.deleteByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
@@ -138,7 +139,7 @@ public class SarFileCompareItemController extends JeroController<SarFileCompareI
|
||||
@AutoLog(value = "文档对比信息条款表-通过id查询")
|
||||
@ApiOperation(value="文档对比信息条款表-通过id查询", notes="文档对比信息条款表-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
public Result<?> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
|
||||
SarFileCompareItem sarFileCompareItem = sarFileCompareItemService.queryById(id);
|
||||
if(sarFileCompareItem==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
@@ -176,8 +177,8 @@ public class SarFileCompareItemController extends JeroController<SarFileCompareI
|
||||
@ApiOperation(value="文档对比信息条款表-条款对比高亮", notes="文档对比信息条款表-条款对比高亮")
|
||||
@GetMapping(value = "/clauseComparison")
|
||||
@RequiresPermissions("documentComparison:edit")
|
||||
public Result<?> clauseComparison(@RequestParam(name="leftId",required=true) String leftId,
|
||||
@RequestParam(name="rightId",required=true) String rightId) {
|
||||
public Result<?> clauseComparison(@ApiParam("左侧id") @RequestParam(name="leftId",required=true) String leftId,
|
||||
@ApiParam("右侧id") @RequestParam(name="rightId",required=true) String rightId) {
|
||||
List<String> res = sarFileCompareItemService.clauseComparison(leftId,rightId);
|
||||
return Result.OK(res);
|
||||
}
|
||||
|
||||
+6
-5
@@ -11,6 +11,7 @@ import com.jero.modules.compare.entity.SarFileCompareMenu;
|
||||
import com.jero.modules.compare.service.ISarFileCompareMenuService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@@ -50,8 +51,8 @@ public class SarFileCompareMenuController extends JeroController<SarFileCompareM
|
||||
@ApiOperation(value="文档对比信息目录表-分页列表查询", notes="文档对比信息目录表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(SarFileCompareMenu sarFileCompareMenu,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
@ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<SarFileCompareMenu> queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareMenu, req.getParameterMap());
|
||||
Page<SarFileCompareMenu> page = new Page<SarFileCompareMenu>(pageNo, pageSize);
|
||||
@@ -109,7 +110,7 @@ public class SarFileCompareMenuController extends JeroController<SarFileCompareM
|
||||
@AutoLog(value = "文档对比信息目录表-通过id删除")
|
||||
@ApiOperation(value="文档对比信息目录表-通过id删除", notes="文档对比信息目录表-通过id删除")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||
public Result<?> delete(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
|
||||
sarFileCompareMenuService.deleteById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -123,7 +124,7 @@ public class SarFileCompareMenuController extends JeroController<SarFileCompareM
|
||||
@AutoLog(value = "文档对比信息目录表-批量删除")
|
||||
@ApiOperation(value="文档对比信息目录表-批量删除", notes="文档对比信息目录表-批量删除")
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
public Result<?> deleteBatch(@ApiParam("ids") @RequestParam(name="ids",required=true) String ids) {
|
||||
this.sarFileCompareMenuService.deleteByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
@@ -137,7 +138,7 @@ public class SarFileCompareMenuController extends JeroController<SarFileCompareM
|
||||
@AutoLog(value = "文档对比信息目录表-通过id查询")
|
||||
@ApiOperation(value="文档对比信息目录表-通过id查询", notes="文档对比信息目录表-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
public Result<?> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
|
||||
SarFileCompareMenu sarFileCompareMenu = sarFileCompareMenuService.queryById(id);
|
||||
if(sarFileCompareMenu==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
|
||||
+8
-7
@@ -12,6 +12,7 @@ import com.jero.modules.compare.entity.SarFileCompareResComment;
|
||||
import com.jero.modules.compare.service.ISarFileCompareResCommentService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -52,8 +53,8 @@ public class SarFileCompareResCommentController extends JeroController<SarFileCo
|
||||
@ApiOperation(value = "文档对比信息结果评论表-分页列表查询", notes = "文档对比信息结果评论表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(SarFileCompareResComment sarFileCompareResComment,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
@ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<SarFileCompareResComment> queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareResComment, req.getParameterMap());
|
||||
Page<SarFileCompareResComment> page = new Page<SarFileCompareResComment>(pageNo, pageSize);
|
||||
@@ -112,7 +113,7 @@ public class SarFileCompareResCommentController extends JeroController<SarFileCo
|
||||
@AutoLog(value = "文档对比信息结果评论表-通过id删除")
|
||||
@ApiOperation(value = "文档对比信息结果评论表-通过id删除", notes = "文档对比信息结果评论表-通过id删除")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
||||
public Result<?> delete(@ApiParam("id") @RequestParam(name = "id", required = true) String id) {
|
||||
sarFileCompareResCommentService.deleteById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
@@ -126,7 +127,7 @@ public class SarFileCompareResCommentController extends JeroController<SarFileCo
|
||||
@AutoLog(value = "文档对比信息结果评论表-批量删除")
|
||||
@ApiOperation(value = "文档对比信息结果评论表-批量删除", notes = "文档对比信息结果评论表-批量删除")
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||
public Result<?> deleteBatch(@ApiParam("ids") @RequestParam(name = "ids", required = true) String ids) {
|
||||
this.sarFileCompareResCommentService.deleteByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
@@ -140,7 +141,7 @@ public class SarFileCompareResCommentController extends JeroController<SarFileCo
|
||||
@AutoLog(value = "文档对比信息结果评论表-通过id查询")
|
||||
@ApiOperation(value = "文档对比信息结果评论表-通过id查询", notes = "文档对比信息结果评论表-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
public Result<?> queryById(@ApiParam("id") @RequestParam(name = "id", required = true) String id) {
|
||||
SarFileCompareResComment sarFileCompareResComment = sarFileCompareResCommentService.queryById(id);
|
||||
if (sarFileCompareResComment == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
@@ -180,8 +181,8 @@ public class SarFileCompareResCommentController extends JeroController<SarFileCo
|
||||
@AutoLog(value = "文档对比信息结果评论表-根据infoId查询列表")
|
||||
@ApiOperation(value = "文档对比信息结果评论表-根据infoId查询列表", notes = "文档对比信息结果评论表-根据infoId查询列表")
|
||||
@GetMapping(value = "/queryListByInfoId")
|
||||
public Result<List<SarFileCompareResComVO>> queryListByInfoId(@RequestParam(name = "id", required = true) String id,
|
||||
@RequestParam(name = "str", required = false) String str) {
|
||||
public Result<List<SarFileCompareResComVO>> queryListByInfoId(@ApiParam("id") @RequestParam(name = "id", required = true) String id,
|
||||
@ApiParam("字符") @RequestParam(name = "str", required = false) String str) {
|
||||
List<SarFileCompareResComVO> list = sarFileCompareResCommentService.queryListByInfoId(id, str);
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
+46
@@ -1,20 +1,66 @@
|
||||
package com.jero.modules.compare.entity;
|
||||
|
||||
import io.swagger.annotations.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class SarFileCompareDetailVO {
|
||||
|
||||
/**
|
||||
* InfoId
|
||||
*/
|
||||
@ApiModelProperty("InfoId")
|
||||
private String InfoId;
|
||||
/**
|
||||
* 左侧标准号
|
||||
*/
|
||||
@ApiModelProperty("左侧标准号")
|
||||
private String serialNumberLeft;
|
||||
/**
|
||||
* 左侧文件名
|
||||
*/
|
||||
@ApiModelProperty("左侧文件名")
|
||||
private String fileNameLeft;
|
||||
/**
|
||||
* 右侧标准号
|
||||
*/
|
||||
@ApiModelProperty("右侧标准号")
|
||||
private String serialNumberRight;
|
||||
/**
|
||||
* 右侧文件名
|
||||
*/
|
||||
@ApiModelProperty("右侧文件名")
|
||||
private String fileNameRight;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
/**
|
||||
* 评论
|
||||
*/
|
||||
@ApiModelProperty("评论")
|
||||
private String comments;
|
||||
/**
|
||||
* 左侧菜单
|
||||
*/
|
||||
@ApiModelProperty("左侧菜单")
|
||||
private List<SarFileCompareMenuVo> menuLeft;
|
||||
/**
|
||||
* 左侧文本
|
||||
*/
|
||||
@ApiModelProperty("左侧文本")
|
||||
private List<SarFileCompareItem> textLeft;
|
||||
/**
|
||||
* 右侧菜单
|
||||
*/
|
||||
@ApiModelProperty("右侧菜单")
|
||||
private List<SarFileCompareMenuVo> menuRight;
|
||||
/**
|
||||
* 右侧文本
|
||||
*/
|
||||
@ApiModelProperty("右侧文本")
|
||||
private List<SarFileCompareItem> textRight;
|
||||
|
||||
public String getInfoId() {
|
||||
|
||||
+18
@@ -1,10 +1,28 @@
|
||||
package com.jero.modules.compare.entity;
|
||||
|
||||
import io.swagger.annotations.*;
|
||||
|
||||
public class SarFileCompareExcelMergeCell {
|
||||
|
||||
/**
|
||||
* 左边的起始行
|
||||
*/
|
||||
@ApiModelProperty("左边的起始行")
|
||||
Integer leftStart;
|
||||
/**
|
||||
* 左边的结束行
|
||||
*/
|
||||
@ApiModelProperty("左边的结束行")
|
||||
Integer leftEnd;
|
||||
/**
|
||||
* 右边的起始行
|
||||
*/
|
||||
@ApiModelProperty("右边的起始行")
|
||||
Integer rightStart;
|
||||
/**
|
||||
* 右边的结束行
|
||||
*/
|
||||
@ApiModelProperty("右边的结束行")
|
||||
Integer rightEnd;
|
||||
|
||||
public Integer getLeftStart() {
|
||||
|
||||
+34
@@ -1,16 +1,50 @@
|
||||
package com.jero.modules.compare.entity;
|
||||
|
||||
import io.swagger.annotations.*;
|
||||
|
||||
/**
|
||||
* 对比条目评论信息展示
|
||||
*/
|
||||
public class SarFileCompareItemComVO {
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@ApiModelProperty("id")
|
||||
private String id;
|
||||
/**
|
||||
* 左侧文件名称
|
||||
*/
|
||||
@ApiModelProperty("左侧文件名称")
|
||||
private String itemsNameLeft;
|
||||
/**
|
||||
* 左侧文件数量
|
||||
*/
|
||||
@ApiModelProperty("左侧文件数量")
|
||||
private String itemsNumLeft;
|
||||
/**
|
||||
* 左侧文件内容
|
||||
*/
|
||||
@ApiModelProperty("左侧文件内容")
|
||||
private String itemsTextLeft;
|
||||
/**
|
||||
* 右侧文件名称
|
||||
*/
|
||||
@ApiModelProperty("右侧文件名称")
|
||||
private String itemsNameRight;
|
||||
/**
|
||||
* 右侧文件数量
|
||||
*/
|
||||
@ApiModelProperty("右侧文件数量")
|
||||
private String itemsNumRight;
|
||||
/**
|
||||
* 右侧文件内容
|
||||
*/
|
||||
@ApiModelProperty("右侧文件内容")
|
||||
private String itemsTextRight;
|
||||
/**
|
||||
* 评论
|
||||
*/
|
||||
@ApiModelProperty("评论")
|
||||
private String comment;
|
||||
|
||||
public SarFileCompareItemComVO() {
|
||||
|
||||
@@ -1,14 +1,27 @@
|
||||
package com.jero.modules.compare.entity;
|
||||
|
||||
import com.jero.modules.system.util.MyStringUtils;
|
||||
import io.swagger.annotations.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class SarFileCompareMenuVo extends SarFileCompareMenu {
|
||||
/**
|
||||
* 键
|
||||
*/
|
||||
@ApiModelProperty("键")
|
||||
private String key;
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
@ApiModelProperty("标题")
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* 子集
|
||||
*/
|
||||
@ApiModelProperty("子集")
|
||||
private List<SarFileCompareMenuVo> children;
|
||||
|
||||
public SarFileCompareMenuVo(SarFileCompareMenu menu) {
|
||||
|
||||
+22
@@ -1,13 +1,35 @@
|
||||
package com.jero.modules.compare.entity;
|
||||
|
||||
import io.swagger.annotations.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class SarFileCompareResComVO {
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@ApiModelProperty("id")
|
||||
private String id;
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
@ApiModelProperty("名称")
|
||||
private String name;
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty("创建时间")
|
||||
private String createTime;
|
||||
/**
|
||||
* 内容
|
||||
*/
|
||||
@ApiModelProperty("内容")
|
||||
private String content;
|
||||
/**
|
||||
* 子集
|
||||
*/
|
||||
@ApiModelProperty("子集")
|
||||
private List<SarFileCompareResComVO> resComVoList;
|
||||
|
||||
public String getId() {
|
||||
|
||||
+38
@@ -1,18 +1,56 @@
|
||||
package com.jero.modules.compare.entity;
|
||||
|
||||
import io.swagger.annotations.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class SarFileCompareResultVO {
|
||||
|
||||
/**
|
||||
* infoId
|
||||
*/
|
||||
@ApiModelProperty("infoId")
|
||||
private String infoId;
|
||||
/**
|
||||
* 左侧标准号
|
||||
*/
|
||||
@ApiModelProperty("左侧标准号")
|
||||
private String serialNumberLeft;
|
||||
/**
|
||||
* 左侧文件名
|
||||
*/
|
||||
@ApiModelProperty("左侧文件名")
|
||||
private String fileNameLeft;
|
||||
/**
|
||||
* 左侧文件id
|
||||
*/
|
||||
@ApiModelProperty("左侧文件id")
|
||||
private String fileIdLeft;
|
||||
/**
|
||||
* 右侧标准号
|
||||
*/
|
||||
@ApiModelProperty("右侧标准号")
|
||||
private String serialNumberRight;
|
||||
/**
|
||||
* 右侧文件名
|
||||
*/
|
||||
@ApiModelProperty("右侧文件名")
|
||||
private String fileNameRight;
|
||||
/**
|
||||
* 右侧文件id
|
||||
*/
|
||||
@ApiModelProperty("右侧文件id")
|
||||
private String fileIdRight;
|
||||
/**
|
||||
* 对比条目评论信息
|
||||
*/
|
||||
@ApiModelProperty("对比条目评论信息")
|
||||
private List<SarFileCompareItemComVO> resList;
|
||||
/**
|
||||
* 评论
|
||||
*/
|
||||
@ApiModelProperty("评论")
|
||||
private String comments;
|
||||
|
||||
public SarFileCompareResultVO() {
|
||||
|
||||
Reference in New Issue
Block a user