Skip to content

Commit 8e3080a

Browse files
rootcclrootccl
authored
Merge pull request #3 from 15516257496/master
增加实时区域评价实体类和历史区域评价实体类及两者增删改查， 更新实时表的同时往历史表中插入一条相同的记录，增加描述
2 parents 49d8a79 + aac5a8a commit 8e3080a

8 files changed

+364
-0
lines changed

‎ruoyi-system/src/main/java/com/ruoyi/traffic/domain/TrafficArea_Evaluation.java

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package com.ruoyi.traffic.domain;
2+
3+
import com.baomidou.mybatisplus.annotation.IdType;
4+
import com.baomidou.mybatisplus.annotation.TableId;
5+
import com.ruoyi.common.core.domain.BaseEntity;
6+
import io.swagger.annotations.ApiModelProperty;
7+
import lombok.Data;
8+
9+
import java.io.Serializable;
10+
11+
/**
12+
* @classname: TrafficArea_Evaluation
13+
* @author: ouyanghua
14+
* @description: 区域评价的实体类
15+
* @date: 2023/7/24
16+
* @version: v1.0
17+
**/
18+
19+
@Data
20+
public class TrafficArea_Evaluation extends BaseEntity implements Serializable {
21+
22+
@TableId(type = IdType.AUTO)
23+
@ApiModelProperty("主键ID")
24+
private Long id;
25+
26+
@ApiModelProperty("对应的区域ID")
27+
private long intersectionId;
28+
29+
@ApiModelProperty("区域名称")
30+
private String name;
31+
32+
@ApiModelProperty("区域平均速度")
33+
private double averageSpeed;
34+
35+
@ApiModelProperty("区域车均延误")
36+
private double averageDelay;
37+
38+
@ApiModelProperty("区域拥堵指数")
39+
private double congestionIndex;
40+
41+
@ApiModelProperty("评价年份")
42+
private String Year;
43+
44+
@ApiModelProperty("评价月份")
45+
private String Month;
46+
47+
@ApiModelProperty("评价日期")
48+
private String Day;
49+
50+
51+
}

‎ruoyi-system/src/main/java/com/ruoyi/traffic/domain/TrafficArea_Evaluation_History.java

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package com.ruoyi.traffic.domain;
2+
3+
import com.baomidou.mybatisplus.annotation.IdType;
4+
import com.baomidou.mybatisplus.annotation.TableId;
5+
import com.ruoyi.common.core.domain.BaseEntity;
6+
import io.swagger.annotations.ApiModelProperty;
7+
import lombok.Data;
8+
9+
import java.io.Serializable;
10+
11+
12+
/**
13+
* @classname: TrafficArea_Evaluation_History
14+
* @author: ouyanghua
15+
* @description: 历史区域评价的实体类
16+
* @date: 2023/7/24
17+
* @version: v1.0
18+
**/
19+
20+
21+
22+
@Data
23+
public class TrafficArea_Evaluation_History extends BaseEntity implements Serializable {
24+
@TableId(type = IdType.AUTO)
25+
@ApiModelProperty("主键ID")
26+
private Long id;
27+
28+
@ApiModelProperty("对应的区域ID")
29+
private long intersectionId;
30+
31+
@ApiModelProperty("区域名称")
32+
private String name;
33+
34+
@ApiModelProperty("区域平均速度")
35+
private double averageSpeed;
36+
37+
@ApiModelProperty("区域车均延误")
38+
private double averageDelay;
39+
40+
@ApiModelProperty("区域拥堵指数")
41+
private double congestionIndex;
42+
43+
@ApiModelProperty("历史评价年份")
44+
private String Year;
45+
46+
@ApiModelProperty("历史评价月份")
47+
private String Month;
48+
49+
@ApiModelProperty("历史评价日期")
50+
private String Day;
51+
52+
}

‎ruoyi-system/src/main/java/com/ruoyi/traffic/mapper/TrafficArea_Evaluation_History_Mapper.java

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.ruoyi.traffic.mapper;
2+
3+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4+
5+
import com.ruoyi.traffic.domain.TrafficArea_Evaluation_History;
6+
import org.apache.ibatis.annotations.Mapper;
7+
8+
9+
/**
10+
* @classname: TrafficArea_Evaluation_History
11+
* @author: ouyanghua
12+
* @description: 历史区域评价的Mapper
13+
* @date: 2023/7/24
14+
* @version: v1.0
15+
**/
16+
@Mapper
17+
public interface TrafficArea_Evaluation_History_Mapper extends BaseMapper<TrafficArea_Evaluation_History> {
18+
19+
20+
21+
}

‎ruoyi-system/src/main/java/com/ruoyi/traffic/mapper/TrafficArea_Evaluation_Mapper.java

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.ruoyi.traffic.mapper;
2+
3+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4+
import com.ruoyi.traffic.domain.TrafficArea_Evaluation;
5+
6+
7+
8+
/**
9+
* @classname: TrafficArea_Evaluation_History
10+
* @author: ouyanghua
11+
* @description: 区域评价的Mapper
12+
* @date: 2023/7/24
13+
* @version: v1.0
14+
**/
15+
public interface TrafficArea_Evaluation_Mapper extends BaseMapper<TrafficArea_Evaluation> {
16+
}

‎ruoyi-system/src/main/java/com/ruoyi/traffic/service/ITrafficArea_Evaluation_History_Service.java

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.ruoyi.traffic.service;
2+
3+
4+
import com.ruoyi.traffic.domain.TrafficArea_Evaluation_History;
5+
6+
import java.util.List;
7+
/**
8+
* @classname: ITrafficLineService
9+
* @author: ouyanghua
10+
* @description: 历史区域评价的服务类
11+
* @date: 2023/7/24
12+
* @version: v1.0
13+
**/
14+
public interface ITrafficArea_Evaluation_History_Service {
15+
// 查询集合
16+
List<TrafficArea_Evaluation_History> queryList(TrafficArea_Evaluation_History trafficArea_evaluation_history);
17+
18+
// 新增评价
19+
void addAreaEvaluationHistory(TrafficArea_Evaluation_History trafficArea_evaluation_history);
20+
21+
// 编辑历史区域评价
22+
void updateAreaEvaluationHistory(TrafficArea_Evaluation_History trafficArea_evaluation_history);
23+
24+
// 删除历史区域评价
25+
void deleteByIdList(List<Long> idList);
26+
27+
//查询历史区域评价详情
28+
TrafficArea_Evaluation_History queryById(Long id);
29+
30+
31+
}

‎ruoyi-system/src/main/java/com/ruoyi/traffic/service/ITrafficArea_Evaluation_Service.java

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.ruoyi.traffic.service;
2+
3+
import com.baomidou.mybatisplus.extension.service.IService;
4+
5+
import com.ruoyi.traffic.domain.TrafficArea_Evaluation;
6+
7+
import java.util.List;
8+
9+
10+
/**
11+
* @classname: ITrafficArea_Evaluation_Service
12+
* @author: ouyanghua
13+
* @description: 区域评价的服务类
14+
* @date: 2023/7/24
15+
* @version: v1.0
16+
**/
17+
public interface ITrafficArea_Evaluation_Service extends IService<TrafficArea_Evaluation> {
18+
// 查询集合
19+
List<TrafficArea_Evaluation> queryList(TrafficArea_Evaluation trafficArea_Evaluation);
20+
21+
// 新增评价
22+
void addAreaEvaluation(TrafficArea_Evaluation trafficArea_Evaluation);
23+
24+
// 编辑区域评价
25+
void updateAreaEvaluation(TrafficArea_Evaluation trafficArea_Evaluation);
26+
27+
// 删除区域评价
28+
void deleteByIdList(List<Long> idList);
29+
30+
//查询区域评价详情
31+
TrafficArea_Evaluation queryById(Long id);
32+
}

‎ruoyi-system/src/main/java/com/ruoyi/traffic/service/impl/ITrafficArea_Evaluation_History_Impl.java

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
package com.ruoyi.traffic.service.impl;
2+
3+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5+
import com.ruoyi.common.utils.StringUtils;
6+
7+
import com.ruoyi.traffic.domain.TrafficArea_Evaluation_History;
8+
9+
import com.ruoyi.traffic.mapper.TrafficArea_Evaluation_History_Mapper;
10+
import com.ruoyi.traffic.service.ITrafficArea_Evaluation_History_Service;
11+
import org.apache.commons.collections4.CollectionUtils;
12+
import org.springframework.stereotype.Service;
13+
14+
import java.util.List;
15+
16+
/**
17+
* @classname: ITrafficArea_Evaluation_History_Impl
18+
* @author: ouyanghua
19+
* @description: 历史区域评价的服务实现类
20+
* @date: 2023/7/24
21+
* @version: v1.0
22+
**/
23+
@Service
24+
public class ITrafficArea_Evaluation_History_Impl extends ServiceImpl<TrafficArea_Evaluation_History_Mapper, TrafficArea_Evaluation_History> implements ITrafficArea_Evaluation_History_Service {
25+
@Override
26+
public List<TrafficArea_Evaluation_History> queryList(TrafficArea_Evaluation_History trafficArea_evaluation_history) {
27+
LambdaQueryWrapper<TrafficArea_Evaluation_History> queryWrapper = new LambdaQueryWrapper<>();
28+
// name
29+
if (StringUtils.isNotBlank(trafficArea_evaluation_history.getName())) {
30+
queryWrapper.like(TrafficArea_Evaluation_History::getName, trafficArea_evaluation_history.getName());
31+
}
32+
// 年份
33+
if (StringUtils.isNotBlank(trafficArea_evaluation_history.getYear())) {
34+
queryWrapper.eq(TrafficArea_Evaluation_History::getYear, trafficArea_evaluation_history.getYear());
35+
}
36+
// 月份
37+
if (StringUtils.isNotBlank(trafficArea_evaluation_history.getMonth())) {
38+
queryWrapper.eq(TrafficArea_Evaluation_History::getMonth, trafficArea_evaluation_history.getMonth());
39+
}
40+
//日期
41+
if (StringUtils.isNotBlank(trafficArea_evaluation_history.getDay())) {
42+
queryWrapper.eq(TrafficArea_Evaluation_History::getDay, trafficArea_evaluation_history.getDay());
43+
}
44+
45+
List<TrafficArea_Evaluation_History> trafficArea_evaluation_HistoryList = baseMapper.selectList(queryWrapper);
46+
return trafficArea_evaluation_HistoryList;
47+
48+
}
49+
50+
@Override
51+
public void addAreaEvaluationHistory(TrafficArea_Evaluation_History trafficArea_evaluation_history) {
52+
baseMapper.insert(trafficArea_evaluation_history);
53+
}
54+
55+
@Override
56+
public void updateAreaEvaluationHistory(TrafficArea_Evaluation_History trafficArea_evaluation_history) {
57+
baseMapper.updateById(trafficArea_evaluation_history);
58+
}
59+
60+
@Override
61+
public void deleteByIdList(List<Long> idList) {
62+
if (CollectionUtils.isNotEmpty(idList)) {
63+
baseMapper.deleteBatchIds(idList);
64+
}
65+
}
66+
67+
@Override
68+
public TrafficArea_Evaluation_History queryById(Long id) {
69+
TrafficArea_Evaluation_History trafficArea_evaluation_history = baseMapper.selectById(id);
70+
return trafficArea_evaluation_history;
71+
}
72+
73+
74+
75+
}

‎ruoyi-system/src/main/java/com/ruoyi/traffic/service/impl/TrafficArea_Evaluation_Impl.java

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
package com.ruoyi.traffic.service.impl;
2+
3+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5+
6+
import com.ruoyi.common.utils.StringUtils;
7+
8+
import com.ruoyi.traffic.domain.TrafficArea_Evaluation;
9+
import com.ruoyi.traffic.domain.TrafficArea_Evaluation_History;
10+
11+
import com.ruoyi.traffic.mapper.TrafficArea_Evaluation_Mapper;
12+
import com.ruoyi.traffic.service.ITrafficArea_Evaluation_Service;
13+
import org.apache.commons.collections4.CollectionUtils;
14+
import org.springframework.beans.factory.annotation.Autowired;
15+
16+
import org.springframework.stereotype.Service;
17+
18+
import java.util.List;
19+
20+
/**
21+
* @classname: rafficArea_Evaluation_Impl
22+
* @author: ouyanghua
23+
* @description: 区域评价的服务实现类
24+
* @date: 2023/7/24
25+
* @version: v1.0
26+
**/
27+
@Service
28+
public class TrafficArea_Evaluation_Impl extends ServiceImpl<TrafficArea_Evaluation_Mapper,TrafficArea_Evaluation> implements ITrafficArea_Evaluation_Service {
29+
@Override
30+
31+
public List<TrafficArea_Evaluation> queryList(TrafficArea_Evaluation trafficArea_evaluation) {
32+
LambdaQueryWrapper<TrafficArea_Evaluation> queryWrapper = new LambdaQueryWrapper<>();
33+
// name
34+
if (StringUtils.isNotBlank(trafficArea_evaluation.getName())) {
35+
queryWrapper.like(TrafficArea_Evaluation::getName, trafficArea_evaluation.getName());
36+
}
37+
38+
List<TrafficArea_Evaluation> trafficArea_evaluationList = baseMapper.selectList(queryWrapper);
39+
return trafficArea_evaluationList;
40+
41+
}
42+
43+
@Override
44+
public void addAreaEvaluation(TrafficArea_Evaluation trafficArea_Evaluation) {
45+
baseMapper.insert(trafficArea_Evaluation);
46+
}
47+
48+
@Autowired
49+
50+
private ITrafficArea_Evaluation_History_Impl iTrafficArea_Evaluation_History_Impl;
51+
@Override
52+
public void updateAreaEvaluation(TrafficArea_Evaluation trafficArea_Evaluation) {
53+
54+
TrafficArea_Evaluation_History history = new TrafficArea_Evaluation_History();
55+
56+
history.setIntersectionId(trafficArea_Evaluation.getIntersectionId());
57+
history.setName(trafficArea_Evaluation.getName());
58+
history.setAverageSpeed(trafficArea_Evaluation.getAverageSpeed());
59+
history.setAverageDelay(trafficArea_Evaluation.getAverageDelay());
60+
history.setCongestionIndex(trafficArea_Evaluation.getCongestionIndex());
61+
history.setYear(trafficArea_Evaluation.getYear());
62+
history.setMonth(trafficArea_Evaluation.getMonth());
63+
history.setDay(trafficArea_Evaluation.getDay());
64+
// 更新实时表的同时往历史表中插入一条相同的记录
65+
iTrafficArea_Evaluation_History_Impl.addAreaEvaluationHistory(history);
66+
67+
baseMapper.updateById(trafficArea_Evaluation);
68+
}
69+
70+
@Override
71+
public void deleteByIdList(List<Long> idList) {
72+
if (CollectionUtils.isNotEmpty(idList)) {
73+
baseMapper.deleteBatchIds(idList);
74+
}
75+
}
76+
77+
@Override
78+
public TrafficArea_Evaluation queryById(Long id) {
79+
TrafficArea_Evaluation trafficAreaEvaluation=baseMapper.selectById(id);
80+
return trafficAreaEvaluation;
81+
}
82+
83+
84+
85+
86+
}

0 commit comments

Comments
 (0)