Skip to content

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

都删了

parent 549bd709
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 643 deletions
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/SysOrganizationCloudService.java
View file @ c45ab822
package pps.cloud.system.service;
import pps.cloud.system.service.data.sys_organization.*;
import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewInput;
import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.data.XListResult;
import xstartup.data.XSingleResult;
@XText("组织机构服务")
......@@ -16,11 +16,5 @@ public interface SysOrganizationCloudService {
@XText("根据用户id获取组织机构")
XSingleResult<GetSysOrganizationViewOutput> getOuByUserId(XContext context, GetSysOrganizationViewInput input);
@XText("根据组织机构ids获取组织机构")
XListResult<GetOuListTreeOutput> getOuListByOuIds(XContext context, GetOuListByOuIdsInput input);
@XText("根据组织机构id获取所有的子级组织机构列表")
XListResult<GetSysOrganizationViewOutput> getAllListByOuId(XContext context, GetAllOuListByOuIdInput input);
}
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/SystemAreaService.java deleted 100644 → 0
View file @ 549bd709
package pps.cloud.system.service;
import pps.cloud.system.service.data.sys_area.GetSysAreaInput;
import pps.cloud.system.service.data.sys_area.GetSysAreaOutput;
import pps.cloud.system.service.data.sys_area.QuerySysAreaInput;
import pps.cloud.system.service.data.sys_area.QuerySysAreaOutput;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.data.XListResult;
import xstartup.data.XSingleResult;
@XText("地区服务")
@XService
public interface SystemAreaService {
@XText("根据id获取地区")
XListResult<GetSysAreaOutput> getSysAreaList(XContext context, GetSysAreaInput input);
/**
* 地区Cloud服务-条件查询地区
*
* @param context 上下文
* @param input 输入
* @return {@link XSingleResult}<{@link GetSysAreaOutput}>
*/
@XText("地区Cloud服务-条件查询地区")
XSingleResult<GetSysAreaOutput> getSysAreaByParam(XContext context, GetSysAreaInput input);
/**
* 地区Cloud服务-查询地区路径
*
* @param context 上下文
* @param input 输入
* @return {@link XSingleResult}<{@link GetSysAreaOutput}>
*/
@XText("地区Cloud服务-查询地区路径")
XSingleResult<GetSysAreaOutput> getSysAreaPath(XContext context, GetSysAreaInput input);
/**
* 获取省和市
*
* @param context 上下文
* @param input 输入
* @return {@link XListResult}<{@link QuerySysAreaOutput}>
*/
@XText("地区Cloud服务-查询地区路径")
XListResult<QuerySysAreaOutput> getProvinceAndCity(XContext context, QuerySysAreaInput input);
}
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/SystemDictionaryService.java
View file @ c45ab822
package pps.cloud.system.service;
import pps.cloud.system.service.data.sys_dictionary.*;
import pps.cloud.system.service.data.sys_dictionary.CreateSysDictionaryInput;
import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
......@@ -12,17 +13,4 @@ public interface SystemDictionaryService {
@XText("根据alias获取字典")
XListResult<QuerySysDictionaryViewOutput> querySysDictionarysByAlias(XContext context, CreateSysDictionaryInput input);
@XText("根据父级alias获取子级字典列表")
XListResult<QuerySysDictionaryViewOutput> queryChildSysDictionarysByParentAlias(XContext context, QuerySysDictionaryViewInput input);
/**
* 条件查询字典列表
*
* @param context 上下文
* @param input 输入
* @return {@link XListResult}<{@link GetSysDictionaryViewOutput}>
*/
@XText("条件查询字典列表")
XListResult<GetSysDictionaryViewOutput> querySysDictionaryByParam(XContext context, GetSysDictionaryViewInput input);
}
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_area/GetSysAreaInput.java deleted 100644 → 0
View file @ 549bd709
package pps.cloud.system.service.data.sys_area;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 地区入参
*
* @author ZWT
* @date 2023/10/10
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class GetSysAreaInput {
private Integer id;
private String name;
private Integer parentId;
private Integer lev;
}
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_area/GetSysAreaOutput.java deleted 100644 → 0
View file @ 549bd709
package pps.cloud.system.service.data.sys_area;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 获取系统区域输出
*
* @author ZWT
* @date 2024/05/09
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class GetSysAreaOutput {
private Integer id;
private String name;
private Integer parentId;
private Integer lev;
}
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_area/QuerySysAreaInput.java deleted 100644 → 0
View file @ 549bd709
package pps.cloud.system.service.data.sys_area;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* 查询系统区域输出
*
* @author ZWT
* @date 2024/05/09
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class QuerySysAreaInput {
/**
* 省份列表
*/
private List<String> provinceList;
}
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_area/QuerySysAreaOutput.java deleted 100644 → 0
View file @ 549bd709
package pps.cloud.system.service.data.sys_area;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 查询系统区域输出
*
* @author ZWT
* @date 2024/05/09
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class QuerySysAreaOutput {
/**
* 省份
*/
private String province;
/**
* 城市
*/
private String city;
/**
* 城市代码
*/
private String cityCode;
/**
* ID
*/
private Integer id;
}
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_dictionary/GetSysDictionaryViewInput.java deleted 100644 → 0
View file @ 549bd709
package pps.cloud.system.service.data.sys_dictionary;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import xstartup.annotation.XText;
/**
* 获取sys字典视图输入
*
* @author ZWT
* @date 2024/05/09
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class GetSysDictionaryViewInput {
@XText("父级ID")
private String pid;
@XText("父级编码")
private String alias;
}
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_dictionary/GetSysDictionaryViewOutput.java deleted 100644 → 0
View file @ 549bd709
package pps.cloud.system.service.data.sys_dictionary;
import lombok.Data;
import xstartup.annotation.XText;
@Data
public class GetSysDictionaryViewOutput {
@XText("父级ID")
private String pid;
@XText("名称")
private String dicName;
@XText("缩写")
private String shortName;
@XText("备注")
private String remark;
@XText("排序")
private Integer sort;
@XText("层级")
private Integer levels;
@XText("是否默认值")
private Integer beDefault;
@XText("是否含有下级")
private Integer beHasChildren;
@XText("0为系统字典，1应用字典")
private Integer dicType;
@XText("字典编码")
private String dicKey;
}
C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_dictionary/QuerySysDictionaryViewInput.java deleted 100644 → 0
View file @ 549bd709
package pps.cloud.system.service.data.sys_dictionary;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.util.Date;
public class QuerySysDictionaryViewInput extends XPageInput {
@XText("主键")
private String id;
@XText("父级ID")
private String pid;
@XText("字典编码、全局唯一")
private String code;
@XText("名称")
private String dicName;
@XText("缩写")
private String shortName;
@XText("备注")
private String remark;
@XText("排序")
private Integer sort;
@XText("层级")
private Integer levels;
@XText("是否默认值")
private Integer beDefault;
@XText("是否含有下级")
private Integer beHasChildren;
@XText("0为系统字典，1应用字典")
private Integer dicType;
@XText("生效时间")
private Date effectTime;
@XText("失效时间")
private Date endTime;
@XText("创建人名称")
private String createName;
@XText("创建时间")
private Date createTime;
@XText("修改人名称")
private String modifyName;
@XText("修改时间")
private Date modifyTime;
@XText("父级编码")
private String alias;
@XText("字典编码")
private String dicKey;
@XText("字典路径")
private String dicPath;
public String getPid() {
return pid;
}
public void setPid(String pid) {
this.pid = pid;
}
public String getAlias() {
return alias;
}
public void setAlias(String alias) {
this.alias = alias;
}
public String getDicPath() {
return dicPath;
}
public void setDicPath(String dicPath) {
this.dicPath = dicPath;
}
public String getDicKey() {
return dicKey;
}
public void setDicKey(String dicKey) {
this.dicKey = dicKey;
}
public String getId() {
return this.id;
}
public void setId(String value) {
this.id = value;
}
public String getCode() {
return this.code;
}
public void setCode(String value) {
this.code = value;
}
public String getDicName() {
return this.dicName;
}
public void setDicName(String value) {
this.dicName = value;
}
public String getShortName() {
return this.shortName;
}
public void setShortName(String value) {
this.shortName = value;
}
public String getRemark() {
return this.remark;
}
public void setRemark(String value) {
this.remark = value;
}
public Integer getSort() {
return this.sort;
}
public void setSort(Integer value) {
this.sort = value;
}
public Integer getLevels() {
return this.levels;
}
public void setLevels(Integer value) {
this.levels = value;
}
public Integer getBeDefault() {
return this.beDefault;
}
public void setBeDefault(Integer value) {
this.beDefault = value;
}
public Integer getBeHasChildren() {
return this.beHasChildren;
}
public void setBeHasChildren(Integer value) {
this.beHasChildren = value;
}
public Integer getDicType() {
return this.dicType;
}
public void setDicType(Integer value) {
this.dicType = value;
}
public Date getEffectTime() {
return this.effectTime;
}
public void setEffectTime(Date value) {
this.effectTime = value;
}
public Date getEndTime() {
return this.endTime;
}
public void setEndTime(Date value) {
this.endTime = value;
}
public String getCreateName() {
return this.createName;
}
public void setCreateName(String value) {
this.createName = value;
}
public Date getCreateTime() {
return this.createTime;
}
public void setCreateTime(Date value) {
this.createTime = value;
}
public String getModifyName() {
return this.modifyName;
}
public void setModifyName(String value) {
this.modifyName = value;
}
public Date getModifyTime() {
return this.modifyTime;
}
public void setModifyTime(Date value) {
this.modifyTime = value;
}
}
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysDictionaryServiceImpl.java
View file @ c45ab822
......@@ -4,15 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.SystemDictionaryService;
import pps.cloud.system.service.data.sys_dictionary.*;
import pps.core.common.pattern.Builder;
import pps.cloud.system.service.data.sys_dictionary.CreateSysDictionaryInput;
import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
import pps.core.system.cache.SysDictionaryCache;
import pps.core.system.entity.SysDictionaryEnt;
import pps.core.system.entity.SysDictionaryView;
import pps.core.system.entity.SysOrganizationDictionaryEnt;
import pps.core.system.entity.SysOrganizationRelEnt;
import pps.core.system.mapper.SysDictionaryMapper;
import pps.core.system.mapper.SysDictionaryViewMapper;
import pps.core.system.mapper.SysOrganizationDictionaryMapper;
import pps.core.system.mapper.SysOrganizationRelMapper;
import xstartup.annotation.XService;
......@@ -20,7 +18,9 @@ import xstartup.base.XContext;
import xstartup.base.util.XCopyUtils;
import xstartup.data.XListResult;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@XService
......@@ -65,9 +65,9 @@ public class SysDictionaryServiceImpl implements SystemDictionaryService {
String ouId = sysOrganizationRelEnt.getOuId();
if (StringUtils.isNotBlank(ouIdPath)) {
List<String> dicIds = sysOrganizationDictionaryEnts.stream().map(p -> {
if (ouIdPath.indexOf(p.getOuId()) != -1 && p.getUseLowerLevel() == 1) {
if (ouIdPath.contains(p.getOuId()) && p.getUseLowerLevel() == 1) {
return p.getDicCode();
} else if (ouId.indexOf(p.getOuId()) != -1) {
} else if (ouId.contains(p.getOuId())) {
return p.getDicCode();
} else {
return "1";
......@@ -86,14 +86,11 @@ public class SysDictionaryServiceImpl implements SystemDictionaryService {
list.add(cache);
}
}
Collections.sort(sysDictionaryList, new Comparator<SysDictionaryEnt>() {
@Override
public int compare(SysDictionaryEnt o1, SysDictionaryEnt o2) {
if (ObjectUtils.isNotEmpty(o1.getSort()) && ObjectUtils.isNotEmpty(o2.getSort())) {
return o1.getSort() - o2.getSort();
} else {
return 0;
}
sysDictionaryList.sort((o1, o2) -> {
if (ObjectUtils.isNotEmpty(o1.getSort()) && ObjectUtils.isNotEmpty(o2.getSort())) {
return o1.getSort() - o2.getSort();
} else {
return 0;
}
});
List<QuerySysDictionaryViewOutput> outputs = XCopyUtils.copyNewList(sysDictionaryList, QuerySysDictionaryViewOutput.class);
......@@ -116,9 +113,9 @@ public class SysDictionaryServiceImpl implements SystemDictionaryService {
String ouId = sysOrganizationRelEnt.getOuId();
if (StringUtils.isNotBlank(ouIdPath)) {
List<String> dicIds = sysOrganizationDictionaryEnts.stream().map(p -> {
if (ouIdPath.indexOf(p.getOuId()) != -1 && p.getUseLowerLevel() == 1) {
if (ouIdPath.contains(p.getOuId()) && p.getUseLowerLevel() == 1) {
return p.getDicCode();
} else if (ouId.indexOf(p.getOuId()) != -1) {
} else if (ouId.contains(p.getOuId())) {
return p.getDicCode();
} else {
return "1";
......@@ -127,7 +124,7 @@ public class SysDictionaryServiceImpl implements SystemDictionaryService {
list = list.stream().filter(i -> dicIds.contains(i.getId())).collect(Collectors.toList());
}
}
Collections.sort(list, (o1, o2) -> {
list.sort((o1, o2) -> {
if (ObjectUtils.isNotEmpty(o1.getSort()) && ObjectUtils.isNotEmpty(o2.getSort())) {
return o1.getSort() - o2.getSort();
} else {
......@@ -137,32 +134,4 @@ public class SysDictionaryServiceImpl implements SystemDictionaryService {
List<QuerySysDictionaryViewOutput> outputs = XCopyUtils.copyNewList(list, QuerySysDictionaryViewOutput.class);
return XListResult.success(outputs);
}
@Override
public XListResult<QuerySysDictionaryViewOutput> queryChildSysDictionarysByParentAlias(XContext context, QuerySysDictionaryViewInput input) {
List<QuerySysDictionaryViewOutput> resultList = new ArrayList<>();
SysDictionaryMapper sysDictionaryMapper = context.getBean(SysDictionaryMapper.class);
List<SysDictionaryEnt> list = sysDictionaryMapper.selectList(Builder.create(QueryWrapper.class).build(queryWrapper -> {
queryWrapper.eq("alias", input.getAlias());
}));
if (list.isEmpty()) {
return XListResult.success(resultList);
}
SysDictionaryEnt parentDictionaryEnt = list.get(0);
list = sysDictionaryMapper.selectList(Builder.create(QueryWrapper.class).build(queryWrapper -> {
queryWrapper.eq("pid", parentDictionaryEnt.getId());
}));
resultList = XCopyUtils.copyNewList(list, QuerySysDictionaryViewOutput.class);
return XListResult.success(resultList);
}
@Override
public XListResult<GetSysDictionaryViewOutput> querySysDictionaryByParam(XContext context, GetSysDictionaryViewInput input) {
SysDictionaryViewMapper mapper = context.getBean(SysDictionaryViewMapper.class);
List<SysDictionaryView> list = mapper.selectListByParam(SysDictionaryView.builder()
.pid(input.getPid())
.alias(input.getAlias())
.build());
return XListResult.success(XCopyUtils.copyNewList(list, GetSysDictionaryViewOutput.class));
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SysOrganizationCloudServiceImpl.java
View file @ c45ab822
......@@ -93,34 +93,4 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
}
return XListResult.success(outputs);
}
@XText("根据组织机构id获取所有的子级组织机构")
public XListResult<GetOuListTreeOutput> getOuListByOuIds(XContext context, GetOuListByOuIdsInput input) {
if (CollectionUtils.isEmpty(input.getOuIdList())) return XListResult.success(new ArrayList<>());
List<GetOuListTreeOutput> outputs = new ArrayList<>();
SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
List<SysOrganizationView> list = mapper.selectListByOuIds(input.getOuIdList());
if (list.size() > 0) {
for (SysOrganizationView item : list) {
GetOuListTreeOutput out = new GetOuListTreeOutput();
out.setOuId(item.getId());
out.setOuName(item.getOuName());
out.setShortName(item.getShortName());
out.setParentOuId(item.getParentOuId());
outputs.add(out);
}
}
return XListResult.success(outputs);
}
@Override
public XListResult<GetSysOrganizationViewOutput> getAllListByOuId(XContext context, GetAllOuListByOuIdInput input) {
SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
SysOrganizationView view = new SysOrganizationView();
view.setIsDeleted(1);
view.setId(input.getOuId());
List<SysOrganizationView> list = mapper.selectAllListByOuId(view);
List<GetSysOrganizationViewOutput> viewList = XCopyUtils.copyNewList(list, GetSysOrganizationViewOutput.class);
return XListResult.success(viewList);
}
}
\ No newline at end of file
C02-system/pps-core-system/src/main/java/pps/core/system/service/SystemAreaServiceImpl.java deleted 100644 → 0
View file @ 549bd709
package pps.core.system.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.data.sys_area.GetSysAreaInput;
import pps.cloud.system.service.data.sys_area.GetSysAreaOutput;
import pps.cloud.system.service.data.sys_area.QuerySysAreaInput;
import pps.cloud.system.service.data.sys_area.QuerySysAreaOutput;
import pps.core.system.entity.SysAreaEnt;
import pps.core.system.entity.SysAreaView;
import pps.core.system.mapper.SysAreaMapper;
import pps.core.system.mapper.SysAreaViewMapper;
import xstartup.annotation.XService;
import xstartup.base.XContext;
import xstartup.base.util.XCopyUtils;
import xstartup.data.XListResult;
import xstartup.data.XSingleResult;
import xstartup.feature.api.annotation.XApiPost;
import java.util.List;
import java.util.Objects;
@XService
public class SystemAreaServiceImpl implements SystemAreaService {
@XApiPost
@Override
public XListResult<GetSysAreaOutput> getSysAreaList(XContext context, GetSysAreaInput input) {
SysAreaViewMapper mapper = context.getBean(SysAreaViewMapper.class);
List<SysAreaView> sysAreaViews = mapper.selectListAll(new SysAreaView());
List<GetSysAreaOutput> getSysAreaOutputs = XCopyUtils.copyNewList(sysAreaViews, GetSysAreaOutput.class);
return XListResult.success(getSysAreaOutputs);
}
/**
* 地区Cloud服务-条件查询地区
*
* @param context 上下文
* @param input 输入
* @return {@link XSingleResult}<{@link GetSysAreaOutput}>
*/
@Override
public XSingleResult<GetSysAreaOutput> getSysAreaByParam(XContext context, GetSysAreaInput input) {
Integer id = input.getId();
String name = input.getName();
Integer parentId = input.getParentId();
SysAreaMapper mapper = context.getBean(SysAreaMapper.class);
SysAreaEnt sysAreaEnt = mapper.selectOne(new LambdaQueryWrapper<SysAreaEnt>()
.eq(Objects.nonNull(id), SysAreaEnt::getId, id)
.eq(Objects.nonNull(parentId), SysAreaEnt::getParentId, parentId)
.eq(StringUtils.isNotEmpty(name), SysAreaEnt::getName, name)
.last("LIMIT 1")
);
return XSingleResult.success(XCopyUtils.copyNewObject(sysAreaEnt, GetSysAreaOutput.class));
}
/**
* 地区Cloud服务-查询地区路径
*
* @param context 上下文
* @param input 输入
* @return {@link XSingleResult}<{@link GetSysAreaOutput}>
*/
@Override
public XSingleResult<GetSysAreaOutput> getSysAreaPath(XContext context, GetSysAreaInput input) {
SysAreaViewMapper mapper = context.getBean(SysAreaViewMapper.class);
SysAreaView sysAreaView = mapper.selectSysAreaPath(input.getId());
return XSingleResult.success(XCopyUtils.copyNewObject(sysAreaView, GetSysAreaOutput.class));
}
/**
* 获取省和市
*
* @param context 上下文
* @param input 输入
* @return {@link XListResult}<{@link QuerySysAreaOutput}>
*/
@Override
public XListResult<QuerySysAreaOutput> getProvinceAndCity(XContext context, QuerySysAreaInput input) {
SysAreaViewMapper mapper = context.getBean(SysAreaViewMapper.class);
List<SysAreaView> viewList = mapper.selectProvinceAndCity(input.getProvinceList());
return XListResult.success(XCopyUtils.copyNewList(viewList, QuerySysAreaOutput.class));
}
}
\ No newline at end of file
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