yumeng 2 years ago
parent
commit
ca50d97e9f

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -204,6 +204,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/ai/projectCreate/*", "anon");
         //获取快手实时组数据信息
         filterChainDefinitionMap.put("/kuaishou/realTime/*", "anon");
+        filterChainDefinitionMap.put("/agent/*", "anon");
 
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<>(1);

+ 1 - 1
jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties

@@ -1,5 +1,5 @@
 #code_generate_project_path
-project_path=D:\\module
+project_path=/Users/yumeng/module
 #bussi_package[User defined]
 bussi_package=cn.com.ctop
 #default code path

File diff suppressed because it is too large
+ 80 - 52
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java


+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/UserAllocationMapper.java

@@ -62,4 +62,6 @@ public interface UserAllocationMapper extends BaseMapper<UserAllocation> {
     List<Long> queryAutomaticAccounts(@Param("projectId") Long projectId);
 
     List<Long> getIdList();
+
+    List<String> getAccountListByProjectV2(@Param("projectId") Long projectId);
 }

+ 3 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/UserAllocationMapper.xml

@@ -243,5 +243,8 @@
         where status = 0
 
     </select>
+    <select id="getAccountListByProjectV2" resultType="java.lang.String" parameterType="java.lang.Long">
+        SELECT  account_id  FROM ctop_user_allocation where project_id = #{projectId}
+    </select>
 
 </mapper>

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IUserAllocationService.java

@@ -69,4 +69,6 @@ public interface IUserAllocationService extends IService<UserAllocation> {
     List<Long> queryAutomaticAccounts(Long projectId);
 
     List<Long> getIdList();
+
+    List<String> getAccountListByProjectV2(Long projectId);
 }

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/UserAllocationServiceImpl.java

@@ -225,4 +225,9 @@ public class UserAllocationServiceImpl extends ServiceImpl<UserAllocationMapper,
     public List<Long> getIdList() {
         return userAllocationMapper.getIdList();
     }
+
+    @Override
+    public List<String> getAccountListByProjectV2(Long projectId) {
+        return userAllocationMapper.getAccountListByProjectV2(projectId);
+    }
 }

+ 8 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/agent/service/impl/AgentManagementServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.com.ctop.toutiao.modules.agent.service.impl;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.HttpUtils;
 import cn.com.ctop.toutiao.modules.agent.entity.TransactionDay;
 import cn.com.ctop.toutiao.modules.agent.entity.TransactionDetails;
@@ -21,6 +22,7 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.jeecg.common.api.vo.Result;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -261,6 +263,9 @@ public class AgentManagementServiceImpl implements AgentManagementService {
      * @author zzy
      * @create: 2021-07-15
      */
+
+    @Autowired
+    private IUserAllocationService userAllocationService;
     @Override
     public Result synchronousAccountTransactionDay(String startDate, String endDate) {
         log.info("开始同步账号日流水---日期{}---{}",startDate,endDate);
@@ -271,7 +276,9 @@ public class AgentManagementServiceImpl implements AgentManagementService {
         ca.add(Calendar.DATE, -1);
 
         try {
-            List<String> accountIdList = ctopAgentAccountMapper.getAllAccountId();
+            List<String> accountIdList = userAllocationService.getAccountListByProjectV2(12630885L);
+
+         //   List<String> accountIdList = ctopAgentAccountMapper.getAllAccountId();
 //            List<String> accountIdList = new ArrayList<>();
             //accountIdList.add("1744115510360071");
             if (!accountIdList.isEmpty()) {