Browse Source

Merge branch 'V2.0.1' into test

zhaoxian 3 years ago
parent
commit
d7700536be

+ 20 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouAppListController.java

@@ -229,4 +229,24 @@ public class KuaiShouAppListController {
         }
         }
         return result;
         return result;
     }
     }
+
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/queryByAppId")
+    public Result<KuaiShouAppList> queryByAppId(Long appId) {
+        Result<KuaiShouAppList> result = new Result<>();
+        KuaiShouAppList kuaiShouAppList = kuaiShouAppListService.getAppListByAppId(appId);
+        if (kuaiShouAppList == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouAppList);
+            result.setSuccess(true);
+        }
+        return result;
+    }
 }
 }

+ 4 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouAppList.java

@@ -82,6 +82,10 @@ public class KuaiShouAppList {
     @ApiModelProperty(value = "应用包名")
     @ApiModelProperty(value = "应用包名")
     private String packageName;
     private String packageName;
     /**
     /**
+     *app隐私政策链接
+     */
+    private String appPrivacyUrl;
+    /**
      * 应用类型 1: Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏
      * 应用类型 1: Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏
      */
      */
     @Excel(name = "应用类型 1: Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏", width = 15)
     @Excel(name = "应用类型 1: Android 应用下载,2: Android 网页游戏,3: iOS 应用下载, 4:iOS 网页游戏", width = 15)

+ 2 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouAppListMapper.java

@@ -18,4 +18,6 @@ public interface KuaiShouAppListMapper extends BaseMapper<KuaiShouAppList> {
     void replaceBatch(@Param("addList") List<KuaiShouAppList> addList);
     void replaceBatch(@Param("addList") List<KuaiShouAppList> addList);
 
 
     List<KuaiShouAppList> getAppNames(@Param("appIds") JSONArray appIds);
     List<KuaiShouAppList> getAppNames(@Param("appIds") JSONArray appIds);
+
+    KuaiShouAppList getAppListByAppId(@Param("appId") Long appId);
 }
 }

+ 11 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouAppListMapper.xml

@@ -12,7 +12,8 @@
         image_token,
         image_token,
         package_name,
         package_name,
         platform,
         platform,
-        return_time
+        return_time,
+        app_privacy_url
         )
         )
         values
         values
         <foreach collection="addList" item="appInfo" separator=",">
         <foreach collection="addList" item="appInfo" separator=",">
@@ -26,7 +27,8 @@
             #{appInfo.imageToken},
             #{appInfo.imageToken},
             #{appInfo.packageName},
             #{appInfo.packageName},
             #{appInfo.platform},
             #{appInfo.platform},
-            #{appInfo.returnTime}
+            #{appInfo.returnTime},
+            #{appInfo.appPrivacyUrl}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>
@@ -41,4 +43,11 @@
         </foreach>
         </foreach>
     </select>
     </select>
 
 
+
+    <select id="getAppListByAppId" resultType="cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppList">
+        SELECT *
+        FROM ctop_kuaishou_app_list
+        WHERE app_id = #{appId}
+    </select>
+
 </mapper>
 </mapper>

+ 2 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouAppListService.java

@@ -19,4 +19,6 @@ public interface IKuaiShouAppListService extends IService<KuaiShouAppList> {
     List<KuaiShouAppList> getAppListByAccountId(Long accountId);
     List<KuaiShouAppList> getAppListByAccountId(Long accountId);
 
 
     List<KuaiShouAppList> getAppNames(JSONArray appIds);
     List<KuaiShouAppList> getAppNames(JSONArray appIds);
+
+    KuaiShouAppList getAppListByAppId(Long appId);
 }
 }

+ 5 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouAppListServiceImpl.java

@@ -44,4 +44,9 @@ public class KuaiShouAppListServiceImpl extends ServiceImpl<KuaiShouAppListMappe
     public List<KuaiShouAppList> getAppNames(JSONArray appIds) {
     public List<KuaiShouAppList> getAppNames(JSONArray appIds) {
         return shouAppListMapper.getAppNames(appIds);
         return shouAppListMapper.getAppNames(appIds);
     }
     }
+
+    @Override
+    public KuaiShouAppList getAppListByAppId(Long appId) {
+        return shouAppListMapper.getAppListByAppId(appId);
+    }
 }
 }

+ 1 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -3182,6 +3182,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                             appList.setAppId(dataJson.getLong("app_id"));
                             appList.setAppId(dataJson.getLong("app_id"));
                             appList.setAppVersion(dataJson.getString("app_version"));
                             appList.setAppVersion(dataJson.getString("app_version"));
                             appList.setAppName(dataJson.getString("app_name"));
                             appList.setAppName(dataJson.getString("app_name"));
+                            appList.setAppPrivacyUrl(dataJson.getString("app_privacy_url"));
                             appList.setAppIconUrl(dataJson.getString("app_icon_url"));
                             appList.setAppIconUrl(dataJson.getString("app_icon_url"));
                             appList.setImageToken(dataJson.getString("image_token"));
                             appList.setImageToken(dataJson.getString("image_token"));
                             appList.setPackageName(dataJson.getString("package_name"));
                             appList.setPackageName(dataJson.getString("package_name"));

+ 5 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/channel/entity/KuaishouChannelAppInfo.java

@@ -56,6 +56,11 @@ public class KuaishouChannelAppInfo {
      * 操作类型,add新增,update修改
      * 操作类型,add新增,update修改
      */
      */
     private String type;
     private String type;
+
+    /**
+     * 创建类型,1新增,2,选择
+     */
+    private String appCreateType;
     /**
     /**
      * 应用包名
      * 应用包名
      */
      */

+ 5 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/channel/entity/KuaishouChannelCreateStrategy.java

@@ -187,6 +187,11 @@ public class KuaishouChannelCreateStrategy {
     private String imageToken;
     private String imageToken;
 
 
     /**
     /**
+     * 创建类型,1新增,2,选择
+     */
+    private String appCreateType;
+
+    /**
      * createTime
      * createTime
      */
      */
     @ApiModelProperty(value = "createTime")
     @ApiModelProperty(value = "createTime")