瀏覽代碼

客户释放BUG修复

anderx 7 年之前
父節點
當前提交
90fb7a4cb9

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

@@ -393,6 +393,6 @@
   </update>
   </update>
   
   
   <select id="selectPendinglockUserList" resultType="com.goafanti.customer.bo.LockingReleaseBo">
   <select id="selectPendinglockUserList" resultType="com.goafanti.customer.bo.LockingReleaseBo">
-  	select id from user_lock_release where status=1
+  	select id,type from user_lock_release where status=1
   </select>
   </select>
 </mapper>
 </mapper>

+ 8 - 0
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 
 
+import org.apache.tomcat.jni.Lock;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
@@ -90,6 +91,7 @@ public class ReleaseUserTask {
 		try {
 		try {
 			List<LockingReleaseBo> lockList=customerServiceImpl.selectPendinglockUserList();
 			List<LockingReleaseBo> lockList=customerServiceImpl.selectPendinglockUserList();
 			List<LockingReleaseBo> newList=new ArrayList<>();
 			List<LockingReleaseBo> newList=new ArrayList<>();
+			List<LockingReleaseBo> userList=new ArrayList<>();
 			if (lockList.size()>0) {
 			if (lockList.size()>0) {
 				for(int i=0;i<lockList.size();i++){
 				for(int i=0;i<lockList.size();i++){
 					newList.add(lockList.get(i));
 					newList.add(lockList.get(i));
@@ -98,6 +100,12 @@ public class ReleaseUserTask {
 						newList.clear();
 						newList.clear();
 						Thread.sleep(2000);
 						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) {
 		} catch (Exception e) {

+ 7 - 0
src/main/java/com/goafanti/customer/bo/LockingReleaseBo.java

@@ -5,6 +5,7 @@ public class LockingReleaseBo {
 	private String uid;
 	private String uid;
 	private String aid;
 	private String aid;
 	private String lockTime;
 	private String lockTime;
+	private String type;
 	private String businessProjectId;
 	private String businessProjectId;
 	private String businessProjectName;
 	private String businessProjectName;
 	private String salesmanName;
 	private String salesmanName;
@@ -64,4 +65,10 @@ public class LockingReleaseBo {
 	public void setLastSignTime(String lastSignTime) {
 	public void setLastSignTime(String lastSignTime) {
 		this.lastSignTime = lastSignTime;
 		this.lastSignTime = lastSignTime;
 	}
 	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
 }
 }