ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

电能质量字典crud

Browse Source
This commit is contained in:
caozehui
2024-11-06 11:04:16 +08:00
parent bb5e5dfec5
commit e640bd4516
21 changed files with 874 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
system/src/main/java/com/njcn/gather/system/dictionary/controller/DictDataController.java
View File

@@ -11,6 +11,7 @@ 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.DictDataParam;
import com.njcn.gather.system.dictionary.pojo.param.DictTypeParam;
import com.njcn.gather.system.dictionary.pojo.po.DictData;
import com.njcn.gather.system.dictionary.service.IDictDataService;
import com.njcn.web.controller.BaseController;
@@ -146,5 +147,13 @@ public class DictDataController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
}
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/export")
@ApiOperation("导出字典数据")
@ApiImplicitParam(name = "queryParam", value = "查询参数",required = true)
public void export(@RequestBody @Validated DictDataParam.DicTypeIdQueryParam queryParam) {
dictDataService.exportDictData(queryParam);
}
}

13
system/src/main/java/com/njcn/gather/system/dictionary/controller/DictPqController.java
View File

@@ -26,6 +26,10 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author caozehui
* @date 2024/11/05
*/
@Slf4j
@Api(tags = "电能质量指标字典操作")
@RestController
@@ -46,9 +50,10 @@ public class DictPqController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
@PostMapping("/add")
@ApiOperation("新增电能质量指标字典")
public HttpResult<Object> add(@RequestBody @Validated DictPqParam dictPqParam){
public HttpResult<Object> add(@RequestBody @Validated DictPqParam dictPqParam) {
String methodDescribe = getMethodDescribe("add");
LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, dictPqParam);
boolean result = dictPqService.addDictPq(dictPqParam);
@@ -59,9 +64,11 @@ public class DictPqController extends BaseController {
}
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
@PostMapping("/update")
@ApiOperation("更新电能质量指标字典")
public HttpResult<Object> update(@RequestBody @Validated DictPqParam.DictPqUpdateParam updateParam){
@ApiImplicitParam(name = "updateParam", value = "更新参数", required = true)
public HttpResult<Object> update(@RequestBody @Validated DictPqParam.DictPqUpdateParam updateParam) {
String methodDescribe = getMethodDescribe("update");
LogUtil.njcnDebug(log, "{}，更新数据为：{}", methodDescribe, updateParam);
boolean result = dictPqService.updateDictPq(updateParam);
@@ -78,7 +85,7 @@ public class DictPqController extends BaseController {
@ApiImplicitParam(name = "ids", value = "字典索引", required = true)
public HttpResult<Object> delete(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("delete");
LogUtil.njcnDebug(log, "{}，字典ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
boolean result = dictPqService.deleteDictPq(ids);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);

2
system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTypeController.java
View File

@@ -109,7 +109,7 @@ public class DictTypeController extends BaseController {
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/export")
@ApiOperation("导出字典类型数据")
@ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
@ApiImplicitParam(name = "queryParam", value = "查询参数",required = true)
public void export(@RequestBody @Validated DictTypeParam.DictTypeQueryParam queryParam) {
dictTypeService.exportDictType(queryParam);
}

94
system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictDataVO.java Normal file
View File

@@ -0,0 +1,94 @@
package com.njcn.gather.system.dictionary.pojo.vo;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* @author caozehui
* @data 2024/11/6
*/
@Data
public class DictDataVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 字典数据表Id
*/
@Excel(name = "字典数据表Id")
private String id;
/**
* 字典类型表Id
*/
@Excel(name = "字典类型表Id")
private String typeId;
/**
* 名称
*/
@Excel(name = "名称")
private String name;
/**
* 编码
*/
@Excel(name = "编码")
private String code;
/**
* 排序
*/
@Excel(name = "排序")
private Integer sort;
/**
* 事件等级：0-普通；1-中等；2-严重(默认为0)
*/
@Excel(name = "事件等级")
private Integer level;
/**
* 与高级算法内部Id描述对应；
*/
@Excel(name = "与高级算法内部Id描述对应")
private Integer algoDescribe;
/**
* 目前只用于表示电压等级数值
*/
@Excel(name = "数值")
private String value;
/**
* 状态：0-删除 1-正常
*/
@Excel(name = "状态")
private Integer state;
/**
* 创建人
*/
@Excel(name = "创建人")
private String createBy;
/**
* 创建时间
*/
@Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 更新人
*/
@Excel(name = "更新人")
private String updateBy;
/**
* 更新时间
*/
@Excel(name = "更新时间", format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}

35
system/src/main/java/com/njcn/gather/system/dictionary/pojo/vo/DictTypeVO.java
View File

@@ -9,70 +9,81 @@ import java.time.LocalDateTime;
/**
* @author caozehui
* @since 2024-11-05
* @date 2024/11/5
*/
@Data
@AllArgsConstructor
public class DictTypeVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 字典类型表Id
*/
//private String id;
@Excel(name = "Id")
private String id;
/**
* 名称
*/
@Excel(name = "名称")
private String name;
/**
* 编码
*/
@Excel(name = "编码")
private String code;
/**
* 排序
*/
//private Integer sort;
@Excel(name = "排序")
private Integer sort;
/**
* 开启等级：0-不开启；1-开启，默认不开启
*/
//private Integer openLevel;
@Excel(name = "开启等级")
private Integer openLevel;
/**
* 开启描述：0-不开启；1-开启，默认不开启
*/
//private Integer openDescribe;
@Excel(name = "开启描述")
private Integer openDescribe;
/**
* 描述
*/
//private String remark;
@Excel(name = "描述")
private String remark;
/**
* 状态：0-删除 1-正常
*/
//private Integer state;
@Excel(name = "状态")
private Integer state;
/**
* 创建人
*/
//private String createBy;
@Excel(name = "创建人")
private String createBy;
/**
* 创建时间
*/
//private String createTime;
@Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 更新人
*/
//private String updateBy;
@Excel(name = "更新人")
private String updateBy;
/**
* 更新时间
*/
//private String updateTime;
@Excel(name = "更新时间", format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}

6
system/src/main/java/com/njcn/gather/system/dictionary/service/IDictDataService.java
View File

@@ -68,4 +68,10 @@ public interface IDictDataService extends IService<DictData> {
* @return 返回所有字典数据
*/
List<SimpleTreeDTO> dictDataCache();
/**
* 导出字典数据
* @param queryParam 查询参数
*/
void exportDictData(DictDataParam.DicTypeIdQueryParam queryParam);
}

27
system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java
View File

@@ -13,6 +13,8 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.db.mybatisplus.constant.DbConstant;
import com.njcn.gather.system.dictionary.mapper.DictDataMapper;
import com.njcn.gather.system.dictionary.pojo.dto.DictDataCache;
import com.njcn.gather.system.dictionary.pojo.vo.DictDataVO;
import com.njcn.gather.system.dictionary.pojo.vo.DictTypeVO;
import com.njcn.gather.system.pojo.enums.SystemResponseEnum;
import com.njcn.gather.system.dictionary.pojo.param.DictDataParam;
import com.njcn.gather.system.dictionary.pojo.po.DictData;
@@ -21,6 +23,7 @@ import com.njcn.gather.system.dictionary.service.IDictDataService;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.pojo.dto.SimpleDTO;
import com.njcn.web.pojo.dto.SimpleTreeDTO;
import com.njcn.web.utils.ExcelUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -43,8 +46,8 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
public Page<DictData> getTypeIdData(DictDataParam.DicTypeIdQueryParam queryParam) {
QueryWrapper<DictData> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotNull(queryParam)) {
queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "sys_dict_data.name", queryParam.getName());
queryWrapper.like(StrUtil.isNotBlank(queryParam.getCode()), "sys_dict_data.code", queryParam.getCode());
queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "sys_dict_data.name", queryParam.getName())
.like(StrUtil.isNotBlank(queryParam.getCode()), "sys_dict_data.code", queryParam.getCode());
//排序
if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
@@ -135,6 +138,26 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
}).collect(Collectors.toList());
}
@Override
public void exportDictData(DictDataParam.DicTypeIdQueryParam queryParam) {
QueryWrapper<DictData> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotNull(queryParam)) {
queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "sys_dict_data.name", queryParam.getName())
.like(StrUtil.isNotBlank(queryParam.getCode()), "sys_dict_data.code", queryParam.getCode());
//排序
if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
} else {
//没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
queryWrapper.orderBy(true, true, "sys_dict_data.sort");
}
}
queryWrapper.ne("sys_dict_data.state", DataStateEnum.DELETED.getCode())
.eq("sys_dict_data.type_id", queryParam.getTypeId());
List<DictData> dictDatas = this.list(queryWrapper);
List<DictDataVO> dictDataVOS = BeanUtil.copyToList(dictDatas, DictDataVO.class);
ExcelUtil.exportExcel("字典数据导出数据.xls", "字典数据", DictDataVO.class, dictDataVOS);
}
/**

7
system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java
View File

@@ -30,7 +30,7 @@ public class DictPqServiceImpl extends ServiceImpl<DictPqMapper, DictPq> impleme
QueryWrapper<DictPq> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotNull(queryParam)) {
queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "sys_dict_pq.name", queryParam.getName())
.like(StrUtil.isNotBlank(queryParam.getOtherName()), "sys_dict_pq.orther_name", queryParam.getOtherName())
.like(StrUtil.isNotBlank(queryParam.getOtherName()), "sys_dict_pq.other_name", queryParam.getOtherName())
.like(StrUtil.isNotBlank(queryParam.getShowName()), "sys_dict_pq.show_name", queryParam.getShowName())
.eq(StrUtil.isNotBlank(queryParam.getDataType()), "sys_dict_pq.data_type", queryParam.getDataType())
.eq(StrUtil.isNotBlank(queryParam.getClassId()), "sys_dict_pq.class_id", queryParam.getClassId());
@@ -53,7 +53,6 @@ public class DictPqServiceImpl extends ServiceImpl<DictPqMapper, DictPq> impleme
BeanUtil.copyProperties(dictPqParam, dictPq);
//默认为正常状态
dictPq.setState(DataStateEnum.ENABLE.getCode());
System.out.println(dictPq.toString());
return this.save(dictPq);
}
@@ -74,7 +73,7 @@ public class DictPqServiceImpl extends ServiceImpl<DictPqMapper, DictPq> impleme
}
/**
* 校验参数，检查同一数据存储及相别下是否存在相同名称的字典项
* 校验参数，检查同一数据模型及相别下是否存在相同名称的字典项
*
* @param dictPqParam 字典项参数
* @param isExcludeSelf 是否排除自己
@@ -82,7 +81,7 @@ public class DictPqServiceImpl extends ServiceImpl<DictPqMapper, DictPq> impleme
private void checkDicPqName(DictPqParam dictPqParam, boolean isExcludeSelf) {
LambdaQueryWrapper<DictPq> dictPqLambdaQueryWrapper = new LambdaQueryWrapper<>();
dictPqLambdaQueryWrapper
.eq(StrUtil.isNotBlank(dictPqParam.getClassId()), DictPq::getClassId, dictPqParam.getClassId())
.eq(StrUtil.isNotBlank(dictPqParam.getDataType()), DictPq::getDataType, dictPqParam.getDataType())
.eq(StrUtil.isNotBlank(dictPqParam.getName()), DictPq::getName, dictPqParam.getName())
.eq(StrUtil.isNotBlank(dictPqParam.getPhase()), DictPq::getPhase, dictPqParam.getPhase())
.eq(DictPq::getState, DataStateEnum.ENABLE.getCode());

23
system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java
View File

@@ -36,8 +36,8 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> i
public Page<DictType> listDictTypes(DictTypeParam.DictTypeQueryParam queryParam) {
QueryWrapper<DictType> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotNull(queryParam)) {
queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "sys_dict_type.name", queryParam.getName());
queryWrapper.like(StrUtil.isNotBlank(queryParam.getCode()), "sys_dict_type.code", queryParam.getCode());
queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "sys_dict_type.name", queryParam.getName())
.like(StrUtil.isNotBlank(queryParam.getCode()), "sys_dict_type.code", queryParam.getCode());
//排序
if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
@@ -78,10 +78,21 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> i
@Override
public void exportDictType(DictTypeParam.DictTypeQueryParam queryParam) {
List<DictType> dictTypes = this.listDictTypes(queryParam).getRecords();
//List<DictTypeVO> dictTypeVOS = BeanUtil.copyToList(dictTypes, DictTypeVO.class);
List<DictTypeVO> dictTypeVOS = new ArrayList<>();
dictTypeVOS.add(new DictTypeVO("性别","SEX"));
QueryWrapper<DictType> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotNull(queryParam)) {
queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "sys_dict_type.name", queryParam.getName())
.like(StrUtil.isNotBlank(queryParam.getCode()), "sys_dict_type.code", queryParam.getCode());
//排序
if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
} else {
//没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
queryWrapper.orderBy(true, true, "sys_dict_type.sort");
}
}
queryWrapper.ne("sys_dict_type.state", DataStateEnum.DELETED.getCode());
List<DictType> dictTypes = this.list(queryWrapper);
List<DictTypeVO> dictTypeVOS = BeanUtil.copyToList(dictTypes, DictTypeVO.class);
ExcelUtil.exportExcel("字典类型导出数据.xls", "字典类型", DictTypeVO.class, dictTypeVOS);
}

2
system/src/main/java/com/njcn/gather/system/pojo/enums/SystemResponseEnum.java
View File

@@ -53,7 +53,7 @@ public enum SystemResponseEnum {
TIMER_NOT_EXISTED("A00361", "定时任务执行类不存在"),
EXE_EMPTY_PARAM("A00361", "请检查定时器的id，定时器cron表达式，定时任务是否为空！"),
DICT_PQ_NAME_EXIST("", "当前数据存储及相别下已存在相同名称"),
DICT_PQ_NAME_EXIST("A00389", "当前数据模型及相别下已存在相同名称"),
/**
* 审计日志模块异常响应
*/