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

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +26757 -1003
238 changed files with 26757 additions and 1003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e93f9cc6b8 - Show all commits

5
ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
View File

@ -146,9 +146,10 @@ public class EmsSiteConfigController extends BaseController{
* 单个站点单个设备点位查询 * 单个站点单个设备点位查询
*/ */
@GetMapping("/getDevicePointList") @GetMapping("/getDevicePointList")
public TableDataInfo getDevicePointList(@RequestParam String siteId,@RequestParam String deviceId,@RequestParam String deviceCategory) public TableDataInfo getDevicePointList(@RequestParam String siteId,@RequestParam String deviceId,
@RequestParam String deviceCategory, String dataPointName)
{ {
List<PointQueryResponse> result = iEmsDeviceSettingService.getSingleSiteDevicePoints(siteId,deviceId,deviceCategory); List<PointQueryResponse> result = iEmsDeviceSettingService.getSingleSiteDevicePoints(siteId,deviceId,deviceCategory,dataPointName);
return getDataTable2(result); return getDataTable2(result);
} }
} }

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); @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<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 @Override
public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId, String deviceCategory) { public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId,
List<PointQueryResponse> response = emsPointMatchMapper.getSingleSiteDevicePoints(siteId,deviceCategory); String deviceCategory, String dataPointName) {
List<PointQueryResponse> response = emsPointMatchMapper.getSingleSiteDevicePoints(siteId,deviceCategory,dataPointName);
// 电动所的电池簇特殊处理-来源pcs+bmsd // 电动所的电池簇特殊处理-来源pcs+bmsd
if (siteId.equals(DDS_SITE_ID) && DeviceCategory.CLUSTER.getCode().equals(deviceCategory)) { 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 from ems_point_match t
where 1=1 where 1=1
<if test="siteId != null and siteId != ''"> <if test="siteId != null and siteId != ''">
and site_id = #{siteId} and t.site_id = #{siteId}
</if> </if>
<if test="deviceCategory != null and deviceCategory != ''"> <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> </if>
</select> </select>
</mapper> </mapper>