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/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 = "=";
}