From 7f18439b123f74c499bb9ec7bc9da8617b24076c Mon Sep 17 00:00:00 2001 From: hanyong <1334742946@qq.com> Date: Fri, 23 Sep 2022 16:33:58 +0800 Subject: [PATCH] =?UTF-8?q?EventTemplate=E6=8E=A7=E5=88=B6=E5=99=A8?= =?UTF-8?q?=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/system/enums/TemplateTreeEnum.java | 6 +-- .../system/pojo/param/EventTemplateParam.java | 23 +++----- .../po/{EventDict.java => EventTemplate.java} | 22 +++----- .../controller/EventTemplateController.java | 38 ++++++------- .../system/mapper/EventTemplateMapper.java | 7 ++- .../mapper/mapping/EventTemplateMapper.xml | 6 +-- .../system/service/IEventTemplateService.java | 7 +-- .../system/service/impl/AuditServiceImpl.java | 3 +- .../impl/EventTemplateServiceImpl.java | 54 ++++++++----------- 9 files changed, 69 insertions(+), 97 deletions(-) rename pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/{EventDict.java => EventTemplate.java} (66%) diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/TemplateTreeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/TemplateTreeEnum.java index b9f5e1533..8c55b4be2 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/TemplateTreeEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/TemplateTreeEnum.java @@ -15,9 +15,9 @@ public enum TemplateTreeEnum { REPORT_LEVEL(0, "报告基础项"), LINE_LEVEL(1, "监测点"), DETAIL_LEVEL(2, "监测点详情"), - TRANS_LEVEL(2, "暂降事件列表表格"), - TRANS_D_LEVEL(2, "暂降密度图形"), - TRANS_R_LEVEL(2, "暂降原因表格"); + TRANS_LEVEL(3, "暂降事件列表表格"), + TRANS_D_LEVEL(4, "暂降密度图形"), + TRANS_R_LEVEL(5, "暂降原因表格"); private final Integer code; private final String message; diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java index 2fc7f9226..50de45966 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java @@ -22,22 +22,15 @@ public class EventTemplateParam { @Pattern(regexp = PatternRegex.DIC_REGEX, message = ValidMessage.NAME_FORMAT_ERROR) private String name; + @ApiModelProperty("模板名称") + @NotBlank(message = ValidMessage.CODE_NOT_BLANK) + @Pattern(regexp = PatternRegex.DES64_REGEX, message = ValidMessage.CODE_FORMAT_ERROR) + private String code; - @ApiModelProperty("父节点") - @NotBlank(message = ValidMessage.PID_NOT_BLANK) - @Pattern(regexp = PatternRegex.DIC_REGEX, message = ValidMessage.PID_FORMAT_ERROR) - private String pid; - - @ApiModelProperty("所有父节点") - private String pids; - - @ApiModelProperty("排序") - @NotNull(message = ValidMessage.SORT_NOT_NULL) - @Min(value = 0, message = ValidMessage.SORT_FORMAT_ERROR) - @Max(value = 999, message = ValidMessage.SORT_FORMAT_ERROR) - private Integer sort; - - + @ApiModelProperty("类型") + @NotBlank(message = ValidMessage.CODE_NOT_BLANK) + @Pattern(regexp = PatternRegex.TYPE_REGEX, message = ValidMessage.DICT_TYPE_ID_FORMAT_ERROR) + private String type; /** * 更新操作实体 diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventDict.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventTemplate.java similarity index 66% rename from pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventDict.java rename to pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventTemplate.java index a1aca1a5f..d1253ab95 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventDict.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventTemplate.java @@ -14,8 +14,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -@TableName(value = "report_template_dict") -public class EventDict extends BaseEntity { +@TableName(value = "report_template") +public class EventTemplate extends BaseEntity { private static final long serialVersionUID = 1L; @@ -30,28 +30,18 @@ public class EventDict extends BaseEntity { private String name; /** - * 描述 + * 类型 */ - private String describe; + private String type; /** - * 父节点 + * 模板名称 */ - private String pid; - - /** - * 上层所有父节点 - */ - private String pids; + private String code; /** * 状态：0-删除 1-正常 */ private Integer state; - /** - * 排序 - */ - private Integer sort; - } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java index e471892e1..94ece0c20 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java @@ -8,9 +8,8 @@ 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.EventTemplateParam; -import com.njcn.system.pojo.po.EventDict; +import com.njcn.system.pojo.po.EventTemplate; import com.njcn.system.pojo.vo.EventTemplateTree; -import com.njcn.system.pojo.vo.EventTemplateVO; import com.njcn.system.service.IEventTemplateService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -30,7 +29,7 @@ import java.util.List; * @date 2022/9/7 */ @Slf4j -@Api(tags = "事件模板") +@Api(tags = "报告模板") @RestController @RequestMapping("/EventTemplate") @RequiredArgsConstructor @@ -59,13 +58,13 @@ public class EventTemplateController extends BaseController{ * @date 2022/09/09 */ @OperateInfo(info = LogEnum.SYSTEM_COMMON) - @PostMapping("/getList") + @GetMapping("/getList") @ApiOperation("查询字典数据") @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) - public HttpResult> getList(@RequestBody @Validated EventTemplateParam.EventTemplateQueryParam queryParam) { + public HttpResult> getList(@RequestBody @Validated EventTemplateParam.EventTemplateQueryParam queryParam) { String methodDescribe = getMethodDescribe("getList"); LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam); - Page result = iEventTemplateService.getList(queryParam); + Page result = iEventTemplateService.getList(queryParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } @@ -76,11 +75,10 @@ public class EventTemplateController extends BaseController{ */ @PostMapping("/add") @OperateInfo(info = LogEnum.SYSTEM_COMMON) - @ApiOperation("新增") + @ApiOperation("新增模板") @ApiImplicitParam(name = "eventTemplateParam", value = "模板数据", required = true) - public HttpResult add(@RequestBody EventTemplateParam eventTemplateParam){ + public HttpResult add(@RequestBody @Validated EventTemplateParam eventTemplateParam){ String methodDescribe = getMethodDescribe("add"); - LogUtil.njcnDebug(log, "{}，模板数据为：{}", methodDescribe, eventTemplateParam); boolean result = iEventTemplateService.add(eventTemplateParam); if (result) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); @@ -96,11 +94,10 @@ public class EventTemplateController extends BaseController{ */ @PostMapping("/update") @OperateInfo(info = LogEnum.SYSTEM_COMMON) - @ApiOperation("修改字典") - @ApiImplicitParam(name = "eventDataUpdateParam", value = "字典表数据", required = true) - public HttpResult update(@RequestBody EventTemplateParam.EventTemplateUpdateParam eventUpdateParam){ + @ApiOperation("修改模板") + @ApiImplicitParam(name = "eventUpdateParam", value = "模板实体", required = true) + public HttpResult update(@RequestBody @Validated EventTemplateParam.EventTemplateUpdateParam eventUpdateParam){ String methodDescribe = getMethodDescribe("update"); - LogUtil.njcnDebug(log, "{}，字典表数据数据为：{}", methodDescribe, eventUpdateParam); boolean result = iEventTemplateService.update(eventUpdateParam); if (result) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); @@ -114,13 +111,16 @@ public class EventTemplateController extends BaseController{ * @author hany * @date 2022/09/08 */ - @DeleteMapping("/delete") + @PostMapping("/delete") @OperateInfo(info = LogEnum.SYSTEM_COMMON) - @ApiOperation("删除字典") - @ApiImplicitParam(name = "id", value = "字典表索引", required = true) - public HttpResult delete(@RequestParam("id") String id){ + @ApiOperation("删除模板") + @ApiImplicitParam(name = "ids", value = "模板ids", required = true) + public HttpResult delete(@RequestBody List ids){ String methodDescribe = getMethodDescribe("delete"); - iEventTemplateService.delete(id); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + boolean result = iEventTemplateService.delete(ids); + if(result){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java index 8474d8b64..4af31a78a 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java @@ -3,9 +3,8 @@ package com.njcn.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.system.pojo.po.EventDict; +import com.njcn.system.pojo.po.EventTemplate; import com.njcn.system.pojo.vo.EventTemplateTree; -import com.njcn.system.pojo.vo.EventTemplateVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,7 +13,7 @@ import java.util.List; * @author hany * @createTime 2022/09/08 */ -public interface EventTemplateMapper extends BaseMapper { +public interface EventTemplateMapper extends BaseMapper { /** * 返回所有树节点（全部report_template_dict表数据） @@ -30,5 +29,5 @@ public interface EventTemplateMapper extends BaseMapper { * @param queryWrapper 查询条件 * @return 字典数据 */ - Page page(@Param("page")Page page, @Param("ew")QueryWrapper queryWrapper); + Page page(@Param("page")Page page, @Param("ew") QueryWrapper queryWrapper); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml index e85583aac..24eef7fa7 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml @@ -5,9 +5,9 @@ - + SELECT report_template.* + FROM report_template report_template WHERE ${ew.sqlSegment} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java index f76d1e5f6..a097d9b76 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java @@ -2,7 +2,7 @@ package com.njcn.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.system.pojo.param.EventTemplateParam; -import com.njcn.system.pojo.po.EventDict; +import com.njcn.system.pojo.po.EventTemplate; import com.njcn.system.pojo.vo.EventTemplateTree; import java.util.List; @@ -24,7 +24,7 @@ public interface IEventTemplateService { * @param queryParam 查询参数 * @return 字典列表 */ - Page getList(EventTemplateParam.EventTemplateQueryParam queryParam); + Page getList(EventTemplateParam.EventTemplateQueryParam queryParam); /** * 新增 @@ -39,6 +39,7 @@ public interface IEventTemplateService { /** * 删除 + * @param ids 模板ids */ - boolean delete(String id); + boolean delete(List ids); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java index 873b625cc..360af8bbe 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.config.GeneralInfo; import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.poi.excel.ExcelUtil; import com.njcn.system.enums.AuditLogEnum; import com.njcn.system.mapper.AuditMapper; import com.njcn.system.mapper.UserLogMapper; @@ -135,7 +134,7 @@ public class AuditServiceImpl extends ServiceImpl implem File filePath = new File(generalInfo.getBusinessTempPath()); filePath.mkdirs(); File file = new File(filePath.getPath() + File.separator + nowTime +" sys_user_log.xlsx"); - ExcelUtil.exportExcelWithTargetFile(file, UserLogExcel.class, excelList); +// ExcelUtil.exportExcelWithTargetFile(file, UserLogExcel.class, excelList); //备份为txt // QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java index b099b54a5..4aed05df5 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; @@ -15,9 +14,8 @@ import com.njcn.system.enums.EventResponseEnum; import com.njcn.system.enums.TemplateTreeEnum; import com.njcn.system.mapper.EventTemplateMapper; import com.njcn.system.pojo.param.EventTemplateParam; -import com.njcn.system.pojo.po.EventDict; +import com.njcn.system.pojo.po.EventTemplate; import com.njcn.system.pojo.vo.EventTemplateTree; -import com.njcn.system.pojo.vo.EventTemplateVO; import com.njcn.system.service.IEventTemplateService; import com.njcn.web.factory.PageFactory; import lombok.AllArgsConstructor; @@ -36,7 +34,7 @@ import java.util.stream.Collectors; */ @Service @AllArgsConstructor -public class EventTemplateServiceImpl extends ServiceImpl implements IEventTemplateService { +public class EventTemplateServiceImpl extends ServiceImpl implements IEventTemplateService { private final EventTemplateMapper eventTemplateMapper; @@ -66,7 +64,7 @@ public class EventTemplateServiceImpl extends ServiceImpl getList(EventTemplateParam.EventTemplateQueryParam queryParam) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public Page getList(EventTemplateParam.EventTemplateQueryParam queryParam) { + QueryWrapper queryWrapper = new QueryWrapper<>(); if (ObjectUtil.isNotNull(queryParam)) { //查询参数不为空，进行条件填充 if (StrUtil.isNotBlank(queryParam.getSearchValue())) { - //字典类型表，仅提供名称模糊查询 + //字典类型表，仅提供名称和编码模糊查询 queryWrapper - .and(param -> param.like("report_template_dict.name", queryParam.getSearchValue())); + .and(param -> param.like("report_template.name",queryParam.getSearchValue()) + .or().like("report_template.code",queryParam.getSearchValue())); } //排序 if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) { queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy())); } else { - queryWrapper.eq("report_template_dict.pid",queryParam.getPid()); //没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序 - queryWrapper.orderBy(true, true, "report_template_dict.update_time"); + queryWrapper.orderBy(true, true, "report_template.update_time"); } } - queryWrapper.ne("report_template_dict.state", DataStateEnum.DELETED.getCode()); + queryWrapper.ne("report_template.state", DataStateEnum.DELETED.getCode()); //初始化分页数据 return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper); } /** - * 新增 + * 新增模板 * @author hany * @date 2022/09/08 */ @Override public boolean add(EventTemplateParam eventTemplateParam) { checkName(eventTemplateParam,true); - EventDict eventDict = new EventDict(); + EventTemplate eventDict = new EventTemplate(); BeanUtils.copyProperties(eventTemplateParam,eventDict); eventDict.setState(DataStateEnum.ENABLE.getCode()); return this.save(eventDict); } /** - * 修改 + * 修改模板 */ @Override public boolean update(EventTemplateParam.EventTemplateUpdateParam eventTemplateUpdateParam) { checkName(eventTemplateUpdateParam,false); - EventDict eventDict = new EventDict(); + EventTemplate eventDict = new EventTemplate(); BeanUtils.copyProperties(eventTemplateUpdateParam,eventDict); return this.updateById(eventDict); } /** - * 删除 + * 删除模板 + * @param ids */ @Override - public boolean delete(String id) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(EventDict::getPid,id).eq(EventDict::getState,DataStateEnum.ENABLE.getCode()); - int resCount = this.count(lambdaQueryWrapper); - if(resCount>0){ - throw new BusinessException(EventResponseEnum.CHILDREN_EXIT); - } - - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.lambda().eq(EventDict::getState,DataStateEnum.ENABLE.getCode()).set(EventDict::getState,DataStateEnum.DELETED.getCode()).eq(EventDict::getId,id); - return this.update(updateWrapper); + public boolean delete(List ids) { + return this.removeByIds(ids); } /** * 名称重复校验 */ private void checkName(EventTemplateParam eventTemplateParam,boolean flag){ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(EventDict::getName,eventTemplateParam.getName()) - .eq(EventDict::getState, DataStateEnum.ENABLE.getCode()); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(EventTemplate::getName,eventTemplateParam.getName()) + .eq(EventTemplate::getState, DataStateEnum.ENABLE.getCode()); //修改 if(!flag){ if(eventTemplateParam instanceof EventTemplateParam.EventTemplateUpdateParam ){ - lambdaQueryWrapper.ne(EventDict::getId,((EventTemplateParam.EventTemplateUpdateParam)eventTemplateParam).getId()); + lambdaQueryWrapper.ne(EventTemplate::getId,((EventTemplateParam.EventTemplateUpdateParam)eventTemplateParam).getId()); } } int res = this.count(lambdaQueryWrapper);