zhangxu
/
cloud-networking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test:(指标预警配置)

dev
zhang xu 2024-06-27 01:43:24 +08:00
parent bc8ff2fdcc
commit b02a9ed457
13 changed files with 124 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/data/MessageDetail.java
View File

@ -41,7 +41,7 @@ public class MessageDetail extends BaseEntity {
/** 指标项key */
@Excel(name = "指标项key")
@ApiModelProperty(name = "指标项key", value = "指标项key")
private String key;
private String messageKey;
/** 起始位 */
@Excel(name = "起始位")
@ -68,7 +68,7 @@ public class MessageDetail extends BaseEntity {
*/
public static MessageDetail queryBuild(MessageDetailQueryReq messageDetailQueryReq){
return MessageDetail.builder()
.key(messageDetailQueryReq.getKey())
.messageKey(messageDetailQueryReq.getMessageKey())
.startBit(messageDetailQueryReq.getStartBit())
.stopBit(messageDetailQueryReq.getStopBit())
.label(messageDetailQueryReq.getLabel())
@ -81,7 +81,7 @@ public class MessageDetail extends BaseEntity {
*/
public static MessageDetail saveBuild(MessageDetailSaveReq messageDetailSaveReq){
return MessageDetail.builder()
.key(messageDetailSaveReq.getKey())
.messageKey(messageDetailSaveReq.getMessageKey())
.startBit(messageDetailSaveReq.getStartBit())
.stopBit(messageDetailSaveReq.getStopBit())
.label(messageDetailSaveReq.getLabel())
@ -95,7 +95,7 @@ public class MessageDetail extends BaseEntity {
public static MessageDetail editBuild(Long id, MessageDetailEditReq messageDetailEditReq){
return MessageDetail.builder()
.id(id)
.key(messageDetailEditReq.getKey())
.messageKey(messageDetailEditReq.getMessageKey())
.startBit(messageDetailEditReq.getStartBit())
.stopBit(messageDetailEditReq.getStopBit())
.label(messageDetailEditReq.getLabel())

2
muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailEditReq.java
View File

@ -25,7 +25,7 @@ public class MessageDetailEditReq {
/** 指标项key */
@ApiModelProperty(name = "指标项key", value = "指标项key")
private String key;
private String messageKey;
/** 起始位 */
@ApiModelProperty(name = "起始位", value = "起始位")

2
muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailQueryReq.java
View File

@ -30,7 +30,7 @@ public class MessageDetailQueryReq{
/** 指标项key */
@ApiModelProperty(name = "指标项key", value = "指标项key")
private String key;
private String messageKey;
/** 起始位 */
@ApiModelProperty(name = "起始位", value = "起始位")

2
muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailSaveReq.java
View File

@ -31,7 +31,7 @@ public class MessageDetailSaveReq {
/** 指标项key */
@ApiModelProperty(name = "指标项key", value = "指标项key")
private String key;
private String messageKey;
/** 起始位 */

1
muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/mapper/FencesMapper.java
View File

@ -2,7 +2,6 @@ package com.muyu.networking.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.domain.Fences;
import org.apache.ibatis.annotations.Mapper;
/**
* @ClassDescription:

13
muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/controller/MessageDetailController.java
View File

@ -39,7 +39,6 @@ public class MessageDetailController extends BaseController {
* 查询报文详情列表
*/
@ApiOperation("获取报文详情列表")
@RequiresPermissions("car:messageDetail:list")
@GetMapping("/list")
public Result<TableDataInfo<MessageDetail>> list(MessageDetailQueryReq messageDetailQueryReq) {
startPage();
@ -51,7 +50,6 @@ public class MessageDetailController extends BaseController {
* 导出报文详情列表
*/
@ApiOperation("导出报文详情列表")
@RequiresPermissions("car:messageDetail:export")
@Log(title = "报文详情", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, MessageDetail messageDetail) {
@ -64,7 +62,6 @@ public class MessageDetailController extends BaseController {
* 获取报文详情详细信息
*/
@ApiOperation("获取报文详情详细信息")
@RequiresPermissions("car:messageDetail:query")
@GetMapping(value = "/{id}")
@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
public Result<MessageDetail> getInfo(@PathVariable("id") Long id) {
@ -74,7 +71,7 @@ public class MessageDetailController extends BaseController {
/**
* 新增报文详情
*/
@RequiresPermissions("car:messageDetail:add")
@Log(title = "报文详情", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation("新增报文详情")
@ -85,7 +82,6 @@ public class MessageDetailController extends BaseController {
/**
* 修改报文详情
*/
@RequiresPermissions("car:messageDetail:edit")
@Log(title = "报文详情", businessType = BusinessType.UPDATE)
@PutMapping("/{id}")
@ApiOperation("修改报文详情")
@ -96,7 +92,6 @@ public class MessageDetailController extends BaseController {
/**
* 删除报文详情
*/
@RequiresPermissions("car:messageDetail:remove")
@Log(title = "报文详情", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@ApiOperation("删除报文详情")
@ -105,6 +100,12 @@ public class MessageDetailController extends BaseController {
return toAjax(messageDetailService.removeBatchByIds(ids));
}
@PostMapping("/submit")
public Result submit(@RequestBody MessageDetail vehicleMessages){
messageDetailService.submit(vehicleMessages);
return Result.success();
}
}

27
muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/mapper/FaultRecordMapper.java 100644
View File

@ -0,0 +1,27 @@
package com.muyu.vehicle.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.domain.FaultRecord;
import com.muyu.domain.req.FaultRecordReqVo;
import com.muyu.domain.vo.FaultRecordVo;
import java.util.List;
/** 车辆故障记录
* @ClassDescription:
* @JdkVersion: 17
* @Author: zhangxu
* @Created: 2024/6/20 15:23
*/
public interface FaultRecordMapper extends BaseMapper<FaultRecord> {
void updateByFaultRecord(FaultRecord build);
FaultRecord getByFaultRecord(FaultRecord faultRecord);
List<FaultRecordVo> countList(FaultRecordReqVo recordReqVo);
}

4
muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/mapper/MessageDetailMapper.java
View File

@ -10,4 +10,8 @@ import com.muyu.domain.data.MessageDetail;
* @Created: 2024/6/26 21:44
*/
public interface MessageDetailMapper extends BaseMapper<MessageDetail> {
void submit(MessageDetail vehicleMessages);
}

13
muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/MessageDetailServiceImpl.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.domain.data.MessageDetail;
import com.muyu.vehicle.mapper.MessageDetailMapper;
import com.muyu.vehicle.service.MessageDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@ -17,10 +18,22 @@ import java.util.List;
*/
@Service
public class MessageDetailServiceImpl extends ServiceImpl<MessageDetailMapper, MessageDetail> implements MessageDetailService {
@Autowired
private MessageDetailMapper messageDetailMapper;
@Override
public List<MessageDetail> list(MessageDetail messageDetail) {
LambdaQueryWrapper<MessageDetail> queryWrapper = new LambdaQueryWrapper<>();
return list(queryWrapper);
}
@Override
public void submit(MessageDetail vehicleMessages) {
messageDetailMapper.submit(vehicleMessages);
}
}

2
muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/MessageDetailService.java
View File

@ -22,4 +22,6 @@ public interface MessageDetailService extends IService<MessageDetail> {
public List<MessageDetail> list(MessageDetail messageDetail);
void submit(MessageDetail vehicleMessages);
}

2
muyu-modules/muyu-networking/muyu-networking-service/src/main/resources/mapper/FaultCodeMapper.xml → muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/FaultCodeMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.muyu.networking.mapper.FaultCodeMapper">
<mapper namespace="com.muyu.vehicle.mapper.FaultCodeMapper">
<resultMap type="com.muyu.domain.FaultCode" id="FaultCodeResult">
<result property="id" column="id" />

52
muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/FaultRecordMapper.xml 100644
View File

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.muyu.vehicle.mapper.FaultRecordMapper">
<resultMap type="com.muyu.domain.FaultRecord" id="FaultRecordResult">
<result property="id" column="id" />
<result property="faultCode" column="fault_code" />
<result property="vin" column="vin" />
<result property="startTime" column="start_time" />
<result property="endTime" column="end_time" />
<result property="faultLevel" column="fault_level" />
<result property="faultHandle" column="fault_handle" />
</resultMap>
<sql id="selectFaultRecordVo">
select id, fault_code, vin, start_time, end_time, fault_level, fault_handle from fault_record
</sql>
<update id="updateByFaultRecord">
update fault_record set end_time=#{endTime} where id=#{id}
</update>
<select id="getByFaultRecord" resultType="com.muyu.domain.FaultRecord">
SELECT id,fault_code,vin,start_time,end_time,fault_level,fault_handle
FROM fault_record
WHERE fault_code =#{faultCode} AND vin = #{vin} AND end_time is NULL
</select>
<select id="countList" resultType="com.muyu.domain.vo.FaultRecordVo">
SELECT
fr.vin,
fr.fault_code,
COUNT(*) AS count,
fc.fault_label
FROM
fault_record fr
LEFT JOIN fault_code fc ON fr.fault_code = fc.fault_code
<where>
<if test=" max != null ">
and #{max} >= start_time
</if>
<if test=" min != null ">
and #{min} &lt;= end_time
</if>
</where>
GROUP BY
fr.vin,
fr.fault_code,
fc.fault_label ORDER BY count
</select>
</mapper>

13
muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/MessageDetailMapper.xml
View File

@ -6,14 +6,23 @@
<resultMap type="com.muyu.domain.data.MessageDetail" id="MessageDetailResult">
<result property="id" column="id" />
<result property="key" column="key" />
<result property="messageKey" column="message_key" />
<result property="startBit" column="start_bit" />
<result property="stopBit" column="stop_bit" />
<result property="label" column="label" />
<result property="type" column="type" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectMessageDetailVo">
select id, key, start_bit, stop_bit, label, type from message_detail
select id,message_key, start_bit, stop_bit, label,
type ,create_by,create_time,update_by,update_time,remark from message_detail
</sql>
<insert id="submit">
INSERT INTO `networking`.`vehicle_message` (`vin`, `message_ids`) VALUES (#{vin}, #{messageIds});
</insert>
</mapper>