银行卡

site/src/main/java/com/mooctest/crowd/site/controller/CrowdProjectController.java

@@ -41,8 +41,6 @@ public class CrowdProjectController{
      */
     @RequestMapping(value = "/api/project/", method = RequestMethod.POST)
     public ProjectDetailsDTO createProject(@Validated @RequestBody CrowdTestProjectCommand crowdTestProjectCommand, BindingResult result,HttpSession session){
-
-
         long  userId=Long.parseLong((String) session.getAttribute("userId"));
 
         if (result.hasErrors()) {

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -1254,7 +1254,7 @@ public class WebMediatorImpl implements ViewMediator {
         }
         String bank = String.valueOf(json.get("bank"));
         Optional<BankLogoPO> bankLogoPO = bankLogoDao.findByName(bankCardVO.getName());
-        if (!bank.equals(bankLogoPO.get().getName())) {
+        if (!bank.equals(bankLogoPO.get().getCode())) {
             throw new HttpBadRequestException("请输入与选定银行一致的账号");
         }
         List<BankCardPO> bankCardPOList = bankCardDao.findByUserIdAndIsDeleted(userId, DeletedStatus.isNotDeleted);

site/src/main/java/com/mooctest/crowd/site/service/ThemeSchedulerTaskService.java

@@ -1,8 +0,0 @@
-package com.mooctest.crowd.site.service;
-
-import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
-
-public interface ThemeSchedulerTaskService {
-    boolean createNewThemeScheduler(CrowdTestTask crowdTestProject);
-    boolean cancelThemeScheduler(CrowdTestTask crowdTestProject);
-}

site/src/main/java/com/mooctest/crowd/site/service/ThemeStatusTaskService.java

@@ -1,7 +0,0 @@
-package com.mooctest.crowd.site.service;
-import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
-
-
-public interface ThemeStatusTaskService {
-    Integer updateStatus(CrowdTestTask crowdTestProject);
-}

site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdTaskServiceImpl.java

@@ -15,10 +15,8 @@ import com.mooctest.crowd.site.data.dto.TaskSquareDTO;
 import com.mooctest.crowd.site.data.enums.ProjectType;
 import com.mooctest.crowd.site.data.enums.RoleType;
 import com.mooctest.crowd.site.data.vo.CrowdTaskVO;
-import com.mooctest.crowd.site.data.vo.CrowdTestProjectVO;
 import com.mooctest.crowd.site.mediator.ViewMediator;
 import com.mooctest.crowd.site.service.CrowdTaskService;
-import com.mooctest.crowd.site.service.ThemeSchedulerTaskService;
 import com.mooctest.crowd.site.util.GenerateFlowCodeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,9 +56,6 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
     @Autowired
     private EvaluationAgencyDao agencyDao;
 
-    @Autowired
-    private ThemeSchedulerTaskService themeSchedulerTaskService;
-
     @Override
     public List<CrowdTaskVO> findMoreHotTasks(){
         List<CrowdTaskVO> list=viewMediator.findMoreHotTasks();//根据创建时间已经倒叙排序好
@@ -95,7 +90,6 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
         CrowdTestProject project = projectRepo.getByProjectCode(projectCode);
         String taskCode = GenerateFlowCodeUtil.generateFlowCode("TASK-"+ ProjectType.getCode(command.getType()));
         task.create(taskCode);
-        themeSchedulerTaskService.createNewThemeScheduler(task);
         project.addTask(task);
         projectRepo.saveCrowdTestProject(project);
         return getTaskDetails(projectCode, taskCode, userId);

site/src/main/java/com/mooctest/crowd/site/service/impl/ThemeSchedulerServiceImpl.java

@@ -96,7 +96,7 @@ public class ThemeSchedulerServiceImpl implements ThemeSchedulerService {
 
             private CrowdTestProject crowdTestProject;
 
-            public MyRunnable() {}
+            //public MyRunnable() {}
 
             public MyRunnable (CrowdTestProject crowdTestProject) {
                 this.crowdTestProject = crowdTestProject;

site/src/main/java/com/mooctest/crowd/site/service/impl/ThemeSchedulerTaskServiceImpl.java

@@ -1,119 +0,0 @@
-package com.mooctest.crowd.site.service.impl;
-
-import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
-import com.mooctest.crowd.site.service.ThemeSchedulerService;
-import com.mooctest.crowd.site.service.ThemeSchedulerTaskService;
-import com.mooctest.crowd.site.service.ThemeStatusService;
-import com.mooctest.crowd.site.service.ThemeStatusTaskService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-import org.springframework.scheduling.support.CronTrigger;
-import org.springframework.stereotype.Service;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ScheduledFuture;
-
-
-/**
- * @program: crowd
- * @author: hanyuwei
- * @create: 2020-07-13 11:30
- **/
-@Service
-public class ThemeSchedulerTaskServiceImpl implements ThemeSchedulerTaskService {
-
-
-    @Autowired
-    private ThemeStatusTaskService themeStatusTaskService;
-
-    private ConcurrentHashMap<CrowdTestTask, ThemeScheduler> map = new ConcurrentHashMap<>();
-    @Override
-    public boolean createNewThemeScheduler(CrowdTestTask crowdTestTask) {
-        if(! this.map.containsKey(crowdTestTask)) {
-            String cronExp = this.generateNextCronExp(crowdTestTask);
-            if(cronExp==null){
-                return false;
-            }
-            ThemeScheduler crowdTestTaskScheduler = new ThemeScheduler(crowdTestTask, cronExp);
-            crowdTestTaskScheduler.startCron();
-            map.put(crowdTestTask, crowdTestTaskScheduler);
-            return true;
-        }
-        return false;
-    }
-
-    public String generateNextCronExp(CrowdTestTask crowdTestTask) {
-        String cronExp = null;
-        String dateFormat="ss mm HH dd MM EE";
-        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, Locale.US);
-        Date now = new Date();
-        if(now.before(crowdTestTask.getCreateTime())) {
-            cronExp = sdf.format(crowdTestTask.getCreateTime());
-        } else if(now.before(crowdTestTask.getDeadTime())){
-            cronExp = sdf.format(crowdTestTask.getDeadTime());
-        }
-        return cronExp;
-    }
-    @Override
-    public boolean cancelThemeScheduler(CrowdTestTask crowdTestTask) {
-        if(this.map.containsKey(crowdTestTask)) {
-            ThemeScheduler crowdTestTaskScheduler = map.get(crowdTestTask);
-            crowdTestTaskScheduler.stopCron();
-            map.remove(crowdTestTask);
-            return true;
-        }
-        return false;
-    }
-
-    private class ThemeScheduler {
-        private ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
-        private ScheduledFuture<?> future;
-        private CrowdTestTask crowdTestTask = null;
-        private String cronExp = null;
-
-        ThemeScheduler() {}
-
-        ThemeScheduler (CrowdTestTask crowdTestTask, String cronExp) {
-            this.crowdTestTask = crowdTestTask;
-            this.cronExp =  cronExp;
-            this.threadPoolTaskScheduler =  new ThreadPoolTaskScheduler();
-            this.threadPoolTaskScheduler.initialize();
-        }
-        public String startCron() {
-            future = this.threadPoolTaskScheduler.schedule(new MyRunnable(this.crowdTestTask), new CronTrigger(this.cronExp));
-            return "startCron";
-        }
-
-        public String stopCron() {
-            if (future != null) {
-                future.cancel(true);
-            }
-            return "stopCron";
-        }
-
-        private class MyRunnable implements Runnable {
-
-            private CrowdTestTask crowdTestTask;
-
-            public MyRunnable() {}
-
-            public MyRunnable (CrowdTestTask crowdTestTask) {
-                this.crowdTestTask = crowdTestTask;
-            }
-
-            @Override
-            public void run() {
-                System.out.println("run111 ");
-                Integer result = themeStatusTaskService.updateStatus(this.crowdTestTask);
-                map.remove(crowdTestTask);
-                if(result.equals(CrowdTestTask.HAS_CREATED) || result.equals(CrowdTestTask.HAS_RELEASED)) {
-                    System.out.println("run22 ");
-                    createNewThemeScheduler(crowdTestTask);
-                }
-            }
-        }
-    }
-}

site/src/main/java/com/mooctest/crowd/site/service/impl/ThemeStatusTaskServiceImpl.java

@@ -1,30 +0,0 @@
-package com.mooctest.crowd.site.service.impl;
-
-import com.mooctest.crowd.domain.dao.CrowdTestTaskDao;
-import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
-import com.mooctest.crowd.site.service.ThemeStatusTaskService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * @program: crowd
- * @author: hanyuwei
- * @create: 2020-07-13 13:11
- **/
-@Service
-public class ThemeStatusTaskServiceImpl implements ThemeStatusTaskService {
-
-    @Autowired
-    private CrowdTestTaskDao crowdTestProjectDao;
-
-    @Override
-    public Integer updateStatus(CrowdTestTask crowdTestProject) {
-        int status = 0;
-        long curr = System.currentTimeMillis();
-        if (crowdTestProject.getDeadTime().getTime() < curr) {
-            status = CrowdTestTask.HAS_TIME_OUT;
-        }
-        crowdTestProjectDao.updateStatusById(status,crowdTestProject.getCode());
-        return status;
-    }
-}