Merge remote-tracking branch 'origin/master' into lih

yt-agent/agent-service/src/main/java/com/ytpm/controller/YtAppUserController.java

@@ -2,6 +2,8 @@ package com.ytpm.controller;
 
 import com.ytpm.agent.param.AdRecordListParam;
 import com.ytpm.agent.param.AuditUserParam;
+import com.ytpm.agent.param.DitchListForIosParam;
+import com.ytpm.agent.view.AgentDitchView;
 import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.app.param.YtAppUserListParam;
 import com.ytpm.app.view.AppUserStaticsView;
@@ -10,8 +12,10 @@ import com.ytpm.app.view.YtUserEcpmListView;
 import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
 import com.ytpm.service.YtAppUserService;
+import com.ytpm.utils.FeignClientInvoker;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,7 +43,22 @@ public class YtAppUserController {
     @PostMapping("/getUserList")
     @ApiOperation(value = "查询App用户列表")
     public ResultTable<YtAppUserListView> selectAppUserList(@RequestBody YtAppUserListParam param, @AuthenticationPrincipal AgentUserInfo userInfo) {
-        return appUserService.selectAppUserList(param, userInfo);
+        if (param.getAppType().equals("2")){
+            return appUserService.selectAppUserForIosList(param, userInfo);
+        } else {
+            return appUserService.selectAppUserList(param, userInfo);
+        }
+    }
+
+    /**
+     * 查询渠道列表
+     * @param param 列表入参
+     * @return 分页列表
+     */
+    @PostMapping("/getDitchList")
+    @ApiOperation(value = "查询渠道列表")
+    public ResultTable<AgentDitchView> selectDitchList(@RequestBody DitchListForIosParam param, @AuthenticationPrincipal AgentUserInfo userInfo) {
+        return appUserService.selectDitchList(param, userInfo);
     }
 
     @PostMapping("/getRevenueByTime")

yt-agent/agent-service/src/main/java/com/ytpm/service/YtAppUserService.java

@@ -2,6 +2,8 @@ package com.ytpm.service;
 
 import com.ytpm.agent.param.AdRecordListParam;
 import com.ytpm.agent.param.AuditUserParam;
+import com.ytpm.agent.param.DitchListForIosParam;
+import com.ytpm.agent.view.AgentDitchView;
 import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.app.param.YtAppUserListParam;
 import com.ytpm.app.view.AppUserStaticsView;
@@ -22,6 +24,20 @@ public interface YtAppUserService {
      */
     ResultTable<YtAppUserListView> selectAppUserList(YtAppUserListParam param, AgentUserInfo userInfo);
 
+    /**
+     * 查询App用户列表
+     * @param param 列表入参
+     * @return 分页列表
+     */
+    ResultTable<YtAppUserListView> selectAppUserForIosList(YtAppUserListParam param, AgentUserInfo userInfo);
+
+    /**
+     * 查询渠道列表
+     * @param param 列表入参
+     * @return 分页列表
+     */
+    ResultTable<AgentDitchView> selectDitchList(DitchListForIosParam param, AgentUserInfo userInfo);
+
     /**
      * 查询用户广告数据统计列表
      */

yt-agent/agent-service/src/main/java/com/ytpm/service/impl/YtAppUserServiceImpl.java

@@ -11,6 +11,8 @@ import com.ytpm.agent.model.YtPlatformUserApp;
 import com.ytpm.agent.param.AdRecordListParam;
 import com.ytpm.agent.param.AuditCheckParam;
 import com.ytpm.agent.param.AuditUserParam;
+import com.ytpm.agent.param.DitchListForIosParam;
+import com.ytpm.agent.view.AgentDitchView;
 import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.app.model.YtDyzAdRecord;
 import com.ytpm.app.model.YtDyzLoginRecord;
@@ -74,6 +76,9 @@ public class YtAppUserServiceImpl implements YtAppUserService {
         //数据量大已改为appId必传
         YtApp ytApp = appMapper.selectPrimary(param.getAppIds());
         YtPlatformUserApp app = agentAppMapper.selectByPrimaryKey(ytApp.getSuperiorId());
+//        if (param.getAppType().equals("2")){
+//            param.setDitchId(ytApp.getDitchId());
+//        }
         Object o = feignInvoker.invoke(app.getServiceName(), "queryAll", param);
         String string = JSON.toJSONString(o);
         JSONObject object = JSON.parseObject(string);
@@ -85,6 +90,33 @@ public class YtAppUserServiceImpl implements YtAppUserService {
         return new ResultTable(StatusCode.OK,RepMessage.QUERY_SUCCESS,views,pageMeta);
     }
 
+    /**
+     * 查询App用户列表
+     * @param param 列表入参
+     * @return 分页列表
+     */
+    @Override
+    public ResultTable<YtAppUserListView> selectAppUserForIosList(YtAppUserListParam param, AgentUserInfo userInfo) {
+        Object o = feignInvoker.invoke("lemonios-service", "queryAll", param);
+        String string = JSON.toJSONString(o);
+        JSONObject object = JSON.parseObject(string);
+        List<YtAppUserListView> views = JSONArray.parseArray(object.getString("data"), YtAppUserListView.class);
+        PageMeta pageMeta = JSON.parseObject(object.getString("pageMeta"), PageMeta.class);
+        return new ResultTable(StatusCode.OK,RepMessage.QUERY_SUCCESS,views,pageMeta);
+    }
+
+    @Override
+    public ResultTable<AgentDitchView> selectDitchList(DitchListForIosParam param, AgentUserInfo userInfo) {
+        Object o = feignInvoker.invoke("lemonios-service", "queryDitchList", param);
+        String string = JSON.toJSONString(o);
+        JSONObject object = JSON.parseObject(string);
+        List<AgentDitchView> views = JSONArray.parseArray(object.getString("data"), AgentDitchView.class);
+        System.out.println(views);
+        PageMeta pageMeta = JSON.parseObject(object.getString("pageMeta"), PageMeta.class);
+
+        return new ResultTable(StatusCode.OK,RepMessage.QUERY_SUCCESS,views,pageMeta);
+    }
+
     /**
      * 设置用户扩展信息
      */

yt-common/src/main/java/com/ytpm/app/param/YtAppUserListParam.java

@@ -36,4 +36,6 @@ public class YtAppUserListParam extends PageMeta {
     private Long ditchId;
     @ApiModelProperty("应用ID")
     private String appIds;
+    @ApiModelProperty("应用类型")
+    private String appType;
 }

yt-ios-lemon/lemon-ios-feign/src/main/java/com/ytpm/lemonios/feign/LemonIosFeign.java

@@ -2,7 +2,9 @@ package com.ytpm.lemonios.feign;
 
 import com.ytpm.agent.model.YtDitch;
 import com.ytpm.agent.param.AuditCheckParam;
+import com.ytpm.agent.param.DitchListForIosParam;
 import com.ytpm.agent.view.AgentAdGroupStaticsVO;
+import com.ytpm.agent.view.AgentDitchView;
 import com.ytpm.agent.view.AgentTopCountView;
 import com.ytpm.app.model.YtAppDefaultConfig;
 import com.ytpm.app.model.YtDyzAdRecord;
@@ -79,6 +81,9 @@ public interface LemonIosFeign {
     @PostMapping("/wx/getLastOne")
     WxDefaultConfig getLastOne(@RequestBody YtDitch param);
 
+    @PostMapping("/ditch/getDitchList")
+    Result<List<AgentDitchView>> queryDitchList(@RequestBody DitchListForIosParam param);
+
     @PostMapping("/user/queryTodayBanned")
     List<YtDyzUser> queryTodayBanned(@RequestBody AppUserTodayBannedParam appUserTodayBannedParam);
 

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/controller/DitchController.java

@@ -1,10 +1,12 @@
 package com.ytpm.lemonios.controller;
 
+import com.github.pagehelper.PageInfo;
 import com.ytpm.agent.param.DitchListForIosParam;
 import com.ytpm.agent.param.DitchListParam;
 import com.ytpm.agent.view.AgentDitchView;
 import com.ytpm.general.RepMessage;
 import com.ytpm.general.Result;
+import com.ytpm.general.ResultTable;
 import com.ytpm.lemonios.service.DitchService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,4 +35,16 @@ public class DitchController {
         return Result.resultOk(RepMessage.QUERY_SUCCESS, agentDitchService.ditchList(ditchListParam));
     }
 
+    /**
+     * 获取渠道类型列表
+     */
+    @ApiOperation("获取渠道类型列表")
+    @PostMapping("/getDitchList")
+    public ResultTable<List<AgentDitchView>> getDitchList(@RequestBody DitchListForIosParam param) {
+        param.setAppId(param.getAppId());
+        DitchListParam ditchListParam = new DitchListParam();
+        ditchListParam.setAppId(param.getAppId());
+        return ResultTable.resultTableOk(new PageInfo<>(agentDitchService.ditchList(ditchListParam)));
+    }
+
 }

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/controller/UserController.java

@@ -68,6 +68,14 @@ public class UserController {
     public ResultTable<YtAppUserListView> queryAll(@RequestBody YtAppUserListParam param) {
         //查询主应用
         PageHelper.startPage(param.getPage(), param.getLimit());
+//        List<YtAppUserListView> result;
+//        if (param.getAppType().equals("2")){
+//            YtAppUserListParam newParam = new YtAppUserListParam();
+//            newParam.setDitchId(param.getDitchId());
+//            result =  appUserMapper.queryAll(newParam);
+//        }else {
+//            result = appUserMapper.queryAll(param);
+//        }
         List<YtAppUserListView> result = appUserMapper.queryAll(param);
         String collect = result.stream().map(YtAppUserListView::getUserId).collect(Collectors.joining(","));
         List<YtDyzAdRecord> adRecords = adRecordMapper.getByUserIds(collect);

yt-ios-lemon/lemon-ios-service/src/main/resources/mapper/DitchMapper.xml

@@ -37,8 +37,10 @@
         ditch_id, ditch_name, create_time
         from yt_ditch
         <where>
-            app_id = #{appId}
-            and is_delete=0
+            is_delete = 0
+            <if test="appId != null and appId != ''">
+                and app_id = #{appId}
+            </if>
         </where>
     </select>
     <select id="selectById" resultType="com.ytpm.agent.model.YtDitch">