Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 18d6445f35090174a97bd3bde79d9a108ac7c363

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java

@@ -23,6 +23,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.Month;
@@ -161,10 +162,28 @@


    public static void main(String[] args) {
        LocalDate now = LocalDate.now();
        System.out.println(LocalDate.now().minusMonths(5) + " 00:00:00");
        LocalDateTime now = LocalDateTime.now();
        LocalDateTime localDateTime = LocalDateTime.now().minusDays(5);

        long hours = Duration.between(localDateTime, now).toHours();
        System.out.println(hours);
    }

    /**
     * 接受任务
     */
    @ApiOperation(value = "获取任务列表--接受任务", response = MissionIdDto.class)
    @PostMapping(value = "/api/t-mission/acceptMission")
    public R<?> acceptMission(@RequestBody String param) {
        MissionIdDto dto = JSON.parseObject(param, MissionIdDto.class);
        TMission mission = missionService.getById(dto.getMissionId());
        mission.setReceiveTime(LocalDateTime.now());
        // 计算 mission中的assign_time 和现在时间 时间差 小时
        mission.setAssignTime(mission.getAssignTime().plusHours(mission.getAssignTime().getHour()));
        long hoursDiff = Duration.between(mission.getAssignTime(), mission.getReceiveTime()).toHours();
        mission.setResTime((double) hoursDiff);
        return R.ok();
    }

    /**
     * 完成任务
@@ -221,5 +240,15 @@
    public R<List<TEquipment>> equipmentList() {
        return R.ok(equipmentService.list());
    }



    @ApiOperation(value = "发送任务", response = TEquipment.class)
    @PostMapping(value = "/open/t-mission/sendMission")
    public R<?> sendMission() {
        WebSocketServerSolo.sendInfo("{\"missionId\":1}", "1");
        return R.ok();
    }

}