Commit 0c068c93 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.添加easy excel配置,增加转换器,增加全局excel导出样式,增加场站下拉选解析器;
2.开发光伏电站模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
3.间开制度管理模块新增设为基础制度开关接口,添加线上接口文档并完成接口冒烟测试;
4.开发井口配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
5.开发第三方有功功率历史数据导入接口,增加模板配置类,添加线上接口文档并完成接口冒烟测试;
6.开发给长庆使用的获取第三方认证token接口,验证获取token后是否能正常跳转指定页面,创建长庆用演示用户及角色;
7.开发柴发设备配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
8.开发储能设备配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 2fc1cc77
...@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime; ...@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.UUID; import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.IdUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import pps.core.common.constant.BusinessConstant; import pps.core.common.constant.BusinessConstant;
import pps.core.common.entity.BaseModel; import pps.core.common.entity.BaseModel;
...@@ -71,6 +72,26 @@ public class BaseUtils { ...@@ -71,6 +72,26 @@ public class BaseUtils {
model.setModifyTime(now); model.setModifyTime(now);
} }
/**
* 创建基础模型默认值
*
* @param model 模型
* @param session 一场
*/
public static void createBaseModelDefault(BaseModel model, PpsUserSession session) {
Date now = DateUtil.date();
model.setId(IdUtil.simpleUUID());
model.setIsDeleted(1);
String userId = session.getId();
String userName = session.getUserName();
model.setCreateById(userId);
model.setCreateByName(userName);
model.setCreateTime(now);
model.setModifyById(userId);
model.setModifyByName(userName);
model.setModifyTime(now);
}
/** /**
* 设置实体默认值(定时任务) * 设置实体默认值(定时任务)
* *
......
...@@ -3,7 +3,6 @@ package pps.core.base.service; ...@@ -3,7 +3,6 @@ package pps.core.base.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.IdUtil;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.EasyExcelFactory; import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
...@@ -217,9 +216,7 @@ public class ExcelService { ...@@ -217,9 +216,7 @@ public class ExcelService {
.latitude(new BigDecimal(ent.getLatitude())) .latitude(new BigDecimal(ent.getLatitude()))
.elevation(new BigDecimal(ent.getElevation())) .elevation(new BigDecimal(ent.getElevation()))
.build(); .build();
BaseUtils.setBaseModelDefault(build, context.getSession(PpsUserSession.class)); BaseUtils.createBaseModelDefault(build, context.getSession(PpsUserSession.class));
build.setId(IdUtil.simpleUUID());
build.setIsDeleted(1);
insertList.add(build); insertList.add(build);
} }
rowNum++; rowNum++;
...@@ -280,9 +277,7 @@ public class ExcelService { ...@@ -280,9 +277,7 @@ public class ExcelService {
.serviceRating(new BigDecimal(ent.getServiceRating())) .serviceRating(new BigDecimal(ent.getServiceRating()))
.ratedPower(new BigDecimal(ent.getRatedPower())) .ratedPower(new BigDecimal(ent.getRatedPower()))
.build(); .build();
BaseUtils.setBaseModelDefault(build, context.getSession(PpsUserSession.class)); BaseUtils.createBaseModelDefault(build, context.getSession(PpsUserSession.class));
build.setId(IdUtil.simpleUUID());
build.setIsDeleted(1);
insertList.add(build); insertList.add(build);
} }
rowNum++; rowNum++;
......
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