From ae69d8a11b0c25025176b76214d92682f0bb62ef Mon Sep 17 00:00:00 2001
From: lifenlong <pikachu1995@126.com>
Date: Fri, 21 May 2021 17:24:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8BAPP=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/common/enums/ResultCode.java    |  2 +-
 .../system/service/AppVersionService.java        |  7 +++++++
 .../serviceimpl/AppVersionServiceImpl.java       | 12 ++++++++++++
 .../setting/AppVersionManagerController.java     | 16 +++++++++++-----
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
index 12228041..bf09e875 100644
--- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java
+++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
@@ -296,7 +296,7 @@ public enum ResultCode {
     WECHAT_QRCODE_ERROR(80502, "微信二维码生成异常"),
     WECHAT_MP_MESSAGE_ERROR(80503, "微信小程序小消息订阅异常"),
 
-
+    APP_VERSION_EXIST(80600, "APP版本已存在")
     ;
     private final Integer code;
     private final String message;
diff --git a/framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java b/framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java
index bf729275..a54652c0 100644
--- a/framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java
+++ b/framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java
@@ -17,4 +17,11 @@ public interface AppVersionService extends IService<AppVersion> {
      * @return 最新的APP版本号
      */
     AppVersion getAppVersion(String appType);
+
+    /**
+     * 检测APP版本信息
+     * @param appVersion app版本
+     * @return 是否可添加
+     */
+    boolean checkAppVersion(AppVersion appVersion);
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java
index 12e0d198..8d31b954 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java
@@ -1,8 +1,11 @@
 package cn.lili.modules.system.serviceimpl;
 
+import cn.lili.common.enums.ResultCode;
+import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.system.entity.dos.AppVersion;
 import cn.lili.modules.system.mapper.AppVersionMapper;
 import cn.lili.modules.system.service.AppVersionService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,4 +25,13 @@ public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVers
     public AppVersion getAppVersion(String appType) {
         return this.baseMapper.getLatestVersion(appType);
     }
+
+    @Override
+    public boolean checkAppVersion(AppVersion appVersion) {
+        //检测版本是否存在
+        if(null!=this.getOne(new LambdaQueryWrapper<AppVersion>().eq(AppVersion::getVersion,appVersion))){
+            throw new ServiceException(ResultCode.APP_VERSION_EXIST);
+        }
+        return true;
+    }
 }
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java
index 9d28b442..51d180b2 100755
--- a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java
@@ -48,8 +48,11 @@ public class AppVersionManagerController {
     @ApiOperation(value = "添加app版本信息", response = AppVersion.class)
     @PostMapping
     public ResultMessage<Object> add(@Valid AppVersion appVersion) {
-        if(this.appVersionService.save(appVersion)){
-            return ResultUtil.success();
+
+        if(this.appVersionService.checkAppVersion(appVersion)){
+            if(this.appVersionService.save(appVersion)){
+                return ResultUtil.success();
+            }
         }
         throw new ServiceException(ResultCode.ERROR);
     }
@@ -59,9 +62,12 @@ public class AppVersionManagerController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "String", paramType = "path")
     })
-    public ResultMessage<Boolean> edit(@Valid AppVersion appVersion, @PathVariable String id) {
-        if(this.appVersionService.updateById(appVersion)){
-            return ResultUtil.success();
+    public ResultMessage<Object> edit(@Valid AppVersion appVersion, @PathVariable String id) {
+
+        if(this.appVersionService.checkAppVersion(appVersion)){
+            if(this.appVersionService.updateById(appVersion)){
+                return ResultUtil.success();
+            }
         }
         throw new ServiceException(ResultCode.ERROR);
     }