From 89c50f8f6bdab30add9485b935c0adcf057a28e6 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 6 Nov 2023 09:14:10 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8):=20standardizationType=E5=AD=97=E6=AE=B5=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsAsmsOpenApiServiceImpl.java | 18 +++++++----------- .../entity/LawsStandardization.java | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java index 4ac74c68..a4ad5963 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java @@ -4,6 +4,11 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.exception.JeroBootException; +import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.MinioUtil; import com.jero.common.util.UUIDUtils; import com.jero.modules.docking.asms.entity.LawsAsmsDomestic; @@ -14,8 +19,6 @@ import com.jero.modules.docking.asms.service.ILawsAsmsOpenApiService; import com.jero.modules.docking.asms.util.AlphanumericComparator; import com.jero.modules.docking.asms.util.AsmsPostUtil; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplit; -import com.jero.modules.laws.documenttool.entity.SarFileSplitItemsVal; -import com.jero.modules.laws.documenttool.entity.SarFileSplitMenu; import com.jero.modules.laws.documenttool.mapper.LawsDocumentSplitMapper; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; @@ -33,7 +36,6 @@ import com.jero.modules.split.service.ISarFileSplitItemsValEOService; import com.jero.modules.split.service.ISarFileSplitMenuEOService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; -import io.minio.errors.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -44,8 +46,8 @@ import org.jsoup.select.Elements; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; +import javax.servlet.http.HttpServletRequest; import java.io.InputStream; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -55,12 +57,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.query.QueryGenerator; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - /** * @Description: 汽车标准数字化平台ASMS开放API接口管理 @@ -288,7 +284,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl lawsStandardizationList = new ArrayList(); mapList.forEach(eMap -> { LawsStandardization lawsStandardization = new LawsStandardization(); - lawsStandardization.setType("2"); + lawsStandardization.setStandardizationType("分标委"); eMap.forEach((k,v) -> { if ("code".equals(k)) { lawsStandardization.setNum(v); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java index 0b40c46d..251cf2f5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java @@ -39,7 +39,7 @@ public class LawsStandardization extends BaseEntity { /**节点类型（固定：分标委）*/ @Excel(name = "节点类型", width = 15) @ApiModelProperty(value = "节点类型（固定：分标委）") - private java.lang.String type; + private java.lang.String standardizationType; /**编号*/ @Excel(name = "编号", width = 15) @ApiModelProperty(value = "编号")