diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictDataController.java b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictDataController.java index 33da717e..94cb8ca3 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictDataController.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictDataController.java @@ -51,7 +51,7 @@ public class DictDataController extends BaseController { public HttpResult> listByTypeId(@RequestBody @Validated DictDataParam.DicTypeIdQueryParam queryParam) { String methodDescribe = getMethodDescribe("listByTypeId"); LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam); - Page result = dictDataService.getTypeIdData(queryParam); + Page result = dictDataService.getDictDataByTypeId(queryParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java new file mode 100644 index 00000000..f9241a0f --- /dev/null +++ b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java @@ -0,0 +1,183 @@ +package com.njcn.gather.system.dictionary.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.LogUtil; +import com.njcn.gather.system.dictionary.pojo.param.DictTreeParam; +import com.njcn.gather.system.dictionary.pojo.po.DictTree; +import com.njcn.gather.system.dictionary.pojo.vo.DictTreeVO; +import com.njcn.gather.system.dictionary.service.IDictTreeService; +import com.njcn.web.utils.HttpResultUtil; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + *

+ * 前端控制器 + *

+ * + * @author hongawen + * @since 2021-12-13 + */ +@Validated +@Slf4j +@Api(tags = "字典树操作") +@RestController +@RequestMapping("/dictTree") +@RequiredArgsConstructor +public class DictTreeController extends BaseController { + + private final IDictTreeService dictTreeService; + + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD) + @PostMapping("/add") + @ApiOperation("新增字典树数据") + @ApiImplicitParam(name = "dictTreeParam", value = "字典数据", required = true) + public HttpResult add(@RequestBody @Validated DictTreeParam dictTreeParam) { + String methodDescribe = getMethodDescribe("add"); + LogUtil.njcnDebug(log, "{}，字典数据为：{}", methodDescribe, dictTreeParam); + boolean result = dictTreeService.addDictTree(dictTreeParam); + if (result) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } + + + + /** + * 修改 + * @param dicParam 修改参数 + */ + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE) + @PutMapping("/update") + @ApiOperation("修改") + @ApiImplicitParam(name = "dicParam", value = "数据", required = true) + public HttpResult update(@RequestBody @Validated DictTreeParam.DictTreeUpdateParam dicParam) { + String methodDescribe = getMethodDescribe("update"); + LogUtil.njcnDebug(log, "{},更新的信息为：{}", methodDescribe,dicParam); + boolean result = dictTreeService.updateDictTree(dicParam); + if (result){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe); + } + } + + /** + * 删除 + * @param id id + */ + @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 = dictTreeService.deleteDictTree(id); + if (result){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe); + } + } + + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @PostMapping("/query") + @ApiOperation("根据pid查询字典树") + public HttpResult> query(@RequestParam("pid") String pid) { + String methodDescribe = getMethodDescribe("query"); + LogUtil.njcnDebug(log, "{}，字典数据为：{}", methodDescribe, pid); + List result = dictTreeService.queryByPid(pid); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + + } + + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @PostMapping("/queryByCodeList") + @ApiOperation("根据Code查询字典树") + public HttpResult> queryByCodeList(@RequestParam("code") String code) { + String methodDescribe = getMethodDescribe("queryByCodeList"); + List result = dictTreeService.queryByCodeList(code); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + + } + + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @PostMapping("/queryByCode") + @ApiOperation("根据Code查询字典树") + public HttpResult queryByCode(@RequestParam("code") String code) { + String methodDescribe = getMethodDescribe("queryByCode"); + LogUtil.njcnDebug(log, "{}，字典数据为：{}", methodDescribe, code); + DictTreeVO result = dictTreeService.queryByCode(code); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + + } + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @PostMapping("/queryByid") + @ApiOperation("根据id查询字典树最底层") + public HttpResult> queryLastLevelById(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("queryLastLevelById"); + LogUtil.njcnDebug(log, "{}，字典数据为：{}", methodDescribe, id); + List result = dictTreeService.queryLastLevelById(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + + } + + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @PostMapping("/queryById") + @ApiOperation("根据id查询数据") + public HttpResult queryById(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("queryById"); + LogUtil.njcnDebug(log, "{}，字典数据为：{}", methodDescribe, id); + DictTree result = dictTreeService.queryById(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @GetMapping("/queryAll") + @ApiOperation("查询所有树形字典") + public HttpResult> queryAll() { + String methodDescribe = getMethodDescribe("queryAll"); + List result = dictTreeService.queryAll(); + 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 = dictTreeService.queryAllByType(type); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @GetMapping("/queryTree") + @ApiOperation("树形字典树结构展示") + public HttpResult> queryTree() { + String methodDescribe = getMethodDescribe("queryTree"); + List result = dictTreeService.queryTree(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + +} + + diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/mapper/DictTreeMapper.java b/system/src/main/java/com/njcn/gather/system/dictionary/mapper/DictTreeMapper.java new file mode 100644 index 00000000..3bfd9214 --- /dev/null +++ b/system/src/main/java/com/njcn/gather/system/dictionary/mapper/DictTreeMapper.java @@ -0,0 +1,16 @@ +package com.njcn.gather.system.dictionary.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.gather.system.dictionary.pojo.po.DictTree; +import com.njcn.gather.system.dictionary.pojo.vo.DictTreeVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author caozehui + * @data 2024/11/8 + */ +public interface DictTreeMapper extends BaseMapper { + List queryLastLevelById(@Param("id") String id); +} diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/mapper/mapping/DictTreeMapper.xml b/system/src/main/java/com/njcn/gather/system/dictionary/mapper/mapping/DictTreeMapper.xml new file mode 100644 index 00000000..fbf70df3 --- /dev/null +++ b/system/src/main/java/com/njcn/gather/system/dictionary/mapper/mapping/DictTreeMapper.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictTreeParam.java b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictTreeParam.java new file mode 100644 index 00000000..5d7ca0f9 --- /dev/null +++ b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictTreeParam.java @@ -0,0 +1,74 @@ +package com.njcn.gather.system.dictionary.pojo.param; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.njcn.common.pojo.constant.PatternRegex; +import com.njcn.gather.system.pojo.constant.SystemValidMessage; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; + +/** + * @author caozehui + * @data 2024/11/8 + */ +@Data +public class DictTreeParam { + /** + * 父id + */ + @ApiModelProperty(value = "父id") + private String pid; + + + /** + * 名称 + */ + @ApiModelProperty(value = "名称") + @NotBlank(message = SystemValidMessage.NAME_NOT_BLANK) + private String name; + + /** + * 编码 + */ + @TableField(value = "编码") + @NotBlank(message = SystemValidMessage.CODE_NOT_BLANK) + private String code; + + /** + * 用于区分多种类型的字典树 0.台账对象类型 1.自定义报表指标类型 + */ + private Integer type; + + /** + * 根据type自定义内容，type:0用于区分对象类型是101电网侧 102用户侧 + */ + private String extend; + + /** + * 排序 + */ + private Integer sort; + + /** + * 描述 + */ + private String remark; + + + /** + * 更新操作实体 + */ + @Data + @EqualsAndHashCode(callSuper = true) + public static class DictTreeUpdateParam extends DictTreeParam { + + + @ApiModelProperty("id") + @NotBlank(message = SystemValidMessage.ID_NOT_BLANK) + @Pattern(regexp = PatternRegex.SYSTEM_ID, message = SystemValidMessage.ID_FORMAT_ERROR) + private String id; + } +} diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/po/DictTree.java b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/po/DictTree.java new file mode 100644 index 00000000..937cb4af --- /dev/null +++ b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/po/DictTree.java @@ -0,0 +1,85 @@ +package com.njcn.gather.system.dictionary.pojo.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.mybatisplus.bo.BaseEntity; +import lombok.Data; + +import java.util.List; + +/** + * @author caozehui + * @data 2024/11/8 + */ +@Data +@TableName(value = "sys_dict_tree") +public class DictTree extends BaseEntity { + /** + * 主键 + */ + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private String id; + + /** + * 父id + */ + @TableField(value = "pid") + private String pid; + + /** + * 父ids + */ + @TableField(value = "pids") + private String pids; + + /** + * 名称 + */ + @TableField(value = "name") + private String name; + + /** + * 编码 + */ + @TableField(value = "code") + private String code; + + /** + * 用于区分多种类型的字典树 0.台账对象类型 1.自定义报表指标类型 + */ + private Integer type; + + /** + * 根据type自定义内容，type:0用于区分对象类型是101电网侧 102用户侧 + */ + private String extend; + + /** + * 排序 + */ + @TableField(value = "sort") + private Integer sort; + + /** + * 描述 + */ + @TableField(value = "remark") + private String remark; + + /** + * 状态（字典 0正常 1停用 2删除） + */ + @TableField(value = "state") + private Integer state; + + /** + * 子类 + */ + @TableField(exist = false) + private List children; + + @TableField(exist = false) + private Integer level; +} diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictDataExcel.java b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictDataExcel.java index 567ff8b2..49a803b4 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictDataExcel.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictDataExcel.java @@ -47,7 +47,7 @@ public class DictDataExcel implements Serializable { /** * 事件等级：0-普通；1-中等；2-严重(默认为0) */ - @Excel(name = "事件等级", width = 15) + @Excel(name = "事件等级", width = 15, replace = {"0", "普通", "1", "中等", "2", "严重"}) private Integer level; /** @@ -61,34 +61,4 @@ public class DictDataExcel implements Serializable { */ @Excel(name = "数值", width = 15) private String value; - - /** - * 状态：0-删除 1-正常 - */ -// @Excel(name = "状态", width = 15) -// private Integer state; - - /** - * 创建人 - */ - @Excel(name = "创建人", width = 40) - private String createBy; - - /** - * 创建时间 - */ - @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss", width = 25) - private LocalDateTime createTime; - - /** - * 更新人 - */ - @Excel(name = "更新人", width = 40) - private String updateBy; - - /** - * 更新时间 - */ - @Excel(name = "更新时间", format = "yyyy-MM-dd HH:mm:ss", width = 25) - private LocalDateTime updateTime; } diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictTreeVO.java b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictTreeVO.java new file mode 100644 index 00000000..1613cb16 --- /dev/null +++ b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictTreeVO.java @@ -0,0 +1,66 @@ +package com.njcn.gather.system.dictionary.pojo.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author caozehui + * @data 2024/11/8 + */ +@Data +public class DictTreeVO implements Serializable { + + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 父id + */ + private String pid; + /** + * 父类名称 + */ + private String pname; + + /** + * 名称 + */ + private String name; + + /** + * 编码 + */ + private String code; + + /** + * 用于区分多种类型的字典树 0.台账对象类型 1.自定义报表指标类型 + */ + private Integer type; + + /** + * 根据type自定义内容，type:0用于区分对象类型是101电网侧 102用户侧 + */ + private String extend; + + /** + * 排序 + */ + private Integer sort; + + /** + * 描述 + */ + private String remark; + + /** + * 状态（字典 0正常 1停用 2删除） + */ + private String state; + +} diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictTypeExcel.java b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictTypeExcel.java index 692cfad3..7e661938 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictTypeExcel.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictTypeExcel.java @@ -42,13 +42,13 @@ public class DictTypeExcel implements Serializable { /** * 开启等级：0-不开启；1-开启，默认不开启 */ - @Excel(name = "开启等级", width = 15) + @Excel(name = "开启等级", width = 15, replace = {"0", "不开启", "1", "开启"}) private Integer openLevel; /** * 开启描述：0-不开启；1-开启，默认不开启 */ - @Excel(name = "开启描述", width = 15) + @Excel(name = "开启描述", width = 15, replace = {"0", "不开启", "1", "开启"}) private Integer openDescribe; /** @@ -56,34 +56,4 @@ public class DictTypeExcel implements Serializable { */ @Excel(name = "描述", width = 50) private String remark; - - /** - * 状态：0-删除 1-正常 - */ -// @Excel(name = "状态", width = 15) -// private Integer state; - - /** - * 创建人 - */ - @Excel(name = "创建人", width = 40) - private String createBy; - - /** - * 创建时间 - */ - @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss", width = 25) - private LocalDateTime createTime; - - /** - * 更新人 - */ - @Excel(name = "更新人", width = 40) - private String updateBy; - - /** - * 更新时间 - */ - @Excel(name = "更新时间", format = "yyyy-MM-dd HH:mm:ss", width = 25) - private LocalDateTime updateTime; } diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictDataService.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictDataService.java index 27d82405..9117f02b 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictDataService.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictDataService.java @@ -24,7 +24,7 @@ public interface IDictDataService extends IService { * @param queryParam 查询参数 * @return 操作结果 */ - Page getTypeIdData(DictDataParam.DicTypeIdQueryParam queryParam); + Page getDictDataByTypeId(DictDataParam.DicTypeIdQueryParam queryParam); /** * 新增数据字典 diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictTreeService.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictTreeService.java new file mode 100644 index 00000000..4f91e855 --- /dev/null +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictTreeService.java @@ -0,0 +1,66 @@ +package com.njcn.gather.system.dictionary.service; + +import com.njcn.gather.system.dictionary.pojo.param.DictTreeParam; +import com.njcn.gather.system.dictionary.pojo.po.DictTree; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.gather.system.dictionary.pojo.vo.DictTreeVO; + +import java.util.List; + + +/** + * @author caozehui + * @data 2024/11/8 + */ +public interface IDictTreeService extends IService { + + /** + * 初始化缓存设备树 + */ + //void refreshDictTreeCache(); + + boolean addDictTree(DictTreeParam dictTreeParam); + + boolean updateDictTree(DictTreeParam dictTreeParam); + + boolean deleteDictTree(String id); + + List queryByPid(String pid); + + DictTreeVO queryByCode(String code); + + List queryLastLevelById(String id); + + /** + * 根据id查询字典数据 + * + * @param id id + */ + DictTree queryById(String id); + + /** + * 查询所有树形字典 + * + * @author cdf + * @date 2023/12/18 + */ + List queryAll(); + + /** + * 分类查询所有树形字典 + * + * @author cdf + * @date 2023/12/18 + */ + List queryAllByType(Integer type); + + List queryTree(); + + /** + * 根据code查询自动树 + * + * @param code code + */ + List queryByCodeList(String code); +} diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java index 3bd8e5f3..443099df 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java @@ -42,7 +42,7 @@ import java.util.stream.Collectors; public class DictDataServiceImpl extends ServiceImpl implements IDictDataService { @Override - public Page getTypeIdData(DictDataParam.DicTypeIdQueryParam queryParam) { + public Page getDictDataByTypeId(DictDataParam.DicTypeIdQueryParam queryParam) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (ObjectUtil.isNotNull(queryParam)) { queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "sys_dict_data.name", queryParam.getName()) @@ -52,7 +52,7 @@ public class DictDataServiceImpl extends ServiceImpl i queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy())); } else { //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序 - queryWrapper.orderBy(true, true, "sys_dict_data.sort"); + queryWrapper.orderBy(true, true, "sys_dict_data.sort").orderByDesc("sys_dict_data.update_time"); } } queryWrapper.ne("sys_dict_data.state", DataStateEnum.DELETED.getCode()) @@ -148,7 +148,7 @@ public class DictDataServiceImpl extends ServiceImpl i queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy())); } else { //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序 - queryWrapper.orderBy(true, true, "sys_dict_data.sort"); + queryWrapper.orderBy(true, true, "sys_dict_data.sort").orderByDesc("sys_dict_data.update_time"); } } queryWrapper.ne("sys_dict_data.state", DataStateEnum.DELETED.getCode()) diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java index e93f5b41..eb06cf6a 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java @@ -42,7 +42,7 @@ public class DictPqServiceImpl extends ServiceImpl impleme queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy())); } else { //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序 - queryWrapper.orderBy(true, true, "sys_dict_pq.sort"); + queryWrapper.orderBy(true, true, "sys_dict_pq.sort").orderByDesc("sys_dict_pq.update_time"); } } queryWrapper.ne("sys_dict_pq.state", DataStateEnum.DELETED.getCode()); diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java new file mode 100644 index 00000000..3943d928 --- /dev/null +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java @@ -0,0 +1,176 @@ +package com.njcn.gather.system.dictionary.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.text.StrPool; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.gather.system.dictionary.mapper.DictTreeMapper; +import com.njcn.gather.system.dictionary.pojo.param.DictTreeParam; +import com.njcn.gather.system.dictionary.pojo.po.DictTree; +import com.njcn.gather.system.dictionary.pojo.vo.DictTreeVO; +import com.njcn.gather.system.dictionary.service.IDictTreeService; +import com.njcn.gather.system.pojo.constant.DictState; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * @author caozehui + * @data 2024/11/8 + */ +@Service +@RequiredArgsConstructor +public class DictTreeServiceImpl extends ServiceImpl implements IDictTreeService { + + //private final RedisUtil redisUtil; + +// @Override +// public void refreshDictTreeCache () { +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(DictTree::getState, DictState.ENABLE); +// List list = this.list(queryWrapper); +// redisUtil.saveByKey(AppRedisKey.DICT_TREE, list); +// } + + @Override + @Transactional(rollbackFor = {Exception.class}) + public boolean addDictTree(DictTreeParam dictTreeParam) { + boolean result; + DictTree dictTree = new DictTree(); + BeanUtils.copyProperties(dictTreeParam, dictTree); + if (!Objects.equals(dictTree.getPid(), DictState.PARENT_ID)) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + queryWrapper.eq("id", dictTree.getPid()); + DictTree instance = this.baseMapper.selectOne(queryWrapper); + + + dictTree.setPids(instance.getPids() + StrPool.COMMA + instance.getId()); + + } else { + dictTree.setPids(DictState.PARENT_ID); + } + dictTree.setState(DictState.ENABLE); + result = this.save(dictTree); +// if (result) { +// refreshDictTreeCache(); +// } + return result; + } + + @Override + public boolean updateDictTree(DictTreeParam dictTreeParam) { + boolean result; + DictTree dictTree = new DictTree(); + BeanUtils.copyProperties(dictTreeParam, dictTree); + result = this.updateById(dictTree); +// if (result) { +// refreshDictTreeCache(); +// } + return result; + } + + @Override + public boolean deleteDictTree(String id) { + boolean result = this.lambdaUpdate().set(DictTree::getState, DictState.DELETE).in(DictTree::getId, id).update(); +// if (result) { +// refreshDictTreeCache(); +// } + return result; + } + + @Override + public List queryByPid(String pid) { + List collect = new ArrayList<>(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(DictTree::getPid, pid).eq(DictTree::getState, DictState.ENABLE).orderByDesc(DictTree::getSort); + List resultList = this.list(query); + + DictTree byId = this.getById(pid); + + if (CollUtil.isNotEmpty(resultList)) { + collect = resultList.stream().map(temp -> { + DictTreeVO resultVO = new DictTreeVO(); + BeanUtils.copyProperties(temp, resultVO); + resultVO.setPname(Objects.nonNull(byId) ? byId.getName() : "最高级"); + return resultVO; + }).collect(Collectors.toList()); + } + return collect; + } + + @Override + public DictTreeVO queryByCode(String code) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.clear(); + query.eq(DictTree::getCode, code).eq(DictTree::getState, DictState.ENABLE); + DictTree result = this.getOne(query); + + if (result != null) { + DictTreeVO resultVO = new DictTreeVO(); + BeanUtils.copyProperties(result, resultVO); + return resultVO; + } + + return null; + } + + @Override + public List queryLastLevelById(String id) { + return this.baseMapper.queryLastLevelById(id); + } + + @Override + public DictTree queryById(String id) { + return this.lambdaQuery().eq(DictTree::getId, id).eq(DictTree::getState, DictState.ENABLE).one(); + } + + @Override + public List queryAll() { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(DictTree::getState, DictState.ENABLE); + return this.list(lambdaQueryWrapper); + } + + @Override + public List queryAllByType(Integer type) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(DictTree::getState, DictState.ENABLE).eq(DictTree::getType, type); + return this.list(lambdaQueryWrapper); + } + + @Override + public List queryTree() { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(DictTree::getState, DictState.ENABLE); + List dictTreeList = this.list(lambdaQueryWrapper); + return dictTreeList.stream().filter(item -> DictState.PARENT_ID.equals(item.getPid())).peek(item -> { + item.setLevel(0); + item.setChildren(getChildren(item, dictTreeList)); + }).collect(Collectors.toList()); + } + + @Override + public List queryByCodeList(String code) { + List sysDicTreePOList = this.list(new LambdaQueryWrapper().eq(DictTree::getState, 0)); + return sysDicTreePOList.stream().filter(item -> item.getCode().equals(code)).peek(item -> { + item.setLevel(0); + item.setChildren(getChildren(item, sysDicTreePOList)); + }).collect(Collectors.toList()); + } + + + private List getChildren(DictTree dictTree, List all) { + return all.stream().filter(item -> item.getPid().equals(dictTree.getId())).peek(item -> { + item.setLevel(dictTree.getLevel() + 1); + item.setChildren(getChildren(item, all)); + }).collect(Collectors.toList()); + } +} \ No newline at end of file diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java index 47e7db70..28abfb86 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java @@ -42,7 +42,7 @@ public class DictTypeServiceImpl extends ServiceImpl i queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy())); } else { //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序 - queryWrapper.orderBy(true, true, "sys_dict_type.sort"); + queryWrapper.orderBy(true, true, "sys_dict_type.sort").orderByDesc("sys_dict_type.update_time"); } } queryWrapper.ne("sys_dict_type.state", DataStateEnum.DELETED.getCode()); @@ -86,7 +86,7 @@ public class DictTypeServiceImpl extends ServiceImpl i queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy())); } else { //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序 - queryWrapper.orderBy(true, true, "sys_dict_type.sort"); + queryWrapper.orderBy(true, true, "sys_dict_type.sort").orderByDesc("sys_dict_type.update_time"); } } queryWrapper.ne("sys_dict_type.state", DataStateEnum.DELETED.getCode()); diff --git a/system/src/main/java/com/njcn/gather/system/menu/controller/MenuController.java b/system/src/main/java/com/njcn/gather/system/menu/controller/MenuController.java index 027cf084..80818bd6 100644 --- a/system/src/main/java/com/njcn/gather/system/menu/controller/MenuController.java +++ b/system/src/main/java/com/njcn/gather/system/menu/controller/MenuController.java @@ -59,10 +59,11 @@ public class MenuController { MenuVO menuVO3 = getMenuVORedirect("/system","system","/system/base","Tools","系统配置"); MenuVO menuVO31 = getMenuVO("/system/base","base","/system/base/index","UserFilled","通用配置"); MenuVO menuVO32 = getMenuVO("/system/dict","dict","/system/dictionary/dictType/index","DataAnalysis","数据字典"); - MenuVO menuVO33 = getMenuVO("/system/template","template","/system/template/index","Memo","报告模板"); - MenuVO menuVO34 = getMenuVO("/system/versionRegister","versionRegister","/system/versionRegister/index","SetUp","版本注册"); - MenuVO menuVO35 = getMenuVO("/system/dictPq","dictPq","/system/dictionary/dictPq/index","DataAnalysis","电能质量字典"); - menuVO3.setChildren(CollectionUtil.toList(menuVO31,menuVO32,menuVO33,menuVO34,menuVO35)); + MenuVO menuVO33 = getMenuVO("/system/dictTree","dictTree","/system/dictionary/dictTree/index","DataAnalysis","树形字典"); + MenuVO menuVO34 = getMenuVO("/system/dictPq","dictPq","/system/dictionary/dictPq/index","DataAnalysis","电能质量字典"); + MenuVO menuVO35 = getMenuVO("/system/template","template","/system/template/index","Memo","报告模板"); + MenuVO menuVO36 = getMenuVO("/system/versionRegister","versionRegister","/system/versionRegister/index","SetUp","版本注册"); + menuVO3.setChildren(CollectionUtil.toList(menuVO31,menuVO32,menuVO33,menuVO34,menuVO35,menuVO36)); menuVOList.add(menuVO3); MenuVO menuVO4 = getMenuVO("/log","log","/log/index","TrendCharts","日志管理"); diff --git a/system/src/main/java/com/njcn/gather/system/pojo/constant/DictState.java b/system/src/main/java/com/njcn/gather/system/pojo/constant/DictState.java new file mode 100644 index 00000000..103f257d --- /dev/null +++ b/system/src/main/java/com/njcn/gather/system/pojo/constant/DictState.java @@ -0,0 +1,21 @@ +package com.njcn.gather.system.pojo.constant; + +/** + * @author caozehui + * @data 2024/11/8 + */ +public interface DictState { + /** + * 状态 0-正常；1-停用；2-删除 默认正常 + */ + int ENABLE = 0; + + int PAUSE = 1; + + int DELETE = 2; + + /** + * 顶层父类的pid + */ + String PARENT_ID = "0"; +} diff --git a/system/src/main/java/com/njcn/gather/system/pojo/constant/SystemValidMessage.java b/system/src/main/java/com/njcn/gather/system/pojo/constant/SystemValidMessage.java index 249cd8f8..ae85a3d1 100644 --- a/system/src/main/java/com/njcn/gather/system/pojo/constant/SystemValidMessage.java +++ b/system/src/main/java/com/njcn/gather/system/pojo/constant/SystemValidMessage.java @@ -27,7 +27,7 @@ public interface SystemValidMessage { String INDUSTRY_FORMAT_ERROR = "行业格式错误，请检查industry参数"; String ADDR_NOT_BLANK = "所属区域不能为空，请检查addr参数"; - String CODE_NOT_BLANK = "编号不能为空，请检查code参数"; + String CODE_NOT_BLANK = "编码不能为空，请检查code参数"; String CODE_FORMAT_ERROR = "编号格式错误，请检查code参数"; diff --git a/user/src/main/java/com/njcn/gather/Main.java b/user/src/main/java/com/njcn/gather/Main.java deleted file mode 100644 index 93935dc9..00000000 --- a/user/src/main/java/com/njcn/gather/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.njcn.gather; - -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} \ No newline at end of file diff --git a/user/src/main/java/com/njcn/gather/user/user/service/ISysUserService.java b/user/src/main/java/com/njcn/gather/user/user/service/ISysUserService.java new file mode 100644 index 00000000..3c3d0e54 --- /dev/null +++ b/user/src/main/java/com/njcn/gather/user/user/service/ISysUserService.java @@ -0,0 +1,12 @@ +package com.njcn.gather.user.user.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.gather.user.user.pojo.po.SysUser; + +/** + * @author caozehui + * @since 2024-11-08 + */ +public interface ISysUserService extends IService { + +}