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

部门接口，字典树接口调整

Browse Source
This commit is contained in:
cdf
2024-05-29 13:40:40 +08:00
parent 619821efc8
commit 8726fdee27
20 changed files with 530 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-system/system-api/src/main/java/com/njcn/system/api/DictTreeFeignClient.java
View File

@@ -31,6 +31,10 @@ public interface DictTreeFeignClient {
@GetMapping("/queryAll")
HttpResult<List<SysDicTreePO>> queryAll() ;
@GetMapping("/queryAllByType")
HttpResult<List<SysDicTreePO>> queryAllByType(@RequestParam("type")Integer type) ;
@GetMapping("/queryTree")
HttpResult<List<SysDicTreePO>> queryTree() ;

5
pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DictTreeFeignClientFallbackFactory.java
View File

@@ -58,6 +58,11 @@ public class DictTreeFeignClientFallbackFactory implements FallbackFactory<DictT
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<SysDicTreePO>> queryAllByType(Integer type) {
log.error("{}异常，降级处理，异常为：{}","分类获取所有字典树数据",cause.toString());
throw new BusinessException(finalExceptionEnum); }
@Override
public HttpResult<List<SysDicTreePO>> queryTree() {
log.error("{}异常，降级处理，异常为：{}","获取树形数据",cause.toString());

14
pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java
View File

@@ -19,16 +19,26 @@ public enum DicTreeEnum {
Wind_Farms("风电场","1401"),
Power_Station("光伏电站","1402"),
//其实对应其他非线性负荷
Smelting_Load("冶炼负荷","2300"),
Smelting_Load("其他非线性负荷","2300"),
Imp_Users("敏感/重要/高危用户","2400"),
//冶炼负荷->小类
//冶炼负荷->小类(以下5个对应主网测点中的所属场站的冶炼负荷)
Electric_Heating_Load("电加热负荷（含电弧炉、中频炉、电热炉、单/多晶硅生产设备）","2301"),
Rolling_Mill("轧机","2303"),
Welding_Load("电焊负荷","2306"),
Lifting_Load("起重负荷（含电铲、升降机、门吊等吊装设备）","2308"),
Electrolytic_Load("电解负荷","2309"),
//
rail_traffic("轨道交通","2304"),
electric_vehicle("电动汽车充电站","2305"),
inverter_motor("变频调速负荷（变频电机、变频水泵等）","2312"),
Commercial_civil_use("商业/市政/民用/电子通讯负荷（含变频空调、大型电梯、节能照明设备、UPS、开关电源、逆变电源等）","2315"),
//冀北主要非线性设备类型
/**
* 类型 类别 名称 所属行业 主要关注的电能质量指标

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

@@ -1,52 +1,52 @@
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;
}
}
//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;
// }
//}

10
pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictTreeParam.java
View File

@@ -41,6 +41,16 @@ public class DictTreeParam {
@NotBlank(message = ValidMessage.CODE_NOT_BLANK)
private String code;
/**
* 用于区分多种类型的字典树 0.台账对象类型 1.自定义报表指标类型
*/
private Integer type;
/**
* 根据type自定义内容，type:0用于区分对象类型是101电网侧 102用户侧
*/
private String extend;
/**
* 排序
*/

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

@@ -1,30 +1,30 @@
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;
}
//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;
//}

10
pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/SysDicTreePO.java
View File

@@ -51,6 +51,16 @@ public class SysDicTreePO extends BaseEntity {
@TableField(value = "code")
private String code;
/**
* 用于区分多种类型的字典树 0.台账对象类型 1.自定义报表指标类型
*/
private Integer type;
/**
* 根据type自定义内容，type:0用于区分对象类型是101电网侧 102用户侧
*/
private String extend;
/**
* 排序
*/

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

@@ -1,35 +1,35 @@
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;
}
//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;
//}

10
pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictTreeVO.java
View File

@@ -42,6 +42,16 @@ public class DictTreeVO implements Serializable {
*/
private String code;
/**
* 用于区分多种类型的字典树 0.台账对象类型 1.自定义报表指标类型
*/
private Integer type;
/**
* 根据type自定义内容，type:0用于区分对象类型是101电网侧 102用户侧
*/
private String extend;
/**
* 排序
*/

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

@@ -1,137 +1,137 @@
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);
}
}
//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);
// }
//}

9
pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java
View File

@@ -130,6 +130,15 @@ public class DictTreeController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/queryAllByType")
@ApiOperation("分类查询所有树形字典")
public HttpResult<List<SysDicTreePO>> queryAllByType(@RequestParam("type")Integer type) {
String methodDescribe = getMethodDescribe("queryAll");
List<SysDicTreePO> result = sysDicTreePOService.queryAllByType(type);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/queryTree")

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

@@ -1,12 +1,12 @@
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();
}
//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();
//}

8
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DicMapper.xml
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.system.mapper.DicMapper">
<select id="getAllDic" resultType="DicVO">
SELECT * from sys_dic_tree WHERE status = 0
</select>
</mapper>

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

@@ -1,52 +1,52 @@
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);
}
//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);
//}

7
pqs-system/system-boot/src/main/java/com/njcn/system/service/SysDicTreePOService.java
View File

@@ -40,5 +40,12 @@ public interface SysDicTreePOService extends IService<SysDicTreePO>{
*/
List<SysDicTreePO> queryAll();
/**
* 分类查询所有树形字典
* @author cdf
* @date 2023/12/18
*/
List<SysDicTreePO> queryAllByType(Integer type);
List<SysDicTreePO> queryTree();
}

6
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java
View File

@@ -8,18 +8,13 @@ import com.njcn.system.pojo.po.*;
import com.njcn.system.pojo.vo.CsStatisticalSetVO;
import com.njcn.system.pojo.vo.DictTreeVO;
import com.njcn.system.pojo.vo.EleEpdPqdListVO;
import com.njcn.system.service.IDicService;
import com.njcn.system.service.IEleEpdPqdService;
import com.njcn.system.service.SysDicTreePOService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.system.mapper.CsStatisticalSetPOMapper;
import com.njcn.system.service.CsStatisticalSetPOService;
import org.springframework.transaction.annotation.Transactional;
@@ -38,7 +33,6 @@ import org.springframework.util.CollectionUtils;
public class CsStatisticalSetPOServiceImpl extends MppServiceImpl<CsStatisticalSetPOMapper, CsStatisticalSetPO> implements CsStatisticalSetPOService{
private final IEleEpdPqdService epdPqdService;
private final IDicService dicService;
private final SysDicTreePOService sysDicTreePOService;
@Override

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

@@ -1,130 +1,130 @@
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);
}
}
}
//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);
// }
// }
//
//}

7
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java
View File

@@ -108,6 +108,13 @@ public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, Sys
return this.list(lambdaQueryWrapper);
}
@Override
public List<SysDicTreePO> queryAllByType(Integer type) {
LambdaQueryWrapper<SysDicTreePO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(SysDicTreePO::getStatus, 0).eq(SysDicTreePO::getType,type);
return this.list(lambdaQueryWrapper);
}
@Override
public List<SysDicTreePO> queryTree() {
LambdaQueryWrapper<SysDicTreePO> lambdaQueryWrapper = new LambdaQueryWrapper<>();

3
pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/PvTerminalTreeVO.java
View File

@@ -30,6 +30,9 @@ public class PvTerminalTreeVO {
@ApiModelProperty(name = "code",value = "单位编号")
private String code;
@ApiModelProperty(name = "level",value = "层级 1.全国 2.省级 3.市级 4.县级")
private Integer level;
@ApiModelProperty(name = "children",value = "子级")

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

@@ -166,7 +166,10 @@
<select id="allDeptList" resultType="PvTerminalTreeVO">
select id,name,pid,pids,code from sys_dept where state = 1 order by sort
select
id,name,pid,pids,code,
LENGTH( pids ) - LENGTH(REPLACE ( pids, ',', '' )) +1 as `level`
from sys_dept where state = 1 order by sort
</select>