From 5e7340b2db3a259f0e16ae41d8c73a0a608350fa Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 21 Oct 2024 16:40:18 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20ems=E8=AE=A1=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E3=80=81=E5=BB=BA=E7=AD=91=E5=AF=B9=E5=BA=94=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/BaseMonitorInfoMapper.java | 84 ------ .../base/service/IBaseMonitorInfoService.java | 1 - .../impl/BaseDnbThresholdServiceImpl.java | 6 +- .../impl/BaseMonitorInfo1ServiceImpl.java | 93 ++++--- .../impl/BaseMonitorInfoServiceImpl.java | 10 +- .../service/impl/DataAnalysisServiceImpl.java | 4 +- .../impl/ReportPointDnbServiceImpl.java | 4 +- .../mapper/base/BaseMonitorInfo1Mapper.xml | 9 +- .../mapper/base/BaseMonitorInfoMapper.xml | 260 ------------------ .../mapper/base/BaseTypeRelationMapper.xml | 9 +- 10 files changed, 59 insertions(+), 421 deletions(-) delete mode 100644 hw-modules/hw-ems/src/main/java/com/hw/ems/base/mapper/BaseMonitorInfoMapper.java delete mode 100644 hw-modules/hw-ems/src/main/resources/mapper/base/BaseMonitorInfoMapper.xml diff --git a/hw-modules/hw-ems/src/main/java/com/hw/ems/base/mapper/BaseMonitorInfoMapper.java b/hw-modules/hw-ems/src/main/java/com/hw/ems/base/mapper/BaseMonitorInfoMapper.java deleted file mode 100644 index 19f21e7f..00000000 --- a/hw-modules/hw-ems/src/main/java/com/hw/ems/base/mapper/BaseMonitorInfoMapper.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.hw.ems.base.mapper; - -import java.util.List; - -import com.hw.ems.base.domain.BaseMonitorInfo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * 计量设备信息Mapper接口 - * - * @author YinQ - * @date 2023-04-06 - */ -@Mapper -public interface BaseMonitorInfoMapper -{ - /** - * 查询计量设备信息 - * - * @param objid 计量设备信息主键 - * @return 计量设备信息 - */ - public BaseMonitorInfo selectBaseMonitorInfoByObjid(Long objid); - - /** - * 查询计量设备信息列表 - * - * @param baseMonitorInfo 计量设备信息 - * @return 计量设备信息集合 - */ - public List selectBaseMonitorInfoList(BaseMonitorInfo baseMonitorInfo); - - /** - * 新增计量设备信息 - * - * @param baseMonitorInfo 计量设备信息 - * @return 结果 - */ - public int insertBaseMonitorInfo(BaseMonitorInfo baseMonitorInfo); - - /** - * 修改计量设备信息 - * - * @param baseMonitorInfo 计量设备信息 - * @return 结果 - */ - public int updateBaseMonitorInfo(BaseMonitorInfo baseMonitorInfo); - - /** - * 删除计量设备信息 - * - * @param objid 计量设备信息主键 - * @return 结果 - */ - public int deleteBaseMonitorInfoByObjid(Long objid); - - /** - * 批量删除计量设备信息 - * - * @param objids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBaseMonitorInfoByObjids(String[] objids); - - /** - * 插入校验MonitorId是否合法 - * @param baseMonitor - * @return - */ - public List checkMonitorIdLegal(BaseMonitorInfo baseMonitor); - - - List selectChildrenMonitorById(String monitorId); - - BaseMonitorInfo selectBaseMonitorInfoByMonitorId(String monitorId); - - void updateMonitorChildren(@Param("monitor") List children); - - List selectMonitorList(BaseMonitorInfo baseMonitorInfo); - - List monitorLedgerList(BaseMonitorInfo baseMonitorInfo); - -} diff --git a/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/IBaseMonitorInfoService.java b/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/IBaseMonitorInfoService.java index 01a1ac90..febf4b5f 100644 --- a/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/IBaseMonitorInfoService.java +++ b/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/IBaseMonitorInfoService.java @@ -96,7 +96,6 @@ public interface IBaseMonitorInfoService { * @return */ ArrayList selectTypeSubset(Long type); - List monitorLedgerList(BaseMonitorInfo baseMonitorInfo); List selectMonitor(Long publicShareId); diff --git a/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseDnbThresholdServiceImpl.java b/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseDnbThresholdServiceImpl.java index 8c4f0fcc..b03b2d1e 100644 --- a/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseDnbThresholdServiceImpl.java +++ b/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseDnbThresholdServiceImpl.java @@ -11,7 +11,7 @@ import com.hw.ems.base.domain.BaseDnbThreshold; import com.hw.ems.base.domain.BaseMonitorInfo; import com.hw.ems.base.domain.vo.TreeSelect; import com.hw.ems.base.mapper.BaseDnbThresholdMapper; -import com.hw.ems.base.mapper.BaseMonitorInfoMapper; +import com.hw.ems.base.mapper.BaseMonitorInfo1Mapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hw.ems.base.service.IBaseDnbThresholdService; @@ -27,7 +27,7 @@ public class BaseDnbThresholdServiceImpl implements IBaseDnbThresholdService { @Autowired private BaseDnbThresholdMapper baseDnbThresholdMapper; @Autowired - private BaseMonitorInfoMapper baseMonitorInfoMapper; + private BaseMonitorInfo1Mapper baseMonitorInfoMapper; /** * 查询电阈值信息 @@ -113,7 +113,7 @@ public class BaseDnbThresholdServiceImpl implements IBaseDnbThresholdService { //@DataScope(deptAlias = "d") //@DS("#header.poolName") public List selectMonitorList(BaseMonitorInfo baseMonitorInfo) { - return baseMonitorInfoMapper.selectMonitorList(baseMonitorInfo); + return baseMonitorInfoMapper.selectBaseMonitorInfoList(baseMonitorInfo); } //@Override diff --git a/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseMonitorInfo1ServiceImpl.java b/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseMonitorInfo1ServiceImpl.java index 1bfc8e40..909f6637 100644 --- a/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseMonitorInfo1ServiceImpl.java +++ b/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseMonitorInfo1ServiceImpl.java @@ -94,46 +94,23 @@ public class BaseMonitorInfo1ServiceImpl implements IBaseMonitorInfo1Service { if (baseMonitorInfos.size() != 0) { throw new ServiceException("计量设备编号重复:" + baseMonitorInfo.getMonitorId()); } - - //todo 新增父级为空判断，父级为空时会导致创建子表与创建计量设备与类型的对应对象失效 try { BaseMonitorInfo monitor = baseMonitorInfoMapper.selectBaseMonitorInfoByObjid(baseMonitorInfo.getParentId()); - if (baseMonitorInfo.getParentId()==0){ - baseMonitorInfo.setAncestors(baseMonitorInfo.getMonitorId()); - } - else { - - - if (monitor != null) { - baseMonitorInfo.setAncestors(monitor.getAncestors() + "," + baseMonitorInfo.getMonitorId()); - String[] split = baseMonitorInfo.getAncestors().split(","); - monitor.setGrade(split.length); - } - } + monitor.setAncestors(monitor.getAncestors() + "," + monitor.getMonitorId()); + String[] split = monitor.getAncestors().split(","); + monitor.setGrade(split.length); this.insertOrUpdateBaseTypeRelation(baseMonitorInfo.getMonitorId(), baseMonitorInfo.getBuildId(), baseMonitorInfo.getBusinessId(), baseMonitorInfo.getSubentryId()); - List subsetList = this.selectMonitorSubsetList(new BaseMonitorInfo()); -// 添加线损对象 - this.insertLineLossList(subsetList); - - baseMonitorInfo.setCreateTime(DateUtils.getNowDate()); - baseMonitorInfo.setCreateBy(SecurityUtils.getUsername()); - //修改父级等级 -// baseMonitorInfoMapper.updateBaseMonitorInfo(monitor); - int result = baseMonitorInfoMapper.insertBaseMonitorInfo(baseMonitorInfo); - - //创建TDEngine子表 - this.createEmsTbale(baseMonitorInfo.getMonitorId(), baseMonitorInfo.getBuildId(), baseMonitorInfo.getMonitorName(), baseMonitorInfo.getObjid()); - - return result; +// List subsetList = this.selectMonitorSubsetList(new BaseMonitorInfo()); + //添加线损对象 +// this.insertLineLossList(subsetList); } catch (Exception e) { - System.out.println("新增计量设备信息异常1111:" + e.getMessage()); - //捕获异常时回滚 - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + System.out.println("新增计量设备信息异常:" + e.getMessage()); } - return 0; - + baseMonitorInfo.setCreateTime(DateUtils.getNowDate()); + baseMonitorInfo.setCreateBy(SecurityUtils.getUsername()); + return baseMonitorInfoMapper.insertBaseMonitorInfo(baseMonitorInfo); } /** @@ -221,14 +198,19 @@ public class BaseMonitorInfo1ServiceImpl implements IBaseMonitorInfo1Service { @Override //@DS("#header.poolName") public int updateBaseMonitorInfo(BaseMonitorInfo baseMonitorInfo) { + // 异常处理：若设备停用则更新所有父级 + if (StringUtils.isNotNull(baseMonitorInfo.getMonitorStatus()) && baseMonitorInfo.getMonitorStatus().equals(1L)){ + this.updateAllBaseMonitorInfo(); + } List baseMonitorInfos = baseMonitorInfoMapper.checkMonitorIdLegal(baseMonitorInfo); - if (baseMonitorInfos.size() > 1) { - throw new ServiceException("计量设备编号重复:" + baseMonitorInfo.getMonitorId()); + if (baseMonitorInfos.size() > 1){ + throw new ServiceException("计量设备编号重复:" + baseMonitorInfo.getMonitorId()); } try { BaseMonitorInfo newParenMonitorInfo = baseMonitorInfoMapper.selectBaseMonitorInfoByObjid(baseMonitorInfo.getParentId()); BaseMonitorInfo oldDeptMonitorInfo = selectBaseMonitorInfoByObjid(baseMonitorInfo.getObjid()); - if (StringUtils.isNotNull(newParenMonitorInfo) && StringUtils.isNotNull(oldDeptMonitorInfo)) { + if (StringUtils.isNotNull(newParenMonitorInfo) && StringUtils.isNotNull(oldDeptMonitorInfo)) + { String newAncestors = newParenMonitorInfo.getAncestors() + "," + oldDeptMonitorInfo.getMonitorId(); String oldAncestors = oldDeptMonitorInfo.getAncestors(); baseMonitorInfo.setAncestors(newAncestors); @@ -238,18 +220,14 @@ public class BaseMonitorInfo1ServiceImpl implements IBaseMonitorInfo1Service { updateMonitorChildren(baseMonitorInfo.getMonitorId(), newAncestors, oldAncestors); } - this.insertOrUpdateBaseTypeRelation(baseMonitorInfo.getMonitorId(), baseMonitorInfo.getBuildId(), - baseMonitorInfo.getBusinessId(), baseMonitorInfo.getSubentryId()); - baseMonitorInfo.setUpdateTime(DateUtils.getNowDate()); - baseMonitorInfo.setUpdateBy(SecurityUtils.getUsername()); - int result = baseMonitorInfoMapper.updateBaseMonitorInfo(baseMonitorInfo); - this.updateTdEngineTable(baseMonitorInfo, oldDeptMonitorInfo); - return result; + this.insertOrUpdateBaseTypeRelation(baseMonitorInfo.getMonitorId(),baseMonitorInfo.getBuildId(), + baseMonitorInfo.getBusinessId(),baseMonitorInfo.getSubentryId()); } catch (Exception e) { e.printStackTrace(); - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); } - return 0; + baseMonitorInfo.setUpdateTime(DateUtils.getNowDate()); + baseMonitorInfo.setUpdateBy(SecurityUtils.getUsername()); + return baseMonitorInfoMapper.updateBaseMonitorInfo(baseMonitorInfo); } /** @@ -270,6 +248,31 @@ public class BaseMonitorInfo1ServiceImpl implements IBaseMonitorInfo1Service { } + /** + * 更新所有测控点 + */ + private void updateAllBaseMonitorInfo() { + List monitorInfoList = this.selectBaseMonitorInfoList(new BaseMonitorInfo()); + for (BaseMonitorInfo baseMonitorInfo : monitorInfoList) { + BaseMonitorInfo newParenMonitorInfo = baseMonitorInfoMapper.selectBaseMonitorInfoByObjid(baseMonitorInfo.getParentId()); + BaseMonitorInfo oldDeptMonitorInfo = selectBaseMonitorInfoByObjid(baseMonitorInfo.getObjid()); + if (StringUtils.isNotNull(newParenMonitorInfo) && StringUtils.isNotNull(oldDeptMonitorInfo)) { + String newAncestors = newParenMonitorInfo.getAncestors() + "," + oldDeptMonitorInfo.getMonitorId(); + String oldAncestors = oldDeptMonitorInfo.getAncestors(); + baseMonitorInfo.setAncestors(newAncestors); + String[] split = baseMonitorInfo.getAncestors().split(","); + baseMonitorInfo.setGrade(split.length); + + updateMonitorChildren(baseMonitorInfo.getMonitorId(), newAncestors, oldAncestors); + } + + this.insertOrUpdateBaseTypeRelation(baseMonitorInfo.getMonitorId(), baseMonitorInfo.getBuildId(), + baseMonitorInfo.getBusinessId(), baseMonitorInfo.getSubentryId()); + baseMonitorInfo.setUpdateTime(DateUtils.getNowDate()); + baseMonitorInfo.setUpdateBy(SecurityUtils.getUsername()); + baseMonitorInfoMapper.updateBaseMonitorInfo(baseMonitorInfo); + } + } /** * @param: baseMonitorInfo 前端传的对象 diff --git a/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseMonitorInfoServiceImpl.java b/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseMonitorInfoServiceImpl.java index fe2d75e4..aaefa463 100644 --- a/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseMonitorInfoServiceImpl.java +++ b/hw-modules/hw-ems/src/main/java/com/hw/ems/base/service/impl/BaseMonitorInfoServiceImpl.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; @Service public class BaseMonitorInfoServiceImpl implements IBaseMonitorInfoService { @Autowired - private BaseMonitorInfoMapper baseMonitorInfoMapper; + private BaseMonitorInfo1Mapper baseMonitorInfoMapper; @Autowired private BaseBusinessTypeMapper baseBusinessTypeMapper; @@ -208,7 +208,7 @@ public class BaseMonitorInfoServiceImpl implements IBaseMonitorInfoService { @Override //@DS("#header.poolName") public int deleteBaseMonitorInfoByObjids(String objids) { - return baseMonitorInfoMapper.deleteBaseMonitorInfoByObjids(Convert.toStrArray(objids)); + return baseMonitorInfoMapper.deleteBaseMonitorInfoByObjids(Convert.toLongArray(objids)); } /** @@ -490,12 +490,6 @@ public class BaseMonitorInfoServiceImpl implements IBaseMonitorInfoService { return typeRelations; } - @Override - //@DS("#header.poolName") - public List monitorLedgerList(BaseMonitorInfo baseMonitorInfo) { - return baseMonitorInfoMapper.monitorLedgerList(baseMonitorInfo); - } - @Override //@DS("#header.poolName") public List selectMonitor(Long publicShareId) { diff --git a/hw-modules/hw-ems/src/main/java/com/hw/ems/report/service/impl/DataAnalysisServiceImpl.java b/hw-modules/hw-ems/src/main/java/com/hw/ems/report/service/impl/DataAnalysisServiceImpl.java index ad38be92..67546068 100644 --- a/hw-modules/hw-ems/src/main/java/com/hw/ems/report/service/impl/DataAnalysisServiceImpl.java +++ b/hw-modules/hw-ems/src/main/java/com/hw/ems/report/service/impl/DataAnalysisServiceImpl.java @@ -10,7 +10,7 @@ import com.hw.ems.base.domain.BaseMonitorInfo; import com.hw.ems.base.domain.BaseTypeRelation; import com.hw.ems.base.mapper.BaseLineLossMapper; import com.hw.ems.base.mapper.BaseLineMonitorMapper; -import com.hw.ems.base.mapper.BaseMonitorInfoMapper; +import com.hw.ems.base.mapper.BaseMonitorInfo1Mapper; import com.hw.ems.base.mapper.BaseTypeRelationMapper; import com.hw.ems.base.service.IBaseMonitorInfoService; import com.hw.ems.report.domain.ExportReport; @@ -55,7 +55,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService { private BaseLineLossMapper baseLineLossMapper; @Autowired - private BaseMonitorInfoMapper baseMonitorInfoMapper; + private BaseMonitorInfo1Mapper baseMonitorInfoMapper; @Autowired private BaseTypeRelationMapper baseTypeRelationMapper; diff --git a/hw-modules/hw-ems/src/main/java/com/hw/ems/report/service/impl/ReportPointDnbServiceImpl.java b/hw-modules/hw-ems/src/main/java/com/hw/ems/report/service/impl/ReportPointDnbServiceImpl.java index 47340d6e..a86d27ba 100644 --- a/hw-modules/hw-ems/src/main/java/com/hw/ems/report/service/impl/ReportPointDnbServiceImpl.java +++ b/hw-modules/hw-ems/src/main/java/com/hw/ems/report/service/impl/ReportPointDnbServiceImpl.java @@ -2,7 +2,7 @@ package com.hw.ems.report.service.impl; import com.hw.common.core.text.Convert; import com.hw.common.core.utils.DateUtils; -import com.hw.ems.base.mapper.BaseMonitorInfoMapper; +import com.hw.ems.base.mapper.BaseMonitorInfo1Mapper; import com.hw.ems.report.domain.ReportPointDnb; import com.hw.ems.report.domain.ReportPointDnbDTO; import com.hw.ems.report.mapper.ReportPointDnbMapper; @@ -27,7 +27,7 @@ public class ReportPointDnbServiceImpl implements IReportPointDnbService { private ReportPointDnbMapper reportPointDnbMapper; @Autowired - private BaseMonitorInfoMapper monitorInfoMapper; + private BaseMonitorInfo1Mapper monitorInfoMapper; /** * 查询电整点数据 diff --git a/hw-modules/hw-ems/src/main/resources/mapper/base/BaseMonitorInfo1Mapper.xml b/hw-modules/hw-ems/src/main/resources/mapper/base/BaseMonitorInfo1Mapper.xml index a93919bb..97406bfa 100644 --- a/hw-modules/hw-ems/src/main/resources/mapper/base/BaseMonitorInfo1Mapper.xml +++ b/hw-modules/hw-ems/src/main/resources/mapper/base/BaseMonitorInfo1Mapper.xml @@ -37,7 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -45,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select objid, parent_id, monitor_id, monitor_name, monitor_addr, monitor_type, monitor_status, collect_device_id, ancestors, grade, build_id, subentry_id, business_id, meter_type_id, - meter_id, correct_value, pt, ct, is_ammeter, is_key_monitor, is_circuit, dept_id, user_id,fee_type, + meter_id, correct_value, pt, ct, is_ammeter, is_key_monitor, is_circuit, dept_id, user_id, create_by, create_time, update_by, update_time, public_share_type,monitor_hierarchy,room_code,room_name,physical_code from base_monitor_info @@ -65,7 +64,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and subentry_id = #{subentryId} and business_id = #{businessId} and meter_type_id = #{meterTypeId} - and fee_type = #{feeType} and meter_id = #{meterId} and correct_value = #{correctValue} and pt = #{pt} @@ -129,7 +127,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bmi.room_code, bmi.room_name, bmi.physical_code, - bmi.fee_type, bt.relation_id from base_monitor_info bmi left join (SELECT monitor_id, relation_id @@ -185,7 +182,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" room_code, room_name, physical_code, - fee_type, #{parentId}, @@ -219,7 +215,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{roomCode}, #{roomName}, #{physicalCode}, - #{feeType}, @@ -256,8 +251,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" room_code = #{roomCode}, room_name = #{roomName}, physical_code = #{physicalCode}, - fee_type = #{feeType}, - submit_flag = #{submitFlag}, monitor_hierarchy = #{monitorHierarchy}, where objid = #{objid} diff --git a/hw-modules/hw-ems/src/main/resources/mapper/base/BaseMonitorInfoMapper.xml b/hw-modules/hw-ems/src/main/resources/mapper/base/BaseMonitorInfoMapper.xml deleted file mode 100644 index b0c23905..00000000 --- a/hw-modules/hw-ems/src/main/resources/mapper/base/BaseMonitorInfoMapper.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select objid, parent_id, monitor_id, monitor_name, monitor_addr, monitor_type, - monitor_status, collect_device_id, ancestors, grade, build_id, subentry_id, - business_id, meter_type_id, meter_id, correct_value, pt, ct, is_ammeter, - is_key_monitor, is_circuit, dept_id, user_id, create_by, create_time, update_by, update_time from base_monitor_info - - - - - - - - - - - update base_monitor_info set ancestors = - - when #{item.monitorId} then #{item.ancestors} - - where monitor_id in - - #{item.monitorId} - - - - insert into base_monitor_info - - parent_id, - monitor_id, - monitor_name, - monitor_addr, - monitor_type, - monitor_status, - collect_device_id, - ancestors, - grade, - build_id, - subentry_id, - business_id, - meter_type_id, - meter_id, - correct_value, - pt, - ct, - is_ammeter, - is_key_monitor, - is_circuit, - dept_id, - user_id, - create_by, - create_time, - update_by, - update_time, - - - #{parentId}, - #{monitorId}, - #{monitorName}, - #{monitorAddr}, - #{monitorType}, - #{monitorStatus}, - #{collectDeviceId}, - #{ancestors}, - #{grade}, - #{buildId}, - #{subentryId}, - #{businessId}, - #{meterTypeId}, - #{meterId}, - #{correctValue}, - #{pt}, - #{ct}, - #{isAmmeter}, - #{isKeyMonitor}, - #{isCircuit}, - #{deptId}, - #{userId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update base_monitor_info - - parent_id = #{parentId}, - monitor_id = #{monitorId}, - monitor_name = #{monitorName}, - monitor_addr = #{monitorAddr}, - monitor_type = #{monitorType}, - monitor_status = #{monitorStatus}, - collect_device_id = #{collectDeviceId}, - ancestors = #{ancestors}, - grade = #{grade}, - build_id = #{buildId}, - subentry_id = #{subentryId}, - business_id = #{businessId}, - meter_type_id = #{meterTypeId}, - meter_id = #{meterId}, - correct_value = #{correctValue}, - pt = #{pt}, - ct = #{ct}, - is_ammeter = #{isAmmeter}, - is_key_monitor = #{isKeyMonitor}, - is_circuit = #{isCircuit}, - dept_id = #{deptId}, - user_id = #{userId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where objid = #{objid} - - - - delete from base_monitor_info where objid = #{objid} - - - - delete from base_monitor_info where objid in - - #{objid} - - - - - - - diff --git a/hw-modules/hw-ems/src/main/resources/mapper/base/BaseTypeRelationMapper.xml b/hw-modules/hw-ems/src/main/resources/mapper/base/BaseTypeRelationMapper.xml index 9add8dd6..43299554 100644 --- a/hw-modules/hw-ems/src/main/resources/mapper/base/BaseTypeRelationMapper.xml +++ b/hw-modules/hw-ems/src/main/resources/mapper/base/BaseTypeRelationMapper.xml @@ -35,15 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" m.monitor_name, case when base_type_relation.type = 0 then bi.build_name - when base_type_relation.type = 1 then bt.business_name - when base_type_relation.type = 2 then st.subentry_name end unit_name, base_type_relation.rate, base_type_relation.formula_mode from base_type_relation left join base_monitor_info m on m.monitor_id = base_type_relation.monitor_id left join base_build_info bi on base_type_relation.relation_id = bi.objid - left join base_business_type bt on base_type_relation.relation_id = bt.objid - left join base_subentry_type st on base_type_relation.relation_id = st.objid