Skip to content

G
gf_back
Commit 9cfd20c4 authored by ZWT's avatar ZWT
Browse files
Options

feat(零碳): 长庆 

1.修改极短期间开预测定时任务逻辑,解决优化后部分优化结果时间段过短问题;
2.修改心知天气气象数据获取及接收定时任务,解决天气数据通过邮件下载后,部分数据精度丢失问题;
3.修改首页各个接口逻辑,对小数类型字段进行处理,修改首页接口,增加小时保留两位四舍五入逻辑,同时解决线路详情接口部分查询逻辑报错问题;
4.能耗分析模块,能耗概览接口修改,修改查询逻辑,修改数据获取逻辑及绿电占比计算逻辑;
5.能耗分析模块,消纳曲线用电趋势接口修改,修改查询逻辑,修改数据获取逻辑及绿电占比计算逻辑;
6.能耗分析模块,用电详情接口修改,修改查询逻辑,修改数据获取逻辑及绿电占比计算逻辑;
7.修改首页先导实验井间开制度模块接口查询逻辑,解决极短期间开优化修改后没有第一次开井时间标识导致数据查询不出来问题;
8.基础间开制度新增修改接口逻辑修改,删除防冻堵对井口处理逻辑;
9.极短期间开优化算法修改,增加防冻堵井开井时间优化逻辑;
10.提供长庆通过日期获取当日间开优化结果接口开发,完成接口冒烟测试并添加线上接口文档;
11.提供长庆1天光伏出力预测结果接口开发,完成接口冒烟测试并添加线上接口文档;
12.提供长庆15天光伏出力预测结果接口开发,完成接口冒烟测试并添加线上接口文档;
13.修改极短期间开优化算法,优化防冻堵策略;
14.开发第三方历史天气导入功能;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 85ac7238
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 317 deletions
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysOrganizationService.java
View file @ 9cfd20c4
......@@ -55,7 +55,6 @@ import java.util.stream.Collectors;
@XService
public class SysOrganizationService {
@XText("根据ouName查询组织机构树和场站")
@XApiPost
public XListResult<QuerySysOrganizationViewOutputTree> selectOuTreeAndStationByOuNameAndStationName(XContext context, GetSysOrganizationInput input) {
......@@ -73,7 +72,6 @@ public class SysOrganizationService {
}
}
}
SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
SysOrganizationView record = new SysOrganizationView();
XCopyUtils.copyObject(input, record);
......@@ -82,13 +80,10 @@ public class SysOrganizationService {
record.setOuIds(ouIds);
List<SysOrganizationView> viewList = mapper.selectOuByOuIdsAndOuName(record);
List<QuerySysOrganizationViewOutputTree> list = XCopyUtils.copyNewList(viewList, QuerySysOrganizationViewOutputTree.class);
List<QuerySysOrganizationViewOutputTree> trees = new ArrayList<>();
PpsUserSession session = context.getSession(PpsUserSession.class);
Integer isSuperAdmin = session.getIsSuperAdmin();
for (QuerySysOrganizationViewOutputTree tree : list) {
//如果是超级管理员查所以组织机构
if (UserConstant.ISSUPERADMIN_TRUE.equals(isSuperAdmin)) {
if (tree.getParentOuId().equals("00000000-0000-0000-0000-000000000000")) {
......@@ -99,10 +94,8 @@ public class SysOrganizationService {
trees.add(tree);
}
}
//子集
for (QuerySysOrganizationViewOutputTree it : list) {
if (OuLevelConstant.CHANG_ZHAN.getCode().equals(it.getOuLevel()) && !CollectionUtils.isEmpty(stationLikeList)) {
List<QuerySysOrganizationViewOutputTree> stationList = new ArrayList<>();
for (QueryBaseStationOutput baseStationView : stationLikeList) {
......@@ -140,7 +133,6 @@ public class SysOrganizationService {
}
});
trees = trees.stream().sorted(Comparator.comparing(QuerySysOrganizationViewOutputTree::getSort)).collect(Collectors.toList());
return XListResult.success(trees);
}
......@@ -155,7 +147,6 @@ public class SysOrganizationService {
PpsUserSession session = context.getSession(PpsUserSession.class);
Integer isSuperAdmin = session.getIsSuperAdmin();
List<SysOrganizationView> viewList = new ArrayList<>();
if (XStringUtils.isNotEmpty(input.getOuLevel()) && OuLevelConstant.CHANG_ZHAN.getCode().equals(input.getOuLevel())) {
if (XStringUtils.isNotEmpty(input.getParentOuId())) {
BaseBaseStationService stationService = context.getBean(BaseBaseStationService.class);
......@@ -175,7 +166,6 @@ public class SysOrganizationService {
}
List<GetSysOrganizationViewOutput> outputs = XCopyUtils.copyNewList(viewList, GetSysOrganizationViewOutput.class);
return XListResult.success(outputs);
}
}
if (XStringUtils.isEmpty(input.getParentOuId())) {
......@@ -190,17 +180,13 @@ public class SysOrganizationService {
} else {
viewList = mapper.selectOuSonByParentOuId(record);
}
List<GetSysOrganizationViewOutput> outputs = XCopyUtils.copyNewList(viewList, GetSysOrganizationViewOutput.class);
return XListResult.success(outputs);
}
@XText("根据用户id查询地区公司")
@XApiPost
public XListResult<GetSysOrganizationViewOutput> selectRegionFirmByUserId(XContext context, SelectRegionFirmInput input) {
PpsUserSession session = context.getSession(PpsUserSession.class);
SysOrganizationMapper bean = context.getBean(SysOrganizationMapper.class);
QueryWrapper<SysOrganizationEnt> wrapper = new QueryWrapper<>();
......@@ -214,7 +200,6 @@ public class SysOrganizationService {
return XListResult.success(new ArrayList<>());
}
List<GetSysOrganizationViewOutput> outputs = new ArrayList<>();
//查询当前用户所属组织机构的上级是有油气调控中心
SysOrganizationViewMapper viewMapper = context.getBean(SysOrganizationViewMapper.class);
SysOrganizationView view = new SysOrganizationView();
......@@ -222,7 +207,6 @@ public class SysOrganizationService {
view.setId(ouId);
view.setOuLevel(OuLevelConstant.YOU_QI_DIAO_KONG_ZHONG_XIN.getCode());
SysOrganizationView organization = viewMapper.getSysOrganizationByOuLevelAndOuId(view);
if (OuLevelConstant.ZHUAN_YE_GONG_SI.getCode().equals(ou.getOuLevel()) || organization != null && OuLevelConstant.YOU_QI_DIAO_KONG_ZHONG_XIN.getCode().equals(organization.getOuLevel())) {
wrapper = new QueryWrapper<>();
wrapper.lambda().eq(SysOrganizationEnt::getOuLevel, OuLevelConstant.DI_QU_GONG_SI.getCode())
......@@ -240,7 +224,6 @@ public class SysOrganizationService {
XCopyUtils.copyObject(organization1, output);
outputs.add(output);
}
return XListResult.success(outputs);
}
......@@ -258,7 +241,6 @@ public class SysOrganizationService {
PpsUserSession session = context.getSession(PpsUserSession.class);
Integer isSuperAdmin = session.getIsSuperAdmin();
for (QuerySysOrganizationViewOutputTree tree : list) {
//如果是超级管理员查所以组织机构
if (UserConstant.ISSUPERADMIN_TRUE.equals(isSuperAdmin)) {
if (tree.getParentOuId().equals("00000000-0000-0000-0000-000000000000")) {
......@@ -269,7 +251,6 @@ public class SysOrganizationService {
trees.add(tree);
}
}
//子集
for (QuerySysOrganizationViewOutputTree it : list) {
if (tree.getId().equals(it.getParentOuId())) {
......@@ -296,11 +277,9 @@ public class SysOrganizationService {
}
});
trees = trees.stream().sorted(Comparator.comparing(QuerySysOrganizationViewOutputTree::getSort)).collect(Collectors.toList());
return XListResult.success(trees);
}
@XText("根据条件组织机构树")
@XApiPost
public XListResult<QuerySysOrganizationViewOutputTree> getOuTreeByCondition(XContext context, GetOuInfoByConditionInput input) {
......@@ -320,7 +299,6 @@ public class SysOrganizationService {
PpsUserSession session = context.getSession(PpsUserSession.class);
ouId = session.getOuId();
}
for (QuerySysOrganizationViewOutputTree tree : list) {
if (rootId != null) {
if (tree.getParentOuId().equals(rootId)) {
......@@ -357,11 +335,9 @@ public class SysOrganizationService {
}
});
trees = trees.stream().sorted(Comparator.comparing(QuerySysOrganizationViewOutputTree::getSort)).collect(Collectors.toList());
return XListResult.success(trees);
}
@XText("根据条件查询组织机构")
@XApiPost
public XListResult<GetSysOrganizationViewOutput> getOuInfoByCondition(XContext context, GetOuInfoByConditionInput input) {
......@@ -378,7 +354,7 @@ public class SysOrganizationService {
PpsUserSession session = context.getSession(PpsUserSession.class);
ouId = session.getOuId();
}
List<SysOrganizationView> viewList = new ArrayList<>();
List<SysOrganizationView> viewList;
if (XStringUtils.isEmpty(input.getParentOuId())) {
//如果是超级管理员查所以组织机构
if (rootId != null) {
......@@ -494,7 +470,6 @@ public class SysOrganizationService {
return XListResult.success(outputs);
}
@XText("根据父级id查询儿子级-特殊")
@XApiPost
public XListResult<GetSysOrganizationViewOutput> selectSpecailOuInfoByParentOuId(XContext context, GetSysOrganizationRelInput input) {
......@@ -505,7 +480,7 @@ public class SysOrganizationService {
record.setIsDeleted(SysOrganizationCode.NORMAL);
PpsUserSession session = context.getSession(PpsUserSession.class);
Integer isSuperAdmin = session.getIsSuperAdmin();
List<SysOrganizationView> viewList = new ArrayList<>();
List<SysOrganizationView> viewList;
SysDictionaryViewMapper dictionaryViewMapper = context.getBean(SysDictionaryViewMapper.class);
SysDictionaryView dictionaryView = new SysDictionaryView();
dictionaryView.setAlias("sys_inform_org");
......@@ -573,7 +548,6 @@ public class SysOrganizationService {
}
});
trees = trees.stream().sorted(Comparator.comparing(QuerySysOrganizationViewOutputTree::getSort)).collect(Collectors.toList());
return XListResult.success(trees);
}
......@@ -586,11 +560,9 @@ public class SysOrganizationService {
if (CollectionUtils.isEmpty(sysOrganizationCaches)) {
List<SysOrganizationCache> caches = selectSysOrganizationTree(context, input);
List<QuerySysOrganizationViewOutputTree> resultTree = XCopyUtils.copyNewList(caches, QuerySysOrganizationViewOutputTree.class);
return XListResult.success(resultTree);
}
List<QuerySysOrganizationViewOutputTree> resultTree = XCopyUtils.copyNewList(sysOrganizationCaches, QuerySysOrganizationViewOutputTree.class);
return XListResult.success(resultTree);
}
......@@ -603,7 +575,6 @@ public class SysOrganizationService {
List<SysOrganizationView> viewList = mapper.selectOrganizationEffective(record);
List<QuerySysOrganizationViewOutputTree> list = XCopyUtils.copyNewList(viewList, QuerySysOrganizationViewOutputTree.class);
List<QuerySysOrganizationViewOutputTree> trees = new ArrayList<>();
for (QuerySysOrganizationViewOutputTree tree : list) {
if (tree.getParentOuId().equals("00000000-0000-0000-0000-000000000000")) {
trees.add(tree);
......@@ -678,14 +649,12 @@ public class SysOrganizationService {
}
}
}
trees.forEach(outputTree -> {
if (outputTree.getSort() == null) {
outputTree.setSort(999);
}
});
trees = trees.stream().sorted(Comparator.comparing(QuerySysOrganizationViewOutputTree::getSort)).collect(Collectors.toList());
return XListResult.success(trees);
}
......@@ -715,20 +684,15 @@ public class SysOrganizationService {
CreateSysDictionaryInput unitLevelInput = new CreateSysDictionaryInput();
unitLevelInput.setAlias("UNIT_LEVEL");
XListResult<QuerySysDictionaryViewOutput> unitLevel = dictService.querySysDictionarysByAlias(context, unitLevelInput);
//介质类型
CreateSysDictionaryInput mediaTypesInput = new CreateSysDictionaryInput();
mediaTypesInput.setAlias("MEDIUM_TYPE");
XListResult<QuerySysDictionaryViewOutput> mediaTypes = dictService.querySysDictionarysByAlias(context, mediaTypesInput);
//国家
CreateSysDictionaryInput countryInput = new CreateSysDictionaryInput();
countryInput.setAlias("COUNTRIES");
XListResult<QuerySysDictionaryViewOutput> countrys = dictService.querySysDictionarysByAlias(context, countryInput);
for (SysOrganizationView view : list) {
//单位级别
if (view.getOuLevel() != null) {
if (unitLevel.getResult() != null) {
......@@ -743,7 +707,6 @@ public class SysOrganizationService {
view.setLevelDicName(view.getOuLevel());
}
}
//介质类型
if (view.getMediaType() != null) {
if (mediaTypes.getResult() != null) {
......@@ -762,14 +725,11 @@ public class SysOrganizationService {
String mediaTypeName = buffer.substring(1);
view.setPropertyName(mediaTypeName);
}
}
if (view.getPropertyName() == null) {
view.setPropertyName(view.getMediaType());
}
}
//国家
if (view.getCountry() != null) {
if (countrys.getResult() != null) {
......@@ -780,12 +740,10 @@ public class SysOrganizationService {
}
}
}
if (view.getCountryName() == null) {
view.setCountryName(view.getCountry());
}
}
}
PageInfo<SysOrganizationView> pageInfo = new PageInfo<>(list);
List<QuerySysOrganizationViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySysOrganizationViewOutput.class);
......@@ -862,7 +820,6 @@ public class SysOrganizationService {
@XText("组织机构排序")
@XApiPost
public XServiceResult updateSysOrganizationRelSort(XContext context, UpdateSysOrganizationRelInput input) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
SysOrganizationRelMapper mapper = context.getBean(SysOrganizationRelMapper.class);
Date date = new Date();
......@@ -875,13 +832,10 @@ public class SysOrganizationService {
return XServiceResult.error(context, XError.NotFound);
}
Integer entitySort = entity.getSort();
QueryWrapper<SysOrganizationRelEnt> sortQueryWrapper = new QueryWrapper<>();
sortQueryWrapper.lambda().eq(SysOrganizationRelEnt::getParentOuId, entity.getParentOuId());
sortQueryWrapper.lambda().le(true, SysOrganizationRelEnt::getEffectTime, date);
sortQueryWrapper.lambda().ge(true, SysOrganizationRelEnt::getEndTime, date);
//判断是上移还是下移
if (input.getSortFlag().equals("up")) {
//sort-=1;
......@@ -892,10 +846,7 @@ public class SysOrganizationService {
sortQueryWrapper.lambda().ge(SysOrganizationRelEnt::getSort, entitySort);
sortQueryWrapper.lambda().orderByAsc(SysOrganizationRelEnt::getSort);
}
List<SysOrganizationRelEnt> relEnts = mapper.selectList(sortQueryWrapper);
PpsUserSession session = context.getSession(PpsUserSession.class);
if (!CollectionUtils.isEmpty(relEnts) && relEnts.size() > 1) {
SysOrganizationRelEnt relEnt = relEnts.get(1);
......@@ -909,7 +860,6 @@ public class SysOrganizationService {
relEntSort += 1;
}
}
//上方或下方有数据进行交换序号
relEnt.setSort(entitySort);
relEnt.setModifyTime(date);
......@@ -918,14 +868,12 @@ public class SysOrganizationService {
mapper.updateById(relEnt);
entity.setSort(relEntSort);
}
entity.setModifyById(session.getId());
entity.setModifyByName(session.getUserName());
entity.setModifyTime(date);
mapper.updateById(entity);
//更新缓存中组织机构树
selectSysOrganizationTree(context, new GetSysOrganizationInput());
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
......@@ -934,7 +882,6 @@ public class SysOrganizationService {
@XText("新增组织机构信息")
@XApiPost
public XServiceResult createSysOrganization(XContext context, CreateSysOrganizationInput input) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
SysOrganizationMapper mapper = context.getBean(SysOrganizationMapper.class);
SysOrganizationRelMapper relMapper = context.getBean(SysOrganizationRelMapper.class);
......@@ -951,7 +898,6 @@ public class SysOrganizationService {
entity.setCreateByName(session.getUserName());
}
mapper.insert(entity);
//先修改父级为有子集状态
if (input.getParentOuId() != null) {
QueryWrapper<SysOrganizationRelEnt> queryWrapper = new QueryWrapper<>();
......@@ -969,15 +915,12 @@ public class SysOrganizationService {
relMapper.updateById(parent);
}
}
//新增组织机构关系表
insertSysOrganizationRel(context, date, uuid, input.getParentOuId(), input.getSort(), session);
//新增组织机构属性表
insertSysOrganizationProperty(context, date, input.getId(), "GAS", session);
//更新缓存中组织机构树
selectSysOrganizationTree(context, new GetSysOrganizationInput());
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
......@@ -1001,7 +944,6 @@ public class SysOrganizationService {
@XText("修改组织机构信息")
@XApiPost
public XServiceResult updateSysOrganization(XContext context, UpdateSysOrganizationInput input) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
SysOrganizationMapper mapper = context.getBean(SysOrganizationMapper.class);
SysOrganizationRelMapper relMapper = context.getBean(SysOrganizationRelMapper.class);
......@@ -1011,7 +953,6 @@ public class SysOrganizationService {
SysOrganizationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
XCopyUtils.copyObject(input, entity);
Date date = new Date();
......@@ -1022,8 +963,6 @@ public class SysOrganizationService {
entity.setModifyByName(session.getUserName());
}
mapper.updateById(entity);
//修改组织机构关系表
QueryWrapper<SysOrganizationRelEnt> relQueryWrapper = new QueryWrapper<>();
relQueryWrapper.lambda().eq(SysOrganizationRelEnt::getOuId, input.getId());
......@@ -1050,7 +989,6 @@ public class SysOrganizationService {
}
relMapper.updateById(originalParent);
}
//修改新父级为有子集状态
QueryWrapper<SysOrganizationRelEnt> nowParentWrapper = new QueryWrapper<>();
nowParentWrapper.lambda().eq(SysOrganizationRelEnt::getOuId, input.getParentOuId());
......@@ -1076,16 +1014,13 @@ public class SysOrganizationService {
relEntity.setModifyById(session.getId());
relEntity.setModifyByName(session.getUserName());
}
relMapper.updateById(relEntity);
//修改组织机构属性表
QueryWrapper<SysOrganizationPropertyEnt> propertyQueryWrapper = new QueryWrapper<>();
propertyQueryWrapper.lambda().eq(SysOrganizationPropertyEnt::getOuId, input.getId())
.le(SysOrganizationPropertyEnt::getEffectTime, new Date())
.ge(SysOrganizationPropertyEnt::getEndTime, new Date());
List<SysOrganizationPropertyEnt> propertyEntitys = propertyMapper.selectList(propertyQueryWrapper);
//组织机构属性数据全部改为失效
propertyEntitys.forEach(sysOrganizationPropertyEnt -> {
sysOrganizationPropertyEnt.setEndTime(date);
......@@ -1135,10 +1070,8 @@ public class SysOrganizationService {
} catch (Exception e) {
throw new XServiceException(e);
}
//更新缓存中组织机构树
selectSysOrganizationTree(context, new GetSysOrganizationInput());
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
......@@ -1147,7 +1080,6 @@ public class SysOrganizationService {
@XText("删除组织机构")
@XApiPost
public XServiceResult deleteSysOrganization(XContext context, DeleteSysOrganizationInput input) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
SysOrganizationMapper mapper = context.getBean(SysOrganizationMapper.class);
SysUserOrganizationRelMapper userOuRelMapper = context.getBean(SysUserOrganizationRelMapper.class);
......@@ -1157,7 +1089,6 @@ public class SysOrganizationService {
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
QueryWrapper<SysUserOrganizationRelEnt> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(SysUserOrganizationRelEnt::getOuId, entity.getId())
.le(true, SysUserOrganizationRelEnt::getEffectTime, new Date())
......@@ -1174,7 +1105,6 @@ public class SysOrganizationService {
}
entity.setIsDeleted(SysOrganizationCode.DELETE);
mapper.updateById(entity);
//组织机构关系表修改为失效状态
SysOrganizationRelMapper relmapper = context.getBean(SysOrganizationRelMapper.class);
QueryWrapper<SysOrganizationRelEnt> relWrapper = new QueryWrapper<>();
......@@ -1193,7 +1123,6 @@ public class SysOrganizationService {
} catch (Exception e) {
throw new XServiceException(e);
}
//组织机构属性表修改为失效状态
SysOrganizationPropertyMapper propertyMapper = context.getBean(SysOrganizationPropertyMapper.class);
QueryWrapper<SysOrganizationPropertyEnt> propertyWrapper = new QueryWrapper<>();
......@@ -1209,11 +1138,9 @@ public class SysOrganizationService {
propertyEnt.setModifyByName(session.getUserName());
}
});
propertyEnts.forEach(propertyMapper::updateById);
//更新缓存中组织机构树
selectSysOrganizationTree(context, new GetSysOrganizationInput());
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
......@@ -1244,20 +1171,16 @@ public class SysOrganizationService {
propertyEnt.setCreateByName(session.getUserName());
}
list.add(propertyEnt);
}
if (!CollectionUtils.isEmpty(list)) {
list.forEach(propertyMapper::insert);
}
}
//新增组织机构关系表
public void insertSysOrganizationRel(XContext context, Date date, String ouId, String parentOuId, Integer sort, PpsUserSession session) {
SysOrganizationRelMapper relMapper = context.getBean(SysOrganizationRelMapper.class);
SysOrganizationRelViewMapper relViewMapper = context.getBean(SysOrganizationRelViewMapper.class);
//新增组织机构关系表
SysOrganizationRelEnt relEnt = new SysOrganizationRelEnt();
relEnt.setId(UUID.randomUUID().toString());
......@@ -1276,7 +1199,6 @@ public class SysOrganizationService {
relEnt.setOuIdPath(ouIdPath);
relEnt.setLevels(relEnt1.getLevels() == null ? 1 : relEnt1.getLevels() + 1);
}
//如果用户不填写序号需要取表中最大的序号然后+1作为当前数据的序号
if (sort == null) {
SysOrganizationRelView relView = relViewMapper.selectMaxSort(parentOuId);
......@@ -1334,7 +1256,6 @@ public class SysOrganizationService {
//根据组织机构id获取所有的子级组织机构
List<GetOuListTreeOutput> ouList = this.getAllOuListByOuId(context, ouId);
if (CollectionUtils.isEmpty(ouList)) return XListResult.success();
if (StringUtils.isBlank(input.getMenuId())) {
return XListResult.success(this.createOuTree(ouList));
}
......@@ -1437,6 +1358,4 @@ public class SysOrganizationService {
}
return treeList;
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysOutUserCreateLogService.java
View file @ 9cfd20c4
......@@ -46,7 +46,6 @@ public class SysOutUserCreateLogService {
SysOutUserCreateLogMapper mapper = context.getBean(SysOutUserCreateLogMapper.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
QueryWrapper<SysOutUserCreateLogEnt> queryWrapper = new QueryWrapper<>();
//queryWrapper.lambda().eq(SysOutUserCreateLogEnt::getOuId , session.getOuId());
if (input.getStatus() != null) {
queryWrapper.lambda().eq(SysOutUserCreateLogEnt::getStatus, input.getStatus());
}
......@@ -411,5 +410,4 @@ public class SysOutUserCreateLogService {
return XServiceResult.OK;
});
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysRoleMenuAuthService.java
View file @ 9cfd20c4
......@@ -41,7 +41,6 @@ public class SysRoleMenuAuthService {
@XApiAnonymous
@XApiPost
public XServiceResult createSysRoleMenuAuth(XContext context, CreateSysRoleMenuAuthInput input) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
//删除原关系
SysRoleMenuAuthMapper mapper = context.getBean(SysRoleMenuAuthMapper.class);
......@@ -53,7 +52,6 @@ public class SysRoleMenuAuthService {
List<String> collect = sysUserRoleRelEnts.stream().map(SysRoleMenuAuthEnt::getId).collect(Collectors.toList());
mapper.deleteBatchIds(collect);
}
//创建新关系
SysRoleMenuAuthViewMapper viewMapper = context.getBean(SysRoleMenuAuthViewMapper.class);
List<String> menuIdList = input.getMenuIds();
......@@ -71,18 +69,15 @@ public class SysRoleMenuAuthService {
}
entity.setCreateTime(now);
viewList.add(entity);
}
if (!CollectionUtils.isEmpty(viewList)) {
viewMapper.batchInsert(viewList);
}
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
}
@XText("查询角色对应多个菜单")
@XApiAnonymous
@XApiPost
......@@ -178,6 +173,4 @@ public class SysRoleMenuAuthService {
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output);
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysRoleService.java
View file @ 9cfd20c4
......@@ -41,7 +41,6 @@ public class SysRoleService {
SystemDictionaryService dictService = context.getBean(SystemDictionaryService.class);
SysRoleView record = new SysRoleView();
XCopyUtils.copyObject(input, record);
List<String> mediaTypeList = new ArrayList<>();
PpsUserSession session = context.getSession(PpsUserSession.class);
//如果不是超级管理员只查询当前用户的组织机构下的角色以及上级可继承的角色
......@@ -50,7 +49,6 @@ public class SysRoleService {
record.setOuId(session.getOuId());
input.setOuId(session.getOuId());
}
if (XStringUtils.isEmpty(input.getMediaType())) {
mediaTypeList.add("ALL");
//普通角色只查询所属企业的介质类型
......@@ -59,7 +57,6 @@ public class SysRoleService {
propertyView.setOuId(session.getOuId());
propertyView.setEndTime(new Date());
List<SysOrganizationPropertyView> propertyViews = mapper.selectList(propertyView);
if (!CollectionUtils.isEmpty(propertyViews)) {
for (SysOrganizationPropertyView propertyEnt : propertyViews) {
mediaTypeList.add(propertyEnt.getPropertyValue());
......@@ -68,11 +65,10 @@ public class SysRoleService {
record.setMediaTypes(mediaTypeList);
}
}
}
}
List<SysRoleView> list = viewMapper.selectSysRoleListByOuId(record);
long total = 0;
long total;
//查询上级可继承的角色
if (XStringUtils.isNotEmpty(input.getOuId())) {
Date date = new Date();
......@@ -104,8 +100,6 @@ public class SysRoleService {
record.setIsInheritable(1);
List<SysRoleView> sysRoleViews = viewMapper.selectExtendsSysRoleListByOuIds(record);
list.addAll(sysRoleViews);
}
}
}
......@@ -116,7 +110,6 @@ public class SysRoleService {
ouIds.add(roleView.getOuId());
}
}
//介质类型
CreateSysDictionaryInput mediaTypesInput = new CreateSysDictionaryInput();
mediaTypesInput.setAlias("MEDIUM_TYPE");
......@@ -138,17 +131,14 @@ public class SysRoleService {
} else {
list = list.subList(page * input.getLimit(), list.size());
}
List<QuerySysRoleViewOutput> outputs = XCopyUtils.copyNewList(list, QuerySysRoleViewOutput.class);
for (QuerySysRoleViewOutput view : outputs) {
if (!CollectionUtils.isEmpty(ouRelEnts)) {
for (SysOrganizationRelEnt ouRelEnt : ouRelEnts) {
if (ouRelEnt.getOuId().equals(view.getOuId())) {
view.setParentOuId(ouRelEnt.getParentOuId());
}
}
}
//查询系统管理员角色，如果true的话不可以删除
String value = LoginConfig.adminRoles.findValue(context);
......@@ -176,22 +166,18 @@ public class SysRoleService {
String mediaTypeName = buffer.substring(1);
view.setMediaTypeName(mediaTypeName);
}
}
if (view.getMediaTypeName() == null) {
view.setMediaTypeName(view.getMediaType());
}
}
}
return XPageResult.success(outputs, input, total);
}
@XText("新增角色")
@XApiPost
public XServiceResult createSysRole(XContext context, CreateSysRoleInput input) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
SysRoleEnt entity = new SysRoleEnt();
SysRoleMapper mapper = context.getBean(SysRoleMapper.class);
......@@ -207,7 +193,6 @@ public class SysRoleService {
XCopyUtils.copyObject(input, entity);
String roleId = UUID.randomUUID().toString();
entity.setId(roleId);
entity.setCreateTime(new Date());
PpsUserSession session = context.getSession(PpsUserSession.class);
entity.setCreateByName(session.getUserName());
......@@ -216,8 +201,6 @@ public class SysRoleService {
if (XStringUtils.isEmpty(entity.getOuId())) {
entity.setOuId(session.getOuId());
}
try {
mapper.insert(entity);
} catch (Exception e) {
......@@ -225,7 +208,6 @@ public class SysRoleService {
}
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
}
......@@ -257,17 +239,14 @@ public class SysRoleService {
entity.setModifyByName(session.getUserName());
entity.setModifyById(session.getId());
mapper.updateById(entity);
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
}
@XText("删除角色")
@XApiPost
public XServiceResult deleteSysRole(XContext context, DeleteSysRoleInput input) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
SysRoleMapper mapper = context.getBean(SysRoleMapper.class);
SysUserRoleRelMapper relMapper = context.getBean(SysUserRoleRelMapper.class);
......@@ -281,7 +260,6 @@ public class SysRoleService {
if (StringUtils.isNotBlank(value) && value.contains(entity.getId())) {
return XServiceResult.error(200, "此角色是管理员角色,请勿删除!");
}
QueryWrapper<SysUserRoleRelEnt> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(SysUserRoleRelEnt::getRoleId, entity.getId());
List<SysUserRoleRelEnt> relEnts = relMapper.selectList(wrapper);
......@@ -289,13 +267,10 @@ public class SysRoleService {
List<String> collect = relEnts.stream().map(SysUserRoleRelEnt::getId).collect(Collectors.toList());
relMapper.deleteBatchIds(collect);
}
mapper.deleteById(entity);
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
}
@XText("根据组织机构id获取角色列表")
......@@ -313,6 +288,4 @@ public class SysRoleService {
List<QuerySysRoleViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySysRoleViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysRoleServiceImpl.java
View file @ 9cfd20c4
......@@ -56,4 +56,4 @@ public class SysRoleServiceImpl implements SysRoleCloudService {
List<GetUserListWithRoleIdsOutput> outputs = XCopyUtils.copyNewList(list, GetUserListWithRoleIdsOutput.class);
return XListResult.success(outputs);
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysSmsGroupHideService.java
View file @ 9cfd20c4
......@@ -36,5 +36,4 @@ public class SysSmsGroupHideService {
mapper.deleteByMap(map);
return XServiceResult.OK;
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysSmsGroupService.java
View file @ 9cfd20c4
......@@ -43,15 +43,11 @@ public class SysSmsGroupService {
SysSmsGroupMapper mapper = context.getBean(SysSmsGroupMapper.class);
SysSmsGroupUserMapper userMapper = context.getBean(SysSmsGroupUserMapper.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
SysSmsGroupEnt entity = new SysSmsGroupEnt();
SysSmsGroupUserEnt userEnt = null;
SysSmsGroupEnt entity;
SysSmsGroupUserEnt userEnt;
QueryWrapper<SysSmsGroupEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SysSmsGroupEnt::getSmsGroupId, input.getSmsGroupId());
entity = mapper.selectOne(queryWrapper);
Date date = new Date();
if (entity != null) {
this.deleteSysSmsGroup(context, input);
......@@ -67,7 +63,6 @@ public class SysSmsGroupService {
} else {
entity = new SysSmsGroupEnt();
XCopyUtils.copyObject(input, entity);
String uuid = UUID.randomUUID().toString();
entity.setSmsGroupId(uuid);
entity.setCreateTime(date);
......@@ -85,43 +80,35 @@ public class SysSmsGroupService {
String groupUserId = UUID.randomUUID().toString();
userEnt = new SysSmsGroupUserEnt();
XCopyUtils.copyObject(item, userEnt);
userEnt.setMobile(UserInfoUtil.encrypt(item.getMobile()));
userEnt.setSmsGroupUserId(groupUserId);
userEnt.setIsDeleted("0");
userEnt.setSmsGroupId(entity.getSmsGroupId());
userMapper.insert(userEnt);
}
} catch (Exception e) {
e.printStackTrace();
}
}
mapper.insert(entity);
return XServiceResult.OK;
}
@XText("查询收信组列表")
@XApiAnonymous
@XApiPost
public XPageResult<QuerySysSmsGroupOutput> querySysSmsGroup(XContext context, QuerySysSmsGroupInput input) {
SysSmsGroupViewMapper mapper = context.getBean(SysSmsGroupViewMapper.class);
SysSmsGroupView record = new SysSmsGroupView();
List<SysSmsGroupView> list = new ArrayList<>();
List<SysSmsGroupView> list;
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit());
PpsUserSession session = context.getSession(PpsUserSession.class);
if (session != null) {
record.setCreateById(session.getId());
record.setOuId(session.getOuId());
}
list = mapper.selectGroupList(record);
PageInfo<SysSmsGroupView> pageInfo = new PageInfo<>(list);
List<QuerySysSmsGroupOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySysSmsGroupOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
......@@ -136,7 +123,6 @@ public class SysSmsGroupService {
SysSmsGroupView record = new SysSmsGroupView();
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit());
PpsUserSession session = context.getSession(PpsUserSession.class);
if (session != null) {
record.setCreateById(session.getId());
......@@ -178,12 +164,9 @@ public class SysSmsGroupService {
SysSmsGroupViewMapper mapper = context.getBean(SysSmsGroupViewMapper.class);
SysSmsGroupView record = new SysSmsGroupView();
XCopyUtils.copyObject(input, record);
SysSmsGroupView view = mapper.selectOne(record);
CreateSysSmsGroupOutput output = new CreateSysSmsGroupOutput();
XCopyUtils.copyObject(view, output);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
}
......@@ -197,11 +180,9 @@ public class SysSmsGroupService {
});
output.setGroupUserInputList(list);
}
return XSingleResult.success(output);
}
@XText("修改收信组")
@XApiAnonymous
@XApiPost
......@@ -213,7 +194,6 @@ public class SysSmsGroupService {
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
// XCopyUtils.copyObject(input, entity);
PpsUserSession session = context.getSession(PpsUserSession.class);
if (session != null) {
Date date = new Date();
......@@ -234,10 +214,8 @@ public class SysSmsGroupService {
SysSmsGroupUserMapper userMapper = context.getBean(SysSmsGroupUserMapper.class);
QueryWrapper<SysSmsGroupEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SysSmsGroupEnt::getSmsGroupId, input.getSmsGroupId());
QueryWrapper<SysSmsGroupUserEnt> queryUserWrapper = new QueryWrapper<>();
queryUserWrapper.lambda().eq(SysSmsGroupUserEnt::getSmsGroupId, input.getSmsGroupId());
SysSmsGroupEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
......@@ -264,5 +242,4 @@ public class SysSmsGroupService {
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output);
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysSmsGroupUserService.java
View file @ 9cfd20c4
......@@ -24,6 +24,7 @@ import java.util.List;
@XService
public class SysSmsGroupUserService {
@XApiAnonymous
@XApiPost
public XServiceResult createSysSmsGroupUser(XContext context, CreateSysSmsGroupUserInput input) {
......@@ -63,7 +64,6 @@ public class SysSmsGroupUserService {
return XServiceResult.OK;
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySysSmsGroupUserViewOutput> querySysSmsGroupUserView(XContext context, QuerySysSmsGroupUserViewInput input) {
......@@ -76,5 +76,4 @@ public class SysSmsGroupUserService {
List<QuerySysSmsGroupUserViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySysSmsGroupUserViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysUserGroupRoleRelService.java
View file @ 9cfd20c4
......@@ -111,7 +111,6 @@ public class SysUserGroupRoleRelService {
return XSingleResult.success(output);
}
@XText("根据用户组id查询选中的角色")
@XApiPost
public XPageResult<QuerySysUserGroupRoleRelViewOutput> querySysUserGroupRoleRelView(XContext context, QuerySysUserGroupRoleRelViewInput input) {
......@@ -124,5 +123,4 @@ public class SysUserGroupRoleRelService {
List<QuerySysUserGroupRoleRelViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySysUserGroupRoleRelViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysUserGroupService.java
View file @ 9cfd20c4
......@@ -6,7 +6,6 @@ import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;
import pps.core.common.session.PpsUserSession;
import pps.core.system.entity.*;
import pps.core.system.mapper.*;
import pps.core.system.service.data.sys_auth_ou_scope.CreateSysAuthOuScopeInput;
......@@ -41,7 +40,6 @@ public class SysUserGroupService {
public XServiceResult createSysUserGroup(XContext context, CreateSysUserGroupInput input) {
return XTransactionHelper.begin(context, () -> {
SysUserGroupMapper mapper = context.getBean(SysUserGroupMapper.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
SysUserGroupEnt entity = new SysUserGroupEnt();
XCopyUtils.copyObject(input, entity);
entity.setId(UUID.randomUUID().toString());
......@@ -53,7 +51,6 @@ public class SysUserGroupService {
});
}
@XText("创建用户组和角色关系")
@XApiPost
public XServiceResult createSysUserGroupRoleRel(XContext context, CreateSysUserGroupRoleRelInput input) {
......@@ -90,7 +87,6 @@ public class SysUserGroupService {
});
}
//SysAuthOuScope
@XText("创建用户组和菜单、组织机构关系表")
@XApiPost
public XServiceResult createSysAuthOuScope(XContext context, CreateSysAuthOuScopeInput input) {
......@@ -118,13 +114,11 @@ public class SysUserGroupService {
entity.setOuId(ouId);
entity.setUserGroupId(input.getUserGroupId());
entity.setId(UUID.randomUUID().toString());
//entity.setCreateById(context.getUser().getId());
entity.setCreateByName(context.getUser().getName());
entity.setCreateTime(now);
viewList.add(entity);
}
}
if (ObjectUtils.isNotEmpty(viewList)) {
viewUserGroupWithRole.batchInsert(viewList);
}
......@@ -136,7 +130,6 @@ public class SysUserGroupService {
@XApiPost
public XServiceResult createSysUserWithUserGroupRel(XContext context, CreateSysUserWithUserGroupRelInput input) {
return XTransactionHelper.begin(context, () -> {
//SysUserWithUserGroupRel
SysUserWithUserGroupRelMapper userGroupWithRole = context.getBean(SysUserWithUserGroupRelMapper.class);
SysUserWithUserGroupRelViewMapper userWithUserGroupRelViewMapper = context.getBean(SysUserWithUserGroupRelViewMapper.class);
//删除原关系
......@@ -291,5 +284,4 @@ public class SysUserGroupService {
List<QuerySysUserGroupViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySysUserGroupViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysUserImportLogService.java
View file @ 9cfd20c4
......@@ -46,9 +46,7 @@ public class SysUserImportLogService {
@XApiGet
public XPageResult<QuerySysUserImportLogViewOutput> querySysUserImportLogViewPage(XContext context, QuerySysUserImportLogViewInput input) {
SysUserImportLogMapper mapper = context.getBean(SysUserImportLogMapper.class);
//PpsUserSession session = context.getSession(PpsUserSession.class);
QueryWrapper<SysUserImportLogEnt> queryWrapper = new QueryWrapper<>();
//queryWrapper.lambda().eq(SysUserImportLogEnt::getOuId , session.getOuId());
if (input.getStatus() != null) {
queryWrapper.lambda().eq(SysUserImportLogEnt::getStatus, input.getStatus());
}
......@@ -177,72 +175,67 @@ public class SysUserImportLogService {
SysUserMapper userMapper = context.getBean(SysUserMapper.class);
SysUserOrganizationRelMapper userOrganizationRelMapper = context.getBean(SysUserOrganizationRelMapper.class);
SysUserRoleRelMapper userRoleRelMapper = context.getBean(SysUserRoleRelMapper.class);
XThreadHelper.async(new Runnable() {
@Override
public void run() {
for (int i = 0; i < successEntList.size(); i++) {
Date currentDate = new Date();
SysUserImportLogDetailEnt record = successEntList.get(i);
record.setId(UUID.randomUUID().toString());
record.setLogId(logEnt.getId());
record.setCreateById(session.getId());
record.setCreateByName(session.getUserName());
record.setCreateTime(currentDate);
detailMapper.insert(record);
//插入用户
SysUserEnt sysUserEnt = XCopyUtils.copyNewObject(record, SysUserEnt.class);
if (record.getIsInner().equals("是"))
sysUserEnt.setIsInner(1);
else
sysUserEnt.setIsInner(2);
if (record.getIsOuter().equals("是"))
sysUserEnt.setIsOuter(1);
else
sysUserEnt.setIsOuter(2);
sysUserEnt.setEndDate(XDateUtils.tryParse("2099-12-31"));
sysUserEnt.setIsSuperAdmin(0);
if (XStringUtils.isNotEmpty(sysUserEnt.getPassword()))
sysUserEnt.setPassword(MD5Util.encryptPassword(sysUserEnt.getPassword()));
else
sysUserEnt.setPassword("2e7832f9c3a0ca243c559017c07cceed");
sysUserEnt.setDuty(getDictKey(sysUserEnt.getDuty(), dictList));
userMapper.insert(sysUserEnt);
//插入用户组织机构关系
SysUserOrganizationRelEnt sysUserOrganizationRelEnt = new SysUserOrganizationRelEnt();
sysUserOrganizationRelEnt.setId(UUID.randomUUID().toString());
sysUserOrganizationRelEnt.setOuId(record.getOuId());
sysUserOrganizationRelEnt.setUserId(sysUserEnt.getId());
sysUserOrganizationRelEnt.setCreateById(session.getId());
sysUserOrganizationRelEnt.setCreateByName(session.getUserName());
sysUserOrganizationRelEnt.setCreateTime(currentDate);
sysUserOrganizationRelEnt.setEffectTime(new Date());
sysUserOrganizationRelEnt.setEndTime(XDateUtils.tryParse("2099-12-31"));
userOrganizationRelMapper.insert(sysUserOrganizationRelEnt);
//插入用户角色关系
QueryWrapper<SysUserRoleRelEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SysUserRoleRelEnt::getUserId, record.getUserIdAct());
List<SysUserRoleRelEnt> userRoleRelEnts = userRoleRelMapper.selectList(queryWrapper);
if (!CollectionUtils.isEmpty(userRoleRelEnts)) {
userRoleRelEnts.stream().forEach(item -> {
item.setId(UUID.randomUUID().toString());
item.setUserId(sysUserEnt.getId());
userRoleRelMapper.insert(item);
});
}
}
for (int i = 0; i < errorEntList.size(); i++) {
Date currentDate = new Date();
SysUserImportLogDetailEnt record = errorEntList.get(i);
record.setId(UUID.randomUUID().toString());
record.setLogId(logEnt.getId());
record.setCreateById(session.getId());
record.setCreateByName(session.getUserName());
record.setCreateTime(currentDate);
detailMapper.insert(record);
XThreadHelper.async(() -> {
for (int i = 0; i < successEntList.size(); i++) {
Date currentDate = new Date();
SysUserImportLogDetailEnt record = successEntList.get(i);
record.setId(UUID.randomUUID().toString());
record.setLogId(logEnt.getId());
record.setCreateById(session.getId());
record.setCreateByName(session.getUserName());
record.setCreateTime(currentDate);
detailMapper.insert(record);
//插入用户
SysUserEnt sysUserEnt = XCopyUtils.copyNewObject(record, SysUserEnt.class);
if (record.getIsInner().equals("是"))
sysUserEnt.setIsInner(1);
else
sysUserEnt.setIsInner(2);
if (record.getIsOuter().equals("是"))
sysUserEnt.setIsOuter(1);
else
sysUserEnt.setIsOuter(2);
sysUserEnt.setEndDate(XDateUtils.tryParse("2099-12-31"));
sysUserEnt.setIsSuperAdmin(0);
if (XStringUtils.isNotEmpty(sysUserEnt.getPassword()))
sysUserEnt.setPassword(MD5Util.encryptPassword(sysUserEnt.getPassword()));
else
sysUserEnt.setPassword("2e7832f9c3a0ca243c559017c07cceed");
sysUserEnt.setDuty(getDictKey(sysUserEnt.getDuty(), dictList));
userMapper.insert(sysUserEnt);
//插入用户组织机构关系
SysUserOrganizationRelEnt sysUserOrganizationRelEnt = new SysUserOrganizationRelEnt();
sysUserOrganizationRelEnt.setId(UUID.randomUUID().toString());
sysUserOrganizationRelEnt.setOuId(record.getOuId());
sysUserOrganizationRelEnt.setUserId(sysUserEnt.getId());
sysUserOrganizationRelEnt.setCreateById(session.getId());
sysUserOrganizationRelEnt.setCreateByName(session.getUserName());
sysUserOrganizationRelEnt.setCreateTime(currentDate);
sysUserOrganizationRelEnt.setEffectTime(new Date());
sysUserOrganizationRelEnt.setEndTime(XDateUtils.tryParse("2099-12-31"));
userOrganizationRelMapper.insert(sysUserOrganizationRelEnt);
//插入用户角色关系
QueryWrapper<SysUserRoleRelEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SysUserRoleRelEnt::getUserId, record.getUserIdAct());
List<SysUserRoleRelEnt> userRoleRelEnts = userRoleRelMapper.selectList(queryWrapper);
if (!CollectionUtils.isEmpty(userRoleRelEnts)) {
userRoleRelEnts.stream().forEach(item -> {
item.setId(UUID.randomUUID().toString());
item.setUserId(sysUserEnt.getId());
userRoleRelMapper.insert(item);
});
}
}
for (int i = 0; i < errorEntList.size(); i++) {
Date currentDate = new Date();
SysUserImportLogDetailEnt record = errorEntList.get(i);
record.setId(UUID.randomUUID().toString());
record.setLogId(logEnt.getId());
record.setCreateById(session.getId());
record.setCreateByName(session.getUserName());
record.setCreateTime(currentDate);
detailMapper.insert(record);
}
});
return XServiceResult.OK;
} catch (Exception ex) {
......@@ -260,25 +253,20 @@ public class SysUserImportLogService {
Sheet sheet = wb.getSheetAt(0);
Iterator<Row> rows = sheet.rowIterator();
this.checkError(rows == null || !rows.hasNext(), "未导入任何数据");
DataFormatter formatter = new DataFormatter();
List<String> tempRowTitle = createTitles();
Row titleRowFromExcel = rows.next();
String titleErrorMessage = "";
isNeedNotEmptyMap.clear();
for (int i = 0; i < tempRowTitle.size(); i++) {
String titleFormExcel = formatter.formatCellValue(titleRowFromExcel.getCell(i)).trim();
isNeedNotEmptyMap.put(i, titleFormExcel.startsWith("*"));
titleFormExcel = titleFormExcel.replace("*", "");
if (!tempRowTitle.get(i).equals(titleFormExcel)) {
titleErrorMessage = titleErrorMessage.concat("第" + (i + 1) + "列表头不正确应为“" + tempRowTitle.get(i) + "”,");
}
}
this.checkError(StringUtils.isNotBlank(titleErrorMessage), titleErrorMessage + "请根据模板修改；");
SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
SysUserMapper userMapper = context.getBean(SysUserMapper.class);
QueryWrapper<SysUserEnt> userEntQueryWrapper = new QueryWrapper<>();
......@@ -326,7 +314,6 @@ public class SysUserImportLogService {
errorMessageBuilder.append("组织机构未匹配；");
}
} catch (Exception ex) {
}
break;
case 1: //登录账户
......@@ -343,7 +330,6 @@ public class SysUserImportLogService {
errorMessageBuilder.append("登录账号匹配多个；");
}
} catch (Exception ex) {
}
break;
case 2: //IAM登录账户
......@@ -360,7 +346,6 @@ public class SysUserImportLogService {
errorMessageBuilder.append("IAM登录账号匹配多个；");
}
} catch (Exception ex) {
}
break;
case 3: //员工编码
......@@ -372,7 +357,6 @@ public class SysUserImportLogService {
resultItem.setUserCode(cellText);
}
} catch (Exception ex) {
}
break;
case 4: //用户姓名
......@@ -384,7 +368,6 @@ public class SysUserImportLogService {
resultItem.setUserName(cellText);
}
} catch (Exception ex) {
}
break;
case 5: //登录密码
......@@ -396,7 +379,6 @@ public class SysUserImportLogService {
resultItem.setPassword(cellText);
}
} catch (Exception ex) {
}
break;
case 6: //内网访问
......@@ -408,7 +390,6 @@ public class SysUserImportLogService {
resultItem.setIsInner(cellText);
}
} catch (Exception ex) {
}
break;
case 7: //外网访问
......@@ -537,12 +518,10 @@ public class SysUserImportLogService {
private String checkEmptyData(Row row, List<String> tempRowTitle) {
String result = "";
DataFormatter formatter = new DataFormatter();
for (int i = 0; i < isNeedNotEmptyMap.size(); i++) {
Cell cell = row.getCell(i);
Boolean isNeedNotEmpty = isNeedNotEmptyMap.get(i);
Boolean isEmptyValue = StringUtils.isBlank(formatter.formatCellValue(cell));
if (isNeedNotEmpty && isEmptyValue) {
result = result.concat(String.format("“%s”", tempRowTitle.get(i).replace("*", "")));
}
......@@ -621,4 +600,4 @@ public class SysUserImportLogService {
}
return XServiceResult.OK;
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysUserOrganizationRelService.java
View file @ 9cfd20c4
......@@ -130,5 +130,4 @@ public class SysUserOrganizationRelService {
List<QuerySysUserOrganizationRelViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySysUserOrganizationRelViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysUserRoleRelService.java
View file @ 9cfd20c4
......@@ -37,11 +37,9 @@ import java.util.stream.Collectors;
@XService
public class SysUserRoleRelService {
@XText("用户绑定多角色关系")
@XApiPost
public XServiceResult createSysUserRoleRel(XContext context, CreateSysUserRoleRelInput input) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
//删除原关系
SysUserRoleRelMapper mapper = context.getBean(SysUserRoleRelMapper.class);
......@@ -71,18 +69,15 @@ public class SysUserRoleRelService {
if (!CollectionUtils.isEmpty(viewList)) {
viewMapper.batchInsert(viewList);
}
//返回执行成功的结果，事务提交
return XServiceResult.OK;
});
}
@XText("角色绑定多用户")
@XApiPost
public XServiceResult createSysUsersRoleRel(XContext context, CreateSysUserRoleRelInput input) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
//查询原关系
SysUserRoleRelMapper mapper = context.getBean(SysUserRoleRelMapper.class);
......@@ -91,7 +86,6 @@ public class SysUserRoleRelService {
List<String> userIds = input.getUserIdList().stream().map(SysUserRoleRelEnt::getId).collect(Collectors.toList());
queryWrapper.lambda().in(SysUserRoleRelEnt::getUserId, userIds);
List<SysUserRoleRelEnt> sysUserRoleRelEnts = mapper.selectList(queryWrapper);
//创建新关系
SysUserRoleRelViewMapper viewMapper = context.getBean(SysUserRoleRelViewMapper.class);
List<SysUserRoleRelEnt> userIdList = input.getUserIdList();
......@@ -115,13 +109,10 @@ public class SysUserRoleRelService {
break;
}
}
}
if (!CollectionUtils.isEmpty(viewList)) {
viewMapper.batchInsert(viewList);
}
if (!CollectionUtils.isEmpty(entList)) {
List<String> collect = entList.stream().map(SysUserRoleRelEnt::getId).collect(Collectors.toList());
mapper.deleteBatchIds(collect);
......@@ -131,7 +122,6 @@ public class SysUserRoleRelService {
});
}
@XText("查询用户角色")
@XApiGet
public XListResult<QuerySysUserRoleRelViewOutput> querySysUserRoleRelView(XContext context, QuerySysUserRoleRelViewInput input) {
......@@ -143,7 +133,6 @@ public class SysUserRoleRelService {
return XListResult.success(outputs);
}
@XText("根据角色查人员列表")
@XApiPost
public XPageResult<QuerySysUserRoleRelViewOutput> querySysUserRoleByRoleIdView(XContext context, QuerySysUserRoleRelOutput input) {
......@@ -153,7 +142,7 @@ public class SysUserRoleRelService {
PageHelper.startPage(input.getPage(), input.getLimit());
PpsUserSession session = context.getSession(PpsUserSession.class);
Integer isSuperAdmin = session.getIsSuperAdmin();
List<SysUserRoleRelView> list = new ArrayList<>();
List<SysUserRoleRelView> list;
record.setEndTime(new Date());
if (XStringUtils.isNotEmpty(input.getOuId())) {
List<String> ouIds = new ArrayList<>();
......@@ -164,7 +153,6 @@ public class SysUserRoleRelService {
List<QuerySysUserRoleRelViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySysUserRoleRelViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
if (UserConstant.ISSUPERADMIN_FALSE.equals(isSuperAdmin)) {
//查询当前用户所属组织机构的子级
SysOrganizationViewMapper sysOrganizationViewMapper = context.getBean(SysOrganizationViewMapper.class);
......@@ -183,22 +171,17 @@ public class SysUserRoleRelService {
record.setOuIds(ouIds);
list = mapper.selectListByRoleIdAndOuIds(record);
} else {
list = mapper.selectListByRoleId(record);
}
PageInfo<SysUserRoleRelView> pageInfo = new PageInfo<>(list);
List<QuerySysUserRoleRelViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySysUserRoleRelViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
@XText("删除角色中的用户")
@XApiPost
public XServiceResult deleteSysUserRoleRel(XContext context, DeleteSysUserRoleRelOutput input) throws XServiceException {
return XTransactionHelper.begin(context, () -> {
SysUserRoleRelMapper mapper = context.getBean(SysUserRoleRelMapper.class);
QueryWrapper<SysUserRoleRelEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().in(SysUserRoleRelEnt::getId, input.getIds());
......@@ -222,4 +205,4 @@ public class SysUserRoleRelService {
List<QuerySysUserRoleRelViewOutput> outputs = XCopyUtils.copyNewList(list, QuerySysUserRoleRelViewOutput.class);
return XListResult.success(outputs);
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysUserService.java
View file @ 9cfd20c4
......@@ -417,7 +417,7 @@ public class SysUserService {
sysOrganizationView.setEndTime(new Date());
sysOrganizationView.setIsDeleted(SysOrganizationCode.NORMAL);
PpsUserSession session = context.getSession(PpsUserSession.class);
List<SysOrganizationView> viewList = new ArrayList<>();
List<SysOrganizationView> viewList;
if (input.getShowAll() == null || !input.getShowAll()) {
sysOrganizationView.setId(session.getOuId());
viewList = organizationViewMapper.selectOuByOuId(sysOrganizationView);
......@@ -449,7 +449,7 @@ public class SysUserService {
context.getLogger().error("参数解密失败", e);
return XListResult.error(context, LoginError.Trade_ParamRSAError);
}
TradeUserInfo tradeUserInfo = null;
TradeUserInfo tradeUserInfo;
try {
tradeUserInfo = XJsonUtils.toObject(userInfo, TradeUserInfo.class);
if (!(tradeUserInfo != null && StringUtils.isNotBlank(tradeUserInfo.getUserName()))) {
......@@ -483,7 +483,7 @@ public class SysUserService {
context.getLogger().error("参数解密失败", e);
return XSingleResult.error(context, LoginError.Trade_ParamRSAError);
}
TradeUserInfo tradeUserInfo = null;
TradeUserInfo tradeUserInfo;
try {
tradeUserInfo = XJsonUtils.toObject(userInfo, TradeUserInfo.class);
if (!(tradeUserInfo != null && StringUtils.isNotBlank(tradeUserInfo.getUserName()))) {
......@@ -519,8 +519,7 @@ public class SysUserService {
@XApiPost
public XListResult<GetSysUserOutput> querySysUserListByOuIds(XContext context, GetSysUserListByOuInput input) {
SysUserViewMapper mapper = context.getBean(SysUserViewMapper.class);
SysUserView record = new SysUserView();
List<SysUserView> list = new ArrayList<>();
List<SysUserView> list;
if (input.getOuIds().size() > 0) {
list = mapper.getSysUserListByOuIds(input);
list.forEach(user -> {
......
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysUserWithUserGroupRelService.java
View file @ 9cfd20c4
......@@ -96,7 +96,6 @@ public class SysUserWithUserGroupRelService {
List<String> collect = sysUserGroupEnts.stream().map(SysUserWithUserGroupRelEnt::getId).collect(Collectors.toList());
delMapper.deleteBatchIds(collect);
}
SysUserWithUserGroupRelMapper mapper = context.getBean(SysUserWithUserGroupRelMapper.class);
List<SysUserWithUserGroupRelEnt> list = new ArrayList<>();
for (String userGroupId : input.getUserGroupIdList()) {
......@@ -122,7 +121,6 @@ public class SysUserWithUserGroupRelService {
List<String> collect = sysUserGroupEnts.stream().map(SysUserWithUserGroupRelEnt::getId).collect(Collectors.toList());
delMapper.deleteBatchIds(collect);
}
SysUserWithUserGroupRelMapper mapper = context.getBean(SysUserWithUserGroupRelMapper.class);
List<SysUserWithUserGroupRelEnt> list = new ArrayList<>();
for (String userId : input.getUserIdList()) {
......@@ -166,5 +164,4 @@ public class SysUserWithUserGroupRelService {
List<QuerySysUserGroupWithUserRelViewOutput> outputs = XCopyUtils.copyNewList(list, QuerySysUserGroupWithUserRelViewOutput.class);
return XListResult.success(outputs);
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SystemAreaServiceImpl.java
View file @ 9cfd20c4
......@@ -25,7 +25,6 @@ import java.util.Objects;
@XService
public class SystemAreaServiceImpl implements SystemAreaService {
@XApiPost
@Override
public XListResult<GetSysAreaOutput> getSysAreaList(XContext context, GetSysAreaInput input) {
......@@ -44,8 +43,6 @@ public class SystemAreaServiceImpl implements SystemAreaService {
QueryWrapper<SysAreaEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SysAreaEnt::getId, sysAreaId);
SysAreaEnt sysAreaEnt = mapper.selectOne(queryWrapper);
if (ObjectUtils.isNotEmpty(sysAreaEnt)) {
if (sysAreaEnt.getLev() == 0) {
model.setArea(String.valueOf(sysAreaEnt.getId()));
......@@ -106,4 +103,4 @@ public class SystemAreaServiceImpl implements SystemAreaService {
SysAreaView sysAreaView = mapper.selectSysAreaPath(input.getId());
return XSingleResult.success(XCopyUtils.copyNewObject(sysAreaView, GetSysAreaOutput.class));
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SystemOrganizationDictionaryServiceImpl.java
View file @ 9cfd20c4
......@@ -48,4 +48,4 @@ public class SystemOrganizationDictionaryServiceImpl implements SystemOrganizati
List<QuerySysOrganizationDictionaryOutput> out = XCopyUtils.copyNewList(list, QuerySysOrganizationDictionaryOutput.class);
return XListResult.success(out);
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SystemScadaIhdServiceImpl.java
View file @ 9cfd20c4
......@@ -34,7 +34,6 @@ public class SystemScadaIhdServiceImpl implements SystemScadaIhdService {
scadaEnvironmentInfoMapperQueryWrapper.eq("is_enable", true);
List<ScadaEnvironmentInfo> ts = mapper.selectList(scadaEnvironmentInfoMapperQueryWrapper);
List<ScadaEnvironmentInfoOutput> outputList = XCopyUtils.copyNewList(ts, ScadaEnvironmentInfoOutput.class);
return XListResult.success(outputList);
}
......@@ -44,19 +43,14 @@ public class SystemScadaIhdServiceImpl implements SystemScadaIhdService {
ScadaGatherConfViewMapper viewMapper = context.getBean(ScadaGatherConfViewMapper.class);
int currentPage = input.getCurrentPage();
int pageSize = input.getPageSize();
int totalRecord = viewMapper.selectTotal(input.getScadaEnvId(), input.getStartDate());
int totalPageNum = (totalRecord + pageSize - 1) / pageSize;
int start = (currentPage - 1) * pageSize;
List<ScadaGatherConfView> scadaGatherConfViews = viewMapper.selectByPage(start, pageSize, input.getScadaEnvId(), beforeMinute);
List<ScadaGatherConfViewOutput> outputList = XCopyUtils.copyNewList(scadaGatherConfViews, ScadaGatherConfViewOutput.class);
ScadaGatherConfViewResultOutput scadaGatherConfViewResultOutput = new ScadaGatherConfViewResultOutput();
scadaGatherConfViewResultOutput.setOutputList(outputList);
scadaGatherConfViewResultOutput.setTotalPageNum(totalPageNum);
return XSingleResult.success(scadaGatherConfViewResultOutput);
}
......@@ -89,9 +83,7 @@ public class SystemScadaIhdServiceImpl implements SystemScadaIhdService {
@Override
public XServiceResult insertDefaultTable(XContext context, DefaultTableInput input) {
ScadaGatherConfViewMapper bean = context.getBean(ScadaGatherConfViewMapper.class);
// ScadaGatherConfViewMapper
bean.insertDefaultData(input.getSql());
return XServiceResult.OK;
}
......@@ -108,7 +100,6 @@ public class SystemScadaIhdServiceImpl implements SystemScadaIhdService {
HashMap<String, Object> stringStringHashMap = bean.selectBusinessModuleTable(input.getSql());
DefaultTableOutput defaultTableOutput = new DefaultTableOutput();
defaultTableOutput.setResultData(stringStringHashMap);
return XSingleResult.success(defaultTableOutput);
}
......@@ -124,10 +115,7 @@ public class SystemScadaIhdServiceImpl implements SystemScadaIhdService {
public XListResult<ScadaGatherDataOutput> getScadaRemedyDataTagList(XContext context, ScadaEnvironmentInfoOutput scadaEnv) {
ScadaGatherDataMapper bean = context.getBean(ScadaGatherDataMapper.class);
List<ScadaGatherData> dataList = bean.selectRemedyList(scadaEnv.getId());
List<ScadaGatherDataOutput> scadaGatherDataOutputs = XCopyUtils.copyNewList(dataList, ScadaGatherDataOutput.class);
return XListResult.success(scadaGatherDataOutputs);
}
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/testService.java deleted 100644 → 0
View file @ 85ac7238
package pps.core.system.service;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
@XText("测试飞书短信")
@XService
public class testService {
// @XText("测试飞书短信")
// @XApiPost
// public XListResult<QuerySysUserWithUserGroupRelViewOutput> test(XContext context){
//
// List<QuerySysUserWithUserGroupRelViewOutput> outputs = new ArrayList<>();
// SaleBackService service = context.getBean(SaleBackService.class);
// XServiceResult xServiceResult = service.saleBackFiyBook(context);
//
// return XListResult.success(outputs);
// }
}
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