diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java index 8842a62b2..868df2ecb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java @@ -135,7 +135,7 @@ public class SysRoleController { */ //@RequiresRoles({"admin"}) @RequiresPermissions("sys:role:del") - @RequestMapping(value = "/delete", method = RequestMethod.DELETE) + @RequestMapping(value = "/delete", method = RequestMethod.GET) public Result delete(@RequestParam(name="id",required=true) String id) { sysRoleService.deleteRole(id); return Result.OK("删除角色成功"); @@ -148,7 +148,7 @@ public class SysRoleController { */ //@RequiresRoles({"admin"}) @RequiresPermissions("sys:role:del") - @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) + @RequestMapping(value = "/deleteBatch", method = RequestMethod.GET) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { Result result = new Result(); if(oConvertUtils.isEmpty(ids)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/websocket/service/WebSocketServer.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/WebSocketServer.java similarity index 94% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/websocket/service/WebSocketServer.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/WebSocketServer.java index a4db31078..fbd5d4bb7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/websocket/service/WebSocketServer.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/WebSocketServer.java @@ -1,4 +1,4 @@ -package com.jero.modules.websocket.service; +package com.jero.modules.ocr.service; import javax.websocket.EndpointConfig; import javax.websocket.Session; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java index c015c0084..118278ca1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRestfulServiceImpl.java @@ -14,7 +14,7 @@ import com.jero.modules.ocr.util.UUIDUtils; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.vo.OcrVO; -import com.jero.modules.websocket.service.WebSocketServer; +import com.jero.modules.ocr.service.WebSocketServer; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/websocket/service/impl/WebsocketServerImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/WebsocketServerImpl.java similarity index 95% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/websocket/service/impl/WebsocketServerImpl.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/WebsocketServerImpl.java index d9c673b05..627fbd449 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/websocket/service/impl/WebsocketServerImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/WebsocketServerImpl.java @@ -1,6 +1,6 @@ -package com.jero.modules.websocket.service.impl; +package com.jero.modules.ocr.service.impl; -import com.jero.modules.websocket.service.WebSocketServer; +import com.jero.modules.ocr.service.WebSocketServer; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/SplitTableInfo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/SplitTableInfo.java index 6aaeb5b7d..ba0b5e892 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/SplitTableInfo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/SplitTableInfo.java @@ -1,28 +1,15 @@ package com.jero.modules.split.common; +import lombok.Data; + /** * @Description: * @Author: yangxuenan * date: 2020/5/11 10:29 */ +@Data public class SplitTableInfo { private String tableName; private String tableHtml; - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getTableHtml() { - return tableHtml; - } - - public void setTableHtml(String tableHtml) { - this.tableHtml = tableHtml; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/UploadFileInfo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/UploadFileInfo.java index 78d902826..9fe64246a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/UploadFileInfo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/UploadFileInfo.java @@ -1,36 +1,15 @@ package com.jero.modules.split.common; +import lombok.Data; + /** * @Description: * @Author: yangxuenan * date: 2020/1/9 18:59 */ +@Data public class UploadFileInfo { private String id; private String filePath; private String name; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFilePath() { - return filePath; - } - - public void setFilePath(String filePath) { - this.filePath = filePath; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index a4bd057b8..efd97332b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java @@ -1,25 +1,27 @@ package com.jero.modules.split.controller; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.split.entity.SarFileSplitInfo; -import com.jero.modules.split.service.ISarFileSplitInfoService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.split.entity.SarFileSplitInfoEO; +import com.jero.modules.split.page.SarFileSplitInfoEOPage; +import com.jero.modules.split.service.ISarFileSplitInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** @@ -32,29 +34,24 @@ import com.jero.common.aspect.annotation.AutoLog; @RestController @RequestMapping("/split/sarFileSplitInfo") @Slf4j -public class SarFileSplitInfoController extends JeroController { +public class SarFileSplitInfoController extends JeroController { @Autowired private ISarFileSplitInfoService sarFileSplitInfoService; - - /** - * 分页列表查询 - * - * @param sarFileSplitInfo - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "文档拆分表-分页列表查询") + + /** + * 分页列表查询 + * @param sarFileSplitInfoEOPage + * @return + */ + @AutoLog(value = "文档拆分表-分页列表查询Y") @ApiOperation(value="文档拆分表-分页列表查询", notes="文档拆分表-分页列表查询") @GetMapping(value = "/page") - public Result queryPageList(SarFileSplitInfo sarFileSplitInfo, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sarFileSplitInfo, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = sarFileSplitInfoService.page(page, queryWrapper); + public Result queryPageList(SarFileSplitInfoEOPage sarFileSplitInfoEOPage) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getSerialNumber()), SarFileSplitInfoEO::getSerialNumber, sarFileSplitInfoEOPage.getSerialNumber()) + .like(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getTitle()), SarFileSplitInfoEO::getTitle, sarFileSplitInfoEOPage.getTitle()); + Page page = new Page(sarFileSplitInfoEOPage.getPageNo(), sarFileSplitInfoEOPage.getPageSize()); + IPage pageList = sarFileSplitInfoService.page(page, queryWrapper); return Result.OK(pageList); } @@ -66,36 +63,36 @@ public class SarFileSplitInfoController extends JeroController> queryList() { - List list = sarFileSplitInfoService.queryList(); + public Result> queryList() { + List list = sarFileSplitInfoService.queryList(); return Result.OK(list); } /** * 添加 * - * @param sarFileSplitInfo + * @param sarFileSplitInfoEO * @return */ @AutoLog(value = "文档拆分表-添加") @ApiOperation(value="文档拆分表-添加", notes="文档拆分表-添加") @PostMapping(value = "/add") - public Result add(@Validated @RequestBody SarFileSplitInfo sarFileSplitInfo) { - sarFileSplitInfoService.add(sarFileSplitInfo); + public Result add(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { + sarFileSplitInfoService.add(sarFileSplitInfoEO); return Result.OK("添加成功！"); } /** * 编辑 * - * @param sarFileSplitInfo + * @param sarFileSplitInfoEO * @return */ @AutoLog(value = "文档拆分表-编辑") @ApiOperation(value="文档拆分表-编辑", notes="文档拆分表-编辑") @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody SarFileSplitInfo sarFileSplitInfo) { - sarFileSplitInfoService.editById(sarFileSplitInfo); + public Result edit(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { + sarFileSplitInfoService.editById(sarFileSplitInfoEO); return Result.OK("编辑成功!"); } @@ -105,9 +102,9 @@ public class SarFileSplitInfoController extends JeroController delete(@RequestParam(name="id",required=true) String id) { sarFileSplitInfoService.deleteById(id); return Result.OK("删除成功!"); @@ -119,9 +116,9 @@ public class SarFileSplitInfoController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -137,22 +134,22 @@ public class SarFileSplitInfoController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { - SarFileSplitInfo sarFileSplitInfo = sarFileSplitInfoService.queryById(id); - if(sarFileSplitInfo==null) { + SarFileSplitInfoEO sarFileSplitInfoEO = sarFileSplitInfoService.queryById(id); + if(sarFileSplitInfoEO ==null) { return Result.error("未找到对应数据"); } - return Result.OK(sarFileSplitInfo); + return Result.OK(sarFileSplitInfoEO); } /** * 导出excel * * @param request - * @param sarFileSplitInfo + * @param sarFileSplitInfoEO */ @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, SarFileSplitInfo sarFileSplitInfo) { - return super.exportXls(request, sarFileSplitInfo, SarFileSplitInfo.class, "文档拆分表"); + public ModelAndView exportXls(HttpServletRequest request, SarFileSplitInfoEO sarFileSplitInfoEO) { + return super.exportXls(request, sarFileSplitInfoEO, SarFileSplitInfoEO.class, "文档拆分表"); } /** @@ -164,7 +161,7 @@ public class SarFileSplitInfoController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, SarFileSplitInfo.class); + return super.importExcel(request, response, SarFileSplitInfoEO.class); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java index 4eab9deaf..a16a26eb9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java @@ -40,7 +40,6 @@ import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -86,7 +85,7 @@ public class SarFileSplitItemsEOController extends JeroController> page(SarFileSplitItemsEOPage page) throws Exception { @@ -110,7 +109,8 @@ public class SarFileSplitItemsEOController extends JeroController> getAllSplitItems(SarFileSplitItemsEOPage page){ page.setValidFlag("0"); @@ -119,21 +119,21 @@ public class SarFileSplitItemsEOController extends JeroController> list(SarFileSplitItemsEOPage page) throws Exception { - return Result.OK(sarFileSplitItemsEOService.queryByList(page)); - } +// @ApiOperation(value = "文档拆分条款信息-查询") +// @GetMapping("") +//// @RequiresPermissions("lawss:sarFileSplitItems:list") +// public Result> list(SarFileSplitItemsEOPage page) throws Exception { +// return Result.OK(sarFileSplitItemsEOService.queryByList(page)); +// } - @ApiOperation(value = "|SarFileSplitItemsEO|详情") - @GetMapping("/{id}") - @RequiresPermissions("lawss:sarFileSplitItems:get") - public Result find(@PathVariable String id) throws Exception { - return Result.OK(sarFileSplitItemsEOService.selectByPrimaryKey(id)); - } +// @ApiOperation(value = "文档拆分条款信息-详情") +// @GetMapping("/{id}") +// @RequiresPermissions("lawss:sarFileSplitItems:get") +// public Result find(@PathVariable String id) throws Exception { +// return Result.OK(sarFileSplitItemsEOService.selectByPrimaryKey(id)); +// } - @ApiOperation(value = "|SarFileSplitItemsEO|新增") + @ApiOperation(value = "文档拆分条款信息-新增") @PostMapping("/addSplitItems") public Result create(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { if(CollectionUtils.isNotEmpty(sarFileSplitItemsEO.getItemValEOList())) { @@ -158,7 +158,7 @@ public class SarFileSplitItemsEOController extends JeroController update(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { if(CollectionUtils.isNotEmpty(sarFileSplitItemsEO.getItemValEOList())) { @@ -178,7 +178,7 @@ public class SarFileSplitItemsEOController extends JeroController save(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { if(CollectionUtils.isNotEmpty(sarFileSplitItemsEO.getItemValEOList())) { @@ -204,16 +204,16 @@ public class SarFileSplitItemsEOController extends JeroController getInfoById(String id) throws Exception { @@ -285,7 +285,7 @@ public class SarFileSplitItemsEOController extends JeroController> judgeContaintChilds(String ids) throws Exception { @@ -293,7 +293,7 @@ public class SarFileSplitItemsEOController extends JeroController importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file, @RequestParam(value = "menuId", required = false) String menuId, diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsFileEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsFileEOController.java deleted file mode 100644 index 0b9806872..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsFileEOController.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.jero.modules.split.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.oss.entity.OSSFile; -import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.split.entity.SarFileSplitItemsFileEO; -import com.jero.modules.split.page.SarFileSplitItemsFileEOPage; -import com.jero.modules.split.service.ISarFileSplitItemsFileEOService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; - -@RestController -@RequestMapping("/split/sarFileSplitItemsFile") -@Api(tags = "文档拆分") -public class SarFileSplitItemsFileEOController extends JeroController { - - private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsFileEOController.class); - - @Autowired - private ISarFileSplitItemsFileEOService sarFileSplitItemsFileEOService; - - @Autowired - private IOSSFileService ossFileService; - - @ApiOperation(value = "|SarFileSplitItemsFileEO|分页查询") - @GetMapping("/page") - @RequiresPermissions("lawss:sarFileSplitItemsFile:page") - public Result> page(SarFileSplitItemsFileEOPage page) throws Exception { - List rows = sarFileSplitItemsFileEOService.queryByPage(page); - IPage pageList = null; - pageList.setRecords(rows); - pageList.setCurrent(page.getPage()); - pageList.setSize(page.getPageSize()); - pageList.setTotal(sarFileSplitItemsFileEOService.queryByCount(page)); - return Result.OK(pageList); - } - - @ApiOperation(value = "|SarFileSplitItemsFileEO|查询") - @GetMapping("") - @RequiresPermissions("lawss:sarFileSplitItemsFile:list") - public Result> list(SarFileSplitItemsFileEOPage page) throws Exception { - return Result.OK(sarFileSplitItemsFileEOService.queryByList(page)); - } - - @ApiOperation(value = "|SarFileSplitItemsFileEO|详情") - @GetMapping("/{id}") - @RequiresPermissions("lawss:sarFileSplitItemsFile:get") - public Result find(@PathVariable String id) throws Exception { - return Result.OK(sarFileSplitItemsFileEOService.selectByPrimaryKey(id)); - } - - @ApiOperation(value = "|SarFileSplitItemsFileEO|新增") - @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) - @RequiresPermissions("lawss:sarFileSplitItemsFile:save") - public Result create(@RequestBody SarFileSplitItemsFileEO sarFileSplitItemsFileEO) throws Exception { - sarFileSplitItemsFileEOService.insertSelective(sarFileSplitItemsFileEO); - return Result.OK(sarFileSplitItemsFileEO); - } - - @ApiOperation(value = "|SarFileSplitItemsFileEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) - @RequiresPermissions("lawss:sarFileSplitItemsFile:update") - public Result update(@RequestBody SarFileSplitItemsFileEO sarFileSplitItemsFileEO) throws Exception { - sarFileSplitItemsFileEOService.updateByPrimaryKeySelective(sarFileSplitItemsFileEO); - return Result.OK(sarFileSplitItemsFileEO); - } - - @ApiOperation(value = "|SarFileSplitItemsFileEO|删除") - @DeleteMapping("/{id}") - @RequiresPermissions("lawss:sarFileSplitItemsFile:delete") - public Result delete(@PathVariable String id) throws Exception { - sarFileSplitItemsFileEOService.deleteByPrimaryKey(id); - logger.info("delete from SAR_FILE_SPLIT_ITEMS_FILE where id = {}", id); - return Result.OK(); - } - - @ApiOperation(value = "|SarFileSplitItemsFileEO|查询转换后的文档详情") - @GetMapping("/queryConvertAtt") - /*@RequiresPermissions("lawss:sarLawsFile:list")*/ - public Result queryConvertAtt(String attId) throws Exception { - List getList = sarFileSplitItemsFileEOService.selectFileByAttId(attId); - SarFileSplitItemsFileEO sarBussStandFileEO = new SarFileSplitItemsFileEO(); - if(getList != null && !getList.isEmpty()){ - sarBussStandFileEO = getList.get(0); - OSSFile ossFile = ossFileService.getById(attId); - if(ossFile != null){ - sarBussStandFileEO.setFileOldName(ossFile.getFileName()); - } -// readStandOrLawsLogService.sendReadSOLLog("STAND",sarBussStandFileEO); - return Result.OK(sarBussStandFileEO); - } else { - return Result.OK(null); - } - - } - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsResEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsResEOController.java deleted file mode 100644 index fc2f82c2e..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsResEOController.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.jero.modules.split.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.split.entity.SarFileSplitItemsResEO; -import com.jero.modules.split.page.SarFileSplitItemsResEOPage; -import com.jero.modules.split.service.ISarFileSplitItemsResEOService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; - -@RestController -@RequestMapping("/split/sarFileSplitItemsRes") -@Api(tags = "文档拆分") -public class SarFileSplitItemsResEOController extends JeroController { - - private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsResEOController.class); - - @Autowired - private ISarFileSplitItemsResEOService sarFileSplitItemsResEOService; - - @ApiOperation(value = "|SarFileSplitItemsResEO|分页查询") - @GetMapping("/page") - @RequiresPermissions("lawss:sarFileSplitItemsRes:page") - public Result> page(SarFileSplitItemsResEOPage page) throws Exception { - List rows = sarFileSplitItemsResEOService.queryByPage(page); - IPage pageList = null; - pageList.setRecords(rows); - pageList.setCurrent(page.getPage()); - pageList.setSize(page.getPageSize()); - pageList.setTotal(sarFileSplitItemsResEOService.queryByCount(page)); - return Result.OK(pageList); - } - - @ApiOperation(value = "|SarFileSplitItemsResEO|查询") - @GetMapping("") - @RequiresPermissions("lawss:sarFileSplitItemsRes:list") - public Result> list(SarFileSplitItemsResEOPage page) throws Exception { - return Result.OK(sarFileSplitItemsResEOService.queryByList(page)); - } - - @ApiOperation(value = "|SarFileSplitItemsResEO|详情") - @GetMapping("/{id}") - @RequiresPermissions("lawss:sarFileSplitItemsRes:get") - public Result find(@PathVariable String id) throws Exception { - return Result.OK(sarFileSplitItemsResEOService.selectByPrimaryKey(id)); - } - - @ApiOperation(value = "|SarFileSplitItemsResEO|新增") - @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) - @RequiresPermissions("lawss:sarFileSplitItemsRes:save") - public Result create(@RequestBody SarFileSplitItemsResEO sarFileSplitItemsResEO) throws Exception { - sarFileSplitItemsResEOService.insertSelective(sarFileSplitItemsResEO); - return Result.OK(sarFileSplitItemsResEO); - } - - @ApiOperation(value = "|SarFileSplitItemsResEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) - @RequiresPermissions("lawss:sarFileSplitItemsRes:update") - public Result update(@RequestBody SarFileSplitItemsResEO sarFileSplitItemsResEO) throws Exception { - sarFileSplitItemsResEOService.updateByPrimaryKeySelective(sarFileSplitItemsResEO); - return Result.OK(sarFileSplitItemsResEO); - } - - @ApiOperation(value = "|SarFileSplitItemsResEO|删除") - @DeleteMapping("/{id}") - @RequiresPermissions("lawss:sarFileSplitItemsRes:delete") - public Result delete(@PathVariable String id) throws Exception { - sarFileSplitItemsResEOService.deleteByPrimaryKey(id); - logger.info("delete from SAR_FILE_SPLIT_ITEMS_RES where id = {}", id); - return Result.OK(); - } - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsTableEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsTableEOController.java deleted file mode 100644 index 13e1a13ea..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsTableEOController.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.jero.modules.split.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.split.entity.SarFileSplitItemsTableEO; -import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; -import com.jero.modules.split.service.ISarFileSplitItemsTableEOService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; - -@RestController -@RequestMapping("/split/sarFileSplitItemsTable") -@Api(tags = "文档拆分") -public class SarFileSplitItemsTableEOController extends JeroController { - - private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsTableEOController.class); - - @Autowired - private ISarFileSplitItemsTableEOService sarFileSplitItemsTableEOService; - - @ApiOperation(value = "|SarFileSplitItemsTableEO|分页查询") - @GetMapping("/page") - @RequiresPermissions("lawss:sarFileSplitItemsTable:page") - public Result> page(SarFileSplitItemsTableEOPage page) throws Exception { - List rows = sarFileSplitItemsTableEOService.queryByPage(page); - IPage pageList = null; - pageList.setRecords(rows); - pageList.setCurrent(page.getPage()); - pageList.setSize(page.getPageSize()); - pageList.setTotal(sarFileSplitItemsTableEOService.queryByCount(page)); - return Result.OK(pageList); - } - - @ApiOperation(value = "|SarFileSplitItemsTableEO|查询") - @GetMapping("") - @RequiresPermissions("lawss:sarFileSplitItemsTable:list") - public Result> list(SarFileSplitItemsTableEOPage page) throws Exception { - return Result.OK(sarFileSplitItemsTableEOService.queryByList(page)); - } - - @ApiOperation(value = "|SarFileSplitItemsTableEO|详情") - @GetMapping("/{id}") - @RequiresPermissions("lawss:sarFileSplitItemsTable:get") - public Result find(@PathVariable String id) throws Exception { - return Result.OK(sarFileSplitItemsTableEOService.selectByPrimaryKey(id)); - } - - @ApiOperation(value = "|SarFileSplitItemsTableEO|新增") - @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) - @RequiresPermissions("lawss:sarFileSplitItemsTable:save") - public Result create(@RequestBody SarFileSplitItemsTableEO sarFileSplitItemsTableEO) throws Exception { - sarFileSplitItemsTableEOService.insertSelective(sarFileSplitItemsTableEO); - return Result.OK(sarFileSplitItemsTableEO); - } - - @ApiOperation(value = "|SarFileSplitItemsTableEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) - @RequiresPermissions("lawss:sarFileSplitItemsTable:update") - public Result update(@RequestBody SarFileSplitItemsTableEO sarFileSplitItemsTableEO) throws Exception { - sarFileSplitItemsTableEOService.updateByPrimaryKeySelective(sarFileSplitItemsTableEO); - return Result.OK(sarFileSplitItemsTableEO); - } - - @ApiOperation(value = "|SarFileSplitItemsTableEO|删除") - @DeleteMapping("/{id}") - @RequiresPermissions("lawss:sarFileSplitItemsTable:delete") - public Result delete(@PathVariable String id) throws Exception { - sarFileSplitItemsTableEOService.deleteByPrimaryKey(id); - logger.info("delete from SAR_FILE_SPLIT_ITEMS_TABLE where id = {}", id); - return Result.OK(); - } - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java index b0eae6e4b..2c62c7d9f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java @@ -1,6 +1,5 @@ package com.jero.modules.split.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.split.entity.SarFileSplitItemsValEO; @@ -11,16 +10,15 @@ import com.jero.modules.split.service.ISarFileSplitItemsValEOService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang.StringUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; -import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; - @RestController @RequestMapping("/split/sarFileSplitItemsVal") @Api(tags = "文档拆分条目信息") @@ -37,20 +35,20 @@ public class SarFileSplitItemsValEOController extends JeroController> page(SarFileSplitItemsValEOPage page) throws Exception { - List rows = sarFileSplitItemsValEOService.queryByPage(page); - IPage pageList = null; - pageList.setRecords(rows); - pageList.setCurrent(page.getPage()); - pageList.setSize(page.getPageSize()); - pageList.setTotal(sarFileSplitItemsValEOService.queryByCount(page)); - return Result.OK(pageList); - } +// @ApiOperation(value = "|SarFileSplitItemsValEO|分页查询") +// @GetMapping("/page") +// @RequiresPermissions("lawss:sarFileSplitItemsVal:page") +// public Result> page(SarFileSplitItemsValEOPage page) throws Exception { +// List rows = sarFileSplitItemsValEOService.queryByPage(page); +// IPage pageList = null; +// pageList.setRecords(rows); +// pageList.setCurrent(page.getPage()); +// pageList.setSize(page.getPageSize()); +// pageList.setTotal(sarFileSplitItemsValEOService.queryByCount(page)); +// return Result.OK(pageList); +// } - @ApiOperation(value = "|SarFileSplitItemsValEO|查询") + @ApiOperation(value = "文档拆分条目信息-查询") @GetMapping("/getItemsValList") // @RequiresPermissions("lawss:sarFileSplitItemsVal:list") public Result> list(SarFileSplitItemsValEOPage page) throws Exception { @@ -89,39 +87,39 @@ public class SarFileSplitItemsValEOController extends JeroController find(@PathVariable String id) throws Exception { - return Result.OK(sarFileSplitItemsValEOService.selectByPrimaryKey(id)); - } +// @ApiOperation(value = "|SarFileSplitItemsValEO|详情") +// @GetMapping("/{id}") +// @RequiresPermissions("lawss:sarFileSplitItemsVal:get") +// public Result find(@PathVariable String id) throws Exception { +// return Result.OK(sarFileSplitItemsValEOService.selectByPrimaryKey(id)); +// } +// +// @ApiOperation(value = "|SarFileSplitItemsValEO|新增") +// @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// @RequiresPermissions("lawss:sarFileSplitItemsVal:save") +// public Result create(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception { +// sarFileSplitItemsValEOService.insertSelective(sarFileSplitItemsValEO); +// return Result.OK(sarFileSplitItemsValEO); +// } +// +// @ApiOperation(value = "|SarFileSplitItemsValEO|修改") +// @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// @RequiresPermissions("lawss:sarFileSplitItemsVal:update") +// public Result update(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception { +// sarFileSplitItemsValEOService.updateByPrimaryKeySelective(sarFileSplitItemsValEO); +// return Result.OK(sarFileSplitItemsValEO); +// } +// +// @ApiOperation(value = "|SarFileSplitItemsValEO|删除") +// @DeleteMapping("/{id}") +// @RequiresPermissions("lawss:sarFileSplitItemsVal:delete") +// public Result delete(@PathVariable String id) throws Exception { +// sarFileSplitItemsValEOService.deleteByPrimaryKey(id); +// logger.info("delete from SAR_FILE_SPLIT_ITEMS_VAL where id = {}", id); +// return Result.OK(); +// } - @ApiOperation(value = "|SarFileSplitItemsValEO|新增") - @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) - @RequiresPermissions("lawss:sarFileSplitItemsVal:save") - public Result create(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception { - sarFileSplitItemsValEOService.insertSelective(sarFileSplitItemsValEO); - return Result.OK(sarFileSplitItemsValEO); - } - - @ApiOperation(value = "|SarFileSplitItemsValEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) - @RequiresPermissions("lawss:sarFileSplitItemsVal:update") - public Result update(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception { - sarFileSplitItemsValEOService.updateByPrimaryKeySelective(sarFileSplitItemsValEO); - return Result.OK(sarFileSplitItemsValEO); - } - - @ApiOperation(value = "|SarFileSplitItemsValEO|删除") - @DeleteMapping("/{id}") - @RequiresPermissions("lawss:sarFileSplitItemsVal:delete") - public Result delete(@PathVariable String id) throws Exception { - sarFileSplitItemsValEOService.deleteByPrimaryKey(id); - logger.info("delete from SAR_FILE_SPLIT_ITEMS_VAL where id = {}", id); - return Result.OK(); - } - - @ApiOperation(value = "|SarFileSplitItemsEO|根据目录查询") + @ApiOperation(value = "文档拆分条目信息-根据目录查询") @GetMapping("/getSplitItemsByMenu") // @RequiresPermissions("lawss:sarFileSplitItems:page") public Result> getSplitItemsByMenu(String menuId, String infoId) throws Exception { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java index 1d148c940..cc1ea519f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java @@ -1,6 +1,5 @@ package com.jero.modules.split.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.split.entity.DrageMenuEO; @@ -34,21 +33,21 @@ public class SarFileSplitMenuEOController extends JeroController> page(SarFileSplitMenuEOPage page) throws Exception { - List rows = sarFileSplitMenuEOService.queryByPage(page); - IPage pageList = null; - pageList.setRecords(rows); - pageList.setCurrent(page.getPage()); - pageList.setSize(page.getPageSize()); - pageList.setTotal(sarFileSplitMenuEOService.queryByCount(page)); - return Result.OK(pageList); - } +// @ApiOperation(value = "文档拆分条款目录-分页查询") +// @GetMapping("/page") +// @RequiresPermissions("lawss:sarFileSplitMenu:page") +// public Result> page(SarFileSplitMenuEOPage page) throws Exception { +// List rows = sarFileSplitMenuEOService.queryByPage(page); +// IPage pageList = null; +// pageList.setRecords(rows); +// pageList.setCurrent(page.getPage()); +// pageList.setSize(page.getPageSize()); +// pageList.setTotal(sarFileSplitMenuEOService.queryByCount(page)); +// return Result.OK(pageList); +// } - @ApiOperation(value = "|SarFileSplitMenuEO|查询") - @GetMapping("getSplitMenusByInfoId") + @ApiOperation(value = "文档拆分条款目录-查询Y") + @GetMapping("/getSplitMenusByInfoId") //@RequiresPermissions("lawss:sarFileSplitMenu:list") public Result> list(SarFileSplitMenuEOPage page) throws Exception { page.setValidFlag("0"); @@ -58,14 +57,14 @@ public class SarFileSplitMenuEOController extends JeroController find(@PathVariable String id) throws Exception { return Result.OK(sarFileSplitMenuEOService.selectByPrimaryKey(id)); } - @ApiOperation(value = "|SarFileSplitMenuEO|新增") + @ApiOperation(value = "文档拆分条款目录-新增Y") @PostMapping("/addMenu") // @RequiresPermissions("lawss:sarFileSplitMenu:save") public Result create(SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { @@ -73,7 +72,7 @@ public class SarFileSplitMenuEOController extends JeroController update(SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { @@ -81,43 +80,43 @@ public class SarFileSplitMenuEOController extends JeroController judgequeryMenuByPid(SarFileSplitMenuEO sarMenuEO) throws Exception { return Result.OK(sarFileSplitMenuEOService.judgequeryMenuByPid(sarMenuEO)); } - @ApiOperation(value = "|SarFileSplitMenuEO|复制节点包括子节点") + @ApiOperation(value = "文档拆分条款目录-复制节点包括子节点") @PostMapping("/copyMenu") public Result copyMenu(@RequestBody SarFileSplitMenuEO sarMenuEO) throws Exception { int result = sarFileSplitMenuEOService.copyMenu(sarMenuEO); return Result.OK("复制成功",sarMenuEO); } - @ApiOperation(value = "|SarFileSplitMenuEO|复制节点不包括子节点") + @ApiOperation(value = "文档拆分条款目录-复制节点不包括子节点") @PostMapping("/copyMenuNotChildren") public Result copyMenuNotChildren(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { int result = sarFileSplitMenuEOService.copyMenuNotChildren(sarFileSplitItemsEO); return Result.OK("复制成功",sarFileSplitItemsEO); } - @ApiOperation(value = "|SarFileSplitMenuEO|批量复制节点不包括子节点") + @ApiOperation(value = "文档拆分条款目录-批量复制节点不包括子节点") @PostMapping("/copyMenuNotChildrenall") public Result> copyMenuNotChildrenall(@RequestParam(value = "ids",required = false) String ids, @RequestParam(value = "menuids",required = false) String menuids, diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSpiltValTableExportDto.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSpiltValTableExportDto.java index 1fd8260eb..0724f4afc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSpiltValTableExportDto.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSpiltValTableExportDto.java @@ -1,6 +1,7 @@ package com.jero.modules.split.dto; import com.jero.modules.split.entity.SarFileSplitItemsTableEO; +import lombok.Data; import java.util.List; @@ -9,6 +10,7 @@ import java.util.List; * @Author: yangxuenan * date: 2020/2/14 10:06 */ +@Data public class FileSpiltValTableExportDto { private String tableName; @@ -16,28 +18,4 @@ public class FileSpiltValTableExportDto { private List> tableEOList; private String tableHtCon; - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public List> getTableEOList() { - return tableEOList; - } - - public void setTableEOList(List> tableEOList) { - this.tableEOList = tableEOList; - } - - public String getTableHtCon() { - return tableHtCon; - } - - public void setTableHtCon(String tableHtCon) { - this.tableHtCon = tableHtCon; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitItemsExportDto.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitItemsExportDto.java index 28a06a2e8..fcdd0878d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitItemsExportDto.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitItemsExportDto.java @@ -1,6 +1,7 @@ package com.jero.modules.split.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.util.Date; import java.util.List; @@ -10,6 +11,7 @@ import java.util.List; * @Author: yangxuenan * date: 2020/2/13 9:48 */ +@Data public class FileSplitItemsExportDto { private String id; @@ -31,108 +33,4 @@ public class FileSplitItemsExportDto { private String relevanceFile; private List itemValContent; - - public String getItemsNum() { - return itemsNum; - } - - public void setItemsNum(String itemsNum) { - this.itemsNum = itemsNum; - } - - public String getItemsName() { - return itemsName; - } - - public void setItemsName(String itemsName) { - this.itemsName = itemsName; - } - - public String getItermsConditions() { - return itermsConditions; - } - - public void setItermsConditions(String itermsConditions) { - this.itermsConditions = itermsConditions; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public List getItemValContent() { - return itemValContent; - } - - public void setItemValContent(List itemValContent) { - this.itemValContent = itemValContent; - } - - public Date getNewcarPutTime() { - return newcarPutTime; - } - - public void setNewcarPutTime(Date newcarPutTime) { - this.newcarPutTime = newcarPutTime; - } - - public Date getProductPutTime() { - return productPutTime; - } - - public void setProductPutTime(Date productPutTime) { - this.productPutTime = productPutTime; - } - - public String getSvpps() { - return svpps; - } - - public void setSvpps(String svpps) { - this.svpps = svpps; - } - - public String getApplyArctic() { - return applyArctic; - } - - public void setApplyArctic(String applyArctic) { - this.applyArctic = applyArctic; - } - - public String getReferenceStand() { - return referenceStand; - } - - public void setReferenceStand(String referenceStand) { - this.referenceStand = referenceStand; - } - - public String getRemarks() { - return remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public String getRelevanceFile() { - return relevanceFile; - } - - public void setRelevanceFile(String relevanceFile) { - this.relevanceFile = relevanceFile; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValExportDto.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValExportDto.java index 3e0a91ac6..c9d746545 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValExportDto.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValExportDto.java @@ -1,6 +1,7 @@ package com.jero.modules.split.dto; import com.jero.modules.split.entity.SarFileSplitItemsTableEO; +import lombok.Data; import java.util.List; @@ -9,6 +10,7 @@ import java.util.List; * @Author: yangxuenan * date: 2020/2/14 9:18 */ +@Data public class FileSplitValExportDto { private String valType; @@ -16,28 +18,4 @@ public class FileSplitValExportDto { private String valContent; private List tableEOList; - - public String getValType() { - return valType; - } - - public void setValType(String valType) { - this.valType = valType; - } - - public String getValContent() { - return valContent; - } - - public void setValContent(String valContent) { - this.valContent = valContent; - } - - public List getTableEOList() { - return tableEOList; - } - - public void setTableEOList(List tableEOList) { - this.tableEOList = tableEOList; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValImgExportDto.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValImgExportDto.java index 1eec6adb4..67ba9c37c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValImgExportDto.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/FileSplitValImgExportDto.java @@ -1,29 +1,16 @@ package com.jero.modules.split.dto; +import lombok.Data; + /** * @Description: * @Author: yangxuenan * date: 2020/2/14 15:58 */ +@Data public class FileSplitValImgExportDto { private String imgName; private String imgPath; - - public String getImgName() { - return imgName; - } - - public void setImgName(String imgName) { - this.imgName = imgName; - } - - public String getImgPath() { - return imgPath; - } - - public void setImgPath(String imgPath) { - this.imgPath = imgPath; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/SarFileSplitItemsImportDto.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/SarFileSplitItemsImportDto.java index 2f0d32854..120c6509a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/SarFileSplitItemsImportDto.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/dto/SarFileSplitItemsImportDto.java @@ -1,5 +1,6 @@ package com.jero.modules.split.dto; +import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; @@ -9,6 +10,7 @@ import java.util.Date; * @Author: yangxuenan * date: 2020/5/9 14:40 */ +@Data public class SarFileSplitItemsImportDto { @Excel(name = "条款号", orderNum = "1") private String itemsNum; @@ -41,92 +43,4 @@ public class SarFileSplitItemsImportDto { private String relevanceFile; private String relevanceFileName; - - public String getItemsNum() { - return itemsNum; - } - - public void setItemsNum(String itemsNum) { - this.itemsNum = itemsNum; - } - - public String getItemsName() { - return itemsName; - } - - public void setItemsName(String itemsName) { - this.itemsName = itemsName; - } - - public String getItermsConditions() { - return itermsConditions; - } - - public void setItermsConditions(String itermsConditions) { - this.itermsConditions = itermsConditions; - } - - public String getRelevanceFile() { - return relevanceFile; - } - - public void setRelevanceFile(String relevanceFile) { - this.relevanceFile = relevanceFile; - } - - public Date getNewcarPutTime() { - return newcarPutTime; - } - - public void setNewcarPutTime(Date newcarPutTime) { - this.newcarPutTime = newcarPutTime; - } - - public Date getProductPutTime() { - return productPutTime; - } - - public void setProductPutTime(Date productPutTime) { - this.productPutTime = productPutTime; - } - - public String getSvpps() { - return svpps; - } - - public void setSvpps(String svpps) { - this.svpps = svpps; - } - - public String getApplyArctic() { - return applyArctic; - } - - public void setApplyArctic(String applyArctic) { - this.applyArctic = applyArctic; - } - - public String getReferenceStand() { - return referenceStand; - } - - public void setReferenceStand(String referenceStand) { - this.referenceStand = referenceStand; - } - - public String getRemarks() { - return remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public String getRelevanceFileName() { - return relevanceFileName; - } - - public void setRelevanceFileName(String relevanceFileName) { - this.relevanceFileName = relevanceFileName; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java similarity index 88% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfo.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java index fcc74bce4..6436b1bab 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,7 +27,7 @@ import java.io.Serializable; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="sar_file_split_info对象", description="文档拆分表") -public class SarFileSplitInfo implements Serializable { +public class SarFileSplitInfoEO implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ @@ -69,7 +70,8 @@ public class SarFileSplitInfo implements Serializable { private String title; /**文本状态*/ - @Excel(name = "文本状态", width = 15) + @Excel(name = "文本状态", width = 15, dicCode = "file_type") + @Dict(dicCode = "file_type") @ApiModelProperty(value = "文本状态") private String fileType; @@ -79,7 +81,8 @@ public class SarFileSplitInfo implements Serializable { private String fileName; /**拆分结果*/ - @Excel(name = "拆分结果", width = 15) + @Excel(name = "拆分结果", width = 15, dicCode = "split_result") + @Dict(dicCode = "split_result") @ApiModelProperty(value = "拆分结果") private String splitResult; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java index daa359ebb..6e6b8b959 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java @@ -1,10 +1,7 @@ package com.jero.modules.split.entity; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; +import lombok.Data; import java.io.Serializable; import java.util.Date; @@ -16,6 +13,7 @@ import java.util.List; * 日期： 2020-01-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class SarFileSplitItemsEO implements Serializable { private static final long serialVersionUID = 1L; @@ -53,364 +51,6 @@ public class SarFileSplitItemsEO implements Serializable { private String relevanceFileAttid; private String issForce; - /** - * java字段名转换为原始数据库列名。如果不存在则返回null
- *

字段列表：

- *
  • id -> id
    • - *
  • infoId -> info_id
    • - *
  • itemsNum -> items_num
    • - *
  • itemsName -> items_name
    • - *
  • itermsConditions -> iterms_conditions
    • - *
  • newcarPutTime -> newcar_put_time
    • - *
  • productPutTime -> product_put_time
    • - *
  • menuId -> menu_id
    • - *
  • svpps -> svpps
    • - *
  • applyArctic -> apply_arctic
    • - *
  • referenceStand -> reference_stand
    • - *
  • specialRequest -> special_request
    • - *
  • relevanceFile -> relevance_file
    • - *
  • remarks -> remarks
    • - *
  • validFlag -> valid_flag
    • - *
  • creationUser -> creation_user
    • - *
  • creationTime -> creation_time
    • - *
  • modifyTime -> modify_time
    • - *
  • modifyUser -> modify_user
    • - */ - public static String fieldToColumn(String fieldName) { - if (fieldName == null) return null; - switch (fieldName) { - case "id": return "id"; - case "infoId": return "info_id"; - case "itemsNum": return "items_num"; - case "itemsName": return "items_name"; - case "itermsConditions": return "iterms_conditions"; - case "newcarPutTime": return "newcar_put_time"; - case "productPutTime": return "product_put_time"; - case "menuId": return "menu_id"; - case "svpps": return "svpps"; - case "applyArctic": return "apply_arctic"; - case "referenceStand": return "reference_stand"; - case "specialRequest": return "special_request"; - case "relevanceFile": return "relevance_file"; - case "remarks": return "remarks"; - case "validFlag": return "valid_flag"; - case "creationUser": return "creation_user"; - case "creationTime": return "creation_time"; - case "modifyTime": return "modify_time"; - case "modifyUser": return "modify_user"; - default: return null; - } - } - - /** - * 原始数据库列名转换为java字段名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • info_id -> infoId
    • - *
  • items_num -> itemsNum
    • - *
  • items_name -> itemsName
    • - *
  • iterms_conditions -> itermsConditions
    • - *
  • newcar_put_time -> newcarPutTime
    • - *
  • product_put_time -> productPutTime
    • - *
  • menu_id -> menuId
    • - *
  • svpps -> svpps
    • - *
  • apply_arctic -> applyArctic
    • - *
  • reference_stand -> referenceStand
    • - *
  • special_request -> specialRequest
    • - *
  • relevance_file -> relevanceFile
    • - *
  • remarks -> remarks
    • - *
  • valid_flag -> validFlag
    • - *
  • creation_user -> creationUser
    • - *
  • creation_time -> creationTime
    • - *
  • modify_time -> modifyTime
    • - *
  • modify_user -> modifyUser
    • - */ - public static String columnToField(String columnName) { - if (columnName == null) return null; - switch (columnName) { - case "id": return "id"; - case "info_id": return "infoId"; - case "items_num": return "itemsNum"; - case "items_name": return "itemsName"; - case "iterms_conditions": return "itermsConditions"; - case "newcar_put_time": return "newcarPutTime"; - case "product_put_time": return "productPutTime"; - case "menu_id": return "menuId"; - case "svpps": return "svpps"; - case "apply_arctic": return "applyArctic"; - case "reference_stand": return "referenceStand"; - case "special_request": return "specialRequest"; - case "relevance_file": return "relevanceFile"; - case "remarks": return "remarks"; - case "valid_flag": return "validFlag"; - case "creation_user": return "creationUser"; - case "creation_time": return "creationTime"; - case "modify_time": return "modifyTime"; - case "modify_user": return "modifyUser"; - default: return null; - } - } - - /** **/ - public String getId() { - return this.id; - } - - /** **/ - public void setId(String id) { - this.id = id; - } - - /** **/ - public String getInfoId() { - return this.infoId; - } - - /** **/ - public void setInfoId(String infoId) { - this.infoId = infoId; - } - - /** **/ - public String getItemsNum() { - return this.itemsNum; - } - - /** **/ - public void setItemsNum(String itemsNum) { - this.itemsNum = itemsNum; - } - - /** **/ - public String getItemsName() { - return this.itemsName; - } - - /** **/ - public void setItemsName(String itemsName) { - this.itemsName = itemsName; - } - - public String getItermsConditions() { - return itermsConditions; - } - - public void setItermsConditions(String itermsConditions) { - this.itermsConditions = itermsConditions; - } - - /** **/ - public Date getNewcarPutTime() { - return this.newcarPutTime; - } - - /** **/ - public void setNewcarPutTime(Date newcarPutTime) { - this.newcarPutTime = newcarPutTime; - } - - /** **/ - public Date getProductPutTime() { - return this.productPutTime; - } - - /** **/ - public void setProductPutTime(Date productPutTime) { - this.productPutTime = productPutTime; - } - - /** **/ - public String getMenuId() { - return this.menuId; - } - - /** **/ - public void setMenuId(String menuId) { - this.menuId = menuId; - } - - /** **/ - public String getSvpps() { - return this.svpps; - } - - /** **/ - public void setSvpps(String svpps) { - this.svpps = svpps; - } - - /** **/ - public String getApplyArctic() { - return this.applyArctic; - } - - /** **/ - public void setApplyArctic(String applyArctic) { - this.applyArctic = applyArctic; - } - - /** **/ - public String getReferenceStand() { - return this.referenceStand; - } - - /** **/ - public void setReferenceStand(String referenceStand) { - this.referenceStand = referenceStand; - } - - /** **/ - public String getSpecialRequest() { - return this.specialRequest; - } - - /** **/ - public void setSpecialRequest(String specialRequest) { - this.specialRequest = specialRequest; - } - - /** **/ - public String getRelevanceFile() { - return this.relevanceFile; - } - - /** **/ - public void setRelevanceFile(String relevanceFile) { - this.relevanceFile = relevanceFile; - } - - /** **/ - public String getRemarks() { - return this.remarks; - } - - /** **/ - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - /** **/ - public Integer getValidFlag() { - return this.validFlag; - } - - /** **/ - public void setValidFlag(Integer validFlag) { - this.validFlag = validFlag; - } - - /** **/ - public String getCreationUser() { - return this.creationUser; - } - - /** **/ - public void setCreationUser(String creationUser) { - this.creationUser = creationUser; - } - - /** **/ - public Date getCreationTime() { - return this.creationTime; - } - - /** **/ - public void setCreationTime(Date creationTime) { - this.creationTime = creationTime; - } - - /** **/ - public Date getModifyTime() { - return this.modifyTime; - } - - /** **/ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - /** **/ - public String getModifyUser() { - return this.modifyUser; - } - - /** **/ - public void setModifyUser(String modifyUser) { - this.modifyUser = modifyUser; - } - - List itemsCondi; - public List getItemsCondi() { - return itemsCondi; - } - - public void setItemsCondi(List itemsCondi) { - this.itemsCondi = itemsCondi; - } - - public String[] getInfoIdList() { - return infoIdList; - } - - public void setInfoIdList(String[] infoIdList) { - this.infoIdList = infoIdList; - } - - public String[] getIdList() { - return idList; - } - - public void setIdList(String[] idList) { - this.idList = idList; - } - - public List getItemValEOList() { - return itemValEOList; - } - - public void setItemValEOList(List itemValEOList) { - this.itemValEOList = itemValEOList; - } - - public String getDelItemIds() { - return delItemIds; - } - - public void setDelItemIds(String delItemIds) { - this.delItemIds = delItemIds; - } - - public String getsMenuId() { - return sMenuId; - } - - public void setsMenuId(String sMenuId) { - this.sMenuId = sMenuId; - } - - public List getParamsList() { - return paramsList; - } - - public void setParamsList(List paramsList) { - this.paramsList = paramsList; - } - - public String getRelevanceFileAttid() { - return relevanceFileAttid; - } - - public void setRelevanceFileAttid(String relevanceFileAttid) { - this.relevanceFileAttid = relevanceFileAttid; - } - - public String getIssForce() { - return issForce; - } - - public void setIssForce(String issForce) { - this.issForce = issForce; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsFileEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsFileEO.java index 6d838eb2e..9a56cd213 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsFileEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsFileEO.java @@ -1,5 +1,7 @@ package com.jero.modules.split.entity; +import lombok.Data; + import java.io.Serializable; import java.util.ArrayList; import java.util.Date; @@ -11,6 +13,7 @@ import java.util.List; * 日期： 2020-03-30
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitItemsFileEO implements Serializable { private static final long serialVersionUID = 1L; @@ -27,168 +30,4 @@ public class SarFileSplitItemsFileEO implements Serializable { private Long pageCount; private List idlist = new ArrayList<>(); private String fileOldName; - - /** - * java字段名转换为原始数据库列名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • standId -> stand_id
    • - *
  • resId -> res_id
    • - *
  • attId -> att_id
    • - *
  • useModel -> use_model
    • - *
  • validFlag -> valid_flag
    • - *
  • creationTime -> creation_time
    • - *
  • modifyTime -> modify_time
    • - *
  • pageCount -> page_count
    • - */ - public static String fieldToColumn(String fieldName) { - if (fieldName == null) return null; - switch (fieldName) { - case "id": return "id"; - case "standId": return "stand_id"; - case "resId": return "res_id"; - case "attId": return "att_id"; - case "useModel": return "use_model"; - case "validFlag": return "valid_flag"; - case "creationTime": return "creation_time"; - case "modifyTime": return "modify_time"; - case "pageCount": return "page_count"; - default: return null; - } - } - - /** - * 原始数据库列名转换为java字段名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • stand_id -> standId
    • - *
  • res_id -> resId
    • - *
  • att_id -> attId
    • - *
  • use_model -> useModel
    • - *
  • valid_flag -> validFlag
    • - *
  • creation_time -> creationTime
    • - *
  • modify_time -> modifyTime
    • - *
  • page_count -> pageCount
    • - */ - public static String columnToField(String columnName) { - if (columnName == null) return null; - switch (columnName) { - case "id": return "id"; - case "stand_id": return "standId"; - case "res_id": return "resId"; - case "att_id": return "attId"; - case "use_model": return "useModel"; - case "valid_flag": return "validFlag"; - case "creation_time": return "creationTime"; - case "modify_time": return "modifyTime"; - case "page_count": return "pageCount"; - default: return null; - } - } - - /** **/ - public String getId() { - return this.id; - } - - /** **/ - public void setId(String id) { - this.id = id; - } - - /** **/ - public String getStandId() { - return this.standId; - } - - /** **/ - public void setStandId(String standId) { - this.standId = standId; - } - - /** **/ - public String getResId() { - return this.resId; - } - - /** **/ - public void setResId(String resId) { - this.resId = resId; - } - - /** **/ - public String getAttId() { - return this.attId; - } - - /** **/ - public void setAttId(String attId) { - this.attId = attId; - } - - /** **/ - public String getUseModel() { - return this.useModel; - } - - /** **/ - public void setUseModel(String useModel) { - this.useModel = useModel; - } - - /** **/ - public Integer getValidFlag() { - return this.validFlag; - } - - /** **/ - public void setValidFlag(Integer validFlag) { - this.validFlag = validFlag; - } - - /** **/ - public Date getCreationTime() { - return this.creationTime; - } - - /** **/ - public void setCreationTime(Date creationTime) { - this.creationTime = creationTime; - } - - /** **/ - public Date getModifyTime() { - return this.modifyTime; - } - - /** **/ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - /** **/ - public Long getPageCount() { - return this.pageCount; - } - - /** **/ - public void setPageCount(Long pageCount) { - this.pageCount = pageCount; - } - - public List getIdlist() { - return idlist; - } - - public void setIdlist(List idlist) { - this.idlist = idlist; - } - - public String getFileOldName() { - return fileOldName; - } - - public void setFileOldName(String fileOldName) { - this.fileOldName = fileOldName; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsParamsEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsParamsEO.java index 9e8641a46..39685357e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsParamsEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsParamsEO.java @@ -1,5 +1,7 @@ package com.jero.modules.split.entity; +import lombok.Data; + import java.io.Serializable; import java.util.Date; @@ -9,6 +11,7 @@ import java.util.Date; * 日期： 2020-02-04
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitItemsParamsEO implements Serializable { private static final long serialVersionUID = 1L; @@ -22,139 +25,4 @@ public class SarFileSplitItemsParamsEO implements Serializable { @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date modifyTime; private String infoId; - - /** - * java字段名转换为原始数据库列名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • itemId -> item_id
    • - *
  • description -> description
    • - *
  • figure -> figure
    • - *
  • validFlag -> valid_flag
    • - *
  • creationTime -> creation_time
    • - *
  • modifyTime -> modify_time
    • - *
  • infoId -> info_id
    • - */ - public static String fieldToColumn(String fieldName) { - if (fieldName == null) return null; - switch (fieldName) { - case "id": return "id"; - case "itemId": return "item_id"; - case "description": return "description"; - case "figure": return "figure"; - case "validFlag": return "valid_flag"; - case "creationTime": return "creation_time"; - case "modifyTime": return "modify_time"; - case "infoId": return "info_id"; - default: return null; - } - } - - /** - * 原始数据库列名转换为java字段名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • item_id -> itemId
    • - *
  • description -> description
    • - *
  • figure -> figure
    • - *
  • valid_flag -> validFlag
    • - *
  • creation_time -> creationTime
    • - *
  • modify_time -> modifyTime
    • - *
  • info_id -> infoId
    • - */ - public static String columnToField(String columnName) { - if (columnName == null) return null; - switch (columnName) { - case "id": return "id"; - case "item_id": return "itemId"; - case "description": return "description"; - case "figure": return "figure"; - case "valid_flag": return "validFlag"; - case "creation_time": return "creationTime"; - case "modify_time": return "modifyTime"; - case "info_id": return "infoId"; - default: return null; - } - } - - /** **/ - public String getId() { - return this.id; - } - - /** **/ - public void setId(String id) { - this.id = id; - } - - /** **/ - public String getItemId() { - return this.itemId; - } - - /** **/ - public void setItemId(String itemId) { - this.itemId = itemId; - } - - /** **/ - public String getDescription() { - return this.description; - } - - /** **/ - public void setDescription(String description) { - this.description = description; - } - - /** **/ - public String getFigure() { - return this.figure; - } - - /** **/ - public void setFigure(String figure) { - this.figure = figure; - } - - /** **/ - public Integer getValidFlag() { - return this.validFlag; - } - - /** **/ - public void setValidFlag(Integer validFlag) { - this.validFlag = validFlag; - } - - /** **/ - public Date getCreationTime() { - return this.creationTime; - } - - /** **/ - public void setCreationTime(Date creationTime) { - this.creationTime = creationTime; - } - - /** **/ - public Date getModifyTime() { - return this.modifyTime; - } - - /** **/ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - /** **/ - public String getInfoId() { - return this.infoId; - } - - /** **/ - public void setInfoId(String infoId) { - this.infoId = infoId; - } - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsResEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsResEO.java index fbb6a056e..85d896766 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsResEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsResEO.java @@ -1,5 +1,7 @@ package com.jero.modules.split.entity; +import lombok.Data; + import java.io.Serializable; import java.util.ArrayList; import java.util.Date; @@ -11,6 +13,7 @@ import java.util.List; * 日期： 2020-03-30
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitItemsResEO implements Serializable { private static final long serialVersionUID = 1L; @@ -26,146 +29,4 @@ public class SarFileSplitItemsResEO implements Serializable { private Date modifyTime; private List idlist = new ArrayList<>(); - - /** - * java字段名转换为原始数据库列名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • standId -> stand_id
    • - *
  • standFileClassify -> stand_file_classify
    • - *
  • fileName -> file_name
    • - *
  • fileSuffix -> file_suffix
    • - *
  • validFlag -> valid_flag
    • - *
  • creationTime -> creation_time
    • - *
  • modifyTime -> modify_time
    • - */ - public static String fieldToColumn(String fieldName) { - if (fieldName == null) return null; - switch (fieldName) { - case "id": return "id"; - case "standId": return "stand_id"; - case "standFileClassify": return "stand_file_classify"; - case "fileName": return "file_name"; - case "fileSuffix": return "file_suffix"; - case "validFlag": return "valid_flag"; - case "creationTime": return "creation_time"; - case "modifyTime": return "modify_time"; - default: return null; - } - } - - /** - * 原始数据库列名转换为java字段名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • stand_id -> standId
    • - *
  • stand_file_classify -> standFileClassify
    • - *
  • file_name -> fileName
    • - *
  • file_suffix -> fileSuffix
    • - *
  • valid_flag -> validFlag
    • - *
  • creation_time -> creationTime
    • - *
  • modify_time -> modifyTime
    • - */ - public static String columnToField(String columnName) { - if (columnName == null) return null; - switch (columnName) { - case "id": return "id"; - case "stand_id": return "standId"; - case "stand_file_classify": return "standFileClassify"; - case "file_name": return "fileName"; - case "file_suffix": return "fileSuffix"; - case "valid_flag": return "validFlag"; - case "creation_time": return "creationTime"; - case "modify_time": return "modifyTime"; - default: return null; - } - } - - /** **/ - public String getId() { - return this.id; - } - - /** **/ - public void setId(String id) { - this.id = id; - } - - /** **/ - public String getStandId() { - return this.standId; - } - - /** **/ - public void setStandId(String standId) { - this.standId = standId; - } - - /** **/ - public String getStandFileClassify() { - return this.standFileClassify; - } - - /** **/ - public void setStandFileClassify(String standFileClassify) { - this.standFileClassify = standFileClassify; - } - - /** **/ - public String getFileName() { - return this.fileName; - } - - /** **/ - public void setFileName(String fileName) { - this.fileName = fileName; - } - - /** **/ - public String getFileSuffix() { - return this.fileSuffix; - } - - /** **/ - public void setFileSuffix(String fileSuffix) { - this.fileSuffix = fileSuffix; - } - - /** **/ - public Integer getValidFlag() { - return this.validFlag; - } - - /** **/ - public void setValidFlag(Integer validFlag) { - this.validFlag = validFlag; - } - - /** **/ - public Date getCreationTime() { - return this.creationTime; - } - - /** **/ - public void setCreationTime(Date creationTime) { - this.creationTime = creationTime; - } - - /** **/ - public Date getModifyTime() { - return this.modifyTime; - } - - /** **/ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - public List getIdlist() { - return idlist; - } - - public void setIdlist(List idlist) { - this.idlist = idlist; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsTableEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsTableEO.java index 0339e5ad7..156092db3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsTableEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsTableEO.java @@ -1,5 +1,7 @@ package com.jero.modules.split.entity; +import lombok.Data; + import java.io.Serializable; import java.util.Date; @@ -9,6 +11,7 @@ import java.util.Date; * 日期： 2020-01-17
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitItemsTableEO implements Serializable { private static final long serialVersionUID = 1L; @@ -24,167 +27,4 @@ public class SarFileSplitItemsTableEO implements Serializable { @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date modifyTime; private String modifyUser; - - /** - * java字段名转换为原始数据库列名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • itemsValId -> items_val_id
    • - *
  • itemsId -> items_id
    • - *
  • rowNum -> row_num
    • - *
  • colNum -> col_num
    • - *
  • content -> content
    • - *
  • validFlag -> valid_flag
    • - *
  • creationTime -> creation_time
    • - *
  • modifyTime -> modify_time
    • - *
  • modifyUser -> modify_user
    • - */ - public static String fieldToColumn(String fieldName) { - if (fieldName == null) return null; - switch (fieldName) { - case "id": return "id"; - case "itemsValId": return "items_val_id"; - case "itemsId": return "items_id"; - case "rowNum": return "row_num"; - case "colNum": return "col_num"; - case "content": return "content"; - case "validFlag": return "valid_flag"; - case "creationTime": return "creation_time"; - case "modifyTime": return "modify_time"; - case "modifyUser": return "modify_user"; - default: return null; - } - } - - /** - * 原始数据库列名转换为java字段名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • items_val_id -> itemsValId
    • - *
  • items_id -> itemsId
    • - *
  • row_num -> rowNum
    • - *
  • col_num -> colNum
    • - *
  • content -> content
    • - *
  • valid_flag -> validFlag
    • - *
  • creation_time -> creationTime
    • - *
  • modify_time -> modifyTime
    • - *
  • modify_user -> modifyUser
    • - */ - public static String columnToField(String columnName) { - if (columnName == null) return null; - switch (columnName) { - case "id": return "id"; - case "items_val_id": return "itemsValId"; - case "items_id": return "itemsId"; - case "row_num": return "rowNum"; - case "col_num": return "colNum"; - case "content": return "content"; - case "valid_flag": return "validFlag"; - case "creation_time": return "creationTime"; - case "modify_time": return "modifyTime"; - case "modify_user": return "modifyUser"; - default: return null; - } - } - - /** **/ - public String getId() { - return this.id; - } - - /** **/ - public void setId(String id) { - this.id = id; - } - - /** **/ - public String getItemsValId() { - return this.itemsValId; - } - - /** **/ - public void setItemsValId(String itemsValId) { - this.itemsValId = itemsValId; - } - - /** **/ - public String getItemsId() { - return this.itemsId; - } - - /** **/ - public void setItemsId(String itemsId) { - this.itemsId = itemsId; - } - - /** **/ - public Integer getRowNum() { - return this.rowNum; - } - - /** **/ - public void setRowNum(Integer rowNum) { - this.rowNum = rowNum; - } - - /** **/ - public Integer getColNum() { - return this.colNum; - } - - /** **/ - public void setColNum(Integer colNum) { - this.colNum = colNum; - } - - /** **/ - public String getContent() { - return this.content; - } - - /** **/ - public void setContent(String content) { - this.content = content; - } - - /** **/ - public Integer getValidFlag() { - return this.validFlag; - } - - /** **/ - public void setValidFlag(Integer validFlag) { - this.validFlag = validFlag; - } - - /** **/ - public Date getCreationTime() { - return this.creationTime; - } - - /** **/ - public void setCreationTime(Date creationTime) { - this.creationTime = creationTime; - } - - /** **/ - public Date getModifyTime() { - return this.modifyTime; - } - - /** **/ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - /** **/ - public String getModifyUser() { - return this.modifyUser; - } - - /** **/ - public void setModifyUser(String modifyUser) { - this.modifyUser = modifyUser; - } - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsValEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsValEO.java index f7eb7d47c..2712f0d21 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsValEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsValEO.java @@ -2,6 +2,7 @@ package com.jero.modules.split.entity; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.modules.split.common.UploadFileInfo; +import lombok.Data; import java.io.Serializable; import java.util.Date; @@ -13,6 +14,7 @@ import java.util.List; * 日期： 2020-01-07
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitItemsValEO implements Serializable { private static final long serialVersionUID = 1L; @@ -35,221 +37,4 @@ public class SarFileSplitItemsValEO implements Serializable { private List tableList; private List> tableListShow; private int rowCount; - - /** - * java字段名转换为原始数据库列名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • type -> type
    • - *
  • itemId -> item_id
    • - *
  • itemContent -> item_content
    • - *
  • validFlag -> valid_flag
    • - *
  • creationUser -> creation_user
    • - *
  • creationTime -> creation_time
    • - *
  • modifyTime -> modify_time
    • - *
  • modifyUser -> modify_user
    • - *
  • displaySeq -> display_seq
    • - */ - public static String fieldToColumn(String fieldName) { - if (fieldName == null) return null; - switch (fieldName) { - case "id": return "id"; - case "type": return "type"; - case "itemId": return "item_id"; - case "itemContent": return "item_content"; - case "validFlag": return "valid_flag"; - case "creationUser": return "creation_user"; - case "creationTime": return "creation_time"; - case "modifyTime": return "modify_time"; - case "modifyUser": return "modify_user"; - case "displaySeq": return "display_seq"; - default: return null; - } - } - - /** - * 原始数据库列名转换为java字段名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • type -> type
    • - *
  • item_id -> itemId
    • - *
  • item_content -> itemContent
    • - *
  • valid_flag -> validFlag
    • - *
  • creation_user -> creationUser
    • - *
  • creation_time -> creationTime
    • - *
  • modify_time -> modifyTime
    • - *
  • modify_user -> modifyUser
    • - *
  • display_seq -> displaySeq
    • - */ - public static String columnToField(String columnName) { - if (columnName == null) return null; - switch (columnName) { - case "id": return "id"; - case "type": return "type"; - case "item_id": return "itemId"; - case "item_content": return "itemContent"; - case "valid_flag": return "validFlag"; - case "creation_user": return "creationUser"; - case "creation_time": return "creationTime"; - case "modify_time": return "modifyTime"; - case "modify_user": return "modifyUser"; - case "display_seq": return "displaySeq"; - default: return null; - } - } - - public Integer getIndexItem() { - return indexItem; - } - - public void setIndexItem(Integer indexItem) { - this.indexItem = indexItem; - } - - /** **/ - public String getId() { - return this.id; - } - - /** **/ - public void setId(String id) { - this.id = id; - } - - /** **/ - public String getType() { - return this.type; - } - - /** **/ - public void setType(String type) { - this.type = type; - } - - /** **/ - public String getItemId() { - return this.itemId; - } - - /** **/ - public void setItemId(String itemId) { - this.itemId = itemId; - } - - /** **/ - public String getItemContent() { - return itemContent; - } - - public void setItemContent(String itemContent) { - this.itemContent = itemContent; - } - - /** **/ - public Integer getValidFlag() { - return this.validFlag; - } - - /** **/ - public void setValidFlag(Integer validFlag) { - this.validFlag = validFlag; - } - - /** **/ - public String getCreationUser() { - return this.creationUser; - } - - /** **/ - public void setCreationUser(String creationUser) { - this.creationUser = creationUser; - } - - /** **/ - public Date getCreationTime() { - return this.creationTime; - } - - /** **/ - public void setCreationTime(Date creationTime) { - this.creationTime = creationTime; - } - - /** **/ - public Date getModifyTime() { - return this.modifyTime; - } - - /** **/ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - /** **/ - public String getModifyUser() { - return this.modifyUser; - } - - /** **/ - public void setModifyUser(String modifyUser) { - this.modifyUser = modifyUser; - } - - /** **/ - public Integer getDisplaySeq() { - return this.displaySeq; - } - - /** **/ - public void setDisplaySeq(Integer displaySeq) { - this.displaySeq = displaySeq; - } - - public String[] getIdList() { - return idList; - } - - public void setIdList(String[] idList) { - this.idList = idList; - } - - public List getDefaultFileList() { - return defaultFileList; - } - - public void setDefaultFileList(List defaultFileList) { - this.defaultFileList = defaultFileList; - } - - public String getImgName() { - return imgName; - } - - public void setImgName(String imgName) { - this.imgName = imgName; - } - - public List getTableList() { - return tableList; - } - - public void setTableList(List tableList) { - this.tableList = tableList; - } - - public int getRowCount() { - return rowCount; - } - - public void setRowCount(int rowCount) { - this.rowCount = rowCount; - } - - public List> getTableListShow() { - return tableListShow; - } - - public void setTableListShow(List> tableListShow) { - this.tableListShow = tableListShow; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java index b6a896a93..85120386f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java @@ -2,6 +2,7 @@ package com.jero.modules.split.entity; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.system.vo.LoginUser; +import lombok.Data; import org.apache.shiro.SecurityUtils; import java.io.Serializable; @@ -15,6 +16,7 @@ import java.util.List; * 日期： 2020-01-03
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitMenuEO implements Serializable { private static final long serialVersionUID = 1L; @@ -39,268 +41,4 @@ public class SarFileSplitMenuEO implements Serializable { private Long childrenCount; private List children = new ArrayList<>(); - /** - * java字段名转换为原始数据库列名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • infoId -> info_id
    • - *
  • name -> name
    • - *
  • pId -> p_id
    • - *
  • displaySeq -> display_seq
    • - *
  • validFlag -> valid_flag
    • - *
  • creationTime -> creation_time
    • - *
  • modifyTime -> modify_time
    • - *
  • remarks -> remarks
    • - *
  • creationUser -> creation_user
    • - *
  • modifyUser -> modify_user
    • - */ - public static String fieldToColumn(String fieldName) { - if (fieldName == null) return null; - switch (fieldName) { - case "id": return "id"; - case "infoId": return "info_id"; - case "name": return "name"; - case "pId": return "p_id"; - case "displaySeq": return "display_seq"; - case "validFlag": return "valid_flag"; - case "creationTime": return "creation_time"; - case "modifyTime": return "modify_time"; - case "remarks": return "remarks"; - case "creationUser": return "creation_user"; - case "modifyUser": return "modify_user"; - default: return null; - } - } - - /** - * 原始数据库列名转换为java字段名。如果不存在则返回null
    - *

    字段列表：

    - *
  • id -> id
    • - *
  • info_id -> infoId
    • - *
  • name -> name
    • - *
  • p_id -> pId
    • - *
  • display_seq -> displaySeq
    • - *
  • valid_flag -> validFlag
    • - *
  • creation_time -> creationTime
    • - *
  • modify_time -> modifyTime
    • - *
  • remarks -> remarks
    • - *
  • creation_user -> creationUser
    • - *
  • modify_user -> modifyUser
    • - */ - public static String columnToField(String columnName) { - if (columnName == null) return null; - switch (columnName) { - case "id": return "id"; - case "info_id": return "infoId"; - case "name": return "name"; - case "p_id": return "pId"; - case "display_seq": return "displaySeq"; - case "valid_flag": return "validFlag"; - case "creation_time": return "creationTime"; - case "modify_time": return "modifyTime"; - case "remarks": return "remarks"; - case "creation_user": return "creationUser"; - case "modify_user": return "modifyUser"; - default: return null; - } - } - - /** **/ - public String getId() { - return this.id; - } - - /** **/ - public void setId(String id) { - this.id = id; - } - - /** **/ - public String getInfoId() { - return this.infoId; - } - - /** **/ - public void setInfoId(String infoId) { - this.infoId = infoId; - } - - /** **/ - public String getName() { - return this.name; - } - - /** **/ - public void setName(String name) { - this.name = name; - } - - /** **/ - public String getPId() { - return this.pId; - } - - /** **/ - public void setPId(String pId) { - this.pId = pId; - } - - /** **/ - public Long getDisplaySeq() { - return this.displaySeq; - } - - /** **/ - public void setDisplaySeq(Long displaySeq) { - this.displaySeq = displaySeq; - } - - /** **/ - public Integer getValidFlag() { - return this.validFlag; - } - - /** **/ - public void setValidFlag(Integer validFlag) { - this.validFlag = validFlag; - } - - /** **/ - public Date getCreationTime() { - return this.creationTime; - } - - /** **/ - public void setCreationTime(Date creationTime) { - this.creationTime = creationTime; - } - - /** **/ - public Date getModifyTime() { - return this.modifyTime; - } - - /** **/ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - /** **/ - public String getRemarks() { - return this.remarks; - } - - /** **/ - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - /** **/ - public String getCreationUser() { - return this.creationUser; - } - - /** **/ - public void setCreationUser(String creationUser) { - this.creationUser = creationUser; - } - - /** **/ - public String getModifyUser() { - return this.modifyUser; - } - - /** **/ - public void setModifyUser(String modifyUser) { - this.modifyUser = modifyUser; - } - - public String getpId() { - return pId; - } - - public void setpId(String pId) { - this.pId = pId; - } - - - public String[] getInfoIdList() { - return infoIdList; - } - - public void setInfoIdList(String[] infoIdList) { - this.infoIdList = infoIdList; - } - - public SarFileSplitMenuEO(){ - } - - public SarFileSplitMenuEO(String id, String name, String parentId, String infoId, Long displaySeq,String itemName) { - this.id = id; - this.name = name; - this.pId = parentId; - this.infoId = infoId; - this.displaySeq = displaySeq; - this.validFlag = 0; - this.creationTime = new Date(); - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - this.creationUser = sysUser.getId(); - this.modifyTime = new Date(); - this.modifyUser = sysUser.getId(); - this.itemName = itemName; - } - - public SarFileSplitMenuEO(String id, String name, String infoId,Long displaySeq,String itemName) { - this.id = id; - this.name = name; - this.infoId = infoId; - this.displaySeq = displaySeq; - this.validFlag = 0; - this.creationTime = new Date(); - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - this.creationUser = sysUser.getId(); - this.modifyTime = new Date(); - this.modifyUser = sysUser.getId(); - this.itemName = itemName; - } - - public Long getDisplaySeqStart() { - return displaySeqStart; - } - - public void setDisplaySeqStart(Long displaySeqStart) { - this.displaySeqStart = displaySeqStart; - } - - public Long getDisplaySeqEnd() { - return displaySeqEnd; - } - - public void setDisplaySeqEnd(Long displaySeqEnd) { - this.displaySeqEnd = displaySeqEnd; - } - - public String getItemName() { - return itemName; - } - - public void setItemName(String itemName) { - this.itemName = itemName; - } - - public Long getChildrenCount() { - return childrenCount; - } - - public void setChildrenCount(Long childrenCount) { - this.childrenCount = childrenCount; - } - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuTreeModel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuTreeModel.java index fa5f44b73..7ff893bd7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuTreeModel.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuTreeModel.java @@ -1,5 +1,7 @@ package com.jero.modules.split.entity; +import lombok.Data; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -7,6 +9,7 @@ import java.util.List; /** * 标准拆分，存储树形结构实体。 */ +@Data public class SarFileSplitMenuTreeModel implements Serializable { private static final long serialVersionUID = 1L; @@ -18,67 +21,4 @@ public class SarFileSplitMenuTreeModel implements Serializable { private String name; private List children = new ArrayList<>(); - - public SarFileSplitMenuTreeModel() { - } - - public static long getSerialVersionUID() { - return serialVersionUID; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getParendId() { - return parendId; - } - - public void setParendId(String parendId) { - this.parendId = parendId; - } - - public String getItemNum() { - return itemNum; - } - - public void setItemNum(String itemNum) { - this.itemNum = itemNum; - } - - public String getItemName() { - return itemName; - } - - public void setItemName(String itemName) { - this.itemName = itemName; - } - - public String getItermsConditions() { - return itermsConditions; - } - - public void setItermsConditions(String itermsConditions) { - this.itermsConditions = itermsConditions; - } - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitInfoMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitInfoMapper.java index bdd3c022a..78c82387f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitInfoMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitInfoMapper.java @@ -1,9 +1,6 @@ package com.jero.modules.split.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.split.entity.SarFileSplitInfo; +import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -12,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Date: 2022-03-03 * @Version: V1.0 */ -public interface SarFileSplitInfoMapper extends BaseMapper { +public interface SarFileSplitInfoMapper extends BaseMapper { } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitInfoMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitInfoMapper.xml index 97210b387..b39469502 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitInfoMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitInfoMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitInfoEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitInfoEOPage.java index cc715ffb8..6d80fc16a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitInfoEOPage.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitInfoEOPage.java @@ -1,6 +1,6 @@ package com.jero.modules.split.page; -import com.jero.modules.split.common.BasePage; +import lombok.Data; /** * 功能：SAR_FILE_SPLIT_INFO SarFileSplitInfoEOPage
    @@ -8,296 +8,50 @@ import com.jero.modules.split.common.BasePage; * 日期： 2020-01-03
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ -public class SarFileSplitInfoEOPage extends BasePage { - - private String sarType; - private String sarTypeOperator = "="; - private String fileName; - private String fileNameOperator = "="; +@Data +public class SarFileSplitInfoEOPage { + /**主键*/ private String id; - private String idOperator = "="; - private String standId; - private String standIdOperator = "="; + + /**创建人*/ + private String createBy; + + /**拆分时间*/ + private java.util.Date createTime; + + /**更新人*/ + private String updateBy; + + /**更新日期*/ + private java.util.Date updateTime; + + /**所属部门*/ + private String sysOrgCode; + + /**编号*/ + private String serialNumber; + + /**标题*/ + private String title; + + /**文本状态*/ private String fileType; - private String fileTypeOperator = "="; - private String attId; - private String attIdOperator = "="; - private String validFlag; - private String validFlagOperator = "="; - private String creationTime; - private String creationTime1; - private String creationTime2; - private String creationTimeOperator = "="; - private String creationUser; - private String creationUserOperator = "="; - private String modifyTime; - private String modifyTime1; - private String modifyTime2; - private String modifyTimeOperator = "="; - private String modifyUser; - private String modifyUserOperator = "="; - private String numOrName; + /**文件名称*/ + private String fileName; - private String standNumber; - private String fileSplitState; - private String standExecuteState; - private String[] idList; - private String userName; //姓名 + /**拆分结果*/ + private String splitResult; - public String getStandExecuteState() { - return standExecuteState; - } + /**文件id*/ + private String fileId; - public void setStandExecuteState(String standExecuteState) { - this.standExecuteState = standExecuteState; - } + //分页 + private Integer pageNo; + private Integer pageSize; - public String getUserName() { - return userName; - } + //排序 + private String orderBy; + private String orderByField; - public void setUserName(String userName) { - this.userName = userName; - } - - public String[] getIdList() { - return idList; - } - - public void setIdList(String[] idList) { - this.idList = idList; - } - - public String getFileSplitState() { - return fileSplitState; - } - - public void setFileSplitState(String fileSplitState) { - this.fileSplitState = fileSplitState; - } - - public String getSarType() { - return this.sarType; - } - - public void setSarType(String sarType) { - this.sarType = sarType; - } - - public String getSarTypeOperator() { - return this.sarTypeOperator; - } - - public void setSarTypeOperator(String sarTypeOperator) { - this.sarTypeOperator = sarTypeOperator; - } - - public String getFileName() { - return this.fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName; - } - - public String getFileNameOperator() { - return this.fileNameOperator; - } - - public void setFileNameOperator(String fileNameOperator) { - this.fileNameOperator = fileNameOperator; - } - - public String getId() { - return this.id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIdOperator() { - return this.idOperator; - } - - public void setIdOperator(String idOperator) { - this.idOperator = idOperator; - } - - public String getStandId() { - return this.standId; - } - - public void setStandId(String standId) { - this.standId = standId; - } - - public String getStandIdOperator() { - return this.standIdOperator; - } - - public void setStandIdOperator(String standIdOperator) { - this.standIdOperator = standIdOperator; - } - - public String getFileType() { - return this.fileType; - } - - public void setFileType(String fileType) { - this.fileType = fileType; - } - - public String getFileTypeOperator() { - return this.fileTypeOperator; - } - - public void setFileTypeOperator(String fileTypeOperator) { - this.fileTypeOperator = fileTypeOperator; - } - - public String getAttId() { - return this.attId; - } - - public void setAttId(String attId) { - this.attId = attId; - } - - public String getAttIdOperator() { - return this.attIdOperator; - } - - public void setAttIdOperator(String attIdOperator) { - this.attIdOperator = attIdOperator; - } - - public String getValidFlag() { - return this.validFlag; - } - - public void setValidFlag(String validFlag) { - this.validFlag = validFlag; - } - - public String getValidFlagOperator() { - return this.validFlagOperator; - } - - public void setValidFlagOperator(String validFlagOperator) { - this.validFlagOperator = validFlagOperator; - } - - public String getCreationTime() { - return this.creationTime; - } - - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - - public String getCreationTime1() { - return this.creationTime1; - } - - public void setCreationTime1(String creationTime1) { - this.creationTime1 = creationTime1; - } - - public String getCreationTime2() { - return this.creationTime2; - } - - public void setCreationTime2(String creationTime2) { - this.creationTime2 = creationTime2; - } - - public String getCreationTimeOperator() { - return this.creationTimeOperator; - } - - public void setCreationTimeOperator(String creationTimeOperator) { - this.creationTimeOperator = creationTimeOperator; - } - - public String getCreationUser() { - return this.creationUser; - } - - public void setCreationUser(String creationUser) { - this.creationUser = creationUser; - } - - public String getCreationUserOperator() { - return this.creationUserOperator; - } - - public void setCreationUserOperator(String creationUserOperator) { - this.creationUserOperator = creationUserOperator; - } - - public String getModifyTime() { - return this.modifyTime; - } - - public void setModifyTime(String modifyTime) { - this.modifyTime = modifyTime; - } - - public String getModifyTime1() { - return this.modifyTime1; - } - - public void setModifyTime1(String modifyTime1) { - this.modifyTime1 = modifyTime1; - } - - public String getModifyTime2() { - return this.modifyTime2; - } - - public void setModifyTime2(String modifyTime2) { - this.modifyTime2 = modifyTime2; - } - - public String getModifyTimeOperator() { - return this.modifyTimeOperator; - } - - public void setModifyTimeOperator(String modifyTimeOperator) { - this.modifyTimeOperator = modifyTimeOperator; - } - - public String getModifyUser() { - return this.modifyUser; - } - - public void setModifyUser(String modifyUser) { - this.modifyUser = modifyUser; - } - - public String getModifyUserOperator() { - return this.modifyUserOperator; - } - - public void setModifyUserOperator(String modifyUserOperator) { - this.modifyUserOperator = modifyUserOperator; - } - - public String getNumOrName() { - return numOrName; - } - - public void setNumOrName(String numOrName) { - this.numOrName = numOrName; - } - - public String getStandNumber() { - return standNumber; - } - - public void setStandNumber(String standNumber) { - this.standNumber = standNumber; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java index 5896c6bb9..640b5b44b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java @@ -2,6 +2,7 @@ package com.jero.modules.split.page; import com.jero.modules.split.common.BasePage; import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import lombok.Data; import java.util.List; @@ -11,6 +12,7 @@ import java.util.List; * 日期： 2020-01-03
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitItemsEOPage extends BasePage { private String id; @@ -67,420 +69,4 @@ public class SarFileSplitItemsEOPage extends BasePage { private List targetItemValEOList; private String targetMenuId; - - public List getTargetItemValEOList() { - return targetItemValEOList; - } - - public void setTargetItemValEOList(List targetItemValEOList) { - this.targetItemValEOList = targetItemValEOList; - } - - public String getTargetMenuId() { - return targetMenuId; - } - - public void setTargetMenuId(String targetMenuId) { - this.targetMenuId = targetMenuId; - } - - public String getId() { - return this.id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIdOperator() { - return this.idOperator; - } - - public void setIdOperator(String idOperator) { - this.idOperator = idOperator; - } - - public String getInfoId() { - return this.infoId; - } - - public void setInfoId(String infoId) { - this.infoId = infoId; - } - - public String getInfoIdOperator() { - return this.infoIdOperator; - } - - public void setInfoIdOperator(String infoIdOperator) { - this.infoIdOperator = infoIdOperator; - } - - public String getItemsNum() { - return this.itemsNum; - } - - public void setItemsNum(String itemsNum) { - this.itemsNum = itemsNum; - } - - public String getItemsNumOperator() { - return this.itemsNumOperator; - } - - public void setItemsNumOperator(String itemsNumOperator) { - this.itemsNumOperator = itemsNumOperator; - } - - public String getItemsName() { - return this.itemsName; - } - - public void setItemsName(String itemsName) { - this.itemsName = itemsName; - } - - public String getItemsNameOperator() { - return this.itemsNameOperator; - } - - public void setItemsNameOperator(String itemsNameOperator) { - this.itemsNameOperator = itemsNameOperator; - } - - public String getItermsConditions() { - return this.itermsConditions; - } - - public void setItermsConditions(String itermsConditions) { - this.itermsConditions = itermsConditions; - } - - public String getItermsConditionsOperator() { - return this.itermsConditionsOperator; - } - - public void setItermsConditionsOperator(String itermsConditionsOperator) { - this.itermsConditionsOperator = itermsConditionsOperator; - } - - public String getNewcarPutTime() { - return this.newcarPutTime; - } - - public void setNewcarPutTime(String newcarPutTime) { - this.newcarPutTime = newcarPutTime; - } - - public String getNewcarPutTime1() { - return this.newcarPutTime1; - } - - public void setNewcarPutTime1(String newcarPutTime1) { - this.newcarPutTime1 = newcarPutTime1; - } - - public String getNewcarPutTime2() { - return this.newcarPutTime2; - } - - public void setNewcarPutTime2(String newcarPutTime2) { - this.newcarPutTime2 = newcarPutTime2; - } - - public String getNewcarPutTimeOperator() { - return this.newcarPutTimeOperator; - } - - public void setNewcarPutTimeOperator(String newcarPutTimeOperator) { - this.newcarPutTimeOperator = newcarPutTimeOperator; - } - - public String getProductPutTime() { - return this.productPutTime; - } - - public void setProductPutTime(String productPutTime) { - this.productPutTime = productPutTime; - } - - public String getProductPutTime1() { - return this.productPutTime1; - } - - public void setProductPutTime1(String productPutTime1) { - this.productPutTime1 = productPutTime1; - } - - public String getProductPutTime2() { - return this.productPutTime2; - } - - public void setProductPutTime2(String productPutTime2) { - this.productPutTime2 = productPutTime2; - } - - public String getProductPutTimeOperator() { - return this.productPutTimeOperator; - } - - public void setProductPutTimeOperator(String productPutTimeOperator) { - this.productPutTimeOperator = productPutTimeOperator; - } - - public String getMenuId() { - return this.menuId; - } - - public void setMenuId(String menuId) { - this.menuId = menuId; - } - - public String getMenuIdOperator() { - return this.menuIdOperator; - } - - public void setMenuIdOperator(String menuIdOperator) { - this.menuIdOperator = menuIdOperator; - } - - public String getSvpps() { - return this.svpps; - } - - public void setSvpps(String svpps) { - this.svpps = svpps; - } - - public String getSvppsOperator() { - return this.svppsOperator; - } - - public void setSvppsOperator(String svppsOperator) { - this.svppsOperator = svppsOperator; - } - - public String getApplyArctic() { - return this.applyArctic; - } - - public void setApplyArctic(String applyArctic) { - this.applyArctic = applyArctic; - } - - public String getApplyArcticOperator() { - return this.applyArcticOperator; - } - - public void setApplyArcticOperator(String applyArcticOperator) { - this.applyArcticOperator = applyArcticOperator; - } - - public String getReferenceStand() { - return this.referenceStand; - } - - public void setReferenceStand(String referenceStand) { - this.referenceStand = referenceStand; - } - - public String getReferenceStandOperator() { - return this.referenceStandOperator; - } - - public void setReferenceStandOperator(String referenceStandOperator) { - this.referenceStandOperator = referenceStandOperator; - } - - public String getSpecialRequest() { - return this.specialRequest; - } - - public void setSpecialRequest(String specialRequest) { - this.specialRequest = specialRequest; - } - - public String getSpecialRequestOperator() { - return this.specialRequestOperator; - } - - public void setSpecialRequestOperator(String specialRequestOperator) { - this.specialRequestOperator = specialRequestOperator; - } - - public String getRelevanceFile() { - return this.relevanceFile; - } - - public void setRelevanceFile(String relevanceFile) { - this.relevanceFile = relevanceFile; - } - - public String getRelevanceFileOperator() { - return this.relevanceFileOperator; - } - - public void setRelevanceFileOperator(String relevanceFileOperator) { - this.relevanceFileOperator = relevanceFileOperator; - } - - public String getRemarks() { - return this.remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public String getRemarksOperator() { - return this.remarksOperator; - } - - public void setRemarksOperator(String remarksOperator) { - this.remarksOperator = remarksOperator; - } - - public String getValidFlag() { - return this.validFlag; - } - - public void setValidFlag(String validFlag) { - this.validFlag = validFlag; - } - - public String getValidFlagOperator() { - return this.validFlagOperator; - } - - public void setValidFlagOperator(String validFlagOperator) { - this.validFlagOperator = validFlagOperator; - } - - public String getCreationUser() { - return this.creationUser; - } - - public void setCreationUser(String creationUser) { - this.creationUser = creationUser; - } - - public String getCreationUserOperator() { - return this.creationUserOperator; - } - - public void setCreationUserOperator(String creationUserOperator) { - this.creationUserOperator = creationUserOperator; - } - - public String getCreationTime() { - return this.creationTime; - } - - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - - public String getCreationTime1() { - return this.creationTime1; - } - - public void setCreationTime1(String creationTime1) { - this.creationTime1 = creationTime1; - } - - public String getCreationTime2() { - return this.creationTime2; - } - - public void setCreationTime2(String creationTime2) { - this.creationTime2 = creationTime2; - } - - public String getCreationTimeOperator() { - return this.creationTimeOperator; - } - - public void setCreationTimeOperator(String creationTimeOperator) { - this.creationTimeOperator = creationTimeOperator; - } - - public String getModifyTime() { - return this.modifyTime; - } - - public void setModifyTime(String modifyTime) { - this.modifyTime = modifyTime; - } - - public String getModifyTime1() { - return this.modifyTime1; - } - - public void setModifyTime1(String modifyTime1) { - this.modifyTime1 = modifyTime1; - } - - public String getModifyTime2() { - return this.modifyTime2; - } - - public void setModifyTime2(String modifyTime2) { - this.modifyTime2 = modifyTime2; - } - - public String getModifyTimeOperator() { - return this.modifyTimeOperator; - } - - public void setModifyTimeOperator(String modifyTimeOperator) { - this.modifyTimeOperator = modifyTimeOperator; - } - - public String getModifyUser() { - return this.modifyUser; - } - - public void setModifyUser(String modifyUser) { - this.modifyUser = modifyUser; - } - - public String getModifyUserOperator() { - return this.modifyUserOperator; - } - - public void setModifyUserOperator(String modifyUserOperator) { - this.modifyUserOperator = modifyUserOperator; - } - - public String getsMenuId() { - return sMenuId; - } - - public void setsMenuId(String sMenuId) { - this.sMenuId = sMenuId; - } - - public List getIdList() { - return idList; - } - - public void setIdList(List idList) { - this.idList = idList; - } - - public int getTableIndex() { - return tableIndex; - } - - public void setTableIndex(int tableIndex) { - this.tableIndex = tableIndex; - } - - public int getImgIndex() { - return imgIndex; - } - - public void setImgIndex(int imgIndex) { - this.imgIndex = imgIndex; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsFileEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsFileEOPage.java index 16c50459b..f49260aff 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsFileEOPage.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsFileEOPage.java @@ -1,6 +1,7 @@ package com.jero.modules.split.page; import com.jero.modules.split.common.BasePage; +import lombok.Data; /** * 功能：SAR_FILE_SPLIT_ITEMS_FILE SarFileSplitItemsFileEOPage
    @@ -8,6 +9,7 @@ import com.jero.modules.split.common.BasePage; * 日期： 2020-03-30
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitItemsFileEOPage extends BasePage { private String id; @@ -32,181 +34,4 @@ public class SarFileSplitItemsFileEOPage extends BasePage { private String modifyTimeOperator = "="; private String pageCount; private String pageCountOperator = "="; - - public String getId() { - return this.id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIdOperator() { - return this.idOperator; - } - - public void setIdOperator(String idOperator) { - this.idOperator = idOperator; - } - - public String getStandId() { - return this.standId; - } - - public void setStandId(String standId) { - this.standId = standId; - } - - public String getStandIdOperator() { - return this.standIdOperator; - } - - public void setStandIdOperator(String standIdOperator) { - this.standIdOperator = standIdOperator; - } - - public String getResId() { - return this.resId; - } - - public void setResId(String resId) { - this.resId = resId; - } - - public String getResIdOperator() { - return this.resIdOperator; - } - - public void setResIdOperator(String resIdOperator) { - this.resIdOperator = resIdOperator; - } - - public String getAttId() { - return this.attId; - } - - public void setAttId(String attId) { - this.attId = attId; - } - - public String getAttIdOperator() { - return this.attIdOperator; - } - - public void setAttIdOperator(String attIdOperator) { - this.attIdOperator = attIdOperator; - } - - public String getUseModel() { - return this.useModel; - } - - public void setUseModel(String useModel) { - this.useModel = useModel; - } - - public String getUseModelOperator() { - return this.useModelOperator; - } - - public void setUseModelOperator(String useModelOperator) { - this.useModelOperator = useModelOperator; - } - - public String getValidFlag() { - return this.validFlag; - } - - public void setValidFlag(String validFlag) { - this.validFlag = validFlag; - } - - public String getValidFlagOperator() { - return this.validFlagOperator; - } - - public void setValidFlagOperator(String validFlagOperator) { - this.validFlagOperator = validFlagOperator; - } - - public String getCreationTime() { - return this.creationTime; - } - - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - - public String getCreationTime1() { - return this.creationTime1; - } - - public void setCreationTime1(String creationTime1) { - this.creationTime1 = creationTime1; - } - - public String getCreationTime2() { - return this.creationTime2; - } - - public void setCreationTime2(String creationTime2) { - this.creationTime2 = creationTime2; - } - - public String getCreationTimeOperator() { - return this.creationTimeOperator; - } - - public void setCreationTimeOperator(String creationTimeOperator) { - this.creationTimeOperator = creationTimeOperator; - } - - public String getModifyTime() { - return this.modifyTime; - } - - public void setModifyTime(String modifyTime) { - this.modifyTime = modifyTime; - } - - public String getModifyTime1() { - return this.modifyTime1; - } - - public void setModifyTime1(String modifyTime1) { - this.modifyTime1 = modifyTime1; - } - - public String getModifyTime2() { - return this.modifyTime2; - } - - public void setModifyTime2(String modifyTime2) { - this.modifyTime2 = modifyTime2; - } - - public String getModifyTimeOperator() { - return this.modifyTimeOperator; - } - - public void setModifyTimeOperator(String modifyTimeOperator) { - this.modifyTimeOperator = modifyTimeOperator; - } - - public String getPageCount() { - return this.pageCount; - } - - public void setPageCount(String pageCount) { - this.pageCount = pageCount; - } - - public String getPageCountOperator() { - return this.pageCountOperator; - } - - public void setPageCountOperator(String pageCountOperator) { - this.pageCountOperator = pageCountOperator; - } - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsParamsEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsParamsEOPage.java index dbf041453..46c3e6d3c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsParamsEOPage.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsParamsEOPage.java @@ -1,6 +1,7 @@ package com.jero.modules.split.page; import com.jero.modules.split.common.BasePage; +import lombok.Data; /** * 功能：SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEOPage
    @@ -8,6 +9,7 @@ import com.jero.modules.split.common.BasePage; * 日期： 2020-02-04
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitItemsParamsEOPage extends BasePage { private String id; @@ -30,165 +32,4 @@ public class SarFileSplitItemsParamsEOPage extends BasePage { private String modifyTimeOperator = "="; private String infoId; private String infoIdOperator = "="; - - public String getId() { - return this.id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIdOperator() { - return this.idOperator; - } - - public void setIdOperator(String idOperator) { - this.idOperator = idOperator; - } - - public String getItemId() { - return this.itemId; - } - - public void setItemId(String itemId) { - this.itemId = itemId; - } - - public String getItemIdOperator() { - return this.itemIdOperator; - } - - public void setItemIdOperator(String itemIdOperator) { - this.itemIdOperator = itemIdOperator; - } - - public String getDescription() { - return this.description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getDescriptionOperator() { - return this.descriptionOperator; - } - - public void setDescriptionOperator(String descriptionOperator) { - this.descriptionOperator = descriptionOperator; - } - - public String getFigure() { - return this.figure; - } - - public void setFigure(String figure) { - this.figure = figure; - } - - public String getFigureOperator() { - return this.figureOperator; - } - - public void setFigureOperator(String figureOperator) { - this.figureOperator = figureOperator; - } - - public String getValidFlag() { - return this.validFlag; - } - - public void setValidFlag(String validFlag) { - this.validFlag = validFlag; - } - - public String getValidFlagOperator() { - return this.validFlagOperator; - } - - public void setValidFlagOperator(String validFlagOperator) { - this.validFlagOperator = validFlagOperator; - } - - public String getCreationTime() { - return this.creationTime; - } - - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - - public String getCreationTime1() { - return this.creationTime1; - } - - public void setCreationTime1(String creationTime1) { - this.creationTime1 = creationTime1; - } - - public String getCreationTime2() { - return this.creationTime2; - } - - public void setCreationTime2(String creationTime2) { - this.creationTime2 = creationTime2; - } - - public String getCreationTimeOperator() { - return this.creationTimeOperator; - } - - public void setCreationTimeOperator(String creationTimeOperator) { - this.creationTimeOperator = creationTimeOperator; - } - - public String getModifyTime() { - return this.modifyTime; - } - - public void setModifyTime(String modifyTime) { - this.modifyTime = modifyTime; - } - - public String getModifyTime1() { - return this.modifyTime1; - } - - public void setModifyTime1(String modifyTime1) { - this.modifyTime1 = modifyTime1; - } - - public String getModifyTime2() { - return this.modifyTime2; - } - - public void setModifyTime2(String modifyTime2) { - this.modifyTime2 = modifyTime2; - } - - public String getModifyTimeOperator() { - return this.modifyTimeOperator; - } - - public void setModifyTimeOperator(String modifyTimeOperator) { - this.modifyTimeOperator = modifyTimeOperator; - } - - public String getInfoId() { - return this.infoId; - } - - public void setInfoId(String infoId) { - this.infoId = infoId; - } - - public String getInfoIdOperator() { - return this.infoIdOperator; - } - - public void setInfoIdOperator(String infoIdOperator) { - this.infoIdOperator = infoIdOperator; - } - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsResEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsResEOPage.java index 830e348c3..aba5809e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsResEOPage.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsResEOPage.java @@ -1,6 +1,7 @@ package com.jero.modules.split.page; import com.jero.modules.split.common.BasePage; +import lombok.Data; /** * 功能：SAR_FILE_SPLIT_ITEMS_RES SarFileSplitItemsResEOPage
    @@ -8,6 +9,7 @@ import com.jero.modules.split.common.BasePage; * 日期： 2020-03-30
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitItemsResEOPage extends BasePage { private String id; @@ -31,164 +33,4 @@ public class SarFileSplitItemsResEOPage extends BasePage { private String modifyTime2; private String modifyTimeOperator = "="; - public String getId() { - return this.id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIdOperator() { - return this.idOperator; - } - - public void setIdOperator(String idOperator) { - this.idOperator = idOperator; - } - - public String getStandId() { - return this.standId; - } - - public void setStandId(String standId) { - this.standId = standId; - } - - public String getStandIdOperator() { - return this.standIdOperator; - } - - public void setStandIdOperator(String standIdOperator) { - this.standIdOperator = standIdOperator; - } - - public String getStandFileClassify() { - return this.standFileClassify; - } - - public void setStandFileClassify(String standFileClassify) { - this.standFileClassify = standFileClassify; - } - - public String getStandFileClassifyOperator() { - return this.standFileClassifyOperator; - } - - public void setStandFileClassifyOperator(String standFileClassifyOperator) { - this.standFileClassifyOperator = standFileClassifyOperator; - } - - public String getFileName() { - return this.fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName; - } - - public String getFileNameOperator() { - return this.fileNameOperator; - } - - public void setFileNameOperator(String fileNameOperator) { - this.fileNameOperator = fileNameOperator; - } - - public String getFileSuffix() { - return this.fileSuffix; - } - - public void setFileSuffix(String fileSuffix) { - this.fileSuffix = fileSuffix; - } - - public String getFileSuffixOperator() { - return this.fileSuffixOperator; - } - - public void setFileSuffixOperator(String fileSuffixOperator) { - this.fileSuffixOperator = fileSuffixOperator; - } - - public String getValidFlag() { - return this.validFlag; - } - - public void setValidFlag(String validFlag) { - this.validFlag = validFlag; - } - - public String getValidFlagOperator() { - return this.validFlagOperator; - } - - public void setValidFlagOperator(String validFlagOperator) { - this.validFlagOperator = validFlagOperator; - } - - public String getCreationTime() { - return this.creationTime; - } - - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - - public String getCreationTime1() { - return this.creationTime1; - } - - public void setCreationTime1(String creationTime1) { - this.creationTime1 = creationTime1; - } - - public String getCreationTime2() { - return this.creationTime2; - } - - public void setCreationTime2(String creationTime2) { - this.creationTime2 = creationTime2; - } - - public String getCreationTimeOperator() { - return this.creationTimeOperator; - } - - public void setCreationTimeOperator(String creationTimeOperator) { - this.creationTimeOperator = creationTimeOperator; - } - - public String getModifyTime() { - return this.modifyTime; - } - - public void setModifyTime(String modifyTime) { - this.modifyTime = modifyTime; - } - - public String getModifyTime1() { - return this.modifyTime1; - } - - public void setModifyTime1(String modifyTime1) { - this.modifyTime1 = modifyTime1; - } - - public String getModifyTime2() { - return this.modifyTime2; - } - - public void setModifyTime2(String modifyTime2) { - this.modifyTime2 = modifyTime2; - } - - public String getModifyTimeOperator() { - return this.modifyTimeOperator; - } - - public void setModifyTimeOperator(String modifyTimeOperator) { - this.modifyTimeOperator = modifyTimeOperator; - } - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsTableEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsTableEOPage.java index a8d3803a3..aebcb2cd1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsTableEOPage.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsTableEOPage.java @@ -1,6 +1,7 @@ package com.jero.modules.split.page; import com.jero.modules.split.common.BasePage; +import lombok.Data; /** * 功能：SAR_FILE_SPLIT_ITEMS_TABLE SarFileSplitItemsTableEOPage
    @@ -8,6 +9,7 @@ import com.jero.modules.split.common.BasePage; * 日期： 2020-01-17
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitItemsTableEOPage extends BasePage { private String id; @@ -34,197 +36,4 @@ public class SarFileSplitItemsTableEOPage extends BasePage { private String modifyTimeOperator = "="; private String modifyUser; private String modifyUserOperator = "="; - - public String getId() { - return this.id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIdOperator() { - return this.idOperator; - } - - public void setIdOperator(String idOperator) { - this.idOperator = idOperator; - } - - public String getItemsValId() { - return this.itemsValId; - } - - public void setItemsValId(String itemsValId) { - this.itemsValId = itemsValId; - } - - public String getItemsValIdOperator() { - return this.itemsValIdOperator; - } - - public void setItemsValIdOperator(String itemsValIdOperator) { - this.itemsValIdOperator = itemsValIdOperator; - } - - public String getItemsId() { - return this.itemsId; - } - - public void setItemsId(String itemsId) { - this.itemsId = itemsId; - } - - public String getItemsIdOperator() { - return this.itemsIdOperator; - } - - public void setItemsIdOperator(String itemsIdOperator) { - this.itemsIdOperator = itemsIdOperator; - } - - public String getRowNum() { - return this.rowNum; - } - - public void setRowNum(String rowNum) { - this.rowNum = rowNum; - } - - public String getRowNumOperator() { - return this.rowNumOperator; - } - - public void setRowNumOperator(String rowNumOperator) { - this.rowNumOperator = rowNumOperator; - } - - public String getColNum() { - return this.colNum; - } - - public void setColNum(String colNum) { - this.colNum = colNum; - } - - public String getColNumOperator() { - return this.colNumOperator; - } - - public void setColNumOperator(String colNumOperator) { - this.colNumOperator = colNumOperator; - } - - public String getContent() { - return this.content; - } - - public void setContent(String content) { - this.content = content; - } - - public String getContentOperator() { - return this.contentOperator; - } - - public void setContentOperator(String contentOperator) { - this.contentOperator = contentOperator; - } - - public String getValidFlag() { - return this.validFlag; - } - - public void setValidFlag(String validFlag) { - this.validFlag = validFlag; - } - - public String getValidFlagOperator() { - return this.validFlagOperator; - } - - public void setValidFlagOperator(String validFlagOperator) { - this.validFlagOperator = validFlagOperator; - } - - public String getCreationTime() { - return this.creationTime; - } - - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - - public String getCreationTime1() { - return this.creationTime1; - } - - public void setCreationTime1(String creationTime1) { - this.creationTime1 = creationTime1; - } - - public String getCreationTime2() { - return this.creationTime2; - } - - public void setCreationTime2(String creationTime2) { - this.creationTime2 = creationTime2; - } - - public String getCreationTimeOperator() { - return this.creationTimeOperator; - } - - public void setCreationTimeOperator(String creationTimeOperator) { - this.creationTimeOperator = creationTimeOperator; - } - - public String getModifyTime() { - return this.modifyTime; - } - - public void setModifyTime(String modifyTime) { - this.modifyTime = modifyTime; - } - - public String getModifyTime1() { - return this.modifyTime1; - } - - public void setModifyTime1(String modifyTime1) { - this.modifyTime1 = modifyTime1; - } - - public String getModifyTime2() { - return this.modifyTime2; - } - - public void setModifyTime2(String modifyTime2) { - this.modifyTime2 = modifyTime2; - } - - public String getModifyTimeOperator() { - return this.modifyTimeOperator; - } - - public void setModifyTimeOperator(String modifyTimeOperator) { - this.modifyTimeOperator = modifyTimeOperator; - } - - public String getModifyUser() { - return this.modifyUser; - } - - public void setModifyUser(String modifyUser) { - this.modifyUser = modifyUser; - } - - public String getModifyUserOperator() { - return this.modifyUserOperator; - } - - public void setModifyUserOperator(String modifyUserOperator) { - this.modifyUserOperator = modifyUserOperator; - } - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsValEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsValEOPage.java index eff19c100..aa1fca50f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsValEOPage.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsValEOPage.java @@ -1,6 +1,7 @@ package com.jero.modules.split.page; import com.jero.modules.split.common.BasePage; +import lombok.Data; /** * 功能：SAR_FILE_SPLIT_ITEMS_VAL SarFileSplitItemsValEOPage
    @@ -8,6 +9,7 @@ import com.jero.modules.split.common.BasePage; * 日期： 2020-01-07
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitItemsValEOPage extends BasePage { private String id; @@ -34,197 +36,4 @@ public class SarFileSplitItemsValEOPage extends BasePage { private String modifyUserOperator = "="; private String displaySeq; private String displaySeqOperator = "="; - - public String getId() { - return this.id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIdOperator() { - return this.idOperator; - } - - public void setIdOperator(String idOperator) { - this.idOperator = idOperator; - } - - public String getType() { - return this.type; - } - - public void setType(String type) { - this.type = type; - } - - public String getTypeOperator() { - return this.typeOperator; - } - - public void setTypeOperator(String typeOperator) { - this.typeOperator = typeOperator; - } - - public String getItemId() { - return this.itemId; - } - - public void setItemId(String itemId) { - this.itemId = itemId; - } - - public String getItemIdOperator() { - return this.itemIdOperator; - } - - public void setItemIdOperator(String itemIdOperator) { - this.itemIdOperator = itemIdOperator; - } - - public String getItemContent() { - return this.itemContent; - } - - public void setItemContent(String itemContent) { - this.itemContent = itemContent; - } - - public String getItemContentOperator() { - return this.itemContentOperator; - } - - public void setItemContentOperator(String itemContentOperator) { - this.itemContentOperator = itemContentOperator; - } - - public String getValidFlag() { - return this.validFlag; - } - - public void setValidFlag(String validFlag) { - this.validFlag = validFlag; - } - - public String getValidFlagOperator() { - return this.validFlagOperator; - } - - public void setValidFlagOperator(String validFlagOperator) { - this.validFlagOperator = validFlagOperator; - } - - public String getCreationUser() { - return this.creationUser; - } - - public void setCreationUser(String creationUser) { - this.creationUser = creationUser; - } - - public String getCreationUserOperator() { - return this.creationUserOperator; - } - - public void setCreationUserOperator(String creationUserOperator) { - this.creationUserOperator = creationUserOperator; - } - - public String getCreationTime() { - return this.creationTime; - } - - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - - public String getCreationTime1() { - return this.creationTime1; - } - - public void setCreationTime1(String creationTime1) { - this.creationTime1 = creationTime1; - } - - public String getCreationTime2() { - return this.creationTime2; - } - - public void setCreationTime2(String creationTime2) { - this.creationTime2 = creationTime2; - } - - public String getCreationTimeOperator() { - return this.creationTimeOperator; - } - - public void setCreationTimeOperator(String creationTimeOperator) { - this.creationTimeOperator = creationTimeOperator; - } - - public String getModifyTime() { - return this.modifyTime; - } - - public void setModifyTime(String modifyTime) { - this.modifyTime = modifyTime; - } - - public String getModifyTime1() { - return this.modifyTime1; - } - - public void setModifyTime1(String modifyTime1) { - this.modifyTime1 = modifyTime1; - } - - public String getModifyTime2() { - return this.modifyTime2; - } - - public void setModifyTime2(String modifyTime2) { - this.modifyTime2 = modifyTime2; - } - - public String getModifyTimeOperator() { - return this.modifyTimeOperator; - } - - public void setModifyTimeOperator(String modifyTimeOperator) { - this.modifyTimeOperator = modifyTimeOperator; - } - - public String getModifyUser() { - return this.modifyUser; - } - - public void setModifyUser(String modifyUser) { - this.modifyUser = modifyUser; - } - - public String getModifyUserOperator() { - return this.modifyUserOperator; - } - - public void setModifyUserOperator(String modifyUserOperator) { - this.modifyUserOperator = modifyUserOperator; - } - - public String getDisplaySeq() { - return this.displaySeq; - } - - public void setDisplaySeq(String displaySeq) { - this.displaySeq = displaySeq; - } - - public String getDisplaySeqOperator() { - return this.displaySeqOperator; - } - - public void setDisplaySeqOperator(String displaySeqOperator) { - this.displaySeqOperator = displaySeqOperator; - } - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitMenuEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitMenuEOPage.java index 2bf10e238..a9adc0e39 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitMenuEOPage.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitMenuEOPage.java @@ -1,6 +1,7 @@ package com.jero.modules.split.page; import com.jero.modules.split.common.BasePage; +import lombok.Data; /** * 功能：SAR_FILE_SPLIT_MENU SarFileSplitMenuEOPage
    @@ -8,6 +9,7 @@ import com.jero.modules.split.common.BasePage; * 日期： 2020-01-03
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarFileSplitMenuEOPage extends BasePage { private String id; @@ -36,213 +38,4 @@ public class SarFileSplitMenuEOPage extends BasePage { private String creationUserOperator = "="; private String modifyUser; private String modifyUserOperator = "="; - - public String getId() { - return this.id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIdOperator() { - return this.idOperator; - } - - public void setIdOperator(String idOperator) { - this.idOperator = idOperator; - } - - public String getInfoId() { - return this.infoId; - } - - public void setInfoId(String infoId) { - this.infoId = infoId; - } - - public String getInfoIdOperator() { - return this.infoIdOperator; - } - - public void setInfoIdOperator(String infoIdOperator) { - this.infoIdOperator = infoIdOperator; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getNameOperator() { - return this.nameOperator; - } - - public void setNameOperator(String nameOperator) { - this.nameOperator = nameOperator; - } - - public String getPId() { - return this.pId; - } - - public void setPId(String pId) { - this.pId = pId; - } - - public String getPIdOperator() { - return this.pIdOperator; - } - - public void setPIdOperator(String pIdOperator) { - this.pIdOperator = pIdOperator; - } - - public String getDisplaySeq() { - return this.displaySeq; - } - - public void setDisplaySeq(String displaySeq) { - this.displaySeq = displaySeq; - } - - public String getDisplaySeqOperator() { - return this.displaySeqOperator; - } - - public void setDisplaySeqOperator(String displaySeqOperator) { - this.displaySeqOperator = displaySeqOperator; - } - - public String getValidFlag() { - return this.validFlag; - } - - public void setValidFlag(String validFlag) { - this.validFlag = validFlag; - } - - public String getValidFlagOperator() { - return this.validFlagOperator; - } - - public void setValidFlagOperator(String validFlagOperator) { - this.validFlagOperator = validFlagOperator; - } - - public String getCreationTime() { - return this.creationTime; - } - - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - - public String getCreationTime1() { - return this.creationTime1; - } - - public void setCreationTime1(String creationTime1) { - this.creationTime1 = creationTime1; - } - - public String getCreationTime2() { - return this.creationTime2; - } - - public void setCreationTime2(String creationTime2) { - this.creationTime2 = creationTime2; - } - - public String getCreationTimeOperator() { - return this.creationTimeOperator; - } - - public void setCreationTimeOperator(String creationTimeOperator) { - this.creationTimeOperator = creationTimeOperator; - } - - public String getModifyTime() { - return this.modifyTime; - } - - public void setModifyTime(String modifyTime) { - this.modifyTime = modifyTime; - } - - public String getModifyTime1() { - return this.modifyTime1; - } - - public void setModifyTime1(String modifyTime1) { - this.modifyTime1 = modifyTime1; - } - - public String getModifyTime2() { - return this.modifyTime2; - } - - public void setModifyTime2(String modifyTime2) { - this.modifyTime2 = modifyTime2; - } - - public String getModifyTimeOperator() { - return this.modifyTimeOperator; - } - - public void setModifyTimeOperator(String modifyTimeOperator) { - this.modifyTimeOperator = modifyTimeOperator; - } - - public String getRemarks() { - return this.remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public String getRemarksOperator() { - return this.remarksOperator; - } - - public void setRemarksOperator(String remarksOperator) { - this.remarksOperator = remarksOperator; - } - - public String getCreationUser() { - return this.creationUser; - } - - public void setCreationUser(String creationUser) { - this.creationUser = creationUser; - } - - public String getCreationUserOperator() { - return this.creationUserOperator; - } - - public void setCreationUserOperator(String creationUserOperator) { - this.creationUserOperator = creationUserOperator; - } - - public String getModifyUser() { - return this.modifyUser; - } - - public void setModifyUser(String modifyUser) { - this.modifyUser = modifyUser; - } - - public String getModifyUserOperator() { - return this.modifyUserOperator; - } - - public void setModifyUserOperator(String modifyUserOperator) { - this.modifyUserOperator = modifyUserOperator; - } - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java index f975bacc8..b60578179 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java @@ -1,6 +1,6 @@ package com.jero.modules.split.service; -import com.jero.modules.split.entity.SarFileSplitInfo; +import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -10,23 +10,23 @@ import java.util.List; * @Date: 2022-03-03 * @Version: V1.0 */ -public interface ISarFileSplitInfoService extends IService { +public interface ISarFileSplitInfoService extends IService { /** * 保存 * - * @param sarFileSplitInfo + * @param sarFileSplitInfoEO * @return */ - void add(SarFileSplitInfo sarFileSplitInfo); + void add(SarFileSplitInfoEO sarFileSplitInfoEO); /** * 更新 * - * @param sarFileSplitInfo + * @param sarFileSplitInfoEO * @return */ - void editById(SarFileSplitInfo sarFileSplitInfo); + void editById(SarFileSplitInfoEO sarFileSplitInfoEO); /** * 通过id删除 @@ -50,12 +50,12 @@ public interface ISarFileSplitInfoService extends IService { * @param id * @return */ - SarFileSplitInfo queryById(String id); + SarFileSplitInfoEO queryById(String id); /** * 列表查询 * * @return */ - List queryList(); + List queryList(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index f6359ec54..222a8823b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -1,12 +1,13 @@ package com.jero.modules.split.service.impl; -import com.jero.modules.split.entity.SarFileSplitInfo; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.mapper.SarFileSplitInfoMapper; import com.jero.modules.split.service.ISarFileSplitInfoService; import org.springframework.stereotype.Service; -import java.util.List; + import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 文档拆分表 @@ -15,33 +16,33 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @Version: V1.0 */ @Service -public class SarFileSplitInfoServiceImpl extends ServiceImpl implements ISarFileSplitInfoService { +public class SarFileSplitInfoServiceImpl extends ServiceImpl implements ISarFileSplitInfoService { /** * 保存 * - * @param sarFileSplitInfo + * @param sarFileSplitInfoEO * @return */ @Override - public void add(SarFileSplitInfo sarFileSplitInfo) { + public void add(SarFileSplitInfoEO sarFileSplitInfoEO) { Date now = new Date(); - sarFileSplitInfo.setCreateTime(now); - sarFileSplitInfo.setUpdateTime(now); - save(sarFileSplitInfo); + sarFileSplitInfoEO.setCreateTime(now); + sarFileSplitInfoEO.setUpdateTime(now); + save(sarFileSplitInfoEO); } /** * 更新 * - * @param sarFileSplitInfo + * @param sarFileSplitInfoEO * @return */ @Override - public void editById(SarFileSplitInfo sarFileSplitInfo) { + public void editById(SarFileSplitInfoEO sarFileSplitInfoEO) { Date now = new Date(); - sarFileSplitInfo.setUpdateTime(now); - saveOrUpdate(sarFileSplitInfo); + sarFileSplitInfoEO.setUpdateTime(now); + saveOrUpdate(sarFileSplitInfoEO); } /** @@ -73,7 +74,7 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl queryList() { + public List queryList() { return list(); } }