Browse Source

将定时客户释放更改为手动触发

anderx 7 years ago
parent
commit
f47a168fe2

+ 1 - 4
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -373,20 +373,17 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
 			return res;
 		}
-
 		Admin a = adminService.selectByMobile(admin.getMobile().trim());
 		if (!TokenManager.getAdminId().equals(a.getId())) {
 			res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
 			return res;
 		}
-
 		Admin ad = new Admin();
 		BeanUtils.copyProperties(admin, ad);
 		Admin aa = adminService.selectByPrimaryKey(TokenManager.getAdminId());
 		ad.setMobile(ad.getMobile().trim());
 		ad.setCreateTime(aa.getCreateTime());
-
-		if (!StringUtils.isBlank(ad.getPassword())) {
+		if (StringUtils.isNotBlank(ad.getPassword())) {
 			if (StringUtils.isBlank(pwd)) {
 				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "原密码"));
 				return res;

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

@@ -14,8 +14,8 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.customer.service.CustomerService;
 import com.goafanti.user.service.UserService;
-@Component
-//@Controller
+//@Component
+@Controller
 public class ReleaseUserTask {
 	@Resource
 	private CustomerService customerServiceImpl;
@@ -28,8 +28,8 @@ public class ReleaseUserTask {
 	 * 每天凌晨一点将客户和业务转为待释放
 	 */
 	
-	@Scheduled(cron = "0 0 20  * * ?") 
-//	@RequestMapping(value = "/open/updateUser", method = RequestMethod.GET)
+//	@Scheduled(cron = "0 0 1  * * ?") 
+	@RequestMapping(value = "/open/updateUser", method = RequestMethod.GET)
 	public void updateUser(){
 		try {
 			List<User> userList = userServiceImpl.selectUserByRoleName("营销员","营销经理");
@@ -80,8 +80,8 @@ public class ReleaseUserTask {
 	 * 将待释放客户与业务释放
 	 */
 	
-	@Scheduled(cron = "0 0 21  * * ?") 
-//	@RequestMapping(value = "/open/releaseUser", method = RequestMethod.GET)
+//	@Scheduled(cron = "0 0 2  * * ?") 
+	@RequestMapping(value = "/open/releaseUser", method = RequestMethod.GET)
 	public void releaseUser(){
 		Date releaseTime = new Date();
 		try {