Browse Source

定时触发任务代码修改、优化

anderx 7 years ago
parent
commit
870624f079

+ 1 - 1
src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java

@@ -92,7 +92,7 @@ public interface UserLockReleaseMapper {
 
 	List<LockingReleaseBo> selectWaitReleaseBusiness(String aid);
 
-	void updateReleaseLock(@Param("lockIds")String lockIds,@Param("releaseTime")Date releaseTime);
+	void updateReleaseLock(@Param("releaseTime")Date releaseTime);
 
 	void updatePendingReleaseLock(@Param("lockIds")String lockIds);
 

+ 1 - 1
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -229,7 +229,7 @@ public interface UserMapper {
 	
 	List<User> selectUserByRoleName(@Param("roleName1")String roleName1,@Param("roleName2")String roleName2);
 	
-	void updateReleaseLock(List<LockingReleaseBo> list);
+	void updateReleaseLock();
 
 	marketingESBo marketingStatistics(@Param("id")String id, @Param("dailyStart")String dailyStart, @Param("dailyEnd")String dailyEnd);
 

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -385,7 +385,7 @@
   </select>
   
   <update id="updateReleaseLock" parameterType="java.lang.String">
-  	update user_lock_release set status = 2,release_time = #{releaseTime} where id in (${lockIds})
+  		update user_lock_release set status = 2,release_time =  #{releaseTime} where status=1
   </update>
   
   <update id="updatePendingReleaseLock" parameterType="java.lang.String">

+ 1 - 4
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -1635,10 +1635,7 @@
     </select>
     
     <update id="updateReleaseLock" parameterType="com.goafanti.customer.bo.LockingReleaseBo">
-    	update user set share_type = 1 where id in 
-	  	<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
-			#{item.uid}
-		</foreach>
+    	update user a,user_lock_release b set a.share_type = 1 where b.status=1 and a.id=b.uid 
     </update>
     
     <select id="marketingStatistics" parameterType="java.lang.String" resultType="com.goafanti.report.bo.marketingESBo">

+ 4 - 35
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -31,6 +31,7 @@ public class ReleaseUserTask {
 	@Scheduled(cron = "0 0 1  * * ?") 
 //	@RequestMapping(value = "/open/updateUser", method = RequestMethod.GET)
 	public void updateUser(){
+		Date releaseTime = new Date();
 		try {
 			List<User> userList = userServiceImpl.selectUserByRoleName("营销员","营销经理");
 			List<LockingReleaseBo> lockUserList = new ArrayList<LockingReleaseBo>();
@@ -66,49 +67,17 @@ public class ReleaseUserTask {
 					  }  
 				  }
 			}
+			List<LockingReleaseBo> lockList=customerServiceImpl.selectPendinglockUserList();
+			if (lockList.size()>0)customerServiceImpl.updateReleaseLock(releaseTime);
 			/*if(lockUserList.size()>0) customerServiceImpl.updateReleaseLock(lockUserList,releaseTime);
 			if(lockBusinessList.size()>0) customerServiceImpl.updateReleaseLock(lockBusinessList,releaseTime);
 			if(lockUserList.size()>0) userServiceImpl.updateReleaseLock(lockUserList);*/
 
 		} catch (Exception e) {
 			LoggerUtils.error(getClass(), "=============================================");
-			LoggerUtils.error(getClass(), "客户标记待释放失败", e);
-			LoggerUtils.error(getClass(), "=============================================");
-		}
-	}
-	/**
-	 * 将待释放客户与业务释放
-	 */
-	
-	@Scheduled(cron = "0 0 2  * * ?") 
-//	@RequestMapping(value = "/open/releaseUser", method = RequestMethod.GET)
-	public void releaseUser(){
-		Date releaseTime = new Date();
-		try {
-			List<LockingReleaseBo> lockList=customerServiceImpl.selectPendinglockUserList();
-			List<LockingReleaseBo> newList=new ArrayList<>();
-			List<LockingReleaseBo> userList=new ArrayList<>();
-			if (lockList.size()>0) {
-				for(int i=0;i<lockList.size();i++){
-					newList.add(lockList.get(i));
-					if(pointsDataLimit == newList.size()||i == lockList.size()-1){
-						if(newList.size()>0) customerServiceImpl.updateReleaseLock(newList,releaseTime);
-						newList.clear();
-						Thread.sleep(2000);
-					}  
-					if (lockList.get(i).getType().equals("0")) {
-						userList.add(lockList.get(i));
-						if(pointsDataLimit == userList.size()||i == lockList.size()-1){
-							if(userList.size()>0) userServiceImpl.updateReleaseLock(userList);
-						}
-					}
-				}
-			}
-		} catch (Exception e) {
-			LoggerUtils.error(getClass(), "=============================================");
 			LoggerUtils.error(getClass(), "客户释放失败", e);
 			LoggerUtils.error(getClass(), "=============================================");
 		}
-		
 	}
+	
 }

+ 1 - 1
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -460,7 +460,7 @@ public interface CustomerService {
 	
 	List<LockingReleaseBo> selectWaitReleaseBusiness(String uid);
 	
-	void updateReleaseLock(List<LockingReleaseBo> list,Date releaseTime);
+	void updateReleaseLock(Date releaseTime);
 	
 	/**
 	 * 查询客户的锁定业务

+ 4 - 9
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1290,15 +1290,10 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 	 * @param list
 	 */
 	@Override
-	public void updateReleaseLock(List<LockingReleaseBo> list,Date releaseTime){
-		String lockIds = "";
-		for(LockingReleaseBo bo:list){
-			lockIds += bo.getId() + ",";
-		}
-		if(lockIds.length()>0) {
-			lockIds = "'" + lockIds.substring(0,lockIds.length()-1).replace(",", "','") + "'";
-			userLockReleaseMapper.updateReleaseLock(lockIds,releaseTime);
-		}
+	public void updateReleaseLock(Date releaseTime){
+		userMapper.updateReleaseLock();
+		userLockReleaseMapper.updateReleaseLock(releaseTime);
+		
 	}
 
 	@Override

+ 1 - 1
src/main/java/com/goafanti/user/service/UserService.java

@@ -68,5 +68,5 @@ public interface UserService {
 	
 	List<User> selectUserByRoleName(String roleName1, String roleName2);
 	
-	void updateReleaseLock(List<LockingReleaseBo> list);
+	
 }

+ 1 - 4
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -373,8 +373,5 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		return userMapper.selectUserByRoleName(roleName1,roleName2);
 	}
 	
-	@Override
-	public void updateReleaseLock(List<LockingReleaseBo> list){
-		 userMapper.updateReleaseLock(list);
-	}
+	
 }