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

docs: 完善文档注释

Browse Source
This commit is contained in:
yjz
2023-11-20 17:39:05 +08:00
parent 23024322e8
commit 8fc59ef979
40 changed files with 932 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/EsInspectPlanFlowController.java
+3 -17
View File
@@ -6,18 +6,16 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.common.util.MessageUtils;
import com.jero.common.util.SnowflakeUtils;
import com.jero.modules.activiti.entity.ProcessNode;
import com.jero.modules.activiti.process.esinspectplan.service.IEsInspectPlanFlowService;
import com.jero.modules.activiti.process.esinspectplan.vo.EsInspectPlanFlowVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @ClassName: 企标稽查计划流程
* @Description:
@@ -47,18 +45,6 @@ public class EsInspectPlanFlowController {
return String.valueOf(SnowflakeUtils.snowflake());
}
/**
* 企标稽查计划流程-人员信息
* @return 项目id
*/
@AutoLog(value = "企标稽查计划流程-人员信息")
@ApiOperation(value="企标稽查计划流程-人员信息", notes="企标稽查计划流程-人员信息")
@GetMapping(value = "/queryPersonInfo")
@Translation
public Result<List<ProcessNode>> queryPersonInfo(String processDefinitionName, String processInstanceId) {
return Result.OK(esInspectPlanFlowService.queryPersonInfo(processDefinitionName, processInstanceId));
}
/**
* 企标稽查计划流程-流程发起
* @param esInspectPlanFlowVO 企标稽查计划流程VO对象
@@ -95,7 +81,7 @@ public class EsInspectPlanFlowController {
@ApiOperation(value="企标稽查计划流程-办理详情", notes="企标稽查计划流程-办理详情")
@GetMapping(value = "/queryDetailByProjectId")
@Translation
public Result<EsInspectPlanFlowVO> queryDetailByProjectId(String projectId, String taskId) {
public Result<EsInspectPlanFlowVO> queryDetailByProjectId(@ApiParam("项目id") String projectId, @ApiParam("任务id") String taskId) {
return Result.OK(esInspectPlanFlowService.queryDetailByProjectId(projectId, taskId));
}
@@ -119,7 +105,7 @@ public class EsInspectPlanFlowController {
@AutoLog(value = "企标稽查计划流程-流程转办")
@ApiOperation(value="企标稽查计划流程-流程转办", notes="企标稽查计划流程-流程转办")
@GetMapping(value = "/flowTransfer")
public Result<T> flowTransfer(@RequestBody String taskId, String userId) {
public Result<T> flowTransfer(@ApiParam("任务id") String taskId, @ApiParam("用户id") String userId) {
esInspectPlanFlowService.flowTransfer(taskId, userId);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanController.java
+12 -10
View File
@@ -8,8 +8,11 @@ import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan;
import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanService;
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.poi.ss.formula.functions.T;
@@ -22,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@@ -51,8 +53,8 @@ public class ProcessEsInspectPlanController extends JeroController<ProcessEsInsp
@ApiOperation(value="企标稽查计划业务表-分页列表查询", notes="企标稽查计划业务表-分页列表查询")
@GetMapping(value = "/page")
public Result<IPage<ProcessEsInspectPlan>> queryPageList(ProcessEsInspectPlan processEsInspectPlan,
@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) {
IPage<ProcessEsInspectPlan> pageList = processEsInspectPlanService.queryPage(processEsInspectPlan, pageNo, pageSize);
return Result.OK(pageList);
}
@@ -108,11 +110,11 @@ public class ProcessEsInspectPlanController extends JeroController<ProcessEsInsp
@AutoLog(value = "企标稽查计划业务表-通过id删除")
@ApiOperation(value="企标稽查计划业务表-通过id删除", notes="企标稽查计划业务表-通过id删除")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
public Result<T> delete(@RequestBody IdMapBody map) {
if (StringUtils.isNotBlank(map.getId())){
return Result.error("请选择数据!");
}
processEsInspectPlanService.deleteById(map.get("id"));
processEsInspectPlanService.deleteById(map.getId());
return Result.OK("删除成功!");
}
@@ -125,11 +127,11 @@ public class ProcessEsInspectPlanController extends JeroController<ProcessEsInsp
@AutoLog(value = "企标稽查计划业务表-批量删除")
@ApiOperation(value="企标稽查计划业务表-批量删除", notes="企标稽查计划业务表-批量删除")
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
public Result<T> deleteBatch(@RequestBody IdsMapBody map) {
if (StringUtils.isNotBlank(map.getIds())){
return Result.error("请选择数据!");
}
this.processEsInspectPlanService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
this.processEsInspectPlanService.deleteByIds(Arrays.asList(map.getIds().split(",")));
return Result.OK("批量删除成功!");
}
@@ -142,7 +144,7 @@ public class ProcessEsInspectPlanController extends JeroController<ProcessEsInsp
@AutoLog(value = "企标稽查计划业务表-通过id查询")
@ApiOperation(value="企标稽查计划业务表-通过id查询", notes="企标稽查计划业务表-通过id查询")
@GetMapping(value = "/queryById")
public Result<ProcessEsInspectPlan> queryById(@RequestParam(name="id",required=true) String id) {
public Result<ProcessEsInspectPlan> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
ProcessEsInspectPlan processEsInspectPlan = processEsInspectPlanService.queryById(id);
if(processEsInspectPlan==null) {
return Result.error("未找到对应数据");
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java
+12 -10
View File
@@ -8,8 +8,11 @@ import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion;
import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanOpinionService;
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.poi.ss.formula.functions.T;
@@ -22,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@@ -52,8 +54,8 @@ public class ProcessEsInspectPlanOpinionController extends JeroController<Proces
@ApiOperation(value="企标稽查计划业务_意见表-分页列表查询", notes="企标稽查计划业务_意见表-分页列表查询")
@GetMapping(value = "/page")
public Result<IPage<ProcessEsInspectPlanOpinion>> queryPageList(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion,
@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) {
IPage<ProcessEsInspectPlanOpinion> pageList = processEsInspectPlanOpinionService.queryPage(processEsInspectPlanOpinion, pageNo, pageSize);
return Result.OK(pageList);
}
@@ -124,11 +126,11 @@ public class ProcessEsInspectPlanOpinionController extends JeroController<Proces
@AutoLog(value = "企标稽查计划业务_意见表-通过id删除")
@ApiOperation(value="企标稽查计划业务_意见表-通过id删除", notes="企标稽查计划业务_意见表-通过id删除")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
public Result<T> delete(@RequestBody IdMapBody map) {
if (StringUtils.isNotBlank(map.getId())){
return Result.error("请选择数据!");
}
processEsInspectPlanOpinionService.deleteById(map.get("id"));
processEsInspectPlanOpinionService.deleteById(map.getId());
return Result.OK("删除成功!");
}
@@ -141,11 +143,11 @@ public class ProcessEsInspectPlanOpinionController extends JeroController<Proces
@AutoLog(value = "企标稽查计划业务_意见表-批量删除")
@ApiOperation(value="企标稽查计划业务_意见表-批量删除", notes="企标稽查计划业务_意见表-批量删除")
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
public Result<T> deleteBatch(@RequestBody IdsMapBody map) {
if (StringUtils.isNotBlank(map.getIds())){
return Result.error("请选择数据!");
}
this.processEsInspectPlanOpinionService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
this.processEsInspectPlanOpinionService.deleteByIds(Arrays.asList(map.getIds().split(",")));
return Result.OK("批量删除成功!");
}
@@ -158,7 +160,7 @@ public class ProcessEsInspectPlanOpinionController extends JeroController<Proces
@AutoLog(value = "企标稽查计划业务_意见表-通过id查询")
@ApiOperation(value="企标稽查计划业务_意见表-通过id查询", notes="企标稽查计划业务_意见表-通过id查询")
@GetMapping(value = "/queryById")
public Result<ProcessEsInspectPlanOpinion> queryById(@RequestParam(name="id",required=true) String id) {
public Result<ProcessEsInspectPlanOpinion> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
ProcessEsInspectPlanOpinion processEsInspectPlanOpinion = processEsInspectPlanOpinionService.queryById(id);
if(processEsInspectPlanOpinion==null) {
return Result.error("未找到对应数据");
laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
+16 -13
View File
@@ -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);
}
laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java
+17 -15
View File
@@ -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);
}
laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java
+8 -7
View File
@@ -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);
}
laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareMenuController.java
+6 -5
View File
@@ -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("未找到对应数据");
laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java
+8 -7
View File
@@ -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);
}
laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareDetailVO.java
+46
View File
@@ -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() {
laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareExcelMergeCell.java
+18
View File
@@ -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() {
laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareItemComVO.java
+34
View File
@@ -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() {
laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java
+13
View File
@@ -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) {
laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComVO.java
+22
View File
@@ -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() {
laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResultVO.java
+38
View File
@@ -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() {
laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java
+24 -21
View File
@@ -3,10 +3,10 @@ package com.jero.modules.laws.customcompare.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.aspect.annotation.Translation;
import com.jero.common.util.MessageUtils;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.customcompare.entity.LawsCustomCompareCell;
import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfo;
import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInventory;
@@ -17,9 +17,12 @@ import com.jero.modules.laws.customcompare.vo.LawsCustomCompareInfoVO;
import com.jero.modules.laws.customcompare.vo.StandardSaveVO;
import com.jero.modules.laws.customcompare.vo.StandardVO;
import com.jero.modules.laws.customcompare.vo.TableDetailVO;
import com.jero.modules.system.vo.IdMapBody;
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.poi.ss.formula.functions.T;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.context.annotation.Lazy;
@@ -63,8 +66,8 @@ public class LawsCustomCompareInfoController {
@GetMapping(value = "/queryByPage")
@RequiresPermissions("customComparison:search")
public Result<IPage<LawsCustomCompareInfoVO>> queryByPage(LawsCustomCompareInfoVO lawsCustomCompareInfoVO,
@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) {
return Result.OK(lawsCustomCompareInfoService.queryByPage(lawsCustomCompareInfoVO, pageNo, pageSize));
}
@@ -77,8 +80,8 @@ public class LawsCustomCompareInfoController {
@GetMapping(value = "/queryStandard")
@RequiresPermissions("customComparison:search")
public Result<IPage<StandardVO>> queryStandard(StandardVO standardVO,
@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) {
return Result.OK(lawsCustomCompareInfoService.queryStandard(standardVO, pageNo, pageSize));
}
@@ -102,7 +105,7 @@ public class LawsCustomCompareInfoController {
@ApiOperation(value="自定义对比-删除标准列表", notes="自定义对比-删除标准列表")
@GetMapping(value = "/delStandard")
@RequiresPermissions("customComparison:edit")
public Result<T> delStandard(String infoId, String standardId) {
public Result<T> delStandard(@ApiParam("自定义对比id") String infoId, @ApiParam("标准id") String standardId) {
lawsCustomCompareInfoService.delStandard(infoId, standardId);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
@@ -115,9 +118,9 @@ public class LawsCustomCompareInfoController {
@ApiOperation(value="自定义对比-标准列表分页查询", notes="自定义对比-标准列表分页查询")
@GetMapping(value = "/queryStandardByInfoId")
@RequiresPermissions("customComparison:search")
public Result<IPage<StandardVO>> queryStandardList(String infoId,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
public Result<IPage<StandardVO>> queryStandardList(@ApiParam("自定义对比id") String infoId,
@ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
return Result.OK(lawsCustomCompareInfoService.queryStandardByInfoId(infoId, pageNo, pageSize));
}
@@ -129,7 +132,7 @@ public class LawsCustomCompareInfoController {
@ApiOperation(value="自定义对比-表格详情", notes="自定义对比-表格详情")
@GetMapping(value = "/queryTableDetail")
@RequiresPermissions("customComparison:search")
public Result<TableDetailVO> queryTableDetail(String infoId) {
public Result<TableDetailVO> queryTableDetail(@ApiParam("自定义对比id") String infoId) {
return Result.OK(lawsCustomCompareInfoService.queryTableDetail(infoId));
}
@@ -141,7 +144,7 @@ public class LawsCustomCompareInfoController {
@ApiOperation(value="自定义对比-清单维护列表查询", notes="自定义对比-清单维护列表查询")
@GetMapping(value = "/queryInventory")
@RequiresPermissions("customComparison:search")
public Result<Map<String, Object>> queryInventoryByInfoId(String infoId) {
public Result<Map<String, Object>> queryInventoryByInfoId(@ApiParam("自定义对比id") String infoId) {
return Result.OK(lawsCustomCompareInfoService.queryInventory(infoId));
}
@@ -153,7 +156,7 @@ public class LawsCustomCompareInfoController {
@ApiOperation(value="自定义对比-清单维护编辑", notes="自定义对比-清单维护编辑")
@PostMapping(value = "/editInventory")
@RequiresPermissions("customComparison:edit")
public Result<T> editInventory(@RequestBody Map<String, Object> map) {
public Result<T> editInventory(@ApiParam("清单维护数据")@RequestBody Map<String, Object> map) {
lawsCustomCompareInfoService.editInventory(map);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
@@ -207,7 +210,7 @@ public class LawsCustomCompareInfoController {
@GetMapping(value = "/queryById")
@Translation
@RequiresPermissions("customComparison:search")
public Result<LawsCustomCompareInfoVO> queryById(String id) {
public Result<LawsCustomCompareInfoVO> queryById(@ApiParam("id")String id) {
return Result.OK(lawsCustomCompareInfoService.queryById(id));
}
@@ -233,10 +236,10 @@ public class LawsCustomCompareInfoController {
@ApiOperation(value="自定义对比-根据id删除", notes="自定义对比-根据id删除")
@PostMapping(value = "/delById")
@RequiresPermissions("customComparison:delete")
public Result<T> delById(@RequestBody Map<String, Object> map) {
if (map.containsKey("id")){
lawsCustomCompareInfoService.delById((String) map.get("id"));
lawsCustomCompareInfoService.editCompareCreateTime((String) map.get("id"));
public Result<T> delById(@RequestBody IdMapBody map) {
if (StringUtils.isNotBlank(map.getId())){
lawsCustomCompareInfoService.delById(map.getId());
lawsCustomCompareInfoService.editCompareCreateTime(map.getId());
}
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
@@ -249,10 +252,10 @@ public class LawsCustomCompareInfoController {
@ApiOperation(value="自定义对比-根据id删除特点/对比项", notes="自定义对比-根据id删除特点/对比项")
@PostMapping(value = "/delInventoryById")
@RequiresPermissions("customComparison:edit")
public Result<T> delInventoryById(@RequestBody Map<String, Object> map) {
if (map.containsKey("id")){
lawsCustomCompareInventoryService.removeById((String) map.get("id"));
lawsCustomCompareInfoService.editCompareCreateTime((String) map.get("id"));
public Result<T> delInventoryById(@RequestBody IdMapBody map) {
if (StringUtils.isNotBlank(map.getId())){
lawsCustomCompareInventoryService.removeById(map.getId());
lawsCustomCompareInfoService.editCompareCreateTime(map.getId());
}
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
+14 -11
View File
@@ -13,9 +13,12 @@ import com.jero.modules.split.entity.SarFileSplitInfoEO;
import com.jero.modules.split.entity.SarFileSplitItemsValEO;
import com.jero.modules.split.entity.SarFileSplitMenuEO;
import com.jero.modules.split.service.ISarFileSplitInfoService;
import com.jero.modules.system.vo.IdMapBody;
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.poi.ss.formula.functions.T;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.context.annotation.Lazy;
@@ -89,7 +92,7 @@ public class DocumentSplitController {
@ApiOperation(value="文档拆分-查看", notes="文档拆分-查看")
@PostMapping(value = "/queryView")
@RequiresPermissions("split:sarFileSplitItems:page")
public Result<LawsDocumentSplitView> queryView(@RequestBody Map<String, Object> parameter) {
public Result<LawsDocumentSplitView> queryView(@RequestBody @ApiParam("标签管理") Map<String, Object> parameter) {
return Result.OK(documentSplitService.queryView(parameter));
}
@@ -101,7 +104,7 @@ public class DocumentSplitController {
@AutoLog(value = "文档拆分-通过文档拆分id查询目录树形结构")
@ApiOperation(value="文档拆分-通过文档拆分id查询目录树形结构", notes="文档拆分-通过文档拆分id查询目录树形结构")
@GetMapping(value = "/queryTreeMenuByInfoId")
public Result<List<SarFileSplitMenuEO>> queryTreeMenuByInfoId(String infoId) {
public Result<List<SarFileSplitMenuEO>> queryTreeMenuByInfoId(@ApiParam("文档拆分id") String infoId) {
return Result.OK(documentSplitService.queryTreeMenuByInfoId(infoId));
}
@@ -145,7 +148,7 @@ public class DocumentSplitController {
@ApiOperation(value="文档拆分-发布", notes="文档拆分-发布")
@PostMapping(value = "/publish")
@RequiresPermissions("split:sarFileSplitInfo:release")
public Result<T> publish(@RequestBody Map<String, Object> parameter) {
public Result<T> publish(@RequestBody @ApiParam("标签管理") Map<String, Object> parameter) {
documentSplitService.publish(parameter);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
@@ -160,7 +163,7 @@ public class DocumentSplitController {
@ApiOperation(value="文档拆分-撤回", notes="文档拆分-撤回")
@PostMapping(value = "/revocation")
@RequiresPermissions("split:sarFileSplitInfo:withdraw")
public Result<T> revocation(@RequestBody Map<String, Object> parameter) {
public Result<T> revocation(@RequestBody @ApiParam("标签管理") Map<String, Object> parameter) {
documentSplitService.revocation(parameter);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
@@ -174,9 +177,9 @@ public class DocumentSplitController {
@ApiOperation(value="文档拆分-通过id删除", notes="文档拆分-通过id删除")
@PostMapping(value = "/delete")
@RequiresPermissions("split:sarFileSplitInfo:delete")
public Result<T> delete(@RequestBody Map<String, Object> map) {
if (map.containsKey("id")) {
String id = (String) map.get("id");
public Result<T> delete(@RequestBody IdMapBody map) {
if (StringUtils.isNotBlank(map.getId())) {
String id = map.getId();
documentSplitService.checkOutOperation(Collections.singletonList(id));
sarFileSplitInfoService.deleteById(id);
}
@@ -211,7 +214,7 @@ public class DocumentSplitController {
@ApiOperation(value = "文档拆分详情-分页列表查询")
@PostMapping("/queryDocumentSplitDetail")
@RequiresPermissions("split:sarFileSplitItems:search")
public Result<IPage<Map<String,Object>>> queryDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
public Result<IPage<Map<String,Object>>> queryDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map<String, Object> parameter) {
try {
IPage<Map<String, Object>> data = documentSplitService.queryDocumentSplitDetail(parameter);
return Result.OK(data);
@@ -266,7 +269,7 @@ public class DocumentSplitController {
@ApiOperation(value = "文档拆分详情-编辑")
@PostMapping("/editDocumentSplitDetail")
@RequiresPermissions("split:sarFileSplitItems:update")
public Result<T> editDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
public Result<T> editDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map<String, Object> parameter) {
documentSplitService.editDocumentSplitDetail(parameter);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
@@ -280,7 +283,7 @@ public class DocumentSplitController {
@ApiOperation(value = "文档拆分详情-批量编辑")
@PostMapping("/editBatchDocumentSplitDetail")
@RequiresPermissions("split:sarFileSplitItems:batchDelete")
public Result<T> editBatchDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
public Result<T> editBatchDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map<String, Object> parameter) {
try {
documentSplitService.editBatchDocumentSplitDetail(parameter);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
@@ -326,7 +329,7 @@ public class DocumentSplitController {
@ApiOperation(value = "文档拆分详情-合并条款")
@PostMapping("/mergeDocumentSplitDetail")
@RequiresPermissions("split:sarFileSplitItems:merge")
public Result<T> mergeDocumentSplitDetail(@RequestBody Map<String, Object> parameter) {
public Result<T> mergeDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map<String, Object> parameter) {
documentSplitService.mergeDocumentSplitDetail(parameter);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java
+1
View File
@@ -58,6 +58,7 @@ public class DocumentSplitInfo extends BaseEntity {
/**拆分结果*/
@Excel(name = "拆分结果", width = 15)
@ApiModelProperty(value = "拆分结果")
private String splitResult;
/**文件id*/
laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java
+21
View File
@@ -1,6 +1,7 @@
package com.jero.modules.laws.documenttool.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.*;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,100 +21,120 @@ public class LawsDocumentSplit extends BaseEntity {
/**
* 条文号
*/
@ApiModelProperty("条文号")
private String itemNum;
/**
* 条文标题
*/
@ApiModelProperty("条文标题")
private String itemTitle;
/**
* 条文内容
*/
@ApiModelProperty("条文内容")
private String itemContent;
/**
* 展示顺序
*/
@ApiModelProperty("展示顺序")
private String sortNumber;
/**
* 拆分目录id
*/
@ApiModelProperty("拆分目录id")
private String menuId;
/**
* 技术领域
*/
@ApiModelProperty("技术领域")
private String technicalField;
/**
* 信息类别
*/
@ApiModelProperty("信息类别")
private String infoType;
/**
* 法规要求类型
*/
@ApiModelProperty("法规要求类型")
private String lawsRequireType;
/**
* 功能分类
*/
@ApiModelProperty("功能分类")
private String functionClassification;
/**
* 功能专业
*/
@ApiModelProperty("功能专业")
private String functionProfessional;
/**
* 功能分组编码
*/
@ApiModelProperty("功能分组编码")
private String functionGroupCode;
/**
* 功能分组名称
*/
@ApiModelProperty("功能分组名称")
private String functionGroupName;
/**
* 新认证实施时间
*/
@ApiModelProperty("新认证实施时间")
private String newCerImplementDate;
/**
* 已认证实施时间
*/
@ApiModelProperty("已认证实施时间")
private String cerImplementDate;
/**
* 新注册实施时间
*/
@ApiModelProperty("新注册实施时间")
private String newRegisterImplementDate;
/**
* 适用车型
*/
@ApiModelProperty("适用车型")
private String applications;
/**
* 动力类型
*/
@ApiModelProperty("动力类型")
private String dynamicType;
/**
* 适用零部件
*/
@ApiModelProperty("适用零部件")
private String applicableComponents;
/**
* 条文解读
*/
@ApiModelProperty("条文解读")
private String interpretationArticles;
/**
* 拆分信息记录id
*/
@ApiModelProperty("拆分信息记录id")
private String infoId;
}
laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SarFileSplitItemsVal.java
+14
View File
@@ -1,5 +1,6 @@
package com.jero.modules.laws.documenttool.entity;
import io.swagger.annotations.*;
import lombok.Data;
import java.util.Date;
@@ -17,54 +18,67 @@ public class SarFileSplitItemsVal implements Serializable {
/**
* 主键
*/
@ApiModelProperty("主键")
private String id;
/**
* 所属部门
*/
@ApiModelProperty("所属部门")
private String sysOrgCode;
/**
* 条款id
*/
@ApiModelProperty("条款id")
private String itemId;
/**
* 类型
*/
@ApiModelProperty("类型")
private String type;
/**
* 条目内容
*/
@ApiModelProperty("条目内容")
private String itemContent;
/**
* 排序
*/
@ApiModelProperty("排序")
private Integer displaySeq;
/**
* 是否有效
*/
@ApiModelProperty("是否有效")
private Integer validFlag;
/**
* 图片
*/
@ApiModelProperty("图片")
private String imgName;
/**
* 用于前端数组排序
*/
@ApiModelProperty("用于前端数组排序")
private Integer indexItem;
/**
* 创建日期
*/
@ApiModelProperty("创建日期")
private Date creationTime;
/**
* 更新人
*/
@ApiModelProperty("更新人")
private String modifyUser;
/**
* 更新日期
*/
@ApiModelProperty("更新日期")
private Date modifyTime;
/**
* 创建人
*/
@ApiModelProperty("创建人")
private String creationUser;
}
laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SarFileSplitMenu.java
+13
View File
@@ -1,5 +1,6 @@
package com.jero.modules.laws.documenttool.entity;
import io.swagger.annotations.*;
import lombok.Data;
import java.util.Date;
@@ -17,50 +18,62 @@ public class SarFileSplitMenu implements Serializable {
/**
* 主键
*/
@ApiModelProperty("主键")
private String id;
/**
* 所属部门
*/
@ApiModelProperty("所属部门")
private String sysOrgCode;
/**
* 信息记录表id
*/
@ApiModelProperty("信息记录表id")
private String infoId;
/**
* 目录名称
*/
@ApiModelProperty("目录名称")
private String name;
/**
* 父节点id
*/
@ApiModelProperty("父节点id")
private String parentId;
/**
* 排序序号
*/
@ApiModelProperty("排序序号")
private Integer displaySeq;
/**
* 是否有效
*/
@ApiModelProperty("是否有效")
private Integer validFlag;
/**
* 备注
*/
@ApiModelProperty("备注")
private String remarks;
/**
* 条款名称
*/
@ApiModelProperty("条款名称")
private String itemName;
/**
* 创建人
*/
@ApiModelProperty("创建人")
private String creationUser;
/**
* 创建日期
*/
@ApiModelProperty("创建日期")
private Date creationTime;
/**
* 更新人
*/
@ApiModelProperty("更新人")
private String modifyUser;
/**
* 更新日期
laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java
+7
View File
@@ -19,25 +19,32 @@ import java.util.Date;
@Data
public class SplitFileInfo {
@Excel(name = "id")
@ApiModelProperty(value = "id")
private String id;
@Excel(name = "文件名称")
@ApiModelProperty(value = "文件名称")
private String fileName;
@Excel(name = "文件地址")
@ApiModelProperty(value = "文件地址")
private String url;
@Excel(name = "标准文件类型")
@Dict(dicCode = "process_manuscript")
@ApiModelProperty(value = "标准文件类型")
private String standardFileType;
@ApiModelProperty(value = "标准id")
@Excel(name = "标准id")
private String standardId;
@ApiModelProperty(value = "标准编号")
@Excel(name = "标准编号")
private String standardNo;
@ApiModelProperty(value = "创建人")
@Excel(name = "创建人")
private String createBy;
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java
+12 -11
View File
@@ -1,16 +1,18 @@
package com.jero.modules.laws.standardization.controller;
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.aspect.annotation.Translation;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.common.api.vo.ResultCommon;
import com.jero.modules.laws.standardization.entity.*;
import com.jero.modules.laws.standardization.service.ILawsStandardizationService;
import com.jero.modules.laws.standardization.vo.StandardizationVO;
import com.jero.modules.system.vo.IdMapBody;
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.poi.ss.formula.functions.T;
@@ -19,7 +21,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
@@ -99,7 +100,7 @@ public class LawsStandardizationController extends JeroController<LawsStandardiz
@AutoLog(value = "标准化活动-通过id查询")
@ApiOperation(value="标准化活动-通过id查询", notes="标准化活动-通过id查询")
@GetMapping(value = "/queryById")
public Result<LawsStandardization> queryById(@RequestParam(name="id",required=true) String id) {
public Result<LawsStandardization> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
return Result.OK(lawsStandardizationService.queryById(id));
}
@@ -112,7 +113,7 @@ public class LawsStandardizationController extends JeroController<LawsStandardiz
@AutoLog(value = "标准化活动-会议统计-联络人联系方式")
@ApiOperation(value="标准化活动-会议统计-联络人联系方式", notes="标准化活动-会议统计-联络人联系方式")
@GetMapping(value = "/queryLiaisonByStandardizationId")
public Result<List<LawsStandardizationLiaison>> queryLiaisonByStandardizationId(@RequestParam(name="id",required=true) String standardizationId) {
public Result<List<LawsStandardizationLiaison>> queryLiaisonByStandardizationId(@ApiParam("标准化活动id") @RequestParam(name="id",required=true) String standardizationId) {
return Result.OK(lawsStandardizationService.queryLiaisonByStandardizationId(standardizationId));
}
@@ -125,7 +126,7 @@ public class LawsStandardizationController extends JeroController<LawsStandardiz
@AutoLog(value = "标准化活动-会议统计-集团参与情况")
@ApiOperation(value="标准化活动-会议统计-集团参与情况", notes="标准化活动-会议统计-集团参与情况")
@GetMapping(value = "/queryGroupByStandardizationId")
public Result<List<LawsStandardizationGroup>> queryGroupByStandardizationId(@RequestParam(name="id",required=true) String standardizationId) {
public Result<List<LawsStandardizationGroup>> queryGroupByStandardizationId(@ApiParam("标准化活动id") @RequestParam(name="id",required=true) String standardizationId) {
return Result.OK(lawsStandardizationService.queryGroupByStandardizationId(standardizationId));
}
@@ -139,7 +140,7 @@ public class LawsStandardizationController extends JeroController<LawsStandardiz
@ApiOperation(value="标准化活动-会议统计-支付信息", notes="标准化活动-会议统计-支付信息")
@GetMapping(value = "/queryPaymentByStandardizationId")
@Translation
public Result<List<LawsStandardizationPayment>> queryPaymentByStandardizationId(@RequestParam(name="id",required=true) String standardizationId) {
public Result<List<LawsStandardizationPayment>> queryPaymentByStandardizationId(@ApiParam("标准化活动id") @RequestParam(name="id",required=true) String standardizationId) {
return Result.OK(lawsStandardizationService.queryPaymentByStandardizationId(standardizationId));
}
@@ -152,7 +153,7 @@ public class LawsStandardizationController extends JeroController<LawsStandardiz
@AutoLog(value = "标准化活动-会议统计-参会记录")
@ApiOperation(value="标准化活动-会议统计-参会记录", notes="标准化活动-会议统计-参会记录")
@GetMapping(value = "/queryMeetingByStandardizationId")
public Result<List<LawsStandardizationMeeting>> queryMeetingByStandardizationId(@RequestParam(name="id",required=true) String standardizationId) {
public Result<List<LawsStandardizationMeeting>> queryMeetingByStandardizationId(@ApiParam("标准化活动id") @RequestParam(name="id",required=true) String standardizationId) {
return Result.OK(lawsStandardizationService.queryMeetingByStandardizationId(standardizationId));
}
@@ -164,7 +165,7 @@ public class LawsStandardizationController extends JeroController<LawsStandardiz
@ApiOperation(value="标准化活动-详情通过id查询", notes="标准化活动-详情通过id查询")
@GetMapping(value = "/queryDetailById")
@Translation
public Result<StandardizationVO> queryDetailById(String id) {
public Result<StandardizationVO> queryDetailById(@ApiParam("id") String id) {
return Result.OK(lawsStandardizationService.queryDetailById(id));
}
@@ -177,11 +178,11 @@ public class LawsStandardizationController extends JeroController<LawsStandardiz
@AutoLog(value = "标准化活动-通过id删除")
@ApiOperation(value="标准化活动-通过id删除", notes="标准化活动-通过id删除")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
public Result<T> delete(@RequestBody IdMapBody map) {
if (StringUtils.isBlank(map.getId())){
return Result.error("请选择数据!");
}
lawsStandardizationService.delete(map.get("id"));
lawsStandardizationService.delete(map.getId());
return Result.OK("删除成功!");
}
}
laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationGroupController.java
+12 -10
View File
@@ -6,8 +6,11 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.laws.standardization.entity.LawsStandardizationGroup;
import com.jero.modules.laws.standardization.service.ILawsStandardizationGroupService;
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.poi.ss.formula.functions.T;
@@ -20,7 +23,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@@ -50,8 +52,8 @@ public class LawsStandardizationGroupController extends JeroController<LawsStand
@ApiOperation(value="标准化-集团参与情况-分页列表查询", notes="标准化-集团参与情况-分页列表查询")
@GetMapping(value = "/page")
public Result<IPage<LawsStandardizationGroup>> queryPageList(LawsStandardizationGroup lawsStandardizationGroup,
@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) {
IPage<LawsStandardizationGroup> pageList = lawsStandardizationGroupService.queryPage(lawsStandardizationGroup, pageNo, pageSize, req);
return Result.OK(pageList);
@@ -109,11 +111,11 @@ public class LawsStandardizationGroupController extends JeroController<LawsStand
@AutoLog(value = "标准化-集团参与情况-通过id删除")
@ApiOperation(value="标准化-集团参与情况-通过id删除", notes="标准化-集团参与情况-通过id删除")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
public Result<T> delete(@RequestBody IdMapBody map) {
if (StringUtils.isBlank(map.getId())){
return Result.error("请选择数据!");
}
lawsStandardizationGroupService.deleteById(map.get("id"));
lawsStandardizationGroupService.deleteById(map.getId());
return Result.OK("删除成功!");
}
@@ -126,11 +128,11 @@ public class LawsStandardizationGroupController extends JeroController<LawsStand
@AutoLog(value = "标准化-集团参与情况-批量删除")
@ApiOperation(value="标准化-集团参与情况-批量删除", notes="标准化-集团参与情况-批量删除")
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
public Result<T> deleteBatch(@RequestBody IdsMapBody map) {
if (StringUtils.isBlank(map.getIds())){
return Result.error("请选择数据!");
}
this.lawsStandardizationGroupService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
this.lawsStandardizationGroupService.deleteByIds(Arrays.asList(map.getIds().split(",")));
return Result.OK("批量删除成功!");
}
@@ -143,7 +145,7 @@ public class LawsStandardizationGroupController extends JeroController<LawsStand
@AutoLog(value = "标准化-集团参与情况-通过id查询")
@ApiOperation(value="标准化-集团参与情况-通过id查询", notes="标准化-集团参与情况-通过id查询")
@GetMapping(value = "/queryById")
public Result<LawsStandardizationGroup> queryById(@RequestParam(name="id",required=true) String id) {
public Result<LawsStandardizationGroup> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
LawsStandardizationGroup lawsStandardizationGroup = lawsStandardizationGroupService.queryById(id);
if(lawsStandardizationGroup==null) {
return Result.error("未找到对应数据");
laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationLiaisonController.java
+14 -12
View File
@@ -6,8 +6,11 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.laws.standardization.entity.LawsStandardizationLiaison;
import com.jero.modules.laws.standardization.service.ILawsStandardizationLiaisonService;
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.poi.ss.formula.functions.T;
@@ -20,7 +23,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@@ -50,8 +52,8 @@ public class LawsStandardizationLiaisonController extends JeroController<LawsSta
@ApiOperation(value="标准化-联络人-分页列表查询", notes="标准化-联络人-分页列表查询")
@GetMapping(value = "/page")
public Result<IPage<LawsStandardizationLiaison>> queryPageList(LawsStandardizationLiaison lawsStandardizationLiaison,
@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) {
IPage<LawsStandardizationLiaison> pageList = lawsStandardizationLiaisonService.queryPage(lawsStandardizationLiaison, pageNo, pageSize, req);
return Result.OK(pageList);
@@ -109,11 +111,11 @@ public class LawsStandardizationLiaisonController extends JeroController<LawsSta
@AutoLog(value = "标准化-联络人-通过id删除")
@ApiOperation(value="标准化-联络人-通过id删除", notes="标准化-联络人-通过id删除")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
return Result.error("请选择数据!");
}
lawsStandardizationLiaisonService.deleteById(map.get("id"));
public Result<T> delete(@RequestBody IdMapBody map) {
if (StringUtils.isBlank(map.getId())){
return Result.error("请选择数据!");
}
lawsStandardizationLiaisonService.deleteById(map.getId());
return Result.OK("删除成功!");
}
@@ -126,11 +128,11 @@ public class LawsStandardizationLiaisonController extends JeroController<LawsSta
@AutoLog(value = "标准化-联络人-批量删除")
@ApiOperation(value="标准化-联络人-批量删除", notes="标准化-联络人-批量删除")
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
public Result<T> deleteBatch(@RequestBody IdsMapBody map) {
if (StringUtils.isBlank(map.getIds())){
return Result.error("请选择数据!");
}
this.lawsStandardizationLiaisonService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
this.lawsStandardizationLiaisonService.deleteByIds(Arrays.asList(map.getIds().split(",")));
return Result.OK("批量删除成功!");
}
@@ -143,7 +145,7 @@ public class LawsStandardizationLiaisonController extends JeroController<LawsSta
@AutoLog(value = "标准化-联络人-通过id查询")
@ApiOperation(value="标准化-联络人-通过id查询", notes="标准化-联络人-通过id查询")
@GetMapping(value = "/queryById")
public Result<LawsStandardizationLiaison> queryById(@RequestParam(name="id",required=true) String id) {
public Result<LawsStandardizationLiaison> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
LawsStandardizationLiaison lawsStandardizationLiaison = lawsStandardizationLiaisonService.queryById(id);
if(lawsStandardizationLiaison==null) {
return Result.error("未找到对应数据");
laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationMeetingController.java
+14 -12
View File
@@ -6,8 +6,11 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.laws.standardization.entity.LawsStandardizationMeeting;
import com.jero.modules.laws.standardization.service.ILawsStandardizationMeetingService;
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.poi.ss.formula.functions.T;
@@ -20,7 +23,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@@ -50,8 +52,8 @@ public class LawsStandardizationMeetingController extends JeroController<LawsSta
@ApiOperation(value="标准化-参会记录-分页列表查询", notes="标准化-参会记录-分页列表查询")
@GetMapping(value = "/page")
public Result<IPage<LawsStandardizationMeeting>> queryPageList(LawsStandardizationMeeting lawsStandardizationMeeting,
@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) {
IPage<LawsStandardizationMeeting> pageList = lawsStandardizationMeetingService.queryPage(lawsStandardizationMeeting, pageNo, pageSize, req);
return Result.OK(pageList);
@@ -109,11 +111,11 @@ public class LawsStandardizationMeetingController extends JeroController<LawsSta
@AutoLog(value = "标准化-参会记录-通过id删除")
@ApiOperation(value="标准化-参会记录-通过id删除", notes="标准化-参会记录-通过id删除")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
return Result.error("请选择数据!");
}
lawsStandardizationMeetingService.deleteById(map.get("id"));
public Result<T> delete(@RequestBody IdMapBody map) {
if (StringUtils.isBlank(map.getId())){
return Result.error("请选择数据!");
}
lawsStandardizationMeetingService.deleteById(map.getId());
return Result.OK("删除成功!");
}
@@ -126,11 +128,11 @@ public class LawsStandardizationMeetingController extends JeroController<LawsSta
@AutoLog(value = "标准化-参会记录-批量删除")
@ApiOperation(value="标准化-参会记录-批量删除", notes="标准化-参会记录-批量删除")
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
public Result<T> deleteBatch(@RequestBody IdsMapBody map) {
if (StringUtils.isBlank(map.getIds())){
return Result.error("请选择数据!");
}
this.lawsStandardizationMeetingService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
this.lawsStandardizationMeetingService.deleteByIds(Arrays.asList(map.getIds().split(",")));
return Result.OK("批量删除成功!");
}
@@ -143,7 +145,7 @@ public class LawsStandardizationMeetingController extends JeroController<LawsSta
@AutoLog(value = "标准化-参会记录-通过id查询")
@ApiOperation(value="标准化-参会记录-通过id查询", notes="标准化-参会记录-通过id查询")
@GetMapping(value = "/queryById")
public Result<LawsStandardizationMeeting> queryById(@RequestParam(name="id",required=true) String id) {
public Result<LawsStandardizationMeeting> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
LawsStandardizationMeeting lawsStandardizationMeeting = lawsStandardizationMeetingService.queryById(id);
if(lawsStandardizationMeeting==null) {
return Result.error("未找到对应数据");
laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationPaymentController.java
+14 -12
View File
@@ -6,8 +6,11 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.laws.standardization.entity.LawsStandardizationPayment;
import com.jero.modules.laws.standardization.service.ILawsStandardizationPaymentService;
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.poi.ss.formula.functions.T;
@@ -20,7 +23,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@@ -50,8 +52,8 @@ public class LawsStandardizationPaymentController extends JeroController<LawsSta
@ApiOperation(value="标准化-支付信息-分页列表查询", notes="标准化-支付信息-分页列表查询")
@GetMapping(value = "/page")
public Result<IPage<LawsStandardizationPayment>> queryPageList(LawsStandardizationPayment lawsStandardizationPayment,
@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) {
IPage<LawsStandardizationPayment> pageList = lawsStandardizationPaymentService.queryPage(lawsStandardizationPayment, pageNo, pageSize, req);
return Result.OK(pageList);
@@ -109,11 +111,11 @@ public class LawsStandardizationPaymentController extends JeroController<LawsSta
@AutoLog(value = "标准化-支付信息-通过id删除")
@ApiOperation(value="标准化-支付信息-通过id删除", notes="标准化-支付信息-通过id删除")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
return Result.error("请选择数据!");
}
lawsStandardizationPaymentService.deleteById(map.get("id"));
public Result<T> delete(@RequestBody IdMapBody map) {
if (StringUtils.isBlank(map.getId())){
return Result.error("请选择数据!");
}
lawsStandardizationPaymentService.deleteById(map.getId());
return Result.OK("删除成功!");
}
@@ -126,11 +128,11 @@ public class LawsStandardizationPaymentController extends JeroController<LawsSta
@AutoLog(value = "标准化-支付信息-批量删除")
@ApiOperation(value="标准化-支付信息-批量删除", notes="标准化-支付信息-批量删除")
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
public Result<T> deleteBatch(@RequestBody IdsMapBody map) {
if (StringUtils.isBlank(map.getIds())){
return Result.error("请选择数据!");
}
this.lawsStandardizationPaymentService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
this.lawsStandardizationPaymentService.deleteByIds(Arrays.asList(map.getIds().split(",")));
return Result.OK("批量删除成功!");
}
@@ -143,7 +145,7 @@ public class LawsStandardizationPaymentController extends JeroController<LawsSta
@AutoLog(value = "标准化-支付信息-通过id查询")
@ApiOperation(value="标准化-支付信息-通过id查询", notes="标准化-支付信息-通过id查询")
@GetMapping(value = "/queryById")
public Result<LawsStandardizationPayment> queryById(@RequestParam(name="id",required=true) String id) {
public Result<LawsStandardizationPayment> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
LawsStandardizationPayment lawsStandardizationPayment = lawsStandardizationPaymentService.queryById(id);
if(lawsStandardizationPayment==null) {
return Result.error("未找到对应数据");
laws-modules/src/main/java/com/jero/modules/split/controller/ClauseSplitController.java
+2 -1
View File
@@ -7,6 +7,7 @@ import com.jero.modules.tag.entity.LawsTag;
import com.jero.modules.tag.enums.TableNameEnum;
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.web.bind.annotation.GetMapping;
@@ -50,7 +51,7 @@ public class ClauseSplitController {
@AutoLog(value = "条款拆分-获取表单模型")
@ApiOperation(value="条款拆分-获取表单模型", notes="条款拆分-获取表单模型")
@GetMapping(value = "getFormModel")
public Result<Object> getFormModel(@RequestParam(name="type") String type) {
public Result<Object> getFormModel(@ApiParam("类型") @RequestParam(name="type") String type) {
Map<String, Object> formModel = lawsCommonService.getFormModel(MODULE_VALUE, type);
return Result.OK(formModel.get(MODULE_VALUE));
}
laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java
+30 -29
View File
@@ -17,6 +17,7 @@ import com.jero.modules.split.service.IFileSplitItemsEOService;
import com.jero.modules.split.service.impl.FileSplitItemsEOServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringEscapeUtils;
@@ -62,7 +63,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@ApiOperation(value = "分页查询")
@PostMapping("/getSplitItemsByPage")
@RequiresPermissions("split:sarFileSplitItems:page")
public Result<IPage> page(@RequestBody Map<String, Object> parameter) throws Exception {
public Result<IPage> page(@ApiParam("标签管理") @RequestBody Map<String, Object> parameter) throws Exception {
IPage infoPage = fileSplitItemsEOService.getInfoPage(parameter);
return Result.OK(infoPage);
}
@@ -71,7 +72,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@ApiOperation(value = "根据id查询")
@GetMapping("/getSplitItemsById")
@RequiresPermissions("split:sarFileSplitItems:update")
public Result<?> getSplitItemsById(String id){
public Result<?> getSplitItemsById(@ApiParam("id") String id){
Map<String, Object> item = fileSplitItemsEOService.getInfoById(id);
return Result.OK(item);
}
@@ -80,7 +81,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@ApiOperation(value = "新增")
@PostMapping("/addSplitItems")
@RequiresPermissions("split:sarFileSplitItems:add")
public Result<?> addSplitItems(@RequestBody Map<String, Object> parameter) {
public Result<?> addSplitItems(@ApiParam("标签管理") @RequestBody Map<String, Object> parameter) {
List<SarFileSplitItemsValEO> itemValEOList = (List<SarFileSplitItemsValEO>) parameter.get("itemValEOList");
if (CollectionUtils.isNotEmpty(itemValEOList)) {
List<SarFileSplitItemsValEO> valEOList = new ArrayList<>();
@@ -111,7 +112,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@ApiOperation(value = "编辑")
@PostMapping("/updateSplitItems")
@RequiresPermissions("split:sarFileSplitItems:update")
public Result<?> updateSplitItems(@RequestBody Map<String, Object> parameter) {
public Result<?> updateSplitItems(@ApiParam("标签管理") @RequestBody Map<String, Object> parameter) {
List<SarFileSplitItemsValEO> itemValEOList = (List<SarFileSplitItemsValEO>) parameter.get("itemValEOList");
if (CollectionUtils.isNotEmpty(itemValEOList)) {
List<SarFileSplitItemsValEO> valEOList = new ArrayList<>();
@@ -142,7 +143,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@ApiOperation(value = "批量删除")
@PostMapping("/batchDeleteItems")
@RequiresPermissions("split:sarFileSplitItems:delete")
public Result batchDeleteItems(String ids) {
public Result batchDeleteItems(@ApiParam("ids") String ids) {
if (StringUtils.isNotEmpty(ids)) {
int result = fileSplitItemsEOService.batchDeleteItems(ids);
if (result > 0) {
@@ -158,8 +159,8 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@AutoLog(value = "批量设置表单中英文切换")
@ApiOperation(value="批量设置表单中英文切换", notes="批量设置表单中英文切换")
@GetMapping(value = "/getBatchSetForm")
public Result<List<Map<String, Object>>> getBatchSetForm(@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
public Result<List<Map<String, Object>>> getBatchSetForm(@ApiParam("数据库表") @RequestParam(name = "flag") String flag,
@ApiParam("国际化") @RequestParam(name = "cut") String cut) {
List<Map<String, Object>> list = fileSplitItemsEOService.getBatchSetForm(flag, cut);
return Result.OK(list);
}
@@ -167,7 +168,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@AutoLog(value = "文档拆分条款信息-判断包含子节点")
@ApiOperation(value = "文档拆分条款信息-判断包含子节点")
@GetMapping("/judgeContainChilds")
public Result<Map<String, Object>> judgeContainChilds(String ids) {
public Result<Map<String, Object>> judgeContainChilds(@ApiParam("ids") String ids) {
Map<String, Object> result = fileSplitItemsEOService.judgeContainChilds(ids);
return Result.OK(result);
}
@@ -176,9 +177,9 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@ApiOperation(value = "文档拆分条款信息-复制")
@GetMapping("/batchCopyItems")
@RequiresPermissions("split:sarFileSplitItems:copy")
public Result<?> batchCopyItems(@RequestParam(value = "ids",required = false) String ids,
@RequestParam(value = "menuids",required = false) String menuIds,
@RequestParam(value = "infoIds",required = false) String infoIds) {
public Result<?> batchCopyItems(@ApiParam("ids") @RequestParam(value = "ids",required = false) String ids,
@ApiParam("目录ids") @RequestParam(value = "menuids",required = false) String menuIds,
@ApiParam("文档拆分ids") @RequestParam(value = "infoIds",required = false) String infoIds) {
int result = fileSplitItemsEOService.batchCopyItems(ids,menuIds,infoIds);
return Result.OK("复制成功", result);
}
@@ -187,7 +188,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@ApiOperation(value = "文档拆分条款信息-批量合并")
@GetMapping("/batchMergeItems")
@RequiresPermissions("split:sarFileSplitItems:merge")
public Result<Map<String, Object>> batchMergeItems(String ids) {
public Result<Map<String, Object>> batchMergeItems(@ApiParam("ids") String ids) {
Map<String, Object> result = fileSplitItemsEOService.batchMergeItems(ids);
return Result.OK("合并成功", result);
}
@@ -196,7 +197,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@ApiOperation(value = "文档拆分条款信息-批量设置")
@PostMapping("/batchSet")
@RequiresPermissions("split:sarFileSplitItems:set")
public Result<?> batchSet(@RequestBody Map<String, Object> parameter) {
public Result<?> batchSet(@ApiParam("标签管理") @RequestBody Map<String, Object> parameter) {
int result = fileSplitItemsEOService.batchSet(parameter); // ids, technology_territory, function_territory, information_category
return Result.OK("设置成功", result);
}
@@ -205,17 +206,17 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@ApiOperation(value = "模板下载")
@GetMapping(value = "/exportTemplate")
@RequiresPermissions("split:sarFileSplitItems:template")
public void exportTemplate(@RequestParam(name = "cut") String cut, HttpServletResponse response, HttpServletRequest request) throws Exception {
public void exportTemplate(@ApiParam("国际化") @RequestParam(name = "cut") String cut, HttpServletResponse response, HttpServletRequest request) throws Exception {
fileSplitItemsEOService.exportTemplate(cut,response,request);
}
@ApiOperation(value = "文档拆分条款信息-导出")
@GetMapping(value = "/exportSplitInfoZip")
@RequiresPermissions("split:sarFileSplitItems:export")
public void exportSplitInfoZip(@RequestParam(value = "cut") String cut,
@RequestParam(value = "idList", required = false) String idList,
@RequestParam(value = "exportName", required = false) String exportName,
@RequestParam(value = "parameter") String parameter,
public void exportSplitInfoZip(@ApiParam("国际化") @RequestParam(value = "cut") String cut,
@ApiParam("idList") @RequestParam(value = "idList", required = false) String idList,
@ApiParam("导出名") @RequestParam(value = "exportName", required = false) String exportName,
@ApiParam("标签管理") @RequestParam(value = "parameter") String parameter,
HttpServletResponse response,
HttpServletRequest request) {
try {
@@ -229,8 +230,8 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@ApiOperation(value = "文档拆分条款信息-导入拆分结果")
@PostMapping(value = "/importSplitResult")
@RequiresPermissions("split:sarFileSplitInfo:splitResult")
public Result<?> importSplitResult(String splitFileId,
String cut,
public Result<?> importSplitResult(@ApiParam("文档拆分条id") String splitFileId,
@ApiParam("国际化") String cut,
SarFileSplitInfoEO splitInfoEO) throws IOException {
return fileSplitItemsEOService.importSplitResult(splitFileId, cut,splitInfoEO);
}
@@ -239,10 +240,10 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@ApiOperation(value = "文档拆分条款信息-导入")
@PostMapping(value = "/importSplitItems")
@RequiresPermissions("split:sarFileSplitItems:import")
public Result<?> importSplitItems(MultipartFile file,
@RequestParam(value = "cut") String cut,
@RequestParam(value = "menuId") String menuId,
@RequestParam(value = "infoId") String infoId) throws Exception {
public Result<?> importSplitItems(@ApiParam("文件对象") MultipartFile file,
@ApiParam("国际化") @RequestParam(value = "cut") String cut,
@ApiParam("菜单id") @RequestParam(value = "menuId") String menuId,
@ApiParam("文档拆分id") @RequestParam(value = "infoId") String infoId) throws Exception {
return fileSplitItemsEOService.importSplitItems(file, cut, menuId, infoId);
}
@@ -255,9 +256,9 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@ApiOperation(value="表头中英文切换", notes="表头中英文切换")
@GetMapping(value = "/getHeader")
@RequiresPermissions("split:sarFileSplitItems:page")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
List<Map<String, Object>> list = fileSplitItemsEOService.getHeader(flag, cut);
public Result<List<Map<String, Object>>> getHeader(@ApiParam("数据库表") @RequestParam(name = "flag") String flag,
@ApiParam("国际化") @RequestParam(name = "cut") String cut){
List<Map<String, Object>> list = fileSplitItemsEOService.getHeader(flag, cut);
return Result.OK(list);
}
@@ -272,8 +273,8 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@PostMapping(value = "/upload")
@RequiresPermissions("split:sarFileSplitItems:page")
public Result<?> upload(HttpServletRequest request, HttpServletResponse response,
@RequestParam(value = "state",required = false) String state,
@RequestParam(value = "cut",required = false) String cut) {
@ApiParam("状态") @RequestParam(value = "state",required = false) String state,
@ApiParam("国际化") @RequestParam(value = "cut",required = false) String cut) {
return fileSplitItemsEOService.upload(request, response, state, cut);
}
laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java
+20 -16
View File
@@ -23,6 +23,7 @@ import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
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.poi.ss.formula.functions.T;
@@ -118,7 +119,9 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
@ApiOperation(value="文档拆分表-回传至文档库", notes="文档拆分表-回传至文档库")
@GetMapping(value = "/bindToDocumentLibrary")
// @RequiresPermissions("split:sarFileSplitInfo:bind")
public Result<T> bindToDocumentLibrary(String id, String connectId, String fileName) {
public Result<T> bindToDocumentLibrary(@ApiParam("id") String id,
@ApiParam("文件关联id") String connectId,
@ApiParam("文件名") String fileName) {
// 设置fileId
boolean bindState = sarFileSplitInfoService.bindToDocumentLibrary(id, connectId, fileName);
if(bindState){
@@ -159,14 +162,15 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
*
* @param sarFileSplitInfoEO
* @return
* @PostMapping(value = "/add1")
* public Result<T> add1(@RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) {
* sarFileSplitInfoEO.setStartNumber(0);
* sarFileSplitInfoEO.setStopNumber(0);
* sarFileSplitInfoService.add1(sarFileSplitInfoEO);
* return Result.OK("添加成功！");
* }
*/
@PostMapping(value = "/add1")
public Result<T> add1(@RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) {
sarFileSplitInfoEO.setStartNumber(0);
sarFileSplitInfoEO.setStopNumber(0);
sarFileSplitInfoService.add1(sarFileSplitInfoEO);
return Result.OK("添加成功！");
}
/**
* 更改权限
@@ -218,7 +222,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
@ApiOperation(value="文档拆分表-通过id删除", notes="文档拆分表-通过id删除")
@PostMapping(value = "/delete")
// @RequiresPermissions("split:sarFileSplitInfo:delete")
public Result<T> delete(@RequestParam(name="id",required=true) String id) {
public Result<T> delete(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
sarFileSplitInfoService.deleteById(id);
return Result.OK("删除成功!");
}
@@ -234,7 +238,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
@ApiOperation(value="文档拆分表-批量删除", notes="文档拆分表-批量删除")
@PostMapping(value = "/deleteBatch")
// @RequiresPermissions("split:sarFileSplitInfo:deleteBatch")
public Result<T> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
public Result<T> deleteBatch(@ApiParam("ids") @RequestParam(name="ids",required=true) String ids) {
this.sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@@ -249,7 +253,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
@ApiOperationSupport(order = 8)
@ApiOperation(value="文档拆分表-通过id查询", notes="文档拆分表-通过id查询")
@GetMapping(value = "/queryById")
public Result<SarFileSplitInfoEO> queryById(@RequestParam(name="id",required=true) String id) {
public Result<SarFileSplitInfoEO> queryById(@ApiParam("id") @RequestParam(name="id",required=true) String id) {
SarFileSplitInfoEO sarFileSplitInfoEO = sarFileSplitInfoService.queryById(id);
if(sarFileSplitInfoEO ==null) {
return Result.error("未找到对应数据");
@@ -267,8 +271,8 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
@GetMapping(value = "/splitFilePageInfo")
// @RequiresPermissions("split:sarFileSplitInfo:splitFile")
public Result<IPage<OSSFile>> splitFilePageInfo(SplitFilePageInfoParam param,
@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 request) {
Page<OSSFile> page = new Page<>(pageNo,pageSize);
Page<OSSFile> ossFilePage = sarFileSplitInfoService.splitFilePageInfoList(page, request, param);
@@ -287,7 +291,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
@PostMapping(value = "/splitResultPageInfo")
@ResponseBody
// @RequiresPermissions("split:sarFileSplitInfo:splitResult")
public Result<IPage<Map<String,Object>>> splitResultPageInfo(@RequestBody Map<String,Object> parameter) {
public Result<IPage<Map<String,Object>>> splitResultPageInfo(@ApiParam("标签管理") @RequestBody Map<String,Object> parameter) {
// IPage<Map<String,Object>> infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter);
// TODO 数据获取需要从企标和国标里拿，需要重写
@@ -328,8 +332,8 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
@ApiOperation(value="表头中英文切换", notes="表头中英文切换")
@GetMapping(value = "/getHeader")
// @RequiresPermissions("split:sarFileSplitInfo:page")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
public Result<List<Map<String, Object>>> getHeader(@ApiParam("数据库表") @RequestParam(name = "flag") String flag,
@ApiParam("国际化") @RequestParam(name = "cut") String cut) {
List<Map<String, Object>> list = sarFileSplitInfoService.getHeader(flag, cut);
return Result.OK(list);
}
laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
+3 -2
View File
@@ -9,6 +9,7 @@ import com.jero.modules.split.service.IFileSplitItemsEOService;
import com.jero.modules.split.service.ISarFileSplitMenuEOService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -147,7 +148,7 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
@ApiOperation(value = "文档拆分条款目录-删除Y")
@GetMapping("/deleteMenu")
@RequiresPermissions("split:sarFileSplitMenu:delete")
public Result delete(@RequestParam(name="id") String id) throws Exception {
public Result delete(@ApiParam(value = "id") @RequestParam(name="id") String id) throws Exception {
sarFileSplitMenuEOService.deleteMenu(id);
return Result.OK("删除成功",null);
}
@@ -155,7 +156,7 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
@ApiOperation(value = "文档拆分条款目录-向上或向下移动")
@PostMapping("/moveUpOrDown")
@RequiresPermissions(value = {"split:sarFileSplitMenu:moveUp","split:sarFileSplitMenu:moveDown"}, logical = Logical.OR)
public Result moveUpOrDown(@RequestBody JSONObject json) throws Exception {
public Result moveUpOrDown(@ApiParam(value = "json数据") @RequestBody JSONObject json) throws Exception {
return this.sarFileSplitMenuEOService.moveUpOrDown(json);
}
}
laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
+9 -1
View File
@@ -100,6 +100,7 @@ public class SarFileSplitInfoEO implements Serializable {
/**拆分结果*/
@Excel(name = "拆分结果", width = 15)
@ApiModelProperty(value = "拆分结果")
private String splitResult;
/**文件id*/
@@ -123,23 +124,30 @@ public class SarFileSplitInfoEO implements Serializable {
private String publishBeforeId;
/**是否asms导入（1是）*/
@ApiModelProperty("是否asms导入（1是）")
private String isAsmsImport;
@ApiModelProperty("删除标识")
@TableField(exist = false)
private String flag;
@ApiModelProperty("开始号")
@TableField(exist = false)
private int startNumber;
@TableField(exist = false)
@ApiModelProperty("结束号")
private int stopNumber;
@TableField(exist = false)
@ApiModelProperty("文件分组")
private String fileGroup;
@TableField(exist = false)
@ApiModelProperty(value = "国际化")
private String cut;
@ApiModelProperty(value = "文件关联id")
@TableField(exist = false)
private String documentId;
/**ids*/
@ApiModelProperty("ids")
@TableField(exist = false)
private String ids;
}
laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java
+3
View File
@@ -18,6 +18,7 @@ import java.util.List;
public class SarFileSplitItemsEO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
private String id;
@ApiModelProperty(value = "拆分信息记录id")
@@ -61,12 +62,14 @@ public class SarFileSplitItemsEO implements Serializable {
private List<SarFileSplitItemsValEO> itemValEOList;
// 前台删除的VAL表条目内容ID
@ApiModelProperty("前台删除的VAL表条目内容ID")
private String delItemIds;
private String sMenuId;
List<String> itemsCondi;
@ApiModelProperty("展示顺序字")
private String zhan3Shi4Shun4Xu4;// 展示顺序字段
laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsTableEO.java
+39 -1
View File
@@ -1,5 +1,6 @@
package com.jero.modules.split.entity;
import io.swagger.annotations.*;
import lombok.Data;
import java.io.Serializable;
@@ -14,17 +15,54 @@ import java.util.Date;
@Data
public class SarFileSplitItemsTableEO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*/
@ApiModelProperty("id")
private String id;
/**
* 条目id
*/
@ApiModelProperty("条目id")
private String itemsValId;
/**
* 条文id
*/
@ApiModelProperty("条文id")
private String itemsId;
/**
* 行号
*/
@ApiModelProperty("行号")
private Integer rowNum;
/**
* 列号
*/
@ApiModelProperty("列号")
private Integer colNum;
/**
* 内容
*/
@ApiModelProperty("内容")
private String content;
/**
* 有效标识
*/
@ApiModelProperty("有效标识")
private Integer validFlag;
@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 创建时间
*/
private Date creationTime;
@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
/**
* 修改时间
*/
private Date modifyTime;
/**
* 修改人
*/
@ApiModelProperty("修改人")
private String modifyUser;
}
laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsValEO.java
+67
View File
@@ -2,6 +2,7 @@ package com.jero.modules.split.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.modules.split.common.UploadFileInfo;
import io.swagger.annotations.*;
import lombok.Data;
import java.io.Serializable;
@@ -18,23 +19,89 @@ import java.util.List;
public class SarFileSplitItemsValEO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*/
@ApiModelProperty("id")
private String id;
/**
* 类型
*/
@ApiModelProperty("类型")
private String type;
/**
* 条文id
*/
@ApiModelProperty("条文id")
private String itemId;
/**
* 条文内容
*/
@ApiModelProperty("条文内容")
private String itemContent;
/**
* 有效标识
*/
@ApiModelProperty("有效标识")
private Integer validFlag;
/**
* 创建人
*/
@ApiModelProperty("创建人")
private String creationUser;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
/**
* 创建时间
*/
private Date creationTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
/**
* 修改时间
*/
private Date modifyTime;
/**
* 修改人
*/
@ApiModelProperty("修改人")
private String modifyUser;
/**
* 显示顺序
*/
@ApiModelProperty("显示顺序")
private Integer displaySeq;
/**
* idList
*/
@ApiModelProperty("idList")
private String[] idList;
/**
* 默认文件
*/
@ApiModelProperty("默认文件")
private List<UploadFileInfo> defaultFileList;
/**
* 图片名称
*/
@ApiModelProperty("图片名称")
private String imgName;
/**
* 序号
*/
@ApiModelProperty("序号")
private Integer indexItem;
/**
* 表格
*/
@ApiModelProperty("表格")
private List<SarFileSplitItemsTableEO> tableList;
/**
* 表格
*/
@ApiModelProperty("表格")
private List<List<SarFileSplitItemsTableEO>> tableListShow;
/**
* 行数
*/
@ApiModelProperty("行数")
private int rowCount;
}
laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java
+69 -2
View File
@@ -1,6 +1,7 @@
package com.jero.modules.split.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -17,31 +18,97 @@ import java.util.List;
@Data
public class SarFileSplitMenuEO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ApiModelProperty("主键")
private String id;
/**
* 信息记录表id
*/
@ApiModelProperty("信息记录表id")
private String infoId;
/**
* 目录名称
*/
@ApiModelProperty("目录名称")
private String name;
/**
* 父节点id
*/
@ApiModelProperty("父节点id")
private String pId;
/**
* 排序序号
*/
@ApiModelProperty("排序序号")
private Long displaySeq;
/**
* 是否有效
*/
@ApiModelProperty("是否有效")
private Integer validFlag;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
/**
* 创建日期
*/
private Date creationTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
/**
* 修改日期
*/
private Date modifyTime;
/**
* 备注
*/
@ApiModelProperty("备注")
private String remarks;
/**
* 创建人
*/
@ApiModelProperty("创建人")
private String creationUser;
/**
* 更新人
*/
@ApiModelProperty("更新人")
private String modifyUser;
/**
* 条款名称
*/
@ApiModelProperty("条款名称")
private String itemName;
/**
* 信息记录表idList
*/
@ApiModelProperty("信息记录表idList")
private String[] infoIdList;
/**
* 排序序号开始
*/
@ApiModelProperty("排序序号开始")
private Long displaySeqStart;
/**
* 排序序号截至
*/
@ApiModelProperty("排序序号截至")
private Long displaySeqEnd;
/**
* 子集数量
*/
@ApiModelProperty("子集数量")
private Long childrenCount;
/**
* 子集
*/
@ApiModelProperty("子集")
private List<SarFileSplitMenuEO> children = new ArrayList<>();
// 向上移动标识
@ApiModelProperty("向上移动标")
private boolean moveUpFlag;
// 向下移动标识
@ApiModelProperty("向下移动标")
private boolean moveDownFlag;
}
laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuTreeModel.java
+29
View File
@@ -1,5 +1,6 @@
package com.jero.modules.split.entity;
import io.swagger.annotations.*;
import lombok.Data;
import java.io.Serializable;
@@ -13,12 +14,40 @@ import java.util.List;
public class SarFileSplitMenuTreeModel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*/
@ApiModelProperty("id")
private String id;
/**
* 父id
*/
@ApiModelProperty("父id")
private String parendId;
/**
* 条文号
*/
@ApiModelProperty("条文号")
private String itemNum;
/**
* 条文名称
*/
@ApiModelProperty("条文名称")
private String itemName;
/**
* 条文内容
*/
@ApiModelProperty("条文内容")
private String itermsConditions;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 子集
*/
@ApiModelProperty("子集")
private List<SarFileSplitMenuTreeModel> children = new ArrayList<>();
}
laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuTreeNode.java
+29
View File
@@ -1,14 +1,43 @@
package com.jero.modules.split.entity;
import io.swagger.annotations.*;
import lombok.Data;
@Data
public class SarFileSplitMenuTreeNode {
/**
* id
*/
@ApiModelProperty("id")
private String id;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 父id
*/
@ApiModelProperty("父id")
private String parentId;
/**
* 父名称
*/
@ApiModelProperty("父名称")
private String parentName;
/**
* 排序
*/
@ApiModelProperty("排序")
private Long orderNum;
/**
* 条文名称
*/
@ApiModelProperty("条文名称")
private String itemName;
/**
* 条文id
*/
@ApiModelProperty("条文id")
private String itemId;
}
laws-modules/src/main/java/com/jero/modules/split/page/SarFileSplitInfoEOPage.java
+17
View File
@@ -12,24 +12,31 @@ import lombok.Data;
@Data
public class SarFileSplitInfoEOPage {
/**主键*/
@ApiModelProperty("id")
private String id;
/**创建人*/
@ApiModelProperty("创建人")
private String createBy;
/**拆分时间*/
@ApiModelProperty("拆分时间")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty("更新人")
private String updateBy;
/**更新日期*/
@ApiModelProperty("更新日期")
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty("所属部门")
private String sysOrgCode;
/**编号*/
@ApiModelProperty("编号")
private String serialNumber;
/**标准编号/标准名称*/
@@ -37,18 +44,23 @@ public class SarFileSplitInfoEOPage {
private String serialNumberOrName;
/**标题*/
@ApiModelProperty("标题")
private String title;
/**文本状态*/
@ApiModelProperty("文本状态")
private String fileType;
/**文件名称*/
@ApiModelProperty("文件名称")
private String fileName;
/**拆分结果*/
@ApiModelProperty("拆分结果")
private String splitResult;
/**文件id*/
@ApiModelProperty("文件id")
private String fileId;
/**拆分状态*/
@@ -60,12 +72,17 @@ public class SarFileSplitInfoEOPage {
private String author;
//分页
@ApiModelProperty(value = "分页")
private Integer pageNo;
@ApiModelProperty(value = "分页")
private Integer pageSize;
//排序
@ApiModelProperty(value = "排序")
private String orderBy;
@ApiModelProperty(value = "排序字段")
private String orderByField;
@ApiModelProperty(value = "国际化")
private String cut;
}
laws-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsValEOPage.java
+97 -1
View File
@@ -1,6 +1,7 @@
package com.jero.modules.split.page;
import com.jero.modules.split.common.BasePage;
import io.swagger.annotations.*;
import lombok.Data;
/**
@@ -11,29 +12,124 @@ import lombok.Data;
*/
@Data
public class SarFileSplitItemsValEOPage extends BasePage {
/**
* id
*/
@ApiModelProperty("id")
private String id;
/**
* id 运算符
*/
@ApiModelProperty("id 运算符")
private String idOperator = "=";
/**
* 类型
*/
@ApiModelProperty("类型")
private String type;
/**
* type 运算符
*/
@ApiModelProperty("type 运算符")
private String typeOperator = "=";
/**
* 项目Id
*/
@ApiModelProperty("项目Id")
private String itemId;
/**
* 项目Id 运算符
*/
@ApiModelProperty("项目Id 运算符")
private String itemIdOperator = "=";
/**
* 条文id
*/
@ApiModelProperty("条文id")
private String itemContent;
/**
* 条文id运算符
*/
@ApiModelProperty("条文id运算符")
private String itemContentOperator = "=";
/**
* 是否有效
*/
@ApiModelProperty("是否有效")
private String validFlag;
/**
* 是否有效 运算符
*/
@ApiModelProperty("是否有效 运算符")
private String validFlagOperator = "=";
/**
* 创建人
*/
@ApiModelProperty("创建人")
private String creationUser;
/**
* 创建人运算符
*/
@ApiModelProperty("创建人运算符")
private String creationUserOperator = "=";
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private String creationTime;
/**
* 创建时间1
*/
@ApiModelProperty("创建时间1")
private String creationTime1;
/**
* 创建时间2
*/
@ApiModelProperty("创建时间2")
private String creationTime2;
/**
* 创建时间运算符
*/
@ApiModelProperty("创建时间运算符")
private String creationTimeOperator = "=";
/**
* 更新时间
*/
@ApiModelProperty("更新时间")
private String modifyTime;
/**
* 更新时间1
*/
@ApiModelProperty("更新时间1")
private String modifyTime1;
/**
* 更新时间2
*/
@ApiModelProperty("更新时间2")
private String modifyTime2;
/**
* 更新时间运算符
*/
@ApiModelProperty("更新时间运算符")
private String modifyTimeOperator = "=";
/**
* 更新人
*/
@ApiModelProperty("更新人")
private String modifyUser;
/**
* 更新人运算符
*/
@ApiModelProperty("更新人运算符")
private String modifyUserOperator = "=";
/**
* 排序
*/
@ApiModelProperty("排序")
private String displaySeq;
/**
* 排序运算符
*/
@ApiModelProperty("排序运算符")
private String displaySeqOperator = "=";
}
laws-modules/src/main/java/com/jero/modules/split/page/SarFileSplitMenuEOPage.java
+105 -1
View File
@@ -1,6 +1,7 @@
package com.jero.modules.split.page;
import com.jero.modules.split.common.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -11,31 +12,134 @@ import lombok.Data;
*/
@Data
public class SarFileSplitMenuEOPage extends BasePage {
/**
* id
*/
@ApiModelProperty("id")
private String id;
/**
* id 运算符
*/
@ApiModelProperty("id 运算符")
private String idOperator = "=";
/**
* infoId
*/
@ApiModelProperty("infoId")
private String infoId;
/**
* infoId 运算符
*/
@ApiModelProperty("infoId 运算符")
private String infoIdOperator = "=";
/**
* 名字
*/
@ApiModelProperty("名字")
private String name;
/**
* 名字 运算符
*/
@ApiModelProperty("名字 运算符")
private String nameOperator = "=";
/**
* 父id
*/
@ApiModelProperty("父id")
private String pId;
/**
* 父id 运算符
*/
@ApiModelProperty("父id 运算符")
private String pIdOperator = "=";
/**
* 排序
*/
@ApiModelProperty("排序")
private String displaySeq;
/**
* 排序 运算符
*/
@ApiModelProperty("排序 运算符")
private String displaySeqOperator = "=";
/**
* 是否有效
*/
@ApiModelProperty("是否有效")
private String validFlag;
/**
* 是否有效 运算符
*/
@ApiModelProperty("是否有效 运算符")
private String validFlagOperator = "=";
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private String creationTime;
/**
* 创建时间1
*/
@ApiModelProperty("创建时间1")
private String creationTime1;
/**
* 创建时间2
*/
@ApiModelProperty("创建时间2")
private String creationTime2;
/**
* 创建时间运算符
*/
@ApiModelProperty("创建时间运算符")
private String creationTimeOperator = "=";
/**
* 更新时间
*/
@ApiModelProperty("更新时间")
private String modifyTime;
/**
* 更新时间1
*/
@ApiModelProperty("更新时间1")
private String modifyTime1;
/**
* 更新时间2
*/
@ApiModelProperty("更新时间2")
private String modifyTime2;
/**
* 更新时间运算符
*/
@ApiModelProperty("更新时间运算符")
private String modifyTimeOperator = "=";
/**
* 备注
*/
@ApiModelProperty("备注")
private String remarks;
/**
* 备注 运算符
*/
@ApiModelProperty("备注 运算符")
private String remarksOperator = "=";
/**
* 创建人
*/
@ApiModelProperty("创建人")
private String creationUser;
/**
* 创建人运算符
*/
@ApiModelProperty("创建人运算符")
private String creationUserOperator = "=";
/**
* 更新人
*/
@ApiModelProperty("更新人")
private String modifyUser;
/**
* 更新人运算符
*/
@ApiModelProperty("更新人运算符")
private String modifyUserOperator = "=";
}