zhaoxian преди 4 години
родител
ревизия
c60ab7c5d8

+ 33 - 18
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/KuaishouAppPackageController.java

@@ -238,24 +238,38 @@ public class KuaishouAppPackageController {
     @PostMapping(value = "/fillInLink")
     public Result<Object> fillInLink(@RequestBody KuaishouAppPackage kuaishouAppPackage) {
         try {
-            if (Check.isNull(kuaishouAppPackage.getProjectId())) {
-                return Result.error("请选择项目");
-            } else if (Check.isNull(kuaishouAppPackage.getAppVersion())) {
-                return Result.error("请填写应用标记");
-            } else if (Check.isNull(kuaishouAppPackage.getAppName())) {
-                return Result.error("请填写应用名称");
-            } else if (Check.isNull(kuaishouAppPackage.getPlatform())) {
+            Integer platform = kuaishouAppPackage.getPlatform();
+            if (Check.isNull(platform)) {
                 return Result.error("请选择应用类型");
-            } else {
-                Integer platform = kuaishouAppPackage.getPlatform();
-                if ((platform == 1 || platform == 3) && Check.isNull(kuaishouAppPackage.getAppIconUrl())) {
-                    return Result.error("请上传图标");
-                }
-                if ((platform == 1 || platform == 2) && Check.isNull(kuaishouAppPackage.getAppPrivacyUrl())) {
+            }
+            if (platform == 1 || platform == 2) {
+                if (Check.isNull(kuaishouAppPackage.getProjectId())) {
+                    return Result.error("请选择项目");
+                } else if (Check.isNull(kuaishouAppPackage.getAppVersion())) {
+                    return Result.error("请填写应用标记");
+                } else if (Check.isNull(kuaishouAppPackage.getAppName())) {
+                    return Result.error("请填写应用名称");
+                } else if (Check.isNull(kuaishouAppPackage.getAppPrivacyUrl())) {
                     return Result.error("安卓类应用隐私政策url不为空");
+                } else {
+                    if (platform == 1 && Check.isNull(kuaishouAppPackage.getAppIconUrl())) {
+                        return Result.error("请上传图标");
+                    }
+                    if (platform == 1 && Check.isNull(kuaishouAppPackage.getPackageName())) {
+                        return Result.error("请填写应用包名");
+                    }
                 }
-                if (platform == 1 && Check.isNull(kuaishouAppPackage.getPackageName())) {
-                    return Result.error("请填写应用包名");
+            } else {
+                if (Check.isNull(kuaishouAppPackage.getAppName())) {
+                    return Result.error("请填写应用名称");
+                } else if (Check.isNull(kuaishouAppPackage.getAppVersion())) {
+                    return Result.error("请填写应用标记");
+                } else if (Check.isNull(kuaishouAppPackage.getUrl())) {
+                    return Result.error("请填写链接");
+                } else if (Check.isNull(kuaishouAppPackage.getProjectId())) {
+                    return Result.error("请选择项目");
+                } else if (platform == 3 && Check.isNull(kuaishouAppPackage.getAppIconUrl())) {
+                    return Result.error("请上传图标");
                 }
             }
             if (!kuaishouAppPackage.getAppIconUrl().contains("http")) {
@@ -445,14 +459,15 @@ public class KuaishouAppPackageController {
                                       @RequestParam("imageUrl") String imageUrl) {
         response.setHeader("Access-Control-Allow-Origin", "*");
         try {
+            if (Check.isNull(platform)) {
+                return Result.error("请选择应用类型");
+            }
             if (Check.isNull(file)) {
                 return Result.error("执行失败,请上传应用Excel文件");
             } else if (Check.isNull(projectId)) {
                 return Result.error("请选择项目");
-            } else if (Check.isNull(imageUrl)) {
+            } else if ((platform == 1 || platform == 3) && Check.isNull(imageUrl)) {
                 return Result.error("请上传图标");
-            } else if (Check.isNull(platform)) {
-                return Result.error("请选择应用类型");
             }
             if (!imageUrl.contains("http")) {
                 imageUrl = "https:".concat(imageUrl);

+ 0 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaishouAppPackageServiceImpl.java

@@ -133,8 +133,6 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
                     return Result.error("解析失败,文档中应用名称列缺失数据");
                 } else if (Check.isNull(url)) {
                     return Result.error("解析失败,文档中下载链接列缺失数据");
-                } else if (Check.isNull(trackUrl)) {
-                    return Result.error("解析失败,文档中监测链接列缺失数据");
                 }
                 if (appVersions.contains(appVersion)) {
                     errAppVersions.append(appVersion).append("、");