Commit ed9270c8 authored by wujipeng's avatar wujipeng
Browse files

设备资产详情

parent d79c5b8f
...@@ -44,12 +44,12 @@ public class SwaggerConfig { ...@@ -44,12 +44,12 @@ public class SwaggerConfig {
private ApiInfo apiInfo() { private ApiInfo apiInfo() {
Contact contact = new Contact( Contact contact = new Contact(
"我是作者姓名", // 作者姓名 "云霄飞车", // 作者姓名
"https://blog.csdn.net/", // 作者网址 "https://blog.csdn.net/", // 作者网址
"123456789@163.com"); // 作者邮箱 "123456789@163.com"); // 作者邮箱
return new ApiInfoBuilder() return new ApiInfoBuilder()
.title("XX项目API") // 可以用来自定义API的主标题 .title("白龙港API") // 可以用来自定义API的主标题
.description("XX项目SwaggerAPI管理") // 可以用来描述整体的API .description("XX项目SwaggerAPI管理") // 可以用来描述整体的API
.termsOfServiceUrl("https://www.baidu.com") // 用于定义服务的域名(跳转链接) .termsOfServiceUrl("https://www.baidu.com") // 用于定义服务的域名(跳转链接)
.version("1.0") // 可以用来定义版本 .version("1.0") // 可以用来定义版本
......
...@@ -4,12 +4,10 @@ import org.example.blg.pojo.dto.EquipmentDTO; ...@@ -4,12 +4,10 @@ import org.example.blg.pojo.dto.EquipmentDTO;
import org.example.blg.pojo.vo.EquipmentVO; import org.example.blg.pojo.vo.EquipmentVO;
import org.example.blg.result.Result; import org.example.blg.result.Result;
import org.example.blg.service.EquipmentService; import org.example.blg.service.EquipmentService;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
...@@ -25,8 +23,17 @@ public class EquipmentController { ...@@ -25,8 +23,17 @@ public class EquipmentController {
private EquipmentService equipmentService; private EquipmentService equipmentService;
@PostMapping("/list") @PostMapping("/list")
public Result<EquipmentVO> list(@RequestBody EquipmentDTO equipmentDTO) { public Result<List<EquipmentVO>> list(@RequestBody EquipmentDTO equipmentDTO) {
return Result.success(equipmentService.list(equipmentDTO)); return Result.success(equipmentService.list(equipmentDTO));
} }
@GetMapping("/{id}")
public Result<EquipmentVO> detail(@PathVariable String id) {
return Result.success(equipmentService.detail(id));
}
@PostMapping("/saveOrUpdate")
public Result<Boolean> saveOrUpdate(@RequestBody EquipmentDTO equipmentDTO) {
return Result.success(equipmentService.saveOrUpdate(equipmentDTO));
}
} }
package org.example.blg.controller;
import org.example.blg.pojo.dto.EquipmentParamDTO;
import org.example.blg.result.Result;
import org.example.blg.service.EquipmentParamService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.Date;
/**
* @author : wujipeng
* @date : 2026/4/16 9:08
* @Version: 1.0
* @Desc : 描述信息
*/
@RestController
@RequestMapping("/equipment/param")
public class EquipmentParamController {
@Resource
private EquipmentParamService equipmentParamService;
@PostMapping("/saveOrUpdate")
public Result<Boolean> saveOrUpdate(@RequestBody EquipmentParamDTO equipmentParamDTO) {
equipmentParamDTO.setTime(new Date());
return Result.success(equipmentParamService.saveOrUpdate(equipmentParamDTO));
}
}
...@@ -2,10 +2,13 @@ package org.example.blg.mapper; ...@@ -2,10 +2,13 @@ package org.example.blg.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.example.blg.pojo.dto.EquipmentDTO; import org.example.blg.pojo.dto.EquipmentDTO;
import org.example.blg.pojo.entity.EquipmentEntity; import org.example.blg.pojo.entity.EquipmentEntity;
import org.example.blg.pojo.vo.EquipmentVO; import org.example.blg.pojo.vo.EquipmentVO;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2026/4/14 9:55 * @date : 2026/4/14 9:55
...@@ -15,6 +18,8 @@ import org.example.blg.pojo.vo.EquipmentVO; ...@@ -15,6 +18,8 @@ import org.example.blg.pojo.vo.EquipmentVO;
@Mapper @Mapper
public interface EquipmentMapper extends BaseMapper<EquipmentEntity> { public interface EquipmentMapper extends BaseMapper<EquipmentEntity> {
EquipmentVO list(EquipmentDTO equipmentDTO); List<EquipmentVO> list(EquipmentDTO equipmentDTO);
EquipmentVO detail(@Param("id") String id);
} }
package org.example.blg.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.example.blg.pojo.entity.EquipmentParamEntity;
import java.util.List;
/**
* @author : wujipeng
* @date : 2026/4/14 14:12
* @Version: 1.0
* @Desc : 描述信息
*/
@Mapper
public interface EquipmentParamMapper extends BaseMapper<EquipmentParamEntity> {
List<EquipmentParamEntity> getLatestGroupByName(@Param("id") String id);
}
package org.example.blg.pojo.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.example.blg.pojo.entity.EquipmentParamEntity;
/**
* @author : wujipeng
* @date : 2026/4/16 9:07
* @Version: 1.0
* @Desc : 描述信息
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class EquipmentParamDTO extends EquipmentParamEntity {
}
...@@ -2,6 +2,7 @@ package org.example.blg.pojo.entity; ...@@ -2,6 +2,7 @@ package org.example.blg.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
/** /**
...@@ -11,6 +12,7 @@ import lombok.Data; ...@@ -11,6 +12,7 @@ import lombok.Data;
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
@Data @Data
@TableName("equipment")
public class EquipmentEntity { public class EquipmentEntity {
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
......
package org.example.blg.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author : wujipeng
* @date : 2026/4/14 14:06
* @Version: 1.0
* @Desc : 描述信息
*/
@Data
@TableName("equipment_param")
public class EquipmentParamEntity {
@TableId(type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty("设备id")
@TableField("equipment_id")
private String equipmentId;
private String name;
private Double value;
private String unit;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date time;
@ApiModelProperty("false正常/true异常")
private Boolean status;
}
package org.example.blg.pojo.vo; package org.example.blg.pojo.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.example.blg.pojo.entity.EquipmentEntity; import org.example.blg.pojo.entity.EquipmentEntity;
import org.example.blg.pojo.entity.EquipmentParamEntity;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipengz
* @date : 2026/4/14 10:00 * @date : 2026/4/14 10:00
* @Version: 1.0 * @Version: 1.0
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@JsonInclude(JsonInclude.Include.NON_NULL)
public class EquipmentVO extends EquipmentEntity { public class EquipmentVO extends EquipmentEntity {
@ApiModelProperty("是否有告警") @ApiModelProperty("是否有告警")
private Boolean hasAlarm; private Boolean hasAlarm;
private List<EquipmentParamEntity> realTime;
} }
package org.example.blg.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.example.blg.pojo.entity.EquipmentParamEntity;
import java.util.List;
/**
* @author : wujipeng
* @date : 2026/4/14 14:13
* @Version: 1.0
* @Desc : 描述信息
*/
public interface EquipmentParamService extends IService<EquipmentParamEntity> {
List<EquipmentParamEntity> getLatestGroupByName(String id);
}
...@@ -5,6 +5,8 @@ import org.example.blg.pojo.dto.EquipmentDTO; ...@@ -5,6 +5,8 @@ import org.example.blg.pojo.dto.EquipmentDTO;
import org.example.blg.pojo.entity.EquipmentEntity; import org.example.blg.pojo.entity.EquipmentEntity;
import org.example.blg.pojo.vo.EquipmentVO; import org.example.blg.pojo.vo.EquipmentVO;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2026/4/14 9:57 * @date : 2026/4/14 9:57
...@@ -13,5 +15,8 @@ import org.example.blg.pojo.vo.EquipmentVO; ...@@ -13,5 +15,8 @@ import org.example.blg.pojo.vo.EquipmentVO;
*/ */
public interface EquipmentService extends IService<EquipmentEntity> { public interface EquipmentService extends IService<EquipmentEntity> {
EquipmentVO list(EquipmentDTO equipmentDTO); List<EquipmentVO> list(EquipmentDTO equipmentDTO);
EquipmentVO detail(String id);
} }
package org.example.blg.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.example.blg.mapper.EquipmentParamMapper;
import org.example.blg.pojo.entity.EquipmentParamEntity;
import org.example.blg.service.EquipmentParamService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author : wujipeng
* @date : 2026/4/14 14:13
* @Version: 1.0
* @Desc : 描述信息
*/
@Service
public class EquipmentParamServiceImpl extends ServiceImpl<EquipmentParamMapper, EquipmentParamEntity> implements EquipmentParamService {
@Override
public List<EquipmentParamEntity> getLatestGroupByName(String id) {
return baseMapper.getLatestGroupByName(id);
}
}
...@@ -4,8 +4,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -4,8 +4,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.example.blg.mapper.EquipmentMapper; import org.example.blg.mapper.EquipmentMapper;
import org.example.blg.pojo.dto.EquipmentDTO; import org.example.blg.pojo.dto.EquipmentDTO;
import org.example.blg.pojo.entity.EquipmentEntity; import org.example.blg.pojo.entity.EquipmentEntity;
import org.example.blg.pojo.entity.EquipmentParamEntity;
import org.example.blg.pojo.vo.EquipmentVO; import org.example.blg.pojo.vo.EquipmentVO;
import org.example.blg.service.EquipmentParamService;
import org.example.blg.service.EquipmentService; import org.example.blg.service.EquipmentService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
...@@ -13,9 +19,28 @@ import org.example.blg.service.EquipmentService; ...@@ -13,9 +19,28 @@ import org.example.blg.service.EquipmentService;
* @Version: 1.0 * @Version: 1.0
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
@Service
public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, EquipmentEntity> implements EquipmentService { public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, EquipmentEntity> implements EquipmentService {
@Resource
private EquipmentParamService equipmentParamService;
@Override @Override
public EquipmentVO list(EquipmentDTO equipmentDTO) { public List<EquipmentVO> list(EquipmentDTO equipmentDTO) {
return baseMapper.list(equipmentDTO); return baseMapper.list(equipmentDTO);
} }
@Override
public EquipmentVO detail(String id) {
EquipmentVO result = baseMapper.detail(id);
List<EquipmentParamEntity> latestGroupByValue = equipmentParamService.getLatestGroupByName(id);
//判断有没有异常数据
if (!latestGroupByValue.isEmpty()) {
result.setHasAlarm(latestGroupByValue.stream().anyMatch(EquipmentParamEntity::getStatus));
} else {
result.setHasAlarm(false);
}
result.setRealTime(latestGroupByValue);
return result;
}
} }
...@@ -7,3 +7,9 @@ spring: ...@@ -7,3 +7,9 @@ spring:
url: jdbc:mysql://192.168.10.3:3307/blg?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.10.3:3307/blg?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true
username: root username: root
password: ruzhoukj@2022 password: ruzhoukj@2022
mvc:
pathMatch:
matching-strategy: ant_path_matcher
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.example.blg.mapper.EquipmentMapper"> <mapper namespace="org.example.blg.mapper.EquipmentMapper">
<select id="list" resultType="org.example.blg.pojo.vo.EquipmentVO"> <select id="list" resultType="org.example.blg.pojo.vo.EquipmentVO">
select select
id, id,
...@@ -17,4 +16,14 @@ ...@@ -17,4 +16,14 @@
</if> </if>
</where> </where>
</select> </select>
<select id="detail" resultType="org.example.blg.pojo.vo.EquipmentVO">
select
id,
name,
code
from
equipment
where
id = #{id}
</select>
</mapper> </mapper>
<?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="org.example.blg.mapper.EquipmentParamMapper">
<select id="getLatestGroupByName" resultType="org.example.blg.pojo.entity.EquipmentParamEntity">
SELECT ep.*
FROM equipment_param ep
INNER JOIN (SELECT name, MAX(time) as max_time
FROM equipment_param
where equipment_id = #{id}
GROUP BY name) latest ON ep.name = latest.name AND ep.time = latest.max_time
</select>
</mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment