From bbc11b8e0692f7f95b47929c5485cf151f72c6d9 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 13 Aug 2025 17:07:11 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=A1=E9=87=8F=E7=BA=BF=E8=B7=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=BF=9E=E8=AE=A1=E9=87=8F=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EmsBaseLineInfoServiceImpl.java      | 42 +++++++++----------
 .../mapper/ems/base/EmsBaseLineInfoMapper.xml |  4 +-
 2 files changed, 24 insertions(+), 22 deletions(-)

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<EmsBaseLineInfo> selectEmsBaseLineInfoList(EmsBaseLineInfo emsBaseLineInfo)
-    {
+    public List<EmsBaseLineInfo> 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 @@
         <where>
             <if test="parentId != null ">and ebli.parent_id = #{parentId}</if>
             <if test="monitorCode != null  and monitorCode != ''">and ebli.monitor_code = #{monitorCode}</if>
-            <if test="monitorName != null  and monitorName != ''">and ebli.monitor_name like concat('%', #{monitorName},
+            <if test="monitorName != null  and monitorName != ''">and ebmi.monitor_name like concat('%', #{monitorName},
                 '%')
             </if>
             <if test="lineType != null ">and ebli.line_type = #{lineType}</if>
             <if test="ancestors != null  and ancestors != ''">and ebli.ancestors = #{ancestors}</if>
+            <if test="monitorType != null  and monitorType != ''">and ebmi.monitor_type = #{monitorType}</if>
+            <if test="monitorStatus != null  and monitorStatus != ''">and ebmi.monitorStatus = #{monitorStatus}</if>
             <if test="grade != null ">and ebli.grade = #{grade}</if>
             <if test="meterTypeId != null  and meterTypeId != ''">and ebli.meter_type_id = #{meterTypeId}</if>
             <if test="correctValue != null ">and ebli.correct_value = #{correctValue}</if>