修改接口bug

Pu Zhibing

2025-04-07 4109495b9c51a4bbd8b0a7c3c69093909d2e33e1

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
package com.ruoyi.dataInterchange.controller;
 
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.dataInterchange.api.vo.UPExgMsgRegisterVo;
import com.ruoyi.dataInterchange.dao.UPExgMsgRealLocationDao;
import com.ruoyi.dataInterchange.dao.UPExgMsgRegisterDao;
import com.ruoyi.dataInterchange.model.GnssData;
import com.ruoyi.dataInterchange.model.UPExgMsgRealLocation;
import com.ruoyi.dataInterchange.model.UPExgMsgRegister;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
 
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
 
/**
 * @author zhibing.pu
 * @Date 2025/3/17 13:39
 */
@RestController
@RequestMapping("/UPExgMsgRegister")
public class UPExgMsgRegisterController {
    
    @Resource
    private UPExgMsgRegisterDao upExgMsgRegisterDao;
    
    @Resource
    private UPExgMsgRealLocationDao upExgMsgRealLocationDao;
    
    
    /**
     * 查询添加时间大于等于给定时间的车辆基础数据
     *
     * @param startTime
     * @return
     */
    @PostMapping("/getUPExgMsgRegisterListIsAfterCreateTime")
    public R<List<UPExgMsgRegisterVo>> getUPExgMsgRegisterListIsAfterCreateTime(@RequestParam("startTime") Long startTime) {
        List<UPExgMsgRegisterVo> voList = new ArrayList<>();
        if (-1 == startTime) {
            Iterator<UPExgMsgRegister> iterator = upExgMsgRegisterDao.findAll().iterator();
            while (iterator.hasNext()) {
                UPExgMsgRegister register = iterator.next();
                UPExgMsgRegisterVo vo = new UPExgMsgRegisterVo();
                BeanUtils.copyProperties(register, vo);
                UPExgMsgRealLocation realLocation = upExgMsgRealLocationDao.findByVehicleNoOrderByCreateTimeDesc(register.getVehicleNo());
                if (null != realLocation) {
                    GnssData gnssData = realLocation.getGnssData();
                    String longitude = new BigDecimal(gnssData.getLon()).divide(new BigDecimal(1000000)).toString();
                    String latitude = new BigDecimal(gnssData.getLat()).divide(new BigDecimal(1000000)).toString();
                    vo.setLongitude(longitude);
                    vo.setLatitude(latitude);
                }
                voList.add(vo);
            }
            
        } else {
            List<UPExgMsgRegister> list = upExgMsgRegisterDao.findByCreateTimeIsAfter(startTime);
            for (UPExgMsgRegister register : list) {
                UPExgMsgRegisterVo vo = new UPExgMsgRegisterVo();
                BeanUtils.copyProperties(register, vo);
                UPExgMsgRealLocation realLocation = upExgMsgRealLocationDao.findByVehicleNoOrderByCreateTimeDesc(register.getVehicleNo());
                if (null != realLocation) {
                    GnssData gnssData = realLocation.getGnssData();
                    String longitude = new BigDecimal(gnssData.getLon()).divide(new BigDecimal(1000000)).toString();
                    String latitude = new BigDecimal(gnssData.getLat()).divide(new BigDecimal(1000000)).toString();
                    vo.setLongitude(longitude);
                    vo.setLatitude(latitude);
                }
                voList.add(vo);
            }
        }
        return R.ok(voList);
    }
}