优化赛事

qmjszx-admin/src/main/java/beilv/web/controller/competition/CompetitionController.java

@@ -125,8 +125,8 @@ public class CompetitionController extends BaseController {
     @Log(title="赛事发布", businessType=BusinessType.UPDATE)
     @PostMapping("/publish")
     @ResponseBody
-    public AjaxResult publish(String id){
-       return toAjax(competitionService.publishCompetitionById(id));
+    public AjaxResult publish(Competition competition){
+       return toAjax(competitionService.publishCompetitionById(competition));
     }
 
     /**

qmjszx-admin/src/main/resources/templates/competition/competition.html

@@ -173,7 +173,7 @@
                 // 获取当前时间
                 var currentTime = new Date();
                 if(allowPublishTime > currentTime){
-                    var data = { "id": id };
+                    var data = { "id": id , "applyStartTime": formatApplyStartTime(allowPublishTime)};
                     $.operate.submit(url, "post", "json", data);
                 }else{
                     $.modal.alertError("赛事开始时间早于当前时间, 请先修改赛事开始时间!")
@@ -182,6 +182,19 @@
         });
     }
 
+
+    // 自定义格式化函数
+    function formatApplyStartTime(date) {
+        var year = date.getFullYear();
+        var month = ('0' + (date.getMonth() + 1)).slice(-2); // 月份从0开始
+        var day = ('0' + date.getDate()).slice(-2);
+        var hours = ('0' + date.getHours()).slice(-2);
+        var minutes = ('0' + date.getMinutes()).slice(-2);
+        var seconds = ('0' + date.getSeconds()).slice(-2);
+
+        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    }
+
 </script>
 </body>
 </html>

qmjszx-business/src/main/java/beilv/competition/service/ICompetitionService.java

@@ -61,7 +61,7 @@ public interface ICompetitionService {
      */
     public int deleteCompetitionById(Integer id);
 
-    int publishCompetitionById(String id);
+    int publishCompetitionById(Competition competition);
 
     int closeCompetitionById(String id);
 

qmjszx-business/src/main/java/beilv/competition/service/impl/CompetitionServiceImpl.java

@@ -127,15 +127,15 @@ public class CompetitionServiceImpl implements ICompetitionService {
     }
 
     @Override
-    public int publishCompetitionById(String id) {
-        Competition competition = new Competition();
+    public int publishCompetitionById(Competition competition) {
+//        Competition competition = new Competition();
         competition.setPublishTime(new Date());
         competition.setPublishBy(ShiroUtils.getSysUser().getUserId().toString());
         competition.setPublishName(ShiroUtils.getSysUser().getUserName());
-        competition.setId(Integer.valueOf(id));
         competition.setCompetitionState(BAO_MING_ZHONG);
         Timer timer = new Timer();
-        timer.schedule(new CloseReg(competitionMapper, Integer.parseInt(id)), new Date(competition.getApplyStartTime().getTime() - (long) (competition.getApplyBeforeTime() * 60 * 1000)));
+        //new Date(competition.getApplyStartTime().getTime() - (long) (competition.getApplyBeforeTime() * 60 * 1000))
+        timer.schedule(new CloseReg(competitionMapper, competition.getId()), competition.getApplyStartTime());
         return competitionMapper.publishCompetition(competition);
     }