From 4adac1c6503d7eca273ef413a9ff4b2d94aaa46f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 4 Jul 2024 16:48:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B8=82=E5=9C=BA=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E5=BA=93=E6=B8=85=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MarketStandardController.java | 20 +++++++++++++++++++ .../entity/LawsMarketStandard.java | 6 ++++++ .../impl/LawsMarketStandardServiceImpl.java | 19 ++++++++++++++---- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index 4392db19..c2c2b113 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -173,4 +173,24 @@ public class MarketStandardController { return Result.OK(errorMessages); } + /** + * 发布 + * + * @param map + * @return + */ + @AutoLog(value = "外部标准库-市场法规清单-发布") + @ApiOperation(value = "外部标准库-市场法规清单-发布", notes = "外部标准库-市场法规清单-发布") + @ApiOperationSupport(order = 7) + @PostMapping(value = "/publish") + @RequiresPermissions("marketStandard:publish") + public Result publish(@RequestBody Map map) { + if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) { + return Result.error("请选择数据!"); + } + return Result.OK(map); + } + + + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java index 1864673b..f66a4563 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java @@ -183,6 +183,12 @@ public class LawsMarketStandard implements Serializable { @ApiModelProperty(value = "附件") private String file; + /** + * 版本标识,用于绑定多个版本 + */ + @ApiModelProperty(value = "版本标识,用于绑定多个版本") + private String versionFlag; + @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 0c587350..ea8bfe79 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -2,11 +2,13 @@ package com.jero.modules.laws.marketStandard.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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.api.ISysBaseAPI; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.laws.marketStandard.constans.MarketStandardConstants; import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard; @@ -35,10 +37,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -102,10 +101,19 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl> map = sysBaseAPI.translateManyDict("market_state",manifest.getCountry()); + List listDict = map.get("market_state"); + List country = listDict.stream().map(DictModel::getText).collect(Collectors.toList()); + // 国家/地区+自定义+固定字段，自定义字段：预留手填，当前默认不填；固定字段：车型需满足标准法规清单 + manifest.setManifestName(String.join("",country) + manifest.getCustomColumnName() + "车型需满足标准法规清单"); manifest.setManifestVersion("V1.0"); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); manifest.setAuthor(sysUser.getId()); save(manifest); + LambdaUpdateWrapper updateLawsMarketStandard = new LambdaUpdateWrapper<>(); + updateLawsMarketStandard.eq(LawsMarketStandard::getId,manifest.getId()); + updateLawsMarketStandard.set(LawsMarketStandard::getVersionFlag, UUID.randomUUID().toString().replace("-","")); + update(updateLawsMarketStandard); List lists = marketStandardDetailVO.getLists(); lists.forEach(e -> e.setManifestId(manifest.getId())); lawsMarketStandardDetailService.saveBatch(lists); @@ -145,6 +153,9 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>();