删除无用类, 增加cron相关

infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/CronCollectionService.java

@@ -0,0 +1,23 @@
+package com.infincash.cron.collection;
+
+import java.util.List;
+
+public interface CronCollectionService {
+	/**
+	 * 查询全部未分配订单
+	 * @return
+	 */
+	List<Collection> readCollection();
+	
+	/**
+	 * 分配待催收订单
+	 * @return
+	 */
+	int assignCollection(List<Collection> list);
+	
+	/**
+	 * 离职员工催收订单分配
+	 * @return
+	 */
+	int assignExemployeeCollection();
+}

infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/CronCollectionServiceImpl.java

@@ -0,0 +1,5 @@
+package com.infincash.cron.collection;
+
+public class CronCollectionServiceImpl implements CronCollectionService{
+
+}

infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/cron/collection/CronJobHandler.java

@@ -1,4 +1,4 @@
-package com.xxl.job.executor.service.jobhandler;
+package com.infincash.cron.collection;
 
 import java.util.List;
 
@@ -22,20 +22,22 @@ import com.xxl.job.core.log.XxlJobLogger;
  *
  * @author xuxueli 2015-12-19 19:43:36
  */
-@JobHandler(value = "risk-count-statistics")
+@JobHandler(value = "collectionDispatch")
 @Component
-public class RiskCountStatisticsJobHandler extends IJobHandler {
+public class CronJobHandler extends IJobHandler {
 	@Autowired
-	RiskService service;
+	CronCollectionService service;
 
 	@Override
 	public ReturnT<String> execute(String param) throws Exception {
-		List<RiskStatsDTO> list = service.countRecentRisk();
+		List<RiskStatsDTO> list = service.readCollection();
-		int res = service.writeRecentRisk(list);
+		int res = service.assignCollection(list);
-		XxlJobLogger.log("res: " + res);
+		XxlJobLogger.log("assignCollection: " + res);
 		if(res < list.size()){			
 		    return FAIL;
 		}
+		res = service.assignExemployeeCollection();
+		XxlJobLogger.log("assignCollection: " + res);
 		return SUCCESS;
 	}
 }

infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/statistics/risk/RiskService.java

@@ -1,11 +0,0 @@
-package com.infincash.statistics.risk;
-
-import java.util.List;
-
-import com.infincash.statistics.risk.table.prd.extend.RiskStatsDTO;
-
-public interface RiskService {
-	List<RiskStatsDTO> countRecentRisk();
-	
-	int writeRecentRisk(List<RiskStatsDTO> list);
-}

infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/statistics/risk/RiskServiceImpl.java

@@ -1,30 +0,0 @@
-package com.infincash.statistics.risk;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.infincash.statistics.risk.mapper.prd.TRiskRuleMapper;
-import com.infincash.statistics.risk.mapper.stats.TStatsRiskDetailMapper;
-import com.infincash.statistics.risk.table.prd.extend.RiskStatsDTO;
-
-@Service
-public class RiskServiceImpl implements RiskService {
-
-	@Autowired
-    private TRiskRuleMapper readMapper;//这里会报错，但是并不会影响
-	
-	@Autowired
-	private TStatsRiskDetailMapper writeMapper;
-	
-	@Override
-	public List<RiskStatsDTO> countRecentRisk() {
-		return readMapper.countRiskRule();
-	}
-
-	@Override
-	public int writeRecentRisk(List<RiskStatsDTO> list) {
-		return writeMapper.insertBatch(list);
-	}
-}

infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/statistics/risk/mapper/prd/TRiskRuleMapper.java

@@ -1,9 +0,0 @@
-package com.infincash.statistics.risk.mapper.prd;
-
-import java.util.List;
-
-import com.infincash.statistics.risk.table.prd.extend.RiskStatsDTO;
-
-public interface TRiskRuleMapper {
-	List<RiskStatsDTO> countRiskRule();
-}

infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/statistics/risk/mapper/stats/TStatsRiskDetailMapper.java

@@ -1,10 +0,0 @@
-package com.infincash.statistics.risk.mapper.stats;
-
-import java.util.List;
-
-import com.infincash.statistics.risk.table.prd.extend.RiskStatsDTO;
-
-
-public interface TStatsRiskDetailMapper {
-    int insertBatch(List<RiskStatsDTO> list);
-}

infintech-executors/executor-collection-dispatcher/src/main/java/com/infincash/statistics/risk/table/prd/extend/RiskStatsDTO.java

@@ -1,28 +0,0 @@
-package com.infincash.statistics.risk.table.prd.extend;
-
-import java.util.Date;
-
-public class RiskStatsDTO {
-	String riskRuleId;
-    int count;
-    Date time;
-    
-	public Date getTime() {
-		return time;
-	}
-	public void setTime(Date time) {
-		this.time = time;
-	}
-	public String getRiskRuleId() {
-		return riskRuleId;
-	}
-	public void setRiskRuleId(String riskRuleId) {
-		this.riskRuleId = riskRuleId;
-	}
-	public int getCount() {
-		return count;
-	}
-	public void setCount(int count) {
-		this.count = count;
-	}    
-}

infintech-executors/executor-collection-dispatcher/src/main/resources/application.properties

@@ -23,7 +23,7 @@ xxl.job.admin.addresses=http://127.0.0.1:8090
 #xxl.job.admin.addresses=http://dispatch-center.infincash.com
 
 ### xxl-job executor address
-xxl.job.executor.appname=executor-001
+xxl.job.executor.appname=executor-collection-dispatcher
 xxl.job.executor.ip=
 xxl.job.executor.port=9002
 

infintech-executors/executor-collection-dispatcher/src/main/resources/mapping/prd/CronCollectionMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.infincash.statistics.risk.mapper.prd.TRiskRuleMapper">
+    <resultMap id="riskStatsDTOMap" type="com.infincash.statistics.risk.table.prd.extend.RiskStatsDTO">  
+        <result property="riskRuleId" column="risk_rule_id" />  
+        <result property="count" column="count1" />  
+        <result property="time" column="time" />  
+    </resultMap>  
+    <!-- id, risk_rule_id, count(1) as count1, now() as time resultType="com.infincash.statistics.risk.table.prd.extend.RiskStatsDTO" -->
+    <select id="selectCollection" resultType="java.lang.String" >
+        select 
+        
+    </select>
+    
+    <select id="selectTel1Employee" resultType="java.lang.String" >
+        select user_id from t_system_user_role t1 inner join t_system_role t2 on t1.role_id = t2.role_id and t2.role_name='电催_1';
+    </select>
+    <select id="selectTel2Employee" resultType="java.lang.String" >
+        select user_id from t_system_user_role t1 inner join t_system_role t2 on t1.role_id = t2.role_id and t2.role_name='电催_2';
+    </select>
+    <select id="selectDoorEmployee" resultType="java.lang.String" >
+        select user_id from t_system_user_role t1 inner join t_system_role t2 on t1.role_id = t2.role_id and t2.role_name='地催';
+    </select>
+    
+</mapper>

infintech-executors/executor-collection-dispatcher/src/main/resources/mapping/prd/TRiskRuleMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.infincash.statistics.risk.mapper.prd.TRiskRuleMapper">
-    <resultMap id="riskStatsDTOMap" type="com.infincash.statistics.risk.table.prd.extend.RiskStatsDTO">  
-        <result property="riskRuleId" column="risk_rule_id" />  
-        <result property="count" column="count1" />  
-        <result property="time" column="time" />  
-    </resultMap>  
-    <!-- id, risk_rule_id, count(1) as count1, now() as time resultType="com.infincash.statistics.risk.table.prd.extend.RiskStatsDTO" -->
-    <select id="countRiskRule" resultMap="riskStatsDTOMap" >
-        <![CDATA[
-        select 
-          risk_rule_id, count(1) as count1, now() as time
-        from t_user_risk 
-        where user_id in (select user_id from t_user where DATE_SUB(NOW(),INTERVAL  1 HOUR) <= register_time)    
-        GROUP by risk_rule_id order by risk_rule_id;
-        ]]>
-    </select>
-</mapper>

infintech-executors/executor-collection-dispatcher/src/main/resources/mapping/stats/TStatsRiskDetailMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.infincash.statistics.risk.mapper.stats.TStatsRiskDetailMapper">
-  <resultMap id="BaseResultMap" type="com.infincash.statistics.risk.table.prd.extend.RiskStatsDTO">
-        <result property="riskRuleId" column="risk_rule_id" />  
-        <result property="count" column="count1" />  
-        <result property="time" column="time" />  
-  </resultMap>
-
-  <insert id="insertBatch" parameterType="java.util.List">
-    insert into t_stats_risk_detail
-    (stats_time, a_hour_count, risk_rule_id)
-    VALUES
-    <foreach collection ="list" item="oneItem" index= "index" separator =",">
-    (
-      #{oneItem.time}, #{oneItem.count},#{oneItem.riskRuleId}
-    )
-    </foreach >
-  </insert>
-</mapper>

infintech-executors/executor-collection-dispatcher/src/test/java/com/xxl/job/executor/test/XxlJobExecutorExampleBootApplicationTests.java

@@ -6,15 +6,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.infincash.cron.collection.CronJobHandler;
 import com.xxl.job.executor.Application;
-import com.xxl.job.executor.service.jobhandler.RiskCountStatisticsJobHandler;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class ,webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class XxlJobExecutorExampleBootApplicationTests {
 
 	@Autowired
-	RiskCountStatisticsJobHandler jobHandler;
+	CronJobHandler jobHandler;
 	
 	@Test
 	public void test() throws Exception {