diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index c6f6bd3..eae0101 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.Logical; import org.springframework.beans.factory.annotation.Autowired; diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java index 9ad5c93..093a4f6 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java @@ -1,5 +1,6 @@ package com.jero.modules.compare.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -184,8 +185,8 @@ public class SarFileCompareItemController extends JeroController> clauseComparisonEvent(String oldItemId, String newItemId, String standHisId, String flag) throws Exception { - Map resultMap = sarFileCompareItemService.clauseComparisonEvent(oldItemId,newItemId,standHisId,flag); + public Result> clauseComparisonEvent(@RequestBody JSONObject json) throws Exception { + Map resultMap = sarFileCompareItemService.clauseComparisonEvent(json); return Result.OK(resultMap); } } diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarItemsStandCompareHisEOController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarItemsStandCompareHisEOController.java new file mode 100644 index 0000000..a0b4a25 --- /dev/null +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarItemsStandCompareHisEOController.java @@ -0,0 +1,59 @@ +package com.jero.modules.compare.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +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.compare.entity.SarItemsCompareHisEO; +import com.jero.modules.compare.service.ISarItemsCompareHisEOService; +import com.jero.modules.system.util.MyStringUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; + +@RestController +@RequestMapping("/compare/sarItemsCompareHis") +@Api(description = "|SarStandItemsCompareHisEO|") +public class SarItemsStandCompareHisEOController extends JeroController { + + private static final Logger logger = LoggerFactory.getLogger(SarItemsStandCompareHisEOController.class); + + @Autowired + private ISarItemsCompareHisEOService sarItemsCompareHisEOService; + + /** + * 分页列表查询 + */ + @AutoLog(value = "条款对比-分页列表查询") + @ApiOperation(value = "条款对比-分页列表查询", notes = "条款对比-分页列表查询") + @GetMapping(value = "/page") + @ApiOperationSupport(order = 1) + public Result queryPageList(@ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @ApiParam("条款对比id") @RequestParam(name = "standHisId", defaultValue = "") String standHisId, + HttpServletRequest req) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (MyStringUtils.isNotBlank(standHisId)) { + queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.eq(SarItemsCompareHisEO::getStandHisId, standHisId)); + } + + Page page = new Page<>(pageNo, pageSize); + IPage pageList = this.sarItemsCompareHisEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + +} diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java index face51f..36bebc8 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java @@ -165,4 +165,8 @@ public class SarFileCompareInfo implements Serializable { private String compareType; @TableField(exist = false) private String compareTypeShow; + + // 比对状态：比对中、比对完成 + @ApiModelProperty(value = "比对状态") + private String compareStatus; } diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/entity/SarItemsCompareHisEO.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/entity/SarItemsCompareHisEO.java new file mode 100644 index 0000000..08eb7fa --- /dev/null +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/entity/SarItemsCompareHisEO.java @@ -0,0 +1,67 @@ +package com.jero.modules.compare.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 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 java.io.Serializable; +import java.util.Date; + +@Data +@TableName("sar_items_compare_his") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="sar_items_compare_his对象", description="条款对比信息表") +public class SarItemsCompareHisEO implements Serializable { + + private static final long serialVersionUID = 1L; + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + private String oldItemsId; + + private String oldItemsName; + + private String oldItemsText; + + private String newItemsId; + + private String newItemsName; + + private String newItemsText; + + private String createUser; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + private String modifyUser; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date modifyTime; + + private String standHisId; + + private String similarityDegree; + + private String oldItemsNum; + + private String newItemsNum; + + private String oldRemark; + + private String newRemark; +} diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/mapper/SarItemsCompareHisEOMapper.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/mapper/SarItemsCompareHisEOMapper.java new file mode 100644 index 0000000..c67c49d --- /dev/null +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/mapper/SarItemsCompareHisEOMapper.java @@ -0,0 +1,23 @@ +package com.jero.modules.compare.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.compare.entity.SarItemsCompareHisEO; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; + +/** + * + *
+ * 功能：SAR_ITEMS_COMPARE_HIS SarItemsCompareHisEODao
+ * 作者：code generator
+ * 日期： 2020-02-26
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +@Mapper +public interface SarItemsCompareHisEOMapper extends BaseMapper { + + @Delete("delete from SAR_ITEMS_COMPARE_HIS WHERE STAND_HIS_ID = #{standHisId}") + void deleteByStandHisId(String standHisId); + + int insertSelective(SarItemsCompareHisEO sarItemsCompareHisEO); +} diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarItemsCompareHisEOMapper.xml b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarItemsCompareHisEOMapper.xml new file mode 100644 index 0000000..97250bf --- /dev/null +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarItemsCompareHisEOMapper.xml @@ -0,0 +1,269 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, old_items_id, old_items_name, old_items_text, new_items_id, new_items_name, new_items_text, + create_user, create_time, modify_user, modify_time, stand_his_id, similarity_degree, + old_items_num, new_items_num,old_remark,new_remark + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and old_items_id ${oldItemsIdOperator} #{oldItemsId} + + + and old_items_name ${oldItemsNameOperator} #{oldItemsName} + + + and old_items_text ${oldItemsTextOperator} #{oldItemsText} + + + and new_items_id ${newItemsIdOperator} #{newItemsId} + + + and new_items_name ${newItemsNameOperator} #{newItemsName} + + + and new_items_text ${newItemsTextOperator} #{newItemsText} + + + and create_user ${createUserOperator} #{createUser} + + + and create_time ${createTimeOperator} #{createTime} + + + and create_time >= #{createTime1} + + + and create_time <= #{createTime2} + + + and modify_user ${modifyUserOperator} #{modifyUser} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and stand_his_id ${standHisIdOperator} #{standHisId} + + + and similarity_degree ${similarityDegreeOperator} #{similarityDegree} + + + and old_items_num ${oldItemsNumOperator} #{oldItemsNum} + + + and new_items_num ${newItemsNumOperator} #{newItemsNum} + + + + + + + + insert into SAR_ITEMS_COMPARE_HIS() + values (#{id, jdbcType=VARCHAR}, #{oldItemsId, jdbcType=VARCHAR}, #{oldItemsName, jdbcType=VARCHAR}, #{oldItemsText, jdbcType=CLOB}, #{newItemsId, jdbcType=VARCHAR}, #{newItemsName, jdbcType=VARCHAR}, #{newItemsText, jdbcType=CLOB}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{standHisId, jdbcType=VARCHAR}, #{similarityDegree, jdbcType=VARCHAR}, #{oldItemsNum, jdbcType=VARCHAR}, #{newItemsNum, jdbcType=VARCHAR}) + + + + + + insert into SAR_ITEMS_COMPARE_HIS + + id, + old_items_id, + old_items_name, + old_items_text, + new_items_id, + new_items_name, + new_items_text, + create_user, + create_time, + modify_user, + modify_time, + stand_his_id, + similarity_degree, + old_items_num, + new_items_num, + old_remark, + new_remark, + + + #{id, jdbcType=VARCHAR}, + #{oldItemsId, jdbcType=VARCHAR}, + #{oldItemsName, jdbcType=VARCHAR}, + #{oldItemsText, jdbcType=CLOB}, + #{newItemsId, jdbcType=VARCHAR}, + #{newItemsName, jdbcType=VARCHAR}, + #{newItemsText, jdbcType=CLOB}, + #{createUser, jdbcType=VARCHAR}, + #{createTime, jdbcType=TIMESTAMP}, + #{modifyUser, jdbcType=VARCHAR}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{standHisId, jdbcType=VARCHAR}, + #{similarityDegree, jdbcType=VARCHAR}, + #{oldItemsNum, jdbcType=VARCHAR}, + #{newItemsNum, jdbcType=VARCHAR}, + #{oldRemark, jdbcType=VARCHAR}, + #{newRemark, jdbcType=VARCHAR}, + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java index bb8fa0a..56dbbbc 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java @@ -1,10 +1,12 @@ package com.jero.modules.compare.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.compare.entity.SarFileCompareDetailVO; import com.jero.modules.compare.entity.SarFileCompareInfo; import java.util.List; +import java.util.Map; /** * @Description: 文档对比信息表 diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java index 17f4918..2a80b65 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java @@ -1,5 +1,6 @@ package com.jero.modules.compare.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.compare.entity.SarFileCompareItem; @@ -73,5 +74,5 @@ public interface ISarFileCompareItemService extends IService List clauseComparison(String lid,String rid); - Map clauseComparisonEvent(String oldItemId, String newItemId, String standHisId,String flag); + Map clauseComparisonEvent(JSONObject json); } diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarItemsCompareHisEOService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarItemsCompareHisEOService.java new file mode 100644 index 0000000..753c909 --- /dev/null +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarItemsCompareHisEOService.java @@ -0,0 +1,13 @@ +package com.jero.modules.compare.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.compare.entity.SarFileCompareInfo; +import com.jero.modules.compare.entity.SarItemsCompareHisEO; + +public interface ISarItemsCompareHisEOService extends IService { + + void insertSelective(SarItemsCompareHisEO sarItemsCompareHisEO); + + void deleteByStandHisId(String id); +} diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index 77f99e6..0f11704 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -1,11 +1,13 @@ package com.jero.modules.compare.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; +import com.jero.common.util.UUIDUtils; import com.jero.modules.compare.entity.*; import com.jero.modules.compare.enums.CompareTypeEnum; import com.jero.modules.compare.enums.ReleaseConditionEnum; @@ -13,21 +15,28 @@ import com.jero.modules.compare.mapper.SarFileCompareInfoMapper; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.compare.service.ISarFileCompareItemService; import com.jero.modules.compare.service.ISarFileCompareMenuService; +import com.jero.modules.compare.service.ISarItemsCompareHisEOService; import com.jero.modules.compare.utils.CompHanLPUtils; import com.jero.modules.compare.utils.CompareConst; +import com.jero.modules.compare.utils.EventEditHistoryHighLightUtil; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsEO; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; import com.jero.modules.split.entity.SarFileSplitMenuEO; +import com.jero.modules.split.page.SarFileSplitItemsValEOPage; import com.jero.modules.split.service.IFileSplitItemsEOService; import com.jero.modules.split.service.ISarFileSplitInfoService; +import com.jero.modules.split.service.ISarFileSplitItemsValEOService; import com.jero.modules.split.service.ISarFileSplitMenuEOService; import com.jero.modules.system.util.MyStringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.NumberFormat; import java.util.*; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -62,6 +71,12 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl clauseComparisonEvent(String oldItemId, String newItemId, String standHisId, String flag) { + public Map clauseComparisonEvent(JSONObject json) { + String oldItemId = json.getString("oldItemId"); + String newItemId = json.getString("newItemId"); + String standHisId = json.getString("standHisId"); + String flag = json.getString("flag"); + Map resultMap = new HashMap(); String oldTxt = ""; SarFileSplitItemsValEOPage oldPage = new SarFileSplitItemsValEOPage(); @@ -194,6 +217,7 @@ public class SarFileCompareItemServiceImpl extends ServiceImpl leftString = new ArrayList<>(); List rightString = new ArrayList<>(); + if(similarity >= 0.6){ String[] anb = EventEditHistoryHighLightUtil.getHighLightDifferent(oldTxt.trim(), newTxt.trim()); if(StringUtils.isNotBlank(flag) && flag.equals("2")){ @@ -227,42 +251,44 @@ public class SarFileCompareItemServiceImpl extends ServiceImpl leftMapEO = this.documentSplitMapper.queryLawsDocumentSplitById(oldItemId); + Map rightMapEO = this.documentSplitMapper.queryLawsDocumentSplitById(newItemId); + String leftItemsText = ""; + if(leftString != null && !leftString.isEmpty()){ + for(String left : leftString){ + leftItemsText += left; + } + } else { + leftItemsText = resultMap.get("leftString").toString(); + } + String rightItemsText = ""; + if(rightString != null && !rightString.isEmpty()){ + for(String right : rightString){ + rightItemsText += right; + } + } else { + rightItemsText = resultMap.get("rightString").toString(); + } + SarItemsCompareHisEO sarItemsCompareHisEO = new SarItemsCompareHisEO(); sarItemsCompareHisEO.setId(UUIDUtils.randomUUID20()); - sarItemsCompareHisEO.setOldItemsId(leftEo.getId()); - sarItemsCompareHisEO.setOldItemsName(leftEo.getItemsName()); - sarItemsCompareHisEO.setOldItemsNum(leftEo.getItemsNum()); + sarItemsCompareHisEO.setOldItemsId(leftMapEO.get("id").toString()); + sarItemsCompareHisEO.setOldItemsName(leftMapEO.get("item_title").toString()); + sarItemsCompareHisEO.setOldItemsNum(leftMapEO.get("item_num").toString()); sarItemsCompareHisEO.setOldItemsText(leftItemsText); - sarItemsCompareHisEO.setNewItemsId(rightEo.getId()); - sarItemsCompareHisEO.setNewItemsName(rightEo.getItemsName()); - sarItemsCompareHisEO.setNewItemsNum(rightEo.getItemsNum()); + sarItemsCompareHisEO.setNewItemsId(rightMapEO.get("id").toString()); + sarItemsCompareHisEO.setNewItemsName(rightMapEO.get("item_title").toString()); + sarItemsCompareHisEO.setNewItemsNum(rightMapEO.get("item_num").toString()); sarItemsCompareHisEO.setNewItemsText(rightItemsText); sarItemsCompareHisEO.setStandHisId(standHisId); sarItemsCompareHisEO.setSimilarityDegree(similarityDegree); - sarItemsCompareHisEO.setCreateUser(LoginUserUtil.getUserId()); - sarItemsCompareHisEO.setModifyUser(LoginUserUtil.getUserId()); sarItemsCompareHisEO.setModifyTime(new Date()); sarItemsCompareHisEO.setCreateTime(new Date()); - sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO);*/ + sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO); } SarFileCompareInfo sarStandCompareHisEO =new SarFileCompareInfo(); sarStandCompareHisEO.setId(standHisId); -// sarStandCompareHisEO.setCompareStatus("比对完成"); -// sarStandCompareHisEODao.updateByPrimaryKeySelective(sarStandCompareHisEO); + sarStandCompareHisEO.setCompareStatus("比对完成"); + sarFileCompareInfoService.editById(sarStandCompareHisEO); if (oldList.size()==0 || newList.size()==0){ resultMap.put("error","比对数据已删除"); } diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarItemsCompareHisEOServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarItemsCompareHisEOServiceImpl.java new file mode 100644 index 0000000..139003f --- /dev/null +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarItemsCompareHisEOServiceImpl.java @@ -0,0 +1,32 @@ +package com.jero.modules.compare.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.compare.entity.SarItemsCompareHisEO; +import com.jero.modules.compare.mapper.SarItemsCompareHisEOMapper; +import com.jero.modules.compare.service.ISarItemsCompareHisEOService; +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; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class SarItemsCompareHisEOServiceImpl extends ServiceImpl implements ISarItemsCompareHisEOService { + private static final Logger logger = LoggerFactory.getLogger(SarItemsCompareHisEOServiceImpl.class); + + + @Autowired + private SarItemsCompareHisEOMapper sarItemsCompareHisEOMapper; + + @Override + public void insertSelective(SarItemsCompareHisEO sarItemsCompareHisEO) { + this.sarItemsCompareHisEOMapper.insertSelective(sarItemsCompareHisEO); + } + + @Override + public void deleteByStandHisId(String id) { + this.sarItemsCompareHisEOMapper.deleteByStandHisId(id); + } +} diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index 5cfc609..81d26a8 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -12,13 +12,16 @@ import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsEO; import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import com.jero.modules.split.page.SarFileSplitItemsValEOPage; import com.jero.modules.split.service.IFileSplitItemsEOService; +import com.jero.modules.split.service.ISarFileSplitItemsValEOService; import com.jero.modules.split.service.impl.FileSplitItemsEOServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.StringEscapeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -45,6 +48,9 @@ public class FileSplitItemsEOController extends JeroController> list(@RequestParam(value = "infoId", required = false) String infoId,@RequestParam(value = "menuId", required = false) String menuId) throws Exception { + + + SarFileSplitItemsValEOPage page = new SarFileSplitItemsValEOPage(); + List getList = sarFileSplitItemsValEOService.queryByList(page); + if (getList != null && !getList.isEmpty()) { + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) { + String imgPath = sarFileSplitItemsValEO.getItemContent(); + if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) { + String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length()); + sarFileSplitItemsValEO.setImgName(imgName); + } + } + } + return Result.OK(getList); + } }