From 1305d0aa469fe7330fd2f8e9fbb10d95042571be Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期一, 10 十月 2022 12:33:36 +0800
Subject: [PATCH] 应急系统和事故管理统计接口
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java
index ddb716c..14f2436 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java
@@ -1,24 +1,18 @@
package com.gkhy.safePlatform.targetDuty.controller;
-
-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.gkhy.safePlatform.targetDuty.entity.TargetType;
-import com.gkhy.safePlatform.targetDuty.service.TargetTypeService;
-import org.springframework.web.bind.annotation.*;
-import com.gkhy.safePlatform.commons.query.PageQuery;
-import com.gkhy.safePlatform.commons.utils.PageUtils;
-import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
+import com.gkhy.safePlatform.commons.query.PageQuery;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.targetDuty.entity.TargetType;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetTypeQueryCriteria;
+import com.gkhy.safePlatform.targetDuty.service.TargetTypeService;
+import com.gkhy.safePlatform.targetDuty.service.baseService.TargetTypeBaseService;
+import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.stream.Collectors;
import javax.annotation.Resource;
import java.io.Serializable;
-import java.util.List;
/**
* 目标分类(TargetType)表控制层
@@ -35,6 +29,9 @@
@Resource
private TargetTypeService targetTypeService;
+ @Resource
+ private TargetTypeBaseService targetTypeBaseService;
+
/**
* 分页查询所有数据
*
@@ -43,7 +40,7 @@
*/
@PostMapping(value = "/page/list")
public ResultVO selectAll(@RequestBody PageQuery<TargetTypeQueryCriteria> pageQuery){
- PageUtils.checkCheck(pageQuery);
+
return this.targetTypeService.queryAll(pageQuery);
}
@@ -68,7 +65,7 @@
*/
@GetMapping(value = "/selectOne/{id}")
public ResultVO selectOne(@PathVariable Serializable id) {
- return new ResultVO<>(ResultCodes.OK,this.targetTypeService.getById(id));
+ return new ResultVO<>(ResultCodes.OK,this.targetTypeBaseService.getById(id));
}
/**
@@ -80,9 +77,9 @@
@PostMapping(value = "/addOrUpdate")
public ResultVO update(@RequestBody TargetType targetType) {
if (targetType.getId() == null) {
- return new ResultVO<>(ResultCodes.OK,targetTypeService.save(targetType));
+ return new ResultVO<>(ResultCodes.OK,targetTypeBaseService.save(targetType));
} else {
- targetTypeService.update(targetType,new UpdateWrapper<TargetType>().eq("id",targetType.getId()));
+ targetTypeBaseService.update(targetType,new UpdateWrapper<TargetType>().eq("id",targetType.getId()));
return new ResultVO<>(ResultCodes.OK);
}
}
@@ -95,11 +92,7 @@
*/
@RequestMapping(value = "/delete",method = RequestMethod.POST)
public ResultVO delete(@RequestBody Long[] ids) {
- if(ids == null){
- return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
- }
- List<Long> idList = Arrays.asList(ids);
- this.targetTypeService.removeByIds(idList);
+ this.targetTypeService.delete(ids);
return new ResultVO<>(ResultCodes.OK);
}
}
\ No newline at end of file
--
Gitblit v1.9.2