修改接口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
82
83
84
85
86
87
88
89
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.UPWarnMsgAdptInfoVo;
import com.ruoyi.dataInterchange.dao.UPWarnMsgAdptInfoDao;
import com.ruoyi.dataInterchange.dao.UPWarnMsgUrgeTodoAckDao;
import com.ruoyi.dataInterchange.model.UPWarnMsgAdptInfo;
import com.ruoyi.dataInterchange.model.UPWarnMsgUrgeTodoAck;
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.util.ArrayList;
import java.util.Iterator;
import java.util.List;
 
/**
 * 报警信息控制器
 *
 * @author zhibing.pu
 * @Date 2025/4/2 10:08
 */
@RestController
@RequestMapping("/warnMsgAdptInfo")
public class UPWarnMsgAdptInfoController {
    
    @Resource
    private UPWarnMsgAdptInfoDao upWarnMsgAdptInfoDao;
    
    @Resource
    private UPWarnMsgUrgeTodoAckDao upWarnMsgUrgeTodoAckDao;
    
    
    /**
     * 查询大于给定日期的所有报警数据
     *
     * @param createTime
     * @return
     */
    @PostMapping("/findByCreateTimeAfter")
    public R<List<UPWarnMsgAdptInfoVo>> findByCreateTimeAfter(@RequestParam("createTime") Long createTime) {
        if (-1 == createTime) {
            Iterator<UPWarnMsgAdptInfo> iterator = upWarnMsgAdptInfoDao.findAll().iterator();
            List<UPWarnMsgAdptInfoVo> list = new ArrayList<>();
            while (iterator.hasNext()) {
                UPWarnMsgAdptInfo upWarnMsgAdptInfo = iterator.next();
                UPWarnMsgAdptInfoVo vo = new UPWarnMsgAdptInfoVo();
                BeanUtils.copyProperties(upWarnMsgAdptInfo, vo);
                UPWarnMsgUrgeTodoAck warnMsgUrgeTodoAck = upWarnMsgUrgeTodoAckDao.findBySupervisionId(upWarnMsgAdptInfo.getInfoId());
                if (null != warnMsgUrgeTodoAck) {
                    vo.setResult(warnMsgUrgeTodoAck.getResult());
                }
                list.add(vo);
            }
            return R.ok(list);
        } else {
            List<UPWarnMsgAdptInfo> adptInfoList = upWarnMsgAdptInfoDao.findByCreateTimeAfter(createTime);
            List<UPWarnMsgAdptInfoVo> list = new ArrayList<>();
            for (UPWarnMsgAdptInfo upWarnMsgAdptInfo : adptInfoList) {
                UPWarnMsgAdptInfoVo vo = new UPWarnMsgAdptInfoVo();
                BeanUtils.copyProperties(upWarnMsgAdptInfo, vo);
                UPWarnMsgUrgeTodoAck warnMsgUrgeTodoAck = upWarnMsgUrgeTodoAckDao.findBySupervisionId(upWarnMsgAdptInfo.getInfoId());
                if (null != warnMsgUrgeTodoAck) {
                    vo.setResult(warnMsgUrgeTodoAck.getResult());
                }
                list.add(vo);
            }
            return R.ok(list);
        }
    }
    
    
    /**
     * 根据信息id查询报警原始数据
     *
     * @param infoId
     * @return
     */
    @PostMapping("/findByInfoId")
    public R<UPWarnMsgAdptInfoVo> findByInfoId(@RequestParam("infoId") Integer infoId) {
        UPWarnMsgAdptInfo warnMsgAdptInfo = upWarnMsgAdptInfoDao.findByInfoIdIs(infoId);
        UPWarnMsgAdptInfoVo vo = new UPWarnMsgAdptInfoVo();
        BeanUtils.copyProperties(warnMsgAdptInfo, vo);
        return R.ok(vo);
    }
}