From 8726fdee27971b8e15be2bcd7dd49ce4c8622875 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Wed, 29 May 2024 13:40:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=A0=91=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/system/api/DictTreeFeignClient.java | 4 + .../DictTreeFeignClientFallbackFactory.java | 5 + .../com/njcn/system/enums/DicTreeEnum.java | 14 +- .../com/njcn/system/pojo/param/DicParam.java | 104 +++---- .../njcn/system/pojo/param/DictTreeParam.java | 10 + .../java/com/njcn/system/pojo/po/Dic.java | 60 ++-- .../com/njcn/system/pojo/po/SysDicTreePO.java | 10 + .../java/com/njcn/system/pojo/vo/DicVO.java | 70 ++--- .../com/njcn/system/pojo/vo/DictTreeVO.java | 10 + .../njcn/system/controller/DicController.java | 274 +++++++++--------- .../system/controller/DictTreeController.java | 9 + .../com/njcn/system/mapper/DicMapper.java | 24 +- .../njcn/system/mapper/mapping/DicMapper.xml | 8 - .../com/njcn/system/service/IDicService.java | 104 +++---- .../system/service/SysDicTreePOService.java | 7 + .../impl/CsStatisticalSetPOServiceImpl.java | 8 +- .../system/service/impl/DicServiceImpl.java | 260 ++++++++--------- .../service/impl/SysDicTreePOServiceImpl.java | 7 + .../njcn/user/pojo/vo/PvTerminalTreeVO.java | 3 + .../njcn/user/mapper/mapping/DeptMapper.xml | 5 +- 20 files changed, 530 insertions(+), 466 deletions(-) delete mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DicMapper.xml diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/DictTreeFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/DictTreeFeignClient.java index 8cc4d484e..ad18b3ef2 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/DictTreeFeignClient.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/DictTreeFeignClient.java @@ -31,6 +31,10 @@ public interface DictTreeFeignClient { @GetMapping("/queryAll") HttpResult> queryAll() ; + @GetMapping("/queryAllByType") + HttpResult> queryAllByType(@RequestParam("type")Integer type) ; + + @GetMapping("/queryTree") HttpResult> queryTree() ; diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DictTreeFeignClientFallbackFactory.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DictTreeFeignClientFallbackFactory.java index 59d1aae1f..284149f0b 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DictTreeFeignClientFallbackFactory.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DictTreeFeignClientFallbackFactory.java @@ -58,6 +58,11 @@ public class DictTreeFeignClientFallbackFactory implements FallbackFactory> queryAllByType(Integer type) { + log.error("{}异常，降级处理，异常为：{}","分类获取所有字典树数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); } + @Override public HttpResult> queryTree() { log.error("{}异常，降级处理，异常为：{}","获取树形数据",cause.toString()); diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java index d0221d7c0..a3d5eab28 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java @@ -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"), + + + + //冀北主要非线性设备类型 /** * 类型 类别 名称 所属行业 主要关注的电能质量指标 diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DicParam.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DicParam.java index 7ffde402f..604f2827a 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DicParam.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DicParam.java @@ -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; +// } +//} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictTreeParam.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictTreeParam.java index 369d1d14e..cb32afb8c 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictTreeParam.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictTreeParam.java @@ -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; + /** * 排序 */ diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Dic.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Dic.java index e21974eb4..812f022d7 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Dic.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Dic.java @@ -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; +//} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/SysDicTreePO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/SysDicTreePO.java index 6c4f51185..e2c4ef0f4 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/SysDicTreePO.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/SysDicTreePO.java @@ -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; + /** * 排序 */ diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DicVO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DicVO.java index 7c2d05bc3..ea4535d80 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DicVO.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DicVO.java @@ -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 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 children; +//} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictTreeVO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictTreeVO.java index bb955c3d2..41ef4cec2 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictTreeVO.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictTreeVO.java @@ -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; + /** * 排序 */ diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DicController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DicController.java index 2e326f61c..b62cf2e05 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DicController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DicController.java @@ -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> getDicTree(){ - String methodDescribe = getMethodDescribe("getDicTree"); - List list = dicService.getDicTree(null); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,list,methodDescribe); - } - - @OperateInfo(info = LogEnum.SYSTEM_COMMON) - @GetMapping("/codeDicTree") - @ApiOperation("根据code获取字典树") - public HttpResult> getCodeDicTree(String code){ - String methodDescribe = getMethodDescribe("getCodeDicTree"); - List 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 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 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 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 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> getDicTree(){ +// String methodDescribe = getMethodDescribe("getDicTree"); +// List list = dicService.getDicTree(null); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,list,methodDescribe); +// } +// +// @OperateInfo(info = LogEnum.SYSTEM_COMMON) +// @GetMapping("/codeDicTree") +// @ApiOperation("根据code获取字典树") +// public HttpResult> getCodeDicTree(String code){ +// String methodDescribe = getMethodDescribe("getCodeDicTree"); +// List 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 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 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 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 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); +// } +//} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java index d6fe7af6c..6189c939b 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java @@ -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> queryAllByType(@RequestParam("type")Integer type) { + String methodDescribe = getMethodDescribe("queryAll"); + List result = sysDicTreePOService.queryAllByType(type); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/queryTree") diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DicMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DicMapper.java index ee6c881f3..b9fe0cf6e 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DicMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DicMapper.java @@ -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 { - - List 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 { +// +// List getAllDic(); +//} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DicMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DicMapper.xml deleted file mode 100644 index 0bbb23554..000000000 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DicMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IDicService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IDicService.java index b8577fee0..0cf0309da 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IDicService.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IDicService.java @@ -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 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 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); +//} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/SysDicTreePOService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/SysDicTreePOService.java index a886785a3..7d2a4d637 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/SysDicTreePOService.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/SysDicTreePOService.java @@ -40,5 +40,12 @@ public interface SysDicTreePOService extends IService{ */ List queryAll(); + /** + * 分类查询所有树形字典 + * @author cdf + * @date 2023/12/18 + */ + List queryAllByType(Integer type); + List queryTree(); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java index f45b7d7a5..42967be32 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java @@ -8,25 +8,20 @@ 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; import org.springframework.util.CollectionUtils; /** - * + * * Description: * Date: 2023/6/9 16:17【需求编号】 * @@ -38,7 +33,6 @@ import org.springframework.util.CollectionUtils; public class CsStatisticalSetPOServiceImpl extends MppServiceImpl implements CsStatisticalSetPOService{ private final IEleEpdPqdService epdPqdService; - private final IDicService dicService; private final SysDicTreePOService sysDicTreePOService; @Override diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DicServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DicServiceImpl.java index c8541f4cc..fcc5d8f02 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DicServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DicServiceImpl.java @@ -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 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 getDicTree(String code) { - List 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 getChildList(DicVO dictMenu, List 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 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 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 getDicTree(String code) { +// List 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 getChildList(DicVO dictMenu, List 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 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); +// } +// } +// +//} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java index 9c506657b..e53b204e9 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java @@ -108,6 +108,13 @@ public class SysDicTreePOServiceImpl extends ServiceImpl queryAllByType(Integer type) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysDicTreePO::getStatus, 0).eq(SysDicTreePO::getType,type); + return this.list(lambdaQueryWrapper); + } + @Override public List queryTree() { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/PvTerminalTreeVO.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/PvTerminalTreeVO.java index a1aaf7533..30c9034d5 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/PvTerminalTreeVO.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/PvTerminalTreeVO.java @@ -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 = "子级") diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml index 8cb856b02..f52a1dba9 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml @@ -166,7 +166,10 @@