Commit e396127e authored by ZWT's avatar ZWT

feat(能源管理系统): 间开制度管理

1.创建space_interval_system 间开制度详情,space_interval_wellhead_config
间开制度井口配置,space_interval_duration
间开制度小间开时段配置表,生成相关代码并添加到项目space模块,解决编译报错问题;
2.添加间开制度管理模块接口文档配置;
3.添加工具类,及基础实体类,处理基础字段;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ea20f894
package pps.core.common.utils;
import com.baomidou.mybatisplus.core.enums.SqlMethod;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import org.apache.commons.lang3.StringUtils;
import pps.core.common.entity.BaseEnt;
import pps.core.common.session.PpsUserSession;
import java.util.Collection;
import java.util.Date;
/**
* 封装工具类
*
* @author ZWT
* @date 2023/08/25 16:08
*/
public class BaseEntUtils {
/**
* 设置默认值
*
* @param entity 实体
* @param session 会话
*/
public static void setBaseEntDefault(BaseEnt entity, PpsUserSession session) {
String id = entity.getId();
Date now = new Date();
String userId = session.getId();
String userName = session.getUserName();
if (StringUtils.isEmpty(id)) {
entity.setCreateById(userId);
entity.setCreateByName(userName);
entity.setCreateTime(now);
}
entity.setModifyById(userId);
entity.setModifyByName(userName);
entity.setModifyTime(now);
}
/**
* 批量插入
*
* @param mapper 映射器
* @param entityClass 实体类
* @param list 列表
*/
public static <E> void batchInsert(Class<?> mapper, Class<?> entityClass, Collection<E> list) {
String sqlStatement = SqlHelper.getSqlStatement(mapper, SqlMethod.INSERT_ONE);
SqlHelper.executeBatch(entityClass, null, list, 1000, (sqlSession, ent) -> {
sqlSession.insert(sqlStatement, ent);
});
}
}
\ No newline at end of file
...@@ -16,8 +16,9 @@ import pps.core.base.service.data.base_power_line_diesel.GetBasePowerLineDieselV ...@@ -16,8 +16,9 @@ import pps.core.base.service.data.base_power_line_diesel.GetBasePowerLineDieselV
import pps.core.base.service.data.base_power_line_plant.GetBasePowerLinePlantViewOutput; import pps.core.base.service.data.base_power_line_plant.GetBasePowerLinePlantViewOutput;
import pps.core.base.service.data.base_power_line_storage.GetBasePowerLineStorageViewOutput; import pps.core.base.service.data.base_power_line_storage.GetBasePowerLineStorageViewOutput;
import pps.core.base.service.data.base_power_line_wellhead.GetBasePowerLineWellheadViewOutput; import pps.core.base.service.data.base_power_line_wellhead.GetBasePowerLineWellheadViewOutput;
import pps.core.base.utils.BaseEntUtils; import pps.core.base.utils.DictUtils;
import pps.core.common.session.PpsUserSession; import pps.core.common.session.PpsUserSession;
import pps.core.common.utils.BaseEntUtils;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
...@@ -209,8 +210,8 @@ public class BasePowerLineService { ...@@ -209,8 +210,8 @@ public class BasePowerLineService {
PageInfo<BasePowerLineView> pageInfo = new PageInfo<>(list); PageInfo<BasePowerLineView> pageInfo = new PageInfo<>(list);
List<QueryBasePowerLineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineViewOutput.class); List<QueryBasePowerLineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineViewOutput.class);
String ouName = this.getSysOrgNameById(context, input.getOuId()); String ouName = this.getSysOrgNameById(context, input.getOuId());
List<QuerySysDictionaryViewOutput> gridTypeList = BaseEntUtils.getDictList(context, "grid_type"); List<QuerySysDictionaryViewOutput> gridTypeList = DictUtils.getDictList(context, "grid_type");
List<QuerySysDictionaryViewOutput> lineTypeList = BaseEntUtils.getDictList(context, "line_type"); List<QuerySysDictionaryViewOutput> lineTypeList = DictUtils.getDictList(context, "line_type");
for (QueryBasePowerLineViewOutput output : outputs) { for (QueryBasePowerLineViewOutput output : outputs) {
output.setOuName(ouName); output.setOuName(ouName);
output.setGridTypeName(gridTypeList.stream() output.setGridTypeName(gridTypeList.stream()
......
...@@ -19,8 +19,9 @@ import pps.core.base.service.data.base_price_strategy.*; ...@@ -19,8 +19,9 @@ import pps.core.base.service.data.base_price_strategy.*;
import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrategyMonthInput; import pps.core.base.service.data.base_price_strategy_month.CreateBasePriceStrategyMonthInput;
import pps.core.base.service.data.base_price_strategy_month.GetBasePriceStrategyMonthOutput; import pps.core.base.service.data.base_price_strategy_month.GetBasePriceStrategyMonthOutput;
import pps.core.base.service.data.base_price_strategy_month.UpdateBasePriceStrategyMonthInput; import pps.core.base.service.data.base_price_strategy_month.UpdateBasePriceStrategyMonthInput;
import pps.core.base.utils.BaseEntUtils; import pps.core.base.utils.DictUtils;
import pps.core.common.session.PpsUserSession; import pps.core.common.session.PpsUserSession;
import pps.core.common.utils.BaseEntUtils;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
...@@ -151,7 +152,7 @@ public class BasePriceStrategyService { ...@@ -151,7 +152,7 @@ public class BasePriceStrategyService {
session.setId("123"); session.setId("123");
session.setUserName("ceshi"); session.setUserName("ceshi");
String strategyId = input.getId(); String strategyId = input.getId();
if (BaseEntUtils.checkStrategyIsReference(context, strategyId)) { if (DictUtils.checkStrategyIsReference(context, strategyId)) {
return XServiceResult.error(992, "当前策略已被引用"); return XServiceResult.error(992, "当前策略已被引用");
} }
return XTransactionHelper.begin(context, () -> { return XTransactionHelper.begin(context, () -> {
......
package pps.core.base.utils; package pps.core.base.utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.enums.SqlMethod;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.SystemDictionaryService; import pps.cloud.system.service.SystemDictionaryService;
import pps.cloud.system.service.data.QuerySysDictionaryViewInput; import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
import pps.cloud.system.service.data.QuerySysDictionaryViewOutput; import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
import pps.core.base.entity.BasePowerLineEnt; import pps.core.base.entity.BasePowerLineEnt;
import pps.core.base.mapper.BasePowerLineMapper; import pps.core.base.mapper.BasePowerLineMapper;
import pps.core.common.entity.BaseEnt;
import pps.core.common.session.PpsUserSession;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.data.XListResult; import xstartup.data.XListResult;
import java.util.Collection;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -24,42 +17,7 @@ import java.util.List; ...@@ -24,42 +17,7 @@ import java.util.List;
* @author ZWT * @author ZWT
* @date 2023/08/25 16:08 * @date 2023/08/25 16:08
*/ */
public class BaseEntUtils { public class DictUtils {
/**
* 设置市电峰谷策略默认值
*
* @param entity 实体
* @param session 会话
*/
public static void setBaseEntDefault(BaseEnt entity, PpsUserSession session) {
String id = entity.getId();
Date now = new Date();
String userId = session.getId();
String userName = session.getUserName();
if (StringUtils.isEmpty(id)) {
entity.setCreateById(userId);
entity.setCreateByName(userName);
entity.setCreateTime(now);
}
entity.setModifyById(userId);
entity.setModifyByName(userName);
entity.setModifyTime(now);
}
/**
* 批量插入
*
* @param mapper 映射器
* @param entityClass 实体类
* @param list 列表
*/
public static <E> void batchInsert(Class<?> mapper, Class<?> entityClass, Collection<E> list) {
String sqlStatement = SqlHelper.getSqlStatement(mapper, SqlMethod.INSERT_ONE);
SqlHelper.executeBatch(entityClass, null, list, 1000, (sqlSession, ent) -> {
sqlSession.insert(sqlStatement, ent);
});
}
/** /**
* 通过字典类型查询字典 * 通过字典类型查询字典
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment