EventTemplate控制器编写

2022-09-29 19:23:41 +08:00
parent b5db5e1cda
commit 5385e7521b
11 changed files with 133 additions and 125 deletions
--- 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<Boolean> addDict(@RequestBody EventDictParam eventDictParam){
+    public HttpResult<Boolean> 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<Boolean> updateDict(@RequestBody EventDictParam.DictUpdateParam dictUpdateParam){
        String methodDescribe = getMethodDescribe("updateDict");
        LogUtil.njcnDebug(log, "{}，字典表数据数据为：{}", methodDescribe, dictUpdateParam);
--- 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<List<EventTemplate>> getList() {
        String methodDescribe = getMethodDescribe("getList");
-        List<EventTemplate> result = iEventTemplateService.getList();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+        List<EventTemplate> 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<Object> 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<Boolean> 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<EventTemplate> delete(@RequestBody List<String> ids){
        String methodDescribe = getMethodDescribe("delete");
        boolean result = iEventTemplateService.delete(ids);
--- 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<EventTemplate> {
     */
    List<EventTemplateTree> getAllList();

+    /**
+     * 删除模板和字典关系
+     * @param ids
+     * @return
+     */
+    Boolean deleteRelationship (@Param("ids")List<String> ids);
+
 }
--- 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">
 <mapper namespace="com.njcn.system.mapper.EventTemplateMapper">

-    <!--获取字典分页列表-->
-    <select id="page" resultType="EventTemplate">
-        SELECT report_template.*
-        FROM report_template report_template
-        WHERE ${ew.sqlSegment}
-    </select>
-
    <!--获取所有表数据-->
    <select id="getAllList" resultType="com.njcn.system.pojo.vo.EventTemplateTree">
        select id, name, type ,code
@@ -18,4 +11,13 @@
        where state = 1
    </select>

+    <!--删除模板与字典关系-->
+    <delete id="deleteRelationship">
+        DELETE FROM report_rel where Rt_id in
+        <foreach item="item" index="index" collection="ids" open="("
+                 separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
 </mapper>
--- 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<EventDictMapper, ReportDic
     */
    private void checkName(EventDictParam eventDictParam,boolean flag){
        LambdaQueryWrapper<ReportDict> 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);
--- 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<EventTemplateMapper, E
     */
    @Override
    public boolean delete(List<String> 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<EventTemplateMapper, E
        int result = this.count(lambdaQueryWrapper);
        //大于等于1个则表示重复
        if (result >= 1) {
-            throw new BusinessException(EventResponseEnum.DIC_NAME_REPEAT);
+            throw new BusinessException(EventResponseEnum.MODEL_NAME_REPEAT);
        }

    }