From eedbf25a4f533a3f24eea29200dc97dc869c2b90 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 16 Nov 2021 20:49:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8A=E6=94=BE=E8=AF=A5=E9=87=8A?= =?UTF-8?q?=E6=94=BE=E7=9A=84=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/toscreen/impl/ScreenExtractServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java index f76adbe421..3b03d3768d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java @@ -321,8 +321,10 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { log.error("extractDaily run exception", e); } log.info("===== extractDaily method end customerId:{}======",customerId); - }finally { - lock.unlock(); + } catch (Exception e) { + log.error("extractDaily exception msg:{}", e); + } finally { + distributedLock.unLock(lock); } } From 90873a38bd521ca13446704c5607a3b126fea795 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 22 Nov 2021 16:45:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=9A=84=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/datastats/impl/DataStatsServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index de8b382a20..4f1deda6ca 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -1238,8 +1238,8 @@ public class DataStatsServiceImpl implements DataStatsService { List agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList()); ScreenCustomerAgencyDTO agencyDTO = indexService.getAgencyInfo(formDTO.getAgencyId()); if (CollectionUtils.isNotEmpty(customerRelation.haveSubCustomer(agencyDTO.getCustomerId()))) { - List subAgencies = indexService.getSubAgencyList(formDTO.getAgencyId(), agencyDTO.getAreaCode()); - agencyIds = subAgencies.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList()); + subAgencyList = indexService.getSubAgencyList(formDTO.getAgencyId(), agencyDTO.getAreaCode()); + agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList()); } //2.按日期查询所有下级组织的事件治理指数 From 4c24b8b7a41049eda64edfb67ae66727815bafe6 Mon Sep 17 00:00:00 2001 From: lzh Date: Tue, 23 Nov 2021 09:23:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/IcResiCategoryWarnConfigDTO.java | 4 + .../ResiCategoryStatsConfigController.java | 3 +- .../dao/IcResiCategoryStatsConfigDao.java | 15 +- .../IcResiCategoryWarnConfigEntity.java | 4 + .../ResiCategoryStatsConfigService.java | 2 +- .../ResiCategoryStatsConfigServiceImpl.java | 149 ++++-------------- .../mapper/IcResiCategoryStatsConfigDao.xml | 49 ++++++ .../mapper/IcResiCategoryWarnConfigDao.xml | 1 + 8 files changed, 109 insertions(+), 118 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcResiCategoryWarnConfigDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcResiCategoryWarnConfigDTO.java index b4a2609d5e..c7ef3d17f8 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcResiCategoryWarnConfigDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcResiCategoryWarnConfigDTO.java @@ -57,6 +57,10 @@ public class IcResiCategoryWarnConfigDTO implements Serializable { * 列名 */ private String columnName; + /** + * 是否预警 1 是 0 否 + */ + private String warn; /** * 排序 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java index 26f3537689..97059846c6 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java @@ -124,7 +124,7 @@ public class ResiCategoryStatsConfigController { @PostMapping("info") public Result info(@LoginUser TokenDto tokenDTO,@RequestBody IcResiCategoryStatsConfigFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, IcResiCategoryStatsConfigFormDTO.SelectGroup.class); - return new Result().ok(resiCategoryStatsConfigService.info(formDTO.getId())); + return new Result().ok(resiCategoryStatsConfigService.info(formDTO.getId(),tokenDTO.getCustomerId())); } @PostMapping("resicategorystatslistshowd") @@ -150,6 +150,7 @@ public class ResiCategoryStatsConfigController { List warnConfigEntityList = icResiCategoryWarnConfigDao.selectList(new QueryWrapper() .lambda() .eq(IcResiCategoryWarnConfigEntity::getCustomerId,customerId) + .eq(IcResiCategoryWarnConfigEntity::getWarn,"1") .orderByAsc(IcResiCategoryWarnConfigEntity::getSort)); return new Result>().ok(ConvertUtils.sourceToTarget(warnConfigEntityList, IcResiCategoryWarnConfigDTO.class)); diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcResiCategoryStatsConfigDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcResiCategoryStatsConfigDao.java index bb55c52594..95fd7c9222 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcResiCategoryStatsConfigDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcResiCategoryStatsConfigDao.java @@ -18,8 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.IcResiCategoryStatsConfigResultDTO; import com.epmet.entity.IcResiCategoryStatsConfigEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 居民类别配置表 @@ -29,5 +33,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcResiCategoryStatsConfigDao extends BaseDao { - + + /** + * 获取配置信息 + * @param customerId + * @param isWarn + * @param level + */ + List listInfo(@Param("customerId") String customerId, @Param("isWarn") Integer isWarn, @Param("level") Integer level); + + IcResiCategoryStatsConfigResultDTO info(@Param("id") String id,@Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryWarnConfigEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryWarnConfigEntity.java index f604689f81..9175c282a6 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryWarnConfigEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryWarnConfigEntity.java @@ -58,6 +58,10 @@ public class IcResiCategoryWarnConfigEntity extends BaseEpmetEntity { * 列名 */ private String columnName; + /** + * 是否预警 1 是 0 否 + */ + private String warn; /** * 排序 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/ResiCategoryStatsConfigService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/ResiCategoryStatsConfigService.java index 2494953fcb..c9a4ff28b7 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/ResiCategoryStatsConfigService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/ResiCategoryStatsConfigService.java @@ -39,7 +39,7 @@ public interface ResiCategoryStatsConfigService { List list(String customerId, ResiCategoryStatsConfigListFormDTO formDTO); - IcResiCategoryStatsConfigResultDTO info(String id); + IcResiCategoryStatsConfigResultDTO info(String id,String customerId); void update(String customerId,IcResiCategoryStatsConfigFormDTO formDTO); diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java index 9759eb2b9c..086b9b700f 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java @@ -1,6 +1,8 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.constant.IcResiCategoryStatsConfigConstant; import com.epmet.dao.IcFormItemDao; import com.epmet.dao.IcFormItemGroupDao; @@ -59,11 +61,13 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf if(!CollectionUtils.isEmpty(groupIds)){ icFormItemGroupEntityList.addAll(icFormItemGroupDao.selectList(new QueryWrapper().lambda().eq(IcFormItemGroupEntity::getCustomerId,customerId).in(IcFormItemGroupEntity::getId, groupIds))); } + //获取tableName和COLUMN_NAME Map tableColumnMap = new HashMap<>(); Map idTableMap = new HashMap<>(); icFormItemEntityList.forEach(item->{ Map map = new HashMap<>(); + item.setColumnName(item.getColumnName().concat(NumConstant.ZERO == item.getColumnNum() ? StrConstant.EPMETY_STR : item.getColumnNum().toString())); if("0".equals(item.getItemGroupId())){ tableColumnMap.put(IcResiCategoryStatsConfigConstant.IC_RESI_USER+"-"+item.getColumnName(),item); idTableMap.put(item.getId(),IcResiCategoryStatsConfigConstant.IC_RESI_USER); @@ -110,7 +114,22 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf if(!CollectionUtils.isEmpty(newStatsEntityList)){ icResiCategoryStatsConfigService.insertBatch(newStatsEntityList); } - + List newWarnList = tableColumnMap.keySet().stream().filter(item -> !warnTableColumnMap.containsKey(item)).collect(Collectors.toList()); + List newWarnEntityList = new ArrayList<>(); + newWarnList.forEach(item->{ + IcFormItemEntity icFormItemEntity = tableColumnMap.get(item); + IcResiCategoryWarnConfigEntity entity = new IcResiCategoryWarnConfigEntity(); + entity.setCustomerId(customerId); + entity.setLabel(icFormItemEntity.getLabel()); + entity.setTableName(idTableMap.get(icFormItemEntity.getId())); + entity.setColumnName(icFormItemEntity.getColumnName()); + entity.setWarn("0"); + entity.setSort(icFormItemEntity.getSort()); + newWarnEntityList.add(entity); + }); + if(!CollectionUtils.isEmpty(newWarnEntityList)){ + icResiCategoryWarnConfigService.insertBatch(newWarnEntityList); + } List delStatsEntityIdList = new ArrayList<>(); List delWarnEntityIdList = new ArrayList<>(); //需要删除的 @@ -130,90 +149,16 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf } //4.返回数据 - List statsConfigList = icResiCategoryStatsConfigDao.selectList(new QueryWrapper().lambda() - .eq(IcResiCategoryStatsConfigEntity::getCustomerId,customerId) - .orderByAsc(IcResiCategoryStatsConfigEntity::getSort)); - List warnConfigList = icResiCategoryWarnConfigDao.selectList(new QueryWrapper().lambda() - .eq(IcResiCategoryWarnConfigEntity::getCustomerId,customerId)); - Map warnMap =new HashMap<>(); - warnConfigList.forEach(item->{ - warnMap.put(item.getTableName()+"-"+item.getColumnName(),item); - }); - List result = new ArrayList<>(); - statsConfigList.forEach(item->{ - IcResiCategoryStatsConfigResultDTO icResiCategoryStatsConfigResultDTO = new IcResiCategoryStatsConfigResultDTO(); - icResiCategoryStatsConfigResultDTO.setId(item.getId()); - icResiCategoryStatsConfigResultDTO.setLabel(item.getLabel()); - icResiCategoryStatsConfigResultDTO.setManagementIcon(item.getManagementIcon()); - icResiCategoryStatsConfigResultDTO.setDataIcon(item.getDataIcon()); - icResiCategoryStatsConfigResultDTO.setHouseShowIcon(item.getHouseShowIcon()); - icResiCategoryStatsConfigResultDTO.setStatus(item.getStatus()); - icResiCategoryStatsConfigResultDTO.setSort(item.getSort()); - IcResiCategoryWarnConfigEntity warnConfigEntity = warnMap.get(item.getTableName() + "-" + item.getColumnName()); - if(warnConfigEntity==null){ - icResiCategoryStatsConfigResultDTO.setWarn(IcResiCategoryStatsConfigConstant.WARN_NO); - }else{ - icResiCategoryStatsConfigResultDTO.setWarn(IcResiCategoryStatsConfigConstant.WARN_YES); - icResiCategoryStatsConfigResultDTO.setLevel1(warnConfigEntity.getLevel1()); - icResiCategoryStatsConfigResultDTO.setLevel2(warnConfigEntity.getLevel2()); - icResiCategoryStatsConfigResultDTO.setLevel3(warnConfigEntity.getLevel3()); - } - result.add(icResiCategoryStatsConfigResultDTO); + List result = icResiCategoryStatsConfigDao.listInfo(customerId,formDTO.getIsWarn(),formDTO.getLevel()); - }); - if(null == formDTO){ - return result; - } - List collect = new ArrayList<>(); - for (IcResiCategoryStatsConfigResultDTO item:result){ - String isWarn = String.valueOf(formDTO.getIsWarn()); - if(null !=formDTO.getIsWarn() && (!item.getWarn().equals(isWarn))){ - continue; - } - if(null!=formDTO.getLevel()){ - if(1==formDTO.getLevel()&&null==item.getLevel1()){ - continue; - } - if(2==formDTO.getLevel()&&null==item.getLevel2()){ - continue; - } - } - collect.add(item); - - } - - return collect; + return result; } @Override @Transactional(rollbackFor = Exception.class) - public IcResiCategoryStatsConfigResultDTO info(String id) { + public IcResiCategoryStatsConfigResultDTO info(String id,String customerId) { IcResiCategoryStatsConfigResultDTO result =new IcResiCategoryStatsConfigResultDTO(); - IcResiCategoryStatsConfigDTO icResiCategoryStatsConfigDTO = icResiCategoryStatsConfigService.get(id); - if(null == icResiCategoryStatsConfigDTO){ - return result; - } - IcResiCategoryWarnConfigEntity icResiCategoryWarnConfigEntity = icResiCategoryWarnConfigDao.selectOne(new QueryWrapper().lambda() - .eq(IcResiCategoryWarnConfigEntity::getCustomerId, icResiCategoryStatsConfigDTO.getCustomerId()) - .eq(IcResiCategoryWarnConfigEntity::getTableName, icResiCategoryStatsConfigDTO.getTableName()) - .eq(IcResiCategoryWarnConfigEntity::getColumnName, icResiCategoryStatsConfigDTO.getColumnName())); - -// IcResiCategoryWarnConfigEntity icResiCategoryWarnConfigEntity = Optional.ofNullable(entity).orElse(new IcResiCategoryWarnConfigEntity()); - result.setId(icResiCategoryStatsConfigDTO.getId()); - result.setLabel(icResiCategoryStatsConfigDTO.getLabel()); - result.setManagementIcon(icResiCategoryStatsConfigDTO.getManagementIcon()); - result.setDataIcon(icResiCategoryStatsConfigDTO.getDataIcon()); - result.setHouseShowIcon(icResiCategoryStatsConfigDTO.getHouseShowIcon()); - result.setStatus(icResiCategoryStatsConfigDTO.getStatus()); - result.setSort(icResiCategoryStatsConfigDTO.getSort()); - result.setWarn(null==icResiCategoryWarnConfigEntity?IcResiCategoryStatsConfigConstant.WARN_NO:IcResiCategoryStatsConfigConstant.WARN_YES); - if(null!=icResiCategoryWarnConfigEntity){ - result.setLevel1(icResiCategoryWarnConfigEntity.getLevel1()); - result.setLevel2(icResiCategoryWarnConfigEntity.getLevel2()); - result.setLevel3(icResiCategoryWarnConfigEntity.getLevel3()); - } - return result; - + return icResiCategoryStatsConfigDao.info(id,customerId); } @Override @@ -231,42 +176,16 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf icResiCategoryStatsConfigDao.updateById(icResiCategoryStatsConfigEntity); //更新配置预警 - if(IcResiCategoryStatsConfigConstant.WARN_YES.equals(formDTO.getWarn())){ - //更新 - IcResiCategoryWarnConfigEntity icResiCategoryWarnConfigEntity = icResiCategoryWarnConfigDao.selectOne(new QueryWrapper().lambda() - .eq(IcResiCategoryWarnConfigEntity::getCustomerId,customerId) - .eq(IcResiCategoryWarnConfigEntity::getTableName, icResiCategoryStatsConfigDTO.getTableName()) - .eq(IcResiCategoryWarnConfigEntity::getColumnName, icResiCategoryStatsConfigDTO.getColumnName())); - if(null == icResiCategoryWarnConfigEntity){ - icResiCategoryWarnConfigEntity = new IcResiCategoryWarnConfigEntity(); - icResiCategoryWarnConfigEntity.setCustomerId(customerId); - icResiCategoryWarnConfigEntity.setLabel(icResiCategoryStatsConfigDTO.getLabel()); - icResiCategoryWarnConfigEntity.setTableName(icResiCategoryStatsConfigDTO.getTableName()); - icResiCategoryWarnConfigEntity.setColumnName(icResiCategoryStatsConfigDTO.getColumnName()); - icResiCategoryWarnConfigEntity.setLevel1(formDTO.getLevel1()); - icResiCategoryWarnConfigEntity.setLevel2(formDTO.getLevel2()); - icResiCategoryWarnConfigEntity.setLevel3(formDTO.getLevel3()); - icResiCategoryWarnConfigEntity.setSort(icResiCategoryStatsConfigDTO.getSort()); - icResiCategoryWarnConfigDao.insert(icResiCategoryWarnConfigEntity); - }else{ -// icResiCategoryWarnConfigEntity.setCustomerId(customerId); - icResiCategoryWarnConfigEntity.setLabel(icResiCategoryStatsConfigDTO.getLabel()); - icResiCategoryWarnConfigEntity.setTableName(icResiCategoryStatsConfigDTO.getTableName()); - icResiCategoryWarnConfigEntity.setColumnName(icResiCategoryStatsConfigDTO.getColumnName()); - icResiCategoryWarnConfigEntity.setLevel1(formDTO.getLevel1()); - icResiCategoryWarnConfigEntity.setLevel2(formDTO.getLevel2()); - icResiCategoryWarnConfigEntity.setLevel3(formDTO.getLevel3()); - icResiCategoryWarnConfigEntity.setSort(icResiCategoryStatsConfigDTO.getSort()); - icResiCategoryWarnConfigDao.updateById(icResiCategoryWarnConfigEntity); - } - }else if(IcResiCategoryStatsConfigConstant.WARN_NO.equals(formDTO.getWarn())){ - //删除 - icResiCategoryWarnConfigDao.delete(new QueryWrapper().lambda() - .eq(IcResiCategoryWarnConfigEntity::getCustomerId,customerId) - .eq(IcResiCategoryWarnConfigEntity::getTableName,icResiCategoryStatsConfigDTO.getTableName()) - .eq(IcResiCategoryWarnConfigEntity::getColumnName,icResiCategoryStatsConfigDTO.getColumnName())); - } - + //更新 + IcResiCategoryWarnConfigEntity icResiCategoryWarnConfigEntity = icResiCategoryWarnConfigDao.selectOne(new QueryWrapper().lambda() + .eq(IcResiCategoryWarnConfigEntity::getCustomerId,customerId) + .eq(IcResiCategoryWarnConfigEntity::getTableName, icResiCategoryStatsConfigDTO.getTableName()) + .eq(IcResiCategoryWarnConfigEntity::getColumnName, icResiCategoryStatsConfigDTO.getColumnName())); + icResiCategoryWarnConfigEntity.setWarn(formDTO.getWarn()); + icResiCategoryWarnConfigEntity.setLevel1(formDTO.getLevel1()); + icResiCategoryWarnConfigEntity.setLevel2(formDTO.getLevel2()); + icResiCategoryWarnConfigEntity.setLevel3(formDTO.getLevel3()); + icResiCategoryWarnConfigDao.updateById(icResiCategoryWarnConfigEntity); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml index 5fb6f245b4..f3afd11c49 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml @@ -22,5 +22,54 @@ + + + + \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryWarnConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryWarnConfigDao.xml index 419adda97c..7fe3679b42 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryWarnConfigDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryWarnConfigDao.xml @@ -9,6 +9,7 @@ +