Browse Source

fix: 修复阈值管理接口异常

master v1.1.0
yinhuaiwei 4 weeks ago
parent
commit
d70541349f
2 changed files with 4 additions and 2 deletions
  1. +2
    -0
      inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java
  2. +2
    -2
      inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml

+ 2
- 0
inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java View File

@ -120,6 +120,8 @@ public class BasedataPatrolPoint extends BaseEntity {
private String pointTypeName;
private String pointTypeCode;
private String parentName;
public void setPatrolpointName(String patrolpointName) {
this.patrolpointName = patrolpointName;
this.patrolPointName = patrolpointName;


+ 2
- 2
inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml View File

@ -746,7 +746,7 @@
a.patrol_point_id,
(SELECT c.device_name FROM basedata_device c WHERE c.device_id = b.parent_id) parent_name,
b.device_name,
a.patrolpoint_name,
a.patrol_point_name,
a.alarm_threshold,
a.alg_subtype_ids,
IFNULL(a.update_time, a.create_time) AS update_time
@ -759,7 +759,7 @@
AND a.alarm_threshold != '[]'
AND ( a.alarm_threshold LIKE '%52%' OR a.alarm_threshold LIKE '%53%' )
<if test="deviceName != null and deviceName != ''">and b.device_name = #{deviceName}</if>
<if test="patrolPointName != null and patrolPointName != ''">and a.patrolpoint_name = #{patrolPointName}</if>
<if test="patrolPointName != null and patrolPointName != ''">and a.patrol_point_name = #{patrolPointName}</if>
ORDER BY
a.device_id
</select>


Loading…
Cancel
Save