Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

微调

Browse Source
This commit is contained in:
hongawen
2024-09-18 16:32:10 +08:00
parent 78ba6903c6
commit c5b63acb27
9 changed files with 9 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DicParam.java
View File

@@ -1,52 +0,0 @@
//package com.njcn.system.pojo.param;
//
//import com.njcn.common.pojo.constant.PatternRegex;
//import com.njcn.web.constant.ValidMessage;
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//import lombok.EqualsAndHashCode;
//import org.hibernate.validator.constraints.Range;
//
//import javax.validation.constraints.NotBlank;
//import javax.validation.constraints.NotNull;
//import javax.validation.constraints.Pattern;
//
//@Data
//public class DicParam {
//
// @ApiModelProperty("节点")
// @NotBlank(message = ValidMessage.PID_NOT_BLANK)
// private String pid;
//
// @ApiModelProperty("名称")
// @NotBlank(message = ValidMessage.NAME_NOT_BLANK)
// @Pattern(regexp = PatternRegex.DIC_REGEX, message = ValidMessage.NAME_FORMAT_ERROR)
// private String name;
//
// @ApiModelProperty("编号")
// @NotBlank(message = ValidMessage.CODE_NOT_BLANK)
// private String code;
//
// @ApiModelProperty("排序")
// @NotNull(message = ValidMessage.SORT_NOT_NULL)
// @Range(min = 0, max = 999, message = ValidMessage.PARAM_FORMAT_ERROR)
// private Integer sort;
//
// @ApiModelProperty("描述")
// private String remark;
//
//
// /**
// * 更新操作实体
// * 需要填写的参数：id
// */
// @Data
// @EqualsAndHashCode(callSuper = true)
// public static class UpdateParam extends DicParam {
//
// @ApiModelProperty("Id")
// @NotBlank(message = ValidMessage.ID_NOT_BLANK)
// @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
// private String id;
// }
//}

30
pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Dic.java
View File

@@ -1,30 +0,0 @@
//package com.njcn.system.pojo.po;
//
//import com.baomidou.mybatisplus.annotation.TableName;
//import com.njcn.db.bo.BaseEntity;
//import lombok.Data;
//import lombok.EqualsAndHashCode;
//
//@Data
//@EqualsAndHashCode(callSuper = true)
//@TableName("sys_dic_tree")
//public class Dic extends BaseEntity {
//
// private static final long serialVersionUID = 1L;
//
// private String id;
//
// private String pid;
//
// private String pids;
//
// private String name;
//
// private String code;
//
// private Integer sort;
//
// private String remark;
//
// private Integer status;
//}

35
pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DicVO.java
View File

@@ -1,35 +0,0 @@
//package com.njcn.system.pojo.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.io.Serializable;
//import java.util.List;
//
//@Data
//public class DicVO implements Serializable {
//
// @ApiModelProperty("Id")
// private String id;
//
// @ApiModelProperty("父节点")
// private String pid;
//
// @ApiModelProperty("名称")
// private String name;
//
// @ApiModelProperty("编码")
// private String code;
//
// @ApiModelProperty("排序")
// private Integer sort;
//
// @ApiModelProperty("描述")
// private String remark;
//
// @ApiModelProperty("状态")
// private Integer status;
//
// @ApiModelProperty("子级")
// List<DicVO> children;
//}

137
pqs-system/system-boot/src/main/java/com/njcn/system/controller/DicController.java
View File

@@ -1,137 +0,0 @@
//package com.njcn.system.controller;
//
//
//import com.njcn.common.pojo.annotation.OperateInfo;
//import com.njcn.common.pojo.constant.OperateType;
//import com.njcn.common.pojo.enums.common.LogEnum;
//import com.njcn.common.pojo.enums.response.CommonResponseEnum;
//import com.njcn.common.pojo.response.HttpResult;
//import com.njcn.common.utils.HttpResultUtil;
//import com.njcn.common.utils.LogUtil;
//import com.njcn.system.pojo.param.DicParam;
//import com.njcn.system.pojo.po.Dic;
//import com.njcn.system.pojo.vo.DicVO;
//import com.njcn.system.service.IDicService;
//import com.njcn.user.pojo.param.FunctionParam;
//import com.njcn.user.pojo.po.Function;
//import com.njcn.web.controller.BaseController;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiImplicitParam;
//import io.swagger.annotations.ApiOperation;
//import lombok.AllArgsConstructor;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.validation.annotation.Validated;
//import org.springframework.web.bind.annotation.*;
//
//import java.util.List;
//
///**
// * @author hany
// * @date 2022/10/18
// */
//@Validated
//@Slf4j
//@RestController
//@RequestMapping("/dic")
//@Api(tags = "树型字典管理")
//@AllArgsConstructor
//public class DicController extends BaseController {
//
// private final IDicService dicService;
//
// /**
// * 获取树
// * @return
// */
// @OperateInfo(info = LogEnum.SYSTEM_COMMON)
// @GetMapping("/dicTree")
// @ApiOperation("获取字典树")
// public HttpResult<List<DicVO>> getDicTree(){
// String methodDescribe = getMethodDescribe("getDicTree");
// List<DicVO> list = dicService.getDicTree(null);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,list,methodDescribe);
// }
//
// @OperateInfo(info = LogEnum.SYSTEM_COMMON)
// @GetMapping("/codeDicTree")
// @ApiOperation("根据code获取字典树")
// public HttpResult<List<DicVO>> getCodeDicTree(String code){
// String methodDescribe = getMethodDescribe("getCodeDicTree");
// List<DicVO> list = dicService.getDicTree(code);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,list,methodDescribe);
// }
// /**
// * 新增
// * @param dicParam
// */
// @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
// @PostMapping("/add")
// @ApiOperation("新增")
// @ApiImplicitParam(name = "dicParam", value = "新增数据", required = true)
// public HttpResult<Boolean> add(@RequestBody @Validated DicParam dicParam) {
// String methodDescribe = getMethodDescribe("add");
// LogUtil.njcnDebug(log, "{}，数据为：{}", methodDescribe, dicParam);
// boolean result = dicService.addDic(dicParam);
// if (result) {
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
// } else {
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
// }
// }
//
// /**
// * 修改
// * @param dicParam
// * @return
// */
// @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
// @PutMapping("/update")
// @ApiOperation("修改")
// @ApiImplicitParam(name = "dicParam", value = "数据", required = true)
// public HttpResult<Boolean> update(@RequestBody @Validated DicParam.UpdateParam dicParam) {
// String methodDescribe = getMethodDescribe("update");
// LogUtil.njcnDebug(log, "{},更新的信息为：{}", methodDescribe,dicParam);
// boolean result = dicService.updateDic(dicParam);
// if (result){
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
// } else {
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
// }
// }
//
// /**
// * 删除
// * @param id
// * @return
// */
// @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
// @DeleteMapping("/delete")
// @ApiOperation("删除")
// @ApiImplicitParam(name = "id", value = "id", required = true)
// public HttpResult<Boolean> delete(@RequestParam @Validated String id) {
// String methodDescribe = getMethodDescribe("delete");
// LogUtil.njcnDebug(log, "{},删除的id为：{}", methodDescribe,id);
// boolean result = dicService.deleteDic(id);
// if (result){
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
// } else {
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
// }
// }
//
// /**
// * 查询
// * @param id
// * @return
// */
// @OperateInfo(info = LogEnum.SYSTEM_COMMON)
// @GetMapping("/getDicById")
// @ApiOperation("查看详情")
// @ApiImplicitParam(name = "id", value = "id", required = true)
// public HttpResult<Dic> getDicById(String id){
// String methodDescribe = getMethodDescribe("getDicById");
// LogUtil.njcnDebug(log, "{},id为：{}", methodDescribe,id);
// Dic dic = dicService.getDicById(id);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,dic,methodDescribe);
// }
//}

12
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DicMapper.java
View File

@@ -1,12 +0,0 @@
//package com.njcn.system.mapper;
//
//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//import com.njcn.system.pojo.po.Dic;
//import com.njcn.system.pojo.vo.DicVO;
//
//import java.util.List;
//
//public interface DicMapper extends BaseMapper<Dic> {
//
// List<DicVO> getAllDic();
//}

52
pqs-system/system-boot/src/main/java/com/njcn/system/service/IDicService.java
View File

@@ -1,52 +0,0 @@
//package com.njcn.system.service;
//
//
//import com.njcn.system.pojo.param.DicParam;
//import com.njcn.system.pojo.po.Dic;
//import com.njcn.system.pojo.vo.DicVO;
//import com.njcn.user.pojo.param.FunctionParam;
//import com.njcn.user.pojo.po.Function;
//
//import java.util.List;
//
///**
// * @author hany
// * @date 2022/10/18
// */
//public interface IDicService {
//
// /**
// * 获取树
// * @return
// */
// List<DicVO> getDicTree(String code);
//
// /**
// * 功能描述:新增
// *
// * @param dicParam 资源参数
// */
// boolean addDic(DicParam dicParam);
//
// /**
// * 功能描述: 修改
// *
// * @param dicParam
// */
// boolean updateDic(DicParam.UpdateParam dicParam);
//
// /**
// * 功能描述:删除
// *
// * @param id
// * @return boolean
// */
// boolean deleteDic(String id);
//
// /**
// * 功能描述: 根据id获取菜单详情
// *
// * @param id
// */
// Dic getDicById(String id);
//}

130
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DicServiceImpl.java
View File

@@ -1,130 +0,0 @@
//package com.njcn.system.service.impl;
//
//import cn.hutool.core.bean.BeanUtil;
//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
//import com.njcn.common.pojo.exception.BusinessException;
//import com.njcn.system.enums.EventResponseEnum;
//import com.njcn.system.enums.TemplateTreeEnum;
//import com.njcn.system.mapper.DicMapper;
//import com.njcn.system.pojo.constant.DicState;
//import com.njcn.system.pojo.param.DicParam;
//import com.njcn.system.pojo.po.Dic;
//import com.njcn.system.pojo.vo.DicVO;
//import com.njcn.system.service.IDicService;
//import lombok.RequiredArgsConstructor;
//import lombok.extern.slf4j.Slf4j;
//import org.apache.commons.lang.StringUtils;
//import org.springframework.stereotype.Service;
//
//import java.util.Comparator;
//import java.util.List;
//import java.util.Objects;
//import java.util.stream.Collectors;
//
///**
// * @author hany
// * @date 2022/10/18
// */
//@Slf4j
//@Service
//@RequiredArgsConstructor
//public class DicServiceImpl extends ServiceImpl<DicMapper, Dic> implements IDicService {
//
// private final DicMapper dicMapper;
//
// @Override
// public boolean addDic(DicParam dicParam) {
// checkDicParam(dicParam,false);
// Dic dic = new Dic();
// BeanUtil.copyProperties(dicParam, dic);
// dic.setStatus(DicState.ENABLE);
// if (Objects.equals(dicParam.getPid(),DicState.FATHER_PID)){
// dic.setPids(DicState.FATHER_PID);
// } else {
// Dic fatherFaction = this.lambdaQuery().eq(Dic::getId,dicParam.getPid()).one();
// if (Objects.equals(fatherFaction.getPid(),DicState.FATHER_PID)){
// dic.setPids(dicParam.getPid());
// } else {
// String pidS = fatherFaction.getPids();
// dic.setPids(pidS+","+dicParam.getPid());
// }
// }
// return this.save(dic);
// }
//
// @Override
// public boolean updateDic(DicParam.UpdateParam dicParam) {
// checkDicParam(dicParam,true);
// Dic dic = new Dic();
// BeanUtil.copyProperties(dicParam, dic);
// return this.updateById(dic);
// }
//
// @Override
// public boolean deleteDic(String id) {
// return this.lambdaUpdate().set(Dic::getStatus, DicState.DELETE).in(Dic::getId, id).update();
// }
//
// @Override
// public Dic getDicById(String id) {
// return this.lambdaQuery().eq(Dic::getId,id).one();
// }
//
// /**
// * 获取树
// * @return
// */
// @Override
// public List<DicVO> getDicTree(String code) {
// List<DicVO> list = dicMapper.getAllDic();
// return list.stream()
// .filter(fun -> {
// boolean flag =true;
// boolean flag1 =true;
// flag = Objects.equals(TemplateTreeEnum.FATHER_PID,fun.getPid());
// if(!StringUtils.isEmpty(code)){
// flag1 = fun.getCode().equals(code);
// }
//
// return flag&&flag1;
//
// })
// .peek(funS -> funS.setChildren(getChildList(funS, list)))
// .sorted(Comparator.comparingInt(DicVO::getSort))
// .collect(Collectors.toList());
// }
//
// /**
// * 递归组装
// */
// private List<DicVO> getChildList(DicVO dictMenu, List<DicVO> categories) {
// return categories.stream().filter(o -> Objects.equals(o.getPid(),dictMenu.getId()))
// .peek(o -> o.setChildren(getChildList(o, categories)))
// .sorted(Comparator.comparingInt(DicVO::getSort))
// .collect(Collectors.toList());
// }
//
// /**
// * 校验参数，
// * 1.检查是否存在相同名称的菜单
// */
// private void checkDicParam(DicParam dicParam, boolean isExcludeSelf) {
// LambdaQueryWrapper<Dic> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// lambdaQueryWrapper
// .eq(Dic::getName,dicParam.getName())
// .eq(Dic::getStatus, DicState.ENABLE);
// //更新的时候，需排除当前记录
// if (isExcludeSelf) {
// if (dicParam instanceof DicParam.UpdateParam) {
// lambdaQueryWrapper.ne(Dic::getId, ((DicParam.UpdateParam) dicParam).getId());
// }
// }
// int countByAccount = this.count(lambdaQueryWrapper);
// //大于等于1个则表示重复
// if (countByAccount >= 1) {
// throw new BusinessException(EventResponseEnum.NAME_REPEAT);
// }
// }
//
//}

16
pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/FunctionMapper.xml
View File

@@ -5,8 +5,8 @@
<select id="getAllFunctions" resultType="FunctionVO">
SELECT
Id,Pid,
`Name` title,
`Code`,
Name title,
Code,
Path routePath,
Icon,Sort,
Type,
@@ -21,8 +21,8 @@
<select id="getFunctionsByList" resultType="FunctionVO">
SELECT
Id,Pid,
`Name` title,
`Code`,
Name title,
Code,
Path routePath,
Icon,Sort,
Type,
@@ -42,8 +42,8 @@
<select id="getUserFunctionsByList" resultType="FunctionVO">
SELECT
Id,Pid,
`Name` title,
`Code`,
Name title,
Code,
Path routePath,
Icon,Sort,
Type,
@@ -63,8 +63,8 @@
<select id="getByList" resultType="FunctionVO">
SELECT
Id,Pid,
`Name` title,
`Code`,
Name title,
Code,
Path routePath,
Icon,Sort,
Type,

2
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/FunctionServiceImpl.java
View File

@@ -190,7 +190,7 @@ public class FunctionServiceImpl extends ServiceImpl<FunctionMapper, Function> i
}
List<FunctionVO> functionVOList = functionMapper.getFunctionsByList(functionList);
result = functionVOList.stream()
.filter(fun -> Objects.equals(FunctionState.FATHER_PID,fun.getPid()))
.filter(fun -> Objects.equals(FunctionState.FATHER_PID,fun.getPid().trim()))
.peek(funS -> funS.setChildren(getChildCategoryList(funS, functionVOList)))
.sorted(Comparator.comparingInt(FunctionVO::getSort))
.collect(Collectors.toList());