diff --git a/os-ems/src/main/java/com/os/ems/base/service/impl/EmsBaseLineInfoServiceImpl.java b/os-ems/src/main/java/com/os/ems/base/service/impl/EmsBaseLineInfoServiceImpl.java index e0d7b52..0fa79bc 100644 --- a/os-ems/src/main/java/com/os/ems/base/service/impl/EmsBaseLineInfoServiceImpl.java +++ b/os-ems/src/main/java/com/os/ems/base/service/impl/EmsBaseLineInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.os.ems.base.service.impl; import java.util.List; + import com.os.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,87 +11,86 @@ import com.os.ems.base.service.IEmsBaseLineInfoService; /** * 计量线路信息Service业务层处理 - * + * * @author Yinq * @date 2025-08-13 */ @Service -public class EmsBaseLineInfoServiceImpl implements IEmsBaseLineInfoService -{ +public class EmsBaseLineInfoServiceImpl implements IEmsBaseLineInfoService { @Autowired private EmsBaseLineInfoMapper emsBaseLineInfoMapper; /** * 查询计量线路信息 - * + * * @param objId 计量线路信息主键 * @return 计量线路信息 */ @Override - public EmsBaseLineInfo selectEmsBaseLineInfoByObjId(Long objId) - { + public EmsBaseLineInfo selectEmsBaseLineInfoByObjId(Long objId) { return emsBaseLineInfoMapper.selectEmsBaseLineInfoByObjId(objId); } /** * 查询计量线路信息列表 - * + * * @param emsBaseLineInfo 计量线路信息 * @return 计量线路信息 */ @Override - public List selectEmsBaseLineInfoList(EmsBaseLineInfo emsBaseLineInfo) - { + public List selectEmsBaseLineInfoList(EmsBaseLineInfo emsBaseLineInfo) { return emsBaseLineInfoMapper.selectEmsBaseLineInfoList(emsBaseLineInfo); } /** * 新增计量线路信息 - * + * * @param emsBaseLineInfo 计量线路信息 * @return 结果 */ @Override - public int insertEmsBaseLineInfo(EmsBaseLineInfo emsBaseLineInfo) - { + public int insertEmsBaseLineInfo(EmsBaseLineInfo emsBaseLineInfo) { + if (emsBaseLineInfo.getParentId() == null || emsBaseLineInfo.getParentId() == 0) { + emsBaseLineInfo.setGrade(1L); + } else { + EmsBaseLineInfo baseLineInfo = emsBaseLineInfoMapper.selectEmsBaseLineInfoByObjId(emsBaseLineInfo.getParentId()); + emsBaseLineInfo.setGrade(baseLineInfo.getGrade() + 1); + } emsBaseLineInfo.setCreateTime(DateUtils.getNowDate()); return emsBaseLineInfoMapper.insertEmsBaseLineInfo(emsBaseLineInfo); } /** * 修改计量线路信息 - * + * * @param emsBaseLineInfo 计量线路信息 * @return 结果 */ @Override - public int updateEmsBaseLineInfo(EmsBaseLineInfo emsBaseLineInfo) - { + public int updateEmsBaseLineInfo(EmsBaseLineInfo emsBaseLineInfo) { emsBaseLineInfo.setUpdateTime(DateUtils.getNowDate()); return emsBaseLineInfoMapper.updateEmsBaseLineInfo(emsBaseLineInfo); } /** * 批量删除计量线路信息 - * + * * @param objIds 需要删除的计量线路信息主键 * @return 结果 */ @Override - public int deleteEmsBaseLineInfoByObjIds(Long[] objIds) - { + public int deleteEmsBaseLineInfoByObjIds(Long[] objIds) { return emsBaseLineInfoMapper.deleteEmsBaseLineInfoByObjIds(objIds); } /** * 删除计量线路信息信息 - * + * * @param objId 计量线路信息主键 * @return 结果 */ @Override - public int deleteEmsBaseLineInfoByObjId(Long objId) - { + public int deleteEmsBaseLineInfoByObjId(Long objId) { return emsBaseLineInfoMapper.deleteEmsBaseLineInfoByObjId(objId); } } diff --git a/os-ems/src/main/resources/mapper/ems/base/EmsBaseLineInfoMapper.xml b/os-ems/src/main/resources/mapper/ems/base/EmsBaseLineInfoMapper.xml index c6931e9..7b6ee67 100644 --- a/os-ems/src/main/resources/mapper/ems/base/EmsBaseLineInfoMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/base/EmsBaseLineInfoMapper.xml @@ -55,11 +55,13 @@ and ebli.parent_id = #{parentId} and ebli.monitor_code = #{monitorCode} - and ebli.monitor_name like concat('%', #{monitorName}, + and ebmi.monitor_name like concat('%', #{monitorName}, '%') and ebli.line_type = #{lineType} and ebli.ancestors = #{ancestors} + and ebmi.monitor_type = #{monitorType} + and ebmi.monitorStatus = #{monitorStatus} and ebli.grade = #{grade} and ebli.meter_type_id = #{meterTypeId} and ebli.correct_value = #{correctValue}