diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java index 29ee97da0..10de11f8b 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java @@ -56,6 +56,7 @@ public enum EventResponseEnum { NO_TABLE("501","字典表无influxDB表名数据"), DEV_LINE_EMPTY("501","设备监测点不可为空"), DIC_NAME_REPEAT("502","字典名称不可重复"), + MODEL_NAME_REPEAT("514","模板名称不可重复"), CHILDREN_EXIT("503","存在子节点，不可删除"), diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventDictParam.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventDictParam.java index 8346a13f6..de7a58d2a 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventDictParam.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventDictParam.java @@ -13,12 +13,6 @@ import javax.validation.constraints.Pattern; @Data public class EventDictParam { - /** - * 父级id - */ - @ApiModelProperty(value = "父级id") - private String pid; - /** * 字典表字段名称 */ @@ -31,6 +25,12 @@ public class EventDictParam { @ApiModelProperty(value = "字典表字段描述") private String describe; + /** + * 父级id + */ + @ApiModelProperty(value = "父级id") + private String pid; + /** * 更新操作实体 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 26b37df4e..acf24c630 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 @@ -25,7 +25,7 @@ public class EventTemplateParam { @ApiModelProperty("模板名称") @NotBlank(message = ValidMessage.CODE_NOT_BLANK) @Pattern(regexp = PatternRegex.DES64_REGEX, message = ValidMessage.CODE_FORMAT_ERROR) - private String code; + private String mark; @ApiModelProperty("类型") @NotBlank(message = ValidMessage.CODE_NOT_BLANK) diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventTemplate.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventTemplate.java index d1253ab95..ada2029e9 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventTemplate.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventTemplate.java @@ -13,8 +13,8 @@ import lombok.EqualsAndHashCode; * @createTime 2022/09/10 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName(value = "report_template") +@EqualsAndHashCode(callSuper = true) public class EventTemplate extends BaseEntity { private static final long serialVersionUID = 1L; @@ -37,7 +37,7 @@ public class EventTemplate extends BaseEntity { /** * 模板名称 */ - private String code; + private String mark; /** * 状态：0-删除 1-正常 diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java index 5e127e178..24d41dc60 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java @@ -16,6 +16,7 @@ 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.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -45,7 +46,7 @@ public class EventDictController extends BaseController { @OperateInfo(info = LogEnum.SYSTEM_COMMON) @ApiOperation("新增字典表") @ApiImplicitParam(name = "eventDictParam", value = "字典表数据", required = true) - public HttpResult addDict(@RequestBody EventDictParam eventDictParam){ + public HttpResult addDict(@RequestBody EventDictParam eventDictParam) { String methodDescribe = getMethodDescribe("addDict"); LogUtil.njcnDebug(log, "{}，字典表数据数据为：{}", methodDescribe, eventDictParam); boolean res = iEventDictService.addDict(eventDictParam); @@ -64,7 +65,7 @@ public class EventDictController extends BaseController { @PostMapping("/updateDict") @OperateInfo(info = LogEnum.SYSTEM_COMMON) @ApiOperation("更新字典表") - @ApiImplicitParam(name = "dictUpadateParam", value = "更新字典表实体", required = true) + @ApiImplicitParam(name = "dictUpdateParam", value = "更新字典表实体", required = true) public HttpResult updateDict(@RequestBody EventDictParam.DictUpdateParam dictUpdateParam){ String methodDescribe = getMethodDescribe("updateDict"); LogUtil.njcnDebug(log, "{}，字典表数据数据为：{}", methodDescribe, dictUpdateParam); 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 5885271c9..97eb65313 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 @@ -29,9 +29,9 @@ import java.util.Objects; * @date 2022/9/7 */ @Slf4j -@Api(tags = "报告模板") @RestController @RequestMapping("/EventTemplate") +@Api(tags = "报告模板管理") @RequiredArgsConstructor @Validated public class EventTemplateController extends BaseController{ @@ -45,12 +45,12 @@ public class EventTemplateController extends BaseController{ * @date 2022/09/09 */ @OperateInfo(info = LogEnum.SYSTEM_COMMON) - @GetMapping("/getList") - @ApiOperation("查询模板数据") + @PostMapping("/getList") + @ApiOperation("查询所有模板") public HttpResult> getList() { String methodDescribe = getMethodDescribe("getList"); - List result = iEventTemplateService.getList(); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + List list = iEventTemplateService.getList(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } /** @@ -81,7 +81,7 @@ public class EventTemplateController extends BaseController{ @PostMapping("/add") @OperateInfo(info = LogEnum.SYSTEM_COMMON) @ApiOperation("新增模板") - @ApiImplicitParam(name = "eventTemplateParam", value = "模板数据", required = true) + @ApiImplicitParam(name = "eventTemplateParam", value = "模板实体", required = true) public HttpResult add(@RequestBody @Validated EventTemplateParam eventTemplateParam){ String methodDescribe = getMethodDescribe("add"); boolean result = iEventTemplateService.add(eventTemplateParam); @@ -100,7 +100,7 @@ public class EventTemplateController extends BaseController{ @PostMapping("/update") @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE) @ApiOperation("修改模板") - @ApiImplicitParam(name = "eventUpdateParam", value = "模板实体", required = true) + @ApiImplicitParam(name = "eventUpdateParam", value = "模板更新实体", required = true) public HttpResult update(@RequestBody @Validated EventTemplateParam.EventTemplateUpdateParam eventUpdateParam){ String methodDescribe = getMethodDescribe("update"); boolean result = iEventTemplateService.update(eventUpdateParam); @@ -120,7 +120,7 @@ public class EventTemplateController extends BaseController{ @PostMapping("/delete") @OperateInfo(info = LogEnum.SYSTEM_COMMON) @ApiOperation("删除模板") - @ApiImplicitParam(name = "ids", value = "模板ids", required = true) + @ApiImplicitParam(name = "ids", value = "模板索引", required = true) public HttpResult delete(@RequestBody List ids){ String methodDescribe = getMethodDescribe("delete"); boolean result = iEventTemplateService.delete(ids); 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 4b6982131..8ca200c67 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,6 +3,7 @@ package com.njcn.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.system.pojo.po.EventTemplate; import com.njcn.system.pojo.vo.EventTemplateTree; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,4 +20,11 @@ public interface EventTemplateMapper extends BaseMapper { */ List getAllList(); + /** + * 删除模板和字典关系 + * @param ids + * @return + */ + Boolean deleteRelationship (@Param("ids")List ids); + } 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 14eb4d72a..e62d3fbb6 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 @@ -4,13 +4,6 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - + + + DELETE FROM report_rel where Rt_id in + + #{item} + + + \ No newline at end of file diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java index 09d9d4575..60002b7bb 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java @@ -120,12 +120,13 @@ public class EventDictServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ReportDict::getName,eventDictParam.getName()) + lambdaQueryWrapper + .eq(ReportDict::getName,eventDictParam.getName()) .eq(ReportDict::getState, DataStateEnum.ENABLE.getCode()); //修改 if(!flag){ if(eventDictParam instanceof EventDictParam.DictUpdateParam ){ - lambdaQueryWrapper.ne(ReportDict::getId,((EventDictParam.DictUpdateParam)eventDictParam).getId()); + lambdaQueryWrapper.ne(ReportDict::getId, ((EventDictParam.DictUpdateParam) eventDictParam).getId()); } } int res = this.count(lambdaQueryWrapper); 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 667637edd..1a7208100 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 @@ -12,6 +12,7 @@ import com.njcn.system.mapper.EventTemplateMapper; import com.njcn.system.pojo.param.EventTemplateParam; import com.njcn.system.pojo.po.EventTemplate; import com.njcn.system.service.IEventTemplateService; +import com.njcn.user.pojo.po.Role; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -81,7 +82,9 @@ public class EventTemplateServiceImpl extends ServiceImpl ids) { - return this.removeByIds(ids); + //删除模板与字典的关系 + this.baseMapper.deleteRelationship(ids); + return this.lambdaUpdate().set(EventTemplate::getState, DataStateEnum.DELETED.getCode()).in(EventTemplate::getId, ids).update(); } /** @@ -100,7 +103,7 @@ public class EventTemplateServiceImpl extends ServiceImpl= 1) { - throw new BusinessException(EventResponseEnum.DIC_NAME_REPEAT); + throw new BusinessException(EventResponseEnum.MODEL_NAME_REPEAT); } } diff --git a/pqs.iws b/pqs.iws index 4ff2127de..fb08a4bf7 100644 --- a/pqs.iws +++ b/pqs.iws @@ -2,23 +2,15 @@ - - - - - - - - - - - + + - + + - + @@ -266,70 +258,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -548,7 +491,7 @@ - + - - - @@ -865,12 +859,10 @@ - - - +