xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据20250916优化-点位名称模糊查询

Browse Source
This commit is contained in:
mashili
2025-09-18 18:04:59 +08:00
parent 8954329ccc
commit e93f9cc6b8
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java
View File

@ -119,5 +119,7 @@ public interface EmsPointMatchMapper
@Param("deviceId")String deviceId);
// 单个站点单个设备点位查询
public List<PointQueryResponse> getSingleSiteDevicePoints(@Param("siteId")String siteId, @Param("deviceCategory")String deviceCategory);
public List<PointQueryResponse> getSingleSiteDevicePoints(@Param("siteId")String siteId,
@Param("deviceCategory")String deviceCategory,
@Param("dataPointName")String dataPointName);
}

2
ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java
View File

@ -24,5 +24,5 @@ public interface IEmsDeviceSettingService
public List<DeviceCategory> getDeviceCategory();
public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId, String deviceCategory);
public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId, String deviceCategory, String dataPointName);
}

5
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
View File

@ -119,8 +119,9 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
}
@Override
public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId, String deviceCategory) {
List<PointQueryResponse> response = emsPointMatchMapper.getSingleSiteDevicePoints(siteId,deviceCategory);
public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId,
String deviceCategory, String dataPointName) {
List<PointQueryResponse> response = emsPointMatchMapper.getSingleSiteDevicePoints(siteId,deviceCategory,dataPointName);
// 电动所的电池簇特殊处理-来源pcs+bmsd
if (siteId.equals(DDS_SITE_ID) && DeviceCategory.CLUSTER.getCode().equals(deviceCategory)) {

7
ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
View File

@ -327,10 +327,13 @@
from ems_point_match t
where 1=1
<if test="siteId != null and siteId != ''">
and site_id = #{siteId}
and t.site_id = #{siteId}
</if>
<if test="deviceCategory != null and deviceCategory != ''">
and device_category = #{deviceCategory}
and t.device_category = #{deviceCategory}
</if>
<if test="dataPointName != null and dataPointName != ''">
and t.data_point_name like CONCAT('%', #{dataPointName}, '%')
</if>
</select>
</mapper>