From ed74013e33d17466f7319983a04814a131dfc748 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Fri, 29 Sep 2023 15:23:11 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=88=A0=E9=99=A4=E3=80=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=A7=E6=94=B6=E8=97=8F=E7=9A=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=20=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9E=9A=E4=B8=BE=E8=BF=81=E7=A7=BB=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E5=88=B0=E6=AF=94=E8=BE=83=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OnlCgformCollectionController.java | 171 -------- .../PhoneOnlCgformCollectionController.java | 161 -------- .../entity/OnlCgformCollection.java | 67 ---- .../mapper/OnlCgformCollectionMapper.java | 27 -- .../service/IOnlCgformCollectionService.java | 79 ---- .../impl/OnlCgformCollectionServiceImpl.java | 372 ------------------ .../SarFileCompareInfoController.java | 2 +- .../enums/ReleaseConditionEnum.java | 2 +- .../impl/SarFileCompareInfoServiceImpl.java | 2 +- 9 files changed, 3 insertions(+), 880 deletions(-) delete mode 100644 laws-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/collection/controller/PhoneOnlCgformCollectionController.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/collection/mapper/OnlCgformCollectionMapper.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java rename laws-modules/src/main/java/com/jero/modules/{docTranslation => compare}/enums/ReleaseConditionEnum.java (96%) diff --git a/laws-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java b/laws-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java deleted file mode 100644 index d1dab0ea..00000000 --- a/laws-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java +++ /dev/null @@ -1,171 +0,0 @@ -//package com.jero.modules.collection.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import com.jero.common.api.vo.Result; -//import com.jero.common.aspect.annotation.AutoLog; -//import com.jero.common.system.base.controller.JeroController; -//import com.jero.modules.collection.entity.OnlCgformCollection; -//import com.jero.modules.collection.service.IOnlCgformCollectionService; -//import com.jero.modules.document.controller.BussDocumentLibraryEOController; -//import com.jero.modules.phone.service.ISearchCenterService; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.validation.annotation.Validated; -//import org.springframework.web.bind.annotation.*; -// -//import java.util.Arrays; -//import java.util.List; -//import java.util.Map; -// -// -///** -// * @Description: 我的收藏 -// * @Author: jero-boot -// * @Date: 2022-02-15 -// * @Version: V1.0 -// */ -//@Api(tags="我的收藏") -//@RestController -//@RequestMapping("/collection/onlCgformCollection") -//@Slf4j -//public class OnlCgformCollectionController extends JeroController { -// @Autowired -// private IOnlCgformCollectionService onlCgformCollectionService; -// @Autowired -// BussDocumentLibraryEOController bussDocumentLibraryEOService; -// @Autowired -// private ISearchCenterService searchCenterService; -// -// /** -// * 分页列表查询 -// * -// * @param params -// * @return -// */ -// @AutoLog(value = "我的收藏-分页列表查询") -// @ApiOperation(value="我的收藏-分页列表查询", notes="我的收藏-分页列表查询") -// @PostMapping(value = "/page") -// public Result queryPageList(@RequestBody Map params){ -// IPage pageList = onlCgformCollectionService.queryPageList(params); -// return Result.OK(pageList); -// } -// -// /** -// * 列表查询 -// * -// * @return -// */ -// @AutoLog(value = "我的收藏-列表查询") -// @ApiOperation(value="我的收藏-列表查询", notes="我的收藏-列表查询") -// @GetMapping(value = "/list") -// public Result> queryList(OnlCgformCollection onlCgformCollection) { -// List list = onlCgformCollectionService.queryList(onlCgformCollection); -// return Result.OK(list); -// } -// -// /** -// * 添加 -// * -// * @param onlCgformCollection -// * @return -// */ -// @AutoLog(value = "我的收藏-添加") -// @ApiOperation(value="我的收藏-添加", notes="我的收藏-添加") -// @PostMapping(value = "/add") -// public Result add(@Validated @RequestBody OnlCgformCollection onlCgformCollection) { -// LambdaQueryWrapper lambdaQueryWrapper= new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.eq(OnlCgformCollection::getId,onlCgformCollection.getDocumentId()) -// .eq(OnlCgformCollection::getDocumentId,onlCgformCollection.getDocumentId()); -// int count=onlCgformCollectionService.count(lambdaQueryWrapper); -// if(count==0){ -// onlCgformCollectionService.add(onlCgformCollection); -// return Result.OK("添加成功！"); -// } -// else{ -// return Result.error("该值不可重复添加，系统中已存在！"); -// } -// } -// -// /** -// * 通过id删除 -// * -// * @param id -// * @return -// */ -// @AutoLog(value = "我的收藏-通过id删除") -// @ApiOperation(value="我的收藏-通过id删除", notes="我的收藏-通过id删除") -// @PostMapping(value = "/delete") -// public Result delete(@RequestParam(name="id",required=true) String id) { -// onlCgformCollectionService.deleteById(id); -// return Result.OK("删除成功!"); -// } -// -// /** -// * 批量删除 -// * -// * @param ids -// * @return -// */ -// @AutoLog(value = "我的收藏-批量删除") -// @ApiOperation(value="我的收藏-批量删除", notes="我的收藏-批量删除") -// @PostMapping(value = "/deleteBatch") -// public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { -// this.onlCgformCollectionService.deleteByIds(Arrays.asList(ids.split(","))); -// return Result.OK("批量删除成功!"); -// } -// -// /** -// * 通过id查询 -// * -// * @param id -// * @return -// */ -// @AutoLog(value = "我的收藏-通过id查询") -// @ApiOperation(value="我的收藏-通过id查询", notes="我的收藏-通过id查询") -// @GetMapping(value = "/queryById") -// public Result queryById(@RequestParam(name="id",required=true) String id) { -// OnlCgformCollection onlCgformCollection = onlCgformCollectionService.queryById(id); -// if(onlCgformCollection==null) { -// return Result.error("未找到对应数据"); -// } -// return Result.OK(onlCgformCollection); -// } -// -// /** -// * 表头中英文切换 -// * -// * @return -// */ -// @AutoLog(value = "我的收藏-表头中英文切换") -// @ApiOperation(value="我的收藏-表头中英文切换", notes="我的收藏-表头中英文切换") -// @GetMapping(value = "/getHeader") -// public Result>> getHeader(@RequestParam(name = "flag") String flag, -// @RequestParam(name = "cut") String cut) { -// List> list =onlCgformCollectionService.getHeader(flag, cut); -// return Result.OK(list); -// } -// -// /** -// * 查询条件中英文切换 -// * -// * @return -// */ -// @AutoLog(value = "我的收藏-查询条件中英文切换") -// @ApiOperation(value="我的收藏-查询条件中英文切换", notes="我的收藏-查询条件中英文切换") -// @GetMapping(value = "/queryCondition") -// public Result>> queryCondition(@RequestParam(name = "flag") String flag, -// @RequestParam(name = "cut") String cut) { -// List> list = onlCgformCollectionService.queryCondition(flag, cut); -// return Result.OK(list); -// } -// -// @AutoLog(value = "我的收藏-搜索-根据用户获取文档库订阅和收藏信息") -// @ApiOperation(value = "我的收藏-搜索-根据用户获取文档库订阅和收藏信息", notes = "我的收藏-搜索-根据用户获取文档库订阅和收藏信息") -// @GetMapping(value = "/getWdkCollectAndSubscribeInfoByUser") -// public Result> getWdkCollectAndSubscribeInfoByUser(@RequestParam Map params) { -// return this.searchCenterService.getWdkCollectAndSubscribeInfoByUser(params); -// } -//} diff --git a/laws-modules/src/main/java/com/jero/modules/collection/controller/PhoneOnlCgformCollectionController.java b/laws-modules/src/main/java/com/jero/modules/collection/controller/PhoneOnlCgformCollectionController.java deleted file mode 100644 index 8bd6be01..00000000 --- a/laws-modules/src/main/java/com/jero/modules/collection/controller/PhoneOnlCgformCollectionController.java +++ /dev/null @@ -1,161 +0,0 @@ -//package com.jero.modules.collection.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import com.jero.common.api.vo.Result; -//import com.jero.common.aspect.annotation.AutoLog; -//import com.jero.common.system.base.controller.JeroController; -//import com.jero.modules.collection.entity.OnlCgformCollection; -//import com.jero.modules.collection.service.IOnlCgformCollectionService; -//import com.jero.modules.document.controller.BussDocumentLibraryEOController; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.validation.annotation.Validated; -//import org.springframework.web.bind.annotation.*; -// -//import java.util.Arrays; -//import java.util.List; -//import java.util.Map; -// -// -///** -// * @Description: 我的收藏 -// * @Author: jero-boot -// * @Date: 2022-02-15 -// * @Version: V1.0 -// */ -//@Api(tags="我的收藏") -//@RestController -//@RequestMapping("/phone/collection/onlCgformCollection") -//@Slf4j -//public class PhoneOnlCgformCollectionController extends JeroController { -// @Autowired -// private IOnlCgformCollectionService onlCgformCollectionService; -// @Autowired -// BussDocumentLibraryEOController bussDocumentLibraryEOService; -// -// /** -// * 分页列表查询 -// * -// * @param params -// * @return -// */ -// @AutoLog(value = "我的收藏-分页列表查询") -// @ApiOperation(value="我的收藏-分页列表查询", notes="我的收藏-分页列表查询") -// @PostMapping(value = "/page") -// public Result queryPageList(@RequestBody Map params){ -// IPage pageList = onlCgformCollectionService.queryPageList(params); -// return Result.OK(pageList); -// } -// -// /** -// * 列表查询 -// * -// * @return -// */ -// @AutoLog(value = "我的收藏-列表查询") -// @ApiOperation(value="我的收藏-列表查询", notes="我的收藏-列表查询") -// @GetMapping(value = "/list") -// public Result> queryList(OnlCgformCollection onlCgformCollection) { -// List list = onlCgformCollectionService.queryList(onlCgformCollection); -// return Result.OK(list); -// } -// -// /** -// * 添加 -// * -// * @param onlCgformCollection -// * @return -// */ -// @AutoLog(value = "我的收藏-添加") -// @ApiOperation(value="我的收藏-添加", notes="我的收藏-添加") -// @PostMapping(value = "/add") -// public Result add(@Validated @RequestBody OnlCgformCollection onlCgformCollection) { -// LambdaQueryWrapper lambdaQueryWrapper= new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.eq(OnlCgformCollection::getId,onlCgformCollection.getDocumentId()) -// .eq(OnlCgformCollection::getDocumentId,onlCgformCollection.getDocumentId()); -// int count=onlCgformCollectionService.count(lambdaQueryWrapper); -// if(count==0){ -// onlCgformCollectionService.add(onlCgformCollection); -// return Result.OK("添加成功！"); -// } -// else{ -// return Result.error("该值不可重复添加，系统中已存在！"); -// } -// } -// -// /** -// * 通过id删除 -// * -// * @param id -// * @return -// */ -// @AutoLog(value = "我的收藏-通过id删除") -// @ApiOperation(value="我的收藏-通过id删除", notes="我的收藏-通过id删除") -// @PostMapping(value = "/delete") -// public Result delete(@RequestParam(name="id",required=true) String id) { -// onlCgformCollectionService.deleteById(id); -// return Result.OK("删除成功!"); -// } -// -// /** -// * 批量删除 -// * -// * @param ids -// * @return -// */ -// @AutoLog(value = "我的收藏-批量删除") -// @ApiOperation(value="我的收藏-批量删除", notes="我的收藏-批量删除") -// @PostMapping(value = "/deleteBatch") -// public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { -// this.onlCgformCollectionService.deleteByIds(Arrays.asList(ids.split(","))); -// return Result.OK("批量删除成功!"); -// } -// -// /** -// * 通过id查询 -// * -// * @param id -// * @return -// */ -// @AutoLog(value = "我的收藏-通过id查询") -// @ApiOperation(value="我的收藏-通过id查询", notes="我的收藏-通过id查询") -// @GetMapping(value = "/queryById") -// public Result queryById(@RequestParam(name="id",required=true) String id) { -// OnlCgformCollection onlCgformCollection = onlCgformCollectionService.queryById(id); -// if(onlCgformCollection==null) { -// return Result.error("未找到对应数据"); -// } -// return Result.OK(onlCgformCollection); -// } -// -// /** -// * 表头中英文切换 -// * -// * @return -// */ -// @AutoLog(value = "我的收藏-表头中英文切换") -// @ApiOperation(value="我的收藏-表头中英文切换", notes="我的收藏-表头中英文切换") -// @GetMapping(value = "/getHeader") -// public Result>> getHeader(@RequestParam(name = "flag") String flag, -// @RequestParam(name = "cut") String cut) { -// List> list =onlCgformCollectionService.getHeader(flag, cut); -// return Result.OK(list); -// } -// -// /** -// * 查询条件中英文切换 -// * -// * @return -// */ -// @AutoLog(value = "我的收藏-查询条件中英文切换") -// @ApiOperation(value="我的收藏-查询条件中英文切换", notes="我的收藏-查询条件中英文切换") -// @GetMapping(value = "/queryCondition") -// public Result>> queryCondition(@RequestParam(name = "flag") String flag, -// @RequestParam(name = "cut") String cut) { -// List> list = onlCgformCollectionService.queryCondition(flag, cut); -// return Result.OK(list); -// } -//} diff --git a/laws-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java b/laws-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java deleted file mode 100644 index d6609133..00000000 --- a/laws-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java +++ /dev/null @@ -1,67 +0,0 @@ -//package com.jero.modules.collection.entity; -// -//import com.baomidou.mybatisplus.annotation.IdType; -//import com.baomidou.mybatisplus.annotation.TableId; -//import com.baomidou.mybatisplus.annotation.TableName; -//import com.fasterxml.jackson.annotation.JsonFormat; -//import com.jero.common.aspect.annotation.Dict; -//import io.swagger.annotations.ApiModel; -//import io.swagger.annotations.ApiModelProperty; -//import lombok.Data; -//import lombok.EqualsAndHashCode; -//import lombok.experimental.Accessors; -//import org.jeecgframework.poi.excel.annotation.Excel; -//import org.springframework.format.annotation.DateTimeFormat; -// -//import java.io.Serializable; -// -// -///** -// * @Description: 我的收藏 -// * @Author: jero-boot -// * @Date: 2022-02-15 -// * @Version: V1.0 -// */ -//@Data -//@TableName("onl_cgform_collection") -//@Accessors(chain = true) -//@EqualsAndHashCode(callSuper = false) -//@ApiModel(value="onl_cgform_collection对象", description="我的收藏") -//public class OnlCgformCollection implements Serializable { -// private static final long serialVersionUID = 1L; -// -// /**主键*/ -// @TableId(type = IdType.ASSIGN_ID) -// @ApiModelProperty(value = "主键") -// private String id; -// -// /**收藏人*/ -// @ApiModelProperty(value = "收藏人") -// private String createBy; -// -// /**收藏日期*/ -// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") -// @ApiModelProperty(value = "收藏日期") -// private java.util.Date createTime; -// -// /**更新人*/ -// @ApiModelProperty(value = "更新人") -// private String updateBy; -// -// /**更新日期*/ -// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") -// @ApiModelProperty(value = "更新日期") -// private java.util.Date updateTime; -// -// /**所属部门*/ -// @ApiModelProperty(value = "所属部门") -// private String sysOrgCode; -// -// /**文档库id*/ -// @Excel(name = "文档库id", width = 15, dictTable = "buss_document_library", dicText = "id", dicCode = "id") -// @Dict(dictTable = "buss_document_library", dicText = "id", dicCode = "id") -// @ApiModelProperty(value = "文档库id") -// private String documentId; -//} diff --git a/laws-modules/src/main/java/com/jero/modules/collection/mapper/OnlCgformCollectionMapper.java b/laws-modules/src/main/java/com/jero/modules/collection/mapper/OnlCgformCollectionMapper.java deleted file mode 100644 index 0afd6e19..00000000 --- a/laws-modules/src/main/java/com/jero/modules/collection/mapper/OnlCgformCollectionMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -//package com.jero.modules.collection.mapper; -// -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import com.jero.modules.collection.entity.OnlCgformCollection; -//import org.apache.ibatis.annotations.Param; -//import org.apache.ibatis.annotations.Select; -// -//import java.util.List; -//import java.util.Map; -// -///** -// * @Description: 我的收藏 -// * @Author: jero-boot -// * @Date: 2022-02-15 -// * @Version: V1.0 -// */ -//public interface OnlCgformCollectionMapper extends BaseMapper { -// -// @Select("select * from buss_document_library as document LEFT JOIN onl_cgform_collection as collection\n" + -// " on document.id= collection.document_id;") -// List queryListByDocumentId(@Param("document_id") String document_id); -// -// IPage queryPageList(IPage page,@Param("params") Map params); -// -// List> infoList(@Param("params") Map params); -//} diff --git a/laws-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java b/laws-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java deleted file mode 100644 index c942873e..00000000 --- a/laws-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java +++ /dev/null @@ -1,79 +0,0 @@ -//package com.jero.modules.collection.service; -// -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import com.baomidou.mybatisplus.extension.service.IService; -//import com.jero.modules.collection.entity.OnlCgformCollection; -// -//import java.util.List; -//import java.util.Map; -// -///** -// * @Description: 我的收藏 -// * @Author: jero-boot -// * @Date: 2022-02-15 -// * @Version: V1.0 -// */ -//public interface IOnlCgformCollectionService extends IService { -// -// /** -// * 保存 -// * -// * @param onlCgformCollection -// * @return -// */ -// void add(OnlCgformCollection onlCgformCollection); -// -// /** -// * 通过id删除 -// * -// * @param id -// * @return -// */ -// void deleteById(String id); -// -// /** -// * 批量删除 -// * -// * @param ids -// * @return -// */ -// void deleteByIds(List ids); -// -// /** -// * 通过id查询 -// * -// * @param id -// * @return -// */ -// OnlCgformCollection queryById(String id); -// -// /** -// * 列表查询 -// * -// * @return -// */ -// List queryList(OnlCgformCollection onlCgformCollection); -// -// /** -// * 列表表头中英文切换 -// * @param flag -// * @param cut -// * @return -// */ -// public List> getHeader(String flag, String cut); -// -// /** -// * 查询条件中英文切换 -// * @param flag -// * @param cut -// * @return -// */ -// public List> queryCondition(String flag, String cut); -// -// /** -// * 分页查询 -// * @param params -// * @return -// */ -// IPage queryPageList(Map params); -//} diff --git a/laws-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java deleted file mode 100644 index b0273215..00000000 --- a/laws-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java +++ /dev/null @@ -1,372 +0,0 @@ -//package com.jero.modules.collection.service.impl; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -//import com.jero.common.constant.enums.LanguageEnum; -//import com.jero.common.constant.enums.YesOrNoEnum; -//import com.jero.common.exception.JeroBootException; -//import com.jero.common.system.vo.LoginUser; -//import com.jero.generater.modules.online.cgform.entity.OnlCgformField; -//import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; -//import com.jero.modules.collection.entity.OnlCgformCollection; -//import com.jero.modules.collection.mapper.OnlCgformCollectionMapper; -//import com.jero.modules.collection.service.IOnlCgformCollectionService; -//import com.jero.modules.document.enums.LawsStateEnum; -//import com.jero.modules.ocr.util.LineHumpUtil; -//import com.jero.modules.system.entity.SysDictItem; -//import com.jero.modules.system.service.impl.SysDictItemServiceImpl; -//import org.apache.commons.collections4.CollectionUtils; -//import org.apache.commons.lang3.ObjectUtils; -//import org.apache.commons.lang3.StringUtils; -//import org.apache.shiro.SecurityUtils; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Service; -//import org.springframework.transaction.annotation.Transactional; -// -//import java.text.SimpleDateFormat; -//import java.util.*; -//import java.util.stream.Collectors; -// -///** -// * @Description: 我的收藏 -// * @Author: jero-boot -// * @Date: 2022-02-15 -// * @Version: V1.0 -// */ -//@Service -//public class OnlCgformCollectionServiceImpl extends ServiceImpl implements IOnlCgformCollectionService { -// @Autowired -// private OnlCgformFieldServiceImpl onlCgformFieldService; -// @Autowired -// OnlCgformCollectionMapper onlCgformCollectionMapper; -// @Autowired -// private SysDictItemServiceImpl sysDictItemServiceImpl; -// -// /** -// * 保存 -// * -// * @param onlCgformCollection -// * @return -// */ -// @Override -// public void add(OnlCgformCollection onlCgformCollection) { -// Date now = new Date(); -// onlCgformCollection.setCreateTime(now); -// save(onlCgformCollection); -// } -// -// -// /** -// * 通过id删除 -// * -// * @param id -// * @return -// */ -// @Override -// @Transactional -// public void deleteById(String id) { -// boolean checkData = checkData(id); -// if(!checkData){ -// throw new JeroBootException("该用户没有权限！"); -// } -// try { -// OnlCgformCollection onlCgformCollection = super.baseMapper.selectById(id); -// List documentIdList = new ArrayList<>(); -// documentIdList.add(onlCgformCollection.getDocumentId()); -// -// //删除订阅 -// //deleteSubscribe(documentIdList); -// -// removeById(id); -// }catch (Exception ex){ -// log.error("取消收藏失败：" + ex.getMessage()); -// throw new JeroBootException("取消收藏失败！"); -// } -// } -// -// /** -// * 批量删除 -// * -// * @param ids -// * @return -// */ -// @Override -// @Transactional -// public void deleteByIds(List ids) { -// for (String id : ids) { -// boolean checkData = checkData(id); -// if(!checkData){ -// throw new JeroBootException("该用户没有权限！"); -// } -// } -// try { -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.lambda().in(OnlCgformCollection::getId,ids); -// List onlCgformCollections = super.baseMapper.selectList(queryWrapper); -// List documentIdList = onlCgformCollections.stream().map(OnlCgformCollection::getDocumentId).distinct().collect(Collectors.toList()); -// -// //删除订阅 -// //deleteSubscribe(documentIdList); -// -// removeByIds(ids); -// }catch (Exception ex){ -// log.error("批量取消收藏失败：" + ex.getMessage()); -// throw new JeroBootException("批量取消收藏失败！"); -// } -// } -// -// /** -// * 通过id查询 -// * -// * @param id -// * @return -// */ -// @Override -// public OnlCgformCollection queryById(String id) { -// boolean checkData = checkData(id); -// if(!checkData){ -// throw new JeroBootException("该用户没有权限！"); -// } -// return getById(id); -// } -// -// /** -// * 列表查询 -// * -// * @return -// */ -// @Override -// public List queryList(OnlCgformCollection onlCgformCollection) { -// List list = onlCgformCollectionMapper.queryListByDocumentId(onlCgformCollection.getDocumentId()); -// return list; -// } -// -// /** -// * 列表表头中英文切换 -// * -// * @return -// */ -// @Override -// public List> getHeader(String flag, String cut) { -// List fieldList = onlCgformFieldService.getFieldList(flag); -// if (fieldList.size() != 0) { -// //过滤列表字段(is_show_list-->列表是否显示0否 1是) 过滤出需要的表头字段 -// fieldList = fieldList.stream().filter( -// e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList())) -// && ( -// e.getDbFieldEnName().equals("serial_number")||e.getDbFieldEnName().equals("title") -// ||e.getDbFieldEnName().equals("state") -// ) -// ).collect(Collectors.toList()); -// } -// List> list = new ArrayList<>(); -// for (OnlCgformField onlCgformField : fieldList) { -// Map map = new HashMap<>(); -// if ("file_name".equals(onlCgformField.getDbFieldName())) { -// //跳转详情的标识 -// map.put("click", "true"); -// } -// //单独处理发布日期和标准实施日期 -// if ("update_time".equals(onlCgformField.getDbFieldName())) { -// map.put("sort", "true");//列表排序标识 -// } -// map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段 -// if (LanguageEnum.CN.getValue().equals(cut)) { -// map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 -// } else { -// map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 -// } -// list.add(map); -// } -// return list; -// } -// -// /** -// * 查询条件中英文切换 -// * -// * @return -// */ -// @Override -// public List> queryCondition(String flag, String cut) { -// List fieldList = onlCgformFieldService.getFieldList(flag); -// if (fieldList.size() != 0) { -// //过滤出需要的搜索条件() -// fieldList = fieldList.stream().filter( -// e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery())) -// && ( -// e.getDbFieldEnName().equals("serial_number")||e.getDbFieldEnName().equals("title") -// ||e.getDbFieldEnName().equals("state") -// ) -// ).collect(Collectors.toList()); -// } -// List> list = new ArrayList<>(); -// for (OnlCgformField onlCgformField : fieldList) { -// Map map = new HashMap<>(); -// map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) -// map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码 -// map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段 -// if (LanguageEnum.CN.getValue().equals(cut)) { -// map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 -// } else { -// map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 -// } -// list.add(map); -// } -// return list; -// } -// -// @Override -// public IPage queryPageList(Map params) { -//// params.put("orderByField","serial_number"); -//// params.put("orderBy","1"); -// if(ObjectUtils.isEmpty(params.get("orderByField"))){ -// params.put("orderBy",""); -// } -// Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); -// Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); -// IPage page = new Page(pageNo, pageSize); -// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// params.put("createBy",sysUser.getUsername()); -// IPage result = new Page(); -// //表头排序（状态单独处理） -// if(ObjectUtils.isNotEmpty(params.get("orderByField")) && "state".equals((String) params.get("orderByField"))){ -// List> infoList = onlCgformCollectionMapper.infoList(params); -// result = stateSort(params,pageNo,pageSize,result,infoList); -// }else{ -// result = onlCgformCollectionMapper.queryPageList(page,params); -// } -// List> records = result.getRecords(); -// dataDispose(records,params); -// return result; -// } -// public IPage stateSort(Map parameter, int pageNo, int pageSize, IPage infoPage,List> infoList) { -// List> list = new LinkedList<>(); -// //状态排序，需要特殊处理 现行，即将实施，草稿，被替代，废止 -// if(ObjectUtils.isNotEmpty(parameter.get("orderByField")) && "state".equals((String) parameter.get("orderByField"))){ -// List> active = infoList.stream() -// .filter(e -> LawsStateEnum.ACTIVE.getValue().equals(e.get("state"))).collect(Collectors.toList()); -// List> theUpcoming = infoList.stream() -// .filter(e -> LawsStateEnum.THE_UPCOMING.getValue().equals(e.get("state"))).collect(Collectors.toList()); -// List> draft = infoList.stream() -// .filter(e -> LawsStateEnum.DRAFT.getValue().equals(e.get("state"))).collect(Collectors.toList()); -// List> beReplaced = infoList.stream() -// .filter(e -> LawsStateEnum.BE_REPLACED.getValue().equals(e.get("state"))).collect(Collectors.toList()); -// List> abolish = infoList.stream() -// .filter(e -> LawsStateEnum.ABOLISH.getValue().equals(e.get("state"))).collect(Collectors.toList()); -// if ("1".equals((String) parameter.get("orderBy"))) { -// //正序 -// list.addAll(active); -// list.addAll(theUpcoming); -// list.addAll(draft); -// list.addAll(beReplaced); -// list.addAll(abolish); -// -// } else if ("2".equals((String) parameter.get("orderBy"))) { -// //倒序 -// list.addAll(abolish); -// list.addAll(beReplaced); -// list.addAll(draft); -// list.addAll(theUpcoming); -// list.addAll(active); -// } -// if(ObjectUtils.isNotEmpty(list)){ -// infoPage = getPages(pageNo, pageSize, list); -// } -// } -// return infoPage; -// } -// public IPage getPages(Integer currentPage, Integer pageSize, List> list){ -// IPage page =new Page(); -// if(list==null){ -// return null; -// } -// int size = list.size(); -// if(pageSize > size){ -// pageSize = size; -// } -// if(pageSize!=0){ -// //求出最⼤页数，防⽌currentPage越界 -// int maxPage = size % pageSize ==0? size / pageSize : size / pageSize +1; -// if(currentPage > maxPage){ -// currentPage = maxPage; -// } -// } -// //当前页第⼀条数据的下标 -// int curIdx = currentPage >1?(currentPage -1)* pageSize :0; -// List pageList =new ArrayList(); -// //将当前页的数据放进pageList -// for(int i =0; i < pageSize && curIdx + i < size; i++){ -// pageList.add(list.get(curIdx + i)); -// } -// page.setCurrent(currentPage).setSize(pageSize).setTotal(list.size()).setRecords(pageList); -// return page; -// } -// -// public void dataDispose(List> datas, Map params){ -// if(CollectionUtils.isNotEmpty(datas)){ -// List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); -// //获取所有文本状态数据字典 -// List stateList = sysDictItems.stream() -// .filter(e -> StringUtils.isNotBlank(e.getDictCode()) && e.getDictCode().equals("state")) -// .collect(Collectors.toList()); -// SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); -// -// String cut = (String) params.get("cut"); -// for (Map data : datas) { -// Date createTime = (Date) data.get("createTime"); -// data.put("createTime",sdf.format(createTime)); -// String state = (String) data.get("state"); -// for (SysDictItem sysDictItem : stateList) { -// if(StringUtils.equals(state,sysDictItem.getItemValue())){ -// if(StringUtils.equals(cut, LanguageEnum.CN.getValue())){ -// data.put("state",sysDictItem.getItemText()); -// }else { -// data.put("state",sysDictItem.getEnName()); -// } -// break; -// } -// } -// //设置为已收藏 -// data.put("collectFlag","1"); -// } -// } -// } -// -// /** -// * 验证数据 -// * @param id -// * @return -// */ -// public boolean checkData(String id){ -// boolean result = false; -// try { -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.lambda().eq(OnlCgformCollection::getId,id); -// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// queryWrapper.lambda().eq(OnlCgformCollection::getCreateBy,sysUser.getUsername()); -// Integer integer = onlCgformCollectionMapper.selectCount(queryWrapper); -// if(integer>0){ -// result = true; -// } -// }catch (Exception ex){ -// log.error("验证我的收藏数据异常：" + ex.getMessage()); -// throw new JeroBootException("验证我的收藏数据异常！"); -// } -// return result; -// } -// -// /*public void deleteSubscribe(List docIdList){ -// try { -// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// QueryWrapper deleteWarpper = new QueryWrapper<>(); -// deleteWarpper.lambda().in(OnlCgformSubscribe::getDocumentId,docIdList); -// deleteWarpper.lambda().eq(OnlCgformSubscribe::getCreateBy,sysUser.getUsername()); -// onlCgformSubscribeMapper.delete(deleteWarpper); -// }catch (Exception ex){ -// log.error("删除订阅信息失败：" + ex.getMessage()); -// throw new JeroBootException("删除订阅信息失败！"); -// } -// }*/ -//} diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index cdf001f4..fd112454 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -16,7 +16,7 @@ import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServi import com.jero.modules.compare.entity.SarFileCompareDetailVO; import com.jero.modules.compare.entity.SarFileCompareInfo; import com.jero.modules.compare.service.ISarFileCompareInfoService; -import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; +import com.jero.modules.compare.enums.ReleaseConditionEnum; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.entity.LawsOverseasStandard; diff --git a/laws-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java b/laws-modules/src/main/java/com/jero/modules/compare/enums/ReleaseConditionEnum.java similarity index 96% rename from laws-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java rename to laws-modules/src/main/java/com/jero/modules/compare/enums/ReleaseConditionEnum.java index 2017071d..5550a94f 100644 --- a/laws-modules/src/main/java/com/jero/modules/docTranslation/enums/ReleaseConditionEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/enums/ReleaseConditionEnum.java @@ -1,4 +1,4 @@ -package com.jero.modules.docTranslation.enums; +package com.jero.modules.compare.enums; import com.jero.common.constant.enums.LanguageEnum; import org.apache.commons.lang3.StringUtils; diff --git a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index e57f6c1d..eb61b2c4 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -9,7 +9,7 @@ import com.jero.modules.compare.service.ISarFileCompareItemService; import com.jero.modules.compare.service.ISarFileCompareMenuService; import com.jero.modules.compare.utils.CompHanLPUtils; import com.jero.modules.compare.utils.CompareConst; -import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; +import com.jero.modules.compare.enums.ReleaseConditionEnum; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsEO;