From 3c7acb27059b21705e364dc15b39bb2f314f342b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Wed, 7 Jul 2021 02:21:45 +0000 Subject: [PATCH 1/7] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index f021e344..468a3c67 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://192.168.10.47:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root From 9709acf0a98552dd3261a7ec49f97e979abb34e7 Mon Sep 17 00:00:00 2001 From: duanwenbin <12345678> Date: Wed, 7 Jul 2021 11:21:42 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A8=A1=E5=9D=97=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/main/config/DozerConfig.java | 24 + .../SarFileSplitInfoEOController.java | 294 +++++++ .../controller/SarStandFileEOController.java | 133 +++ .../dao/SarFileSplitInfoEODao.java | 39 + .../dao/SarFileSplitItemsEODao.java | 39 + .../dao/SarFileSplitItemsParamsEODao.java | 28 + .../dao/SarFileSplitItemsTableEODao.java | 33 + .../dao/SarFileSplitItemsValEODao.java | 36 + .../dao/SarFileSplitMenuEODao.java | 50 ++ .../dto/FileSplitItemsExportDto.java | 230 ++++++ .../dto/FileSplitValExportDto.java | 43 + .../slrs/standardSplit/entity/PrcNumName.java | 22 + .../entity/SarFileSplitInfoEO.java | 324 ++++++++ .../entity/SarFileSplitInfoEOPage.java | 307 +++++++ .../entity/SarFileSplitItemsEO.java | 523 ++++++++++++ .../entity/SarFileSplitItemsEOPage.java | 475 +++++++++++ .../entity/SarFileSplitItemsParamsEO.java | 160 ++++ .../entity/SarFileSplitItemsTableEO.java | 190 +++++ .../entity/SarFileSplitItemsTableEOPage.java | 230 ++++++ .../entity/SarFileSplitItemsValEO.java | 244 ++++++ .../entity/SarFileSplitMenuEO.java | 295 +++++++ .../standardSplit/entity/SarLawsInfoEO.java | 449 +++++++++++ .../entity/SarLawsInfoEOPage.java | 754 ++++++++++++++++++ .../slrs/standardSplit/entity/SarMenuEO.java | 228 ++++++ .../entity/SarStandAttrDetailsEO.java | 286 +++++++ .../standardSplit/entity/SarStandFileEO.java | 279 +++++++ .../entity/SarStandFileEOPage.java | 247 ++++++ .../standardSplit/service/MenuService.java | 4 + .../service/SarFileSplitInfoEOService.java | 31 + .../service/SarLawsInfoEOService.java | 10 + .../service/SarStandAttrDetailsEOService.java | 4 + .../service/SarStandFileEOService.java | 4 + .../service/impl/MenuServiceImpl.java | 15 + .../impl/SarFileSplitInfoEOServiceImpl.java | 662 +++++++++++++++ .../impl/SarLawsInfoEOServiceImpl.java | 47 ++ .../SarStandAttrDetailsEOServiceImpl.java | 14 + .../impl/SarStandFileEOServiceImpl.java | 14 + .../java/com/adc/da/utils/util/UserUtils.java | 225 ++++++ .../SarFileSplitInfoEOMapper.xml | 330 ++++++++ .../SarFileSplitItemsEOMapper.xml | 572 +++++++++++++ .../SarFileSplitItemsParamsEOMapper.xml | 217 +++++ .../SarFileSplitItemsTableEOMapper.xml | 257 ++++++ .../SarFileSplitItemsValEOMapper.xml | 295 +++++++ .../SarFileSplitMenuEOMapper.xml | 363 +++++++++ adc-da-sys/pom.xml | 23 + .../ocr/controller/OCRRestfulController.java | 178 +++++ .../com/adc/da/ocr/dao/OcrRecordEODao.java | 32 + .../da/ocr/entity/OcrCallBackResultEo.java | 76 ++ .../com/adc/da/ocr/entity/OcrRecordEO.java | 280 +++++++ .../com/adc/da/ocr/entity/OcrRequestEo.java | 83 ++ .../com/adc/da/ocr/entity/OcrResultEo.java | 30 + .../com/adc/da/ocr/page/OcrRecordEOPage.java | 256 ++++++ .../adc/da/ocr/service/OCRRestfulService.java | 16 + .../da/ocr/service/OcrRecordEOService.java | 14 + .../service/impl/OCRRestfulServiceImpl.java | 184 +++++ .../service/impl/OcrRecordEOServiceImpl.java | 39 + .../java/com/adc/da/ocr/util/Base64Util.java | 211 +++++ .../java/com/adc/da/ocr/util/MD5Util.java | 77 ++ .../java/com/adc/da/ocr/util/RsaUtil.java | 131 +++ .../java/com/adc/da/ocr/util/UUIDUtils.java | 40 + .../adc/da/person/dao/PersonCollectEODao.java | 2 + .../adc/da/person/dao/PersonShareEODao.java | 2 + .../com/adc/da/sys/util/LoginUserUtil.java | 53 ++ .../java/com/adc/da/sys/util/UUIDUtils.java | 44 + .../resources/dozer/dozer-mappings-sys.xml | 83 ++ .../mybatis/mapper/att/AttFileEOMapper.xml | 2 +- .../mybatis/mapper/ocr/OcrRecordEOMapper.xml | 245 ++++++ .../mapper/person/PersonCollectEOMapper.xml | 12 + .../mapper/person/PersonShareEOMapper.xml | 12 + 69 files changed, 11150 insertions(+), 1 deletion(-) create mode 100644 adc-da-main/src/main/java/com/adc/da/main/config/DozerConfig.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsParamsEODao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitItemsExportDto.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitValExportDto.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/PrcNumName.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsParamsEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsTableEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsTableEOPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitMenuEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarLawsInfoEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarLawsInfoEOPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarMenuEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandAttrDetailsEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/MenuService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarLawsInfoEOService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandAttrDetailsEOService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/MenuServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarLawsInfoEOServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandAttrDetailsEOServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/utils/util/UserUtils.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsParamsEOMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsTableEOMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsValEOMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitMenuEOMapper.xml create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/controller/OCRRestfulController.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/dao/OcrRecordEODao.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrCallBackResultEo.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrRecordEO.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrRequestEo.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrResultEo.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/page/OcrRecordEOPage.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/service/OCRRestfulService.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/service/OcrRecordEOService.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OcrRecordEOServiceImpl.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/util/Base64Util.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/util/MD5Util.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/util/RsaUtil.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/ocr/util/UUIDUtils.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/util/LoginUserUtil.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/util/UUIDUtils.java create mode 100644 adc-da-sys/src/main/resources/dozer/dozer-mappings-sys.xml create mode 100644 adc-da-sys/src/main/resources/mybatis/mapper/ocr/OcrRecordEOMapper.xml diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/DozerConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/DozerConfig.java new file mode 100644 index 00000000..446d3602 --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/config/DozerConfig.java @@ -0,0 +1,24 @@ +package com.adc.da.main.config; + +import org.dozer.DozerBeanMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Arrays; +import java.util.List; + +/** + * 各个模块的dozer配置文件 + */ +@Configuration +public class DozerConfig { + + @Bean(name = "org.dozer.Mapper") + public DozerBeanMapper dozer() { + List mappingFiles = Arrays.asList("dozer/dozer-mappings-sys.xml"); + DozerBeanMapper dozerBean = new DozerBeanMapper(); + dozerBean.setMappingFiles(mappingFiles); + return dozerBean; + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java new file mode 100644 index 00000000..b5fbec66 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java @@ -0,0 +1,294 @@ +package com.adc.da.slrs.standardSplit.controller; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.person.entity.PersonMsgEO; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage; +import com.adc.da.slrs.standardSplit.entity.SarLawsInfoEO; +import com.adc.da.slrs.standardSplit.service.*; +import com.adc.da.sys.util.LoginUserUtil; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.adc.da.sys.service.IUserEOService; + +@RestController +@RequestMapping("/${restPath}/lawss/sarFileSplitInfo") +@Api(description = "|SarFileSplitInfoEO|") +public class SarFileSplitInfoEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOController.class); + + @Autowired + private SarFileSplitInfoEOService sarFileSplitInfoEOService; +// @Autowired +// private SarStandardsInfoEOService sarStandardsInfoEOService; +// @Autowired +// private PersonMsgEOService personMsgEOService; + @Autowired + private IUserEOService userService; + @Autowired + private SarLawsInfoEOService sarLawsInfoEOService; + + @ApiOperation(value = "|SarFileSplitInfoEO|分页查询") + @GetMapping("/page") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitInfo:page") + public ResponseMessage> page(SarFileSplitInfoEOPage page) throws Exception { + page.setOrderBy("modify_time desc"); + List rows = sarFileSplitInfoEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|SarFileSplitInfoEO|查询") + @GetMapping("") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitInfo:list") + public ResponseMessage> list(SarFileSplitInfoEOPage page) throws Exception { + return Result.success(sarFileSplitInfoEOService.queryByList(page)); + } + + @ApiOperation(value = "|SarFileSplitInfoEO|详情") + @GetMapping("/{id}") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitInfo:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(sarFileSplitInfoEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarFileSplitInfoEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitInfo:save") + public ResponseMessage create(@RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception { + sarFileSplitInfoEOService.insertSelective(sarFileSplitInfoEO); + return Result.success(sarFileSplitInfoEO); + } + + @ApiOperation(value = "|SarFileSplitInfoEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitInfo:update") + public ResponseMessage update(@RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception { + sarFileSplitInfoEOService.updateByPrimaryKeySelective(sarFileSplitInfoEO); + return Result.success(sarFileSplitInfoEO); + } + + @ApiOperation(value = "|SarFileSplitInfoEO|删除") + @DeleteMapping("/{id}") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitInfo:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + sarFileSplitInfoEOService.deleteByPrimaryKey(id); + logger.info("delete from SAR_FILE_SPLIT_INFO where id = {}", id); + return Result.success(); + } + + @ApiOperation(value = "|SarFileSplitInfoEO|文件拆分相关信息存储") + @GetMapping("/fileSplit") + public ResponseMessage fileSplit(SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception { + if (sarFileSplitInfoEO.getStopNumber()<=0){ + sarFileSplitInfoEO.setStopNumber(200); + } + if (sarFileSplitInfoEO.getStartNumber()<=0){ + sarFileSplitInfoEO.setStartNumber(1); + } + int i = sarFileSplitInfoEOService.fileAplit(sarFileSplitInfoEO); + if (i>0){ + SarFileSplitInfoEO newinfo = new SarFileSplitInfoEO(); + newinfo.setResult("1"); + newinfo.setId(sarFileSplitInfoEO.getId()); + newinfo.setModifyUser(LoginUserUtil.getUserId()); + sarFileSplitInfoEOService.updateByPrimaryKeySelective(newinfo); + return Result.success(sarFileSplitInfoEO); + } else { + SarFileSplitInfoEO newinfo = new SarFileSplitInfoEO(); + newinfo.setResult("2"); + newinfo.setId(sarFileSplitInfoEO.getId()); + newinfo.setModifyUser(LoginUserUtil.getUserId()); + sarFileSplitInfoEOService.updateByPrimaryKeySelective(newinfo); + return Result.error("该文档不符合规范，无法拆分"); + } + } + + @ApiOperation(value = "|SarFileSplitInfoEO|自定义分页查询列表") + @GetMapping("/getSarFileSplitInfoEOPage") + //@RequiresPermissions("lawss:sarBussionessStand:getSarBussionStandPage") + public ResponseMessage> getSarFileSplitInfoEOPage(SarFileSplitInfoEOPage page) throws Exception { + if(StringUtils.isNotBlank(page.getPaixu())){ + page.setOrderBy("SAR_FILE_SPLIT_INFO."+page.getPaixu()+" "+page.getShunxu()); + }else{ + page.setOrderBy("SAR_FILE_SPLIT_INFO.creation_time desc,SAR_FILE_SPLIT_INFO.id"); + } + List rows = sarFileSplitInfoEOService.queryByPageOwn(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + +// @ApiOperation(value = "拆分审核完成回调接口") +// @GetMapping("/changeSarFileSplitInfoStatusCallBack") +// public ResponseMessage changeSarFileSplitInfoStatusCallBack(@RequestBody @Validated ChangeSarFileSplitInfoStatusDTO changeSarFileSplitInfoStatusDTO) throws Exception { +// boolean flag = sarFileSplitInfoEOService.changeSarFileSplitInfoStatusCallBack(changeSarFileSplitInfoStatusDTO); +// if(flag){ +// return Result.success(); +// } +// return Result.error(); +// } + + @ApiOperation(value = "|SarFileSplitInfoEO|批量删除") + @PostMapping("/batchDelete") + public ResponseMessage batchDelete(String ids) throws Exception { + if (StringUtils.isNotEmpty(ids)) { + int result = sarFileSplitInfoEOService.deleteByIds(ids); + if (result > 0) { + return Result.success("0","删除成功",null); + } else { + return Result.error("删除失败"); + } + + } else { + return Result.error("请选择要删除的数据"); + } + } + + @ApiOperation(value = "|SarFileSplitInfoEO|关联") + @PostMapping("/connectToStandItems") + public ResponseMessage connectToStandItems(@RequestBody List sarFileSplitInfoEOList) throws Exception { + for (SarFileSplitInfoEO sarFileSplitInfoEO:sarFileSplitInfoEOList) { + List getList = new ArrayList<>(); + List sarLawsInfoEOList = new ArrayList<>(); + //根据标准号查询标准是否存在 + String standNum=""; + if (StringUtils.isNotEmpty(sarFileSplitInfoEO.getStandId())) { + standNum=sarFileSplitInfoEO.getShowNumber(); + } else if(StringUtils.isNotEmpty(sarFileSplitInfoEO.getStandNumSplit())){ + standNum=sarFileSplitInfoEO.getStandNumSplit(); + }else{ + return Result.error("标准号不能为空"); + } +// if (sarFileSplitInfoEO.getFileType().equals("ZCWB") || sarFileSplitInfoEO.getFileType().equals("GCGJ")) { +// SarLawsInfoEOPage page = new SarLawsInfoEOPage(); +// page.setLawsType("FOREIGN"); +// page.setLawsNumber(standNum); +// sarLawsInfoEOList = sarLawsInfoEOService.getLawsInfoPage(page); +// }else { +// getList = sarStandardsInfoEOService.selectStandardsByStandnumber(standNum,null); +// } +// +// SarStandardsInfoEO result = new SarStandardsInfoEO(); +// SarLawsInfoEO result1 = new SarLawsInfoEO(); +// +// if(getList != null && getList.size()>0){ +// result = getList.get(0); +// String msg = sarFileSplitInfoEOService.addToStandItems(sarFileSplitInfoEO,result); +// return Result.success("0",msg,null); +// } else if (sarLawsInfoEOList.size()>0) { +// result1 = sarLawsInfoEOList.get(0); +// String msg = sarFileSplitInfoEOService.addToStandItems1(sarFileSplitInfoEO,result1); +// return Result.success("0",msg,null); +// }else { +// return Result.error("0", "该条数据标准号在标准库中不存在"); +// } + } + return Result.error("0","关联失败"); + } + + @ApiOperation(value = "|SarFileSplitInfoEO|标准拆分编辑") + @PostMapping("/updateSarFileSplitInfo") + public ResponseMessage updateSarFileSplitInfo(@RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception { + + if(null!=sarFileSplitInfoEO){ + sarFileSplitInfoEO.setModifyTime(new Date()); + sarFileSplitInfoEO.setSplitStatus("0"); + sarFileSplitInfoEOService.updateByPrimaryKeySelective(sarFileSplitInfoEO); + return Result.success("0","编辑成功",null); + }else{ + return Result.error(); + } + + } + + @ApiOperation(value = "|SarFileSplitInfoEO|标准拆分提交FO审核") + @GetMapping("submitAndExamine") + public ResponseMessage submitAndExamine(String id, String standNum, String standName,String standType) throws Exception { + String standId = null; +// if (standType.equals("POLICY")){ +// SarLawsInfoEOPage page = new SarLawsInfoEOPage(); +// page.setLawsType("FOREIGN"); +// page.setLawsNumber(standNum); +// page.setLawsNumberOperator("="); +// List sarLawsInfoEOList = sarLawsInfoEOService.getLawsInfoPage(page); +// if (sarLawsInfoEOList.size() == 0){ +// return Result.error("政策号不存在"); +// } +// standId = sarLawsInfoEOList.get(0).getId(); +// }else if(standType.equals("STAND")){ +// List getList = sarStandardsInfoEOService.selectStandardsByStandnumber(StringUtils.trim(standNum), +// null); +// if (getList.size() == 0){ +// return Result.error("标准号不存在"); +// } +// standId = getList.get(0).getId(); +// }else { +// List getList = sarStandardsInfoEOService.selectStandardsByStandnumber(StringUtils.trim(standNum), +// standType); +// if (getList.size() == 0){ +// return Result.error("标准号不存在"); +// } +// standId = getList.get(0).getId(); +// } + + SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO(); + sarFileSplitInfoEO.setId(id); + sarFileSplitInfoEO.setSplitStatus("1"); + sarFileSplitInfoEO.setStandId(standId); + sarFileSplitInfoEO.setModifyTime(new Date()); + sarFileSplitInfoEOService.updateByPrimaryKeySelective(sarFileSplitInfoEO); + String roleName = "国内标准法规FO"; + String stand = "国内标准法规"; + if (standType.equals("FOREIGN")){ + roleName = "海外标准法规FO"; + stand = "海外标准法规"; + }else if (standType.equals("POLICY")){ + roleName = "政策法规FO"; + stand = "国内外政策"; + }else if(standType.equals("STAND")){ + roleName = "国内标准法规FO,海外标准法规FO"; + stand = "国内外标准法规"; + } +// List userList = userService.getUserByRole(null,null,null,roleName); +// for (RoleUserVO data:userList) { +// PersonMsgEO personMsgEO = new PersonMsgEO(); +// personMsgEO.setUserIds(data.getUserId()); +// personMsgEO.setMsgTitle("确认【"+stand+"】标准拆分数据"+standNum); +// personMsgEO.setMsgContent("【"+stand+"】标准拆分数据"+standNum+"，请确认审核是否通过？"); +// personMsgEO.setMsgType("SPLIT"); +// personMsgEO.setBusiId(id); +// personMsgEO.setSenderId(LoginUserUtil.getUserId()); +// personMsgEO.setReturnAddress("itemSplitInfo?infoId="+id+"&standNumSplit="+standNum+"&standNameSplit="+standName); +// personMsgEOService.saveNew(personMsgEO); +// } + return Result.success("提交成功"); + } + + + @ApiOperation(value = "|PersonMsgEO|修改新") + @PostMapping("updateNew") + //@RequiresPermissions("person:personMsg:update") + public ResponseMessage updateNew(@RequestBody PersonMsgEO personMsgEO) throws Exception { + return Result.success(sarFileSplitInfoEOService.updateNew(personMsgEO)); + } + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java new file mode 100644 index 00000000..b5dd6883 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java @@ -0,0 +1,133 @@ +package com.adc.da.slrs.standardSplit.controller; + +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; +import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; +import com.adc.da.slrs.standardSplit.service.SarStandAttrDetailsEOService; +import com.adc.da.slrs.standardSplit.service.SarStandFileEOService; +import com.adc.da.sys.common.SelectionResult; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; +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("/${restPath}/lawss/sarStandFile") +@Api(description = "|SarStandFileEO|") +public class SarStandFileEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(SarStandFileEOController.class); + + @Autowired + private SarStandFileEOService sarStandFileEOService; + @Autowired + private IAttFileEOService attFileEOService; + @Autowired + private SarStandAttrDetailsEOService sarStandAttrDetailsEOService; + +// @ApiOperation(value = "|SarStandFileEO|分页查询") +// @GetMapping("/page") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarStandFile:page") +// public ResponseMessage> page(SarStandFileEOPage page) throws Exception { +// List rows = sarStandFileEOService.queryByPage(page); +// return Result.success(getPageInfo(page.getPager(), rows)); +// } +// +// @ApiOperation(value = "|SarStandFileEO|查询") +// @GetMapping("") +// //401问题2021-03-31暂时注释掉 liuhuiwen +//// @RequiresPermissions("lawss:sarStandFile:list") +// public ResponseMessage> list(SarStandFileEOPage page) throws Exception { +// return Result.success(sarStandFileEOService.queryByList(page)); +// } +// +// @ApiOperation(value = "|SarStandFileEO|详情") +// @GetMapping("/{id}") +// //401问题2021-03-31暂时注释掉 liuhuiwen +//// @RequiresPermissions("lawss:sarStandFile:get") +// public ResponseMessage find(@PathVariable String id) throws Exception { +// return Result.success(sarStandFileEOService.selectByPrimaryKey(id)); +// } +// +// @ApiOperation(value = "|SarStandFileEO|新增") +// @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// //401问题2021-03-31暂时注释掉 liuhuiwen +//// @RequiresPermissions("lawss:sarStandFile:save") +// public ResponseMessage create(@RequestBody SarStandFileEO sarStandFileEO) throws Exception { +// sarStandFileEOService.insertSelective(sarStandFileEO); +// return Result.success(sarStandFileEO); +// } +// +// @ApiOperation(value = "|SarStandFileEO|修改") +// @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// //401问题2021-03-31暂时注释掉 liuhuiwen +//// @RequiresPermissions("lawss:sarStandFile:update") +// public ResponseMessage update(@RequestBody SarStandFileEO sarStandFileEO) throws Exception { +// sarStandFileEOService.updateByPrimaryKeySelective(sarStandFileEO); +// return Result.success(sarStandFileEO); +// } +// +// @ApiOperation(value = "|SarStandFileEO|删除") +// @DeleteMapping("/{id}") +// //401问题2021-03-31暂时注释掉 liuhuiwen +//// @RequiresPermissions("lawss:sarStandFile:delete") +// public ResponseMessage delete(@PathVariable String id) throws Exception { +// sarStandFileEOService.deleteByPrimaryKey(id); +// logger.info("delete from SAR_STAND_FILE where id = {}", id); +// return Result.success(); +// } +// +// @ApiOperation(value = "|SarStandFileEO|查询转换后的文档详情") +// @GetMapping("/queryConvertAtt") +// /*@RequiresPermissions("lawss:sarLawsFile:list")*/ +// public ResponseMessage queryConvertAtt(String attId) throws Exception { +// List getList = sarStandFileEOService.selectFileByAttId(attId); +// SarStandFileEO sarBussStandFileEO = new SarStandFileEO(); +// if(getList != null && !getList.isEmpty()){ +// sarBussStandFileEO = getList.get(0); +// AttFileEO attFileEO = attFileEOService.getFileInfo(attId); +// if(attFileEO != null){ +// sarBussStandFileEO.setFileOldName(attFileEO.getOldFileName()); +// } +//// readStandOrLawsLogService.sendReadSOLLog("STAND",sarBussStandFileEO); +// return Result.success(sarBussStandFileEO); +// } else { +// return Result.success(null); +// } +// +// } +// +// @ApiOperation(value = "|SarStandFileEO|分页查询") +// @GetMapping("/getStandFileListByPage") +//// @RequiresPermissions("lawss:sarStandRes:page") +// public ResponseMessage> getStandFileListByPage(SarStandFileEOPage page) throws Exception { +// String suffix = page.getFileSuffix(); +// if (StringUtils.isNotBlank(suffix)) { +// page.setFileSuffixList(suffix.split(",")); +// } +// List rows = sarStandFileEOService.getStandFileListByPage(page); +// if (rows != null && !rows.isEmpty()) { +// for (SarStandFileEO sarStandFileEO : rows) { +// List getField = sarStandAttrDetailsEOService.selectFileFieldForSel(sarStandFileEO.getStandFileClassify()); +// if (getField != null && !getField.isEmpty()) { +// sarStandFileEO.setStandFileClassifyShow(getField.get(0).getLabel()); +// } else { +// sarStandFileEO.setStandFileClassifyShow(null); +// } +// } +// } +// return Result.success(getPageInfo(page.getPager(), rows)); +// } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java new file mode 100644 index 00000000..141cb0b3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java @@ -0,0 +1,39 @@ +package com.adc.da.slrs.standardSplit.dao; + +import com.adc.da.base.page.BasePage; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage; + +/** + * + *
+ * 功能：OCR_RECORD OcrRecordEODao
+ * 作者：code generator
+ * 日期： 2019-03-25
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +@Mapper +public interface SarFileSplitInfoEODao extends BaseMapper { + + List queryByPage(BasePage var1); + + List queryByList(BasePage var1); + + SarFileSplitInfoEO selectByPrimaryKey(String id); + + int insertSelective(SarFileSplitInfoEO sarFileSplitInfoEO); + + int updateByPrimaryKeySelective(SarFileSplitInfoEO sarFileSplitInfoEO); + + int deleteByPrimaryKey(String id); + + List queryByPageOwn(SarFileSplitInfoEOPage page); + + int queryByCountOwn(SarFileSplitInfoEOPage page); + + int deleteByIds(SarFileSplitInfoEO sarFileSplitInfoEO); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java new file mode 100644 index 00000000..a3ddb0d7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java @@ -0,0 +1,39 @@ +package com.adc.da.slrs.standardSplit.dao; + +import com.adc.da.slrs.standardSplit.dto.FileSplitItemsExportDto; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * + *
+ * 功能：SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEODao
+ * 作者：code generator
+ * 日期： 2020-01-03
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +@Mapper +public interface SarFileSplitItemsEODao extends BaseMapper { + + int insertForeach(List list); + + int deleteByIds(SarFileSplitItemsEO sarFileSplitItemsEO); + + int deleteByItemsIds(SarFileSplitItemsEO sarFileSplitItemsEO); + + int deleteByMenuIds(@Param("idList") List idList); + + int deleteByItemsIdList(@Param("idList") List idList); + + List queryItemsByMenuId(@Param("menuId") String menuId); + + List queryByItemsIds(@Param("idList") List idList); + + List queryByOrdersForExport(SarFileSplitItemsEOPage page); + + List queryByList2(SarFileSplitItemsEOPage page); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsParamsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsParamsEODao.java new file mode 100644 index 00000000..9842eb1e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsParamsEODao.java @@ -0,0 +1,28 @@ +package com.adc.da.slrs.standardSplit.dao; + +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * + *
+ * 功能：SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEODao
+ * 作者：code generator
+ * 日期： 2020-02-04
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +@Mapper +public interface SarFileSplitItemsParamsEODao extends BaseMapper { + + int deleteByItemIds(@Param("idList") List idList); + + int deleteByInfoIds(@Param("idList") List idList); + + int insertForeach(List list); + + List queryItemsParamsByMenuId(@Param("idList") List idList); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java new file mode 100644 index 00000000..c71a60f0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java @@ -0,0 +1,33 @@ +package com.adc.da.slrs.standardSplit.dao; + +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsTableEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsTableEOPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * + *
+ * 功能：SAR_FILE_SPLIT_ITEMS_TABLE SarFileSplitItemsTableEODao
+ * 作者：code generator
+ * 日期： 2020-01-17
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +@Mapper +public interface SarFileSplitItemsTableEODao extends BaseMapper { + + int insertForeach(List list); + + List queryByRowNum(SarFileSplitItemsTableEOPage page); + + int deleteByitemValIds(@Param("idList") List idList); + + int deleteTableByMenuIds(@Param("idList") List idList); + + int deleteByitemIds(@Param("idList") List idList); + + List queryItemsTableByMenuId(@Param("idList") List idList); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java new file mode 100644 index 00000000..42c9f66a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java @@ -0,0 +1,36 @@ +package com.adc.da.slrs.standardSplit.dao; + +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * + *
+ * 功能：SAR_FILE_SPLIT_ITEMS_VAL SarFileSplitItemsValEODao
+ * 作者：code generator
+ * 日期： 2020-01-07
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +@Mapper +public interface SarFileSplitItemsValEODao extends BaseMapper { + + int deleteByIds(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + int deleteByitemId(String id); + + int insertForeach(List list); + + int updateForeach(List list); + + int deleteValByInfoIds(@Param("idList") List idList); + + int deleteValByitemIds(@Param("idList") List idList); + + int deleteValByMenuIds(@Param("idList") List idList); + + List queryItemsValByMenuId(@Param("idList") List idList); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java new file mode 100644 index 00000000..1592ae36 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java @@ -0,0 +1,50 @@ +package com.adc.da.slrs.standardSplit.dao; + +import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * + *
+ * 功能：SAR_FILE_SPLIT_MENU SarFileSplitMenuEODao
+ * 作者：code generator
+ * 日期： 2020-01-03
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +@Mapper +public interface SarFileSplitMenuEODao extends BaseMapper { + + int insertForeach(List list); + + int deleteByIds(SarFileSplitMenuEO sarFileSplitMenuEO); + + int updateDisplaySeqAdd(SarFileSplitMenuEO sarFileSplitMenuEO); + + int updateDisplaySeqCut(SarFileSplitMenuEO sarFileSplitMenuEO); + + List queryByPidExcpetSelf(SarFileSplitMenuEO sarFileSplitMenuEO); + + int deleteByPId(@Param("id") List id); + + List getChild(@Param("id") String id); + + int getMaxDisplayByid(@Param("id") String id); + + int getChildrenCountByParentId(@Param("id") String id); + + int updateChildrenDisplaySeqByIDAdd(SarFileSplitMenuEO childrenUpdateEO); + + int updateChildrenDisplaySeqByIDCut(SarFileSplitMenuEO childrenUpdateEO); + + /** + * 根据ID查询所有的子节点包括父节点 + * @param sarFileSplitMenuEO + * @return + */ + List queryAllChildrenByid(SarFileSplitMenuEO sarFileSplitMenuEO); + + int deleteByIdList(@Param("idList") List idList); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitItemsExportDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitItemsExportDto.java new file mode 100644 index 00000000..fd9de690 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitItemsExportDto.java @@ -0,0 +1,230 @@ +package com.adc.da.slrs.standardSplit.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import java.util.List; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/2/13 9:48 + */ +public class FileSplitItemsExportDto { + private String id; + + private String itemsNum; + + private String itemsName; + + private String itermsConditions; + + private String type; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date newcarPutTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date productPutTime; + private String svpps; + private String applyArctic; + private String referenceStand; + private String remarks; + private String relevanceFile; + + //导出新加字段 + private String fo; + private String dutyEngineer; + private String claimType; + private String claimTypeShow; + private String busStandCover; + private String fileType; + private String responsibleUnit;//责任部门 + private String responsibleUnitShow; + private String dutyEngineerShow;//责任工程师 + private String foShow;//fo + + + 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; + } + + public String getFo() { + return fo; + } + + public void setFo(String fo) { + this.fo = fo; + } + + public String getDutyEngineer() { + return dutyEngineer; + } + + public void setDutyEngineer(String dutyEngineer) { + this.dutyEngineer = dutyEngineer; + } + + public String getClaimType() { + return claimType; + } + + public void setClaimType(String claimType) { + this.claimType = claimType; + } + + public String getBusStandCover() { + return busStandCover; + } + + public void setBusStandCover(String busStandCover) { + this.busStandCover = busStandCover; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getResponsibleUnit() { + return responsibleUnit; + } + + public void setResponsibleUnit(String responsibleUnit) { + this.responsibleUnit = responsibleUnit; + } + + public String getResponsibleUnitShow() { + return responsibleUnitShow; + } + + public void setResponsibleUnitShow(String responsibleUnitShow) { + this.responsibleUnitShow = responsibleUnitShow; + } + + public String getClaimTypeShow() { + return claimTypeShow; + } + + public void setClaimTypeShow(String claimTypeShow) { + this.claimTypeShow = claimTypeShow; + } + + public String getDutyEngineerShow() { + return dutyEngineerShow; + } + + public void setDutyEngineerShow(String dutyEngineerShow) { + this.dutyEngineerShow = dutyEngineerShow; + } + + public String getFoShow() { + return foShow; + } + + public void setFoShow(String foShow) { + this.foShow = foShow; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitValExportDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitValExportDto.java new file mode 100644 index 00000000..f0c7c6ec --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitValExportDto.java @@ -0,0 +1,43 @@ +package com.adc.da.slrs.standardSplit.dto; + + +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsTableEO; +import java.util.List; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/2/14 9:18 + */ +public class FileSplitValExportDto { + + private String valType; + + 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/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/PrcNumName.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/PrcNumName.java new file mode 100644 index 00000000..0886eb4a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/PrcNumName.java @@ -0,0 +1,22 @@ +package com.adc.da.slrs.standardSplit.entity; + +public class PrcNumName { + private String prcNum; + private String prcName; + + public String getPrcNum() { + return prcNum; + } + + public void setPrcNum(String prcNum) { + this.prcNum = prcNum; + } + + public String getPrcName() { + return prcName; + } + + public void setPrcName(String prcName) { + this.prcName = prcName; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEO.java new file mode 100644 index 00000000..e77326e2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEO.java @@ -0,0 +1,324 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * 功能：SAR_FILE_SPLIT_INFO SarFileSplitInfoEOEntity
+ * 作者：code generator
+ * 日期： 2020-01-03
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public class SarFileSplitInfoEO extends BaseEntity { + + private String sarType; + private String fileName; + private String id; + private String standId; + private String fileType; + private String fileTypeShow; + private String attId; + private Integer validFlag; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private String creationUser; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + private String modifyUser; + private String standName; + private String standNumSplit; + private String standNameSplit; + private String[] idList; + private int startNumber; + private int stopNumber; + private String result; + private String splitStatus; + private String collectId; + //用于拆分结果导入 by zj + private String menuId; + private String infoId; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
+ *

字段列表：

+ *
  • sarType -> sar_type
    • + *
  • fileName -> file_name
    • + *
  • id -> id
    • + *
  • standId -> stand_id
    • + *
  • fileType -> file_type
    • + *
  • attId -> att_id
    • + *
  • validFlag -> valid_flag
    • + *
  • creationTime -> creation_time
    • + *
  • creationUser -> creation_user
    • + *
  • modifyTime -> modify_time
    • + *
  • modifyUser -> modify_user
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) return null; + switch (fieldName) { + case "sarType": return "sar_type"; + case "fileName": return "file_name"; + case "id": return "id"; + case "standId": return "stand_id"; + case "fileType": return "file_type"; + case "attId": return "att_id"; + case "validFlag": return "valid_flag"; + case "creationTime": return "creation_time"; + case "creationUser": return "creation_user"; + case "modifyTime": return "modify_time"; + case "modifyUser": return "modify_user"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • sar_type -> sarType
    • + *
  • file_name -> fileName
    • + *
  • id -> id
    • + *
  • stand_id -> standId
    • + *
  • file_type -> fileType
    • + *
  • att_id -> attId
    • + *
  • valid_flag -> validFlag
    • + *
  • creation_time -> creationTime
    • + *
  • creation_user -> creationUser
    • + *
  • modify_time -> modifyTime
    • + *
  • modify_user -> modifyUser
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) return null; + switch (columnName) { + case "sar_type": return "sarType"; + case "file_name": return "fileName"; + case "id": return "id"; + case "stand_id": return "standId"; + case "file_type": return "fileType"; + case "att_id": return "attId"; + case "valid_flag": return "validFlag"; + case "creation_time": return "creationTime"; + case "creation_user": return "creationUser"; + case "modify_time": return "modifyTime"; + case "modify_user": return "modifyUser"; + default: return null; + } + } + + /** **/ + public String getSarType() { + return this.sarType; + } + + /** **/ + public void setSarType(String sarType) { + this.sarType = sarType; + } + + /** **/ + public String getFileName() { + return this.fileName; + } + + /** **/ + public void setFileName(String fileName) { + this.fileName = fileName; + } + + /** **/ + 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 getFileType() { + return this.fileType; + } + + /** **/ + public void setFileType(String fileType) { + this.fileType = fileType; + } + + /** **/ + public String getAttId() { + return this.attId; + } + + /** **/ + public void setAttId(String attId) { + this.attId = attId; + } + + /** **/ + 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 String getCreationUser() { + return this.creationUser; + } + + /** **/ + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + /** **/ + 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; + } + + private String showNumber; + + public String getShowNumber() { + return showNumber; + } + + public void setShowNumber(String showNumber) { + this.showNumber = showNumber; + } + + public String getStandName() { + return standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String[] getIdList() { + return idList; + } + + public void setIdList(String[] idList) { + this.idList = idList; + } + + public String getStandNumSplit() { + return standNumSplit; + } + + public void setStandNumSplit(String standNumSplit) { + this.standNumSplit = standNumSplit; + } + + public String getStandNameSplit() { + return standNameSplit; + } + + public void setStandNameSplit(String standNameSplit) { + this.standNameSplit = standNameSplit; + } + + public int getStartNumber() { + return startNumber; + } + + public void setStartNumber(int startNumber) { + this.startNumber = startNumber; + } + + public int getStopNumber() { + return stopNumber; + } + + public void setStopNumber(int stopNumber) { + this.stopNumber = stopNumber; + } + + public String getFileTypeShow() { + return fileTypeShow; + } + + public void setFileTypeShow(String fileTypeShow) { + this.fileTypeShow = fileTypeShow; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public String getSplitStatus() { + return splitStatus; + } + + public void setSplitStatus(String splitStatus) { + this.splitStatus = splitStatus; + } + + public String getCollectId() { + return collectId; + } + + public void setCollectId(String collectId) { + this.collectId = collectId; + } + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String getInfoId() { + return infoId; + } + + public void setInfoId(String infoId) { + this.infoId = infoId; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java new file mode 100644 index 00000000..68158eff --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitInfoEOPage.java @@ -0,0 +1,307 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：SAR_FILE_SPLIT_INFO SarFileSplitInfoEOPage
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitInfoEOPage extends BasePage { + + private String sarType; + private String sarTypeOperator = "="; + private String fileName; + private String fileNameOperator = "="; + private String id; + private String idOperator = "="; + private String standId; + private String standIdOperator = "="; + 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 splitStatus; + + private String standNum; + + private String result; + + private String paixu; + + private String shunxu; + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public String getStandNum() { + return standNum; + } + + public void setStandNum(String standNum) { + this.standNum = standNum; + } + + public String getSplitStatus() { + return splitStatus; + } + + public void setSplitStatus(String splitStatus) { + this.splitStatus = splitStatus; + } + + 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 getPaixu() { + return paixu; + } + + public void setPaixu(String paixu) { + this.paixu = paixu; + } + + public String getShunxu() { + return shunxu; + } + + public void setShunxu(String shunxu) { + this.shunxu = shunxu; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java new file mode 100644 index 00000000..ebcad944 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java @@ -0,0 +1,523 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; +import java.util.List; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEOEntity
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsEO extends BaseEntity { + + private String id; + private String infoId; + private String itemsNum; + private String itemsName; + private String itermsConditions; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date newcarPutTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date productPutTime; + private String menuId; + private String svpps; + private String applyArctic; + private String referenceStand; + private String specialRequest; + private String relevanceFile; + private String remarks; + private Integer validFlag; + private String creationUser; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + private String modifyUser; + private String[] infoIdList; + private String[] idList; + private List itemValEOList; + // 前台删除的VAL表条目内容ID + private String delItemIds; + private String sMenuId; + //特殊参数要求 + private List paramsList; + private String relevanceFileAttid; + + //新加字段 SVPPS在前边已经存在 + private String fo;//FO + private String dutyEngineer;//责任工程师 + private String claimType;//要求类型 + private String busStandCover;//企标覆盖关系 + private String fileType;//文件类型 + + //新加字段带show + private String foShow;//FO + private String dutyEngineerShow;//责任工程师 + private String svppsShow;//SVPPS + private String claimTypeShow;//要求类型 + private String busStandCoverShow;//企标覆盖关系 + private String fileTypeShow;//文件类型 + + private String responsibleUnit;//责任部门 + private String responsibleUnitShow; + /** + * 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 getFo() { + return fo; + } + + public void setFo(String fo) { + this.fo = fo; + } + + public String getDutyEngineer() { + return dutyEngineer; + } + + public void setDutyEngineer(String dutyEngineer) { + this.dutyEngineer = dutyEngineer; + } + + public String getClaimType() { + return claimType; + } + + public void setClaimType(String claimType) { + this.claimType = claimType; + } + + public String getBusStandCover() { + return busStandCover; + } + + public void setBusStandCover(String busStandCover) { + this.busStandCover = busStandCover; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFoShow() { + return foShow; + } + + public void setFoShow(String foShow) { + this.foShow = foShow; + } + + public String getDutyEngineerShow() { + return dutyEngineerShow; + } + + public void setDutyEngineerShow(String dutyEngineerShow) { + this.dutyEngineerShow = dutyEngineerShow; + } + + public String getSvppsShow() { + return svppsShow; + } + + public void setSvppsShow(String svppsShow) { + this.svppsShow = svppsShow; + } + + public String getClaimTypeShow() { + return claimTypeShow; + } + + public void setClaimTypeShow(String claimTypeShow) { + this.claimTypeShow = claimTypeShow; + } + + public String getBusStandCoverShow() { + return busStandCoverShow; + } + + public void setBusStandCoverShow(String busStandCoverShow) { + this.busStandCoverShow = busStandCoverShow; + } + + public String getFileTypeShow() { + return fileTypeShow; + } + + public void setFileTypeShow(String fileTypeShow) { + this.fileTypeShow = fileTypeShow; + } + + public String getResponsibleUnit() { + return responsibleUnit; + } + + public void setResponsibleUnit(String responsibleUnit) { + this.responsibleUnit = responsibleUnit; + } + + public String getResponsibleUnitShow() { + return responsibleUnitShow; + } + + public void setResponsibleUnitShow(String responsibleUnitShow) { + this.responsibleUnitShow = responsibleUnitShow; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java new file mode 100644 index 00000000..b6d6d46c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java @@ -0,0 +1,475 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.page.BasePage; + +import java.util.List; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEOPage
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String infoId; + private String infoIdOperator = "="; + private String itemsNum; + private String itemsNumOperator = "="; + private String itemsName; + private String itemsNameOperator = "="; + private String itermsConditions; + private String itermsConditionsOperator = "="; + private String newcarPutTime; + private String newcarPutTime1; + private String newcarPutTime2; + private String newcarPutTimeOperator = "="; + private String productPutTime; + private String productPutTime1; + private String productPutTime2; + private String productPutTimeOperator = "="; + private String menuId; + private String menuIdOperator = "="; + private String svpps; + private String svppsOperator = "="; + private String applyArctic; + private String applyArcticOperator = "="; + private String referenceStand; + private String referenceStandOperator = "="; + private String specialRequest; + private String specialRequestOperator = "="; + private String relevanceFile; + private String relevanceFileOperator = "="; + private String remarks; + private String remarksOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationUser; + private String creationUserOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String modifyUser; + private String modifyUserOperator = "="; + private String sMenuId; + private List idList; + private List menuIdList; + + private int tableIndex = 1; + private int imgIndex = 1; + + 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; + } + + public List getMenuIdList() { + return menuIdList; + } + + public void setMenuIdList(List menuIdList) { + this.menuIdList = menuIdList; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsParamsEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsParamsEO.java new file mode 100644 index 00000000..5b1457f9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsParamsEO.java @@ -0,0 +1,160 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; + +import java.util.Date; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEOEntity
    + * 作者：code generator
    + * 日期： 2020-02-04
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsParamsEO extends BaseEntity { + + private String id; + private String itemId; + private String description; + private String figure; + private Integer validFlag; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + 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/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsTableEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsTableEO.java new file mode 100644 index 00000000..e421d727 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsTableEO.java @@ -0,0 +1,190 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; + +import java.util.Date; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_TABLE SarFileSplitItemsTableEOEntity
    + * 作者：code generator
    + * 日期： 2020-01-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsTableEO extends BaseEntity { + + private String id; + private String itemsValId; + private String itemsId; + private Integer rowNum; + private Integer colNum; + private String content; + private Integer validFlag; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + 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/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsTableEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsTableEOPage.java new file mode 100644 index 00000000..dd1f9ed2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsTableEOPage.java @@ -0,0 +1,230 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_TABLE SarFileSplitItemsTableEOPage
    + * 作者：code generator
    + * 日期： 2020-01-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsTableEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String itemsValId; + private String itemsValIdOperator = "="; + private String itemsId; + private String itemsIdOperator = "="; + private String rowNum; + private String rowNumOperator = "="; + private String colNum; + private String colNumOperator = "="; + private String content; + private String contentOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + 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/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java new file mode 100644 index 00000000..3825e89e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java @@ -0,0 +1,244 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.common.UploadFileInfo; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import java.util.List; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_VAL SarFileSplitItemsValEOEntity
    + * 作者：code generator
    + * 日期： 2020-01-07
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsValEO extends BaseEntity { + + private String id; + private String type; + private String itemId; + private String itemContent; + private Integer validFlag; + private String creationUser; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + private String modifyUser; + private Integer displaySeq; + private String[] idList; + private List defaultFileList; + private String imgName; + 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 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/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitMenuEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitMenuEO.java new file mode 100644 index 00000000..af4f1dc0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitMenuEO.java @@ -0,0 +1,295 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.sys.util.LoginUserUtil; +import com.adc.da.utils.treetool.annotation.TreeNodeId; +import com.adc.da.utils.treetool.annotation.TreeNodeName; +import com.adc.da.utils.treetool.annotation.TreeNodeParentId; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; + +/** + * 功能：SAR_FILE_SPLIT_MENU SarFileSplitMenuEOEntity
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitMenuEO extends BaseEntity { + + @TreeNodeId + private String id; + private String infoId; + @TreeNodeName + private String name; + @TreeNodeParentId + private String pId; + private Long displaySeq; + private Integer validFlag; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + private String remarks; + private String creationUser; + private String modifyUser; + private String itemName; + private String[] infoIdList; + + private Long displaySeqStart; + private Long displaySeqEnd; + private Long childrenCount; + /** + * 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(); + this.creationUser = LoginUserUtil.getUserId(); + this.modifyTime = new Date(); + this.modifyUser = LoginUserUtil.getUserId(); + 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(); + this.creationUser = LoginUserUtil.getUserId(); + this.modifyTime = new Date(); + this.modifyUser = LoginUserUtil.getUserId(); + 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; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarLawsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarLawsInfoEO.java new file mode 100644 index 00000000..b10274af --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarLawsInfoEO.java @@ -0,0 +1,449 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.sys.entity.DicTypeEO; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * @Author yangxuenan + * @Description 法规信息 + * Date 2018/9/3 16:37 + * @Param + * @return + **/ +public class SarLawsInfoEO extends BaseEntity { + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private Integer validFlag; + private String creationUser; + private String replaceLawsNum; + private String replacedLawsNum; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date putTime; + private String issueTime; + private String lawsState; + private String lawsName; + private String lawsNumber; + private String lawsProperty; + private String country; + private String lawsType; + private String id; + private String menuId; + private String stateName; + private String countryName; + private String propertyName; + //记录收藏id + private String collectId; + //记录是否修改了替代文件号 + private int upReplaceNumFlag; + //记录是否修改了文件号 + private int upNumFlag; + //新增字段 + private String synopsis; + private String lawsEnName; + private String sychronId; + private Map attrInfoMap; //属性表字段与值 + private List dicTypeList; + private String sarLawsAttrEOStr; //新增修改时属性表信息 + private String fileIds; //全部文件ID + private List attrInfoList = new ArrayList<>(); + private String accessCountry;//纳入清单的国家 + private String citeStand;//引用标准 + private String citedStand;//被引用标准 + private String prcNum;//流程编号 + private String textStatus;//文本状态 + private String isRelateAccess; + private String allPutTime; + private List prcNumAndName; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • creationUser -> creation_user
    • + *
  • relevanceFile -> relevance_file
    • + *
  • opinionFile -> opinion_file
    • + *
  • lawsFile -> laws_file
    • + *
  • linkUri -> link_uri
    • + *
  • responsibleUnit -> responsible_unit
    • + *
  • applyAuth -> apply_auth
    • + *
  • energyKind -> energy_kind
    • + *
  • applyArctic -> apply_arctic
    • + *
  • replaceLawsNum -> replace_laws_num
    • + *
  • putTime -> put_time
    • + *
  • issueTime -> issue_time
    • + *
  • lawsState -> laws_state
    • + *
  • issueUnit -> issue_unit
    • + *
  • lawsName -> laws_name
    • + *
  • lawsNumber -> laws_number
    • + *
  • lawsProperty -> laws_property
    • + *
  • country -> country
    • + *
  • lawsType -> laws_type
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "lawsEnName": return "laws_en_name"; + case "synopsis": return "synopsis"; + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "validFlag": return "valid_flag"; + case "creationUser": return "creation_user"; + case "replaceLawsNum": return "replace_laws_num"; + case "replacedLawsNum": return "replaced_laws_num"; + case "putTime": return "put_time"; + case "issueTime": return "issue_time"; + case "lawsState": return "laws_state"; + case "lawsName": return "laws_name"; + case "lawsNumber": return "laws_number"; + case "lawsProperty": return "laws_property"; + case "country": return "country"; + case "lawsType": return "laws_type"; + case "id": return "id"; + case "menuId": return "menu_id"; + case "stateName": return "stateName"; + default: return null; + } + } + + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "laws_en_name": return "lawsEnName"; + case "synopsis": return "synopsis"; + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "valid_flag": return "validFlag"; + case "creation_user": return "creationUser"; + case "replace_laws_num": return "replaceLawsNum"; + case "replaced_laws_num": return "replacedLawsNum"; + case "put_time": return "putTime"; + case "issue_time": return "issueTime"; + case "laws_state": return "lawsState"; + case "laws_name": return "lawsName"; + case "laws_number": return "lawsNumber"; + case "laws_property": return "lawsProperty"; + case "country": return "country"; + case "laws_type": return "lawsType"; + case "id": return "id"; + case "menu_id": return "menuId"; + case "stateName": return "stateName"; + default: return null; + } + } + + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public Date getCreationTime() { + return creationTime; + } + + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + public Integer getValidFlag() { + return validFlag; + } + + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + public String getCreationUser() { + return creationUser; + } + + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + public String getReplaceLawsNum() { + return replaceLawsNum; + } + + public void setReplaceLawsNum(String replaceLawsNum) { + this.replaceLawsNum = replaceLawsNum; + } + + public String getReplacedLawsNum() { + return replacedLawsNum; + } + + public void setReplacedLawsNum(String replacedLawsNum) { + this.replacedLawsNum = replacedLawsNum; + } + + public Date getPutTime() { + return putTime; + } + + public void setPutTime(Date putTime) { + this.putTime = putTime; + } + + public String getIssueTime() { + return issueTime; + } + + public void setIssueTime(String issueTime) { + this.issueTime = issueTime; + } + + public String getLawsState() { + return lawsState; + } + + public void setLawsState(String lawsState) { + this.lawsState = lawsState; + } + + public String getLawsName() { + return lawsName; + } + + public void setLawsName(String lawsName) { + this.lawsName = lawsName; + } + + public String getLawsNumber() { + return lawsNumber; + } + + public void setLawsNumber(String lawsNumber) { + this.lawsNumber = lawsNumber; + } + + public String getLawsProperty() { + return lawsProperty; + } + + public void setLawsProperty(String lawsProperty) { + this.lawsProperty = lawsProperty; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getLawsType() { + return lawsType; + } + + public void setLawsType(String lawsType) { + this.lawsType = lawsType; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String getStateName() { + return stateName; + } + + public void setStateName(String stateName) { + this.stateName = stateName; + } + + public String getCountryName() { + return countryName; + } + + public void setCountryName(String countryName) { + this.countryName = countryName; + } + + public String getCollectId() { + return collectId; + } + + public void setCollectId(String collectId) { + this.collectId = collectId; + } + + public int getUpReplaceNumFlag() { + return upReplaceNumFlag; + } + + public void setUpReplaceNumFlag(int upReplaceNumFlag) { + this.upReplaceNumFlag = upReplaceNumFlag; + } + + public int getUpNumFlag() { + return upNumFlag; + } + + public void setUpNumFlag(int upNumFlag) { + this.upNumFlag = upNumFlag; + } + + public String getSynopsis() { + return synopsis; + } + + public void setSynopsis(String synopsis) { + this.synopsis = synopsis; + } + + public String getLawsEnName() { + return lawsEnName; + } + + public void setLawsEnName(String lawsEnName) { + this.lawsEnName = lawsEnName; + } + + public String getSychronId() { + return sychronId; + } + + public void setSychronId(String sychronId) { + this.sychronId = sychronId; + } + + public Map getAttrInfoMap() { + return attrInfoMap; + } + + public void setAttrInfoMap(Map attrInfoMap) { + this.attrInfoMap = attrInfoMap; + } + + public List getDicTypeList() { + return dicTypeList; + } + + public void setDicTypeList(List dicTypeList) { + this.dicTypeList = dicTypeList; + } + + public String getFileIds() { + return fileIds; + } + + public void setFileIds(String fileIds) { + this.fileIds = fileIds; + } + + public List getAttrInfoList() { + return attrInfoList; + } + + public void setAttrInfoList(List attrInfoList) { + this.attrInfoList = attrInfoList; + } + + public String getPropertyName() { + return propertyName; + } + + public void setPropertyName(String propertyName) { + this.propertyName = propertyName; + } + + public String getSarLawsAttrEOStr() { + return sarLawsAttrEOStr; + } + + public void setSarLawsAttrEOStr(String sarLawsAttrEOStr) { + this.sarLawsAttrEOStr = sarLawsAttrEOStr; + } + + public String getCiteStand() { + return citeStand; + } + + public void setCiteStand(String citeStand) { + this.citeStand = citeStand; + } + + public String getCitedStand() { + return citedStand; + } + + public void setCitedStand(String citedStand) { + this.citedStand = citedStand; + } + + public String getPrcNum() { + return prcNum; + } + + public void setPrcNum(String prcNum) { + this.prcNum = prcNum; + } + + public String getTextStatus() { + return textStatus; + } + + public void setTextStatus(String textStatus) { + this.textStatus = textStatus; + } + + public String getIsRelateAccess() { + return isRelateAccess; + } + + public void setIsRelateAccess(String isRelateAccess) { + this.isRelateAccess = isRelateAccess; + } + + public String getAccessCountry() { + return accessCountry; + } + + public void setAccessCountry(String accessCountry) { + this.accessCountry = accessCountry; + } + + public List getPrcNumAndName() { + return prcNumAndName; + } + + public void setPrcNumAndName(List prcNumAndName) { + this.prcNumAndName = prcNumAndName; + } + + public String getAllPutTime() { + return allPutTime; + } + + public void setAllPutTime(String allPutTime) { + this.allPutTime = allPutTime; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarLawsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarLawsInfoEOPage.java new file mode 100644 index 00000000..b8a42773 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarLawsInfoEOPage.java @@ -0,0 +1,754 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.page.BasePage; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import java.util.List; + +/** + * @Author yangxuenan + * @Description 法规信息 + * Date 2018/9/3 16:37 + * @Param + * @return + **/ +public class SarLawsInfoEOPage extends BasePage { + + private Date modifyTime; + private Date modifyTime1; + private Date modifyTime2; + private String modifyTimeOperator = "="; + private Date creationTime; + private Date creationTime1; + private Date creationTime2; + private String creationTimeOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationUser; + private String creationUserOperator = "="; + private String relevanceFile; + private String relevanceFileOperator = "="; + private String opinionFile; + private String opinionFileOperator = "="; + private String lawsFile; + private String lawsFileOperator = "="; + private String linkUri; + private String linkUriOperator = "="; + private String responsibleUnit; + private String responsibleUnitOperator = "="; + private String applyAuth; + private String applyAuthOperator = "like"; + private String energyKind; + private String energyKindOperator = "like"; + private String applyArctic; + private String applyArcticOperator = "like"; + private String replaceLawsNum; + private String replacedLawsNum; + //需求变动，特此修改（byl）,原 private String replaceLawsNumOperator = "="; + private String replaceLawsNumOperator = "like"; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date putTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date putTime1; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date putTime2; + private String putTimeOperator = "="; + private String issueTime; + private String issueTime1; + private String issueTime2; + private String issueTimeOperator = "="; + private String lawsState; + private String lawsStateOperator = "="; + private String issueUnit; + private String issueUnitOperator = "="; + private String lawsName; + private String lawsNameOperator = "like"; + private String lawsNumber; + private String lawsNumberOperator = "like"; + private String lawsProperty; + private String lawsPropertyOperator = "="; + private String country; + private String countryOperator = "="; + private String lawsType; + private String lawsTypeOperator = "="; + private String id; + private String idOperator = "="; + private String menuId; + private List menuIdList; + //为了在sql中区分修改操作 + private String updateFlag; + //新加字段 + private String synopsis; + private String lawsEnName; + private String category; + private String[] replaceLawsNumList; + private String[] applyArcticList; + private String[] energyKindList; + private String[] applyAuthList; + private List menuRoleList; + private String numberName; + private String synchronId; + private String[] idlist; + // 树结构增加搜索条件 + private String collectMenuId; + private String labelMenuId; + private String advanceSearchVOStr; + private String advanceSearchStr; + private String isRelateAccess; + private String ids; + private String proType; + private String userId; + private Integer nowOrder; + private Integer nowOrderBy; + private String orderBy1 = "SAR_LAWS_INFO.modify_time"; + private String order1 = "desc"; + + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public Date getModifyTime1() { + return modifyTime1; + } + + public void setModifyTime1(Date modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public Date getModifyTime2() { + return modifyTime2; + } + + public void setModifyTime2(Date modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public Date getCreationTime() { + return creationTime; + } + + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + public Date getCreationTime1() { + return creationTime1; + } + + public void setCreationTime1(Date creationTime1) { + this.creationTime1 = creationTime1; + } + + public Date getCreationTime2() { + return creationTime2; + } + + public void setCreationTime2(Date creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getValidFlag() { + return validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationUser() { + return creationUser; + } + + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + public String getCreationUserOperator() { + return creationUserOperator; + } + + public void setCreationUserOperator(String creationUserOperator) { + this.creationUserOperator = creationUserOperator; + } + + public String getRelevanceFile() { + return relevanceFile; + } + + public void setRelevanceFile(String relevanceFile) { + this.relevanceFile = relevanceFile; + } + + public String getRelevanceFileOperator() { + return relevanceFileOperator; + } + + public void setRelevanceFileOperator(String relevanceFileOperator) { + this.relevanceFileOperator = relevanceFileOperator; + } + + public String getOpinionFile() { + return opinionFile; + } + + public void setOpinionFile(String opinionFile) { + this.opinionFile = opinionFile; + } + + public String getOpinionFileOperator() { + return opinionFileOperator; + } + + public void setOpinionFileOperator(String opinionFileOperator) { + this.opinionFileOperator = opinionFileOperator; + } + + public String getLawsFile() { + return lawsFile; + } + + public void setLawsFile(String lawsFile) { + this.lawsFile = lawsFile; + } + + public String getLawsFileOperator() { + return lawsFileOperator; + } + + public void setLawsFileOperator(String lawsFileOperator) { + this.lawsFileOperator = lawsFileOperator; + } + + public String getLinkUri() { + return linkUri; + } + + public void setLinkUri(String linkUri) { + this.linkUri = linkUri; + } + + public String getLinkUriOperator() { + return linkUriOperator; + } + + public void setLinkUriOperator(String linkUriOperator) { + this.linkUriOperator = linkUriOperator; + } + + public String getResponsibleUnit() { + return responsibleUnit; + } + + public void setResponsibleUnit(String responsibleUnit) { + this.responsibleUnit = responsibleUnit; + } + + public String getResponsibleUnitOperator() { + return responsibleUnitOperator; + } + + public void setResponsibleUnitOperator(String responsibleUnitOperator) { + this.responsibleUnitOperator = responsibleUnitOperator; + } + + public String getApplyAuth() { + return applyAuth; + } + + public void setApplyAuth(String applyAuth) { + this.applyAuth = applyAuth; + } + + public String getApplyAuthOperator() { + return applyAuthOperator; + } + + public void setApplyAuthOperator(String applyAuthOperator) { + this.applyAuthOperator = applyAuthOperator; + } + + public String getEnergyKind() { + return energyKind; + } + + public void setEnergyKind(String energyKind) { + this.energyKind = energyKind; + } + + public String getEnergyKindOperator() { + return energyKindOperator; + } + + public void setEnergyKindOperator(String energyKindOperator) { + this.energyKindOperator = energyKindOperator; + } + + public String getApplyArctic() { + return applyArctic; + } + + public void setApplyArctic(String applyArctic) { + this.applyArctic = applyArctic; + } + + public String getApplyArcticOperator() { + return applyArcticOperator; + } + + public void setApplyArcticOperator(String applyArcticOperator) { + this.applyArcticOperator = applyArcticOperator; + } + + public String getReplaceLawsNum() { + return replaceLawsNum; + } + + public void setReplaceLawsNum(String replaceLawsNum) { + this.replaceLawsNum = replaceLawsNum; + } + + public String getReplaceLawsNumOperator() { + return replaceLawsNumOperator; + } + + public void setReplaceLawsNumOperator(String replaceLawsNumOperator) { + this.replaceLawsNumOperator = replaceLawsNumOperator; + } + + public Date getPutTime() { + return putTime; + } + + public void setPutTime(Date putTime) { + this.putTime = putTime; + } + + public Date getPutTime1() { + return putTime1; + } + + public void setPutTime1(Date putTime1) { + this.putTime1 = putTime1; + } + + public Date getPutTime2() { + return putTime2; + } + + public void setPutTime2(Date putTime2) { + this.putTime2 = putTime2; + } + + public String getPutTimeOperator() { + return putTimeOperator; + } + + public void setPutTimeOperator(String putTimeOperator) { + this.putTimeOperator = putTimeOperator; + } + + public String getIssueTime() { + return issueTime; + } + + public void setIssueTime(String issueTime) { + this.issueTime = issueTime; + } + + public String getIssueTime1() { + return issueTime1; + } + + public void setIssueTime1(String issueTime1) { + this.issueTime1 = issueTime1; + } + + public String getIssueTime2() { + return issueTime2; + } + + public void setIssueTime2(String issueTime2) { + this.issueTime2 = issueTime2; + } + + public String getIssueTimeOperator() { + return issueTimeOperator; + } + + public void setIssueTimeOperator(String issueTimeOperator) { + this.issueTimeOperator = issueTimeOperator; + } + + public String getLawsState() { + return lawsState; + } + + public void setLawsState(String lawsState) { + this.lawsState = lawsState; + } + + public String getLawsStateOperator() { + return lawsStateOperator; + } + + public void setLawsStateOperator(String lawsStateOperator) { + this.lawsStateOperator = lawsStateOperator; + } + + public String getIssueUnit() { + return issueUnit; + } + + public void setIssueUnit(String issueUnit) { + this.issueUnit = issueUnit; + } + + public String getIssueUnitOperator() { + return issueUnitOperator; + } + + public void setIssueUnitOperator(String issueUnitOperator) { + this.issueUnitOperator = issueUnitOperator; + } + + public String getLawsName() { + return lawsName; + } + + public void setLawsName(String lawsName) { + this.lawsName = lawsName; + } + + public String getLawsNameOperator() { + return lawsNameOperator; + } + + public void setLawsNameOperator(String lawsNameOperator) { + this.lawsNameOperator = lawsNameOperator; + } + + public String getLawsNumber() { + return lawsNumber; + } + + public List getMenuIdList() { + return menuIdList; + } + + public void setMenuIdList(List menuIdList) { + this.menuIdList = menuIdList; + } + + public void setLawsNumber(String lawsNumber) { + this.lawsNumber = lawsNumber; + } + + public String getLawsNumberOperator() { + return lawsNumberOperator; + } + + public void setLawsNumberOperator(String lawsNumberOperator) { + this.lawsNumberOperator = lawsNumberOperator; + } + + public String getLawsProperty() { + return lawsProperty; + } + + public void setLawsProperty(String lawsProperty) { + this.lawsProperty = lawsProperty; + } + + public String getLawsPropertyOperator() { + return lawsPropertyOperator; + } + + public void setLawsPropertyOperator(String lawsPropertyOperator) { + this.lawsPropertyOperator = lawsPropertyOperator; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getCountryOperator() { + return countryOperator; + } + + public void setCountryOperator(String countryOperator) { + this.countryOperator = countryOperator; + } + + public String getLawsType() { + return lawsType; + } + + public void setLawsType(String lawsType) { + this.lawsType = lawsType; + } + + public String getLawsTypeOperator() { + return lawsTypeOperator; + } + + public void setLawsTypeOperator(String lawsTypeOperator) { + this.lawsTypeOperator = lawsTypeOperator; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String getUpdateFlag() { + return updateFlag; + } + + public void setUpdateFlag(String updateFlag) { + this.updateFlag = updateFlag; + } + + public String[] getApplyArcticList() { + return applyArcticList; + } + + public void setApplyArcticList(String[] applyArcticList) { + this.applyArcticList = applyArcticList; + } + + public String[] getEnergyKindList() { + return energyKindList; + } + + public void setEnergyKindList(String[] energyKindList) { + this.energyKindList = energyKindList; + } + + public String[] getApplyAuthList() { + return applyAuthList; + } + + public void setApplyAuthList(String[] applyAuthList) { + this.applyAuthList = applyAuthList; + } + + public String getSynopsis() { + return synopsis; + } + + public void setSynopsis(String synopsis) { + this.synopsis = synopsis; + } + + public String getLawsEnName() { + return lawsEnName; + } + + public void setLawsEnName(String lawsEnName) { + this.lawsEnName = lawsEnName; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String[] getReplaceLawsNumList() { + return replaceLawsNumList; + } + + public void setReplaceLawsNumList(String[] replaceLawsNumList) { + this.replaceLawsNumList = replaceLawsNumList; + } + + public String getReplacedLawsNum() { + return replacedLawsNum; + } + + public void setReplacedLawsNum(String replacedLawsNum) { + this.replacedLawsNum = replacedLawsNum; + } + + public List getMenuRoleList() { + return menuRoleList; + } + + public void setMenuRoleList(List menuRoleList) { + this.menuRoleList = menuRoleList; + } + + public String getNumberName() { + return numberName; + } + + public void setNumberName(String numberName) { + this.numberName = numberName; + } + + public String getSynchronId() { + return synchronId; + } + + public void setSynchronId(String synchronId) { + this.synchronId = synchronId; + } + + public String[] getIdlist() { + return idlist; + } + + public void setIdlist(String[] idlist) { + this.idlist = idlist; + } + + public String getCollectMenuId() { + return collectMenuId; + } + + public void setCollectMenuId(String collectMenuId) { + this.collectMenuId = collectMenuId; + } + + public String getLabelMenuId() { + return labelMenuId; + } + + public void setLabelMenuId(String labelMenuId) { + this.labelMenuId = labelMenuId; + } + + public String getAdvanceSearchVOStr() { + return advanceSearchVOStr; + } + + public void setAdvanceSearchVOStr(String advanceSearchVOStr) { + this.advanceSearchVOStr = advanceSearchVOStr; + } + + public String getAdvanceSearchStr() { + return advanceSearchStr; + } + + public void setAdvanceSearchStr(String advanceSearchStr) { + this.advanceSearchStr = advanceSearchStr; + } + + public String getIsRelateAccess() { + return isRelateAccess; + } + + public void setIsRelateAccess(String isRelateAccess) { + this.isRelateAccess = isRelateAccess; + } + + public String getIds() { + return ids; + } + + public void setIds(String ids) { + this.ids = ids; + } + + public String getProType() { + return proType; + } + + public void setProType(String proType) { + this.proType = proType; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + + public String getOrderBy1() { + return orderBy1; + } + + public void setOrderBy1(String orderBy1) { + this.orderBy1 = orderBy1; + } + + public String getOrder1() { + return order1; + } + + public void setOrder1(String order1) { + this.order1 = order1; + } + + public Integer getNowOrder() { + return nowOrder; + } + + public void setNowOrder(Integer nowOrder) { + this.nowOrder = nowOrder; + } + + public Integer getNowOrderBy() { + return nowOrderBy; + } + + public void setNowOrderBy(Integer nowOrderBy) { + this.nowOrderBy = nowOrderBy; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarMenuEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarMenuEO.java new file mode 100644 index 00000000..b17d546d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarMenuEO.java @@ -0,0 +1,228 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.utils.treetool.annotation.TreeNodeId; +import com.adc.da.utils.treetool.annotation.TreeNodeName; +import com.adc.da.utils.treetool.annotation.TreeNodeParentId; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import java.util.List; + +/** + * 功能：SAR_MENU SarMenuEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarMenuEO extends BaseEntity { + + @TreeNodeParentId + private String parentId; + @TreeNodeName + private String menuName; + private String sorDivide; + @TreeNodeId + private String id; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private Integer validFlag; + private Integer displaySeq; + private String parentIds; + private String remarks; + private List roleIds; + private List childMenuIds; + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • parentId -> parent_id
    • + *
  • menuName -> menu_name
    • + *
  • sorDivide -> sor_divide
    • + *
  • id -> id
    • + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • validFlag -> valid_flag
    • + *
  • displaySeq -> display_seq
    • + *
  • parentIds -> parent_ids
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "parentId": + return "parent_id"; + case "menuName": + return "menu_name"; + case "sorDivide": + return "sor_divide"; + case "id": + return "id"; + case "modifyTime": + return "modify_time"; + case "creationTime": + return "creation_time"; + case "validFlag": + return "valid_flag"; + case "displaySeq": + return "display_seq"; + case "parentIds": + return "parent_ids"; + default: + return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • parent_id -> parentId
    • + *
  • menu_name -> menuName
    • + *
  • sor_divide -> sorDivide
    • + *
  • id -> id
    • + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • display_seq -> displaySeq
    • + *
  • parent_ids -> parentIds
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "parent_id": + return "parentId"; + case "menu_name": + return "menuName"; + case "sor_divide": + return "sorDivide"; + case "id": + return "id"; + case "modify_time": + return "modifyTime"; + case "creation_time": + return "creationTime"; + case "valid_flag": + return "validFlag"; + case "display_seq": + return "displaySeq"; + case "parent_ids": + return "parentIds"; + default: + return null; + } + } + + /** **/ + public String getParentId() { + return this.parentId; + } + + /** **/ + public void setParentId(String parentId) { + this.parentId = parentId; + } + + /** **/ + public String getMenuName() { + return this.menuName; + } + + /** **/ + public void setMenuName(String menuName) { + this.menuName = menuName; + } + + /** **/ + public String getSorDivide() { + return this.sorDivide; + } + + /** **/ + public void setSorDivide(String sorDivide) { + this.sorDivide = sorDivide; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public Integer getDisplaySeq() { + return this.displaySeq; + } + + /** **/ + public void setDisplaySeq(Integer displaySeq) { + this.displaySeq = displaySeq; + } + + /** **/ + public String getParentIds() { + return this.parentIds; + } + + /** **/ + public void setParentIds(String parentIds) { + this.parentIds = parentIds; + } + + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + + public List getChildMenuIds() { + return childMenuIds; + } + + public void setChildMenuIds(List childMenuIds) { + this.childMenuIds = childMenuIds; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandAttrDetailsEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandAttrDetailsEO.java new file mode 100644 index 00000000..731c9435 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandAttrDetailsEO.java @@ -0,0 +1,286 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * 功能：SAR_STAND_ATTR_DETAILS SarStandAttrDetailsEOEntity
    + * 作者：code generator
    + * 日期： 2020-08-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarStandAttrDetailsEO extends BaseEntity { + + private String id; + private String attrField; + private String attrName; + private String attrType; + private Long orderNum; + private String isEdit; + private String creationUser; + private String validFlag; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date creationTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date modifyTime; + private Long attrLen; + private String attrValue; + private String isMust; + private String isShowImp; + private String showRegionId; + private String selVal; + private String sarType; + private String isSearch; + private String isWarn; + private String areaName; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • attrField -> attr_field
    • + *
  • attrName -> attr_name
    • + *
  • attrType -> attr_type
    • + *
  • orderNum -> order_num
    • + *
  • isEdit -> is_edit
    • + *
  • creationUser -> creation_user
    • + *
  • validFlag -> valid_flag
    • + *
  • creationTime -> creation_time
    • + *
  • modifyTime -> modify_time
    • + *
  • attrLen -> attr_len
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) return null; + switch (fieldName) { + case "id": return "id"; + case "attrField": return "attr_field"; + case "attrName": return "attr_name"; + case "attrType": return "attr_type"; + case "orderNum": return "order_num"; + case "isEdit": return "is_edit"; + case "creationUser": return "creation_user"; + case "validFlag": return "valid_flag"; + case "creationTime": return "creation_time"; + case "modifyTime": return "modify_time"; + case "attrLen": return "attr_len"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • attr_field -> attrField
    • + *
  • attr_name -> attrName
    • + *
  • attr_type -> attrType
    • + *
  • order_num -> orderNum
    • + *
  • is_edit -> isEdit
    • + *
  • creation_user -> creationUser
    • + *
  • valid_flag -> validFlag
    • + *
  • creation_time -> creationTime
    • + *
  • modify_time -> modifyTime
    • + *
  • attr_len -> attrLen
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) return null; + switch (columnName) { + case "id": return "id"; + case "attr_field": return "attrField"; + case "attr_name": return "attrName"; + case "attr_type": return "attrType"; + case "order_num": return "orderNum"; + case "is_edit": return "isEdit"; + case "creation_user": return "creationUser"; + case "valid_flag": return "validFlag"; + case "creation_time": return "creationTime"; + case "modify_time": return "modifyTime"; + case "attr_len": return "attrLen"; + default: return null; + } + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getAttrField() { + return this.attrField; + } + + /** **/ + public void setAttrField(String attrField) { + this.attrField = attrField; + } + + /** **/ + public String getAttrName() { + return this.attrName; + } + + /** **/ + public void setAttrName(String attrName) { + this.attrName = attrName; + } + + /** **/ + public String getAttrType() { + return this.attrType; + } + + /** **/ + public void setAttrType(String attrType) { + this.attrType = attrType; + } + + /** **/ + public Long getOrderNum() { + return this.orderNum; + } + + /** **/ + public void setOrderNum(Long orderNum) { + this.orderNum = orderNum; + } + + /** **/ + public String getIsEdit() { + return this.isEdit; + } + + /** **/ + public void setIsEdit(String isEdit) { + this.isEdit = isEdit; + } + + /** **/ + public String getCreationUser() { + return this.creationUser; + } + + /** **/ + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + /** **/ + public String getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(String 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 getAttrLen() { + return this.attrLen; + } + + /** **/ + public void setAttrLen(Long attrLen) { + this.attrLen = attrLen; + } + + public String getAttrValue() { + return attrValue; + } + + public void setAttrValue(String attrValue) { + this.attrValue = attrValue; + } + + public String getIsMust() { + return isMust; + } + + public void setIsMust(String isMust) { + this.isMust = isMust; + } + + public String getIsShowImp() { + return isShowImp; + } + + public void setIsShowImp(String isShowImp) { + this.isShowImp = isShowImp; + } + + public String getShowRegionId() { + return showRegionId; + } + + public void setShowRegionId(String showRegionId) { + this.showRegionId = showRegionId; + } + + public String getSelVal() { + return selVal; + } + + public void setSelVal(String selVal) { + this.selVal = selVal; + } + + public String getSarType() { + return sarType; + } + + public void setSarType(String sarType) { + this.sarType = sarType; + } + + public String getIsSearch() { + return isSearch; + } + + public void setIsSearch(String isSearch) { + this.isSearch = isSearch; + } + + public String getIsWarn() { + return isWarn; + } + + public void setIsWarn(String isWarn) { + this.isWarn = isWarn; + } + + public String getAreaName() { + return areaName; + } + + public void setAreaName(String areaName) { + this.areaName = areaName; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java new file mode 100644 index 00000000..b45d23b3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java @@ -0,0 +1,279 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 功能：SAR_STAND_FILE SarStandFileEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarStandFileEO extends BaseEntity { + + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private String validFlag; + private String useModel; + private String attId; + private String resId; + private String standId; + private String id; + private Integer pageCount; + private String fileOldName; + private List idlist = new ArrayList<>(); + private String standFileClassify; + private String standFileClassifyShow; + private String fileSuffix; + private String fileName; + private String password; + private String creationUser; + private String standNumber; + private String standName; + private String sarType; + private String oriAttId; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

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

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • valid_flag -> validFlag
    • + *
  • use_model -> useModel
    • + *
  • att_id -> attId
    • + *
  • res_id -> resId
    • + *
  • stand_id -> standId
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "page_count": return "pageCount"; + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "valid_flag": return "validFlag"; + case "use_model": return "useModel"; + case "att_id": return "attId"; + case "res_id": return "resId"; + case "stand_id": return "standId"; + case "id": return "id"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public String getValidFlag() { + return validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public String getUseModel() { + return this.useModel; + } + + /** **/ + public void setUseModel(String useModel) { + this.useModel = useModel; + } + + /** **/ + public String getAttId() { + return this.attId; + } + + /** **/ + public void setAttId(String attId) { + this.attId = attId; + } + + /** **/ + public String getResId() { + return this.resId; + } + + /** **/ + public void setResId(String resId) { + this.resId = resId; + } + + /** **/ + public String getStandId() { + return this.standId; + } + + /** **/ + public void setStandId(String standId) { + this.standId = standId; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + public Integer getPageCount() { + return pageCount; + } + + public void setPageCount(Integer 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; + } + + public String getStandFileClassify() { + return standFileClassify; + } + + public void setStandFileClassify(String standFileClassify) { + this.standFileClassify = standFileClassify; + } + + public String getFileSuffix() { + return fileSuffix; + } + + public void setFileSuffix(String fileSuffix) { + this.fileSuffix = fileSuffix; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getCreationUser() { + return creationUser; + } + + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + public String getStandNumber() { + return standNumber; + } + + public void setStandNumber(String standNumber) { + this.standNumber = standNumber; + } + + public String getStandName() { + return standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String getSarType() { + return sarType; + } + + public void setSarType(String sarType) { + this.sarType = sarType; + } + + public String getStandFileClassifyShow() { + return standFileClassifyShow; + } + + public void setStandFileClassifyShow(String standFileClassifyShow) { + this.standFileClassifyShow = standFileClassifyShow; + } + + public String getOriAttId() { + return oriAttId; + } + + public void setOriAttId(String oriAttId) { + this.oriAttId = oriAttId; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java new file mode 100644 index 00000000..b0613ba5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java @@ -0,0 +1,247 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; + +/** + * 功能：SAR_STAND_FILE SarStandFileEOPage
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarStandFileEOPage extends BaseEntity { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String useModel; + private String useModelOperator = "="; + private String attId; + private String attIdOperator = "="; + private String resId; + private String resIdOperator = "="; + private String standId; + private String standIdOperator = "="; + private String id; + private String idOperator = "="; + private String[] fileSuffixList; + private String fileSuffix; + private String standNumber; + private String standName; + private String fileType; + private String standFileClassify; + + 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 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 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 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 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 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 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 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[] getFileSuffixList() { + return fileSuffixList; + } + + public void setFileSuffixList(String[] fileSuffixList) { + this.fileSuffixList = fileSuffixList; + } + + public String getFileSuffix() { + return fileSuffix; + } + + public void setFileSuffix(String fileSuffix) { + this.fileSuffix = fileSuffix; + } + + public String getStandNumber() { + return standNumber; + } + + public void setStandNumber(String standNumber) { + this.standNumber = standNumber; + } + + public String getStandName() { + return standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getStandFileClassify() { + return standFileClassify; + } + + public void setStandFileClassify(String standFileClassify) { + this.standFileClassify = standFileClassify; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/MenuService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/MenuService.java new file mode 100644 index 00000000..cd7f453c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/MenuService.java @@ -0,0 +1,4 @@ +package com.adc.da.slrs.standardSplit.service; + +public interface MenuService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java new file mode 100644 index 00000000..6b63e22c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java @@ -0,0 +1,31 @@ +package com.adc.da.slrs.standardSplit.service; + +import com.adc.da.base.page.BasePage; +import com.adc.da.person.entity.PersonMsgEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage; + +import java.util.List; + +public interface SarFileSplitInfoEOService { + + List queryByPage(BasePage page) throws Exception; + + List queryByList(BasePage page) throws Exception; + + SarFileSplitInfoEO selectByPrimaryKey(String id) throws Exception; + + int insertSelective(SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception; + + int updateByPrimaryKeySelective(SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception; + + int deleteByPrimaryKey(String id) throws Exception; + + int fileAplit(SarFileSplitInfoEO sarFileSplitInfoEO); + + List queryByPageOwn(SarFileSplitInfoEOPage page); + + int deleteByIds(String ids); + + PersonMsgEO updateNew(PersonMsgEO val) throws Exception; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarLawsInfoEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarLawsInfoEOService.java new file mode 100644 index 00000000..5f1618f1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarLawsInfoEOService.java @@ -0,0 +1,10 @@ +package com.adc.da.slrs.standardSplit.service; + +import com.adc.da.slrs.standardSplit.entity.SarLawsInfoEO; +import com.adc.da.slrs.standardSplit.entity.SarLawsInfoEOPage; +import java.util.List; + +public interface SarLawsInfoEOService { + + List getLawsInfoPage(SarLawsInfoEOPage page) throws Exception; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandAttrDetailsEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandAttrDetailsEOService.java new file mode 100644 index 00000000..3dc46951 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandAttrDetailsEOService.java @@ -0,0 +1,4 @@ +package com.adc.da.slrs.standardSplit.service; + +public interface SarStandAttrDetailsEOService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java new file mode 100644 index 00000000..5063a985 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java @@ -0,0 +1,4 @@ +package com.adc.da.slrs.standardSplit.service; + +public interface SarStandFileEOService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/MenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/MenuServiceImpl.java new file mode 100644 index 00000000..eb0140e3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/MenuServiceImpl.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.standardSplit.service.impl; + +import com.adc.da.slrs.standardSplit.service.MenuService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class MenuServiceImpl implements MenuService { + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java new file mode 100644 index 00000000..101d92a5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -0,0 +1,662 @@ +package com.adc.da.slrs.standardSplit.service.impl; + +import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.person.entity.PersonMsgEO; +import com.adc.da.slrs.standardSplit.dao.*; +import com.adc.da.slrs.standardSplit.service.SarLawsInfoEOService; +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.base.page.BasePage; +import com.adc.da.common.ReadWordTable; +import com.adc.da.slrs.standardSplit.entity.*; +import com.adc.da.slrs.standardSplit.service.SarFileSplitInfoEOService; +import com.adc.da.sys.util.LoginUserUtil; +import com.adc.da.sys.util.UUIDUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.poi.xwpf.usermodel.*; +import org.apache.xmlbeans.XmlCursor; +import org.apache.xmlbeans.XmlObject; +import org.openxmlformats.schemas.drawingml.x2006.main.CTGraphicalObject; +import org.openxmlformats.schemas.drawingml.x2006.picture.CTPicture; +import org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.CTAnchor; +import org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.CTInline; +import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDrawing; +import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTLevelText; +import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import com.adc.da.common.SplitFilePragraTypeEnum; +import java.io.*; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import com.adc.da.person.dao.PersonShareEODao; +import com.adc.da.person.dao.PersonCollectEODao; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService { + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class); + + @Autowired + private IAttFileEOService attFileEOService; + @Value("${file.path}") + private String filePath;//文件存储路径 + /** + * 文件下载路径 + */ + @Value("${file.downloadUrl}") + private String downloadUrl; + @Autowired + private PersonShareEODao personShareEODao; + @Autowired + private SarFileSplitInfoEODao sarFileSplitInfoEODao; + @Autowired + private SarFileSplitMenuEODao sarFileSplitMenuEODao; + @Autowired + private SarFileSplitItemsEODao sarFileSplitItemsEODao; + @Autowired + private SarFileSplitItemsValEODao sarFileSplitItemsValEODao; + @Autowired + private SarLawsInfoEOService sarLawsInfoEOService; + @Autowired + private SarFileSplitItemsTableEODao sarFileSplitItemsTableEODao; + @Autowired + private PersonCollectEODao personCollectEODao; + @Autowired + private SarFileSplitItemsParamsEODao sarFileSplitItemsParamsEODao; + + @Override + public List queryByPage(BasePage page) throws Exception{ + return sarFileSplitInfoEODao.queryByPage(page); + } + + @Override + public List queryByList(BasePage page) throws Exception{ + return sarFileSplitInfoEODao.queryByList(page); + } + + @Override + public SarFileSplitInfoEO selectByPrimaryKey(String id) throws Exception{ + return sarFileSplitInfoEODao.selectByPrimaryKey(id); + } + + @Override + public int insertSelective(SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception{ + return sarFileSplitInfoEODao.insertSelective(sarFileSplitInfoEO); + } + + @Override + public int updateByPrimaryKeySelective(SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception{ + return sarFileSplitInfoEODao.updateByPrimaryKeySelective(sarFileSplitInfoEO); + } + + @Override + public int deleteByPrimaryKey(String id) throws Exception{ + return sarFileSplitInfoEODao.deleteByPrimaryKey(id); + } + + @Override + public int fileAplit(SarFileSplitInfoEO sarFileSplitInfoEO){ + // 拆分文件主表中插入数据 + sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20()); + sarFileSplitInfoEO.setValidFlag(0); + sarFileSplitInfoEO.setCreationTime(new Date()); + sarFileSplitInfoEO.setCreationUser(LoginUserUtil.getUserId()); + sarFileSplitInfoEO.setModifyTime(new Date()); + sarFileSplitInfoEO.setModifyUser(LoginUserUtil.getUserId()); + sarFileSplitInfoEODao.insertSelective(sarFileSplitInfoEO); + + // 拆分文件条款表中最终插入数据 + List messageList = new ArrayList<>(); + int messageNumber = 0; + // 拆分文件目录表中最终插入数据 + List treeList = new ArrayList<>(); + // 拆分文件条款详情表中最终插入数据 + List itemValList = new ArrayList<>(); + Long treeListDisplay = 1L; + + String generalCatalogueId = UUIDUtils.randomUUID20(); + SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(generalCatalogueId,"总目录","",sarFileSplitInfoEO.getId(),treeListDisplay++,""); + treeList.add(documentTreeEO); + + List nowStart = new ArrayList<>(); + if (sarFileSplitInfoEO.getStartNumber()<4){ + nowStart.add("4"); + } else { + nowStart.add(String.valueOf(sarFileSplitInfoEO.getStartNumber())); + } + try { + AttFileEO attFileEO = attFileEOService.getFileInfo(sarFileSplitInfoEO.getAttId()); + String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + + InputStream is = new FileInputStream(readFilePath); //需要将文件路更改为word文档所在路径。 + XWPFDocument doc = new XWPFDocument(is); + + Pattern ptest = Pattern.compile("^1范围"); + Matcher matcher; + + // 记录拆分后的每一段文字 + List elements = doc.getBodyElements(); + // 记录word自动生成的编号数据 + Map numberMap = new HashMap(); + boolean menuCanAdd = false; // 判断当前目录下是否可以正常填写数据 + for (IBodyElement element : elements) { + // 段落 + if (element instanceof XWPFParagraph) { + XWPFParagraph p = (XWPFParagraph)element; + + // 处理段落生成编号不识别问题 + String paragraphString = p.getText(); + if (StringUtils.isNotBlank(paragraphString)) { + paragraphString = paragraphString.replace((char) 12288, ' '); + paragraphString = paragraphString.trim(); + } + if (StringUtils.isNotEmpty(p.getNumLevelText())&& p.getNumLevelText().indexOf(".")>0) { + String numberParent = p.getNumLevelText().substring(0,p.getNumLevelText().lastIndexOf(".")); + if (numberMap.containsKey(numberParent)){ + Integer numbernow =(Integer)numberMap.get(numberParent)+1; + if (messageList != null && !messageList.isEmpty() && messageList.get(messageList.size()-1).getItemsNum().equals(numberParent + "." + String.valueOf(numbernow))){ + numberMap.put(numberParent,numbernow+1); + paragraphString = numberParent + "." + String.valueOf(numbernow+1)+ p.getText(); + } else { + numberMap.put(numberParent,numbernow); + paragraphString = numberParent + "." + String.valueOf(numbernow)+ p.getText(); + } + } else { + numberMap.put(numberParent,1); + paragraphString = numberParent+".1"+ p.getText(); + } + } + if (messageNumber == 0) { + ptest= Pattern.compile("^1\\s{0,3}范围"); + matcher=ptest.matcher(paragraphString); + while(matcher.find()){ + List clauseContent = new ArrayList<>(); + SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(),"1","范围",clauseContent); + SarFileSplitMenuEO documentTreeEO1 = new SarFileSplitMenuEO(UUIDUtils.randomUUID20(),message.getItemsNum(),generalCatalogueId,sarFileSplitInfoEO.getId(),treeListDisplay++,"范围"); + message.setMenuId(documentTreeEO1.getId()); + if(sarFileSplitInfoEO.getStartNumber()<=1 && sarFileSplitInfoEO.getStopNumber()>=1){ + messageList.add(message); + treeList.add(documentTreeEO1); + menuCanAdd = true; + } else { + menuCanAdd = false; + } + messageNumber++; + } + } + else if (messageNumber == 1){ + ptest= Pattern.compile("^2\\s{0,3}规范性引用文件"); + matcher=ptest.matcher(paragraphString); + if(matcher.find()){ + List clauseContent = new ArrayList<>(); + SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(),"2","规范性引用文件",clauseContent); + SarFileSplitMenuEO documentTreeEO1 = new SarFileSplitMenuEO(UUIDUtils.randomUUID20(),message.getItemsNum(),generalCatalogueId,sarFileSplitInfoEO.getId(),treeListDisplay++,"规范性引用文件"); + message.setMenuId(documentTreeEO1.getId()); + if(sarFileSplitInfoEO.getStartNumber()<=2 && sarFileSplitInfoEO.getStopNumber()>=2){ + messageList.add(message); + treeList.add(documentTreeEO1); + menuCanAdd = true; + } else { + menuCanAdd = false; + } + messageNumber++; + } else if(menuCanAdd){ + List imageBundleList = readImageInParagraph((XWPFParagraph)p); + if(CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size()-1),itemValList, p,imageBundleList); + } else { + addItermsConditionsText(messageList.get(messageList.size()-1),itemValList, p.getText()); + } + } + } + else if (messageNumber == 2){ + ptest= Pattern.compile("^3\\s{0,3}术语(和|与)定义"); + matcher=ptest.matcher(paragraphString); + if(matcher.find()){ + List clauseContent = new ArrayList<>(); + SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(),"3","术语与定义",clauseContent); + SarFileSplitMenuEO documentTreeEO1 = new SarFileSplitMenuEO(UUIDUtils.randomUUID20(),message.getItemsNum(),generalCatalogueId,sarFileSplitInfoEO.getId(),treeListDisplay++,"术语与定义"); + message.setMenuId(documentTreeEO1.getId()); + if(sarFileSplitInfoEO.getStartNumber()<=3 && sarFileSplitInfoEO.getStopNumber()>=3){ + messageList.add(message); + treeList.add(documentTreeEO1); + menuCanAdd = true; + } else { + menuCanAdd = false; + } + messageNumber++; + } else if(menuCanAdd){ + List imageBundleList = readImageInParagraph((XWPFParagraph)p); + if(CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size()-1),itemValList, p,imageBundleList); + } else { + addItermsConditionsText(messageList.get(messageList.size()-1),itemValList, p.getText()); + } + } + } + else if (messageNumber>=3){ + ptest = Pattern.compile("^[\\d.]*$"); + boolean hasGoIf = false; + for (int i=0;i10?paragraphString.substring(nowStart.get(i).length(),nowStart.get(i).length()+10):paragraphString.substring(nowStart.get(i).length()); + List clauseContent = new ArrayList<>(); + clauseContent.add(paragraphString); + SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(),nowStart.get(i),itemName,clauseContent); + + String[] numberStr = nowStart.get(i).split("\\."); + if (Integer.valueOf(numberStr[0]) > sarFileSplitInfoEO.getStopNumber()){ + menuCanAdd = false; + } else { + // 增加一条数据，需要在数结构中加一条数据 + SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i),treeList,generalCatalogueId,sarFileSplitInfoEO ,treeListDisplay++,itemName); + treeList.add(sarFileSplitMenuEO) ; + message.setMenuId(sarFileSplitMenuEO.getId()); + addItermsConditionsText(message,itemValList,paragraphString.substring(nowStart.get(i).length())); + messageList.add(message); + nowStart = getNewNowStart(nowStart.get(i)); + menuCanAdd = true; + } + hasGoIf = true; + break; + } + } + if(!hasGoIf && menuCanAdd) { + // 判断是否是附录 + ptest= Pattern.compile("^附录\\s{0,3}[A-Z]{1}"); + matcher=ptest.matcher(paragraphString); + // 获取当前最后一项num + String appendixNum = messageList.get(messageList.size()-1).getItemsNum().split("\\.")[0]; + if(matcher.find() && !messageList.get(messageList.size()-1).getItemsNum().equals("附录") ){ + if ( Integer.valueOf(appendixNum)+1 <= sarFileSplitInfoEO.getStopNumber()) { + String itemName = "附录"; + List clauseContent = new ArrayList<>(); + clauseContent.add(paragraphString); + SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(),"附录",itemName,clauseContent); + // 增加一条数据，需要在数结构中加一条数据 + SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList("附录",treeList,generalCatalogueId,sarFileSplitInfoEO ,treeListDisplay++,""); + addItermsConditionsText(message,itemValList,paragraphString); + treeList.add(sarFileSplitMenuEO) ; + message.setMenuId(sarFileSplitMenuEO.getId()); + messageList.add(message); + nowStart = new ArrayList<>(); + } else { + break; + } + } else { + if (!p.getText().equals("") ){ + addItermsConditionsText(messageList.get(messageList.size()-1),itemValList,p.getText()); + } + List imageBundleList = readImageInParagraph((XWPFParagraph)p); + if(CollectionUtils.isNotEmpty(imageBundleList)) { + addItermsConditionsImage(messageList.get(messageList.size()-1),itemValList, p,imageBundleList); + } + } + } + // 判断是否直接跳出所有循环 + if (!menuCanAdd && messageList.size()>0) { + break; + } + } + } else if (element instanceof XWPFTable){ + if(messageList != null && !messageList.isEmpty()){ + addItermsConditionsOfTable(messageList.get(messageList.size()-1),itemValList,(XWPFTable)element); + } + } + } + + } catch (Exception e) { + e.printStackTrace(); + return -1; + } + if(treeList.size()>0 && messageList.size() > 0){ + sarFileSplitMenuEODao.insertForeach(treeList); + sarFileSplitItemsEODao.insertForeach(messageList); + sarFileSplitItemsValEODao.insertForeach(itemValList); + } else { + return -1; + } + return treeList.size(); + } + + private SarFileSplitItemsEO getSarFileSplitItemsEO(String infoId,String itemsNum,String itemsName,List itemsCondi) { + SarFileSplitItemsEO sarFileSplitItemsEO = new SarFileSplitItemsEO(); + sarFileSplitItemsEO.setInfoId(infoId); + sarFileSplitItemsEO.setItemsNum(itemsNum); + sarFileSplitItemsEO.setItemsName(itemsName); + sarFileSplitItemsEO.setItemsCondi(itemsCondi); + sarFileSplitItemsEO.setItermsConditions(""); + sarFileSplitItemsEO.setId(UUIDUtils.randomUUID20()); + sarFileSplitItemsEO.setValidFlag(0); + sarFileSplitItemsEO.setCreationTime(new Date()); + sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId()); + sarFileSplitItemsEO.setModifyTime(new Date()); + sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId()); + return sarFileSplitItemsEO; + } + + //获取某一个段落中的所有图片索引 + private List readImageInParagraph(XWPFParagraph paragraph) { + //图片索引List + List imageBundleList = new ArrayList(); + + //段落中所有XWPFRun + List runList = paragraph.getRuns(); + for (XWPFRun run : runList) { + //XWPFRun是POI对xml元素解析后生成的自己的属性，无法通过xml解析，需要先转化成CTR + CTR ctr = run.getCTR(); + //对子元素进行遍历 + XmlCursor c = ctr.newCursor(); + //这个就是拿到所有的子元素： + c.selectPath("./*"); + while (c.toNextSelection()) { + XmlObject o = c.getObject(); + //如果子元素是这样的形式，使用CTDrawing保存图片 + if (o instanceof CTDrawing) { + CTDrawing drawing = (CTDrawing) o; + CTInline[] ctInlines = drawing.getInlineArray(); + CTAnchor[] ctAnchors = drawing.getAnchorArray(); + for (CTInline ctInline : ctInlines) { + CTGraphicalObject graphic = ctInline.getGraphic(); + // + XmlCursor cursor = graphic.getGraphicData().newCursor(); + cursor.selectPath("./*"); + while (cursor.toNextSelection()) { + XmlObject xmlObject = cursor.getObject(); + // 如果子元素是这样的形式 + if (xmlObject instanceof CTPicture) { + CTPicture picture = (CTPicture) xmlObject; + //拿到元素的属性 + imageBundleList.add(picture.getBlipFill().getBlip().getEmbed()); + } + } + } + for (CTAnchor ctAnchor : ctAnchors) { + CTGraphicalObject graphic = ctAnchor.getGraphic(); + XmlCursor cursor = graphic.getGraphicData().newCursor(); + cursor.selectPath("./*"); + while (cursor.toNextSelection()) { + XmlObject xmlObject = cursor.getObject(); + // 如果子元素是这样的形式 + if (xmlObject instanceof CTPicture) { + CTPicture picture = (CTPicture) xmlObject; + //拿到元素的属性 + imageBundleList.add(picture.getBlipFill().getBlip().getEmbed()); + } + } + } + } else if (o instanceof CTLevelText){ + logger.info(((CTLevelText) o).getVal()); + } + } + } + return imageBundleList; + } + + // 像每个条款中依次插入每一段的内容 + private void addItermsConditionsImage(SarFileSplitItemsEO message,List itemsValList,XWPFParagraph p,List imageBundleList) { + for (String pictureId : imageBundleList) { + XWPFPictureData pictureData = p.getDocument().getPictureDataByID(pictureId); + String imageName = UUIDUtils.randomUUID10() + pictureData.getFileName(); + byte[] bytev = pictureData.getData(); + String outPath = filePath + "/img/"; + File file1 = new File(outPath); + if(!file1.exists()){ + file1.mkdirs(); + } + String filepathandname = filePath + "/img/" + imageName; + try { + FileOutputStream fos = new FileOutputStream(filepathandname); + fos.write(bytev); + String path = "uploadPath/img/" + imageName; + String imgCon = ""; + message.getItemsCondi().add(imgCon); + message.setItermsConditions(message.getItermsConditions() + imgCon); + itemsValList.add(getSplitItemsValObject(message.getId(),SplitFilePragraTypeEnum.IMG.getValue(),imgCon,message.getItemsCondi().size(),null)); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + private SarFileSplitItemsValEO getSplitItemsValObject (String itemId,String type,String itemContent,int disPlaySql,List tableList) { + SarFileSplitItemsValEO sarFileSplitItemsValEO = new SarFileSplitItemsValEO(); + sarFileSplitItemsValEO.setId(UUIDUtils.randomUUID20()); + sarFileSplitItemsValEO.setValidFlag(0); + sarFileSplitItemsValEO.setCreationTime(new Date()); + sarFileSplitItemsValEO.setCreationUser(LoginUserUtil.getUserId()); + sarFileSplitItemsValEO.setModifyTime(new Date()); + sarFileSplitItemsValEO.setModifyUser(LoginUserUtil.getUserId()); + sarFileSplitItemsValEO.setItemId(itemId); + sarFileSplitItemsValEO.setType(type); + sarFileSplitItemsValEO.setDisplaySeq(disPlaySql); + sarFileSplitItemsValEO.setItemContent(itemContent); + return sarFileSplitItemsValEO; + } + + // 像每个条款中依次插入每一段的内容 + private void addItermsConditionsText(SarFileSplitItemsEO message,List itemsValList,String p) { + message.getItemsCondi().add(p); + message.setItermsConditions(message.getItermsConditions() + "

    "+p+ "

    "); + // 判断message中是否引用到其他标准 +// String testString = p; +// Pattern ptest = Pattern.compile("[A-Z]{1,}/{0,1}[A-Z]{1,}\\s{0,1}[0-9]\\d*\\.?\\d*"); +// Pattern ptest2 = Pattern.compile("[A-Z]{1,}/{0,1}[A-Z]{1,}\\s{0,1}[0-9]\\d*\\.?\\d*-[0-9]{1,4}"); +// Matcher matcher = ptest2.matcher(testString); +// while (matcher.find()){ +// String standNumber = matcher.group(); +// if (StringUtils.isNotEmpty(message.getReferenceStand()) && message.getReferenceStand()!=""){ +// message.setReferenceStand(message.getReferenceStand() + ","+standNumber); +// } else { +// message.setReferenceStand(standNumber); +// } +// testString = testString.replaceAll(standNumber," "); +// } +// matcher = ptest.matcher(testString); +// while (matcher.find()){ +// if (StringUtils.isNotEmpty(message.getReferenceStand()) && message.getReferenceStand()!=""){ +// message.setReferenceStand(message.getReferenceStand() + ","+matcher.group()); +// } else { +// message.setReferenceStand(matcher.group()); +// } +// } + itemsValList.add(getSplitItemsValObject(message.getId(),SplitFilePragraTypeEnum.TEXT.getValue(),p,message.getItemsCondi().size(),null)); + } + + private SarFileSplitMenuEO getTreeList(String name, List treeList,String generalCatalogueId,SarFileSplitInfoEO sarFileSplitInfoEO ,Long treeListDisplay,String itemName){ + SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(UUIDUtils.randomUUID20(),name,sarFileSplitInfoEO.getId(),treeListDisplay,itemName); + // 用现在得name 和之前得name 做比较，确定，parentId + if (name.indexOf(".")>=0) { + for (SarFileSplitMenuEO forDocumentTree : treeList) { + if (name.substring(0, name.lastIndexOf(".")).equals(forDocumentTree.getName())) { + documentTreeEO.setPId(forDocumentTree.getId()); + break; + } + } + }else { + documentTreeEO.setPId(generalCatalogueId); + } + return documentTreeEO; + } + + /** + * 通过传递过来的编号，得出下次可能出现的编号 + * @param nowStart + * @return + */ + private List getNewNowStart(String nowStart){ + List nowStartList = new ArrayList<>(); + List nowResultStartList = new ArrayList<>(); + String[] numberStr = nowStart.split("\\."); + String startnumber = ""; + for(int i=0;i itemsValList,XWPFTable table) throws IOException { + StringBuilder tabaleStringNew = new StringBuilder(""); + //将表格转为html字符串 + ReadWordTable readWordTable = new ReadWordTable(); + String tableStr = readWordTable.readTable(table); + tabaleStringNew.append(tableStr); + message.getItemsCondi().add(table.getText()); + message.setItermsConditions(message.getItermsConditions() + tabaleStringNew); + itemsValList.add(getSplitItemsValObject(message.getId(),SplitFilePragraTypeEnum.TABLE.getValue(),tabaleStringNew.toString(),message.getItemsCondi().size(),null)); + + } + + @Override + public List queryByPageOwn(SarFileSplitInfoEOPage page){ + int rowCount = sarFileSplitInfoEODao.queryByCountOwn(page); + page.getPager().setRowCount(rowCount); + List rows = sarFileSplitInfoEODao.queryByPageOwn(page); + if (rows != null && !rows.isEmpty()) { + for (SarFileSplitInfoEO infoEO : rows) { +// if (!infoEO.getSplitStatus().equals("0") && infoEO.getShowNumber() == null){ +// SarLawsInfoEOPage sarLawsInfoEOPage = new SarLawsInfoEOPage(); +// sarLawsInfoEOPage.setId(infoEO.getStandId()); +// sarLawsInfoEOPage.setLawsType("FOREIGN"); +// List sarLawsInfoEOList = sarLawsInfoEOService.getLawsInfoPage(sarLawsInfoEOPage); +// if (sarLawsInfoEOList.size()>0){ +// infoEO.setShowNumber(sarLawsInfoEOList.get(0).getLawsNumber()); +// infoEO.setStandName(sarLawsInfoEOList.get(0).getLawsName()); +// } +// } +// String collectId = personCollectEOService.queryCollectByUserAndId(infoEO.getId()); +// infoEO.setCollectId(collectId); +// if (StringUtils.isNotBlank(infoEO.getFileType())) { +// List getList = +// sarStandAttrDetailsEODao.selectFileFieldForSel1(infoEO.getFileType()); +// if (getList != null && !getList.isEmpty()) { +// infoEO.setFileTypeShow(getList.get(0).getLabel()); +// } else { +// infoEO.setFileTypeShow(null); +// } +// } + } + } + return rows; + } + + @Override + public int deleteByIds(String ids){ + String[] infoIds = ids.split(","); + // 删除info表数据 + SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO(); + sarFileSplitInfoEO.setIdList(infoIds); + int result = sarFileSplitInfoEODao.deleteByIds(sarFileSplitInfoEO); + + //删除menu表数据 + SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); + sarFileSplitMenuEO.setInfoIdList(infoIds); + sarFileSplitMenuEODao.deleteByIds(sarFileSplitMenuEO); + // 删除val表数据 + List idList = Arrays.asList(infoIds); + sarFileSplitItemsValEODao.deleteValByInfoIds(idList); + // 删除table表数据 + sarFileSplitItemsTableEODao.deleteTableByMenuIds(idList); + //删除items表数据 + SarFileSplitItemsEO sarFileSplitItemsEO = new SarFileSplitItemsEO(); + sarFileSplitItemsEO.setInfoIdList(infoIds); + sarFileSplitItemsEODao.deleteByIds(sarFileSplitItemsEO); + //删除params表数据 + sarFileSplitItemsParamsEODao.deleteByInfoIds(idList); + //删除收藏表中数据 + personCollectEODao.deleteByResIdList(idList); + // 删除分享表中数据 + personShareEODao.deleteByResIdList(idList); + return result; + } + + @Override + public PersonMsgEO updateNew(PersonMsgEO val) throws Exception { +// PersonMsgEO personMsgEO = personMsgEOService.selectByPrimaryKey(val.getId()); +// personMsgEO.setMsgResult(val.getMsgResult()); +// personMsgEOService.updateByPrimaryKeySelective(personMsgEO); +// if (personMsgEO.getMsgType().equals("SPLIT")){ +// PersonMsgEOPage page = new PersonMsgEOPage(); +// page.setMsgType("SPLIT"); +// page.setBusiId(personMsgEO.getBusiId()); +// page.setMsgTitle(personMsgEO.getMsgTitle()); +// List list = personMsgEOService.queryByList(page); +// for (PersonMsgEO item:list) { +// item.setMsgResult(personMsgEO.getMsgResult()); +// personMsgEOService.updateByPrimaryKeySelective(item); +// } +// SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO(); +// sarFileSplitInfoEO.setId(personMsgEO.getBusiId()); +// if (personMsgEO.getMsgResult().equals("0")){ +// sarFileSplitInfoEO.setSplitStatus("2"); +// }else { +// sarFileSplitInfoEO.setSplitStatus("0"); +// } +// sarFileSplitInfoEO.setModifyTime(new Date()); +// this.updateByPrimaryKeySelective(sarFileSplitInfoEO); +// if (list.size() > 0 && list.get(0).getSenderId() != null){ +// PersonMsgEO personMsgEO1 = new PersonMsgEO(); +// personMsgEO1.setUserIds(list.get(0).getSenderId()); +// personMsgEO1.setMsgTitle(list.get(0).getMsgTitle().replace("确认","")+"审核结果"); +// personMsgEO1.setMsgContent(list.get(0).getMsgTitle().replace("确认","") + (personMsgEO.getMsgResult().equals("0")?"已审核通过":"未审核通过")); +// personMsgEO1.setMsgType("TEXT"); +// personMsgEOService.saveNew(personMsgEO1); +// List emailList = new ArrayList<>(); +// UserEO userEO = userEOService.selectByPrimaryKey(list.get(0).getSenderId()); +// if(userEO!=null){ +// emailList.add(userEO.getEmail()); +// String[] array=emailList.toArray(new String[0]); +// mailUtil.sendMsg(array,personMsgEO1.getMsgContent()); +// } +// +// } +// SarFileSplitInfoEOPage sarFileSplitInfoEOPage = new SarFileSplitInfoEOPage(); +// sarFileSplitInfoEOPage.setId(personMsgEO.getBusiId()); +// sarFileSplitInfoEOPage.setSplitStatus("2"); +// List list1 =this.queryByPageOwn(sarFileSplitInfoEOPage); +// for (SarFileSplitInfoEO data:list1) { +// //根据标准号查询标准是否存在 +// String standNum=""; +// if (StringUtils.isNotEmpty(data.getStandId())) { +// standNum=data.getShowNumber(); +// } else if(StringUtils.isNotEmpty(data.getStandNumSplit())){ +// standNum=data.getStandNumSplit(); +// } +// List getList = sarStandardsInfoEOService.selectStandardsByStandnumber(standNum,null); +// SarStandardsInfoEO result = new SarStandardsInfoEO(); +// if(getList != null && getList.size()>0){ +// result = getList.get(0); +// SarStandItemsEOPage itemPage = new SarStandItemsEOPage(); +// String standId = data.getStandId(); +// itemPage.setStandId(standId); +// itemPage.setValidFlag("0"); +// itemPage.setFileType(data.getFileType()); +// List getItemsIds = sarStandItemsEODao.queryIdsByList(itemPage); +// if (getItemsIds.size()>0){ +// this.addToStandItems(data,result); +// } +// } +// } +// } +// return personMsgEO; + return null; + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarLawsInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarLawsInfoEOServiceImpl.java new file mode 100644 index 00000000..cb5de8b1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarLawsInfoEOServiceImpl.java @@ -0,0 +1,47 @@ +package com.adc.da.slrs.standardSplit.service.impl; + +import com.adc.da.slrs.standardSplit.entity.SarLawsInfoEO; +import com.adc.da.slrs.standardSplit.entity.SarLawsInfoEOPage; +import com.adc.da.slrs.standardSplit.service.SarLawsInfoEOService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarLawsInfoEOServiceImpl implements SarLawsInfoEOService { + private static final Logger logger = LoggerFactory.getLogger(SarLawsInfoEOServiceImpl.class); + +// @Autowired +// private SarMenuEOService sarMenuEOService; + + public List getLawsInfoPage(SarLawsInfoEOPage page) throws Exception { + //查询当前登录人角色拥有权限的菜单 +// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getLawsType()+"_LAWS",null); +// if(getMenuIdList != null && !getMenuIdList.isEmpty()){ +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } +// if (page.getMenuId() != null){ +// List sarMenuEOList = sarMenuEODao.queryByList(new SarMenuEOPage()); +// Tree tree = new Tree<>(sarMenuEOList); +// TreeNode treeNode = tree.getTreeNode(page.getMenuId()); +// List menuIds = new ArrayList<>(); +// menuIds.add(treeNode.getNodeId()); +// for (TreeNode node: treeNode.getAllChildren()) { +// menuIds.add(node.getNodeId()); +// } +// page.setMenuIdList(menuIds); +// } +// Integer rowCount = dao.queryByCount(page); +// page.getPager().setRowCount(rowCount); +// List sarlist = dao.queryByPage(page); +// attrInfo(sarlist); +// return sarlist; + return null; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandAttrDetailsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandAttrDetailsEOServiceImpl.java new file mode 100644 index 00000000..8c3d1e0a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandAttrDetailsEOServiceImpl.java @@ -0,0 +1,14 @@ +package com.adc.da.slrs.standardSplit.service.impl; + +import com.adc.da.slrs.standardSplit.service.SarStandAttrDetailsEOService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarStandAttrDetailsEOServiceImpl implements SarStandAttrDetailsEOService { + private static final Logger logger = LoggerFactory.getLogger(SarLawsInfoEOServiceImpl.class); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java new file mode 100644 index 00000000..590af634 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -0,0 +1,14 @@ +package com.adc.da.slrs.standardSplit.service.impl; + +import com.adc.da.slrs.standardSplit.service.SarStandFileEOService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarStandFileEOServiceImpl implements SarStandFileEOService { + private static final Logger logger = LoggerFactory.getLogger(SarLawsInfoEOServiceImpl.class); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/UserUtils.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/UserUtils.java new file mode 100644 index 00000000..0e0f99eb --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/UserUtils.java @@ -0,0 +1,225 @@ +//package com.adc.da.utils.util; +// +//import com.adc.da.slrs.standardSplit.service.UserEOService; +//import com.adc.da.sys.entity.MenuEO; +//import com.adc.da.sys.entity.RoleEO; +//import com.adc.da.sys.entity.UserEO; +//import com.adc.da.util.utils.CollectionUtils; +//import com.adc.da.util.utils.SpringContextHolder; +//import com.google.common.collect.Maps; +//import org.apache.commons.lang3.SerializationUtils; +//import org.apache.commons.lang3.StringUtils; +//import org.apache.shiro.SecurityUtils; +//import org.apache.shiro.UnavailableSecurityManagerException; +//import org.apache.shiro.authz.SimpleAuthorizationInfo; +//import org.apache.shiro.session.InvalidSessionException; +//import org.apache.shiro.subject.Subject; +//import java.util.List; +//import java.util.Map; +// +//public class UserUtils { +// +// public static final String CURRENT_USER = "currentUser"; +// public static final String CACHE_ROLE_LIST = "roleList"; +// public static final String CACHE_MENU_LIST = "menuList"; +// public static final String CACHE_MENU_TREE = "menuTree"; +// public static final String CACHE_AREA_LIST = "areaList"; +// public static final String CACHE_OFFICE_LIST = "officeList"; +// +// private static UserEOService userService = SpringContextHolder.getBean(UserEOService.class); +//// private static MenuEOService menuService = SpringContextHolder.getBean(MenuEOService.class); +//// private static RoleEOService roleEOService = SpringContextHolder.getBean(RoleEOService.class); +//// +//// /** +//// * 退出 +//// */ +//// public static void logout() { +//// try { +//// SecurityUtils.getSubject().logout(); +//// } catch (UnavailableSecurityManagerException e) { +//// e.printStackTrace(); +//// } catch (InvalidSessionException e) { +//// e.printStackTrace(); +//// } +//// } +//// +//// /** +//// * 获取当前登录用户ID +//// * +//// */ +//// public static String getUserId() { +//// String userId = null; +//// try { +//// Subject subject = SecurityUtils.getSubject(); +//// SystemAuthorizingRealm.Principal principal = (SystemAuthorizingRealm.Principal) subject.getPrincipal(); +//// if (principal != null) { +//// userId = principal.getId(); +//// } +//// } catch (UnavailableSecurityManagerException e) { +//// } catch (InvalidSessionException e) { +//// } +//// return userId; +//// } +//// +//// /** +//// * 获取当前登录用户信息 +//// */ +//// public static UserEO getUser() throws NumberFormatException, Exception { +//// UserEO user = (UserEO) CacheUtils.getCache(CURRENT_USER); +//// if (user == null) { +//// String userId = getUserId(); +//// +//// if(StringUtils.isNotEmpty(userId)) { +////// UserEO userInDb = userService.selectByPrimaryKey(userId); +////// liwenxuan:上面的方法不能查出组织机构 +//// UserEO userInDb = userService.getUserWithRoles(userId); +//// user= SerializationUtils.clone(userInDb); +////// user = ObjectUtils.clone(userInDb); +//// user.setPassword(null); +//// CacheUtils.putCache(CURRENT_USER, user); +//// } +//// } +//// return user; +//// } +//// +//// public static void updateUserInfo(UserEO userVo) throws NumberFormatException, Exception { +//// UserEO user = (UserEO) CacheUtils.getCache(CURRENT_USER); +//// if (user != null) { +//// String userId = getUserId(); +//// +//// if (StringUtils.isNotEmpty(userId)) { +//// UserEO userInDb = userService.selectByPrimaryKey(userId); +//// userInDb.setUname(userVo.getUname()); +//// userService.save(userInDb); +//// +//// CacheUtils.removeCache(CURRENT_USER); +//// } +//// } +//// } +//// +// /** +// * 获取当前登录用户角色列表 +// */ +// public static List getRoleList() throws NumberFormatException, Exception { +// List roleList = (List) CacheUtils.getCache(CACHE_ROLE_LIST); +// if (roleList == null) { +// UserEO user = getUser(); +// if(user != null) { +// roleList = roleEOService.getSysRoleListByUserId(user.getUsid()); +// } +// CacheUtils.putCache(CACHE_ROLE_LIST, roleList); +// } +// return roleList; +// } +// +// public static String getRoleIds() throws NumberFormatException, Exception { +// List roleList = getRoleList(); +// if (CollectionUtils.isEmpty(roleList)) { +// return ""; +// } +// StringBuilder roleIds = new StringBuilder(); +// for (RoleEO sysRoleEO : roleList) { +// roleIds.append(sysRoleEO.getId()).append(","); +// } +// return roleIds.substring(0, roleIds.length() - 1); +// } +// +// +//// /** +//// * 获取当前登录用户菜单列表 +//// */ +//// public static List getMenuList() throws Exception { +//// List menuList = (List) CacheUtils.getCache(CACHE_MENU_LIST); +//// if (menuList == null) { +//// UserEO user = getUser(); +//// if (isAdmin(user)) { +//// menuList = menuService.findAll(); +//// } else { +//// menuList = menuService.listMenuEOByUserId(String.valueOf(user.getUsid())); +//// } +//// CacheUtils.putCache(CACHE_MENU_LIST, menuList); +//// } +//// return menuList; +//// } +//// +//// /** +//// * 获取当前登录用户菜单树 +//// * +//// */ +//// public static MenuEO getMenuTree() { +//// MenuEO menu = (MenuEO) CacheUtils.getCache(CACHE_MENU_TREE); +//// if (menu == null) { +////// menu = menuService.organizeListAsTree(menuService.selectByPrimaryKey(1), getMenuList()); +//// CacheUtils.putCache(CACHE_MENU_TREE, menu); +//// } +//// return menu; +//// } +//// +//// /** +//// * 判断用户是否是超级管理员 +//// * @param userVo +//// * @return +//// */ +//// public static boolean isAdmin(UserEO userVo) { +//// //todo +//// return userVo != null && userVo.getUsid().equals("1"); +//// } +//// +//// /** +//// * 获取用户菜单权限信息 +//// */ +//// public static SimpleAuthorizationInfo getAuthInfo() throws NumberFormatException, Exception { +//// SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(); +//// List list = com.adc.da.login.util.UserUtils.getMenuList(); +//// for (MenuEO menu : list) { +//// if (StringUtils.isNotBlank(menu.getPermission())) { +//// // 添加基于Permission的权限信息 +//// for (String permission : StringUtils.split(menu.getPermission(), ",")) { +//// info.addStringPermission(permission); +//// } +//// } +//// } +//// return info; +//// } +//// +//// public static void flush() { +//// CacheUtils.removeCache(CURRENT_USER); +//// CacheUtils.removeCache(CACHE_MENU_LIST); +//// CacheUtils.removeCache(CACHE_MENU_TREE); +//// } +//// +//// +// private static final class CacheUtils { +// public static Object getCache(String key) { +// return getCache(key, null); +// } +// +// public static Object getCache(String key, Object defaultValue) { +// Object obj = getCacheMap().get(key); +// return obj == null ? defaultValue : obj; +// } +// +// public static void putCache(String key, Object value) { +// getCacheMap().put(key, value); +// } +// +// public static void removeCache(String key) { +// getCacheMap().remove(key); +// } +// +// public static Map getCacheMap() { +// Map map = Maps.newHashMap(); +// try { +// Subject subject = SecurityUtils.getSubject(); +// SystemAuthorizingRealm.Principal principal = (SystemAuthorizingRealm.Principal) subject.getPrincipal(); +// return principal != null ? principal.getCacheMap() : map; +// } catch (UnavailableSecurityManagerException e) { +// +// } catch (InvalidSessionException e) { +// +// } +// return map; +// } +// }; +// +//} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml new file mode 100644 index 00000000..5f560a34 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml @@ -0,0 +1,330 @@ + + + + + + + + + + + + + + + + + + + + + + + + + sar_type, file_name, id, stand_id, file_type, att_id, valid_flag, creation_time, + creation_user, modify_time, modify_user,stand_num_split,stand_name_split,result + + + + + where 1=1 + + + and sar_type ${sarTypeOperator} #{sarType} + + + and file_name ${fileNameOperator} #{fileName} + + + and id ${idOperator} #{id} + + + and stand_id ${standIdOperator} #{standId} + + + and file_type ${fileTypeOperator} #{fileType} + + + and att_id ${attIdOperator} #{attId} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and creation_user ${creationUserOperator} #{creationUser} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and modify_user ${modifyUserOperator} #{modifyUser} + + + + + + + + insert into SAR_FILE_SPLIT_INFO() + values (#{sarType, jdbcType=VARCHAR}, #{fileName, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{fileType, jdbcType=VARCHAR}, #{attId, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{creationUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}) + + + + + + insert into SAR_FILE_SPLIT_INFO + + sar_type, + file_name, + id, + stand_id, + file_type, + att_id, + valid_flag, + creation_time, + creation_user, + modify_time, + modify_user, + stand_num_split, + stand_name_split, + result, + + + #{sarType, jdbcType=VARCHAR}, + #{fileName, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + #{standId, jdbcType=VARCHAR}, + #{fileType, jdbcType=VARCHAR}, + #{attId, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{creationTime, jdbcType=TIMESTAMP}, + #{creationUser, jdbcType=VARCHAR}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{modifyUser, jdbcType=VARCHAR}, + #{standNumSplit, jdbcType=VARCHAR}, + #{standNameSplit, jdbcType=VARCHAR}, + #{result, jdbcType=VARCHAR}, + + + + + + update SAR_FILE_SPLIT_INFO + set sar_type = #{sarType}, + file_name = #{fileName}, + stand_id = #{standId}, + file_type = #{fileType}, + att_id = #{attId}, + valid_flag = #{validFlag}, + creation_time = #{creationTime}, + creation_user = #{creationUser}, + modify_time = #{modifyTime}, + modify_user = #{modifyUser} + where id = #{id} + + + + + update SAR_FILE_SPLIT_INFO + + + sar_type = #{sarType}, + + + file_name = #{fileName}, + + + stand_id = #{standId}, + + + file_type = #{fileType}, + + + att_id = #{attId}, + + + valid_flag = #{validFlag}, + + + creation_time = #{creationTime}, + + + creation_user = #{creationUser}, + + + modify_time = #{modifyTime}, + + + modify_user = #{modifyUser}, + + + result = #{result}, + + + stand_num_split = #{standNumSplit}, + + + stand_name_split = #{standNameSplit}, + + + split_status = #{splitStatus} + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_INFO + where id = #{value} + + + + + + + + + + + + + + + + + delete from SAR_FILE_SPLIT_INFO + where id in + + #{item} + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml new file mode 100644 index 00000000..c63d3936 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml @@ -0,0 +1,572 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SAR_FILE_SPLIT_ITEMS.id, SAR_FILE_SPLIT_ITEMS.info_id, SAR_FILE_SPLIT_ITEMS.items_num, items_name, iterms_conditions, + newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file, + SAR_FILE_SPLIT_ITEMS.remarks, SAR_FILE_SPLIT_ITEMS.valid_flag, SAR_FILE_SPLIT_ITEMS.creation_user, + SAR_FILE_SPLIT_ITEMS.creation_time, SAR_FILE_SPLIT_ITEMS.modify_time, SAR_FILE_SPLIT_ITEMS.modify_user, + SAR_FILE_SPLIT_ITEMS.fo,SAR_FILE_SPLIT_ITEMS.duty_engineer, SAR_FILE_SPLIT_ITEMS.claim_type, + SAR_FILE_SPLIT_ITEMS.bus_stand_cover,SAR_FILE_SPLIT_ITEMS.file_type,SAR_FILE_SPLIT_ITEMS.responsible_unit, + TS_ORG.org_name as responsibleUnitShow, dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.NAME as + dutyEngineerShow,tsFo.NAME as foShow + + + + + where 1=1 + + + and SAR_FILE_SPLIT_ITEMS.id ${idOperator} #{id} + + + and SAR_FILE_SPLIT_ITEMS.info_id ${infoIdOperator} #{infoId} + + + and SAR_FILE_SPLIT_ITEMS.items_num ${itemsNumOperator} #{itemsNum} + + + and SAR_FILE_SPLIT_ITEMS.items_name ${itemsNameOperator} #{itemsName} + + + and SAR_FILE_SPLIT_ITEMS.iterms_conditions ${itermsConditionsOperator} #{itermsConditions} + + + and SAR_FILE_SPLIT_ITEMS.newcar_put_time ${newcarPutTimeOperator} #{newcarPutTime} + + + and SAR_FILE_SPLIT_ITEMS.newcar_put_time >= #{newcarPutTime1} + + + and SAR_FILE_SPLIT_ITEMS.newcar_put_time <= #{newcarPutTime2} + + + and SAR_FILE_SPLIT_ITEMS.product_put_time ${productPutTimeOperator} #{productPutTime} + + + and SAR_FILE_SPLIT_ITEMS.product_put_time >= #{productPutTime1} + + + and SAR_FILE_SPLIT_ITEMS.product_put_time <= #{productPutTime2} + + + and menu_id = #{sMenuId} + + + and svpps ${svppsOperator} #{svpps} + + + and apply_arctic ${applyArcticOperator} #{applyArctic} + + + and reference_stand ${referenceStandOperator} #{referenceStand} + + + and special_request ${specialRequestOperator} #{specialRequest} + + + and relevance_file ${relevanceFileOperator} #{relevanceFile} + + + and SAR_FILE_SPLIT_ITEMS.remarks ${remarksOperator} #{remarks} + + + and SAR_FILE_SPLIT_ITEMS.valid_flag ${validFlagOperator} #{validFlag} + + + and SAR_FILE_SPLIT_ITEMS.creation_user ${creationUserOperator} #{creationUser} + + + and SAR_FILE_SPLIT_ITEMS.creation_time ${creationTimeOperator} #{creationTime} + + + and SAR_FILE_SPLIT_ITEMS.creation_time >= #{creationTime1} + + + and SAR_FILE_SPLIT_ITEMS.creation_time <= #{creationTime2} + + + and SAR_FILE_SPLIT_ITEMS.modify_time ${modifyTimeOperator} #{modifyTime} + + + and SAR_FILE_SPLIT_ITEMS.modify_time >= #{modifyTime1} + + + and SAR_FILE_SPLIT_ITEMS.modify_time <= #{modifyTime2} + + + and SAR_FILE_SPLIT_ITEMS.modify_user ${modifyUserOperator} #{modifyUser} + + + + + + + + insert into SAR_FILE_SPLIT_ITEMS() + values (#{id, jdbcType=VARCHAR}, #{infoId, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itermsConditions, jdbcType=CLOB}, #{newcarPutTime, jdbcType=TIMESTAMP}, #{productPutTime, jdbcType=TIMESTAMP}, #{menuId, jdbcType=VARCHAR}, #{svpps, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{referenceStand, jdbcType=VARCHAR}, #{specialRequest, jdbcType=VARCHAR}, #{relevanceFile, jdbcType=VARCHAR}, #{remarks, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationUser, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}) + + + + + + insert into SAR_FILE_SPLIT_ITEMS + + id, + info_id, + items_num, + items_name, + iterms_conditions, + newcar_put_time, + product_put_time, + menu_id, + svpps, + apply_arctic, + reference_stand, + special_request, + relevance_file, + remarks, + valid_flag, + creation_user, + creation_time, + modify_time, + modify_user, + + fo, + duty_engineer, + claim_type, + bus_stand_cover, + file_type, + responsible_unit + + + #{id, jdbcType=VARCHAR}, + #{infoId, jdbcType=VARCHAR}, + #{itemsNum, jdbcType=VARCHAR}, + #{itemsName, jdbcType=VARCHAR}, + #{itermsConditions, jdbcType=CLOB}, + #{newcarPutTime, jdbcType=TIMESTAMP}, + #{productPutTime, jdbcType=TIMESTAMP}, + #{menuId, jdbcType=VARCHAR}, + #{svpps, jdbcType=VARCHAR}, + #{applyArctic, jdbcType=VARCHAR}, + #{referenceStand, jdbcType=VARCHAR}, + #{specialRequest, jdbcType=VARCHAR}, + #{relevanceFile, jdbcType=VARCHAR}, + #{remarks, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{creationUser, jdbcType=VARCHAR}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{modifyUser, jdbcType=VARCHAR}, + + #{fo, jdbcType=VARCHAR}, + #{dutyEngineer, jdbcType=VARCHAR}, + #{claimType, jdbcType=VARCHAR}, + #{busStandCover, jdbcType=VARCHAR}, + #{fileType, jdbcType=VARCHAR}, + #{responsibleUnit, jdbcType=VARCHAR} + + + + + + update SAR_FILE_SPLIT_ITEMS + set 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} + where id = #{id} + + + + + update SAR_FILE_SPLIT_ITEMS + + + info_id = #{infoId}, + + + items_num = #{itemsNum}, + + + items_name = #{itemsName}, + + + iterms_conditions = #{itermsConditions}, + + + newcar_put_time = #{newcarPutTime}, + + + newcar_put_time = null, + + + product_put_time = #{productPutTime}, + + + product_put_time = null, + + + 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}, + + + + fo = #{fo}, + + + duty_engineer = #{dutyEngineer}, + + + claim_type = #{claimType}, + + + bus_stand_cover = #{busStandCover}, + + + file_type = #{fileType}, + + + responsible_unit = #{responsibleUnit}, + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS + where id = #{value} + + + + + + + + + + + + + + + + + insert into SAR_FILE_SPLIT_ITEMS + (id, info_id, items_num, items_name, newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file, remarks, valid_flag, creation_user, creation_time, modify_time, + modify_user, iterms_conditions) + values + + ( + #{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR}, + #{item.itemsName, jdbcType=VARCHAR}, + #{item.newcarPutTime, jdbcType=TIMESTAMP}, #{item.productPutTime, jdbcType=TIMESTAMP}, + #{item.menuId, jdbcType=VARCHAR}, #{item.svpps, jdbcType=VARCHAR}, #{item.applyArctic, jdbcType=VARCHAR}, + #{item.referenceStand, jdbcType=VARCHAR}, #{item.specialRequest, jdbcType=VARCHAR}, + #{item.relevanceFile, jdbcType=VARCHAR}, #{item.remarks, jdbcType=VARCHAR}, + #{item.validFlag, jdbcType=INTEGER}, #{item.creationUser, jdbcType=VARCHAR}, + #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, + #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB} + ) + + + + + delete from SAR_FILE_SPLIT_ITEMS + where info_id in + + #{item} + + + + + delete from SAR_FILE_SPLIT_ITEMS + where id in + + #{item} + + + + + delete from SAR_FILE_SPLIT_ITEMS + where menu_id in + + #{item} + + + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS + where id in + + #{item} + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsParamsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsParamsEOMapper.xml new file mode 100644 index 00000000..42248aa7 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsParamsEOMapper.xml @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + id, item_id, description, figure, valid_flag, creation_time, modify_time, info_id + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and item_id ${itemIdOperator} #{itemId} + + + and description ${descriptionOperator} #{description} + + + and figure ${figureOperator} #{figure} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and info_id ${infoIdOperator} #{infoId} + + + + + + + + insert into SAR_FILE_SPLIT_ITEMS_PARAMS() + values (#{id, jdbcType=VARCHAR}, #{itemId, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, #{figure, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{infoId, jdbcType=VARCHAR}) + + + + + + insert into SAR_FILE_SPLIT_ITEMS_PARAMS + + id, + item_id, + description, + figure, + valid_flag, + creation_time, + modify_time, + info_id, + + + #{id, jdbcType=VARCHAR}, + #{itemId, jdbcType=VARCHAR}, + #{description, jdbcType=VARCHAR}, + #{figure, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{infoId, jdbcType=VARCHAR}, + + + + + + update SAR_FILE_SPLIT_ITEMS_PARAMS + set item_id = #{itemId}, + description = #{description}, + figure = #{figure}, + valid_flag = #{validFlag}, + creation_time = #{creationTime}, + modify_time = #{modifyTime}, + info_id = #{infoId} + where id = #{id} + + + + + update SAR_FILE_SPLIT_ITEMS_PARAMS + + + item_id = #{itemId}, + + + description = #{description}, + + + figure = #{figure}, + + + valid_flag = #{validFlag}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + info_id = #{infoId}, + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_PARAMS + where id = #{value} + + + + + + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_PARAMS + where item_id in + + #{item} + + + + + insert into SAR_FILE_SPLIT_ITEMS_PARAMS() + values + + (#{item.id, jdbcType=VARCHAR}, #{item.itemId, jdbcType=VARCHAR}, #{item.description, jdbcType=VARCHAR}, #{item.figure, jdbcType=VARCHAR}, #{item.validFlag, jdbcType=INTEGER}, #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, #{item.infoId, jdbcType=VARCHAR}) + + + + + delete from SAR_FILE_SPLIT_ITEMS_PARAMS + where info_id in + + #{item} + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsTableEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsTableEOMapper.xml new file mode 100644 index 00000000..03604705 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsTableEOMapper.xml @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + id, items_val_id, items_id, row_num, col_num, content, valid_flag, creation_time, modify_time, modify_user + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and items_val_id ${itemsValIdOperator} #{itemsValId} + + + and items_id ${itemsIdOperator} #{itemsId} + + + and row_num ${rowNumOperator} #{rowNum} + + + and col_num ${colNumOperator} #{colNum} + + + and content ${contentOperator} #{content} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and modify_user ${modifyUserOperator} #{modifyUser} + + + + + + + + insert into SAR_FILE_SPLIT_ITEMS_TABLE() + values (#{id, jdbcType=VARCHAR}, #{itemsValId, jdbcType=VARCHAR}, #{itemsId, jdbcType=VARCHAR}, #{rowNum, jdbcType=INTEGER}, #{colNum, jdbcType=INTEGER}, #{content, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}) + + + + + + insert into SAR_FILE_SPLIT_ITEMS_TABLE + + id, + items_val_id, + items_id, + row_num, + col_num, + content, + valid_flag, + creation_time, + modify_time, + modify_user, + + + #{id, jdbcType=VARCHAR}, + #{itemsValId, jdbcType=VARCHAR}, + #{itemsId, jdbcType=VARCHAR}, + #{rowNum, jdbcType=INTEGER}, + #{colNum, jdbcType=INTEGER}, + #{content, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{modifyUser, jdbcType=VARCHAR}, + + + + + + update SAR_FILE_SPLIT_ITEMS_TABLE + set 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} + where id = #{id} + + + + + update SAR_FILE_SPLIT_ITEMS_TABLE + + + 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}, + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_TABLE + where id = #{value} + + + + + + + + + + + + + + insert into SAR_FILE_SPLIT_ITEMS_TABLE() + values (#{item.id, jdbcType=VARCHAR}, #{item.itemsValId, jdbcType=VARCHAR}, + #{item.itemsId, jdbcType=VARCHAR}, #{item.rowNum, jdbcType=INTEGER}, #{item.colNum, jdbcType=INTEGER}, + #{item.content, jdbcType=VARCHAR}, #{item.validFlag, jdbcType=INTEGER}, #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, #{item.modifyUser, jdbcType=VARCHAR}) + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_TABLE + where ITEMS_VAL_ID in + + #{item} + + + + + delete from SAR_FILE_SPLIT_ITEMS_TABLE + where EXISTS ( + select 1 from SAR_FILE_SPLIT_ITEMS + where SAR_FILE_SPLIT_ITEMS_TABLE.ITEMS_ID=SAR_FILE_SPLIT_ITEMS.id + and SAR_FILE_SPLIT_ITEMS.MENU_ID in + + #{item} + + ) + + + + delete from SAR_FILE_SPLIT_ITEMS_TABLE + where ITEMS_ID in + + #{item} + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsValEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsValEOMapper.xml new file mode 100644 index 00000000..cf629a82 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsValEOMapper.xml @@ -0,0 +1,295 @@ + + + + + + + + + + + + + + + + + + + + + id, type, item_id, item_content, valid_flag, creation_user, creation_time, modify_time, modify_user, display_seq,img_name + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and type ${typeOperator} #{type} + + + and item_id ${itemIdOperator} #{itemId} + + + and item_content ${itemContentOperator} #{itemContent} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_user ${creationUserOperator} #{creationUser} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and modify_user ${modifyUserOperator} #{modifyUser} + + + and display_seq ${displaySeqOperator} #{displaySeq} + + + + + + + + insert into SAR_FILE_SPLIT_ITEMS_VAL() + values (#{id, jdbcType=VARCHAR}, #{type, jdbcType=VARCHAR}, #{itemId, jdbcType=VARCHAR}, #{itemContent, jdbcType=CLOB}, #{validFlag, jdbcType=INTEGER}, #{creationUser, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{displaySeq, jdbcType=INTEGER}) + + + + + + insert into SAR_FILE_SPLIT_ITEMS_VAL + + id, + type, + item_id, + item_content, + valid_flag, + creation_user, + creation_time, + modify_time, + modify_user, + display_seq, + img_name, + + + #{id, jdbcType=VARCHAR}, + #{type, jdbcType=VARCHAR}, + #{itemId, jdbcType=VARCHAR}, + #{itemContent, jdbcType=CLOB}, + #{validFlag, jdbcType=INTEGER}, + #{creationUser, jdbcType=VARCHAR}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{modifyUser, jdbcType=VARCHAR}, + #{displaySeq, jdbcType=INTEGER}, + #{imgName, jdbcType=INTEGER}, + + + + + + update SAR_FILE_SPLIT_ITEMS_VAL + set 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} + where id = #{id} + + + + + update SAR_FILE_SPLIT_ITEMS_VAL + + + 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}, + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_VAL + where id = #{value} + + + + + + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS_VAL + where id in + + #{item} + + + + + + delete from SAR_FILE_SPLIT_ITEMS_VAL + where item_id = #{value} + + + + + + insert into SAR_FILE_SPLIT_ITEMS_VAL + (id, type, item_id, valid_flag, creation_user, creation_time, modify_time, modify_user, display_seq, img_name, item_content) + values + + ( + #{item.id, jdbcType=VARCHAR}, #{item.type, jdbcType=VARCHAR}, + #{item.itemId, jdbcType=VARCHAR}, + #{item.validFlag, jdbcType=INTEGER}, #{item.creationUser, jdbcType=VARCHAR}, + #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, + #{item.modifyUser, jdbcType=VARCHAR}, #{item.displaySeq, jdbcType=INTEGER}, + #{item.imgName, jdbcType=INTEGER}, + #{item.itemContent, jdbcType=CLOB}) + + + + + delete from SAR_FILE_SPLIT_ITEMS_VAL + where EXISTS ( + select 1 from SAR_FILE_SPLIT_ITEMS + where SAR_FILE_SPLIT_ITEMS_VAL.ITEM_ID=SAR_FILE_SPLIT_ITEMS.id + and SAR_FILE_SPLIT_ITEMS.INFO_ID in + + #{item} + + ) + + + + delete from SAR_FILE_SPLIT_ITEMS_VAL + where ITEM_ID in + + #{item} + + + + + + update SAR_FILE_SPLIT_ITEMS_VAL + + item_content = #{item.itemContent, jdbcType=VARCHAR}, + modify_time = #{item.modifyTime, jdbcType=TIMESTAMP}, + modify_user = #{item.modifyUser, jdbcType=VARCHAR}, + display_seq = #{item.displaySeq, jdbcType=INTEGER}, + + where id = #{item.id, jdbcType=VARCHAR} + + ; + + + + delete from SAR_FILE_SPLIT_ITEMS_VAL + where EXISTS ( + select 1 from SAR_FILE_SPLIT_ITEMS + where SAR_FILE_SPLIT_ITEMS_VAL.ITEM_ID=SAR_FILE_SPLIT_ITEMS.id + and SAR_FILE_SPLIT_ITEMS.MENU_ID in + + #{item} + + ) + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitMenuEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitMenuEOMapper.xml new file mode 100644 index 00000000..728ab13a --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitMenuEOMapper.xml @@ -0,0 +1,363 @@ + + + + + + + + + + + + + + + + + + + + + + id, info_id, name, p_id, display_seq, valid_flag, creation_time, modify_time, remarks, creation_user, modify_user,item_name + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and info_id ${infoIdOperator} #{infoId} + + + and name ${nameOperator} #{name} + + + and p_id ${pIdOperator} #{pId} + + + and display_seq ${displaySeqOperator} #{displaySeq} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and remarks ${remarksOperator} #{remarks} + + + and creation_user ${creationUserOperator} #{creationUser} + + + and modify_user ${modifyUserOperator} #{modifyUser} + + + + + + + + insert into SAR_FILE_SPLIT_MENU() + values (#{id, jdbcType=VARCHAR}, #{infoId, jdbcType=VARCHAR}, #{name, jdbcType=VARCHAR}, #{pId, jdbcType=VARCHAR}, #{displaySeq, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{remarks, jdbcType=VARCHAR}, #{creationUser, jdbcType=VARCHAR}, #{modifyUser, jdbcType=VARCHAR}) + + + + + + insert into SAR_FILE_SPLIT_MENU + + id, + info_id, + name, + p_id, + display_seq, + valid_flag, + creation_time, + modify_time, + remarks, + creation_user, + modify_user, + item_name, + + + #{id, jdbcType=VARCHAR}, + #{infoId, jdbcType=VARCHAR}, + #{name, jdbcType=VARCHAR}, + #{pId, jdbcType=VARCHAR}, + #{displaySeq, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{remarks, jdbcType=VARCHAR}, + #{creationUser, jdbcType=VARCHAR}, + #{modifyUser, jdbcType=VARCHAR}, + #{itemName, jdbcType=VARCHAR}, + + + + + + update SAR_FILE_SPLIT_MENU + set 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} + where id = #{id} + + + + + update SAR_FILE_SPLIT_MENU + + + 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}, + + + item_name = #{itemName}, + + + where id = #{id} + + + + + + + + delete from SAR_FILE_SPLIT_MENU + where id = #{value} + + + + + + + + + + + + + + + insert into SAR_FILE_SPLIT_MENU() + values + + (#{item.id, jdbcType=VARCHAR}, + #{item.infoId, jdbcType=VARCHAR}, + #{item.name, jdbcType=VARCHAR}, + #{item.pId, jdbcType=VARCHAR}, + #{item.displaySeq, jdbcType=VARCHAR}, + #{item.validFlag, jdbcType=INTEGER}, + #{item.creationTime, jdbcType=TIMESTAMP}, + #{item.modifyTime, jdbcType=TIMESTAMP}, #{item.remarks, jdbcType=VARCHAR}, + #{item.creationUser, jdbcType=VARCHAR}, #{item.modifyUser, jdbcType=VARCHAR} , #{item.itemName, jdbcType=VARCHAR}) + + + + + delete from SAR_FILE_SPLIT_MENU + where info_id in + + #{item} + + + + + + update SAR_FILE_SPLIT_MENU + set display_seq = display_seq+#{childrenCount}, + modify_time = #{modifyTime}, + modify_user = #{modifyUser} + where display_seq >= #{displaySeqStart} and display_seq < #{displaySeqEnd} and valid_flag = 0 and info_id = #{infoId} + + + + update SAR_FILE_SPLIT_MENU + set display_seq = display_seq-#{childrenCount}, + modify_time = #{modifyTime}, + modify_user = #{modifyUser} + where display_seq <= #{displaySeqEnd} and display_seq > #{displaySeqStart} and valid_flag = 0 and info_id = #{infoId} + + + + + + + + + + + + + delete + from SAR_FILE_SPLIT_MENU + where id in + + #{item} + + + + + + + + + + + + + + + + update SAR_FILE_SPLIT_MENU + set display_seq = display_seq + #{childrenCount}, + modify_time = #{modifyTime}, + modify_user = #{modifyUser} + where id in ( SELECT id FROM + SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = p_id) + + + + update SAR_FILE_SPLIT_MENU + set display_seq = display_seq - #{childrenCount}, + modify_time = #{modifyTime}, + modify_user = #{modifyUser} + where id in ( SELECT id FROM + SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = p_id) + + + + + + + + + + + + + + delete from SAR_FILE_SPLIT_MENU + where id in + + #{item} + + + + diff --git a/adc-da-sys/pom.xml b/adc-da-sys/pom.xml index d199fc22..67891c56 100644 --- a/adc-da-sys/pom.xml +++ b/adc-da-sys/pom.xml @@ -54,6 +54,29 @@ 2.4 jdk15 + + + org.bouncycastle + bcprov-jdk15on + 1.56 + compile + + + com.adc + adc-da-util + 2.2.4 + + + org.bouncycastle + bcprov-jdk14 + + + + + org.dom4j + dom4j + 2.0.1 + diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/controller/OCRRestfulController.java b/adc-da-sys/src/main/java/com/adc/da/ocr/controller/OCRRestfulController.java new file mode 100644 index 00000000..81fa8c32 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/controller/OCRRestfulController.java @@ -0,0 +1,178 @@ +package com.adc.da.ocr.controller; + +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.ocr.entity.OcrCallBackResultEo; +import com.adc.da.ocr.entity.OcrRecordEO; +import com.adc.da.ocr.page.OcrRecordEOPage; +import com.adc.da.ocr.service.OCRRestfulService; +import com.adc.da.ocr.service.OcrRecordEOService; +import com.adc.da.ocr.util.MD5Util; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; +import org.apache.http.entity.ContentType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import java.io.File; +import java.io.FileInputStream; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** + * @program: OcrDemo + * @description: ocr接口对接类 + * @author: duyunbao + * @create: 2019-03-13 18:21 + */ +@RestController +@RequestMapping("/${restPath}/ocr/OCRRestful") +@Api(description = "|OCR识别 |") +public class OCRRestfulController extends BaseController { + private static final Logger logger = LoggerFactory.getLogger(OCRRestfulController.class); + + @Autowired + private OCRRestfulService ocrRestfulService; + @Autowired + private OcrRecordEOService ocrRecordEOService; + @Autowired + private IAttFileEOService attFileEOService; + //接口回调公钥 + @Value("${OCR.publicKey}") + private String OcrPublicKey; + @Value("${OCR.ocrDownPath}") + private String ocrDownPath; + @Value("${file.path}") + private String filePath;//文件存储路径 + + @ApiOperation(value = "请求ocr") + @PostMapping(value="/upload",consumes="multipart/*",headers="content-type=multipart/form-data" ) + public ResponseMessage handleFile(@RequestParam("file") MultipartFile file) throws Exception { + SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); + logger.info("收到文件上传请求，开始处理文件:【"+sdf.format(new Date())+"】"); + return ocrRestfulService.handleFile(file,file.getOriginalFilename(),null,"add"); + } + + @ApiOperation(value = "ocr回调") + @PostMapping("/OcrHandleResult") + public String OcrHandleResult(@RequestParam("wordFile") MultipartFile wordFile,@RequestParam("jsonFile") MultipartFile jsonFile, OcrCallBackResultEo ocrCallBackResultEo) { + try{ + logger.info("调取到我了"); + logger.info("接口回调结果："+ JSON.toJSONString(ocrCallBackResultEo)); + logger.info("接口回调时所传文件---wordFile:"+ wordFile.toString() +"; jsonFile:"+jsonFile.toString()); + if("error".equals(ocrCallBackResultEo.getResult())){ + logger.info("客户接口处理文件失败"); + ocrRestfulService.updateDb(ocrCallBackResultEo.getTaskID(),"客户接口处理文件失败"); + return "{\"result\":\"error\"}"; + } + //1.验证 key 是否符合,不符合打回，符合继续 + //2.向后传递文件 + String key = ocrCallBackResultEo.getKey(); + String sign = ocrCallBackResultEo.getTaskID() + OcrPublicKey; + String signMD5 = MD5Util.string2MD5(sign); + if(!signMD5.equals(key)){ + //不同，则认证失败 + logger.info("认证失败"); + ocrRestfulService.updateDb(ocrCallBackResultEo.getTaskID(),"回调接口认证失败"); + return "{\"result\":\"Authentication failed\"}"; + } + return ocrRestfulService.OcrHandleResult(wordFile,jsonFile,ocrCallBackResultEo.getTaskID()); + }catch (Exception e){ + logger.error(e.getMessage(),e); + return "{\"result\":\"runTimeException\"}"; + } + } + + @ApiOperation(value = "获取所有ocr结果") + @PostMapping("/getAllOcrResult") + public ResponseMessage> page(OcrRecordEOPage page) throws Exception { + if(org.apache.commons.lang3.StringUtils.isNotBlank(page.getPaixu()) && org.apache.commons.lang3.StringUtils.isNotBlank(page.getShunxu())){ + String sql = page.getPaixu()+" "+page.getShunxu(); + page.setSql(sql); + }else{ + page.setOrderBy("creation_time"); + page.setOrder("desc"); + } + List rows = ocrRecordEOService.queryByPage(page); + DecimalFormat df = new DecimalFormat("0.00");//设置保留位数 + for (OcrRecordEO ocrRecordEO : rows){ + ocrRecordEO.setDocRealFile(ocrDownPath+ocrRecordEO.getDocRealName()); + ocrRecordEO.setJsonRealFile(ocrDownPath+ocrRecordEO.getJsonRealName()); + } + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "新增ocr内容") + @PostMapping("/addOcrRecord") + public ResponseMessage addOcrRecord(OcrRecordEO ocrRecordEO) throws Exception { + SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); + logger.info("收到文件上传请求，开始处理文件:【"+sdf.format(new Date())+"】"); + // 根据attID查找文件 + String fileId = ocrRecordEO.getAttId(); + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); + if (attFileEO != null) { + String fileOriPath = filePath + attFileEO.getFilePath(); + String oriName = attFileEO.getOldFileName(); + File pdfFile = new File(fileOriPath+attFileEO.getFileName()); + FileInputStream fileInputStream = new FileInputStream(pdfFile); + MultipartFile multipartFile = new MockMultipartFile(oriName, oriName, + ContentType.APPLICATION_OCTET_STREAM.toString(), fileInputStream); + return ocrRestfulService.handleFile(multipartFile,multipartFile.getOriginalFilename(),ocrRecordEO,"add"); + } else { + return Result.error("0","无法找到该文件",null); + } + } + + @ApiOperation(value = "修改ocr内容") + @PutMapping("/updateOcrRecord") + public ResponseMessage updateOcrRecord(@RequestBody OcrRecordEO ocrRecordEO) throws Exception { + if (StringUtils.isEmpty(ocrRecordEO.getAttId())) { + ocrRecordEOService.updateByPrimaryKeySelective(ocrRecordEO); + return Result.success("0","保存成功",ocrRecordEO); + } else { + SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); + logger.info("收到文件上传请求，开始处理文件:【"+sdf.format(new Date())+"】"); + // 根据attID查找文件 + String fileId = ocrRecordEO.getAttId(); + AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); + if (attFileEO != null) { + String fileOriPath = filePath + attFileEO.getFilePath(); + String oriName = attFileEO.getOldFileName(); + File pdfFile = new File(fileOriPath+attFileEO.getFileName()); + FileInputStream fileInputStream = new FileInputStream(pdfFile); + MultipartFile multipartFile = new MockMultipartFile(oriName, oriName, + ContentType.APPLICATION_OCTET_STREAM.toString(), fileInputStream); + return ocrRestfulService.handleFile(multipartFile,multipartFile.getOriginalFilename(),ocrRecordEO,"update"); + } else { + return Result.error("0","无法找到该文件",null); + } + } + } + + @ApiOperation(value = "删除ocr内容") + @DeleteMapping("/deleteOcrRecord") + public ResponseMessage deleteOcrRecord(String ids) throws Exception { + if (StringUtils.isNotEmpty(ids)) { + String[] idArr = ids.split(","); + List idList = Arrays.asList(idArr); + int i = ocrRecordEOService.deleteByIds(idList); + return Result.success("0","删除成功",i); + } else { + return Result.error("删除数据不能为空"); + } + + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/dao/OcrRecordEODao.java b/adc-da-sys/src/main/java/com/adc/da/ocr/dao/OcrRecordEODao.java new file mode 100644 index 00000000..edd242d4 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/dao/OcrRecordEODao.java @@ -0,0 +1,32 @@ +package com.adc.da.ocr.dao; + +import com.adc.da.base.page.BasePage; +import com.adc.da.ocr.entity.OcrRecordEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * + *
    + * 功能：OCR_RECORD OcrRecordEODao
    + * 作者：code generator
    + * 日期： 2019-03-25
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Mapper +public interface OcrRecordEODao extends BaseMapper { + +// List getAllOcrResult(); +// +// int deleteByIds(@Param("idList") List idList); + + List queryByPage(BasePage var1); + + int insertSelective(OcrRecordEO ocrRecordEO); + + int updateByPrimaryKeySelective(OcrRecordEO ocrRecordEO); + + int deleteByIds(@Param("idList") List idList); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrCallBackResultEo.java b/adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrCallBackResultEo.java new file mode 100644 index 00000000..cc9ea879 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrCallBackResultEo.java @@ -0,0 +1,76 @@ +package com.adc.da.ocr.entity; + +/** + * @program: OcrDemo + * @description: orc调取回调函数的参数 + * @author: duyunbao + * @create: 2019-03-13 16:14 + */ +public class OcrCallBackResultEo { + + private String result ; + private String taskID ; +// private String wordFileName; +// private String wordFileContent; +// private String jsonFileName; +// private String jsonFileContent; + + private String key; + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public String getTaskID() { + return taskID; + } + + public void setTaskID(String taskID) { + this.taskID = taskID; + } +// +// public String getWordFileName() { +// return wordFileName; +// } +// +// public void setWordFileName(String wordFileName) { +// this.wordFileName = wordFileName; +// } +// +// public String getWordFileContent() { +// return wordFileContent; +// } +// +// public void setWordFileContent(String wordFileContent) { +// this.wordFileContent = wordFileContent; +// } +// +// public String getJsonFileName() { +// return jsonFileName; +// } +// +// public void setJsonFileName(String jsonFileName) { +// this.jsonFileName = jsonFileName; +// } + +// public String getJsonFileContent() { +// return jsonFileContent; +// } +// +// public void setJsonFileContent(String jsonFileContent) { +// this.jsonFileContent = jsonFileContent; +// } + + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrRecordEO.java b/adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrRecordEO.java new file mode 100644 index 00000000..738cd9d9 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrRecordEO.java @@ -0,0 +1,280 @@ +package com.adc.da.ocr.entity; + +import com.adc.da.base.entity.BaseEntity; + +import java.io.Serializable; +import java.util.Date; + +/** + * 功能：OCR_RECORD OcrRecordEOEntity
    + * 作者：code generator
    + * 日期： 2019-03-25
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class OcrRecordEO extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = -5464438392516276473L; + private Object wordFileCode; + private Object jsonFileCode; + private String id; + private String docRealName; + private String jsonRealName; + private String fileName; + private String docName; + private String jsonName; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + private String docRealFile; + private String jsonRealFile; + + //计算文件转换耗费时间 + private String spendTime; + //转换结果 + private String resultContent; + //新增字段 + private String fileType; + private String standNumber; + private String standName; + private String creationUser; + private String attId; + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • wordFileCode -> word_file_code
    • + *
  • jsonFileCode -> json_file_code
    • + *
  • id -> id
    • + *
  • docRealName -> doc_real_name
    • + *
  • jsonRealName -> json_real_name
    • + *
  • fileName -> file_name
    • + *
  • docName -> doc_name
    • + *
  • jsonName -> json_name
    • + *
  • creationTime -> creation_time
    • + *
  • modifyTime -> modify_time
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) return null; + switch (fieldName) { + case "wordFileCode": return "word_file_code"; + case "jsonFileCode": return "json_file_code"; + case "id": return "id"; + case "docRealName": return "doc_real_name"; + case "jsonRealName": return "json_real_name"; + case "fileName": return "file_name"; + case "docName": return "doc_name"; + case "jsonName": return "json_name"; + case "creationTime": return "creation_time"; + case "modifyTime": return "modify_time"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • word_file_code -> wordFileCode
    • + *
  • json_file_code -> jsonFileCode
    • + *
  • id -> id
    • + *
  • doc_real_name -> docRealName
    • + *
  • json_real_name -> jsonRealName
    • + *
  • file_name -> fileName
    • + *
  • doc_name -> docName
    • + *
  • json_name -> jsonName
    • + *
  • creation_time -> creationTime
    • + *
  • modify_time -> modifyTime
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) return null; + switch (columnName) { + case "word_file_code": return "wordFileCode"; + case "json_file_code": return "jsonFileCode"; + case "id": return "id"; + case "doc_real_name": return "docRealName"; + case "json_real_name": return "jsonRealName"; + case "file_name": return "fileName"; + case "doc_name": return "docName"; + case "json_name": return "jsonName"; + case "creation_time": return "creationTime"; + case "modify_time": return "modifyTime"; + default: return null; + } + } + + /** **/ + public Object getWordFileCode() { + return this.wordFileCode; + } + + /** **/ + public void setWordFileCode(Object wordFileCode) { + this.wordFileCode = wordFileCode; + } + + /** **/ + public Object getJsonFileCode() { + return this.jsonFileCode; + } + + /** **/ + public void setJsonFileCode(Object jsonFileCode) { + this.jsonFileCode = jsonFileCode; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getDocRealName() { + return this.docRealName; + } + + /** **/ + public void setDocRealName(String docRealName) { + this.docRealName = docRealName; + } + + /** **/ + public String getJsonRealName() { + return this.jsonRealName; + } + + /** **/ + public void setJsonRealName(String jsonRealName) { + this.jsonRealName = jsonRealName; + } + + /** **/ + public String getFileName() { + return this.fileName; + } + + /** **/ + public void setFileName(String fileName) { + this.fileName = fileName; + } + + /** **/ + public String getDocName() { + return this.docName; + } + + /** **/ + public void setDocName(String docName) { + this.docName = docName; + } + + /** **/ + public String getJsonName() { + return this.jsonName; + } + + /** **/ + public void setJsonName(String jsonName) { + this.jsonName = jsonName; + } + + /** **/ + 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 getDocRealFile() { + return docRealFile; + } + + public void setDocRealFile(String docRealFile) { + this.docRealFile = docRealFile; + } + + public String getJsonRealFile() { + return jsonRealFile; + } + + public void setJsonRealFile(String jsonRealFile) { + this.jsonRealFile = jsonRealFile; + } + + public String getSpendTime() { + return spendTime; + } + + public void setSpendTime(String spendTime) { + this.spendTime = spendTime; + } + + public String getResultContent() { + return resultContent; + } + + public void setResultContent(String resultContent) { + this.resultContent = resultContent; + } + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getStandNumber() { + return standNumber; + } + + public void setStandNumber(String standNumber) { + this.standNumber = standNumber; + } + + public String getStandName() { + return standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String getCreationUser() { + return creationUser; + } + + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + public String getAttId() { + return attId; + } + + public void setAttId(String attId) { + this.attId = attId; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrRequestEo.java b/adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrRequestEo.java new file mode 100644 index 00000000..d4a92142 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrRequestEo.java @@ -0,0 +1,83 @@ +package com.adc.da.ocr.entity; + +/** + * @program: OcrDemo + * @description: ocr接口请求实体类 + * @author: duyunbao + * @create: 2019-03-13 20:46 + */ +public class OcrRequestEo { + + private String userId; + private String authCode; + private String convertType; + private String Filename; + private String taskId; + private String callBackUrl; + private String callBackMethod; + private String fileContent; + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getAuthCode() { + return authCode; + } + + public void setAuthCode(String authCode) { + this.authCode = authCode; + } + + public String getConvertType() { + return convertType; + } + + public void setConvertType(String convertType) { + this.convertType = convertType; + } + + public String getFilename() { + return Filename; + } + + public void setFilename(String filename) { + Filename = filename; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getCallBackUrl() { + return callBackUrl; + } + + public void setCallBackUrl(String callBackUrl) { + this.callBackUrl = callBackUrl; + } + + public String getCallBackMethod() { + return callBackMethod; + } + + public void setCallBackMethod(String callBackMethod) { + this.callBackMethod = callBackMethod; + } + + public String getFileContent() { + return fileContent; + } + + public void setFileContent(String fileContent) { + this.fileContent = fileContent; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrResultEo.java b/adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrResultEo.java new file mode 100644 index 00000000..9c6e519a --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/entity/OcrResultEo.java @@ -0,0 +1,30 @@ +package com.adc.da.ocr.entity; + +/** + * @program: OcrDemo + * @description: ocr返回结果 + * @author: duyunbao + * @create: 2019-03-13 15:35 + */ +public class OcrResultEo { + + private String resultCode; + + private String returnMessage; + + public String getResultCode() { + return resultCode; + } + + public void setResultCode(String resultCode) { + this.resultCode = resultCode; + } + + public String getReturnMessage() { + return returnMessage; + } + + public void setReturnMessage(String returnMessage) { + this.returnMessage = returnMessage; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/page/OcrRecordEOPage.java b/adc-da-sys/src/main/java/com/adc/da/ocr/page/OcrRecordEOPage.java new file mode 100644 index 00000000..5ab56ddc --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/page/OcrRecordEOPage.java @@ -0,0 +1,256 @@ +package com.adc.da.ocr.page; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：OCR_RECORD OcrRecordEOPage
    + * 作者：code generator
    + * 日期： 2019-03-25
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class OcrRecordEOPage extends BasePage { + + private String wordFileCode; + private String wordFileCodeOperator = "="; + private String jsonFileCode; + private String jsonFileCodeOperator = "="; + private String id; + private String idOperator = "="; + private String docRealName; + private String docRealNameOperator = "="; + private String jsonRealName; + private String jsonRealNameOperator = "="; + private String fileName; + private String fileNameOperator = "="; + private String docName; + private String docNameOperator = "="; + private String jsonName; + private String jsonNameOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String paixu; + private String shunxu; + private String sql; + + public String getWordFileCode() { + return this.wordFileCode; + } + + public void setWordFileCode(String wordFileCode) { + this.wordFileCode = wordFileCode; + } + + public String getWordFileCodeOperator() { + return this.wordFileCodeOperator; + } + + public void setWordFileCodeOperator(String wordFileCodeOperator) { + this.wordFileCodeOperator = wordFileCodeOperator; + } + + public String getJsonFileCode() { + return this.jsonFileCode; + } + + public void setJsonFileCode(String jsonFileCode) { + this.jsonFileCode = jsonFileCode; + } + + public String getJsonFileCodeOperator() { + return this.jsonFileCodeOperator; + } + + public void setJsonFileCodeOperator(String jsonFileCodeOperator) { + this.jsonFileCodeOperator = jsonFileCodeOperator; + } + + 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 getDocRealName() { + return this.docRealName; + } + + public void setDocRealName(String docRealName) { + this.docRealName = docRealName; + } + + public String getDocRealNameOperator() { + return this.docRealNameOperator; + } + + public void setDocRealNameOperator(String docRealNameOperator) { + this.docRealNameOperator = docRealNameOperator; + } + + public String getJsonRealName() { + return this.jsonRealName; + } + + public void setJsonRealName(String jsonRealName) { + this.jsonRealName = jsonRealName; + } + + public String getJsonRealNameOperator() { + return this.jsonRealNameOperator; + } + + public void setJsonRealNameOperator(String jsonRealNameOperator) { + this.jsonRealNameOperator = jsonRealNameOperator; + } + + 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 getDocName() { + return this.docName; + } + + public void setDocName(String docName) { + this.docName = docName; + } + + public String getDocNameOperator() { + return this.docNameOperator; + } + + public void setDocNameOperator(String docNameOperator) { + this.docNameOperator = docNameOperator; + } + + public String getJsonName() { + return this.jsonName; + } + + public void setJsonName(String jsonName) { + this.jsonName = jsonName; + } + + public String getJsonNameOperator() { + return this.jsonNameOperator; + } + + public void setJsonNameOperator(String jsonNameOperator) { + this.jsonNameOperator = jsonNameOperator; + } + + 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 getPaixu() { + return paixu; + } + + public void setPaixu(String paixu) { + this.paixu = paixu; + } + + public String getShunxu() { + return shunxu; + } + + public void setShunxu(String shunxu) { + this.shunxu = shunxu; + } + + public String getSql() { + return sql; + } + + public void setSql(String sql) { + this.sql = sql; + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/OCRRestfulService.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/OCRRestfulService.java new file mode 100644 index 00000000..0ce578ab --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/OCRRestfulService.java @@ -0,0 +1,16 @@ +package com.adc.da.ocr.service; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.ocr.entity.OcrRecordEO; +import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; + +public interface OCRRestfulService{ + + ResponseMessage handleFile(MultipartFile file, String fileName, OcrRecordEO getOcrEO, String type) throws Exception; + + void updateDb(String taskId,String result) throws Exception; + + String OcrHandleResult(MultipartFile wordFile,MultipartFile jsonFile,String taskId) throws Exception; + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/OcrRecordEOService.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/OcrRecordEOService.java new file mode 100644 index 00000000..c059d1df --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/OcrRecordEOService.java @@ -0,0 +1,14 @@ +package com.adc.da.ocr.service; + +import com.adc.da.ocr.entity.OcrRecordEO; +import com.adc.da.ocr.page.OcrRecordEOPage; +import java.util.List; + +public interface OcrRecordEOService { + + List queryByPage(OcrRecordEOPage page); + + int updateByPrimaryKeySelective(OcrRecordEO ocrRecordEO); + + int deleteByIds(List idList); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java new file mode 100644 index 00000000..d2b57f55 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java @@ -0,0 +1,184 @@ +package com.adc.da.ocr.service.impl; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.ocr.dao.OcrRecordEODao; +import com.adc.da.ocr.entity.OcrRecordEO; +import com.adc.da.ocr.entity.OcrResultEo; +import com.adc.da.ocr.service.OCRRestfulService; +import com.adc.da.ocr.util.Base64Util; +import com.adc.da.ocr.util.RsaUtil; +import com.adc.da.ocr.util.UUIDUtils; +import com.alibaba.fastjson.JSONObject; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.multipart.MultipartFile; +import com.adc.da.sys.util.LoginUserUtil; + +import java.io.File; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class OCRRestfulServiceImpl implements OCRRestfulService { + private static final Logger logger = LoggerFactory.getLogger(OCRRestfulServiceImpl.class); + + //请求处理客户认证码 + @Value("${OCR.authCode}") + private String OcrAuthCode; + //请求处理文件url + @Value("${OCR.handleFileUrl}") + private String RestHandleFileUrl; + //接口回调url + @Value("${OCR.callBackUrl}") + private String RestCallBackUrl; + //请求处理usrid + @Value("${OCR.userId}") + private String OcrUserId; + @Value("${OCR.convertType}") + private String convertType; + @Autowired + private RestTemplate restTemplate; + @Autowired + private OcrRecordEODao ocrRecordEODao; + //ocr处理文件后存放url + @Value("${OCR.ocrPath}") + private String ocrFilePath; + @Value("${OCR.ocrDownPath}") + private String ocrDownPath; + + public ResponseMessage handleFile(MultipartFile file, String fileName, OcrRecordEO getOcrEO, String type) + throws Exception { + String taskId = ""; + if ("add".equals(type)) { + taskId = UUIDUtils.randomUUID20(); + } else { + taskId = getOcrEO.getId(); + } + + String authCode = RsaUtil.publicEncrypt(OcrAuthCode); + if(authCode == null){ + logger.error("客户认证RSA加密失败"); + return Result.error("客户认证RSA加密失败"); + } + String fileContent = Base64Util.PDFToBase64(file); + if(fileContent == null || "".equals(fileContent)){ + logger.error("PDF转Base64失败"); + return Result.error("PDF转Base64失败"); + } + MultiValueMap paramMap = new LinkedMultiValueMap(); + paramMap.add("userId",OcrUserId); + paramMap.add("authCode",authCode); + paramMap.add("convertType",convertType); + paramMap.add("fileName",fileName); + paramMap.add("fileContent",fileContent); + paramMap.add("taskId",taskId); + paramMap.add("callBackUrl",RestCallBackUrl); + paramMap.add("callBackMethod",""); + HttpHeaders headers = new HttpHeaders(); + HttpEntity> httpEntity = new HttpEntity>(paramMap,headers); + SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); + logger.info("处理完文件数据，开始请求OCR接口数据：【"+sdf.format(new Date())+"】"); + try{ + ResponseEntity responseEntity = restTemplate.postForEntity(RestHandleFileUrl, httpEntity, String.class); + logger.info("请求OCR接口完毕，返回响应状态：【"+sdf.format(new Date())+"】"); + HttpStatus statusCode = responseEntity.getStatusCode(); + if(statusCode != HttpStatus.OK){ + logger.error("请求出现异常："+statusCode.value()); + return Result.error("请求出现异常"); + }else{ + OcrResultEo ocrResultEo = JSONObject.parseObject(responseEntity.getBody(), OcrResultEo.class); + if(ocrResultEo.getResultCode().equals("0")){ + if ("add".equals(type)) { + OcrRecordEO ocrRecordEO = new OcrRecordEO(); + ocrRecordEO.setId(taskId); + ocrRecordEO.setCreationUser(LoginUserUtil.getUserId()); + ocrRecordEO.setFileName(fileName); + ocrRecordEO.setCreationTime(new Date()); + ocrRecordEO.setResultContent("转换中"); + ocrRecordEO.setStandNumber(getOcrEO.getStandNumber()); + ocrRecordEO.setStandName(getOcrEO.getStandName()); + ocrRecordEO.setFileType(getOcrEO.getFileType()); + ocrRecordEODao.insertSelective(ocrRecordEO); + return Result.success(ocrResultEo.getResultCode(), "加入转换成功", taskId); + } else { + OcrRecordEO ocrRecordEO = new OcrRecordEO(); + ocrRecordEO.setId(taskId); + ocrRecordEO.setFileName(fileName); + ocrRecordEO.setResultContent("转换中"); + ocrRecordEO.setStandNumber(getOcrEO.getStandNumber()); + ocrRecordEO.setStandName(getOcrEO.getStandName()); + ocrRecordEO.setFileType(getOcrEO.getFileType()); + ocrRecordEO.setCreationTime(new Date()); + ocrRecordEODao.updateByPrimaryKeySelective(ocrRecordEO); + return Result.success(ocrResultEo.getResultCode(), "加入转换成功", taskId); + } + }else{ + return Result.error(ocrResultEo.getReturnMessage()); + } + } + }catch (Exception e){ + logger.error(e.getMessage(),e); + return Result.error("OCR接口请求出现异常，无法将文件传输到OCR引擎！"); + } + } + + public void updateDb(String taskId,String result) throws Exception { + OcrRecordEO ocrRecordEO = new OcrRecordEO(); + ocrRecordEO.setId(taskId); + ocrRecordEO.setModifyTime(new Date()); + ocrRecordEO.setResultContent(result); + ocrRecordEODao.updateByPrimaryKeySelective(ocrRecordEO); + } + + public String OcrHandleResult(MultipartFile wordFile,MultipartFile jsonFile,String taskId) throws Exception { + //首先将文件保存至本地 + String saveWordFilePath=null; + String saveWordFileName=null; + if(wordFile!=null && !wordFile.isEmpty()){ + saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename(); + saveWordFilePath=ocrFilePath+saveWordFileName; + FileUtils.copyInputStreamToFile(wordFile.getInputStream(),new File(saveWordFilePath)); + } + String saveJsonFilePath=null; + String saveJsonFileName=null; + if(jsonFile!=null && !jsonFile.isEmpty()){ + saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename(); + saveJsonFilePath=ocrFilePath+saveJsonFileName; + FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath)); + } + //开始将文件保存至数据库中 + if(StringUtils.isNotEmpty(saveWordFilePath) && StringUtils.isNotEmpty(saveJsonFilePath)){ + OcrRecordEO ocrRecordEO = new OcrRecordEO(); + ocrRecordEO.setId(taskId); + ocrRecordEO.setDocName(saveWordFilePath); + ocrRecordEO.setJsonName(saveJsonFilePath); + ocrRecordEO.setDocRealName(saveWordFileName); + ocrRecordEO.setWordFileCode(null); + ocrRecordEO.setJsonRealName(saveJsonFileName); + ocrRecordEO.setJsonFileCode(null); + ocrRecordEO.setModifyTime(new Date()); + ocrRecordEO.setResultContent("转换成功"); + ocrRecordEODao.updateByPrimaryKeySelective(ocrRecordEO); + return "{\"result\":\"success\"}"; + }else{ + updateDb(taskId,"error:File does not exist"); + return "{\"result\":\"error:File does not exist\"}";//文件不存在 + } + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OcrRecordEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OcrRecordEOServiceImpl.java new file mode 100644 index 00000000..90e1d5d0 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OcrRecordEOServiceImpl.java @@ -0,0 +1,39 @@ +package com.adc.da.ocr.service.impl; + +import com.adc.da.ocr.dao.OcrRecordEODao; +import com.adc.da.ocr.entity.OcrRecordEO; +import com.adc.da.ocr.page.OcrRecordEOPage; +import com.adc.da.ocr.service.OcrRecordEOService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class OcrRecordEOServiceImpl implements OcrRecordEOService { + private static final Logger logger = LoggerFactory.getLogger(OcrRecordEOServiceImpl.class); + + @Autowired + private OcrRecordEODao ocrRecordEODao; + + @Override + public List queryByPage(OcrRecordEOPage page) { + return ocrRecordEODao.queryByPage(page); + } + + @Override + public int updateByPrimaryKeySelective(OcrRecordEO ocrRecordEO) { + return ocrRecordEODao.updateByPrimaryKeySelective(ocrRecordEO); + } + + @Override + public int deleteByIds(List idList){ + return ocrRecordEODao.deleteByIds(idList); + } + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/util/Base64Util.java b/adc-da-sys/src/main/java/com/adc/da/ocr/util/Base64Util.java new file mode 100644 index 00000000..f10e4f1b --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/util/Base64Util.java @@ -0,0 +1,211 @@ +package com.adc.da.ocr.util; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; +import org.bouncycastle.util.encoders.Base64; +import java.io.*; + +/** + * @program: OcrDemo + * @description: 工具类 + * @author: duyunbao + * @create: 2019-03-13 14:58 + */ +public class Base64Util { + private static final Logger logger = LoggerFactory.getLogger(Base64Util.class); + public static String PDFToBase64(MultipartFile file) { + //BASE64Encoder encoder = new BASE64Encoder(); + InputStream fin =null; + BufferedInputStream bin =null; + ByteArrayOutputStream baos = null; + BufferedOutputStream bout =null; + try { + fin = file.getInputStream(); + bin = new BufferedInputStream(fin); + baos = new ByteArrayOutputStream(); + bout = new BufferedOutputStream(baos); + byte[] buffer = new byte[1024]; + int len = bin.read(buffer); + while(len != -1){ + bout.write(buffer, 0, len); + len = bin.read(buffer); + } + //刷新此输出流并强制写出所有缓冲的输出字节 + bout.flush(); + byte[] bytes = baos.toByteArray(); + return Base64.toBase64String(bytes); + + } catch (FileNotFoundException e) { + logger.error(e.getMessage(),e); + } catch (IOException e) { + logger.error(e.getMessage(),e); + }finally{ + try { + fin.close(); + bin.close(); + bout.close(); + } catch (IOException e) { + logger.error(e.getMessage(),e); + } + } + return null; + } + + + /* public static String FindPDFBase(MultipartFile file){ + InputStream fin= null; + BufferedInputStream bin= null; + ByteArrayOutputStream baos= null; + BufferedOutputStream bout= null; + try{ + fin=file.getInputStream(); + bin=new BufferedInputStream(fin); + baos=new ByteArrayOutputStream(); + bout=new BufferedOutputStream(baos); + byte[] buffer=new byte[1024]; + int len=bin.read(buffer); + while(len!=-1){ + bout.write(buffer,0,len); + len=bin.read(buffer); + } + //读取完毕 + bout.flush(); + byte[] bytes=baos.toByteArray(); + String res= Base64.toBase64String(bytes); + return res; + }catch(Exception e){ + e.printStackTrace(); + }finally { + try{ + fin.close(); + bin.close(); + bout.close(); + }catch (IOException e){ + e.printStackTrace(); + } + } + + return null; + }*/ + + /** + *@Description: base64 转成文件 + *@Param: [base64Content, filePath] + *@return: void + *@Author: duyunbao + *@date: 2019/3/13 16:49 + */ + public static String base64StringToFile(String base64Content,String filePath) { + // BASE64Decoder decoder = new BASE64Decoder(); + BufferedInputStream bis = null; + FileOutputStream fos = null; + BufferedOutputStream bos = null; + + try { + // logger.info("获取到的文件base64字符串："+base64Content); + // byte[] bytes = decoder.decodeBuffer(base64Content,);//base64编码内容转换为字节数组 + byte[] bytes = Base64.decode(base64Content.getBytes("UTF-8")); + ByteArrayInputStream byteInputStream = new ByteArrayInputStream(bytes); + bis = new BufferedInputStream(byteInputStream); + File file = new File(filePath); + File path = file.getParentFile(); + if(!path.exists()){ + path.mkdirs(); + } + fos = new FileOutputStream(file); + bos = new BufferedOutputStream(fos); + + byte[] buffer = new byte[1024]; + int length = bis.read(buffer); + while(length != -1){ + bos.write(buffer, 0, length); + length = bis.read(buffer); + } + bos.flush(); + } catch (Exception e) { + logger.error(e.getMessage(),e); + return "error"; + }finally{ + try { + bos.close(); + bis.close(); + fos.close(); + } catch (IOException e) { + logger.error(e.getMessage(),e); + return "error"; + } + } + return "success"; + } + + /** + *@Description: base64 转成文件 + *@Param: [base64Content, filePath] + *@return: void + *@Author: duyunbao + *@date: 2019/3/13 16:49 + */ + public static String base64StringToFileOfTxt(String base64Content,String filePath) { + BASE64Decoder decoder = new BASE64Decoder(); + BufferedInputStream bis = null; + FileOutputStream fos = null; + BufferedOutputStream bos = null; + + try { + //logger.info("获取到的文件base64字符串："+base64Content); + // new String(decoder.decodeBuffer(base64Content),"UTF-8"); +// byte[] bytes = decoder.decodeBuffer(base64Content);//base64编码内容转换为字节数组 + byte[] bytes = Base64.decode(base64Content.getBytes("UTF-8")); +// String result=new String(bytes); +// logger.info("返回的内容为:"+result); + ByteArrayInputStream byteInputStream = new ByteArrayInputStream(bytes); + bis = new BufferedInputStream(byteInputStream); + File file = new File(filePath); + File path = file.getParentFile(); + if(!path.exists()){ + path.mkdirs(); + } + fos = new FileOutputStream(file); + bos = new BufferedOutputStream(fos); + + byte[] buffer = new byte[1024]; + int length = bis.read(buffer); + while(length != -1){ + bos.write(buffer, 0, length); + length = bis.read(buffer); + } + bos.flush(); +// FileWriter fw; +// fw = new FileWriter(filePath); +// PrintWriter out = new PrintWriter(fw); +// out.write(result); +// out.println(); +// fw.close(); +// out.close(); + } catch (Exception e) { + logger.error(e.getMessage(),e); + return "error"; + }finally{ + try { + bos.close(); + bis.close(); + fos.close(); + } catch (IOException e) { + logger.error(e.getMessage(),e); + return "error"; + } + } + return "success"; + } + + + + public static void main(String[] args) { + String str="UEsDBBQAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAX3JlbHMvUEsDBBQAAAAIAAAAAADjVjz6ugAAAC4BAAALAAAAX3JlbHMvLnJlbHONzzsOwjAMBuAdiTtE3mlaBoRQ0y4IqSsqB4gSN41okygJj56NgSNxBTIwAGJgtP37s/y43cv6Og7kjD5oaxgUWQ4EjbBSG8Xg0O4WayAhciP5YA0ymDBAXc1n5R4HHtNS6LULJCkmMOhjdBtKg+hx5CGzDk2adNaPPKbSK+q4OHKFdJnnK+rfDag+TNJIBr6RBZB2cviPbbtOC9xacRrRxB8nvhJJ5l5hZHCxXlL5ameJBVqV9OPF6glQSwMEFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAB3b3JkL1BLAwQUAAAACABae3xOcf0GXu4BAADvBAAAEQAAAHdvcmQvc2V0dGluZ3MueG1spZTPbhMxEMbvSLxD5HuyGyRQteqmEqQtF1DUUO7G681a2B5rPJtt+moceCRegcn+JS0qkTitvPPNb76xx/714+fl1YOzs73GaMDnYrlIxUx7BYXxu1zcf7mZX4hZJOkLacHrXBx0FFer168umyxqIpbFGSN8zJpcVEQhS5KoKu1kXEDQnmMloJPES9wlDWAREJSOkVOdTd6k6bvESeNFj8FzMFCWRuk1qNppTx0EtZXEXcTKhDjQmnAOrkDZ/GHn1OS6Cw5Ep84hOonf6zBX4AKb+masoUMLn4zFZxxnFEKEkhac1/fYmuHMZfrE1raSQU+03f/RbhHqMND2uajRZz1oPoKO7WR7ZwcdvKTrCvaf0ecyPSPnaE2seMIeAdysyfbS5qKsrd3InRbJMdKf2C2a4iOgeQRP0m6DVPxzyFheLJ+Jv2oko16QmhisPEzM9ZR7zdfkMGac6AfsP9SqkigVaezLf+ASCHZQHacF+Tw2tVdUt8Pc5ZUA5IH0Bo+rAHHICLwh74EIXCf0tbtxNEQLrYyTdgzdab7JSFM5z/e3hjqeVuG4KXKR/vVv20ny1FI35+2GwGeg64fAL8a2MiXdaeLzTibRtns1GOel013T4xX5BAXPSpPVaM6fZzHu8tveXG+HX6lkeqZWvwFQSwMEFAAAAAgAWnt8TuOGQpEXAQAArwIAABIAAAB3b3JkL251bWJlcmluZy54bWylkk1OwzAQRvdI3CHyPn8sEIqadlPBAYADuM6ksbA91thJ6NlYcCSugNMkbQEJRerKGs18z2+k+fr4XG3etYo6ICfRlCxPMhaBEVhJsy/Z68tj/MAi57mpuEIDJTuAY5v17c2qL0yrd0BhMAoM44q+ZI33tkhTJxrQ3CVowYRejaS5DyXt0x6psoQCnAtJrdK7LLtPNZeGTRhagsG6lgK2KFoNxo8QAsV9WMM10rqZ1tsluIp4f6HzU3I7NmeiFkuImtNba2OB2gapnVTSH47ws5j7w9FSEDqsfRJy045HmZDMs19azw23cKbtr6M9EbZ2pnUla8kUEyg+gYZ1ik6reQ7/mxs/nJ6TZ54tyAxqbDiy9OLK1t9QSwMEFAAAAAgAWnt8Tt98YfH/AgAAcw0AAA8AAAB3b3JkL3N0eWxlcy54bWztV19r2zAQfx/sOxi/p06yMkaoW7qUjkHJSv88D0WWYy2yJHRy3JR9sz3sI+0rTJIlN7GzENbBBqtf7Dvd/e50v9Mp+fHt+8nZQ8miFVFABU/j0dEwjgjHIqN8kcb3d5eDd3EEGvEMMcFJGq8JxGenr1+d1BPQa0YgMgAcJnUaF1rLSZIALkiJ4EhIws1aLlSJtBHVIqmFyqQSmAAY/JIl4+HwbVIiymMPow6BEXlOMbkQuCoJ1w2IIgxpswcoqISAVstD4DKF6o10tpO8aBYDYokPQSyRWlZygEUpTVJzyqheO/CnxKCHU1KsBIhcHxk/v0eXjPEcDTtp3RZIkie0xfPQPihRyYC2SuNK8YkHGrRAdjuTVcmCndhn1wT0rzbP0fAAH5tafGr6KxP4guSoYhqsqK6VF73kXpeCa4jqCQJMaRrf0dK05IzU0Y0okWmrekIQ6HOgaOdicc5htxuGvjqxIeHRrK4QS+PxcdBMoatjiC+CjvDB/e12Kq1qTjMaROOY+J0l3f3KrmRfS0LkjDzoEGjYxLbqK8oJdPQ1zUQ9NQVTgnWWoMiCBjOClKuAYMKcR1RpYcWcMuYl52Iz76JIhKnb95yY80DsguUm10T5b0btFBkft8JNxcgmLOU2E0Zy7T0UXRThO6cK9JWD8CG/4JCDdfEllL6Em0VLeg3l5pfx1mtp8CRSaKGQLGycrDEzA9FKzvBjlsYze8aZa06OShIie3XywsxhzPzN0+tK1xbHPd0KbRET5FGwkwKovWi6BT5oKvwGmc8fJK59+w2PC9Px2PC/p+H9cbkOZ8Py1Wt/bxS1VpEzS16I/geJxhVoUd5agy7ZU2PnFt70KH4vsnWkzTz7OvrsZwwCkn3inR7YbpRmW5Qvg5VDH291xrxT3vm0Oxu7o4z2LMBMXzZFsqfXii7Jr/kb7uDP66qg4OZXb5+fx2IwnW3z06oafhrxIH62bp49/Pjq7eFmJzWbt9MmGRt0b95cf+IqunTPzpH///Ft/iuFbzj9CVBLAwQUAAAACABae3xOQP0TY0gBAABRAwAAEgAAAHdvcmQvZm9vdG5vdGVzLnhtbKWTTU7DMBCF90jcIfK+TcICIatJNxUcoHAA4ziNReyxZpyano0FR+IKuGnSlh9VQWzGGs28b95I44+398Xy1bTJViFpsAXL5xlLlJVQabsp2NPj/eyOJeSFrUQLVhVsp4gty+urReA1gLfgFSWRYYmHgjXeO56mJBtlBM3BKRtrNaARPqa4SQNg5RCkIoojTJveZNltaoS2bMDgFAzUtZZqBbIzyvoDBFUrfFyDGu1opAU3BVehCGd2vppcHYoj0cgpRCPwpXMzCcZFU8+61X7Xw0/G6AfHaIlAUPt51A079maiMs++2Vo3wqkTbfM/2gNC50batmAdWj6AZkfQfh2+Ne3YB5f6DgOH5+gzzyZo9tZYeXZiSeC6Klg8zsD9zsU7JOUECg/Y97l9wHKRjtH1cZT/gspPKAnWa9v1t7P+EzZ+g7OUyk9QSwMEFAAAAAgAWnt8Tti6jnnDAgAAKQcAABEAAAB3b3JkL2RvY3VtZW50LnhtbKVV3U7bMBS+n7R3qHIPSQoUqGgRGwNNYggBewDXcRIP28eynYbu1bjYI+0Vduw4KRQ2dSIXic/f5+/82Pn99Ovk9FGK0ZIZy0HNknw3S0ZMUSi4qmbJ9/uLnaNkZB1RBRGg2CxZMZuczj9+OGmnBdBGMuVGCKHstJ0ltXN6mqaW1kwSuwuaKbSVYCRxKJoqbcEU2gBl1uIOUqTjLJukknCVRBizDQyUJafsPBLoQAwTxGEWtuba9mit3gauMKR9RuclyfPO2CNKug2iJOah0TsUpEZSCy64WwXwNTH7CkdyasBC6XYxLuYYyGBknm3QuquJZmu06n1olwYa3aMtZ0lj1DQC7QxAPp3pUoreD/7l120YPwPPPNsixlNbRxz8X2bjsPIkJZ1+rRQYshA4uAiUzHFqF1Cs/FeH140Jnzu3EmzUTpdEzJIgjJPUWx4Y09fs0fW2bK2+4orZDX3LC2g/g3IGxIbJ1kWvoYIRk6BEQQDOO2kceLHkQkQphCx4wTdRNKHYLtQuGM4b8wYUSOmYiWvB/Tkd7w/CbePzX8Ny5ZkIVroYYXhV9+uSG+uuAkTc8gftOfgQr0uHwnWvuL7AvH1BiKWcz5J7LrE+16wd3YIkyoMzYt2Z5eRNY32m7Nth1L5WB2qhfkOFwrNZphfd6eW899Ngub8z3turdKiCm+d/ebyT61y7EoadGHVdYAngFDgWJxKG0dKkYp/AOZAdOdXICzkMZMEol0QMpluGt7UZzBR7wlUDjY00N7ap7n6iK17deX6cHYc24HpytLcfC1R9I77CDrTXT8bJMDoYcPBseg73jiZeXASqa+eakcLPZj5GzFFH4LlcNS7ObtzwupH3K+1PY8gEPYdm+5r41uJwHo5jgIIvqvAZBck4cRkANzqK/6pLw4t4Im64o5jn3iSLVenbkMb7Af9v6foHN/8DUEsDBBQAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAd29yZC9fcmVscy9QSwMEFAAAAAgAAAAAAJR6mP7rAAAArAIAABwAAAB3b3JkL19yZWxzL2RvY3VtZW50LnhtbC5yZWxzrZJNTsMwEIX3SNzBmj1x2iKEUJ1uEFK3VTiASSY/ajxj2VNEzsaCI3EFLAEllaqKRZbzRn7vm/F8vn+sN29uUK8YYs9kYJHloJAqrntqDTyXTzf3oKJYqu3AhAZGjLAprq/WOxyspEex631UyYWigU7EP2gdqw6djRl7pNRpODgrqQyt9rba2xb1Ms/vdJh6QHHiqba1gbCtF6DK0eN/vLlp+gofuTo4JDkToRtmIZY0gyptaFEMHKUsuYE+D7GcEyLKOEwJvutL8as54+ngXjCk//0jOEqXIG5n3QGKpLzpFn6UXwR9cmDFF1BLAwQUAAAACAAAAAAAhg2J1z0BAAAkBAAAEwAAAFtDb250ZW50X1R5cGVzXS54bWy1kz1OAzEQhXsk7mC5RVkHCoRQNin4KYEiHMB4ZzcGe2zZk5CcjYIjcQVm87MF2pAmKddvvveePdqfr+/RZOmdWEDKNmApL4uhFIAmVBabUr5OHwc3UmTSWGkXEEq5giwn4/Oz0XQVIQumMZdyRhRvlcpmBl7nIkRAVuqQvCb+TI2K2nzoBtTVcHitTEACpAG1HnI8uodazx2JhyUfb5okcFmKu81gm1VKHaOzRhPraoHVn5TBNqFgcj2TZzbmCx6QqjehVfYH7OfeIzR/QOvbq62FfiZiP9KeM/HMC0i2AvGiEz1pz7r6DKlSVTBzz0zxf9me1wh1bQ10fOsWUzCQM2/Wu6JTvLa4e6W9PTKtHOTjt9j4HozHuX+DxMjxG3TWB0vUIRAGOsUzdNaHFwFEzJxiFVvnXQW1/sHHv1BLAQIUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAMAAAAAAAAABfcmVscy9QSwECFAAUAAAACAAAAAAA41Y8+roAAAAuAQAACwAAAAAAAAAAACAAAAAkAAAAX3JlbHMvLnJlbHNQSwECFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAADAAAAAHAQAAd29yZC9QSwECFAAUAAAACABae3xOcf0GXu4BAADvBAAAEQAAAAAAAAAAACAgAAAqAQAAd29yZC9zZXR0aW5ncy54bWxQSwECFAAUAAAACABae3xO44ZCkRcBAACvAgAAEgAAAAAAAAAAACAgAABHAwAAd29yZC9udW1iZXJpbmcueG1sUEsBAhQAFAAAAAgAWnt8Tt98YfH/AgAAcw0AAA8AAAAAAAAAAAAgIAAAjgQAAHdvcmQvc3R5bGVzLnhtbFBLAQIUABQAAAAIAFp7fE5A/RNjSAEAAFEDAAASAAAAAAAAAAAAICAAALoHAAB3b3JkL2Zvb3Rub3Rlcy54bWxQSwECFAAUAAAACABae3xO2LqOecMCAAApBwAAEQAAAAAAAAAAACAgAAAyCQAAd29yZC9kb2N1bWVudC54bWxQSwECFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAADAAAAAkDAAAd29yZC9fcmVscy9QSwECFAAUAAAACAAAAAAAlHqY/usAAACsAgAAHAAAAAAAAAAAACAAAABNDAAAd29yZC9fcmVscy9kb2N1bWVudC54bWwucmVsc1BLAQIUABQAAAAIAAAAAACGDYnXPQEAACQEAAATAAAAAAAAAAAAIAAAAHINAABbQ29udGVudF9UeXBlc10ueG1sUEsFBgAAAAALAAsAnwIAAOAOAAAAAA=="; + base64StringToFileOfTxt(str,"d://1.json"); + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/util/MD5Util.java b/adc-da-sys/src/main/java/com/adc/da/ocr/util/MD5Util.java new file mode 100644 index 00000000..349bc0f3 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/util/MD5Util.java @@ -0,0 +1,77 @@ +package com.adc.da.ocr.util; + + +import java.security.MessageDigest; + +/** + * 采用MD5加密解密 + * @author tfq + * @datetime 2011-10-13 + */ +public class MD5Util { + + /*** + * MD5加码 生成32位md5码 + */ + public static String string2MD5(String inStr){ + MessageDigest md5 = null; + try{ + md5 = MessageDigest.getInstance("MD5"); + }catch (Exception e){ + System.out.println(e.toString()); + e.printStackTrace(); + return ""; + } + char[] charArray = inStr.toCharArray(); + byte[] byteArray = new byte[charArray.length]; + + for (int i = 0; i < charArray.length; i++) + byteArray[i] = (byte) charArray[i]; + byte[] md5Bytes = md5.digest(byteArray); + StringBuffer hexValue = new StringBuffer(); + for (int i = 0; i < md5Bytes.length; i++){ + int val = ((int) md5Bytes[i]) & 0xff; + if (val < 16) + hexValue.append("0"); + hexValue.append(Integer.toHexString(val)); + } + return hexValue.toString(); + + } + + /** + * 加密解密算法 执行一次加密，两次解密 + */ + public static String convertMD5(String inStr){ + + char[] a = inStr.toCharArray(); + for (int i = 0; i < a.length; i++){ + a[i] = (char) (a[i] ^ 't'); + } + String s = new String(a); + return s; + + } + + // 测试主函数 + public static void main(String args[]) { + /* String s = new String("tangfuqiang"); + System.out.println("原始：" + s); + System.out.println("MD5后：" + string2MD5(s)); + + System.out.println("加密的：" + convertMD5(s)); + + System.out.println("解密的：" + convertMD5(convertMD5(s)));*/ +// String fileId = "ATT_FILE_07_JLBUTUSFXDRUKTVX5BT5"; +// String key = "dufy20170329java"; +// SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd-HH"); +// String time = df.format(new Date()); +// String sign = fileId + time + key; + String str="GVJ3EZKW6NTK6Z5U92QE"+"EC4KKA6ZDTCPAOCRBC5M"; + String key="ecd2c0791b398882310c4edcc1eee42b"; + String entoryStr = string2MD5(str); + + System.out.println(entoryStr); + System.out.println(key); + } +} \ No newline at end of file diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/util/RsaUtil.java b/adc-da-sys/src/main/java/com/adc/da/ocr/util/RsaUtil.java new file mode 100644 index 00000000..97699f51 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/util/RsaUtil.java @@ -0,0 +1,131 @@ +package com.adc.da.ocr.util; + + +import com.adc.da.util.utils.IOUtils; +import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; +import org.bouncycastle.crypto.params.RSAKeyParameters; +import org.bouncycastle.crypto.util.SubjectPublicKeyInfoFactory; +import org.bouncycastle.util.encoders.Base64; +import org.dom4j.DocumentException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import javax.crypto.Cipher; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.KeyFactory; +import java.security.NoSuchAlgorithmException; +import java.security.interfaces.RSAPublicKey; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.X509EncodedKeySpec; + +/** + * @program: OcrDemo + * @description: rsa加密解密 + * @author: duyunbao + * @create: 2019-03-14 19:54 + */ +public class RsaUtil { + + private static final Logger logger = LoggerFactory.getLogger(RsaUtil.class); + + public static final String CHARSET = "UTF-8"; + public static final String RSA_ALGORITHM = "RSA"; + + /// RSA公钥格式转换，.net->java + + public static String RSAPublicKeyDotNet2Java() throws IOException, DocumentException { + /* SAXReader reader = new SAXReader(); + Document document = reader.read(new File("../../../resources/rsa/publicRSAXML.xml")); + Element root = document.getRootElement(); + Element ModulusElem = root.element("Modulus"); + Element ExponentElem = root.element("Exponent"); + BigInteger m = new BigInteger(1, Base64.decode(ModulusElem.elements().get(0).getData().toString())); + BigInteger p = new BigInteger(1, Base64.decode(ExponentElem.elements().get(0).getData().toString()));*/ + BigInteger m = new BigInteger(1, Base64.decode("ncJeLmq4CT6t07x1Ct8LJn8/h6vPaSoySEcirRxAfFS7uoxxaWTyQE3khA4idvwky2ZrLtZjqVCFWRlHADKB5OCbRsVxvQv7kAR3VASJnCUtXH1lm+5zF9vxcw20ISfqEYUwikMDDogbVyLzNjwU/7ZfzzNY5lG+KsZxV8tuOE8=")); + BigInteger p = new BigInteger(1, Base64.decode("AQAB")); + + RSAKeyParameters pub = new RSAKeyParameters(false, m, p); + SubjectPublicKeyInfo publicKeyInfo = SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(pub); + byte[] serializedPublicBytes = publicKeyInfo.toASN1Primitive().getEncoded(); + return Base64.toBase64String(serializedPublicBytes); + } + + + /** + } + + * 得到公钥 + * @param publicKey 密钥字符串（经过base64编码） + * @throws Exception + */ + public static RSAPublicKey getPublicKey(String publicKey) throws NoSuchAlgorithmException, InvalidKeySpecException { + // 通过X509编码的Key指令获得公钥对象 + KeyFactory keyFactory = KeyFactory.getInstance(RSA_ALGORITHM); + X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(Base64.decode(publicKey)); + RSAPublicKey key = (RSAPublicKey) keyFactory.generatePublic(x509KeySpec); + return key; + } + + + + /** + * 公钥加密 + * @param data + * @return + */ + public static String publicEncrypt(String data) { + RSAPublicKey publicKey = null; + try { + publicKey = getPublicKey(RSAPublicKeyDotNet2Java()); + }catch (Exception e){ + logger.error(e.getMessage(),e); + return null; + } + + try { + Cipher cipher = Cipher.getInstance(RSA_ALGORITHM); + cipher.init(Cipher.ENCRYPT_MODE, publicKey); + return Base64.toBase64String(rsaSplitCodec(cipher, Cipher.ENCRYPT_MODE, data.getBytes(CHARSET), + publicKey.getModulus().bitLength())); + } catch (Exception e) { + logger.error("加密字符串[" + data + "]时遇到异常",e); + return null; + } + } + + + + + private static byte[] rsaSplitCodec(Cipher cipher, int opmode, byte[] datas, int keySize) { + int maxBlock = 0; + if (opmode == Cipher.DECRYPT_MODE) { + maxBlock = keySize / 8; + } else { + maxBlock = keySize / 8 - 11; + } + ByteArrayOutputStream out = new ByteArrayOutputStream(); + int offSet = 0; + byte[] buff; + int i = 0; + try { + while (datas.length > offSet) { + if (datas.length - offSet > maxBlock) { + buff = cipher.doFinal(datas, offSet, maxBlock); + } else { + buff = cipher.doFinal(datas, offSet, datas.length - offSet); + } + out.write(buff, 0, buff.length); + i++; + offSet = i * maxBlock; + } + } catch (Exception e) { + logger.error("加解密阀值为[" + maxBlock + "]的数据时发生异常",e); + } + byte[] resultDatas = out.toByteArray(); + IOUtils.closeQuietly(out); + return resultDatas; + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/util/UUIDUtils.java b/adc-da-sys/src/main/java/com/adc/da/ocr/util/UUIDUtils.java new file mode 100644 index 00000000..c7965124 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/util/UUIDUtils.java @@ -0,0 +1,40 @@ +package com.adc.da.ocr.util; + + +import com.adc.da.util.utils.RandomUtils; + +import java.util.Random; + +public class UUIDUtils { + + public static String randomUUID10() { + return RandomUtils.randomString(10); + } + + public static String randomUUID20() { + return RandomUtils.randomString(20); + } + + public static String randomUUID(int length) { + return RandomUtils.randomString(length); + } + + public static String getUUIDPath(String uuid){ + StringBuilder builder=new StringBuilder(); + builder.append("/"); + builder.append((uuid.substring(0, 3).hashCode())%100+"").append("/"); + builder.append((uuid.substring(7,10).hashCode())%100+"").append("/"); + builder.append((uuid.substring(11,14).hashCode())%100+"").append("/"); + return builder.toString(); + } + + public static String getAttTable(){ + Random rand = new Random(); + int nextInt = rand.nextInt(10)+1; + StringBuilder builder=new StringBuilder(); + builder.append("ATT_FILE_").append(String.format("%02d", nextInt)); + return builder.toString(); + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java index 9b744f0d..af760448 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java @@ -32,4 +32,6 @@ public interface PersonCollectEODao extends BaseMapper { public int deleteByResId(@Param("resId") String resId); + int deleteByResIdList(@Param("idList") List idList); + } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonShareEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonShareEODao.java index d1d0a883..478d3a12 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonShareEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonShareEODao.java @@ -28,4 +28,6 @@ public interface PersonShareEODao extends BaseMapper { void deleteByIdListForward(@Param("idList") List idList); int deleteByResId(@Param("resId") String resId); + + int deleteByResIdList(@Param("idList") List idList); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/util/LoginUserUtil.java b/adc-da-sys/src/main/java/com/adc/da/sys/util/LoginUserUtil.java new file mode 100644 index 00000000..508b73a2 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/util/LoginUserUtil.java @@ -0,0 +1,53 @@ +package com.adc.da.sys.util; + +import com.alibaba.fastjson.JSONObject; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.UnavailableSecurityManagerException; +import org.apache.shiro.session.InvalidSessionException; +import org.apache.shiro.subject.Subject; + +import java.util.Map; + +public class LoginUserUtil { + /** + * 获取当前登录用户ID + * + */ + public static String getUserId() { + String userId = null; + try { + Subject subject = SecurityUtils.getSubject(); + Object object=subject.getPrincipal(); + if(object!=null){ + String json = JSONObject.toJSONString(object); + if(json!=null && json.length()>0){ + Map userInfo= JSONObject.parseObject(json, Map.class); + userId=userInfo.get("id").toString(); + } + } + } catch (UnavailableSecurityManagerException e) { + } catch (InvalidSessionException e) { + } + return userId; + } + + public static String getUserParamValue() { + String paramValue = null; + try { + Subject subject = SecurityUtils.getSubject(); + Object object=subject.getPrincipal(); + if(object!=null){ + String json = JSONObject.toJSONString(object); + if(json!=null && json.length()>0){ + Map userInfo= JSONObject.parseObject(json, Map.class); + paramValue=userInfo.get("paramValue").toString(); + } + } + } catch (UnavailableSecurityManagerException e) { + } catch (InvalidSessionException e) { + } + return paramValue; + } + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/util/UUIDUtils.java b/adc-da-sys/src/main/java/com/adc/da/sys/util/UUIDUtils.java new file mode 100644 index 00000000..b767d3d2 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/util/UUIDUtils.java @@ -0,0 +1,44 @@ +package com.adc.da.sys.util; + + +import com.adc.da.util.utils.RandomUtils; + +import java.util.Random; + +public class UUIDUtils { + + public static String randomUUID10() { + return RandomUtils.randomString(10); + } + + public static String randomUUID20() { + return RandomUtils.randomString(20); + } + + public static String randomUUID50() { + return RandomUtils.randomString(50); + } + + public static String randomUUID(int length) { + return RandomUtils.randomString(length); + } + + public static String getUUIDPath(String uuid){ + StringBuilder builder=new StringBuilder(); + builder.append("/"); + builder.append((uuid.substring(0, 3).hashCode())%100+"").append("/"); + builder.append((uuid.substring(7,10).hashCode())%100+"").append("/"); + builder.append((uuid.substring(11,14).hashCode())%100+"").append("/"); + return builder.toString(); + } + + public static String getAttTable(){ + Random rand = new Random(); + int nextInt = rand.nextInt(10)+1; + StringBuilder builder=new StringBuilder(); + builder.append("ATT_FILE_").append(String.format("%02d", nextInt)); + return builder.toString(); + } + + +} diff --git a/adc-da-sys/src/main/resources/dozer/dozer-mappings-sys.xml b/adc-da-sys/src/main/resources/dozer/dozer-mappings-sys.xml new file mode 100644 index 00000000..4568c2a2 --- /dev/null +++ b/adc-da-sys/src/main/resources/dozer/dozer-mappings-sys.xml @@ -0,0 +1,83 @@ + + + + com.adc.da.sys.entity.UserEO + com.adc.da.sys.vo.UserVO + + roleIdList + roleIdList + + + roleNameList + roleNameList + + + roleEOList + roles + + + orgIdList + orgsstr + + + orgEOList + orgs + + + password + password + + + + + com.adc.da.sys.entity.RoleEO + com.adc.da.sys.vo.RoleVO + + id + id + + + name + name + + + remarks + remarks + + + validFlag + validFlag + + + menuEOIdList + menusstr + + + menuEOList + menus + + + + com.adc.da.sys.entity.MenuEO + com.adc.da.sys.vo.MenuVO + + + com.adc.da.sys.entity.DictionaryEO + com.adc.da.sys.vo.DictionaryVO + + + com.adc.da.sys.entity.DicTypeEO + com.adc.da.sys.vo.DicTypeVO + + + com.adc.da.sys.entity.OrgEO + com.adc.da.sys.vo.OrgVO + + + com.adc.da.log.entity.LogEO + com.adc.da.log.vo.LogVO + + + \ No newline at end of file diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml index 04f4a809..96c715ff 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml @@ -35,7 +35,7 @@ diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/ocr/OcrRecordEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/ocr/OcrRecordEOMapper.xml new file mode 100644 index 00000000..2e851195 --- /dev/null +++ b/adc-da-sys/src/main/resources/mybatis/mapper/ocr/OcrRecordEOMapper.xml @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + word_file_code, json_file_code, id, doc_real_name, json_real_name, file_name, doc_name, json_name, + creation_time, modify_time,result_content,file_type,stand_number,stand_name + + + + + where 1=1 + + + and word_file_code ${wordFileCodeOperator} #{wordFileCode} + + + and json_file_code ${jsonFileCodeOperator} #{jsonFileCode} + + + and id ${idOperator} #{id} + + + and doc_real_name ${docRealNameOperator} #{docRealName} + + + and json_real_name ${jsonRealNameOperator} #{jsonRealName} + + + and file_name ${fileNameOperator} #{fileName} + + + and doc_name ${docNameOperator} #{docName} + + + and json_name ${jsonNameOperator} #{jsonName} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + + + + + + insert into OCR_RECORD() + values (#{wordFileCode, jdbcType=VARCHAR}, #{jsonFileCode, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{docRealName, jdbcType=VARCHAR}, #{jsonRealName, jdbcType=VARCHAR}, #{fileName, jdbcType=VARCHAR}, #{docName, jdbcType=VARCHAR}, #{jsonName, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}) + + + + + + insert into OCR_RECORD + + word_file_code, + json_file_code, + id, + doc_real_name, + json_real_name, + file_name, + doc_name, + json_name, + creation_time, + modify_time, + result_content, + file_type, + stand_number, + stand_name, + + + #{wordFileCode, jdbcType=VARCHAR}, + #{jsonFileCode, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + #{docRealName, jdbcType=VARCHAR}, + #{jsonRealName, jdbcType=VARCHAR}, + #{fileName, jdbcType=VARCHAR}, + #{docName, jdbcType=VARCHAR}, + #{jsonName, jdbcType=VARCHAR}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{resultContent, jdbcType=VARCHAR}, + #{fileType, jdbcType=VARCHAR}, + #{standNumber, jdbcType=VARCHAR}, + #{standName, jdbcType=VARCHAR}, + + + + + + update OCR_RECORD + set word_file_code = #{wordFileCode}, + json_file_code = #{jsonFileCode}, + doc_real_name = #{docRealName}, + json_real_name = #{jsonRealName}, + file_name = #{fileName}, + doc_name = #{docName}, + json_name = #{jsonName}, + creation_time = #{creationTime}, + modify_time = #{modifyTime} + where id = #{id} + + + + + update OCR_RECORD + + + word_file_code = #{wordFileCode}, + + + json_file_code = #{jsonFileCode}, + + + doc_real_name = #{docRealName}, + + + json_real_name = #{jsonRealName}, + + + file_name = #{fileName}, + + + doc_name = #{docName}, + + + json_name = #{jsonName}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + result_content = #{resultContent}, + + + file_type = #{fileType}, + + + stand_number = #{standNumber}, + + + stand_name = #{standName}, + + + where id = #{id} + + + + + + + + delete from OCR_RECORD + where id = #{value} + + + + + + + + + + + + + + + delete from OCR_RECORD + where id in + + #{item} + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml index b02a17d2..68378140 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml @@ -379,4 +379,16 @@ where collect_res_id = #{resId} + + delete from TS_PERSON_COLLECT + + + collect_res_id IN + + #{item} + + + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonShareEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonShareEOMapper.xml index 5e45ff5c..2ed8193c 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonShareEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonShareEOMapper.xml @@ -246,4 +246,16 @@ set valid_flag=1 where res_id = #{resId} + + + delete from TS_PERSON_COLLECT + + + collect_res_id IN + + #{item} + + + + From 0c8df99fd23c74bf689ef14e10637f2a19d2dbae Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Thu, 8 Jul 2021 09:17:52 +0800 Subject: [PATCH 3/7] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 4e81e311..3919b41a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import java.util.*; +import static com.adc.da.login.util.UserUtils.getUserName; /** *

    * 服务实现类 @@ -68,6 +69,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl page = new Page<>(pages, size); IPage userIPage = sarLawsDetailedListDao.selectPage(page, wrapper); - Map map= iDicTypeEOService.getDicTypeListCode(); - List list= userIPage.getRecords(); - List> arr = (List>)map.get("COUNTRY"); - for (SarLawsDetailedList list1:list){ - if (list1.getCountryArea().contains(",")){ - String[] split = list1.getCountryArea().split(","); - StringBuilder builder = new StringBuilder(); - for (String s:split){ + if ("1".equals(sortKey)){ + Map map= iDicTypeEOService.getDicTypeListCode(); + List list= userIPage.getRecords(); + List> arr = (List>)map.get("COUNTRY"); + for (SarLawsDetailedList list1:list){ + if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")){ + String[] split = list1.getCountryArea().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:arr) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setCountryArea(completedString); + }else { for (Map map1:arr) { - if (map1.get("value").equals(s)){ - s=map1.get("label"); - builder.append(s+","); + if (map1.get("value").equals(list1.getCountryArea())){ + list1.setCountryArea(map1.get("label")); break; } } } - String completedString = builder.delete(builder.length()-1,builder.length()).toString(); - list1.setCountryArea(completedString); - }else { - for (Map map1:arr) { - if (map1.get("value").equals(list1.getCountryArea())){ - list1.setCountryArea(map1.get("label")); - break; - } - } } + userIPage.setRecords(list); } - userIPage.setRecords(list); System.out.println("总条数" + userIPage.getTotal()); System.out.println("总页数" + userIPage.getPages()); return userIPage; From 1ed0888256dea5b40aa95b35b531d5e6ad2df6f5 Mon Sep 17 00:00:00 2001 From: duanwenbin <12345678> Date: Thu, 8 Jul 2021 09:22:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4ocr=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-dev.properties | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 468a3c67..ed70a9a5 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -48,4 +48,19 @@ spring.rabbitmq.password=cs986432 # ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ \ No newline at end of file +file.path=/usr/laws/file/ + +# 云端OCR识别集成配置参数 +#OCR请求识别URL地址 +OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion +# OCR回调接口地址 配置客户本地的IP及端口号 +OCR.callBackUrl = http://39.98.140.126:10001/api/ocr/OCRRestful/OcrHandleResult +OCR.userId =dayuzhou1234 +OCR.authCode =123456 +OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M +# OCR文件存储路径 +OCR.ocrPath=D:/APPSOFT/LAWSOCRDEMO/OCRFILE/ +# OCR文件请求下载或在线预览时URL +OCR.ocrDownPath=http://106.2.13.189:8089/downfile/ +OCR.times=20 +OCR.convertType=BOTH \ No newline at end of file From 2e8a2bba51e52f10fc447a7b87c50dc468f08fed Mon Sep 17 00:00:00 2001 From: duanwenbin <12345678> Date: Thu, 8 Jul 2021 11:21:18 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/common/ConvertHtml2Excel.java | 282 +++++ .../com/adc/da/common/CrossRangeCellMeta.java | 53 + .../entity/SarStandardsInfoEO.java | 2 + .../SarFileSplitInfoEOController.java | 4 +- .../SarFileSplitItemsEOController.java | 569 ++++++++++ .../SarFileSplitMenuEOController.java | 150 +++ .../controller/SarStandFileEOController.java | 191 ++-- .../dao/SarFileSplitItemsEODao.java | 15 + .../dao/SarFileSplitItemsParamsEODao.java | 3 + .../dao/SarFileSplitItemsValEODao.java | 3 + .../dao/SarFileSplitMenuEODao.java | 13 + .../dao/SarStandAttrDetailsEODao.java | 35 + .../standardSplit/dao/SarStandFileEODao.java | 49 + .../dao/SarStandardsInfoEODao.java | 66 ++ .../dto/FileSpiltValTableExportDto.java | 43 + .../dto/FileSplitValImgExportDto.java | 29 + .../dto/SarFileSplitItemsImportDto.java | 148 +++ .../standardSplit/entity/DrageMenuEO.java | 87 ++ .../entity/SarCompStatusInfoEO.java | 423 ++++++++ .../entity/SarFileSplitItemsParamsEOPage.java | 194 ++++ .../entity/SarFileSplitItemsValEOPage.java | 230 ++++ .../entity/SarFileSplitMenuEOPage.java | 248 +++++ .../entity/SarStandAttrDetailsEOPage.java | 301 ++++++ .../entity/SarStandFileEOPage.java | 4 +- .../standardSplit/entity/SarStandItemsEO.java | 486 +++++++++ .../entity/SarStandardsInfoEO.java | 588 +++++++++++ .../entity/SarStandardsInfoEOPage.java | 651 ++++++++++++ .../service/SarFileSplitInfoEOService.java | 2 + .../service/SarFileSplitItemsEOService.java | 49 + .../SarFileSplitItemsParamsEOService.java | 11 + .../SarFileSplitItemsTableEOService.java | 4 + .../SarFileSplitItemsValEOService.java | 11 + .../service/SarFileSplitMenuEOService.java | 33 + .../service/SarStandAttrDetailsEOService.java | 6 + .../service/SarStandFileEOService.java | 21 + .../service/SarStandardsInfoEOService.java | 10 + .../service/impl/MenuServiceImpl.java | 2 +- .../impl/SarFileSplitInfoEOServiceImpl.java | 12 + .../impl/SarFileSplitItemsEOServiceImpl.java | 988 ++++++++++++++++++ .../SarFileSplitItemsParamsEOServiceImpl.java | 28 + .../SarFileSplitItemsTableEOServiceImpl.java | 14 + .../SarFileSplitItemsValEOServiceImpl.java | 28 + .../impl/SarFileSplitMenuEOServiceImpl.java | 452 ++++++++ .../SarStandAttrDetailsEOServiceImpl.java | 15 +- .../impl/SarStandFileEOServiceImpl.java | 54 +- .../impl/SarStandardsInfoEOServiceImpl.java | 29 + .../da/slrs/standardSplit/vo/RecommendVO.java | 56 + .../SarStandAttrDetailsEOMapper.xml | 354 +++++++ .../standardSplit/SarStandFileEOMapper.xml | 359 +++++++ .../SarStandardsInfoEOMapper.xml | 844 +++++++++++++++ .../controller/PersonCollectEOController.java | 6 +- .../adc/da/person/dao/PersonCollectEODao.java | 2 + .../service/IPersonCollectEOService.java | 2 + .../impl/PersonCollectEOServiceImpl.java | 8 + .../java/com/adc/da/sys/common/BasePage.java | 93 ++ 55 files changed, 8255 insertions(+), 105 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/common/ConvertHtml2Excel.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/common/CrossRangeCellMeta.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitMenuEOController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandAttrDetailsEODao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandardsInfoEODao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSpiltValTableExportDto.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitValImgExportDto.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/SarFileSplitItemsImportDto.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/DrageMenuEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarCompStatusInfoEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsParamsEOPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEOPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitMenuEOPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandAttrDetailsEOPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandardsInfoEO.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandardsInfoEOPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsParamsEOService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsTableEOService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandardsInfoEOService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsParamsEOServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsTableEOServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandardsInfoEOServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/vo/RecommendVO.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandAttrDetailsEOMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml create mode 100644 adc-da-sys/src/main/java/com/adc/da/sys/common/BasePage.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/common/ConvertHtml2Excel.java b/adc-da-slrs/src/main/java/com/adc/da/common/ConvertHtml2Excel.java new file mode 100644 index 00000000..87276771 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/common/ConvertHtml2Excel.java @@ -0,0 +1,282 @@ +package com.adc.da.common; + +import com.adc.da.util.utils.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.hssf.util.HSSFColor; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/2/26 10:10 + */ +public class ConvertHtml2Excel { + /** + * html表格转excel + */ + public static HSSFWorkbook table2Excel(String tableHtml, HSSFWorkbook wb, String sheetName) throws Exception { +// HSSFWorkbook wb = new HSSFWorkbook(); + HSSFSheet sheet = wb.createSheet(sheetName); + List moneyCols =new ArrayList<>(); + moneyCols.add(1); + int headEndRow = 1; + List crossRowEleMetaLs = new ArrayList(); + int rowIndex = 0; + try { + Document data = DocumentHelper.parseText(tableHtml); + HSSFCellStyle contentStyle = getContentStyle(wb); + // 生成表头 + Element thead = data.getRootElement().element("thead"); + HSSFCellStyle titleStyle = getTitleStyle(wb); + int ls = 0;//列数 + if (thead != null) { + List trLs = thead.elements("tr"); + for (Element trEle : trLs) { + HSSFCellStyle style = rowIndex<=headEndRow?titleStyle:contentStyle; + style.setWrapText(true); + HSSFRow row = sheet.createRow(rowIndex); + List thLs = trEle.elements("th"); + if(ls tdLs = trEle.elements("td"); + if(ls trBody = tbody.elements("tr"); + for (Element trEle : trBody) { + HSSFCellStyle style = rowIndex<=headEndRow?titleStyle:contentStyle; + style.setWrapText(true); + HSSFRow row = sheet.createRow(rowIndex); + List thLs = trEle.elements("th"); + if(ls tdLs = trEle.elements("td"); + if(ls trFoot = tfoot.elements("tr"); + for (Element trEle : trFoot) { + HSSFCellStyle style = rowIndex<=headEndRow?titleStyle:contentStyle; + style.setWrapText(true); + HSSFRow row = sheet.createRow(rowIndex); + List thLs = trEle.elements("th"); + if(ls tdLs = trEle.elements("td"); + if(ls tdLs, int rowIndex, HSSFRow row, int startCellIndex, HSSFCellStyle cellStyle, + List crossRowEleMetaLs, boolean inHead, List moneyCols) { + int i = startCellIndex; + for (int eleIndex = 0; eleIndex < tdLs.size(); i++, eleIndex++) { + int captureCellSize = getCaptureCellSize(rowIndex, i, crossRowEleMetaLs); + while (captureCellSize > 0) { + for (int j = 0; j < captureCellSize; j++) {// 当前行跨列处理（补单元格） + row.createCell(i); + i++; + } + captureCellSize = getCaptureCellSize(rowIndex, i, crossRowEleMetaLs); + } + Element thEle = tdLs.get(eleIndex); + String val = thEle.getText(); + if (StringUtils.isEmpty(val)) { + Element e = thEle.element("a"); + if (e != null) { + val = e.getText(); + } + } + HSSFCell c = row.createCell(i); + if (NumberUtils.isNumber(val)) { + if (moneyCols != null && moneyCols.contains(i)) { + c.setCellType(CellType.STRING); + c.setCellValue(val); + } else { + c.setCellValue(Double.parseDouble(val)); + c.setCellType(CellType.STRING); + } + + } else { + c.setCellType(CellType.STRING); + c.setCellValue(new HSSFRichTextString(val)); + } + int rowSpan = NumberUtils.toInt(thEle.attributeValue("rowspan"), 1); + int colSpan = NumberUtils.toInt(thEle.attributeValue("colspan"), 1); + c.setCellStyle(cellStyle); + if (rowSpan > 1 || colSpan > 1) { // 存在跨行或跨列 + crossRowEleMetaLs.add(new CrossRangeCellMeta(rowIndex, i, rowSpan, colSpan, inHead)); + } + if (colSpan > 1) {// 当前行跨列处理（补单元格） + for (int j = 1; j < colSpan; j++) { + i++; + row.createCell(i); + } + } + } + return i; + } + + /** + * 设置合并单元格的边框样式 + * + * @param sheet + * @param region + * @param cs + */ + public static void setRegionStyle(HSSFSheet sheet, CellRangeAddress region, HSSFCellStyle cs) { + for (int i = region.getFirstRow(); i <= region.getLastRow(); i++) { + HSSFRow row = sheet.getRow(i); + for (int j = region.getFirstColumn(); j <= region.getLastColumn(); j++) { + HSSFCell cell = row.getCell(j); + cell.setCellStyle(cs); + } + } + } + + /** + * 获得因rowSpan占据的单元格 + * + * @param rowIndex 行号 + * @param colIndex 列号 + * @param crossRowEleMetaLs 跨行列元数据 + * @return 当前行在某列需要占据单元格 + */ + private static int getCaptureCellSize(int rowIndex, int colIndex, List crossRowEleMetaLs) { + int captureCellSize = 0; + for (CrossRangeCellMeta crossRangeCellMeta : crossRowEleMetaLs) { + if (crossRangeCellMeta.getFirstRow() < rowIndex && crossRangeCellMeta.getLastRow() >= rowIndex) { + if (crossRangeCellMeta.getFirstCol() <= colIndex && crossRangeCellMeta.getLastCol() >= colIndex) { + captureCellSize = crossRangeCellMeta.getLastCol() - colIndex + 1; + } + } + } + return captureCellSize; + } + + /** + * 获得标题样式 + * + * @param workbook + * @return + */ + private static HSSFCellStyle getTitleStyle(HSSFWorkbook workbook) { + short titlebackgroundcolor = HSSFColor.HSSFColorPredefined.WHITE.getIndex(); + short fontSize = 11; + String fontName = "宋体"; + HSSFCellStyle style = workbook.createCellStyle(); + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setAlignment(HorizontalAlignment.CENTER); + style.setBorderBottom(BorderStyle.THIN); //下边框 + style.setBorderLeft(BorderStyle.THIN);//左边框 + style.setBorderTop(BorderStyle.THIN);//上边框 + style.setBorderRight(BorderStyle.THIN);//右边框 + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + style.setFillForegroundColor(titlebackgroundcolor);// 背景色 + style.setWrapText(true); + HSSFFont font = workbook.createFont(); +// font.setFontName(fontName); + font.setFontHeightInPoints(fontSize); +// font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); + style.setFont(font); + return style; + } + + /** + * 获得内容样式 + * + * @param wb + * @return + */ + private static HSSFCellStyle getContentStyle(HSSFWorkbook wb) { + short fontSize = 11; +// String fontName = "宋体"; + HSSFCellStyle style = wb.createCellStyle(); + style.setBorderBottom(BorderStyle.THIN); + style.setBorderTop(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + HSSFFont font = wb.createFont(); +// font.setFontName(fontName); + font.setFontHeightInPoints(fontSize); + style.setFont(font); + style.setAlignment(HorizontalAlignment.CENTER);//水平居中 + style.setVerticalAlignment(VerticalAlignment.CENTER);//垂直居中 + style.setWrapText(true); + return style; + } + + public static void main(String[] args) throws Exception { + String cnt = "\n"; + List c =new ArrayList<>(); + c.add(1); + String tableHtml = "
    111111113333333333444444444
    555555566666
    324234
    "; + tableHtml = tableHtml.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt); +// HSSFWorkbook hssfWorkbook = ConvertHtml2Excel.table2Excel(tableHtml,c,1); +// hssfWorkbook.write(FileUtils.openOutputStream(new File("D:\\test\\test1.xls"))); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/common/CrossRangeCellMeta.java b/adc-da-slrs/src/main/java/com/adc/da/common/CrossRangeCellMeta.java new file mode 100644 index 00000000..1cbbb748 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/common/CrossRangeCellMeta.java @@ -0,0 +1,53 @@ +package com.adc.da.common; + +/** + * @Description: table转excel 跨行元素元数据 + * @Author: yangxuenan + * date: 2020/2/26 10:14 + */ +public class CrossRangeCellMeta { + + public CrossRangeCellMeta(int firstRowIndex, int firstColIndex, int rowSpan, int colSpan, boolean inHead) { + super(); + this.firstRowIndex = firstRowIndex; + this.firstColIndex = firstColIndex; + this.rowSpan = rowSpan; + this.colSpan = colSpan; + this.inHead = inHead; + } + + private int firstRowIndex; + private int firstColIndex; + private int rowSpan;// 跨越行数 + private int colSpan;// 跨越列数 + private boolean inHead; + + public boolean isInHead() { + return inHead; + } + + public CrossRangeCellMeta setInHead(boolean inHead) { + this.inHead = inHead; + return this; + } + + public int getFirstRow() { + return firstRowIndex; + } + + public int getLastRow() { + return firstRowIndex + rowSpan - 1; + } + + public int getFirstCol() { + return firstColIndex; + } + + public int getLastCol() { + return firstColIndex + colSpan - 1; + } + + public int getColSpan() { + return colSpan; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java index f4fee6c3..9981e6ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java @@ -14,6 +14,8 @@ public class SarStandardsInfoEO { @ApiModelProperty(value = "标准编号") private String standNumber; + private String standType; + @ApiModelProperty(value = "标准名称") private String standName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java index b5fbec66..b964f1b1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java @@ -97,8 +97,8 @@ public class SarFileSplitInfoEOController extends BaseController fileSplit(SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception { + @PostMapping("/fileSplit") + public ResponseMessage fileSplit(@RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception { if (sarFileSplitInfoEO.getStopNumber()<=0){ sarFileSplitInfoEO.setStopNumber(200); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java new file mode 100644 index 00000000..fc593344 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java @@ -0,0 +1,569 @@ +package com.adc.da.slrs.standardSplit.controller; + +import cn.afterturn.easypoi.excel.ExcelImportUtil; +import cn.afterturn.easypoi.excel.entity.ImportParams; +import cn.hutool.core.util.ZipUtil; +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.base.web.BaseController; +import com.adc.da.common.ConvertHtml2Excel; +import com.adc.da.common.FileUnZip; +import com.adc.da.common.SplitTableInfo; +import com.adc.da.http.PageInfo; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO; +import com.adc.da.slrs.standardSplit.dto.*; +import com.adc.da.slrs.standardSplit.entity.*; +import com.adc.da.slrs.standardSplit.service.*; +import com.adc.da.sys.util.UUIDUtils; +import com.adc.da.util.exception.AdcDaBaseException; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import com.adc.da.util.utils.IOUtils; +import com.adc.da.utils.util.POIReadExcelToHtml; +import com.adc.da.common.ReadExcel; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.poi.common.usermodel.HyperlinkType; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.OutputStream; +import java.util.*; + +import static com.adc.da.utils.util.ExcelUtil.checkObjAllFieldsIsNull; +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/${restPath}/lawss/sarFileSplitItems") +@Api(description = "|SarFileSplitItemsEO|") +public class SarFileSplitItemsEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsEOController.class); + + @Autowired + private SarFileSplitItemsEOService sarFileSplitItemsEOService; + @Autowired + private SarFileSplitItemsValEOService sarFileSplitItemsValEOService; + @Autowired + private SarFileSplitItemsTableEOService sarFileSplitItemsTableEOService; + @Autowired + private SarFileSplitItemsParamsEOService sarFileSplitItemsParamsEOService; + @Autowired + private SarFileSplitMenuEOService sarFileSplitMenuEOService; + @Autowired + private IAttFileEOService attFileEOService; + @Autowired + private SarFileSplitInfoEOService sarFileSplitInfoEOService; + @Autowired + private SarStandardsInfoEOService sarStandardsInfoEOService; + + @Value("${file.path}") + private String filePath; + + @Value("${file.path}") + private String uploadFilePath; + + @ApiOperation(value = "|SarFileSplitItemsEO|分页查询") + @GetMapping("/getSplitItemsByPage") +// @RequiresPermissions("lawss:sarFileSplitItems:page") + public ResponseMessage> page(SarFileSplitItemsEOPage page) throws Exception { + //6-18 端哥已做修改 + Map map = sarFileSplitItemsEOService.getByPage(page); + page.getPager().setRowCount((Integer) map.get("count")); + return Result.success(getPageInfo(page.getPager(), (List) map.get("list"))); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|查询") + @GetMapping("") +// @RequiresPermissions("lawss:sarFileSplitItems:list") + public ResponseMessage> list(SarFileSplitItemsEOPage page) throws Exception { + return Result.success(sarFileSplitItemsEOService.queryByList(page)); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|详情") + @GetMapping("/{id}") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitItems:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(sarFileSplitItemsEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) +// @RequiresPermissions("lawss:sarFileSplitItems:save") + //401问题2021-03-31暂时注释掉 liuhuiwen + public ResponseMessage create(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { + sarFileSplitItemsEOService.insertSelective(sarFileSplitItemsEO); + return Result.success(sarFileSplitItemsEO); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|修改") + @PutMapping("/updateSplitItems") + public ResponseMessage update(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { + int resultCount = sarFileSplitItemsEOService.updateItemContent(sarFileSplitItemsEO); + if (resultCount > 0) { + return Result.success("0","修改成功",sarFileSplitItemsEO); + } else { + return Result.error("修改失败"); + } + } + + @ApiOperation(value = "|SarFileSplitItemsEO|删除") + @DeleteMapping("/{id}") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitItems:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + sarFileSplitItemsEOService.deleteByPrimaryKey(id); + logger.info("delete from SAR_FILE_SPLIT_ITEMS where id = {}", id); + return Result.success(); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|批量删除") + @PostMapping("/batchDeleteItems") + public ResponseMessage batchDeleteItems(String ids) throws Exception { + if (StringUtils.isNotEmpty(ids)) { + int result = sarFileSplitItemsEOService.batchDeleteItems(ids); + if (result > 0) { + return Result.success("0","删除成功",null); + } else { + return Result.error("删除失败"); + } + + } else { + return Result.error("请选择要删除的数据"); + } + } + + @ApiOperation(value = "|SarFileSplitItemsEO|根据id查询") + @GetMapping("/getInfoById") +// @RequiresPermissions("lawss:sarFileSplitItems:get") + public ResponseMessage getInfoById(String id) throws Exception { + SarFileSplitItemsEO sarFileSplitItemsEO = sarFileSplitItemsEOService.selectByPrimaryKey(id); + if (sarFileSplitItemsEO != null) { + SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage(); + paramPage.setItemId(id); + List paramList = sarFileSplitItemsParamsEOService.queryByList(paramPage); + sarFileSplitItemsEO.setParamsList(paramList); + } + // 查询特殊参数要求信息 + return Result.success(sarFileSplitItemsEO); + } + + @ApiOperation(value = "判断包含子节点") + @GetMapping("/judgeContaintChilds") + /*@RequiresPermissions("lawss:sarMenu:judgequeryMenuByPid")*/ + public ResponseMessage judgeContaintChilds(String ids) throws Exception { + boolean result = sarFileSplitItemsEOService.judgeContaintChilds(ids); + return Result.success(result); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|导出zip") + @GetMapping(value = "/exportSplitInfoZip") + public void exportSplitInfoZip(String idList, String infoId, String exportName, HttpServletResponse response, HttpServletRequest request) throws Exception { + OutputStream os = null; + OutputStream excelOS = null; + HSSFWorkbook workbook = new HSSFWorkbook(); + String fileOriName = "拆分条款信息"; + if (StringUtils.isNotEmpty(exportName)) { + fileOriName = exportName; + } + try{ + //创建临时文件夹 + String fileNowPath = uploadFilePath + "/tempZip/" + UUIDUtils.randomUUID20() + "/" + fileOriName; + File nowFile = new File(fileNowPath); + if (nowFile.exists()){ + nowFile.delete(); + } + nowFile.mkdirs(); + String fileName = fileOriName + ".xls"; + HSSFSheet sheetItems = workbook.createSheet("条款内容"); + String[] headers = {"条款号","条款名称","内容简介","责任部门","FO","责任工程师","SVPPS","适用车辆类型","要求类型","企标覆盖关系"}; + HSSFCellStyle cellStyle =workbook.createCellStyle(); + cellStyle.setWrapText(true); +// cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); + HSSFCellStyle cellStyle1 =workbook.createCellStyle(); + cellStyle1.setAlignment(HorizontalAlignment.CENTER); + HSSFCellStyle cellStyleLink =workbook.createCellStyle(); + HSSFFont font = workbook.createFont(); + font.setColor(IndexedColors.LIGHT_BLUE.index); + cellStyleLink.setFont(font); + cellStyleLink.setWrapText(true); + List itemIdList = new ArrayList<>(); + SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage(); + if (StringUtils.isNotEmpty(idList)) { + String[] idArr = idList.split(","); + itemIdList = Arrays.asList(idArr); + page.setIdList(itemIdList); + } + //查询全部条款 + page.setInfoId(infoId); + page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + List allItemsList = sarFileSplitItemsEOService.queryByOrdersForExport(page); + List allTableList = new ArrayList<>(); + List allImgList = new ArrayList<>(); + List allRelevFileList = new ArrayList<>(); + int countMaxFile = 1; + if (allItemsList != null && !allItemsList.isEmpty()) { + for (FileSplitItemsExportDto itemsExportDto : allItemsList) { + SarFileSplitItemsValEOPage valEOPage = new SarFileSplitItemsValEOPage(); + valEOPage.setItemId(itemsExportDto.getId()); + valEOPage.setOrderBy("DISPLAY_SEQ,ID"); + List getValList = sarFileSplitItemsValEOService.queryByList(valEOPage); + List valContentList = sarFileSplitItemsEOService.combineItemValInfo(getValList,allTableList,allImgList,page); + itemsExportDto.setItemValContent(valContentList); + } + } + // 在excel表中添加表头 + HSSFRow row = sheetItems.createRow(0); + sheetItems.setColumnWidth(0,10*256); + sheetItems.setColumnWidth(1,20*256); + sheetItems.setColumnWidth(2,100*256); + sheetItems.setColumnWidth(3,20*256); + sheetItems.setColumnWidth(4,20*256); + sheetItems.setColumnWidth(5,20*256); + sheetItems.setColumnWidth(6,20*256); + sheetItems.setColumnWidth(7,20*256); + sheetItems.setColumnWidth(8,20*256); + sheetItems.setColumnWidth(9,20*256); + + for (int i = 0; i < headers.length; i++) { + HSSFCell cell = row.createCell(i); + HSSFRichTextString text = new HSSFRichTextString(headers[i]); + cell.setCellValue(text); + cell.setCellStyle(cellStyle1); + } + //放文字内容 + int allRow = 0; + for(int rowNum = 0;rowNum < allItemsList.size(); rowNum++){ + FileSplitItemsExportDto exportDto = allItemsList.get(rowNum); + List valList = exportDto.getItemValContent(); + int countFile = 0; + if(valList != null && !valList.isEmpty()){ + int startRow = allRow + 1; + for (int valRow=0;valRow -1) { + content = content.substring(0,content.lastIndexOf("\n")); + } + } + if("TABLE".equals(valList.get(valRow).getValType())){ + /* 连接跳转*/ + CreationHelper createHelper = workbook.getCreationHelper(); + Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.DOCUMENT); + String tableName = "#\'"+ content + "\'!A1"; + hyperlink1.setAddress(tableName); + cell2.setHyperlink(hyperlink1);// 链接 + row1.getCell(2).setCellStyle(cellStyleLink); + } else if ("IMG".equals(valList.get(valRow).getValType())) { + /* 连接跳转*/ + CreationHelper createHelper = workbook.getCreationHelper(); + Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.FILE); + String imgName = content; + hyperlink1.setAddress(imgName); + cell2.setHyperlink(hyperlink1);// 链接 + row1.getCell(2).setCellStyle(cellStyleLink); + } + cell2.setCellValue(content); + + + row1.createCell(3).setCellValue(exportDto.getResponsibleUnitShow()); + row1.getCell(3).setCellStyle(cellStyle); + row1.createCell(4).setCellValue(exportDto.getFoShow()); + row1.getCell(4).setCellStyle(cellStyle); + row1.createCell(5).setCellValue(exportDto.getDutyEngineerShow()); + row1.getCell(5).setCellStyle(cellStyle); + row1.createCell(6).setCellValue(exportDto.getSvpps()); + row1.getCell(6).setCellStyle(cellStyle); + row1.createCell(7).setCellValue(exportDto.getApplyArctic()); + row1.getCell(7).setCellStyle(cellStyle); + row1.createCell(8).setCellValue(exportDto.getClaimTypeShow()); + row1.getCell(8).setCellStyle(cellStyle); + row1.createCell(9).setCellValue(exportDto.getBusStandCover()); + row1.getCell(9).setCellStyle(cellStyle); + + } + if (allRow > startRow) { + sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,0,0)); + sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,1,1)); + sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,3,3)); + sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,4,4)); + sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,5,5)); + sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,6,6)); + sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,7,7)); + sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,8,8)); + sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,9,9)); + } + } else { + allRow++; + HSSFRow row1 = sheetItems.createRow(allRow); + row1.createCell(0).setCellValue(exportDto.getItemsNum()); + row1.getCell(0).setCellStyle(cellStyle); + row1.createCell(1).setCellValue(exportDto.getItemsName()); + row1.getCell(1).setCellStyle(cellStyle); + row1.createCell(2).setCellValue(""); + row1.getCell(2).setCellStyle(cellStyle); + row1.createCell(3).setCellValue(exportDto.getResponsibleUnitShow()); + row1.getCell(3).setCellStyle(cellStyle); + row1.createCell(4).setCellValue(exportDto.getFoShow()); + row1.getCell(4).setCellStyle(cellStyle); + row1.createCell(5).setCellValue(exportDto.getDutyEngineerShow()); + row1.getCell(5).setCellStyle(cellStyle); + row1.createCell(6).setCellValue(exportDto.getSvpps()); + row1.getCell(6).setCellStyle(cellStyle); + row1.createCell(7).setCellValue(exportDto.getApplyArctic()); + row1.getCell(7).setCellStyle(cellStyle); + row1.createCell(8).setCellValue(exportDto.getClaimTypeShow()); + row1.getCell(8).setCellStyle(cellStyle); + row1.createCell(9).setCellValue(exportDto.getBusStandCover()); + row1.getCell(9).setCellStyle(cellStyle); + } + } + if (countMaxFile > 1) { + for (int i=1;i> rowtableList = tableExportDto.getTableEOList(); +// HSSFSheet sheetTable = workbook.createSheet(tableExportDto.getTableName()); + String tableName = tableExportDto.getTableName(); + String tableHtml = tableExportDto.getTableHtCon(); + if (StringUtils.isNotEmpty(tableHtml) && tableHtml.indexOf("") < 0) { + if (tableHtml.indexOf("") < 0) { + tableHtml = tableHtml.replaceFirst("",""); + tableHtml = tableHtml.replaceFirst("",""); + } else { + tableHtml = tableHtml.replaceFirst("",""); + tableHtml = tableHtml.replaceFirst("",""); + } + } + String cnt = "\n"; + tableHtml = tableHtml.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt); + workbook = ConvertHtml2Excel.table2Excel(tableHtml,workbook,tableName); +// for (int r=0;r colTableList = rowtableList.get(r); +// HSSFRow tRow = sheetTable.createRow(colTableList.get(0).getRowNum()-1); +// for(int c=0;c importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file, + SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception { + //验证文件名是否合格 + /* 截取后缀名 */ + sarFileSplitInfoEO.setFileName(file.getOriginalFilename()); + int pos = file.getOriginalFilename().lastIndexOf("."); + String str = file.getOriginalFilename().substring(pos+1).toLowerCase(); + String filenameorg = file.getOriginalFilename().substring(0,pos); + //判断上传文件必须是zip + if (!str.equals("zip")) { + return Result.error("fail", "请上传zip文件"); + } + String path = filePath + "/modal/"+filenameorg; + File saveDirectory = new File(path); + if(!saveDirectory.isDirectory()){ + saveDirectory.mkdir(); + } + FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path +"/"+ file.getOriginalFilename())); + try{ + //解压缩 + String zipEntryName = FileUnZip.unZipFiles(path +"/"+ file.getOriginalFilename(),path); + // 数据相关处理, + // 1.获取其中的Excel, + List excelfilelist = FileUnZip.readExcelFile(zipEntryName); + if(excelfilelist.size()<1){ + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "压缩包内没有上传Excel数据"); + } else if (excelfilelist.size()>1) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "压缩包内有多个Excel数据源"); + } + File excelfile = excelfilelist.get(0); + // 导入参数设置，默认即可 + ImportParams params = new ImportParams(); + try { + String fields[] = {"条款号", "条款名称","内容简介","责任部门", + "FO","责任工程师","SVPPS","适用车辆类型","要求类型","企标覆盖关系"}; + params.setImportFields(fields); + List result = new ArrayList<>(); + // 解析excel，并返回校验信息 + result = ExcelImportUtil.importExcel(excelfile, SarFileSplitItemsImportDto.class, params); + Long getExcelInfo = System.currentTimeMillis(); + //excel读取到的数据 + List datas = result; + if(datas!=null &&!datas.isEmpty()){ + try { + //获取全部sheet页中表格 + Workbook workbook = WorkbookFactory.create(new FileInputStream(excelfile)); + //XSSFWorkbook workbook=new XSSFWorkbook(new FileInputStream(excelfile)); + Sheet sheet=null; + List getSheetTableList = new ArrayList(); + for (int i = 1; i < workbook.getNumberOfSheets(); i++) {//获取每个Sheet表 + sheet = workbook.getSheetAt(i); + SplitTableInfo splitTableInfo = new SplitTableInfo(); + splitTableInfo.setTableName(sheet.getSheetName()); + String tableHtml = POIReadExcelToHtml.readExcelToHtml(workbook,i,false); + splitTableInfo.setTableHtml(tableHtml); + getSheetTableList.add(splitTableInfo); + } + int i = 0 ; + List datasUpdate = new ArrayList<>(); + //2019.05.14 当读取exceL出现空行过多时，空行数为20以上时中断读取，将数据清洗为新的list + for(SarFileSplitItemsImportDto sarStandImportDto :datas){ + if(i>20){ + break; + } + //判断此行数据是否全部为空 + if(checkObjAllFieldsIsNull(sarStandImportDto)){ + i++; + //是则不读取 + continue; + } + i = 0; + datasUpdate.add(sarStandImportDto); + } + String unzipfilepath = zipEntryName; + ResponseMessage message = sarFileSplitItemsEOService.importSplitItems + (datasUpdate,unzipfilepath,sarFileSplitInfoEO,getSheetTableList); + workbook.close(); + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return message; + } catch (Exception e) { + e.printStackTrace(); + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", e.getMessage()); + } + }else{ + + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "没有可导入的数据,请检查!"); + } + } catch (NoSuchElementException e){ + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "没有可导入的数据,请检查!"); + } catch (Exception e) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); + } + } catch (Exception e) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + return Result.error("fail", "读取失败，请严格按照模板文件导入数据"); + } + + } + + @ApiOperation(value = "合并条款") + @PostMapping("/combineItems") + public ResponseMessage combineItems(String ids) throws Exception { + if (StringUtils.isNotBlank(ids)) { + sarFileSplitItemsEOService.combineItems(ids); + return Result.success("0","合并条款成功",ids); + } else { + return Result.error("传入id不能为空"); + } + + } + + /** + * 获取对应条款信息 + * @param standNum + * @param fileType + * @return + */ + @ApiOperation(value = "|SarFileSplitInfoEO|获取所有对应的条款") + @GetMapping("getClauseBySplitId") + public ResponseMessage getClauseBySplitId(String standNum, String fileType, SarFileSplitItemsEOPage page) throws Exception{ + //根据标准号查询标准是否存在 + if (standNum == null) { + return Result.error("标准号不能为空"); + } + List getList = sarStandardsInfoEOService.selectStandardsByStandnumber(standNum,null); + if (getList.size()>0){ + //查询拆分中所有条款信息 + String getSplitItemsList = sarFileSplitInfoEOService.getClauseBySplitId(standNum,fileType); + page.setInfoId(getSplitItemsList); + Map map = sarFileSplitItemsEOService.getByPage(page); + page.getPager().setRowCount((Integer) map.get("count")); + return Result.success(getPageInfo(page.getPager(), (List) map.get("list"))); + } + return Result.error("0", "该条数据标准号在标准库中不存在"); + } + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitMenuEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitMenuEOController.java new file mode 100644 index 00000000..57957edd --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitMenuEOController.java @@ -0,0 +1,150 @@ +package com.adc.da.slrs.standardSplit.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsEODao; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEO; +import com.adc.da.slrs.standardSplit.service.SarFileSplitMenuEOService; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEOPage; +import com.adc.da.slrs.standardSplit.entity.DrageMenuEO; + +@RestController +@RequestMapping("/${restPath}/lawss/sarFileSplitMenu") +@Api(description = "|SarFileSplitMenuEO|") +public class SarFileSplitMenuEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitMenuEOController.class); + + @Autowired + private SarFileSplitMenuEOService sarFileSplitMenuEOService; + + @Autowired + private SarFileSplitItemsEODao sarFileSplitItemsEODao; + + @ApiOperation(value = "|SarFileSplitMenuEO|分页查询") + @GetMapping("/page") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitMenu:page") + public ResponseMessage> page(SarFileSplitMenuEOPage page) throws Exception { + page.setOrderBy("modify_time desc"); + List rows = sarFileSplitMenuEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|查询") + @GetMapping("getSplitMenusByInfoId") + //@RequiresPermissions("lawss:sarFileSplitMenu:list") + public ResponseMessage> list(SarFileSplitMenuEOPage page) throws Exception { + page.setValidFlag("0"); + // page.setOrderBy("regexp_replace(replace('.'||NAME, '.', '.00000000'), '0+([^\\.]{8})', '\\1')"); + page.setOrderBy("display_seq asc"); + List getList = sarFileSplitMenuEOService.queryByList(page); + return Result.success(getList); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|详情") + @GetMapping("/{id}") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitMenu:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(sarFileSplitMenuEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|新增") + @PostMapping("/addMenu") +// @RequiresPermissions("lawss:sarFileSplitMenu:save") + public ResponseMessage create(SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { + sarFileSplitMenuEOService.addMenu(sarFileSplitMenuEO); + return Result.success("0","新增成功",sarFileSplitMenuEO); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|修改") + @PutMapping("/updateMenu") +// @RequiresPermissions("lawss:sarFileSplitMenu:update") + public ResponseMessage update(SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception { + sarFileSplitMenuEOService.updateByPrimaryKeySelective(sarFileSplitMenuEO); + return Result.success("0","修改成功",sarFileSplitMenuEO); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|删除") + @DeleteMapping("/deleteMenu") +// @RequiresPermissions("lawss:sarFileSplitMenu:delete") + public ResponseMessage delete(String id) throws Exception { + sarFileSplitMenuEOService.deleteMenu(id); + return Result.success("0","删除成功",null); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|拖拽节点") + @PostMapping("/dragMenu") + public ResponseMessage dragMenu(@RequestBody DrageMenuEO drageMenuEO) throws Exception { + sarFileSplitMenuEOService.dragMenu(drageMenuEO); + return Result.success("0","修改成功",drageMenuEO); + } + + @ApiOperation(value = "查询子节点") + @PostMapping("/judgequeryMenuByPid") + /*@RequiresPermissions("lawss:sarMenu:judgequeryMenuByPid")*/ + public ResponseMessage judgequeryMenuByPid(SarFileSplitMenuEO sarMenuEO) throws Exception { + return Result.success(sarFileSplitMenuEOService.judgequeryMenuByPid(sarMenuEO)); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|复制节点包括子节点") + @PostMapping("/copyMenu") + public ResponseMessage copyMenu(@RequestBody SarFileSplitMenuEO sarMenuEO) throws Exception { + int result = sarFileSplitMenuEOService.copyMenu(sarMenuEO); + return Result.success("0","复制成功",sarMenuEO); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|复制节点不包括子节点") + @PostMapping("/copyMenuNotChildren") + public ResponseMessage copyMenuNotChildren(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { + int result = sarFileSplitMenuEOService.copyMenuNotChildren(sarFileSplitItemsEO); + return Result.success("0","复制成功",sarFileSplitItemsEO); + } + + @ApiOperation(value = "|SarFileSplitMenuEO|批量复制节点不包括子节点") + @PostMapping("/copyMenuNotChildrenall") + public ResponseMessage> copyMenuNotChildrenall(String ids, String menuids, String infoIds) throws Exception { + + /*int result = sarFileSplitMenuEOService.copyMenuNotChildren(sarFileSplitItemsEO); + return Result.success("0","复制成功",sarFileSplitItemsEO);*/ + String idsl[] = ids.split(","); + List idlist =new ArrayList<>(); + idlist = Arrays.asList(idsl); + + String menuidss[] = menuids.split(","); + List menuidslist =new ArrayList<>(); + menuidslist = Arrays.asList(menuidss); + + + String infoIdss[] = infoIds.split(","); + List infoIdslist =new ArrayList<>(); + infoIdslist = Arrays.asList(infoIdss); + List sarFileSplitItemsEOS = new ArrayList<>(); + for(int i=0;i { private IAttFileEOService attFileEOService; @Autowired private SarStandAttrDetailsEOService sarStandAttrDetailsEOService; + public static final String APPLICATION_JSON_UTF8_VALUE = "application/json;charset=UTF-8"; -// @ApiOperation(value = "|SarStandFileEO|分页查询") -// @GetMapping("/page") + + @ApiOperation(value = "|SarStandFileEO|分页查询") + @GetMapping("/page") + // 401问题2021-03-31暂时注释掉 liuhuiwen + // @RequiresPermissions("lawss:sarStandFile:page") + public ResponseMessage> page(SarStandFileEOPage page) throws Exception { + List rows = sarStandFileEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|SarStandFileEO|查询") + @GetMapping("") //401问题2021-03-31暂时注释掉 liuhuiwen -// @RequiresPermissions("lawss:sarStandFile:page") -// public ResponseMessage> page(SarStandFileEOPage page) throws Exception { -// List rows = sarStandFileEOService.queryByPage(page); -// return Result.success(getPageInfo(page.getPager(), rows)); -// } -// -// @ApiOperation(value = "|SarStandFileEO|查询") -// @GetMapping("") -// //401问题2021-03-31暂时注释掉 liuhuiwen -//// @RequiresPermissions("lawss:sarStandFile:list") -// public ResponseMessage> list(SarStandFileEOPage page) throws Exception { -// return Result.success(sarStandFileEOService.queryByList(page)); -// } -// -// @ApiOperation(value = "|SarStandFileEO|详情") -// @GetMapping("/{id}") -// //401问题2021-03-31暂时注释掉 liuhuiwen -//// @RequiresPermissions("lawss:sarStandFile:get") -// public ResponseMessage find(@PathVariable String id) throws Exception { -// return Result.success(sarStandFileEOService.selectByPrimaryKey(id)); -// } -// -// @ApiOperation(value = "|SarStandFileEO|新增") -// @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) -// //401问题2021-03-31暂时注释掉 liuhuiwen -//// @RequiresPermissions("lawss:sarStandFile:save") -// public ResponseMessage create(@RequestBody SarStandFileEO sarStandFileEO) throws Exception { -// sarStandFileEOService.insertSelective(sarStandFileEO); -// return Result.success(sarStandFileEO); -// } -// -// @ApiOperation(value = "|SarStandFileEO|修改") -// @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) -// //401问题2021-03-31暂时注释掉 liuhuiwen -//// @RequiresPermissions("lawss:sarStandFile:update") -// public ResponseMessage update(@RequestBody SarStandFileEO sarStandFileEO) throws Exception { -// sarStandFileEOService.updateByPrimaryKeySelective(sarStandFileEO); -// return Result.success(sarStandFileEO); -// } -// -// @ApiOperation(value = "|SarStandFileEO|删除") -// @DeleteMapping("/{id}") -// //401问题2021-03-31暂时注释掉 liuhuiwen -//// @RequiresPermissions("lawss:sarStandFile:delete") -// public ResponseMessage delete(@PathVariable String id) throws Exception { -// sarStandFileEOService.deleteByPrimaryKey(id); -// logger.info("delete from SAR_STAND_FILE where id = {}", id); -// return Result.success(); -// } -// -// @ApiOperation(value = "|SarStandFileEO|查询转换后的文档详情") -// @GetMapping("/queryConvertAtt") -// /*@RequiresPermissions("lawss:sarLawsFile:list")*/ -// public ResponseMessage queryConvertAtt(String attId) throws Exception { -// List getList = sarStandFileEOService.selectFileByAttId(attId); -// SarStandFileEO sarBussStandFileEO = new SarStandFileEO(); -// if(getList != null && !getList.isEmpty()){ -// sarBussStandFileEO = getList.get(0); -// AttFileEO attFileEO = attFileEOService.getFileInfo(attId); -// if(attFileEO != null){ -// sarBussStandFileEO.setFileOldName(attFileEO.getOldFileName()); -// } -//// readStandOrLawsLogService.sendReadSOLLog("STAND",sarBussStandFileEO); -// return Result.success(sarBussStandFileEO); -// } else { -// return Result.success(null); -// } -// -// } -// -// @ApiOperation(value = "|SarStandFileEO|分页查询") -// @GetMapping("/getStandFileListByPage") -//// @RequiresPermissions("lawss:sarStandRes:page") -// public ResponseMessage> getStandFileListByPage(SarStandFileEOPage page) throws Exception { -// String suffix = page.getFileSuffix(); -// if (StringUtils.isNotBlank(suffix)) { -// page.setFileSuffixList(suffix.split(",")); -// } -// List rows = sarStandFileEOService.getStandFileListByPage(page); -// if (rows != null && !rows.isEmpty()) { -// for (SarStandFileEO sarStandFileEO : rows) { -// List getField = sarStandAttrDetailsEOService.selectFileFieldForSel(sarStandFileEO.getStandFileClassify()); -// if (getField != null && !getField.isEmpty()) { -// sarStandFileEO.setStandFileClassifyShow(getField.get(0).getLabel()); -// } else { -// sarStandFileEO.setStandFileClassifyShow(null); -// } -// } -// } -// return Result.success(getPageInfo(page.getPager(), rows)); -// } +// @RequiresPermissions("lawss:sarStandFile:list") + public ResponseMessage> list(SarStandFileEOPage page) throws Exception { + return Result.success(sarStandFileEOService.queryByList(page)); + } + + @ApiOperation(value = "|SarStandFileEO|详情") + @GetMapping("/{id}") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarStandFile:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(sarStandFileEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarStandFileEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarStandFile:save") + public ResponseMessage create(@RequestBody SarStandFileEO sarStandFileEO) throws Exception { + sarStandFileEOService.insertSelective(sarStandFileEO); + return Result.success(sarStandFileEO); + } + + @ApiOperation(value = "|SarStandFileEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarStandFile:update") + public ResponseMessage update(@RequestBody SarStandFileEO sarStandFileEO) throws Exception { + sarStandFileEOService.updateByPrimaryKeySelective(sarStandFileEO); + return Result.success(sarStandFileEO); + } + + @ApiOperation(value = "|SarStandFileEO|删除") + @DeleteMapping("/{id}") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarStandFile:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + sarStandFileEOService.deleteByPrimaryKey(id); + logger.info("delete from SAR_STAND_FILE where id = {}", id); + return Result.success(); + } + + @ApiOperation(value = "|SarStandFileEO|查询转换后的文档详情") + @GetMapping("/queryConvertAtt") + /*@RequiresPermissions("lawss:sarLawsFile:list")*/ + public ResponseMessage queryConvertAtt(String attId) throws Exception { + List getList = sarStandFileEOService.selectFileByAttId(attId); + SarStandFileEO sarBussStandFileEO = new SarStandFileEO(); + if(getList != null && !getList.isEmpty()){ + sarBussStandFileEO = getList.get(0); + AttFileEO attFileEO = attFileEOService.getFileInfo(attId); + if(attFileEO != null){ + sarBussStandFileEO.setFileOldName(attFileEO.getOldFileName()); + } +// readStandOrLawsLogService.sendReadSOLLog("STAND",sarBussStandFileEO); + return Result.success(sarBussStandFileEO); + } else { + return Result.success(null); + } + + } + + @ApiOperation(value = "|SarStandFileEO|分页查询") + @GetMapping("/getStandFileListByPage") +// @RequiresPermissions("lawss:sarStandRes:page") + public ResponseMessage> getStandFileListByPage(SarStandFileEOPage page) throws Exception { + String suffix = page.getFileSuffix(); + if (StringUtils.isNotBlank(suffix)) { + page.setFileSuffixList(suffix.split(",")); + } + List rows = sarStandFileEOService.getStandFileListByPage(page); + if (rows != null && !rows.isEmpty()) { + for (SarStandFileEO sarStandFileEO : rows) { + List getField = sarStandAttrDetailsEOService.selectFileFieldForSel(sarStandFileEO.getStandFileClassify()); + if (getField != null && !getField.isEmpty()) { + sarStandFileEO.setStandFileClassifyShow(getField.get(0).getLabel()); + } else { + sarStandFileEO.setStandFileClassifyShow(null); + } + } + } + return Result.success(getPageInfo(page.getPager(), rows)); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java index a3ddb0d7..2d6c75cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java @@ -36,4 +36,19 @@ public interface SarFileSplitItemsEODao extends BaseMapper List queryByOrdersForExport(SarFileSplitItemsEOPage page); List queryByList2(SarFileSplitItemsEOPage page); + + List queryByList(SarFileSplitItemsEOPage page); + + SarFileSplitItemsEO selectByPrimaryKey(String id); + + int insertSelective(SarFileSplitItemsEO sarFileSplitItemsEO); + + int queryByCount(SarFileSplitItemsEOPage page); + + List queryByPage(SarFileSplitItemsEOPage page); + + int updateByPrimaryKeySelective(SarFileSplitItemsEO page); + + int deleteByPrimaryKey(String id); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsParamsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsParamsEODao.java index 9842eb1e..154f3fb8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsParamsEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsParamsEODao.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.standardSplit.dao; import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,4 +26,6 @@ public interface SarFileSplitItemsParamsEODao extends BaseMapper queryItemsParamsByMenuId(@Param("idList") List idList); + List queryByList(SarFileSplitItemsParamsEOPage paramPage); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java index 42c9f66a..e78a0a09 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.standardSplit.dao; import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -33,4 +34,6 @@ public interface SarFileSplitItemsValEODao extends BaseMapper queryItemsValByMenuId(@Param("idList") List idList); + List queryByList(SarFileSplitItemsValEOPage valEOPage); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java index 1592ae36..9ad86e6c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java @@ -1,6 +1,8 @@ package com.adc.da.slrs.standardSplit.dao; +import com.adc.da.base.page.BasePage; import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -47,4 +49,15 @@ public interface SarFileSplitMenuEODao extends BaseMapper { List queryAllChildrenByid(SarFileSplitMenuEO sarFileSplitMenuEO); int deleteByIdList(@Param("idList") List idList); + + int insertSelective(SarFileSplitMenuEO sarFileSplitMenuEO); + + List queryByList(SarFileSplitMenuEOPage page); + + int updateByPrimaryKeySelective(SarFileSplitMenuEO menu); + + SarFileSplitMenuEO selectByPrimaryKey(String id); + + List queryByPage(BasePage page); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandAttrDetailsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandAttrDetailsEODao.java new file mode 100644 index 00000000..aea3e2b6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandAttrDetailsEODao.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.standardSplit.dao; + +import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO; +import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEOPage; +import com.adc.da.sys.common.SelectionResult; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * + *
    + * 功能：SAR_STAND_ATTR_DETAILS SarStandAttrDetailsEODao
    + * 作者：code generator
    + * 日期： 2020-08-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Mapper +public interface SarStandAttrDetailsEODao extends BaseMapper { + + int deleteByIds(@Param("idList") List idList); + + String selectAllFieldToStr(SarStandAttrDetailsEOPage page); + + SarStandAttrDetailsEO selectFieldByName(@Param("attrName") String attrName, @Param("sarType") String sarType); + + String selectNameByField(@Param("attrField") String attrField, @Param("sarType") String sarType); + + List selectFileFieldForSel(@Param("attrField") String attrField); + + List selectFileFieldForSel1(@Param("attrField") String attrField); + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java new file mode 100644 index 00000000..7bdbbe20 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java @@ -0,0 +1,49 @@ +package com.adc.da.slrs.standardSplit.dao; + +import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; +import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import java.util.List; + +/** + * + *
    + * 功能：SAR_STAND_FILE SarStandFileEODao
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Mapper +public interface SarStandFileEODao extends BaseMapper { + List selectFileByStandId(String lawsId); + + List selectFileByAttId(String attId); + + List selectFileByResId(SarStandFileEO sarStandFileEO); + + List selectFileByStandIdAndId(SarStandFileEO sarStandFileEO); + + List selectFileMsgByAttId(String attId); + + int deleteByStandId(String standId); + + int insertForeach(List list); //批量新增 + + List getStandFileListByPage(SarStandFileEOPage stand); + + int queryStandFileListByCount(SarStandFileEOPage stand); + + List queryByPage(SarStandFileEOPage page); + + List queryByList(SarStandFileEOPage page); + + SarStandFileEO selectByPrimaryKey(String id); + + int insertSelective(SarStandFileEO sarStandFileEO); + + int updateByPrimaryKeySelective(SarStandFileEO sarStandFileEO); + + int deleteByPrimaryKey(String id); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandardsInfoEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandardsInfoEODao.java new file mode 100644 index 00000000..21a5b6aa --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandardsInfoEODao.java @@ -0,0 +1,66 @@ +package com.adc.da.slrs.standardSplit.dao; + +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO; +import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * + *
    + * 功能：SAR_STANDARDS_INFO SarStandardsInfoEODao
    + * 作者：code generator
    + * 日期： 2020-08-19
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +@Mapper +public interface SarStandardsInfoEODao extends BaseMapper { + + List getSarStandardsInfoPage(SarStandardsInfoEOPage page); + + int getSarStandardsInfoCount(SarStandardsInfoEOPage page); + + SarStandardsInfoEO selectByPrimaryKeyAndModifyTime(SarStandardsInfoEO page); + + List selectStandardsByStandnumber(SarStandardsInfoEO sarStandardsInfoEO); + + Integer selectStandColumn(@Param("columnName") String columnName); + + Integer selectCounterStandardsCount(SarStandardsInfoEO sarStandardsInfoEO); + + int deleteByPrimaryKeyFlag(String id); + + int updateByStandNum(SarStandardsInfoEO standardsInfoEO); + + List selectStandardsInfoByIdAndRole(SarStandardsInfoEOPage standEO); + + int updateReplacedNumById(SarStandardsInfoEO sarStandardsInfoEO); + + int updateCitedStandById(SarStandardsInfoEO sarStandardsInfoEO); + + List getSarStandardsExportInfo(SarStandardsInfoEOPage page); + + List selectStandardsInfoByKey(String id); + + List selectRecommendStand(SarStandardsInfoEOPage pagenew); + + List countReplaceMsg(@Param("standNum") String standNum); + + List selectStandToUpState(@Param("stateName") String stateName); + + List selectStandToUpRepState(); + + List selectStandToUpRepAndTime(); + + int updateStateById(@Param("state") String state, @Param("list") List list); + + int selectIsExit(@Param("id") String id); + + //添加一个查询标准，但是不判断标准是否删除 + List selectStandardsInfoByIdAndRoleAll(SarStandardsInfoEOPage standEO); + + List selectStandardsInfoBynumber(SarStandardsInfoEOPage page); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSpiltValTableExportDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSpiltValTableExportDto.java new file mode 100644 index 00000000..9c7b9b36 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSpiltValTableExportDto.java @@ -0,0 +1,43 @@ +package com.adc.da.slrs.standardSplit.dto; + +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsTableEO; + +import java.util.List; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/2/14 10:06 + */ +public class FileSpiltValTableExportDto { + + private String tableName; + + 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/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitValImgExportDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitValImgExportDto.java new file mode 100644 index 00000000..1dc3d5e0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitValImgExportDto.java @@ -0,0 +1,29 @@ +package com.adc.da.slrs.standardSplit.dto; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/2/14 15:58 + */ +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/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/SarFileSplitItemsImportDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/SarFileSplitItemsImportDto.java new file mode 100644 index 00000000..754f9ef3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/SarFileSplitItemsImportDto.java @@ -0,0 +1,148 @@ +package com.adc.da.slrs.standardSplit.dto; + +import cn.afterturn.easypoi.excel.annotation.Excel; + +/** + * @Description: + * @Author: yangxuenan + * date: 2020/5/9 14:40 + */ +public class SarFileSplitItemsImportDto { + @Excel(name = "条款号", orderNum = "1") + private String itemsNum; + + @Excel(name = "条款名称", orderNum = "1") + private String itemsName; + + @Excel(name = "内容简介", orderNum = "1") + private String itermsConditions; + + @Excel(name = "责任部门", orderNum = "1") + private String responsibleUnit; + +// @Excel(name = "责任部门", orderNum = "1") + private String newcarPutTime; + + @Excel(name = "FO", orderNum = "1") + private String fo; + + @Excel(name = "责任工程师", orderNum = "1") + private String dutyEngineer; + + @Excel(name = "SVPPS", orderNum = "1") + private String svpps; + + @Excel(name = "适用车辆类型", orderNum = "1") + private String applyArctic; + + @Excel(name = "要求类型", orderNum = "1") + private String claimType; + + @Excel(name = "企标覆盖关系", orderNum = "1") + private String busStandCover; + + + +// @Excel(name = "在产车实施日期", orderNum = "1") +// private Date productPutTime; +// +// @Excel(name = "引用标准", orderNum = "1") +// private String referenceStand; +// +// @Excel(name = "备注", orderNum = "1") +// private String remarks; +// +// @Excel(name = "关联文件", orderNum = "1") +// 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 getResponsibleUnit() { + return responsibleUnit; + } + + public void setResponsibleUnit(String responsibleUnit) { + this.responsibleUnit = responsibleUnit; + } + + public String getNewcarPutTime() { + return newcarPutTime; + } + + public void setNewcarPutTime(String newcarPutTime) { + this.newcarPutTime = newcarPutTime; + } + + public String getFo() { + return fo; + } + + public void setFo(String fo) { + this.fo = fo; + } + + public String getDutyEngineer() { + return dutyEngineer; + } + + public void setDutyEngineer(String dutyEngineer) { + this.dutyEngineer = dutyEngineer; + } + + 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 getClaimType() { + return claimType; + } + + public void setClaimType(String claimType) { + this.claimType = claimType; + } + + public String getBusStandCover() { + return busStandCover; + } + + public void setBusStandCover(String busStandCover) { + this.busStandCover = busStandCover; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/DrageMenuEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/DrageMenuEO.java new file mode 100644 index 00000000..d8ac87c2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/DrageMenuEO.java @@ -0,0 +1,87 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; + +/** + * 功能：MSG_BROWSE_INFO MsgBrowseInfoEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class DrageMenuEO extends BaseEntity { + + private String menuId; + private String menuParentId; + private Long menuDisplay; + private String targetMenuId; + private String targetParentId; + private Long targetMenuDisplay; + private String infoId; + private String moveType; + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String getMenuParentId() { + return menuParentId; + } + + public void setMenuParentId(String menuParentId) { + this.menuParentId = menuParentId; + } + + + + public String getTargetMenuId() { + return targetMenuId; + } + + public void setTargetMenuId(String targetMenuId) { + this.targetMenuId = targetMenuId; + } + + public String getTargetParentId() { + return targetParentId; + } + + public void setTargetParentId(String targetParentId) { + this.targetParentId = targetParentId; + } + + public Long getMenuDisplay() { + return menuDisplay; + } + + public void setMenuDisplay(Long menuDisplay) { + this.menuDisplay = menuDisplay; + } + + public Long getTargetMenuDisplay() { + return targetMenuDisplay; + } + + public void setTargetMenuDisplay(Long targetMenuDisplay) { + this.targetMenuDisplay = targetMenuDisplay; + } + + public String getInfoId() { + return infoId; + } + + public void setInfoId(String infoId) { + this.infoId = infoId; + } + + public String getMoveType() { + return moveType; + } + + public void setMoveType(String moveType) { + this.moveType = moveType; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarCompStatusInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarCompStatusInfoEO.java new file mode 100644 index 00000000..7f5ecab5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarCompStatusInfoEO.java @@ -0,0 +1,423 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * 功能：SAR_COMP_STATUS_INFO SarCompStatusInfoEOEntity
    + * 作者：code generator
    + * 日期： 2021-02-04
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarCompStatusInfoEO extends BaseEntity { + + private String id; + private String sarType; + private String sarId; + private String sarItemId; + private String sarState; + private String sarItemState; + private String prcNum; + private String color; + private String prcState; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date creationTime; + private String nonConfomity; + private String current;//我司现状 + private String changeScheme;//更改方案 + private String estimatedChangeCycle; + private String estimatedCost; + private String riskPoint; + private String verificationScheme; + private String justified; + private String compPerson; + private String compPersonName; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date compTime; + private String state; + private String sarNumber; + private String sarItemNumber; + private String standId; + private String standType; + private String standCode; + private String standName; + private String createType; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • sarType -> sar_type
    • + *
  • sarId -> sar_id
    • + *
  • sarItemId -> sar_item_id
    • + *
  • sarState -> sar_state
    • + *
  • sarItemState -> sar_item_state
    • + *
  • prcNum -> prc_num
    • + *
  • color -> color
    • + *
  • prcState -> prc_state
    • + *
  • creationTime -> creation_time
    • + *
  • nonConfomity -> non_confomity
    • + *
  • current -> current
    • + *
  • changeScheme -> change_scheme
    • + *
  • estimatedChangeCycle -> estimated_change_cycle
    • + *
  • estimatedCost -> estimated_cost
    • + *
  • riskPoint -> risk_point
    • + *
  • verificationScheme -> verification_scheme
    • + *
  • justified -> justified
    • + *
  • compPerson -> comp_person
    • + *
  • compTime -> comp_time
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) return null; + switch (fieldName) { + case "id": return "id"; + case "sarType": return "sar_type"; + case "sarId": return "sar_id"; + case "sarItemId": return "sar_item_id"; + case "sarState": return "sar_state"; + case "sarItemState": return "sar_item_state"; + case "prcNum": return "prc_num"; + case "color": return "color"; + case "prcState": return "prc_state"; + case "creationTime": return "creation_time"; + case "nonConfomity": return "non_confomity"; + case "current": return "current"; + case "changeScheme": return "change_scheme"; + case "estimatedChangeCycle": return "estimated_change_cycle"; + case "estimatedCost": return "estimated_cost"; + case "riskPoint": return "risk_point"; + case "verificationScheme": return "verification_scheme"; + case "justified": return "justified"; + case "compPerson": return "comp_person"; + case "compTime": return "comp_time"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • sar_type -> sarType
    • + *
  • sar_id -> sarId
    • + *
  • sar_item_id -> sarItemId
    • + *
  • sar_state -> sarState
    • + *
  • sar_item_state -> sarItemState
    • + *
  • prc_num -> prcNum
    • + *
  • color -> color
    • + *
  • prc_state -> prcState
    • + *
  • creation_time -> creationTime
    • + *
  • non_confomity -> nonConfomity
    • + *
  • current -> current
    • + *
  • change_scheme -> changeScheme
    • + *
  • estimated_change_cycle -> estimatedChangeCycle
    • + *
  • estimated_cost -> estimatedCost
    • + *
  • risk_point -> riskPoint
    • + *
  • verification_scheme -> verificationScheme
    • + *
  • justified -> justified
    • + *
  • comp_person -> compPerson
    • + *
  • comp_time -> compTime
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) return null; + switch (columnName) { + case "id": return "id"; + case "sar_type": return "sarType"; + case "sar_id": return "sarId"; + case "sar_item_id": return "sarItemId"; + case "sar_state": return "sarState"; + case "sar_item_state": return "sarItemState"; + case "prc_num": return "prcNum"; + case "color": return "color"; + case "prc_state": return "prcState"; + case "creation_time": return "creationTime"; + case "non_confomity": return "nonConfomity"; + case "current": return "current"; + case "change_scheme": return "changeScheme"; + case "estimated_change_cycle": return "estimatedChangeCycle"; + case "estimated_cost": return "estimatedCost"; + case "risk_point": return "riskPoint"; + case "verification_scheme": return "verificationScheme"; + case "justified": return "justified"; + case "comp_person": return "compPerson"; + case "comp_time": return "compTime"; + default: return null; + } + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + /** **/ + public String getSarType() { + return this.sarType; + } + + /** **/ + public void setSarType(String sarType) { + this.sarType = sarType; + } + + /** **/ + public String getSarId() { + return this.sarId; + } + + /** **/ + public void setSarId(String sarId) { + this.sarId = sarId; + } + + /** **/ + public String getSarItemId() { + return this.sarItemId; + } + + /** **/ + public void setSarItemId(String sarItemId) { + this.sarItemId = sarItemId; + } + + /** **/ + public String getSarState() { + return this.sarState; + } + + /** **/ + public void setSarState(String sarState) { + this.sarState = sarState; + } + + /** **/ + public String getSarItemState() { + return this.sarItemState; + } + + /** **/ + public void setSarItemState(String sarItemState) { + this.sarItemState = sarItemState; + } + + /** **/ + public String getPrcNum() { + return this.prcNum; + } + + /** **/ + public void setPrcNum(String prcNum) { + this.prcNum = prcNum; + } + + /** **/ + public String getColor() { + return this.color; + } + + /** **/ + public void setColor(String color) { + this.color = color; + } + + /** **/ + public String getPrcState() { + return this.prcState; + } + + /** **/ + public void setPrcState(String prcState) { + this.prcState = prcState; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public String getNonConfomity() { + return this.nonConfomity; + } + + /** **/ + public void setNonConfomity(String nonConfomity) { + this.nonConfomity = nonConfomity; + } + + /** **/ + public String getCurrent() { + return this.current; + } + + /** **/ + public void setCurrent(String current) { + this.current = current; + } + + /** **/ + public String getChangeScheme() { + return this.changeScheme; + } + + /** **/ + public void setChangeScheme(String changeScheme) { + this.changeScheme = changeScheme; + } + + /** **/ + public String getEstimatedChangeCycle() { + return this.estimatedChangeCycle; + } + + /** **/ + public void setEstimatedChangeCycle(String estimatedChangeCycle) { + this.estimatedChangeCycle = estimatedChangeCycle; + } + + /** **/ + public String getEstimatedCost() { + return this.estimatedCost; + } + + /** **/ + public void setEstimatedCost(String estimatedCost) { + this.estimatedCost = estimatedCost; + } + + /** **/ + public String getRiskPoint() { + return this.riskPoint; + } + + /** **/ + public void setRiskPoint(String riskPoint) { + this.riskPoint = riskPoint; + } + + /** **/ + public String getVerificationScheme() { + return this.verificationScheme; + } + + /** **/ + public void setVerificationScheme(String verificationScheme) { + this.verificationScheme = verificationScheme; + } + + /** **/ + public String getJustified() { + return this.justified; + } + + /** **/ + public void setJustified(String justified) { + this.justified = justified; + } + + /** **/ + public String getCompPerson() { + return this.compPerson; + } + + /** **/ + public void setCompPerson(String compPerson) { + this.compPerson = compPerson; + } + + /** **/ + public Date getCompTime() { + return this.compTime; + } + + /** **/ + public void setCompTime(Date compTime) { + this.compTime = compTime; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getSarNumber() { + return sarNumber; + } + + public void setSarNumber(String sarNumber) { + this.sarNumber = sarNumber; + } + + public String getSarItemNumber() { + return sarItemNumber; + } + + public void setSarItemNumber(String sarItemNumber) { + this.sarItemNumber = sarItemNumber; + } + + public String getStandId() { + return standId; + } + + public void setStandId(String standId) { + this.standId = standId; + } + + public String getStandType() { + return standType; + } + + public void setStandType(String standType) { + this.standType = standType; + } + + public String getStandCode() { + return standCode; + } + + public void setStandCode(String standCode) { + this.standCode = standCode; + } + + public String getStandName() { + return standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String getCompPersonName() { + return compPersonName; + } + + public void setCompPersonName(String compPersonName) { + this.compPersonName = compPersonName; + } + + public String getCreateType() { + return createType; + } + + public void setCreateType(String createType) { + this.createType = createType; + } + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsParamsEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsParamsEOPage.java new file mode 100644 index 00000000..98dd0384 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsParamsEOPage.java @@ -0,0 +1,194 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEOPage
    + * 作者：code generator
    + * 日期： 2020-02-04
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsParamsEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String itemId; + private String itemIdOperator = "="; + private String description; + private String descriptionOperator = "="; + private String figure; + private String figureOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + 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/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEOPage.java new file mode 100644 index 00000000..b03b9c7b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEOPage.java @@ -0,0 +1,230 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：SAR_FILE_SPLIT_ITEMS_VAL SarFileSplitItemsValEOPage
    + * 作者：code generator
    + * 日期： 2020-01-07
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitItemsValEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String type; + private String typeOperator = "="; + private String itemId; + private String itemIdOperator = "="; + private String itemContent; + private String itemContentOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationUser; + private String creationUserOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String modifyUser; + 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/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitMenuEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitMenuEOPage.java new file mode 100644 index 00000000..273090a6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitMenuEOPage.java @@ -0,0 +1,248 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：SAR_FILE_SPLIT_MENU SarFileSplitMenuEOPage
    + * 作者：code generator
    + * 日期： 2020-01-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarFileSplitMenuEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String infoId; + private String infoIdOperator = "="; + private String name; + private String nameOperator = "="; + private String pId; + private String pIdOperator = "="; + private String displaySeq; + private String displaySeqOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String remarks; + private String remarksOperator = "="; + private String creationUser; + 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/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandAttrDetailsEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandAttrDetailsEOPage.java new file mode 100644 index 00000000..92e15eb7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandAttrDetailsEOPage.java @@ -0,0 +1,301 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：SAR_STAND_ATTR_DETAILS SarStandAttrDetailsEOPage
    + * 作者：code generator
    + * 日期： 2020-08-17
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarStandAttrDetailsEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String attrField; + private String attrFieldOperator = "="; + private String attrName; + private String attrNameOperator = "="; + private String attrType; + private String attrTypeOperator = "="; + private String orderNum; + private String orderNumOperator = "="; + private String isEdit; + private String isEditOperator = "="; + private String creationUser; + private String creationUserOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String attrLen; + private String attrLenOperator = "="; + private String[] idList; + private String notId; + private String sarType; + private String isSearch; + private String isWarn; + private String isShow; + + 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 getAttrField() { + return this.attrField; + } + + public void setAttrField(String attrField) { + this.attrField = attrField; + } + + public String getAttrFieldOperator() { + return this.attrFieldOperator; + } + + public void setAttrFieldOperator(String attrFieldOperator) { + this.attrFieldOperator = attrFieldOperator; + } + + public String getAttrName() { + return this.attrName; + } + + public void setAttrName(String attrName) { + this.attrName = attrName; + } + + public String getAttrNameOperator() { + return this.attrNameOperator; + } + + public void setAttrNameOperator(String attrNameOperator) { + this.attrNameOperator = attrNameOperator; + } + + public String getAttrType() { + return this.attrType; + } + + public void setAttrType(String attrType) { + this.attrType = attrType; + } + + public String getAttrTypeOperator() { + return this.attrTypeOperator; + } + + public void setAttrTypeOperator(String attrTypeOperator) { + this.attrTypeOperator = attrTypeOperator; + } + + public String getOrderNum() { + return this.orderNum; + } + + public void setOrderNum(String orderNum) { + this.orderNum = orderNum; + } + + public String getOrderNumOperator() { + return this.orderNumOperator; + } + + public void setOrderNumOperator(String orderNumOperator) { + this.orderNumOperator = orderNumOperator; + } + + public String getIsEdit() { + return this.isEdit; + } + + public void setIsEdit(String isEdit) { + this.isEdit = isEdit; + } + + public String getIsEditOperator() { + return this.isEditOperator; + } + + public void setIsEditOperator(String isEditOperator) { + this.isEditOperator = isEditOperator; + } + + 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 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 getAttrLen() { + return this.attrLen; + } + + public void setAttrLen(String attrLen) { + this.attrLen = attrLen; + } + + public String getAttrLenOperator() { + return this.attrLenOperator; + } + + public void setAttrLenOperator(String attrLenOperator) { + this.attrLenOperator = attrLenOperator; + } + + public String[] getIdList() { + return idList; + } + + public void setIdList(String[] idList) { + this.idList = idList; + } + + public String getNotId() { + return notId; + } + + public void setNotId(String notId) { + this.notId = notId; + } + + public String getSarType() { + return sarType; + } + + public void setSarType(String sarType) { + this.sarType = sarType; + } + + public String getIsSearch() { + return isSearch; + } + + public void setIsSearch(String isSearch) { + this.isSearch = isSearch; + } + + public String getIsWarn() { + return isWarn; + } + + public void setIsWarn(String isWarn) { + this.isWarn = isWarn; + } + + public String getIsShow() { + return isShow; + } + + public void setIsShow(String isShow) { + this.isShow = isShow; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java index b0613ba5..02332e62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java @@ -1,6 +1,6 @@ package com.adc.da.slrs.standardSplit.entity; -import com.adc.da.base.entity.BaseEntity; +import com.adc.da.base.page.BasePage; /** * 功能：SAR_STAND_FILE SarStandFileEOPage
    @@ -8,7 +8,7 @@ import com.adc.da.base.entity.BaseEntity; * 日期： 2018-09-03
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ -public class SarStandFileEOPage extends BaseEntity { +public class SarStandFileEOPage extends BasePage { private String modifyTime; private String modifyTime1; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java new file mode 100644 index 00000000..5d924914 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java @@ -0,0 +1,486 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; +import java.util.List; + +/** + * 功能：SAR_STAND_ITEMS SarStandItemsEOEntity
    + * 作者：code generator
    + * 日期： 2018-09-03
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarStandItemsEO extends BaseEntity { + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + private String creationUser; + private Integer validFlag; + private String remarks; + private String responsibleUnit; + private String energyKind; + private String applyArctic; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date tackTime; + private String parts; + private String itemsName; + private String itemsNum; + private String standId; + private String id; + private String emergyKindShow; + private String applyArcticShow; + private String responsibleUnitShow; + private String termsConditions; //条款要求 + private String mainPointImplementation; //实施要点 + //新加字段 + private String fo;//FO + private String foUser;//FO + private String dutyEngineer;//责任工程师 + private String svpps;//SVPPS + private String claimType;//要求类型 + private String busStandCover;//企标覆盖关系 + private String fileType;//文件类型 + //新加字段带show + private String foShow;//FO + private String dutyEngineerShow;//责任工程师 + private String svppsShow;//SVPPS + private String claimTypeShow;//要求类型 + private String busStandCoverShow;//企标覆盖关系 + private String fileTypeShow;//文件类型 + private String itemState;//条款状态 + private List idList; + private String oldId; + private String jspg; + private SarCompStatusInfoEO pgForm; + + private String menuId; + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modifyTime -> modify_time
    • + *
  • creationTime -> creation_time
    • + *
  • creationUser -> creation_user
    • + *
  • validFlag -> valid_flag
    • + *
  • remarks -> remarks
    • + *
  • responsibleUnit -> responsible_unit
    • + *
  • energyKind -> energy_kind
    • + *
  • applyArctic -> apply_arctic
    • + *
  • tackTime -> tack_time
    • + *
  • parts -> parts
    • + *
  • itemsName -> items_name
    • + *
  • itemsNum -> items_num
    • + *
  • standId -> stand_id
    • + *
  • id -> id
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null){ return null;} + switch (fieldName) { + case "modifyTime": return "modify_time"; + case "creationTime": return "creation_time"; + case "creationUser": return "creation_user"; + case "validFlag": return "valid_flag"; + case "remarks": return "remarks"; + case "responsibleUnit": return "responsible_unit"; + case "energyKind": return "energy_kind"; + case "applyArctic": return "apply_arctic"; + case "tackTime": return "tack_time"; + case "parts": return "parts"; + case "itemsName": return "items_name"; + case "itemsNum": return "items_num"; + case "standId": return "stand_id"; + case "id": return "id"; + case "termsConditions": return "terms_conditions"; + case "mainPointImplementation": return "MAINPOINTS_IMPEMENTATION"; + case "fo": return "fo"; + case "dutyEngineer": return "duty_engineer"; + case "svpps": return "svpps"; + case "claimType": return "claim_type"; + case "busStandCover": return "bus_stand_cover"; + case "fileType": return "file_type"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • modify_time -> modifyTime
    • + *
  • creation_time -> creationTime
    • + *
  • creation_user -> creationUser
    • + *
  • valid_flag -> validFlag
    • + *
  • remarks -> remarks
    • + *
  • responsible_unit -> responsibleUnit
    • + *
  • energy_kind -> energyKind
    • + *
  • apply_arctic -> applyArctic
    • + *
  • tack_time -> tackTime
    • + *
  • parts -> parts
    • + *
  • items_name -> itemsName
    • + *
  • items_num -> itemsNum
    • + *
  • stand_id -> standId
    • + *
  • id -> id
    • + */ + public static String columnToField(String columnName) { + if (columnName == null){ return null;} + switch (columnName) { + case "modify_time": return "modifyTime"; + case "creation_time": return "creationTime"; + case "creation_user": return "creationUser"; + case "valid_flag": return "validFlag"; + case "remarks": return "remarks"; + case "responsible_unit": return "responsibleUnit"; + case "energy_kind": return "energyKind"; + case "apply_arctic": return "applyArctic"; + case "tack_time": return "tackTime"; + case "parts": return "parts"; + case "items_name": return "itemsName"; + case "items_num": return "itemsNum"; + case "stand_id": return "standId"; + case "id": return "id"; + case "terms_conditions": return "termsConditions"; + case "MAINPOINTS_IMPEMENTATION": return "mainPointImplementation"; + case "fo": return "fo"; + case "duty_engineer": return "dutyEngineer"; + case "svpps": return "svpps"; + case "claim_type": return "claimType"; + case "bus_stand_cover": return "busStandCover"; + case "file_type": return "fileType"; + default: return null; + } + } + + /** **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** **/ + public Date getCreationTime() { + return this.creationTime; + } + + /** **/ + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + /** **/ + public String getCreationUser() { + return this.creationUser; + } + + /** **/ + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + /** **/ + public Integer getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + /** **/ + public String getRemarks() { + return this.remarks; + } + + /** **/ + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + /** **/ + public String getResponsibleUnit() { + return this.responsibleUnit; + } + + /** **/ + public void setResponsibleUnit(String responsibleUnit) { + this.responsibleUnit = responsibleUnit; + } + + /** **/ + public String getEnergyKind() { + return this.energyKind; + } + + /** **/ + public void setEnergyKind(String energyKind) { + this.energyKind = energyKind; + } + + /** **/ + public String getApplyArctic() { + return this.applyArctic; + } + + /** **/ + public void setApplyArctic(String applyArctic) { + this.applyArctic = applyArctic; + } + + /** **/ + public Date getTackTime() { + return this.tackTime; + } + + /** **/ + public void setTackTime(Date tackTime) { + this.tackTime = tackTime; + } + + /** **/ + public String getParts() { + return this.parts; + } + + /** **/ + public void setParts(String parts) { + this.parts = parts; + } + + /** **/ + public String getItemsName() { + return this.itemsName; + } + + /** **/ + public void setItemsName(String itemsName) { + this.itemsName = itemsName; + } + + /** **/ + public String getItemsNum() { + return this.itemsNum; + } + + /** **/ + public void setItemsNum(String itemsNum) { + this.itemsNum = itemsNum; + } + + /** **/ + public String getStandId() { + return this.standId; + } + + /** **/ + public void setStandId(String standId) { + this.standId = standId; + } + + /** **/ + public String getId() { + return this.id; + } + + /** **/ + public void setId(String id) { + this.id = id; + } + + public String getResponsibleUnitShow() { + return responsibleUnitShow; + } + + public void setResponsibleUnitShow(String responsibleUnitShow) { + this.responsibleUnitShow = responsibleUnitShow; + } + + public String getEmergyKindShow() { + return emergyKindShow; + } + + public void setEmergyKindShow(String emergyKindShow) { + this.emergyKindShow = emergyKindShow; + } + + public String getApplyArcticShow() { + return applyArcticShow; + } + + public void setApplyArcticShow(String applyArcticShow) { + this.applyArcticShow = applyArcticShow; + } + + public String getTermsConditions() { + return termsConditions; + } + + public void setTermsConditions(String termsConditions) { + this.termsConditions = termsConditions; + } + + public String getMainPointImplementation() { + return mainPointImplementation; + } + + public void setMainPointImplementation(String mainPointImplementation) { + this.mainPointImplementation = mainPointImplementation; + } + + public String getFo() { + return fo; + } + + public void setFo(String fo) { + this.fo = fo; + } + + public String getDutyEngineer() { + return dutyEngineer; + } + + public void setDutyEngineer(String dutyEngineer) { + this.dutyEngineer = dutyEngineer; + } + + public String getSvpps() { + return svpps; + } + + public void setSvpps(String svpps) { + this.svpps = svpps; + } + + public String getClaimType() { + return claimType; + } + + public void setClaimType(String claimType) { + this.claimType = claimType; + } + + public String getBusStandCover() { + return busStandCover; + } + + public void setBusStandCover(String busStandCover) { + this.busStandCover = busStandCover; + } + + public String getFileType() { + return fileType; + } + + public void setFileType(String fileType) { + this.fileType = fileType; + } + + public String getFoShow() { + return foShow; + } + + public void setFoShow(String foShow) { + this.foShow = foShow; + } + + public String getDutyEngineerShow() { + return dutyEngineerShow; + } + + public void setDutyEngineerShow(String dutyEngineerShow) { + this.dutyEngineerShow = dutyEngineerShow; + } + + public String getSvppsShow() { + return svppsShow; + } + + public void setSvppsShow(String svppsShow) { + this.svppsShow = svppsShow; + } + + public String getClaimTypeShow() { + return claimTypeShow; + } + + public void setClaimTypeShow(String claimTypeShow) { + this.claimTypeShow = claimTypeShow; + } + + public String getBusStandCoverShow() { + return busStandCoverShow; + } + + public void setBusStandCoverShow(String busStandCoverShow) { + this.busStandCoverShow = busStandCoverShow; + } + + public String getFileTypeShow() { + return fileTypeShow; + } + + public void setFileTypeShow(String fileTypeShow) { + this.fileTypeShow = fileTypeShow; + } + + public List getIdList() { + return idList; + } + + public void setIdList(List idList) { + this.idList = idList; + } + + public String getItemState() { + return itemState; + } + + public void setItemState(String itemState) { + this.itemState = itemState; + } + + public String getJspg() { + return jspg; + } + + public void setJspg(String jspg) { + this.jspg = jspg; + } + + public SarCompStatusInfoEO getPgForm() { + return pgForm; + } + + public void setPgForm(SarCompStatusInfoEO pgForm) { + this.pgForm = pgForm; + } + + public String getOldId() { + return oldId; + } + + public void setOldId(String oldId) { + this.oldId = oldId; + } + + public String getFoUser() { + return foUser; + } + + public void setFoUser(String foUser) { + this.foUser = foUser; + } + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandardsInfoEO.java new file mode 100644 index 00000000..d459967c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandardsInfoEO.java @@ -0,0 +1,588 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.sys.entity.DicTypeEO; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.*; + +/** + * 功能：SAR_STANDARDS_INFO SarStandardsInfoEOEntity
    + * 作者：code generator
    + * 日期： 2020-08-19
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarStandardsInfoEO extends BaseEntity { + + private String id; + private String standType; + private String country; + private String standSort; + private String standNumber; + private String standYear; + private String standName; + private String standEnName; + private String standState; + private String standNature; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String issueTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date putTime; + private String synopsis; + private String replaceStandNum; + private String replacedStandNum; + private String creationUser; + private String validFlag; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date creationTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date modifyTime; + private String isRelateAccess; + // 以下为非表中字段 + private String collectId; // 收藏表ID + private String countryShow; //国家地区显示名称 + private String standSortShow; // 标准类别显示名称 + private String standStateShow; // 标准状态显示名称 + private String standNatureShow; // 标准性质显示名称 + private String sychronId; // 同步数据ID + private List dicTypeList = new ArrayList(); // 记录标准涉及到的所有数据字典数据 + private Map attrInfoMap = new LinkedHashMap<>(); //属性表字段与值 + private String sarStandAttrEOStr; //新增修改时属性表信息 + private String menuId; //目录ID + private int upReplaceNumFlag; //记录是否修改了替代文件号 + private int upNumFlag; //记录是否修改了文件号 + private List attrInfoList = new ArrayList<>(); + private String fileIds; //全部文件ID + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date newCarPutTime; + private List itemsList = new ArrayList<>(); + private String citeStand;//引用标准 + private String citedStand;//被引用标准 + private String relateStand;//对应其他标准 + private String accessCountry;//纳入清单的国家 + private String processNum;//流程编号 + private String textStatus;//文本状态 +// 在库里的标准节点类型（工作组） + private String menuType; + private String allPutTime; + private String jspg; + private SarCompStatusInfoEO pgForm; + private String CHJL; + private String puttime; + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • standType -> stand_type
    • + *
  • country -> country
    • + *
  • standSort -> stand_sort
    • + *
  • standNumber -> stand_number
    • + *
  • standYear -> stand_year
    • + *
  • standName -> stand_name
    • + *
  • standEnName -> stand_en_name
    • + *
  • standState -> stand_state
    • + *
  • standNature -> stand_nature
    • + *
  • issueTime -> issue_time
    • + *
  • putTime -> put_time
    • + *
  • synopsis -> synopsis
    • + *
  • replaceStandNum -> replace_stand_num
    • + *
  • replacedStandNum -> replaced_stand_num
    • + *
  • creationUser -> creation_user
    • + *
  • 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 "standType": return "stand_type"; + case "country": return "country"; + case "standSort": return "stand_sort"; + case "standNumber": return "stand_number"; + case "standYear": return "stand_year"; + case "standName": return "stand_name"; + case "standEnName": return "stand_en_name"; + case "standState": return "stand_state"; + case "standNature": return "stand_nature"; + case "issueTime": return "issue_time"; + case "putTime": return "put_time"; + case "synopsis": return "synopsis"; + case "replaceStandNum": return "replace_stand_num"; + case "replacedStandNum": return "replaced_stand_num"; + case "creationUser": return "creation_user"; + case "validFlag": return "valid_flag"; + case "creationTime": return "creation_time"; + case "modifyTime": return "modify_time"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • stand_type -> standType
    • + *
  • country -> country
    • + *
  • stand_sort -> standSort
    • + *
  • stand_number -> standNumber
    • + *
  • stand_year -> standYear
    • + *
  • stand_name -> standName
    • + *
  • stand_en_name -> standEnName
    • + *
  • stand_state -> standState
    • + *
  • stand_nature -> standNature
    • + *
  • issue_time -> issueTime
    • + *
  • put_time -> putTime
    • + *
  • synopsis -> synopsis
    • + *
  • replace_stand_num -> replaceStandNum
    • + *
  • replaced_stand_num -> replacedStandNum
    • + *
  • creation_user -> creationUser
    • + *
  • 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_type": return "standType"; + case "country": return "country"; + case "stand_sort": return "standSort"; + case "stand_number": return "standNumber"; + case "stand_year": return "standYear"; + case "stand_name": return "standName"; + case "stand_en_name": return "standEnName"; + case "stand_state": return "standState"; + case "stand_nature": return "standNature"; + case "issue_time": return "issueTime"; + case "put_time": return "putTime"; + case "synopsis": return "synopsis"; + case "replace_stand_num": return "replaceStandNum"; + case "replaced_stand_num": return "replacedStandNum"; + case "creation_user": return "creationUser"; + 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 getStandType() { + return this.standType; + } + + /** **/ + public void setStandType(String standType) { + this.standType = standType; + } + + /** **/ + public String getCountry() { + return this.country; + } + + /** **/ + public void setCountry(String country) { + this.country = country; + } + + /** **/ + public String getStandSort() { + return this.standSort; + } + + /** **/ + public void setStandSort(String standSort) { + this.standSort = standSort; + } + + /** **/ + public String getStandNumber() { + return this.standNumber; + } + + /** **/ + public void setStandNumber(String standNumber) { + this.standNumber = standNumber; + } + + /** **/ + public String getStandYear() { + return this.standYear; + } + + /** **/ + public void setStandYear(String standYear) { + this.standYear = standYear; + } + + /** **/ + public String getStandName() { + return this.standName; + } + + /** **/ + public void setStandName(String standName) { + this.standName = standName; + } + + /** **/ + public String getStandEnName() { + return this.standEnName; + } + + /** **/ + public void setStandEnName(String standEnName) { + this.standEnName = standEnName; + } + + /** **/ + public String getStandState() { + return this.standState; + } + + /** **/ + public void setStandState(String standState) { + this.standState = standState; + } + + /** **/ + public String getStandNature() { + return this.standNature; + } + + /** **/ + public void setStandNature(String standNature) { + this.standNature = standNature; + } + + /** **/ + public String getIssueTime() { + return this.issueTime; + } + + /** **/ + public void setIssueTime(String issueTime) { + this.issueTime = issueTime; + } + + /** **/ + public Date getPutTime() { + return this.putTime; + } + + /** **/ + public void setPutTime(Date putTime) { + this.putTime = putTime; + } + + public String getSynopsis() { + return synopsis; + } + + public void setSynopsis(String synopsis) { + this.synopsis = synopsis; + } + + public String getReplaceStandNum() { + return replaceStandNum; + } + + public void setReplaceStandNum(String replaceStandNum) { + this.replaceStandNum = replaceStandNum; + } + + /** **/ + public String getReplacedStandNum() { + return this.replacedStandNum; + } + + /** **/ + public void setReplacedStandNum(String replacedStandNum) { + this.replacedStandNum = replacedStandNum; + } + + /** **/ + public String getCreationUser() { + return this.creationUser; + } + + /** **/ + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + /** **/ + public String getValidFlag() { + return this.validFlag; + } + + /** **/ + public void setValidFlag(String 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 getCollectId() { + return collectId; + } + + public void setCollectId(String collectId) { + this.collectId = collectId; + } + + public String getCountryShow() { + return countryShow; + } + + public void setCountryShow(String countryShow) { + this.countryShow = countryShow; + } + + public String getStandSortShow() { + return standSortShow; + } + + public void setStandSortShow(String standSortShow) { + this.standSortShow = standSortShow; + } + + public String getStandStateShow() { + return standStateShow; + } + + public void setStandStateShow(String standStateShow) { + this.standStateShow = standStateShow; + } + + public String getStandNatureShow() { + return standNatureShow; + } + + public void setStandNatureShow(String standNatureShow) { + this.standNatureShow = standNatureShow; + } + + public String getSychronId() { + return sychronId; + } + + public void setSychronId(String sychronId) { + this.sychronId = sychronId; + } + + public List getDicTypeList() { + return dicTypeList; + } + + public void setDicTypeList(List dicTypeList) { + this.dicTypeList = dicTypeList; + } + + public Map getAttrInfoMap() { + return attrInfoMap; + } + + public void setAttrInfoMap(Map attrInfoMap) { + this.attrInfoMap = attrInfoMap; + } + + public String getSarStandAttrEOStr() { + return sarStandAttrEOStr; + } + + public void setSarStandAttrEOStr(String sarStandAttrEOStr) { + this.sarStandAttrEOStr = sarStandAttrEOStr; + } + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public int getUpReplaceNumFlag() { + return upReplaceNumFlag; + } + + public void setUpReplaceNumFlag(int upReplaceNumFlag) { + this.upReplaceNumFlag = upReplaceNumFlag; + } + + public int getUpNumFlag() { + return upNumFlag; + } + + public void setUpNumFlag(int upNumFlag) { + this.upNumFlag = upNumFlag; + } + + public List getAttrInfoList() { + return attrInfoList; + } + + public void setAttrInfoList(List attrInfoList) { + this.attrInfoList = attrInfoList; + } + + public String getFileIds() { + return fileIds; + } + + public void setFileIds(String fileIds) { + this.fileIds = fileIds; + } + + public Date getNewCarPutTime() { + return newCarPutTime; + } + + public void setNewCarPutTime(Date newCarPutTime) { + this.newCarPutTime = newCarPutTime; + } + + public String getIsRelateAccess() { + return isRelateAccess; + } + + public void setIsRelateAccess(String isRelateAccess) { + this.isRelateAccess = isRelateAccess; + } + + public List getItemsList() { + return itemsList; + } + + public void setItemsList(List itemsList) { + this.itemsList = itemsList; + } + + public String getCiteStand() { + return citeStand; + } + + public void setCiteStand(String citeStand) { + this.citeStand = citeStand; + } + + public String getCitedStand() { + return citedStand; + } + + public void setCitedStand(String citedStand) { + this.citedStand = citedStand; + } + + public String getAccessCountry() { + return accessCountry; + } + + public void setAccessCountry(String accessCountry) { + this.accessCountry = accessCountry; + } + + public String getProcessNum() { + return processNum; + } + + public void setProcessNum(String processNum) { + this.processNum = processNum; + } + + public String getTextStatus() { + return textStatus; + } + + public void setTextStatus(String textStatus) { + this.textStatus = textStatus; + } + + public String getMenuType() { + return menuType; + } + + public void setMenuType(String menuType) { + this.menuType = menuType; + } + + public String getRelateStand() { + return relateStand; + } + + public void setRelateStand(String relateStand) { + this.relateStand = relateStand; + } + + public String getAllPutTime() { + return allPutTime; + } + + public void setAllPutTime(String allPutTime) { + this.allPutTime = allPutTime; + } + + public String getJspg() { + return jspg; + } + + public void setJspg(String jspg) { + this.jspg = jspg; + } + + public SarCompStatusInfoEO getPgForm() { + return pgForm; + } + + public void setPgForm(SarCompStatusInfoEO pgForm) { + this.pgForm = pgForm; + } + + public String getCHJL() { + return CHJL; + } + + public void setCHJL(String CHJL) { + this.CHJL = CHJL; + } + + public String getPuttime() { + return puttime; + } + + public void setPuttime(String puttime) { + this.puttime = puttime; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandardsInfoEOPage.java new file mode 100644 index 00000000..3a5bb959 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandardsInfoEOPage.java @@ -0,0 +1,651 @@ +package com.adc.da.slrs.standardSplit.entity; + +import com.adc.da.base.page.BasePage; +import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; + +import java.util.List; +import java.util.Map; + +/** + * 功能：SAR_STANDARDS_INFO SarStandardsInfoEOPage
    + * 作者：code generator
    + * 日期： 2020-08-19
    + * 版权所有：版权归北京卡达克数据技术中心所有。
    + */ +public class SarStandardsInfoEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String standType; + private String standTypeOperator = "="; + private String country; + private String countryOperator = "="; + private String standSort; + private String standSortOperator = "="; + private String standNumber; + private String standNumberOperator = "="; + private String standYear; + private String standYearOperator = "="; + private String standName; + private String standNameOperator = "="; + private String standEnName; + private String standEnNameOperator = "="; + private String standState; + private String standStateOperator = "="; + private String standNature; + private String standNatureOperator = "="; + private String issueTime; + private String issueTime1; + private String issueTime2; + private String issueTimeOperator = "="; + private String putTime; + private String putTime1; + private String putTime2; + private String putTimeOperator = "="; + private String synopsis; + private String synopsisOperator = "="; + private String replaceStandNum; + private String replaceStandNumOperator = "="; + private String replacedStandNum; + private String replacedStandNumOperator = "="; + private String creationUser; + private String creationUserOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String isRelateAccess; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private List menuRoleList; //有权限的目录 + private String[] idlist; //多个id + private String menuId; //目录ID + private String rootMenuId; + private String attrSearchStr; + private String advanceSearchStr; + private Map attrSearchMap; //属性表数据条件查询 + // 树结构增加搜索条件 + private String collectMenuId; + private String labelMenuId; + private String applyArctic; + private String ids; + private List replaceStandNumList; + private List menuAllChildrenIdList; + private List advanceSearchVOList; + private String advanceSearchVOStr; + private String proType; // 请求的流程类型 + private String userId; + private String productId; + private Integer nowOrder; + private Integer nowOrderBy; + private String orderBy1 = "SAR_STANDARDS_INFO.issue_time"; + private String order1 = "desc"; + private String isNumYear; + + 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 getStandType() { + return this.standType; + } + + public void setStandType(String standType) { + this.standType = standType; + } + + public String getStandTypeOperator() { + return this.standTypeOperator; + } + + public void setStandTypeOperator(String standTypeOperator) { + this.standTypeOperator = standTypeOperator; + } + + public String getCountry() { + return this.country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getCountryOperator() { + return this.countryOperator; + } + + public void setCountryOperator(String countryOperator) { + this.countryOperator = countryOperator; + } + + public String getStandSort() { + return this.standSort; + } + + public void setStandSort(String standSort) { + this.standSort = standSort; + } + + public String getStandSortOperator() { + return this.standSortOperator; + } + + public void setStandSortOperator(String standSortOperator) { + this.standSortOperator = standSortOperator; + } + + public String getStandNumber() { + return this.standNumber; + } + + public void setStandNumber(String standNumber) { + this.standNumber = standNumber; + } + + public String getStandNumberOperator() { + return this.standNumberOperator; + } + + public void setStandNumberOperator(String standNumberOperator) { + this.standNumberOperator = standNumberOperator; + } + + public String getStandYear() { + return this.standYear; + } + + public void setStandYear(String standYear) { + this.standYear = standYear; + } + + public String getStandYearOperator() { + return this.standYearOperator; + } + + public void setStandYearOperator(String standYearOperator) { + this.standYearOperator = standYearOperator; + } + + public String getStandName() { + return this.standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String getStandNameOperator() { + return this.standNameOperator; + } + + public void setStandNameOperator(String standNameOperator) { + this.standNameOperator = standNameOperator; + } + + public String getStandEnName() { + return this.standEnName; + } + + public void setStandEnName(String standEnName) { + this.standEnName = standEnName; + } + + public String getStandEnNameOperator() { + return this.standEnNameOperator; + } + + public void setStandEnNameOperator(String standEnNameOperator) { + this.standEnNameOperator = standEnNameOperator; + } + + public String getStandState() { + return this.standState; + } + + public void setStandState(String standState) { + this.standState = standState; + } + + public String getStandStateOperator() { + return this.standStateOperator; + } + + public void setStandStateOperator(String standStateOperator) { + this.standStateOperator = standStateOperator; + } + + public String getStandNature() { + return this.standNature; + } + + public void setStandNature(String standNature) { + this.standNature = standNature; + } + + public String getStandNatureOperator() { + return this.standNatureOperator; + } + + public void setStandNatureOperator(String standNatureOperator) { + this.standNatureOperator = standNatureOperator; + } + + public String getIssueTime() { + return this.issueTime; + } + + public void setIssueTime(String issueTime) { + this.issueTime = issueTime; + } + + public String getIssueTime1() { + return this.issueTime1; + } + + public void setIssueTime1(String issueTime1) { + this.issueTime1 = issueTime1; + } + + public String getIssueTime2() { + return this.issueTime2; + } + + public void setIssueTime2(String issueTime2) { + this.issueTime2 = issueTime2; + } + + public String getIssueTimeOperator() { + return this.issueTimeOperator; + } + + public void setIssueTimeOperator(String issueTimeOperator) { + this.issueTimeOperator = issueTimeOperator; + } + + public String getPutTime() { + return this.putTime; + } + + public void setPutTime(String putTime) { + this.putTime = putTime; + } + + public String getPutTime1() { + return this.putTime1; + } + + public void setPutTime1(String putTime1) { + this.putTime1 = putTime1; + } + + public String getPutTime2() { + return this.putTime2; + } + + public void setPutTime2(String putTime2) { + this.putTime2 = putTime2; + } + + public String getPutTimeOperator() { + return this.putTimeOperator; + } + + public void setPutTimeOperator(String putTimeOperator) { + this.putTimeOperator = putTimeOperator; + } + + public String getSynopsis() { + return this.synopsis; + } + + public void setSynopsis(String synopsis) { + this.synopsis = synopsis; + } + + public String getSynopsisOperator() { + return this.synopsisOperator; + } + + public void setSynopsisOperator(String synopsisOperator) { + this.synopsisOperator = synopsisOperator; + } + + public String getReplaceStandNum() { + return this.replaceStandNum; + } + + public void setReplaceStandNum(String replaceStandNum) { + this.replaceStandNum = replaceStandNum; + } + + public String getReplaceStandNumOperator() { + return this.replaceStandNumOperator; + } + + public void setReplaceStandNumOperator(String replaceStandNumOperator) { + this.replaceStandNumOperator = replaceStandNumOperator; + } + + public String getReplacedStandNum() { + return this.replacedStandNum; + } + + public void setReplacedStandNum(String replacedStandNum) { + this.replacedStandNum = replacedStandNum; + } + + public String getReplacedStandNumOperator() { + return this.replacedStandNumOperator; + } + + public void setReplacedStandNumOperator(String replacedStandNumOperator) { + this.replacedStandNumOperator = replacedStandNumOperator; + } + + 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 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 List getMenuRoleList() { + return menuRoleList; + } + + public void setMenuRoleList(List menuRoleList) { + this.menuRoleList = menuRoleList; + } + + public String[] getIdlist() { + return idlist; + } + + public void setIdlist(String[] idlist) { + this.idlist = idlist; + } + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String getRootMenuId() { + return rootMenuId; + } + + public void setRootMenuId(String rootMenuId) { + this.rootMenuId = rootMenuId; + } + + public Map getAttrSearchMap() { + return attrSearchMap; + } + + public void setAttrSearchMap(Map attrSearchMap) { + this.attrSearchMap = attrSearchMap; + } + + public String getCollectMenuId() { + return collectMenuId; + } + + public void setCollectMenuId(String collectMenuId) { + this.collectMenuId = collectMenuId; + } + + public String getLabelMenuId() { + return labelMenuId; + } + + public void setLabelMenuId(String labelMenuId) { + this.labelMenuId = labelMenuId; + } + + public String getAttrSearchStr() { + return attrSearchStr; + } + + public void setAttrSearchStr(String attrSearchStr) { + this.attrSearchStr = attrSearchStr; + } + + public String getApplyArctic() { + return applyArctic; + } + + public void setApplyArctic(String applyArctic) { + this.applyArctic = applyArctic; + } + + public List getReplaceStandNumList() { + return replaceStandNumList; + } + + public void setReplaceStandNumList(List replaceStandNumList) { + this.replaceStandNumList = replaceStandNumList; + } + + public String getIsRelateAccess() { + return isRelateAccess; + } + + public void setIsRelateAccess(String isRelateAccess) { + this.isRelateAccess = isRelateAccess; + } + + public String getIds() { + return ids; + } + + public void setIds(String ids) { + this.ids = ids; + } + + public String getAdvanceSearchStr() { + return advanceSearchStr; + } + + public void setAdvanceSearchStr(String advanceSearchStr) { + this.advanceSearchStr = advanceSearchStr; + } + + public List getAdvanceSearchVOList() { + return advanceSearchVOList; + } + + public void setAdvanceSearchVOList(List advanceSearchVOList) { + this.advanceSearchVOList = advanceSearchVOList; + } + + public String getAdvanceSearchVOStr() { + return advanceSearchVOStr; + } + + public void setAdvanceSearchVOStr(String advanceSearchVOStr) { + this.advanceSearchVOStr = advanceSearchVOStr; + } + + public List getMenuAllChildrenIdList() { + return menuAllChildrenIdList; + } + + public void setMenuAllChildrenIdList(List menuAllChildrenIdList) { + this.menuAllChildrenIdList = menuAllChildrenIdList; + } + + public String getProType() { + return proType; + } + + public void setProType(String proType) { + this.proType = proType; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getProductId() { + return productId; + } + + public void setProductId(String productId) { + this.productId = productId; + } + + + public String getOrderBy1() { + return orderBy1; + } + + public void setOrderBy1(String orderBy1) { + this.orderBy1 = orderBy1; + } + + + public String getOrder1() { + return order1; + } + + public void setOrder1(String order1) { + this.order1 = order1; + } + + public Integer getNowOrder() { + return nowOrder; + } + + public void setNowOrder(Integer nowOrder) { + this.nowOrder = nowOrder; + } + + + public void setNowOrderBy(Integer nowOrderBy) { + this.nowOrderBy = nowOrderBy; + } + + public Integer getNowOrderBy() { + return nowOrderBy; + } + + public String getIsNumYear() { + return isNumYear; + } + + public void setIsNumYear(String isNumYear) { + this.isNumYear = isNumYear; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java index 6b63e22c..f54ed2ad 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java @@ -28,4 +28,6 @@ public interface SarFileSplitInfoEOService { int deleteByIds(String ids); PersonMsgEO updateNew(PersonMsgEO val) throws Exception; + + String getClauseBySplitId(String standNum, String fileType); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java new file mode 100644 index 00000000..f2e0da79 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java @@ -0,0 +1,49 @@ +package com.adc.da.slrs.standardSplit.service; + +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.common.SplitTableInfo; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO; +import com.adc.da.slrs.standardSplit.dto.*; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO; +import com.adc.da.util.http.ResponseMessage; + +import java.io.IOException; +import java.util.List; +import java.util.Map; + +public interface SarFileSplitItemsEOService { + + Map getByPage(SarFileSplitItemsEOPage page); + + List queryByList(SarFileSplitItemsEOPage page); + + SarFileSplitItemsEO selectByPrimaryKey(String id); + + int insertSelective(SarFileSplitItemsEO sarFileSplitItemsEO); + + int updateItemContent(SarFileSplitItemsEO sarFileSplitItemsEO); + + int deleteByPrimaryKey(String id); + + int batchDeleteItems(String ids); + + boolean judgeContaintChilds(String ids); + + List queryByOrdersForExport(SarFileSplitItemsEOPage page); + + List combineItemValInfo(List getValList,List + allTableList,List allImgList,SarFileSplitItemsEOPage page); + + void downLoadImgList(List allImgList,String fileNowPath) throws IOException; + + void downLoadFileList(List attfileEo, String fileNowPath) throws IOException ; + + ResponseMessage importSplitItems(List datasUpdate, + String unzipfilepath, SarFileSplitInfoEO sarFileSplitInfoEO, + List getSheetTableList); + + void combineItems(String ids); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsParamsEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsParamsEOService.java new file mode 100644 index 00000000..414a4daa --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsParamsEOService.java @@ -0,0 +1,11 @@ +package com.adc.da.slrs.standardSplit.service; + +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEOPage; + +import java.util.List; + +public interface SarFileSplitItemsParamsEOService { + + List queryByList(SarFileSplitItemsParamsEOPage paramPage); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsTableEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsTableEOService.java new file mode 100644 index 00000000..ddb59151 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsTableEOService.java @@ -0,0 +1,4 @@ +package com.adc.da.slrs.standardSplit.service; + +public interface SarFileSplitItemsTableEOService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java new file mode 100644 index 00000000..60aa46ac --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java @@ -0,0 +1,11 @@ +package com.adc.da.slrs.standardSplit.service; + +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage; + +import java.util.List; + +public interface SarFileSplitItemsValEOService { + + List queryByList(SarFileSplitItemsValEOPage valEOPage); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java new file mode 100644 index 00000000..84ec8397 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java @@ -0,0 +1,33 @@ +package com.adc.da.slrs.standardSplit.service; + +import com.adc.da.base.page.BasePage; +import com.adc.da.slrs.standardSplit.entity.DrageMenuEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEOPage; +import java.util.List; + +public interface SarFileSplitMenuEOService { + + List queryByPage(BasePage page); + + List queryByList(SarFileSplitMenuEOPage page); + + SarFileSplitMenuEO selectByPrimaryKey(String id); + + int addMenu(SarFileSplitMenuEO sarFileSplitMenuEO); + + int updateByPrimaryKeySelective(SarFileSplitMenuEO sarFileSplitMenuEO); + + void deleteMenu(String id); + + int dragMenu(DrageMenuEO drageMenuEO); + + boolean judgequeryMenuByPid(SarFileSplitMenuEO sarMenuEO) throws Exception; + + int copyMenu (SarFileSplitMenuEO sarMenuEO); + + int copyMenuNotChildren(SarFileSplitItemsEO sarFileSplitItemsEO); + + String addMenuForImport(SarFileSplitMenuEO sarFileSplitMenuEO); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandAttrDetailsEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandAttrDetailsEOService.java index 3dc46951..fa9d59ed 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandAttrDetailsEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandAttrDetailsEOService.java @@ -1,4 +1,10 @@ package com.adc.da.slrs.standardSplit.service; +import com.adc.da.sys.common.SelectionResult; + +import java.util.List; + public interface SarStandAttrDetailsEOService { + + List selectFileFieldForSel(String attrField); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java index 5063a985..daee26b8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java @@ -1,4 +1,25 @@ package com.adc.da.slrs.standardSplit.service; +import com.adc.da.base.page.BasePage; +import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; +import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; +import java.util.List; + public interface SarStandFileEOService { + + List getStandFileListByPage(SarStandFileEOPage stand); + + List queryByPage(SarStandFileEOPage page); + + List queryByList(SarStandFileEOPage page); + + SarStandFileEO selectByPrimaryKey(String id) throws Exception; + + int insertSelective(SarStandFileEO sarStandFileEO) throws Exception; + + int updateByPrimaryKeySelective(SarStandFileEO sarStandFileEO) throws Exception; + + int deleteByPrimaryKey(String id) throws Exception; + + List selectFileByAttId(String attId) throws Exception; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandardsInfoEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandardsInfoEOService.java new file mode 100644 index 00000000..3c6bb4b6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandardsInfoEOService.java @@ -0,0 +1,10 @@ +package com.adc.da.slrs.standardSplit.service; + +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO; + +import java.util.List; + +public interface SarStandardsInfoEOService { + + List selectStandardsByStandnumber(String standNum, String val); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/MenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/MenuServiceImpl.java index eb0140e3..52fea74f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/MenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/MenuServiceImpl.java @@ -10,6 +10,6 @@ import org.springframework.transaction.annotation.Transactional; @Service @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class MenuServiceImpl implements MenuService { - private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(MenuServiceImpl.class); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 101d92a5..d49d5d84 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -70,6 +70,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService private PersonCollectEODao personCollectEODao; @Autowired private SarFileSplitItemsParamsEODao sarFileSplitItemsParamsEODao; + @Autowired + private SarFileSplitInfoEODao dao; @Override public List queryByPage(BasePage page) throws Exception{ @@ -659,4 +661,14 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService return null; } + @Override + public String getClauseBySplitId(String standNum, String fileType) { + SarFileSplitInfoEOPage sarFileSplitInfoEOPage = new SarFileSplitInfoEOPage(); + sarFileSplitInfoEOPage.setNumOrName(standNum); + sarFileSplitInfoEOPage.setFileType(fileType); + sarFileSplitInfoEOPage.setSplitStatus("2"); + List rows = dao.queryByPageOwn(sarFileSplitInfoEOPage); + return rows.get(0).getId(); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java new file mode 100644 index 00000000..427b113e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -0,0 +1,988 @@ +package com.adc.da.slrs.standardSplit.service.impl; + +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.att.vo.AttFileVo; +import com.adc.da.common.FileUnZip; +import com.adc.da.common.SplitTableInfo; +import com.adc.da.login.util.UserUtils; +import com.adc.da.slrs.standardSplit.dao.*; +import com.adc.da.slrs.standardSplit.dto.*; +import com.adc.da.slrs.standardSplit.entity.*; +import com.adc.da.slrs.standardSplit.service.SarFileSplitInfoEOService; +import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsEOService; +import com.adc.da.slrs.standardSplit.service.SarFileSplitMenuEOService; +import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +import com.adc.da.sys.dao.DicTypeEODao; +import com.adc.da.sys.dao.RoleEODao; +import com.adc.da.sys.entity.DicTypeEO; +import com.adc.da.sys.util.LoginUserUtil; +import com.adc.da.sys.util.UUIDUtils; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import com.adc.da.utils.treetool.Tree; +import com.adc.da.utils.treetool.TreeNode; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.*; + +import static com.adc.da.utils.util.ExcelUtil.checkObjAllFieldsIsNull; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOService { + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsEOServiceImpl.class); + + @Autowired + private SarFileSplitMenuEOService sarFileSplitMenuEOService; + @Autowired + private SarFileSplitItemsEODao dao; + @Autowired + private SarFileSplitItemsParamsEODao sarFileSplitItemsParamsEODao; + @Autowired + private SarFileSplitItemsValEODao sarFileSplitItemsValEODao; + @Autowired + private SysInfoEOService sysInfoEOService; + @Autowired + private SarFileSplitMenuEODao sarFileSplitMenuEODao; + @Autowired + private SarFileSplitItemsTableEODao sarFileSplitItemsTableEODao; + @Autowired + private SarFileSplitItemsEODao sarFileSplitItemsEODao; + @Autowired + private DicTypeEODao dicTypeEODao; + @Value("${file.path}") + private String uploadFilePath; + @Autowired + private RoleEODao roleEODao; + @Autowired + private IAttFileEOService attFileEOService; + @Autowired + private SarFileSplitInfoEOService sarFileSplitInfoEOService; + + + @Override + public Map getByPage(SarFileSplitItemsEOPage page) { + page.setValidFlag("0"); + page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) { + List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage()); + Tree tree = new Tree<>(sarFileSplitMenuEOList); + TreeNode treeNode = tree.getTreeNode(page.getMenuId()); + + List menuIds = new ArrayList<>(); + menuIds.add(treeNode.getNodeId()); + for (TreeNode node : treeNode.getAllChildren()) { + menuIds.add(node.getNodeId()); + } + page.setMenuIdList(menuIds); + } + int count = dao.queryByCount(page); + List rows = dao.queryByPage(page); + if (rows != null && !rows.isEmpty()) { + for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { + //查询svpps + String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps()); + sarFileSplitItemsEO.setSvppsShow(svppsShow); + SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage(); + paramPage.setItemId(sarFileSplitItemsEO.getId()); + List paramList = sarFileSplitItemsParamsEODao.queryByList(paramPage); + sarFileSplitItemsEO.setParamsList(paramList); + String foName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getFo()); + sarFileSplitItemsEO.setFoShow(foName); + //TODO 2021年6月17日 补充责任部门和项目评估角色回显时如果时多个时回显为空的情况 + String dutyEngineerName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getDutyEngineer()); + sarFileSplitItemsEO.setDutyEngineerShow(dutyEngineerName); + //责任部门多个时 + String orgNames = sysInfoEOService.getOrgNamesByIds(sarFileSplitItemsEO.getResponsibleUnit()); + sarFileSplitItemsEO.setResponsibleUnitShow(orgNames); + } + + } + Map map = new HashMap<>(); + map.put("list",rows); + map.put("count",count); + return map; + } + + @Override + public List queryByList(SarFileSplitItemsEOPage page) { + return dao.queryByList(page); + } + + @Override + public SarFileSplitItemsEO selectByPrimaryKey(String id) { + return dao.selectByPrimaryKey(id); + } + + @Override + public int insertSelective(SarFileSplitItemsEO sarFileSplitItemsEO) { + return dao.insertSelective(sarFileSplitItemsEO); + } + + @Override + public int updateItemContent(SarFileSplitItemsEO sarFileSplitItemsEO) { + List getValList = sarFileSplitItemsEO.getItemValEOList(); + String itemConditions = ""; + String userId = UserUtils.getUserId(); + int resultCount = 0; + //修改特殊参数要求信息 + updateParamsContent(sarFileSplitItemsEO); + //修改条款要求内容 + if (getValList != null && !getValList.isEmpty()) { + String delIds = sarFileSplitItemsEO.getDelItemIds(); + List itemValIds = new ArrayList<>(); + //删除VAL表前台删掉的条目信息 + if (StringUtils.isNotEmpty(delIds)) { + String[] delArr = delIds.split(","); + SarFileSplitItemsValEO delEO = new SarFileSplitItemsValEO(); + delEO.setIdList(delArr); + if (delArr != null && delArr.length > 0) { + sarFileSplitItemsValEODao.deleteByIds(delEO); + //删除table表数据 + itemValIds = new ArrayList<>(Arrays.asList(delArr)); + } + } + //向val表更新数据 + int ind = 1; + List addValList = new ArrayList<>(); + List updateValList = new ArrayList<>(); + for (SarFileSplitItemsValEO valEO : getValList) { + // 当前段内容 + String valContent = ""; + if ("TEXT".equals(valEO.getType())) { + valContent = "

    " + valEO.getItemContent() + "

    "; + } else if ("IMG".equals(valEO.getType())) { + valContent = valEO.getItemContent() ; + //\" + } else if ("TABLE".equals(valEO.getType())) { + valContent = valEO.getItemContent(); + } + itemConditions += valContent; + // val表信息 + if (StringUtils.isNotEmpty(valEO.getId())) { + valEO.setDisplaySeq(ind); + valEO.setModifyTime(new Date()); + valEO.setModifyUser(userId); + updateValList.add(valEO); + itemValIds.add(valEO.getId()); +// sarFileSplitItemsValEODao.updateByPrimaryKeySelective(valEO); + } else { + valEO.setId(UUIDUtils.randomUUID20()); + valEO.setDisplaySeq(ind); + valEO.setValidFlag(0); + valEO.setCreationTime(new Date()); + valEO.setModifyTime(new Date()); + valEO.setCreationUser(userId); + valEO.setModifyUser(userId); + addValList.add(valEO); + } + ind++; + } + if (addValList != null && !addValList.isEmpty()) { + sarFileSplitItemsValEODao.insertForeach(addValList); + } + if (updateValList != null && !updateValList.isEmpty()) { + for(SarFileSplitItemsValEO s : updateValList){ + sarFileSplitItemsValEODao.updateForeach(Arrays.asList(s)); + } + } + sarFileSplitItemsEO.setItermsConditions(itemConditions); + resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); + } else { + sarFileSplitItemsEO.setItermsConditions(""); + resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); + // 删除val表全部信息 + sarFileSplitItemsValEODao.deleteByitemId(sarFileSplitItemsEO.getId()); + } + return resultCount; + } + + /** + * @Author yangxuenan + * @Description 修改特殊参数要求内容 + * Date 2020/2/4 15:56 + * @Param [sarFileSplitItemsEO] + * @return void + **/ + public void updateParamsContent(SarFileSplitItemsEO sarFileSplitItemsEO){ + List itemList = new ArrayList<>(); + itemList.add(sarFileSplitItemsEO.getId()); + sarFileSplitItemsParamsEODao.deleteByItemIds(itemList); + List paramList = sarFileSplitItemsEO.getParamsList(); + if(paramList != null && !paramList.isEmpty()){ + for(SarFileSplitItemsParamsEO paramsEO : paramList){ + paramsEO.setId(UUIDUtils.randomUUID20()); + paramsEO.setItemId(sarFileSplitItemsEO.getId()); + paramsEO.setInfoId(sarFileSplitItemsEO.getInfoId()); + paramsEO.setValidFlag(0); + paramsEO.setCreationTime(new Date()); + paramsEO.setModifyTime(new Date()); + } + sarFileSplitItemsParamsEODao.insertForeach(paramList); + } + } + + @Override + public int deleteByPrimaryKey(String id) { + return dao.deleteByPrimaryKey(id); + } + + @Override + public int batchDeleteItems(String ids) { + String[] itemIds = ids.split(","); + List idList = Arrays.asList(itemIds); + // 查到对应menu + List getMenuList = dao.queryByItemsIds(idList); + List getAllItemList = new ArrayList<>(); + List menuIdList = new ArrayList<>(); + List allItemIdList = new ArrayList<>(); + int result = 0; + if (getMenuList != null && !getMenuList.isEmpty()) { + for(SarFileSplitItemsEO splitItemsEO : getMenuList){ + menuIdList.add(splitItemsEO.getMenuId()); + List menuList = sarFileSplitMenuEODao.getChild(splitItemsEO.getMenuId()); + menuIdList.addAll(menuList); + } + if(!menuIdList.isEmpty()){ + for(String menuId:menuIdList){ + List rows = dao.queryItemsByMenuId(menuId); + getAllItemList.addAll(rows); + } + } + if (!getAllItemList.isEmpty()) { + for (SarFileSplitItemsEO itemsEO : getAllItemList) { + if (!allItemIdList.contains(itemsEO.getId())) { + allItemIdList.add(itemsEO.getId()); + } + } + // 删除menu表数据 + sarFileSplitMenuEODao.deleteByIdList(menuIdList); + // 删除val表数据 + sarFileSplitItemsValEODao.deleteValByitemIds(allItemIdList); + //删除table数据 + sarFileSplitItemsTableEODao.deleteByitemIds(allItemIdList); + //删除特殊参数要求params表数据 + sarFileSplitItemsParamsEODao.deleteByItemIds(allItemIdList); + //删除res表数据 +// sarFileSplitItemsResEODao.deleteByItemIds(allItemIdList); + //删除file表数据 +// sarFileSplitItemsFileEODao.deleteByItemIds(allItemIdList); + result = dao.deleteByItemsIdList(allItemIdList); + }else if(!idList.isEmpty()){//菜单被删掉了，数据当时被保留下来的 + allItemIdList.clear(); + allItemIdList.addAll(idList); + // 删除val表数据 + sarFileSplitItemsValEODao.deleteValByitemIds(allItemIdList); + //删除table数据 + sarFileSplitItemsTableEODao.deleteByitemIds(allItemIdList); + //删除特殊参数要求params表数据 + sarFileSplitItemsParamsEODao.deleteByItemIds(allItemIdList); + result = dao.deleteByItemsIdList(allItemIdList); + } + } + return result; + } + + @Override + public boolean judgeContaintChilds(String ids) { + String[] itemIds = ids.split(","); + List idList = Arrays.asList(itemIds); + // 查到对应menu + List getMenuList = dao.queryByItemsIds(idList); + if (getMenuList != null && !getMenuList.isEmpty()) { + for (SarFileSplitItemsEO splitItemsEO : getMenuList) { + SarFileSplitMenuEO sarMenuEO = new SarFileSplitMenuEO(); + sarMenuEO.setId(splitItemsEO.getMenuId()); + List list = sarFileSplitMenuEODao.queryByPidExcpetSelf(sarMenuEO); + if(list != null && !list.isEmpty()){ + return false; + } + } + } + return true; + } + + @Override + public List queryByOrdersForExport(SarFileSplitItemsEOPage page) { + List list = sarFileSplitItemsEODao.queryByOrdersForExport(page); + + for (FileSplitItemsExportDto data:list) { + //查询svpps + String svppsShow = sysInfoEOService.getSvppsNamesByIds(data.getSvpps()); + data.setSvpps(svppsShow); + List getDicType = dicTypeEODao.getDicTypeByDicCode("ENERGYTYPES"); + List getDicType1 = dicTypeEODao.getDicTypeByDicCode("BZFGGXOUIUJ"); + getDicType.addAll(getDicType1); + for (DicTypeEO dicTypeEO:getDicType) { + if (dicTypeEO.getDicTypeCode().equals(data.getApplyArctic())){ + data.setApplyArctic(dicTypeEO.getDicTypeName()); + } + if (dicTypeEO.getDicTypeCode().equals(data.getBusStandCover())){ + data.setBusStandCover(dicTypeEO.getDicTypeName()); + } + } + } + return list; + } + + @Override + public List combineItemValInfo(List getValList, List allTableList, List allImgList, SarFileSplitItemsEOPage page) { + int tableIndex = page.getTableIndex(); + int imgIndex = page.getImgIndex(); + List valContent = new ArrayList<>(); + if (getValList != null && !getValList.isEmpty()) { + String preType = ""; + for(SarFileSplitItemsValEO itemsValEO : getValList){ + String type = itemsValEO.getType(); + FileSplitValExportDto lastOne = new FileSplitValExportDto(); + lastOne.setValType(type); + if(preType.equals(type) && "TEXT".equals(type)) { + lastOne = valContent.get(valContent.size() - 1); + lastOne.setValContent(lastOne.getValContent()+itemsValEO.getItemContent() + "\n"); + valContent.set(valContent.size() - 1, lastOne); + } else if ("TEXT".equals(type)) { + lastOne.setValContent(lastOne.getValContent()+itemsValEO.getItemContent() + "\n"); + valContent.add(lastOne); + } else if ("TABLE".equals(type)) { + String tableName = String.valueOf(tableIndex); + lastOne.setValContent("tableSheet" + tableName); + //查询table信息 + SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); + tablePage.setItemsValId(itemsValEO.getId()); + valContent.add(lastOne); +// List> tableList = combineTableList(itemsValEO); + FileSpiltValTableExportDto tableExportDto = new FileSpiltValTableExportDto(); + tableExportDto.setTableName("tableSheet" + tableName); +// tableExportDto.setTableEOList(tableList); + tableExportDto.setTableHtCon(itemsValEO.getItemContent()); + allTableList.add(tableExportDto); + tableIndex++; + page.setTableIndex(tableIndex); + } else if ("IMG".equals(type)) { + String imgContent = itemsValEO.getItemContent(); + String imgUUIndex = "img" + String.valueOf(imgIndex); + if (StringUtils.isNotEmpty(imgContent)){ + int pathIndex = imgContent.indexOf("src='uploadPath"); + if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) { + String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2); + String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length()); + lastOne.setValContent(imgUUIndex+".png"); + valContent.add(lastOne); + FileSplitValImgExportDto fileSplitValImgExportDto = new FileSplitValImgExportDto(); + fileSplitValImgExportDto.setImgName(imgUUIndex+".png"); + if (StringUtils.isNotEmpty(itemsValEO.getImgName())) { + fileSplitValImgExportDto.setImgPath(itemsValEO.getImgName()); + } else { + fileSplitValImgExportDto.setImgPath(imgPath); + } + allImgList.add(fileSplitValImgExportDto); + imgIndex++; + page.setImgIndex(imgIndex); + } + } + } + preType = itemsValEO.getType(); + } + } + return valContent; + } + + @Override + public void downLoadImgList(List allImgList, String fileNowPath) throws IOException { + for(FileSplitValImgExportDto imgExportDto : allImgList){ + String oldPath = uploadFilePath+ "/" + imgExportDto.getImgPath(); + String newPath = fileNowPath + "/" + imgExportDto.getImgName(); + File oldFile = new File(oldPath); + if (oldFile.exists()){ + copyFile1(oldPath, newPath); + } + } + } + + @Override + public void downLoadFileList(List attfileEo, String fileNowPath) throws IOException { + for(AttFileEO fileExportDto : attfileEo){ + String oldPath = uploadFilePath+ "/" + fileExportDto.getFilePath() + fileExportDto.getFileName(); + String newPath = fileNowPath + "/" + fileExportDto.getOldFileName(); + File oldFile = new File(oldPath); + if (oldFile.exists()){ + copyFile1(oldPath, newPath); + } + } + } + + @Override + @Transactional + public ResponseMessage importSplitItems(List list, String filepath, + SarFileSplitInfoEO sarFileSplitInfoEO, List getSheetTableList) { + //此处需要做各种验证，数据库操作 + try { + String infoId = null; + if (StringUtils.isNotBlank(sarFileSplitInfoEO.getInfoId())){ + infoId = sarFileSplitInfoEO.getInfoId(); + sarFileSplitInfoEO.setInfoId(null); + }else { + infoId = UUIDUtils.randomUUID20(); + } + //验证导入数据是否符合规则 + Map map = validateImportDatas(list,filepath); + boolean isOk = (boolean) map.get("result"); + if (!isOk) { + //验证没有通过 + String message = (String) map.get("message"); + return Result.error("fail", message); + } + //将导入数据循环合并整理后 新增至相应表 + list = (List) map.get("resultList"); + int countSuccess = 0; + // 最终添加的数据 + List addItemsEOList = new ArrayList<>(); + int itemNum = 0; + String firstId = UUIDUtils.randomUUID20(); + String menuid = sarFileSplitInfoEO.getMenuId(); + if (null == menuid) { + SarFileSplitItemsEO firstItem = new SarFileSplitItemsEO(); + firstItem.setId(firstId); + firstItem.setItemsNum("总目录"); + firstItem.setValidFlag(0); + firstItem.setCreationTime(new Date()); + firstItem.setModifyTime(new Date()); + addItemsEOList.add(firstItem); //新的总目录家在了添加的list中 当前仅一条 + } + + for (SarFileSplitItemsImportDto importDto : list) { //遍历传入的值 + //判断此行数据是否全部为空,是则不读取 + if(checkObjAllFieldsIsNull(importDto)){ + continue; + } + SarFileSplitItemsEO sarFileSplitItemsEO = new SarFileSplitItemsEO(); + BeanUtils.copyProperties(importDto, sarFileSplitItemsEO); + sarFileSplitItemsEO.setInfoId(infoId); + List addItemValList = new ArrayList<>(); + if (addItemsEOList != null && !addItemsEOList.isEmpty()) { + SarFileSplitItemsEO oldItems = addItemsEOList.get(addItemsEOList.size()-1); + if (itemNum > 0 && sarFileSplitItemsEO.getItemsNum().equals(oldItems.getItemsNum()) + && sarFileSplitItemsEO.getItemsName().equals(oldItems.getItemsName())) { + addItemValList = oldItems.getItemValEOList(); + String itemContent = oldItems.getItermsConditions()+sarFileSplitItemsEO.getItermsConditions(); + oldItems.setItermsConditions(itemContent); + if(StringUtils.isBlank(sarFileSplitItemsEO.getItermsConditions())){ + continue; + } + String[] valArr = sarFileSplitItemsEO.getItermsConditions().split("\n"); + if (valArr != null && valArr.length > 0) { + for (int i=0;i nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); + if (nowfilelist != null && !nowfilelist.isEmpty()) { + AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); + if(attFileVo!=null){ + isText = false; + String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); + String imgCon = ""; + valEO.setType("IMG"); + valEO.setItemContent(imgCon); + } + } + if (isText) { + valEO.setType("TEXT"); + valEO.setItemContent(valArr[i]); + } + addItemValList.add(valEO); + } + } + oldItems.setItemValEOList(addItemValList); + }else { + String[] valArr = sarFileSplitItemsEO.getItermsConditions().split("\n"); + if (valArr != null && valArr.length > 0) { + for (int i=0;i nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); + if (nowfilelist != null && !nowfilelist.isEmpty()) { + AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); + if(attFileVo!=null){ + isText = false; + String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); + String imgCon = ""; + valEO.setType("IMG"); + valEO.setItemContent(imgCon); + } + } + if (isText) { + valEO.setType("TEXT"); + valEO.setItemContent(valArr[i]); + } + addItemValList.add(valEO); + } + } + sarFileSplitItemsEO.setItemValEOList(addItemValList); + addItemsEOList.add(sarFileSplitItemsEO); + } + } else { + String[] valArr = sarFileSplitItemsEO.getItermsConditions().split("\n"); + if (valArr != null && valArr.length > 0) { + for (int i=0;i nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); + if (nowfilelist != null && !nowfilelist.isEmpty()) { + AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); + if(attFileVo!=null){ + isText = false; + String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); + String imgCon = ""; + valEO.setType("IMG"); + valEO.setItemContent(imgCon); + } + } + if (isText) { + valEO.setType("TEXT"); + valEO.setItemContent(valArr[i]); + } + addItemValList.add(valEO); + } + } + sarFileSplitItemsEO.setItemValEOList(addItemValList); + addItemsEOList.add(sarFileSplitItemsEO); + } + itemNum++; + } + + //导入拆分结果前首先新增拆分条目 + if (StringUtils.isBlank(menuid)) { + sarFileSplitInfoEO.setCreationTime(new Date()); + sarFileSplitInfoEO.setModifyTime(new Date()); + sarFileSplitInfoEO.setId(infoId); + sarFileSplitInfoEO.setValidFlag(0); + sarFileSplitInfoEO.setResult("1"); + sarFileSplitInfoEO.setModifyUser(LoginUserUtil.getUserId()); + sarFileSplitInfoEOService.insertSelective(sarFileSplitInfoEO); + } + + Map menuPidMap = new HashMap<>(); + //默认为总目录了 + if (StringUtils.isBlank(menuid)) { + menuPidMap.put("总目录", firstId); + }else{ + menuPidMap.put("总目录",menuid ); + } + for (SarFileSplitItemsEO itemsEO : addItemsEOList) { + String menuIdT = createItemsInfo(itemsEO,infoId,countSuccess,menuPidMap); + menuPidMap.put(itemsEO.getItemsNum(),menuIdT); + countSuccess++; + } + //统计成功结果需要去掉总目录这条数据 + String msg = "成功导入" + (countSuccess-1) + "条"; + return Result.success("0", msg, null); + } catch (Exception e) { + logger.error(e.getMessage(),e); + return Result.error("导入失败"); + } + } + + public String createItemsInfo(SarFileSplitItemsEO sarFileSplitItemsEO,String infoId,int countNum,Map menuPMap){ + String userId = LoginUserUtil.getUserId(); + //创建菜单 + SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); + sarFileSplitMenuEO.setInfoId(infoId); + sarFileSplitMenuEO.setName(sarFileSplitItemsEO.getItemsNum()); + sarFileSplitMenuEO.setItemName(sarFileSplitItemsEO.getItemsName()); + //获取父节点id + String menuNm = sarFileSplitItemsEO.getItemsNum(); + if(menuNm.indexOf(".") > 0){ + menuNm = menuNm.substring(0,menuNm.lastIndexOf(".")); + sarFileSplitMenuEO.setpId(menuPMap.get(menuNm)); + }else if("总目录".equalsIgnoreCase(menuNm)){ + sarFileSplitMenuEO.setPId(""); + }else{ + sarFileSplitMenuEO.setpId(menuPMap.get("总目录")); + } + + sarFileSplitMenuEO.setDisplaySeq(countNum+1L); + sarFileSplitMenuEO.setCreationUser(userId); + sarFileSplitMenuEO.setModifyUser(userId); + String menuId = sarFileSplitMenuEOService.addMenuForImport(sarFileSplitMenuEO); + //添加items表数据 + String itemsId = UUIDUtils.randomUUID20(); + sarFileSplitItemsEO.setId(itemsId); + sarFileSplitItemsEO.setMenuId(menuId); + sarFileSplitItemsEO.setValidFlag(0); + sarFileSplitItemsEO.setCreationTime(new Date()); + sarFileSplitItemsEO.setModifyTime(new Date()); + sarFileSplitItemsEO.setCreationUser(userId); + dao.insertSelective(sarFileSplitItemsEO); + //添加val表数据 + List getValList = sarFileSplitItemsEO.getItemValEOList(); + int ind = 1; + if (getValList != null && !getValList.isEmpty()) { + for (SarFileSplitItemsValEO valEO : getValList) { + // 当前段内容 + String valContent = ""; + if ("TEXT".equals(valEO.getType())) { + valContent = "

    " + valEO.getItemContent() + "

    "; + } else if ("IMG".equals(valEO.getType())) { + valContent = ""; + } else if ("TABLE".equals(valEO.getType())) { + valContent = valEO.getItemContent(); + } + // val表信息 + valEO.setId(UUIDUtils.randomUUID20()); + valEO.setItemId(itemsId); + valEO.setDisplaySeq(ind); + valEO.setValidFlag(0); + valEO.setCreationTime(new Date()); + valEO.setModifyTime(new Date()); + valEO.setCreationUser(userId); + valEO.setModifyUser(userId); + ind++; + } + sarFileSplitItemsValEODao.insertForeach(getValList); + } + return menuId; + } + + public Map validateImportDatas(List datas, String filepath) throws Exception { + //存放数据验证结果信息 + List stringMessage = new ArrayList<>(); + List claimStypelist = new ArrayList<>(); + List foList=new ArrayList<>(); + List dutyEngineerList=new ArrayList<>(); + int i = 1; //记录行号 + int num = 0; //记录是第几条数据 + //循环验证数据 + for (SarFileSplitItemsImportDto dto : datas) { + i++; + int countError = 0; //记录失败数据数量 + DicTypeEO dic = new DicTypeEO(); + List getDic = new ArrayList<>(); + String errorMsg = "第" + i + "行："; + //关联文件已经删除了 +// dto.setRelevanceFileName(dto.getRelevanceFile()); + if (num > 0 && StringUtils.isEmpty(dto.getItemsNum()) && StringUtils.isEmpty(dto.getItemsName())) { + String nowItemContent = dto.getItermsConditions(); + BeanUtils.copyProperties(datas.get(num-1), dto); + dto.setItermsConditions(nowItemContent); + // dto.setRelevanceFile(dto.getRelevanceFileName()); + } + if (StringUtils.isEmpty(dto.getItemsNum())) { + errorMsg += "条款号不能为空;"; + countError++; + } else { + if (dto.getItemsNum().length()>100) { + errorMsg += "条款号不能超过100个字符;"; + countError++; + } + } + if (StringUtils.isEmpty(dto.getItemsName())) { + errorMsg += "条款名称不能为空;"; + countError++; + } else { + if (dto.getItemsName().length()>100) { + errorMsg += "条款名称不能超过100个字符;"; + countError++; + } + } + String saveApplyCode = ""; + if (StringUtils.isNotEmpty(dto.getApplyArctic())) { + dto.setApplyArctic(dto.getApplyArctic().replace("，", ",")); + String applys[] = dto.getApplyArctic().split(","); + if(applys.length>20){ + errorMsg += "适用车型选项不能超过20个;"; + countError++; + } else if (dto.getApplyArctic().length() > 500) { + errorMsg += "适用车型不能超过500个字符;"; + countError++; + } else { + Set set = new HashSet(); + for (int a = 0; a < applys.length; a++) { + dic.setDicTypeName(applys[a]); + dic.setDicTypeCode("ENERGYTYPES"); + getDic = dicTypeEODao.getDicTypeByDicTypeName(dic); + if (getDic.size() == 1) { + saveApplyCode += getDic.get(0).getDicTypeCode() + ","; + } else if (getDic.size() > 0) { + errorMsg += "适用车型" + applys[a] + "不明确;"; + countError++; + break; + } else { + errorMsg += "适用车型" + applys[a] + "不存在;"; + countError++; + break; + } + set.add(applys[a]); + if (a==applys.length-1 && applys.length != set.size()){ + errorMsg += "适用车型存在重复数据;"; + countError++; + } + } + if (!saveApplyCode.equals("")){ + dto.setApplyArctic(saveApplyCode.substring(0,saveApplyCode.length()-1)); + } + } + } + if(!claimStypelist.contains(dto.getClaimType())) { + if (StringUtils.isNotEmpty(dto.getClaimType())) { + dic.setDicTypeName(dto.getClaimType()); + dic.setDicTypeCode("REQUESTTYPE"); + if (dto.getClaimType().length() > 500) { + errorMsg += "要求类型不能超过500个字符;"; + countError++; + } else { + getDic = dicTypeEODao.getDicTypeByDicTypeName(dic); + Set set = new HashSet(); + if (getDic != null) { + if (getDic.size() == 1) { + dto.setClaimType(getDic.get(0).getDicTypeCode()); + claimStypelist.add(getDic.get(0).getDicTypeCode()); + } else if (getDic.size() > 0) { + errorMsg += "要求类型不明确;"; + countError++; + } else { + errorMsg += "要求类型不存在;"; + countError++; + } + } else { + errorMsg += "要求类型不存在;"; + countError++; + } + } + } + } + if(StringUtils.isNotEmpty(dto.getItermsConditions())){ + if(dto.getItermsConditions().length() > 50000){ + errorMsg += "内容简介不能超过50000个字符；"; + countError++; + } + } + if(!foList.contains(dto.getFo())) { + if (StringUtils.isNotEmpty(dto.getFo())) { + if (dto.getFo().length() > 200) { + errorMsg += "FO不能超过200个字符；"; + countError++; + } else { + String uname = roleEODao.getIdsByNames(dto.getFo().split(",")); + if (StringUtils.isNotBlank(uname)) { + dto.setFo(uname); + foList.addAll(Arrays.asList(uname.split(","))); + } else { + errorMsg += "FO不存在;"; + countError++; + } + } + } + } + if(!dutyEngineerList.contains(dto.getDutyEngineer())) { + if (StringUtils.isNotEmpty(dto.getDutyEngineer())) { + if (dto.getDutyEngineer().length() > 100) { + errorMsg += "责任工程师不能超过100个字符;"; + countError++; + } else { + String emList = roleEODao.getIdsByNames(dto.getDutyEngineer().split(",")); + if (StringUtils.isNotBlank(emList)) { + dto.setDutyEngineer(emList); + dutyEngineerList.addAll(Arrays.asList(dto.getDutyEngineer().split(","))); + } else { + errorMsg += "系统中没有用户：" + dto.getDutyEngineer(); + countError++; + } + } + } + } + if(StringUtils.isNotEmpty(dto.getSvpps())){ + if(dto.getSvpps().length() > 200){ + errorMsg += "SVPPS不能超过200个字符；"; + countError++; + }else { + String svppsShow = sysInfoEOService.getSvppsIdByName(dto.getSvpps()); + dto.setSvpps(svppsShow); + } + } + if(StringUtils.isNotEmpty(dto.getBusStandCover())){ + if(dto.getBusStandCover().length() > 200){ + errorMsg += "企标覆盖关系不能超过200个字符；"; + countError++; + }else { + List getDicType = dicTypeEODao.getDicTypeByDicCode("BZFGGXOUIUJ"); + for (DicTypeEO dicTypeEO:getDicType) { + if (dicTypeEO.getDicTypeName().equals(dto.getBusStandCover())){ + dto.setBusStandCover(dicTypeEO.getDicTypeCode()); + } + } + } + } + if(StringUtils.isNotBlank(dto.getResponsibleUnit())){ + if(dto.getResponsibleUnit().length() > 100){ + errorMsg += "责任部门不能超过100个字符；"; + countError++; + }else { + String id = sysInfoEOService.getOrgIdByName(dto.getResponsibleUnit(),"DEPART"); + if(StringUtils.isNotBlank(id)){ + dto.setResponsibleUnit(id); + } else { + errorMsg += "系统中没有部门"+dto.getResponsibleUnit(); + countError++; + } + } + } + if (countError > 0) { + stringMessage.add(errorMsg); + } + num++; + } + Map map = new HashMap(); + if (stringMessage.isEmpty()) { + map.put("result", true); + map.put("resultList", datas); + map.put("message", ""); + } else { + map.put("result", false); + String html = ""; + if (stringMessage.size()>0){ + html = StringUtils.join(stringMessage,"
    "); + } + map.put("message", html); + } + return map; + } + + + @Override + public void combineItems(String ids) { + String userId = UserUtils.getUserId(); + String[] idArr = ids.split(","); + SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage(); + page.setIdList(Arrays.asList(idArr)); + page.setValidFlag("0"); + page.setPageSize(1000); + page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + List getList = dao.queryByPage(page); + if (getList != null && !getList.isEmpty()) { + // 最终合并后的条款 + SarFileSplitItemsEO resultItem = getList.get(0); + String reaultItemId = resultItem.getId(); + // 合并所有条款内容 + StringBuilder resultContent = new StringBuilder(); + resultContent.append(resultItem.getItermsConditions()); + // 合并所有val表内容 + List resultValList = new ArrayList<>(); + SarFileSplitItemsValEOPage valEOPage = new SarFileSplitItemsValEOPage(); + valEOPage.setItemId(reaultItemId); + List valList = sarFileSplitItemsValEODao.queryByList(valEOPage); + resultValList.addAll(valList); + // 保存所有合并后需要删掉的条款id + List delIds = new ArrayList<>(); + List delMenuIds = new ArrayList<>(); + for (int i = 1; i < getList.size(); i++) { + SarFileSplitItemsEO itemsEO = getList.get(i); + delIds.add(itemsEO.getId()); + delMenuIds.add(itemsEO.getMenuId()); + String itemContent = "

    " + itemsEO.getItemsNum() + "

    " + itemsEO.getItermsConditions(); + resultContent.append(itemContent); + SarFileSplitItemsValEO valEO = new SarFileSplitItemsValEO(); + valEO.setItemId(reaultItemId); + valEO.setType("TEXT"); + valEO.setItemContent(itemsEO.getItemsNum()); + valEO.setId(UUIDUtils.randomUUID20()); + valEO.setValidFlag(0); + valEO.setCreationTime(new Date()); + valEO.setModifyTime(new Date()); + valEO.setCreationUser(userId); + valEO.setModifyUser(userId); + resultValList.add(valEO); + SarFileSplitItemsValEOPage valEOPage1 = new SarFileSplitItemsValEOPage(); + valEOPage1.setItemId(itemsEO.getId()); + List valList1 = sarFileSplitItemsValEODao.queryByList(valEOPage1); + resultValList.addAll(valList1); + } + // 开始进行合并数据处理 + changeInfos(resultContent, reaultItemId, delMenuIds, delIds, resultValList); + } + } + + public void changeInfos (StringBuilder resultContent,String reaultItemId,List delMenuIds,List delIds,List resultValList) { + //1.更新最终合并的条款内容 + if (resultContent != null) { + SarFileSplitItemsEO newItems = new SarFileSplitItemsEO(); + newItems.setId(reaultItemId); + newItems.setItermsConditions(resultContent.toString()); + dao.updateByPrimaryKeySelective(newItems); + } + // 2.删除多余节点数据 + if (delMenuIds != null && !delMenuIds.isEmpty()) { + sarFileSplitMenuEODao.deleteByIdList(delMenuIds); + } + // 3.删除多余条款及val表数据 + if (delIds != null && !delIds.isEmpty()) { + dao.deleteByItemsIdList(delIds); + delIds.add(reaultItemId); + sarFileSplitItemsValEODao.deleteValByitemIds(delIds); + } + // 4.保存新的val表数据 + if (resultValList != null && !resultValList.isEmpty()) { + int ind = 0; + for (SarFileSplitItemsValEO valEO : resultValList) { + ind++; + valEO.setItemId(reaultItemId); + valEO.setDisplaySeq(ind); + } + sarFileSplitItemsValEODao.insertForeach(resultValList); + } + } + + public static void copyFile1(String srcPath, String destPath) throws IOException { + // 打开输入流 + FileInputStream fis = new FileInputStream(srcPath); + // 打开输出流 + FileOutputStream fos = new FileOutputStream(destPath); + // 读取和写入信息 + int len = 0; + while ((len = fis.read()) != -1) { + fos.write(len); + } + // 关闭流 先开后关 后开先关 + fos.close(); // 后开先关 + fis.close(); // 先开后关 + + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsParamsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsParamsEOServiceImpl.java new file mode 100644 index 00000000..fd048cd4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsParamsEOServiceImpl.java @@ -0,0 +1,28 @@ +package com.adc.da.slrs.standardSplit.service.impl; + +import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsParamsEODao; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEOPage; +import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsParamsEOService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitItemsParamsEOServiceImpl implements SarFileSplitItemsParamsEOService { + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsParamsEOServiceImpl.class); + + @Autowired + private SarFileSplitItemsParamsEODao sarFileSplitItemsParamsEODao; + + @Override + public List queryByList(SarFileSplitItemsParamsEOPage paramPage) { + return sarFileSplitItemsParamsEODao.queryByList(paramPage); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsTableEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsTableEOServiceImpl.java new file mode 100644 index 00000000..63c5a0e8 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsTableEOServiceImpl.java @@ -0,0 +1,14 @@ +package com.adc.da.slrs.standardSplit.service.impl; + +import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsTableEOService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitItemsTableEOServiceImpl implements SarFileSplitItemsTableEOService { + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsTableEOServiceImpl.class); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java new file mode 100644 index 00000000..e2011de7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java @@ -0,0 +1,28 @@ +package com.adc.da.slrs.standardSplit.service.impl; + +import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsValEODao; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage; +import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsValEOService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitItemsValEOServiceImpl implements SarFileSplitItemsValEOService { + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsValEOServiceImpl.class); + + @Autowired + private SarFileSplitItemsValEODao sarFileSplitItemsValEODao; + + @Override + public List queryByList(SarFileSplitItemsValEOPage valEOPage) { + return sarFileSplitItemsValEODao.queryByList(valEOPage); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java new file mode 100644 index 00000000..5ead95c6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -0,0 +1,452 @@ +package com.adc.da.slrs.standardSplit.service.impl; + +import com.adc.da.base.page.BasePage; +import com.adc.da.slrs.standardSplit.dao.*; +import com.adc.da.slrs.standardSplit.entity.*; +import com.adc.da.slrs.standardSplit.service.SarFileSplitMenuEOService; +import com.adc.da.sys.util.LoginUserUtil; +import com.adc.da.sys.util.UUIDUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import java.util.*; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService { + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitMenuEOServiceImpl.class); + + @Autowired + private SarFileSplitMenuEODao dao; + @Autowired + private SarFileSplitItemsEODao sarFileSplitItemsEODao; + @Autowired + private SarFileSplitItemsValEODao sarFileSplitItemsValEODao; + @Autowired + private SarFileSplitItemsTableEODao sarFileSplitItemsTableEODao; + @Autowired + private SarFileSplitMenuEODao SarFileSplitMenuEODao; + @Autowired + private SarFileSplitItemsParamsEODao sarFileSplitItemsParamsEODao; + + @Override + public List queryByPage(BasePage page){ + return SarFileSplitMenuEODao.queryByPage(page); + } + + @Override + public List queryByList(SarFileSplitMenuEOPage page){ + return SarFileSplitMenuEODao.queryByList(page); + } + + @Override + public SarFileSplitMenuEO selectByPrimaryKey(String id){ + return SarFileSplitMenuEODao.selectByPrimaryKey(id); + } + + @Override + public int addMenu(SarFileSplitMenuEO sarFileSplitMenuEO){ + sarFileSplitMenuEO.setId(UUIDUtils.randomUUID20()); + sarFileSplitMenuEO.setValidFlag(0); + sarFileSplitMenuEO.setCreationTime(new Date()); + sarFileSplitMenuEO.setModifyTime(new Date()); + int count = dao.insertSelective(sarFileSplitMenuEO); + // 之后的所有节点序号增加 + SarFileSplitMenuEOPage page = new SarFileSplitMenuEOPage(); + page.setPId(sarFileSplitMenuEO.getPId()); + List getList = dao.queryByList(page); + if (getList != null && !getList.isEmpty()) { + for(SarFileSplitMenuEO menu : getList){ + Long olgSeq = menu.getDisplaySeq(); + if (olgSeq >= sarFileSplitMenuEO.getDisplaySeq()) { + menu.setDisplaySeq(olgSeq + 1); + dao.updateByPrimaryKeySelective(menu); + } + } + } + return count; + } + + @Override + public int updateByPrimaryKeySelective(SarFileSplitMenuEO sarFileSplitMenuEO){ + return dao.updateByPrimaryKeySelective(sarFileSplitMenuEO); + } + + @Override + public void deleteMenu(String id) { + List menuIds = new ArrayList<>(); + menuIds.add(id); + // 删除节点及子节点 + List ids = dao.getChild(id); + if(ids!=null && !ids.isEmpty()){ + dao.deleteByPId(ids); + sarFileSplitItemsValEODao.deleteValByMenuIds(ids); + sarFileSplitItemsTableEODao.deleteTableByMenuIds(ids); + sarFileSplitItemsEODao.deleteByMenuIds(ids); + } + } + + @Override + public int dragMenu(DrageMenuEO drageMenuEO) { + SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); + sarFileSplitMenuEO.setInfoId(drageMenuEO.getInfoId()); + sarFileSplitMenuEO.setModifyUser(LoginUserUtil.getUserId()); + sarFileSplitMenuEO.setModifyTime(new Date()); + sarFileSplitMenuEO.setId(drageMenuEO.getMenuId()); + int result = 0; + if (drageMenuEO.getMoveType().equals("inner")) { + sarFileSplitMenuEO.setPId(drageMenuEO.getTargetMenuId()); + if (drageMenuEO.getMenuDisplay()>drageMenuEO.getTargetMenuDisplay()) { + // 修改被影响的其他节点的排序，修改时间，修改人 + long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); + sarFileSplitMenuEO.setChildrenCount(childrenCount); + sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getTargetMenuDisplay()+1); + sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getMenuDisplay()); + result += dao.updateDisplaySeqAdd(sarFileSplitMenuEO); + // 如果子节点个数多，都需修改 + if (childrenCount>1) { + // 计算移动节点前后排序差 + long betwttenNum = drageMenuEO.getMenuDisplay()-drageMenuEO.getTargetMenuDisplay()-1; + SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); + childrenUpdateEO.setId(drageMenuEO.getMenuId()); + childrenUpdateEO.setChildrenCount(betwttenNum); + childrenUpdateEO.setModifyTime(new Date()); + childrenUpdateEO.setModifyUser(LoginUserUtil.getUserId()); + result += dao.updateChildrenDisplaySeqByIDCut(childrenUpdateEO); + } + sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()+1); + } else { + // 修改被影响的其他节点的排序，修改时间，修改人 + long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); + sarFileSplitMenuEO.setChildrenCount(childrenCount); + sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getMenuDisplay()+childrenCount-1); + sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getTargetMenuDisplay()); + result += dao.updateDisplaySeqCut(sarFileSplitMenuEO); + // 如果子节点个数多，都需修改 + if (childrenCount>1) { + // 计算移动节点前后排序差 + long betwttenNum = drageMenuEO.getTargetMenuDisplay()-childrenCount+1- drageMenuEO.getMenuDisplay(); + SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); + childrenUpdateEO.setId(drageMenuEO.getMenuId()); + childrenUpdateEO.setChildrenCount(betwttenNum); + childrenUpdateEO.setModifyTime(new Date()); + childrenUpdateEO.setModifyUser(LoginUserUtil.getUserId()); + result += dao.updateChildrenDisplaySeqByIDAdd(childrenUpdateEO); + } + sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()-childrenCount+1); + } + } else if (drageMenuEO.getMoveType().equals("prev")) { + sarFileSplitMenuEO.setPId(drageMenuEO.getTargetParentId()); + if (drageMenuEO.getMenuDisplay()>drageMenuEO.getTargetMenuDisplay()) { + // 修改被影响的其他节点的排序，修改时间，修改人 + long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); + sarFileSplitMenuEO.setChildrenCount(childrenCount); + sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getTargetMenuDisplay()); + sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getMenuDisplay()); + result += dao.updateDisplaySeqAdd(sarFileSplitMenuEO); + // 如果子节点个数多，都需修改 + if (childrenCount>1) { + // 计算移动节点前后排序差 + long betwttenNum = drageMenuEO.getMenuDisplay()-drageMenuEO.getTargetMenuDisplay(); + SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); + childrenUpdateEO.setId(drageMenuEO.getMenuId()); + childrenUpdateEO.setChildrenCount(betwttenNum); + childrenUpdateEO.setModifyTime(new Date()); + childrenUpdateEO.setModifyUser(LoginUserUtil.getUserId()); + result += dao.updateChildrenDisplaySeqByIDCut(childrenUpdateEO); + } + sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()); + } else { + // 修改被影响的其他节点的排序，修改时间，修改人 + long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); + sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getMenuDisplay()+childrenCount-1); + sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getTargetMenuDisplay()-1); + sarFileSplitMenuEO.setChildrenCount(childrenCount); + result += dao.updateDisplaySeqCut(sarFileSplitMenuEO); + // 如果子节点个数多，都需修改 + if (childrenCount>1) { + // 计算移动节点前后排序差 + long betwttenNum = drageMenuEO.getTargetMenuDisplay()- childrenCount - drageMenuEO.getMenuDisplay(); + SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); + childrenUpdateEO.setId(drageMenuEO.getMenuId()); + childrenUpdateEO.setChildrenCount(betwttenNum); + childrenUpdateEO.setModifyTime(new Date()); + childrenUpdateEO.setModifyUser(LoginUserUtil.getUserId()); + result += dao.updateChildrenDisplaySeqByIDAdd(childrenUpdateEO); + } + + sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()-childrenCount); + } + + } else { + sarFileSplitMenuEO.setPId(drageMenuEO.getTargetParentId()); + if (drageMenuEO.getMenuDisplay()>drageMenuEO.getTargetMenuDisplay()) { + // 修改被影响的其他节点的排序，修改时间，修改人 往上移动 + // 查询目标最大的排序 + long targetDisplay = getMaxDisplayByid(drageMenuEO.getTargetMenuId()); + // 查询移动节点包括子节点一共有多少个 + long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); + sarFileSplitMenuEO.setDisplaySeqStart(targetDisplay+1); + sarFileSplitMenuEO.setChildrenCount(childrenCount); + sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getMenuDisplay()); + result += dao.updateDisplaySeqAdd(sarFileSplitMenuEO); + // 如果子节点个数多，都需修改 + if (childrenCount>1) { + // 计算移动节点前后排序差 + long betwttenNum = drageMenuEO.getMenuDisplay()-targetDisplay-1; + SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); + childrenUpdateEO.setId(drageMenuEO.getMenuId()); + childrenUpdateEO.setChildrenCount(betwttenNum); + childrenUpdateEO.setModifyTime(new Date()); + childrenUpdateEO.setModifyUser(LoginUserUtil.getUserId()); + result += dao.updateChildrenDisplaySeqByIDCut(childrenUpdateEO); + } + sarFileSplitMenuEO.setDisplaySeq(targetDisplay+1); + } else { + // 修改被影响的其他节点的排序，修改时间，修改人 往下移动 + // 如果该节点下有字节点，寻找该节点包括所有子节点的最大排序 + // 查询目标最大的排序 + long targetDisplay = getMaxDisplayByid(drageMenuEO.getTargetMenuId()); + long menuMaxDisplay = getMaxDisplayByid(drageMenuEO.getMenuId()); + // 查询移动节点包括子节点一共有多少个 + long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); + sarFileSplitMenuEO.setDisplaySeqStart(menuMaxDisplay); + sarFileSplitMenuEO.setChildrenCount(childrenCount); + sarFileSplitMenuEO.setDisplaySeqEnd(targetDisplay); + result += dao.updateDisplaySeqCut(sarFileSplitMenuEO); + // 如果子节点个数多，都需修改 + if (childrenCount>1) { + // 计算移动节点前后排序差 + long betwttenNum = targetDisplay-childrenCount+1 - drageMenuEO.getMenuDisplay(); + SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); + childrenUpdateEO.setId(drageMenuEO.getMenuId()); + childrenUpdateEO.setChildrenCount(betwttenNum); + childrenUpdateEO.setModifyTime(new Date()); + childrenUpdateEO.setModifyUser(LoginUserUtil.getUserId()); + result += dao.updateChildrenDisplaySeqByIDAdd(childrenUpdateEO); + } + sarFileSplitMenuEO.setDisplaySeq(targetDisplay-childrenCount+1); + // 修改字节的的排序 + } + } + // 修改当前节点，父亲Id，排序，修改时间，修改人 + result += dao.updateByPrimaryKeySelective(sarFileSplitMenuEO); + return result; + } + + // 通过ID查询该结点及结点下所有的节点排序的最大值 + public int getMaxDisplayByid(String menuID) { + return dao.getMaxDisplayByid(menuID); + } + + @Override + public boolean judgequeryMenuByPid(SarFileSplitMenuEO sarMenuEO) throws Exception { + boolean result = false; //true 表示有记录，false表示无记录 + //先判断目录下是否有子节点 + List list = dao.queryByPidExcpetSelf(sarMenuEO); + if(list.size()<=0){ + //再查节点下是否有标准，法规，企业标准记录 + SarFileSplitItemsEOPage itemEO = new SarFileSplitItemsEOPage(); + itemEO.setMenuId(sarMenuEO.getId()); + itemEO.setValidFlag("0"); + List listresult = sarFileSplitItemsEODao.queryByList(itemEO); + if(listresult !=null && listresult.size()>0){ + result=true; + } + } + else{ + result=true; + } + return result; + } + + @Override + public int copyMenu (SarFileSplitMenuEO sarMenuEO) { + int result = 0; + // 用来存放item的新旧ID，key：旧ID，value：新ID + Map itemIdMap = new HashMap<>(); + List oldItemIdList = new ArrayList<>(); + Map itemValIdMap = new HashMap<>(); + Map menuIdMap = new HashMap<>(); + // 根据目录ID查询相关信息 + sarMenuEO = dao.selectByPrimaryKey(sarMenuEO.getId()); + // 查询该节点下所有的 子节点 并修改排序 + List sarFileSplitMenuEOList = dao.queryAllChildrenByid(sarMenuEO); + int maxDisplay = dao.getMaxDisplayByid(sarMenuEO.getId()); + SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); + sarFileSplitMenuEO.setDisplaySeqStart(Long.valueOf(maxDisplay + 1)); + sarFileSplitMenuEO.setDisplaySeqEnd(10000L); + sarFileSplitMenuEO.setChildrenCount(Long.valueOf(sarFileSplitMenuEOList.size())); + sarFileSplitMenuEO.setModifyUser(LoginUserUtil.getUserId()); + sarFileSplitMenuEO.setModifyTime(new Date()); + sarFileSplitMenuEO.setInfoId(sarMenuEO.getInfoId()); + dao.updateDisplaySeqAdd(sarFileSplitMenuEO); + for (SarFileSplitMenuEO sarFileSplitMenuEOfor : sarFileSplitMenuEOList) { + menuIdMap.put(sarFileSplitMenuEOfor.getId(),UUIDUtils.randomUUID20()); + } + for (SarFileSplitMenuEO sarFileSplitMenuEOfor : sarFileSplitMenuEOList) { + sarFileSplitMenuEOfor.setId(menuIdMap.get(sarFileSplitMenuEOfor.getId()).toString()); + if (menuIdMap.containsKey(sarFileSplitMenuEOfor.getpId())){ + sarFileSplitMenuEOfor.setpId(menuIdMap.get(sarFileSplitMenuEOfor.getpId()).toString()); + } + sarFileSplitMenuEOfor.setDisplaySeq(sarFileSplitMenuEOfor.getDisplaySeq() + sarFileSplitMenuEOList.size()); + sarFileSplitMenuEOfor.setCreationTime(new Date()); + sarFileSplitMenuEOfor.setModifyTime(new Date()); + sarFileSplitMenuEOfor.setCreationUser(LoginUserUtil.getUserId()); + sarFileSplitMenuEOfor.setModifyUser(LoginUserUtil.getUserId()); + } + // SAR_FILE_ITEMS_MENU 添加数据， + result = dao.insertForeach(sarFileSplitMenuEOList); + // SAR_FILE_ITEMS 添加数据， + List sarFileSplitItemsEOList = sarFileSplitItemsEODao.queryItemsByMenuId(sarMenuEO.getId()); + for (SarFileSplitItemsEO sarFileSplitItemsEO : sarFileSplitItemsEOList) { + String newItemId = UUIDUtils.randomUUID20(); + oldItemIdList.add(sarFileSplitItemsEO.getId()); + itemIdMap.put(sarFileSplitItemsEO.getId(), newItemId); + sarFileSplitItemsEO.setId(newItemId); + sarFileSplitItemsEO.setMenuId(menuIdMap.get(sarFileSplitItemsEO.getMenuId()).toString()); + sarFileSplitItemsEO.setCreationTime(new Date()); + sarFileSplitItemsEO.setModifyTime(new Date()); + sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId()); + sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId()); + } + result += sarFileSplitItemsEODao.insertForeach(sarFileSplitItemsEOList); + // SAR_FILE_ITEMS_VAL 添加数据， + List sarFileSplitItemsValEOList = sarFileSplitItemsValEODao.queryItemsValByMenuId(oldItemIdList); + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : sarFileSplitItemsValEOList) { + String newItemValId = UUIDUtils.randomUUID20(); + itemValIdMap.put(sarFileSplitItemsValEO.getId(), newItemValId); + sarFileSplitItemsValEO.setId(newItemValId); + sarFileSplitItemsValEO.setItemId(itemIdMap.get(sarFileSplitItemsValEO.getItemId()).toString()); + sarFileSplitItemsValEO.setCreationTime(new Date()); + sarFileSplitItemsValEO.setModifyTime(new Date()); + sarFileSplitItemsValEO.setCreationUser(LoginUserUtil.getUserId()); + sarFileSplitItemsValEO.setModifyUser(LoginUserUtil.getUserId()); + } + if (sarFileSplitItemsValEOList.size()>0) { + result += sarFileSplitItemsValEODao.insertForeach(sarFileSplitItemsValEOList); + } + // SAR_FILE_ITEMS_PARAMS 添加数据， + List sarFileSplitItemsParamsEOList = sarFileSplitItemsParamsEODao.queryItemsParamsByMenuId(oldItemIdList); + for (SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO : sarFileSplitItemsParamsEOList) { + sarFileSplitItemsParamsEO.setId(UUIDUtils.randomUUID20()); + sarFileSplitItemsParamsEO.setItemId(itemIdMap.get(sarFileSplitItemsParamsEO.getItemId()).toString()); + sarFileSplitItemsParamsEO.setCreationTime(new Date()); + sarFileSplitItemsParamsEO.setModifyTime(new Date()); + } + if (sarFileSplitItemsParamsEOList.size()>0){ + result += sarFileSplitItemsParamsEODao.insertForeach(sarFileSplitItemsParamsEOList); + } + return result; + } + + @Override + public int copyMenuNotChildren(SarFileSplitItemsEO sarFileSplitItemsEO) { + int result =0; + List oldItemIdList = new ArrayList<>(); + Map itemValIdMap = new HashMap<>(); + oldItemIdList.add(sarFileSplitItemsEO.getId()); + + sarFileSplitItemsEO = sarFileSplitItemsEODao.selectByPrimaryKey(sarFileSplitItemsEO.getId()); + + // 查询该节点下所有的 子节点 并修改排序 + SarFileSplitMenuEO sarMenuEO = new SarFileSplitMenuEO(); + sarMenuEO.setId(sarFileSplitItemsEO.getMenuId()); + List sarFileSplitMenuEOList = dao.queryAllChildrenByid(sarMenuEO); + sarMenuEO = dao.selectByPrimaryKey(sarMenuEO.getId()); + int maxDisplay = dao.getMaxDisplayByid(sarMenuEO.getId()); + SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); + sarFileSplitMenuEO.setDisplaySeqStart(Long.valueOf(maxDisplay + 1)); + sarFileSplitMenuEO.setDisplaySeqEnd(10000L); + sarFileSplitMenuEO.setChildrenCount(1L); + sarFileSplitMenuEO.setModifyUser(LoginUserUtil.getUserId()); + sarFileSplitMenuEO.setModifyTime(new Date()); + sarFileSplitMenuEO.setInfoId(sarFileSplitItemsEO.getInfoId()); + dao.updateDisplaySeqAdd(sarFileSplitMenuEO); + + // SAR_FILE_ITEMS_MENU 添加数据， + sarMenuEO.setId(UUIDUtils.randomUUID20()); + sarMenuEO.setDisplaySeq(Long.valueOf(maxDisplay + 1)); + sarMenuEO.setCreationTime(new Date()); + sarMenuEO.setModifyTime(new Date()); + sarMenuEO.setCreationUser(LoginUserUtil.getUserId()); + sarMenuEO.setModifyUser(LoginUserUtil.getUserId()); + result = dao.insertSelective(sarMenuEO); + + // SAR_FILE_ITEMS 添加数据， + sarFileSplitItemsEO.setId(UUIDUtils.randomUUID20()); + sarFileSplitItemsEO.setMenuId(sarMenuEO.getId()); + sarFileSplitItemsEO.setCreationTime(new Date()); + sarFileSplitItemsEO.setModifyTime(new Date()); + sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId()); + sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId()); + result += sarFileSplitItemsEODao.insertSelective(sarFileSplitItemsEO); + + // SAR_FILE_ITEMS_VAL 添加数据， + List sarFileSplitItemsValEOList = sarFileSplitItemsValEODao.queryItemsValByMenuId(oldItemIdList); + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : sarFileSplitItemsValEOList) { + String newItemValId = UUIDUtils.randomUUID20(); + itemValIdMap.put(sarFileSplitItemsValEO.getId(), newItemValId); + sarFileSplitItemsValEO.setId(newItemValId); + sarFileSplitItemsValEO.setItemId(sarFileSplitItemsEO.getId()); + sarFileSplitItemsValEO.setCreationTime(new Date()); + sarFileSplitItemsValEO.setModifyTime(new Date()); + sarFileSplitItemsValEO.setCreationUser(LoginUserUtil.getUserId()); + sarFileSplitItemsValEO.setModifyUser(LoginUserUtil.getUserId()); + } + if (sarFileSplitItemsValEOList.size()>0) { + result += sarFileSplitItemsValEODao.insertForeach(sarFileSplitItemsValEOList); + } + // SAR_FILE_ITEMS_PARAMS 添加数据， + List sarFileSplitItemsParamsEOList = sarFileSplitItemsParamsEODao.queryItemsParamsByMenuId(oldItemIdList); + for (SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO : sarFileSplitItemsParamsEOList) { + sarFileSplitItemsParamsEO.setId(UUIDUtils.randomUUID20()); + sarFileSplitItemsParamsEO.setItemId(sarFileSplitItemsEO.getId()); + sarFileSplitItemsParamsEO.setCreationTime(new Date()); + sarFileSplitItemsParamsEO.setModifyTime(new Date()); + } + if (sarFileSplitItemsParamsEOList.size()>0){ + result += sarFileSplitItemsParamsEODao.insertForeach(sarFileSplitItemsParamsEOList); + } + // SAR_FILE_ITEMS_TABLE 添加数据， + List sarFileSplitItemsTableEOList = sarFileSplitItemsTableEODao.queryItemsTableByMenuId(oldItemIdList); + for (SarFileSplitItemsTableEO sarFileSplitItemsTableEO : sarFileSplitItemsTableEOList) { + sarFileSplitItemsTableEO.setId(UUIDUtils.randomUUID20()); + sarFileSplitItemsTableEO.setItemsId(sarFileSplitItemsEO.getId()); + sarFileSplitItemsTableEO.setItemsValId(itemValIdMap.get(sarFileSplitItemsTableEO.getItemsValId()).toString()); + sarFileSplitItemsTableEO.setCreationTime(new Date()); + sarFileSplitItemsTableEO.setModifyTime(new Date()); + sarFileSplitItemsTableEO.setModifyUser(LoginUserUtil.getUserId()); + } + if (sarFileSplitItemsTableEOList.size()>0){ + result += sarFileSplitItemsTableEODao.insertForeach(sarFileSplitItemsTableEOList); + } + return result; + } + + @Override + public String addMenuForImport(SarFileSplitMenuEO sarFileSplitMenuEO) { + sarFileSplitMenuEO.setId(UUIDUtils.randomUUID20()); + sarFileSplitMenuEO.setValidFlag(0); + sarFileSplitMenuEO.setCreationTime(new Date()); + sarFileSplitMenuEO.setModifyTime(new Date()); + int count = dao.insertSelective(sarFileSplitMenuEO); + // 之后的所有节点序号增加 + /*SarFileSplitMenuEOPage page = new SarFileSplitMenuEOPage(); + page.setPId(sarFileSplitMenuEO.getPId()); + List getList = dao.queryByList(page); + if (getList != null && !getList.isEmpty()) { + for(SarFileSplitMenuEO menu : getList){ + Long olgSeq = menu.getDisplaySeq(); + if (olgSeq >= sarFileSplitMenuEO.getDisplaySeq()) { + menu.setDisplaySeq(olgSeq + 1); + dao.updateByPrimaryKeySelective(menu); + } + } + }*/ + return sarFileSplitMenuEO.getId(); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandAttrDetailsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandAttrDetailsEOServiceImpl.java index 8c3d1e0a..2580a5cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandAttrDetailsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandAttrDetailsEOServiceImpl.java @@ -1,14 +1,27 @@ package com.adc.da.slrs.standardSplit.service.impl; +import com.adc.da.slrs.standardSplit.dao.SarStandAttrDetailsEODao; import com.adc.da.slrs.standardSplit.service.SarStandAttrDetailsEOService; +import com.adc.da.sys.common.SelectionResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + @Service @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class SarStandAttrDetailsEOServiceImpl implements SarStandAttrDetailsEOService { - private static final Logger logger = LoggerFactory.getLogger(SarLawsInfoEOServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(SarStandAttrDetailsEOServiceImpl.class); + + @Autowired + private SarStandAttrDetailsEODao sarStandAttrDetailsEODao; + + @Override + public List selectFileFieldForSel(String attrField){ + return sarStandAttrDetailsEODao.selectFileFieldForSel(attrField); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 590af634..d4457165 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -1,14 +1,66 @@ package com.adc.da.slrs.standardSplit.service.impl; +import com.adc.da.slrs.standardSplit.dao.SarStandAttrDetailsEODao; +import com.adc.da.slrs.standardSplit.dao.SarStandFileEODao; +import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; +import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; import com.adc.da.slrs.standardSplit.service.SarStandFileEOService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.List; @Service @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class SarStandFileEOServiceImpl implements SarStandFileEOService { - private static final Logger logger = LoggerFactory.getLogger(SarLawsInfoEOServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(SarStandFileEOServiceImpl.class); + + @Autowired + private SarStandFileEODao sarStandFileEODao; + @Autowired + private SarStandAttrDetailsEODao sarStandAttrDetailsEODao; + + @Override + public List getStandFileListByPage(SarStandFileEOPage stand){ + return sarStandFileEODao.getStandFileListByPage(stand); + } + + @Override + public List queryByPage(SarStandFileEOPage page){ + return sarStandFileEODao.queryByPage(page); + } + + @Override + public List queryByList(SarStandFileEOPage page){ + return sarStandFileEODao.queryByList(page); + } + + @Override + public SarStandFileEO selectByPrimaryKey(String id) throws Exception{ + return sarStandFileEODao.selectByPrimaryKey(id); + } + + @Override + public int insertSelective(SarStandFileEO sarStandFileEO) throws Exception { + return sarStandFileEODao.insertSelective(sarStandFileEO); + } + + @Override + public int updateByPrimaryKeySelective(SarStandFileEO sarStandFileEO) throws Exception{ + return sarStandFileEODao.updateByPrimaryKeySelective(sarStandFileEO); + } + + @Override + public int deleteByPrimaryKey(String id) throws Exception{ + return sarStandFileEODao.deleteByPrimaryKey(id); + } + + @Override + public List selectFileByAttId(String attId) throws Exception{ + return sarStandFileEODao.selectFileByAttId(attId); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandardsInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandardsInfoEOServiceImpl.java new file mode 100644 index 00000000..a3b56ede --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandardsInfoEOServiceImpl.java @@ -0,0 +1,29 @@ +package com.adc.da.slrs.standardSplit.service.impl; + +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO; +import com.adc.da.slrs.standardSplit.dao.SarStandardsInfoEODao; +import com.adc.da.slrs.standardSplit.service.SarStandardsInfoEOService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarStandardsInfoEOServiceImpl implements SarStandardsInfoEOService { + private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoEOServiceImpl.class); + + @Autowired + private SarStandardsInfoEODao dao; + + @Override + public List selectStandardsByStandnumber(String standNum, String val) { + SarStandardsInfoEO sarStandardsInfoEO = new SarStandardsInfoEO(); + sarStandardsInfoEO.setStandNumber(standNum); + sarStandardsInfoEO.setStandType(val); + return dao.selectStandardsByStandnumber(sarStandardsInfoEO); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/vo/RecommendVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/vo/RecommendVO.java new file mode 100644 index 00000000..827f38c0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/vo/RecommendVO.java @@ -0,0 +1,56 @@ +package com.adc.da.slrs.standardSplit.vo; + +import com.adc.da.base.entity.BaseEntity; + +/** + * Created by gaoayn on 2018/9/13 19:29 + * 用于搜索中心的推荐 + */ +public class RecommendVO extends BaseEntity { + + private String nameShow; + private String numberShow; + private String typeShow; + private String id; + private String module; + + public String getNameShow() { + return nameShow; + } + + public void setNameShow(String nameShow) { + this.nameShow = nameShow; + } + + public String getNumberShow() { + return numberShow; + } + + public void setNumberShow(String numberShow) { + this.numberShow = numberShow; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeShow() { + return typeShow; + } + + public void setTypeShow(String typeShow) { + this.typeShow = typeShow; + } + + public String getModule() { + return module; + } + + public void setModule(String module) { + this.module = module; + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandAttrDetailsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandAttrDetailsEOMapper.xml new file mode 100644 index 00000000..4c160498 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandAttrDetailsEOMapper.xml @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, attr_field, attr_name, attr_type, order_num, is_edit, creation_user, + valid_flag, creation_time, modify_time, + attr_len,is_must,is_show_imp,show_region_id,sel_val,sar_type,is_search,is_warn + + + + SAR_STAND_ATTR_DETAILS.id, attr_field, attr_name, attr_type, SAR_STAND_ATTR_DETAILS.order_num, is_edit, SAR_STAND_ATTR_DETAILS.creation_user, + SAR_STAND_ATTR_DETAILS.valid_flag, SAR_STAND_ATTR_DETAILS.creation_time, SAR_STAND_ATTR_DETAILS.modify_time, + attr_len,is_must,is_show_imp,show_region_id,sel_val,SAR_STAND_ATTR_DETAILS.sar_type,is_search,is_warn + + + + + where 1=1 and SAR_STAND_ATTR_DETAILS.valid_flag=0 + + + and SAR_STAND_ATTR_DETAILS.is_show_imp = 0 + + + and SAR_STAND_ATTR_DETAILS.id ${idOperator} #{id} + + + and attr_field ${attrFieldOperator} #{attrField} + + + and attr_name ${attrNameOperator} #{attrName} + + + and attr_type ${attrTypeOperator} #{attrType} + + + and SAR_STAND_ATTR_DETAILS.order_num ${orderNumOperator} #{orderNum} + + + and is_edit ${isEditOperator} #{isEdit} + + + and SAR_STAND_ATTR_DETAILS.creation_user ${creationUserOperator} #{creationUser} + + + and SAR_STAND_ATTR_DETAILS.valid_flag ${validFlagOperator} #{validFlag} + + + and SAR_STAND_ATTR_DETAILS.creation_time ${creationTimeOperator} #{creationTime} + + + and SAR_STAND_ATTR_DETAILS.creation_time >= #{creationTime1} + + + and SAR_STAND_ATTR_DETAILS.creation_time <= #{creationTime2} + + + and SAR_STAND_ATTR_DETAILS.modify_time ${modifyTimeOperator} #{modifyTime} + + + and SAR_STAND_ATTR_DETAILS.modify_time >= #{modifyTime1} + + + and SAR_STAND_ATTR_DETAILS.modify_time <= #{modifyTime2} + + + and attr_len ${attrLenOperator} #{attrLen} + + + and SAR_STAND_ATTR_DETAILS.sar_type like concat(concat('%',#{sarType}),'%') + + + and is_search = #{isSearch} + + + and is_warn = #{isWarn} + + + and SAR_STAND_ATTR_DETAILS.ID != #{notId} + + + and SAR_STAND_ATTR_DETAILS.ID in + + #{item} + + + + + + + + + insert into SAR_STAND_ATTR_DETAILS() + values (#{id, jdbcType=VARCHAR}, #{attrField, jdbcType=VARCHAR}, #{attrName, jdbcType=VARCHAR}, #{attrType, jdbcType=VARCHAR}, #{orderNum, jdbcType=VARCHAR}, #{isEdit, jdbcType=VARCHAR}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{attrLen, jdbcType=VARCHAR}) + + + + + + insert into SAR_STAND_ATTR_DETAILS + + id, + attr_field, + attr_name, + attr_type, + order_num, + is_edit, + creation_user, + valid_flag, + creation_time, + modify_time, + attr_len, + is_must, + is_show_imp, + show_region_id, + sel_val, + sar_type, + is_search, + is_warn, + + + #{id, jdbcType=VARCHAR}, + #{attrField, jdbcType=VARCHAR}, + #{attrName, jdbcType=VARCHAR}, + #{attrType, jdbcType=VARCHAR}, + #{orderNum, jdbcType=VARCHAR}, + #{isEdit, jdbcType=VARCHAR}, + #{creationUser, jdbcType=VARCHAR}, + #{validFlag, jdbcType=VARCHAR}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{attrLen, jdbcType=VARCHAR}, + #{isMust, jdbcType=VARCHAR}, + #{isShowImp, jdbcType=VARCHAR}, + #{showRegionId, jdbcType=VARCHAR}, + #{selVal, jdbcType=VARCHAR}, + #{sarType, jdbcType=VARCHAR}, + #{isSearch, jdbcType=VARCHAR}, + #{isWarn, jdbcType=VARCHAR}, + + + + + + update SAR_STAND_ATTR_DETAILS + set attr_field = #{attrField}, + attr_name = #{attrName}, + attr_type = #{attrType}, + order_num = #{orderNum}, + is_edit = #{isEdit}, + creation_user = #{creationUser}, + valid_flag = #{validFlag}, + creation_time = #{creationTime}, + modify_time = #{modifyTime}, + attr_len = #{attrLen} + where id = #{id} + + + + + update SAR_STAND_ATTR_DETAILS + + + attr_field = #{attrField}, + + + attr_name = #{attrName}, + + + attr_type = #{attrType}, + + + order_num = #{orderNum}, + + + is_edit = #{isEdit}, + + + creation_user = #{creationUser}, + + + valid_flag = #{validFlag}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + attr_len = #{attrLen}, + + + is_must = #{isMust}, + + + is_show_imp = #{isShowImp}, + + + show_region_id = #{showRegionId}, + + + sel_val = #{selVal}, + + + sar_type = #{sarType}, + + + is_search = #{isSearch}, + + + is_warn = #{isWarn}, + + + where id = #{id} + + + + + + + + delete from SAR_STAND_ATTR_DETAILS + where id = #{value} and valid_flag=0 + + + + + + + + + + + + + delete from SAR_STAND_ATTR_DETAILS + where id in + + #{item} + + + + + + + + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml new file mode 100644 index 00000000..471e17c1 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, use_model, att_id, stand_id, id,file_suffix,file_name,stand_file_classify, + password,creation_user,ori_att_id + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and use_model ${useModelOperator} #{useModel} + + + and att_id ${attIdOperator} #{attId} + + + and stand_id ${standIdOperator} #{standId} + + + and id ${idOperator} #{id} + + + + + + + + insert into SAR_STAND_FILE() + values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, + #{useModel, jdbcType=VARCHAR}, #{attId, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR},#{fileSuffix, jdbcType=VARCHAR},#{fileName, jdbcType=VARCHAR},#{standFileClassify, jdbcType=VARCHAR}, + #{password, jdbcType=VARCHAR},#{creationUser, jdbcType=VARCHAR}) + + + + + insert into SAR_STAND_FILE + + modify_time, + creation_time, + valid_flag, + use_model, + att_id, + stand_id, + id, + file_suffix, + file_name, + stand_file_classify, + password, + creation_user, + ori_att_id, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{useModel, jdbcType=VARCHAR}, + #{attId, jdbcType=VARCHAR}, + #{standId, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + #{fileSuffix, jdbcType=VARCHAR}, + #{fileName, jdbcType=VARCHAR}, + #{standFileClassify, jdbcType=VARCHAR}, + #{password, jdbcType=VARCHAR}, + #{creationUser, jdbcType=VARCHAR}, + #{oriAttId, jdbcType=VARCHAR}, + + + + + + update SAR_STAND_FILE + + + ori_att_id = #{oriAttId}, + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + use_model = #{useModel}, + + + att_id = #{attId}, + + + stand_id = #{standId}, + + + where id = #{id} + + + + + + + + delete from SAR_STAND_FILE + where id = #{value} + + + + + + + + + + + + + + + + + + + + + + + + delete from SAR_STAND_FILE + where stand_id = #{value} + + + + + insert into SAR_STAND_FILE + () + values + + (#{item.modifyTime, jdbcType=TIMESTAMP}, + #{item.creationTime, jdbcType=TIMESTAMP}, + #{item.validFlag, jdbcType=INTEGER}, + #{item.useModel, jdbcType=VARCHAR}, + #{item.attId, jdbcType=VARCHAR}, + #{item.standId, jdbcType=VARCHAR}, + #{item.id, jdbcType=VARCHAR}, + #{item.fileSuffix, jdbcType=VARCHAR}, + #{item.fileName, jdbcType=VARCHAR}, + #{item.standFileClassify, jdbcType=VARCHAR}, + #{item.password, jdbcType=VARCHAR}, + #{item.creationUser, jdbcType=VARCHAR}, + #{item.oriAttId, jdbcType=VARCHAR}) + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml new file mode 100644 index 00000000..cc1ca549 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml @@ -0,0 +1,844 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SAR_STANDARDS_INFO.id, SAR_STANDARDS_INFO.stand_type, SAR_STANDARDS_INFO.country, SAR_STANDARDS_INFO.stand_sort, + SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name, + SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time, + SAR_STANDARDS_INFO.synopsis, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag, + SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,SAR_STANDARDS_INFO.is_relate_access,SAR_STANDARDS_INFO.cite_stand,SAR_STANDARDS_INFO.cited_stand + + + + SAR_STANDARDS_INFO.id, SAR_STANDARDS_INFO.stand_type, SAR_STANDARDS_INFO.country, SAR_STANDARDS_INFO.stand_sort, + SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name, + SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time, + concat(SAR_STANDARDS_INFO.synopsis, '') as synopsis, concat(replace_stand_num, '') as replace_stand_num, replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag, + SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME as countryShow, dicstandSort.DIC_TYPE_NAME as standSortShow, + dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,is_relate_access,cite_stand,cited_stand + + + + SAR_STANDARDS_INFO.id, SAR_STANDARDS_INFO.stand_type, SAR_STANDARDS_INFO.country, SAR_STANDARDS_INFO.stand_sort, + SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name, + SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time, + concat(SAR_STANDARDS_INFO.synopsis, ''), concat(replace_stand_num, ''), replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag, + SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME, dicstandSort.DIC_TYPE_NAME, + dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand + + + + + where 1=1 and SAR_STANDARDS_INFO.valid_flag=0 + + + and id ${idOperator} #{id} + + + and stand_type ${standTypeOperator} #{standType} + + + and country ${countryOperator} #{country} + + + and stand_sort ${standSortOperator} #{standSort} + + + and stand_number ${standNumberOperator} #{standNumber} + + + and stand_year ${standYearOperator} #{standYear} + + + and stand_name ${standNameOperator} #{standName} + + + and stand_en_name ${standEnNameOperator} #{standEnName} + + + and stand_state ${standStateOperator} #{standState} + + + and stand_nature ${standNatureOperator} #{standNature} + + + and issue_time ${issueTimeOperator} #{issueTime} + + + and issue_time >= #{issueTime1} + + + and issue_time <= #{issueTime2} + + + and put_time ${putTimeOperator} #{putTime} + + + and put_time >= #{putTime1} + + + and put_time <= #{putTime2} + + + and synopsis ${synopsisOperator} #{synopsis} + + + and replace_stand_num ${replaceStandNumOperator} #{replaceStandNum} + + + and replaced_stand_num ${replacedStandNumOperator} #{replacedStandNum} + + + and creation_user ${creationUserOperator} #{creationUser} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and is_relate_access = #{isRelateAccess} + + + + + + + insert into SAR_STANDARDS_INFO() + values (#{id, jdbcType=VARCHAR}, #{standType, jdbcType=VARCHAR}, #{country, jdbcType=VARCHAR}, #{standSort, jdbcType=VARCHAR}, #{standNumber, jdbcType=VARCHAR}, #{standYear, jdbcType=VARCHAR}, #{standName, jdbcType=VARCHAR}, #{standEnName, jdbcType=VARCHAR}, #{standState, jdbcType=VARCHAR}, #{standNature, jdbcType=VARCHAR}, #{issueTime, jdbcType=TIMESTAMP}, #{putTime, jdbcType=TIMESTAMP}, #{synopsis, jdbcType=CLOB}, #{replaceStandNum, jdbcType=CLOB}, #{replacedStandNum, jdbcType=VARCHAR}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}) + + + + + insert into SAR_STANDARDS_INFO + + id, + stand_type, + country, + stand_sort, + stand_number, + stand_year, + stand_name, + stand_en_name, + stand_state, + stand_nature, + issue_time, + put_time, + synopsis, + replace_stand_num, + replaced_stand_num, + creation_user, + valid_flag, + creation_time, + modify_time, + is_relate_access, + cite_stand, + cited_stand, + + + #{id, jdbcType=VARCHAR}, + #{standType, jdbcType=VARCHAR}, + #{country, jdbcType=VARCHAR}, + #{standSort, jdbcType=VARCHAR}, + #{standNumber, jdbcType=VARCHAR}, + #{standYear, jdbcType=VARCHAR}, + #{standName, jdbcType=VARCHAR}, + #{standEnName, jdbcType=VARCHAR}, + #{standState, jdbcType=VARCHAR}, + #{standNature, jdbcType=VARCHAR}, + #{issueTime, jdbcType=VARCHAR}, + #{putTime, jdbcType=TIMESTAMP}, + #{synopsis, jdbcType=CLOB}, + #{replaceStandNum, jdbcType=CLOB}, + #{replacedStandNum, jdbcType=VARCHAR}, + #{creationUser, jdbcType=VARCHAR}, + #{validFlag, jdbcType=VARCHAR}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{isRelateAccess, jdbcType=VARCHAR}, + #{citeStand, jdbcType=VARCHAR}, + #{citedStand, jdbcType=VARCHAR}, + + + + + + update SAR_STANDARDS_INFO + set stand_type = #{standType}, + country = #{country}, + stand_sort = #{standSort}, + stand_number = #{standNumber}, + stand_year = #{standYear}, + stand_name = #{standName}, + stand_en_name = #{standEnName}, + stand_state = #{standState}, + stand_nature = #{standNature}, + issue_time = #{issueTime}, + put_time = #{putTime}, + synopsis = #{synopsis}, + replace_stand_num = #{replaceStandNum}, + replaced_stand_num = #{replacedStandNum}, + creation_user = #{creationUser}, + valid_flag = #{validFlag}, + creation_time = #{creationTime}, + modify_time = #{modifyTime} + where id = #{id} + + + + + update SAR_STANDARDS_INFO + + + stand_type = #{standType}, + + + country = #{country}, + + + stand_sort = #{standSort}, + + + stand_number = #{standNumber}, + + + stand_year = #{standYear}, + + + stand_name = #{standName}, + + + stand_en_name = #{standEnName}, + + + stand_state = #{standState}, + + + stand_nature = #{standNature}, + + + issue_time = #{issueTime}, + + + put_time = #{putTime}, + + + synopsis = #{synopsis}, + + + replace_stand_num = #{replaceStandNum}, + + + replaced_stand_num = #{replacedStandNum}, + + + creation_user = #{creationUser}, + + + valid_flag = #{validFlag}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + is_relate_access = #{isRelateAccess}, + + + cite_stand = #{citeStand}, + + + cited_stand = #{citedStand}, + + + where id = #{id} + + + + + + + + delete from SAR_STANDARDS_INFO + where id = #{value} + + + + + + + + + + + + + left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is + not null and dicountry.valid_flag = 0) + left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and + dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) + left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and + dicstandState.dic_id is not null and dicstandState.valid_flag = 0 ) + left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and + dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) + left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id + left join SAR_MENU on SAR_STAND_MENU.menu_id = SAR_MENU.id + left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) + left join TS_PERSON_COLLECT on (TS_PERSON_COLLECT.COLLECT_RES_ID = SAR_STANDARDS_INFO.id and TS_PERSON_COLLECT.VALID_FLAG=0) + where 1=1 and SAR_STANDARDS_INFO.valid_flag=0 + + + + and stand_type = #{standType} + + + + + and country = #{country} + + + + and ( + (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', + SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '') + or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{standNumber}),'%') + and SAR_STANDARDS_INFO.STAND_YEAR = '') + or (stand_name like concat(concat('%',#{standNumber}),'%')) + ) + +-- 精准查询时使用 + + and ( + (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', + SAR_STANDARDS_INFO.STAND_YEAR) = #{standNumber} and SAR_STANDARDS_INFO.STAND_YEAR != '') + or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) = #{standNumber} + and SAR_STANDARDS_INFO.STAND_YEAR = '') + or (stand_name = #{standNumber} + ) + + + + + and stand_name like concat(concat('%',#{standName}),'%') + + + and stand_en_name like concat(concat('%',#{standEnName}),'%') + + + + and stand_state = #{standState} + + + + + and stand_nature = #{standNature} + + + + and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%') + + + + and replaced_stand_num like concat(concat('%',#{replacedStandNum}),'%') + + + + and SAR_STAND_MENU.MENU_ID in + + #{item} + + + + + + + + + + + + + + + + and SAR_STAND_MENU.MENU_ID in + + #{item} + + + + + + + + + + + + and SAR_STANDARDS_INFO.id in + + #{item} + + + + and SAR_STANDARDS_INFO.stand_sort = #{standSort} + + + + AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0 + + + and SAR_STANDARDS_INFO.id in ( + select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0 + and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND') + and TS_PERSON_COLLECT.user_id=#{userId} + ) + + + and SAR_STAND_ATTR_INFO.GXHBQ is not null + + + and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{labelMenuId}),'%') + + + and SAR_STAND_ATTR_INFO.SYCLLX = #{applyArctic} + + + and is_relate_access = #{isRelateAccess} + + + and (${advanceSearchStr}) + + + + + + + + + + + + + + + + + + + + + + + + update SAR_STANDARDS_INFO set + stand_state=#{standState} where 1=1 and valid_flag=0 + + and stand_sort = #{standSort} + + + and stand_Number = #{standNumber} + + + and stand_year = #{standYear} + + + + + + + delete from SAR_STANDARDS_INFO + where id = #{id} and valid_flag=1 + + + + update SAR_STANDARDS_INFO set REPLACED_STAND_NUM = #{replacedStandNum} where id = #{id} + + + + update SAR_STANDARDS_INFO set CITED_STAND = #{citedStand} where id = #{id} + + + + + + + + + + + + + + + + + + + + + update SAR_STANDARDS_INFO set stand_state = #{state} + where id in + + #{item} + + + + + + + diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java index a2be6996..1d3054c2 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java @@ -157,11 +157,11 @@ public class PersonCollectEOController extends BaseController { **/ @ApiOperation(value = "取消收藏") @PutMapping("/updateByUserId") -// @RequiresPermissions("person:personCollect:updateByUserId") +// @RequiresPermissions("person:personCollect:updateByUserId") PersonCollectEO public ResponseMessage updateByUserId(PersonCollectEO personCollectEO) throws Exception { personCollectEO.setValidFlag(1); - boolean result = personCollectEOService.updateById(personCollectEO); - if(result){ + int result = personCollectEOService.updateByPrimaryKeySelective(personCollectEO); + if(result == 1){ return Result.success("0","取消成功",personCollectEO); } else { return Result.error("0","取消失败",personCollectEO); diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java index af760448..26c07001 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java @@ -34,4 +34,6 @@ public interface PersonCollectEODao extends BaseMapper { int deleteByResIdList(@Param("idList") List idList); + int updateByPrimaryKeySelective(PersonCollectEO personCollectEO); + } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java index 9e3a673b..e275d28a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java @@ -20,4 +20,6 @@ public interface IPersonCollectEOService extends IService { public int deleteByResId(String resId); + int updateByPrimaryKeySelective(PersonCollectEO personCollectEO) throws Exception; + } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java index eb744b72..9035db87 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java @@ -2,6 +2,7 @@ package com.adc.da.person.service.impl; import com.adc.da.base.page.BasePage; import com.adc.da.person.dao.PersonCollectEODao; +import com.adc.da.person.dao.PersonConfEODao; import com.adc.da.person.dao.PersonNoteEODao; import com.adc.da.person.entity.PersonCollectEO; import com.adc.da.person.entity.PersonNoteEO; @@ -33,6 +34,8 @@ public class PersonCollectEOServiceImpl extends ServiceImpl 0) { + orderField = this.orderBy; + } + + if (orderField.trim().length() > 0 && this.order != null && this.order.trim().length() > 0) { + orderField = orderField + " " + this.order; + } + + this.pager.setOrderField(orderField); + return this.pager; + } + + public void setPager(Pager pager) { + this.pager = pager; + } + + public Integer getPage() { + return this.page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getPageSize() { + return this.pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public String getOrderBy() { + return this.orderBy; + } + + public void setOrderBy(String orderBy) { + this.orderBy = orderBy; + } + + public String getOrder() { + return this.order; + } + + public void setOrder(String order) { + this.order = order; + } + + public String getQ() { + return this.q; + } + + public void setQ(String q) { + this.q = q; + } + + public Integer getStartIndex() { + return this.startIndex; + } + + public void setStartIndex(Integer startIndex) { + this.startIndex = (this.page - 1) * this.pageSize + 1; + } + + public Integer getEndIndex() { + return this.endIndex; + } + + public void setEndIndex(Integer endIndex) { + this.endIndex = this.page * this.pageSize; + } +} From f59419de626b095cc04a7d5d8dd99b7b962013fb Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 8 Jul 2021 14:00:51 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E5=85=B8=20=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarMenuStandardController.java | 76 ++++++++++ .../dao/SarMenuStandardDao.java | 17 +++ .../entity/SarMenuStandard.java | 107 ++++++++++++++ .../service/ISarMenuStandardService.java | 51 +++++++ .../impl/SarMenuStandardServiceImpl.java | 137 ++++++++++++++++++ .../sarMenuStandard/SarMenuStandardMapper.xml | 5 + 6 files changed, 393 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/dao/SarMenuStandardDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandard.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/sarMenuStandard/SarMenuStandardMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardController.java new file mode 100644 index 00000000..34ebbbb5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardController.java @@ -0,0 +1,76 @@ +package com.adc.da.slrs.sarMenuStandard.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarMenu.entity.SarMenu; +import com.adc.da.slrs.sarMenu.service.ISarMenuService; +import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardService; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** +*

    + * 前端控制器 + *

    +* +* @author super_liu +* @since 2021-07-07 +*/ +@RestController +@Api(tags = "福田标准法规--标准法规库-菜单标准体系") +@RequestMapping("/${restPath}/lawss/sarMenuStandard") +public class SarMenuStandardController extends BaseController { + + @Autowired + private ISarMenuStandardService iSarMenuStandardService; + + @ApiOperation("查询所有菜单") + @GetMapping + public ResponseMessage> getAll(@RequestParam String dicId){ + List sarMenus=iSarMenuStandardService.getAll(dicId); + return Result.success(sarMenus); + } + + @ApiOperation("根据ID查询菜单") + @GetMapping("/getSarMenuStandardById") + public ResponseMessage getSarMenuStandardById(@RequestParam String menuId){ + SarMenuStandard sarMenus = iSarMenuStandardService.getById(menuId); + if(sarMenus != null && sarMenus.getParentIds() != null && StringUtils.isNotBlank(sarMenus.getParentIds())){ + List menuStandards = iSarMenuStandardService.getMenuByIds(Arrays.asList(sarMenus.getParentIds().split(","))); + if(!menuStandards.isEmpty()){ + String parentIdsName = menuStandards.stream().map(SarMenuStandard::getMenuName).collect(Collectors.joining(",")); + sarMenus.setParentIdsName(parentIdsName); + } + } + return Result.success(sarMenus); + } + + @ApiOperation("添加菜单") + @PostMapping("/add") + public ResponseMessage addMenu(@RequestBody SarMenuStandard sarMenu){ + return iSarMenuStandardService.addMenu(sarMenu); + } + + @ApiOperation("编辑菜单") + @PutMapping + public ResponseMessage updateMenu(@Validated(SarMenuStandard.update.class) @RequestBody SarMenuStandard sarMenu){ + return iSarMenuStandardService.updateMenu(sarMenu); + } + + @ApiOperation("删除菜单") + @DeleteMapping + public ResponseMessage delMenu(@RequestParam String menuId){ + return iSarMenuStandardService.delMenu(menuId); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/dao/SarMenuStandardDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/dao/SarMenuStandardDao.java new file mode 100644 index 00000000..838bb7f5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/dao/SarMenuStandardDao.java @@ -0,0 +1,17 @@ +package com.adc.da.slrs.sarMenuStandard.dao; + +import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + *

    + * Mapper 接口 + *

    + * + * @author super_liu + * @since 2021-07-07 + */ +public interface SarMenuStandardDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandard.java new file mode 100644 index 00000000..cec9006c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandard.java @@ -0,0 +1,107 @@ +package com.adc.da.slrs.sarMenuStandard.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.utils.treetool.annotation.TreeNodeName; +import com.adc.da.utils.treetool.annotation.TreeNodeParentId; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; + +/** + *

    + * + *

    + * + * @author super_liu + * @since 2021-07-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarMenuStandard对象", description="") +public class SarMenuStandard extends BaseEntity { + public interface update{ + } + + private static final long serialVersionUID = 1L; + + @NotNull(message = "id不能为空",groups = {update.class}) + @ApiModelProperty(value = "主键") + @TableId(value = "ID",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "标准法规划分") + @TableField("SOR_DIVIDE") + private String sorDivide; + + @TreeNodeName + @ApiModelProperty(value = "目录名称") + @TableField("MENU_NAME") + private String menuName; + + @TreeNodeParentId + @ApiModelProperty(value = "父级ID") + @TableField("PARENT_ID") + private String parentId; + + @ApiModelProperty(value = "父级ID集合") + @TableField("PARENT_IDS") + private String parentIds; + + @ApiModelProperty(value = "排序序号") + @TableField("DISPLAY_SEQ") + private Integer displaySeq; + + @ApiModelProperty(value = "路径") + @TableField("HREF") + private String href; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private Integer validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + @ApiModelProperty(value = "备注") + @TableField("REMARKS") + private String remarks; + + @ApiModelProperty(value = "数据字典ID") + @TableField("DIC_ID") + private String dicId; + + @ApiModelProperty(value = "子菜单") + @TableField(exist = false) + private List children; + + @TableField(exist=false) + private List roleIds; + + @TableField(exist=false) + private List childMenuIds; + + @TableField(exist=false) + private String parentIdsName; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardService.java new file mode 100644 index 00000000..add1f398 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardService.java @@ -0,0 +1,51 @@ +package com.adc.da.slrs.sarMenuStandard.service; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

    + * 服务类 + *

    + * + * @author super_liu + * @since 2021-07-07 + */ +public interface ISarMenuStandardService extends IService { + + /** + * 查询所有菜单 + */ + List getAll(String dicId); + + /** + * 添加菜单 + * @param sarMenu：菜单信息 + * @return ResponseMessage + */ + ResponseMessage addMenu(SarMenuStandard sarMenu); + + /** + * 编辑菜单 + * @param sarMenu：菜单信息 + * @return ResponseMessage + */ + ResponseMessage updateMenu(SarMenuStandard sarMenu); + + /** + * 删除菜单 + * @param menuId ：菜单ID + * @return ResponseMessage + */ + ResponseMessage delMenu(String menuId); + + /** + * 通过Ids查询menu + * @param menuIds :菜单Ids + * @return List + */ + List getMenuByIds(List menuIds); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java new file mode 100644 index 00000000..a544f8db --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java @@ -0,0 +1,137 @@ +package com.adc.da.slrs.sarMenuStandard.service.impl; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarMenu.entity.SarMenu; +import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; +import com.adc.da.slrs.sarMenuStandard.dao.SarMenuStandardDao; +import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + *

    + * 服务实现类 + *

    + * + * @author super_liu + * @since 2021-07-07 + */ +@Service +public class SarMenuStandardServiceImpl extends ServiceImpl implements ISarMenuStandardService { + + @Autowired + private SarMenuStandardDao dao; + + /** + * 查询所有菜单 + */ + @Override + public List getAll(String dicId) { + QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); + sarMenuQueryWrapper.eq("DIC_ID",dicId); + sarMenuQueryWrapper.orderByAsc("DISPLAY_SEQ"); + sarMenuQueryWrapper.isNull("PARENT_ID"); + List sarMenus=dao.selectList(sarMenuQueryWrapper); + for(SarMenuStandard sarMenu:sarMenus){ + sarMenu.setChildren(recursionGetChildren((sarMenu))); + } + return sarMenus; + } + + /** + * 添加菜单 + * @param sarMenu：菜单信息 + * @return ResponseMessage + */ + @Override + public ResponseMessage addMenu(SarMenuStandard sarMenu) { + SarMenuStandard save = new SarMenuStandard(); + if(sarMenu.getParentId() != null && StringUtils.isNotBlank(sarMenu.getParentId())){ + SarMenuStandard parent=dao.selectById(sarMenu.getParentId()); + if(parent==null){ + return Result.error("该父菜单不存在"); + } + } + sarMenu.setCreationTime(new Date()); + sarMenu.setModifyTime(new Date()); + dao.insert(sarMenu); + return Result.success(); + } + + /** + * 编辑菜单 + * @param sarMenu：菜单信息 + * @return ResponseMessage + */ + @Override + public ResponseMessage updateMenu(SarMenuStandard sarMenu) { + SarMenuStandard oldMenu=dao.selectById(sarMenu.getId()); + if(oldMenu==null){ + return Result.error("该菜单不存在"); + } + if(sarMenu.getParentId() != null && StringUtils.isNotBlank(sarMenu.getParentId())){ + SarMenuStandard parent=dao.selectById(sarMenu.getParentId()); + if(parent==null){ + return Result.error("父节点不存在"); + } + } + dao.updateById(sarMenu); + return Result.success(); + } + + /** + * 删除菜单 + * @param menuId ：菜单ID + * @return ResponseMessage + */ + @Override + public ResponseMessage delMenu(String menuId) { + QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); + sarMenuQueryWrapper.eq("parent_id",menuId); + List children=dao.selectList(sarMenuQueryWrapper); + if(children !=null && !children.isEmpty()){ + return Result.error("该菜单有子节点，无法删除"); + } + dao.deleteById(menuId); + return Result.success(); + } + + /** + * 通过Ids查询menu + * @param menuIds :菜单Ids + * @return List + */ + @Override + public List getMenuByIds(List menuIds) { + if(menuIds!=null&&menuIds.size()>0){ + QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); + sarMenuQueryWrapper.in("id",menuIds); + return dao.selectList(sarMenuQueryWrapper); + } + return new ArrayList<>(); + } + + /** + * 递归调用获取子节点 + * @param parent：父节点 + * @return List + */ + private List recursionGetChildren(SarMenuStandard parent){ + QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); + sarMenuQueryWrapper.orderByAsc("DISPLAY_SEQ"); + sarMenuQueryWrapper.eq("PARENT_ID",parent.getId()); + List children=dao.selectList(sarMenuQueryWrapper); + for(SarMenuStandard sarMenu:children){ + sarMenu.setChildren(recursionGetChildren((sarMenu))); + } + return children; + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarMenuStandard/SarMenuStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarMenuStandard/SarMenuStandardMapper.xml new file mode 100644 index 00000000..4f4bb0b0 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarMenuStandard/SarMenuStandardMapper.xml @@ -0,0 +1,5 @@ + + + + + From 8aade0862c734df91bcf2186538ac487572baaa6 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Thu, 8 Jul 2021 14:06:07 +0800 Subject: [PATCH 7/7] =?UTF-8?q?add:=E4=BA=A7=E5=93=81=E7=BA=BF=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=8F=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 25 ++++++++++++++++--- .../entity/SarStandProjectLibrary.java | 3 +++ .../entity/SarStandProjectLibraryDto.java | 6 ++++- .../entity/productLineDto.java | 15 +++++++++++ .../SarStandProjectLibraryService.java | 3 +++ .../SarStandProjectLibraryServiceImpl.java | 22 ++++++++++++++++ 6 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 4bd89a81..39cb0fb4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; +import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -17,9 +18,7 @@ import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

    @@ -70,5 +69,25 @@ public class SarStandProjectLibraryController extends BaseController list1 = sarStandProjectLibraryService.queryProjectManager(); + // 创建一个新的list集合，用于存储去重后的元素 + List listTemp = new ArrayList(); + for (SarStandProjectLibrary sarStandProjectLibrary:list1){ + productLineDto p = new productLineDto(); + p.setProductLine(sarStandProjectLibrary.getProductLine()); + p.setProjectManager(sarStandProjectLibrary.getProjectManager()); + List list2 = sarStandProjectLibraryService.queryByProductLine(sarStandProjectLibrary.getProductLine()); + p.setSarStandProjectLibraries(list2); + listTemp.add(p); + } + System.out.println(listTemp); + + return Result.success("200",listTemp); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index e8843c2d..d4e8b803 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -60,6 +60,9 @@ public class SarStandProjectLibrary extends BaseEntity { @ApiModelProperty(value = "项目级别") private String projectLevel; + @ApiModelProperty(value = "产品线") + private String productLine; + private String projectManager; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java index 6f68f8ab..1046c618 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java @@ -3,7 +3,8 @@ package com.adc.da.slrs.sarStandProjectLibrary.entity; import lombok.Data; -import java.util.Date; +import java.util.List; + /** * //TODO @@ -35,4 +36,7 @@ public class SarStandProjectLibraryDto { private String projectLevel; private String projectManager; + + private String productLine; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java new file mode 100644 index 00000000..11a2aed8 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class productLineDto { + + private String projectManager; + + private String productLine; + + private List sarStandProjectLibraries; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 49eedc33..8e9dcb06 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.service; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; +import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; @@ -10,4 +11,6 @@ public interface SarStandProjectLibraryService { IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); List queryById(String id); + List queryProjectManager(); + List queryByProductLine(String productLine); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 7ec7f63b..04dfe995 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; +import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; import com.adc.da.slrs.sarStandProjectLibrary.service.SarStandProjectLibraryService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -43,6 +44,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager() { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("product_line","project_manager"); + wrapper.groupBy("product_line"); + List list = sarStandProjectLibraryDao.selectList(wrapper); + return list; + } + + @Override + public List queryByProductLine(String productLine) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("product_line",productLine); + List list = sarStandProjectLibraryDao.selectList(wrapper); + return list; + } + private IPage getSarStandProjectLibraryIPage(int current, int pageSize, QueryWrapper wrapper) { Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);