yt_app无需irun

yt-app/app-service/src/main/java/com/ytpm/controller/dyz/UserController.java

@@ -22,9 +22,6 @@ import com.ytpm.dao.dyz.AdRecordMapper;
 import com.ytpm.dao.dyz.AppUserMapper;
 import com.ytpm.dao.dyz.LoginRecordMapper;
 import com.ytpm.dao.dyz.QuestionMapper;
-import com.ytpm.dao.irun.IRunAdRecordMapper;
-import com.ytpm.dao.irun.IRunLoginRecordMapper;
-import com.ytpm.dao.irun.IRunUserMapper;
 import com.ytpm.dao.nofeeds.NFAdRecordMapper;
 import com.ytpm.dao.nofeeds.NFLoginRecordMapper;
 import com.ytpm.dao.nofeeds.NFUserMapper;
@@ -79,8 +76,6 @@ public class UserController {
     @Resource
     private QnmUserMapper qnmUserMapper;
     @Resource
-    private IRunUserMapper iRunUserMapper;
-    @Resource
     private LoginRecordMapper loginRecordMapper;
     @Resource
     private QNLoginRecordMapper qnLoginRecordMapper;
@@ -89,8 +84,6 @@ public class UserController {
     @Resource
     private QnmLoginRecordMapper qnmLoginRecordMapper;
     @Resource
-    private IRunLoginRecordMapper iRunLoginRecordMapper;
-    @Resource
     private AdRecordMapper adRecordMapper;
     @Resource
     private QNAdRecordMapper qnAdRecordMapper;
@@ -99,8 +92,6 @@ public class UserController {
     @Resource
     private QnmAdRecordMapper qnmAdRecordMapper;
     @Resource
-    private IRunAdRecordMapper iRunAdRecordMapper;
-    @Resource
     private QuestionMapper questionMapper;
 
     private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -122,7 +113,6 @@ public class UserController {
         List<YtAppUserListView> qnUserList = qnUserMapper.queryAll(param);
         List<YtAppUserListView> nfUserList = nfUserMapper.queryAll(param);
         List<YtAppUserListView> qnmUserList = qnmUserMapper.queryAll(param);
-        List<YtAppUserListView> irunUserList = iRunUserMapper.queryAll(param);
         if (CollUtil.isNotEmpty(dyzUserList)) {
             resultList.addAll(dyzUserList);
         }
@@ -135,9 +125,6 @@ public class UserController {
         if (CollUtil.isNotEmpty(qnmUserList)) {
             resultList.addAll(qnmUserList);
         }
-        if (CollUtil.isNotEmpty(irunUserList)) {
-            resultList.addAll(irunUserList);
-        }
         int total = resultList.size()/param.getLimit();
         long a =  resultList.size() % param.getLimit();
         if(resultList.size() % param.getLimit() != 0){
@@ -167,7 +154,6 @@ public class UserController {
         List<YtDyzAdRecord> qnAdRecords = qnAdRecordMapper.getByUserIds(collect);
         List<YtDyzAdRecord> nfAdRecords = nfAdRecordMapper.getByUserIds(collect);
         List<YtDyzAdRecord> qnmAdRecords = qnmAdRecordMapper.getByUserIds(collect);
-        List<YtDyzAdRecord> irunAdRecords = iRunAdRecordMapper.getByUserIds(collect);
         if(CollUtil.isNotEmpty(qnAdRecords)){
             adRecords.addAll(qnAdRecords);
         }
@@ -177,14 +163,10 @@ public class UserController {
         if(CollUtil.isNotEmpty(qnmAdRecords)){
             adRecords.addAll(qnmAdRecords);
         }
-        if(CollUtil.isNotEmpty(irunAdRecords)){
-            adRecords.addAll(irunAdRecords);
-        }
         List<YtDyzLoginRecord> dyzLogins = loginRecordMapper.getLoginRecordByIds(collect);
         List<YtDyzLoginRecord> qnLogins = qnLoginRecordMapper.getLoginRecordByIds(collect);
         List<YtDyzLoginRecord> nfLogins = nfLoginRecordMapper.getLoginRecordByIds(collect);
         List<YtDyzLoginRecord> qnmLogins = qnmLoginRecordMapper.getLoginRecordByIds(collect);
-        List<YtDyzLoginRecord> irunLogins = iRunLoginRecordMapper.getLoginRecordByIds(collect);
 
         if(CollUtil.isNotEmpty(qnLogins)){
             dyzLogins.addAll(qnLogins);
@@ -195,9 +177,6 @@ public class UserController {
         if(CollUtil.isNotEmpty(qnmLogins)){
             dyzLogins.addAll(qnmLogins);
         }
-        if(CollUtil.isNotEmpty(irunLogins)){
-            dyzLogins.addAll(irunLogins);
-        }
         Map<String, List<YtDyzAdRecord>> userAdMap = adRecords.stream().collect(
                 Collectors.groupingBy(YtDyzAdRecord::getUserId));
         Map<String, List<YtDyzLoginRecord>> loginMap = dyzLogins.stream().collect(
@@ -252,10 +231,6 @@ public class UserController {
         if(Objects.nonNull(qnmRevenue)){
             result = result.add(qnmRevenue);
         }
-        BigDecimal irunRevenue = iRunAdRecordMapper.getRevenueByTime(param);
-        if(Objects.nonNull(irunRevenue)){
-            result = result.add(irunRevenue);
-        }
         return result;
     }
 
@@ -287,8 +262,6 @@ public class UserController {
         if(CollUtil.isNotEmpty(nfuserList)){resultList.addAll(nfuserList);}
         List<YtDyzUser> qnmuserList = qnmUserMapper.queryUserList(param);
         if(CollUtil.isNotEmpty(qnmuserList)){resultList.addAll(qnmuserList);}
-        List<YtDyzUser> irunuserList = iRunUserMapper.queryUserList(param);
-        if(CollUtil.isNotEmpty(irunuserList)){resultList.addAll(irunuserList);}
         return ResultTable.resultTableOk(new PageInfo<>(resultList));
     }
 
@@ -329,10 +302,6 @@ public class UserController {
         if(CollUtil.isNotEmpty(qnmRecords)){
             result.addAll(qnmRecords);
         }
-        List<YtDyzAdRecord> irunRecords = iRunAdRecordMapper.getByUserId(userId, adsourceType);
-        if(CollUtil.isNotEmpty(irunRecords)){
-            result.addAll(irunRecords);
-        }
         return ResultTable.resultTableOk(new PageInfo<YtDyzAdRecord>(result));
     }
 
@@ -400,10 +369,6 @@ public class UserController {
             qnmUserMapper.unlockUser(userIds);
             return;
         }
-        dyzUsers = iRunUserMapper.queryByUserIds(userIds);
-        if(CollUtil.isNotEmpty(dyzUsers)){
-            iRunUserMapper.unlockUser(userIds);
-        }
     }
     @GetMapping("/lockUser")
     public YtDyzUser lockUser(@RequestParam("userId")String userId,@RequestParam("userStatus")Integer userStatus){
@@ -431,11 +396,6 @@ public class UserController {
             qnmUserMapper.updateUser(newUser);
             return dyzUser;
         }
-        dyzUser = iRunUserMapper.selectPrimaryKey(userId);
-        if(Objects.nonNull(dyzUser)){
-            iRunUserMapper.updateUser(newUser);
-            return dyzUser;
-        }
         return null;
     }
 
@@ -458,8 +418,6 @@ public class UserController {
         if(CollUtil.isNotEmpty(nfAuditCheckList)){auditList.addAll(nfAuditCheckList);}
         List<AgentAuditCheckVO> qnmAuditCheckList = qnmUserMapper.queryTodayUserAd(auditParam);
         if(CollUtil.isNotEmpty(qnmAuditCheckList)){auditList.addAll(qnmAuditCheckList);}
-        List<AgentAuditCheckVO> irunAuditCheckList = iRunUserMapper.queryTodayUserAd(auditParam);
-        if(CollUtil.isNotEmpty(irunAuditCheckList)){auditList.addAll(irunAuditCheckList);}
 
         Map<String, List<YtDyzAdRecord>> adRecordMap = auditList.stream().collect(
                 Collectors.toMap(AgentAuditCheckVO::getUserId, AgentAuditCheckVO::getAdRecordList));

yt-irun/irun-service/src/main/java/com/ytpm/irun/IRunApplication.java

@@ -2,7 +2,6 @@ package com.ytpm.irun;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.web.bind.annotation.RestController;

yt-risk/risk-manage/src/main/java/com/ytpm/RiskManageApplication.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 @SpringBootApplication
 @EnableDiscoveryClient
 @MapperScan(basePackages = "com.ytpm.dao")
-@EnableFeignClients(basePackages = {"com.ytpm.feign"})
+@EnableFeignClients(basePackages = {"com.ytpm.feign","com.ytpm.irun.feign"})
 public class RiskManageApplication
 {
     public static void main( String[] args )

yt-risk/risk-manage/src/main/java/com/ytpm/service/impl/RiskServiceImpl.java

@@ -11,7 +11,6 @@ import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ytpm.advertise.enums.AdSourceTypeEnum;
-import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.agent.model.YtPlatformBanned;
 import com.ytpm.agent.model.YtPlatformDeblocking;
 import com.ytpm.agent.view.AgentAppClassView;
@@ -53,6 +52,7 @@ import com.ytpm.util.RedisService;
 import com.ytpm.util.ReflectUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
@@ -97,7 +97,7 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
     private RiskManageMapper riskManageMapper;
     @Resource
     private AppFeign appFeign;
-    @Resource
+    @Autowired
     private IRunFeign iRunFeign;
     @Value("${risk.banned.tips}")
     private String tips;