From 61e78131b88698cf180b947f9486b70213140f90 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 27 九月 2022 17:24:18 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index 3bb5691..e39a1c3 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.Slideshow;
+import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.db.manual.pojo.QueryResults;
import com.dg.core.db.manual.pojo.RecommendResult;
@@ -33,10 +36,11 @@
*/
@ApiOperation("查询导办事务详情")
@GetMapping("/getData")
- public ResultData selectConfigData(@RequestParam("Id") String Id)
+ @Authorization
+ public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
Assert.notNull(Id, "Id 不能为空");
- return ResultData.success(iTransactionEventService.selectConfigData(Id));
+ return ResultData.success(iTransactionEventService.selectConfigData(Id,sysUser));
}
/**
@@ -78,6 +82,7 @@
*/
@ApiOperation("新增导办事务")
@PostMapping("/add")
+ @Authorization
public ResultData insertConfig(@RequestBody TransactionEvent entity)
{
return toAjax(iTransactionEventService.insertConfig(entity));
@@ -90,6 +95,7 @@
*/
@ApiOperation("修改导办事务")
@PostMapping("/update")
+ @Authorization
public ResultData updateConfig(@RequestBody TransactionEvent entity)
{
return toAjax(iTransactionEventService.updateConfig(entity));
@@ -102,6 +108,7 @@
*/
@ApiOperation("删除导办事务")
@DeleteMapping("/delete")
+ @Authorization
public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
{
@@ -130,6 +137,21 @@
return queryResults;
}
+ /**
+ * 导办事务搜索(无分页用于小程序)
+ * @param keyWord
+ * @return
+ */
+ @ApiOperation(value = "导办事务搜索(无分页用于小程序)",response = QueryResults.class)
+ @GetMapping("/queryKeyWord")
+ @Authorization
+ public QueryResults queryKeyWord(@RequestParam(value = "keyWord",required = false) String keyWord)
+ {
+ QueryResults queryResults = iTransactionEventService.queryMatterNameList(keyWord);
+ return queryResults;
+ }
+
+
/**
* 根据分离查询导办事务
@@ -140,6 +162,23 @@
@GetMapping("/queryByClassifyIdList")
public TableDataInfo queryByClassifyIdList(@RequestParam("classifyId") String classifyId,@RequestParam(required = false,name="departmentId") Integer departmentId){
return getDataTable(iTransactionEventService.queryByClassifyIdList(classifyId,departmentId),iTransactionEventService.countNumByClassifyIdList(classifyId,departmentId));
+ }
+
+ /**
+ * 根据分类id查询导办事务(分页)
+ * @param classifyId
+ * @return
+ */
+ @ApiOperation(value = "根据分类id查询导办事务(分页)",response = TransactionEvent.class)
+ @GetMapping("/queryByClassifyIdConfigList")
+ public TableDataInfo queryByClassifyIdConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam("classifyId") String classifyId,
+ @RequestParam(required = false,name="departmentId") Integer departmentId){
+ Assert.notNull(pageNum, "pageNum 不能为空");
+ Assert.notNull(pageSize, "pageSize 不能为空");
+ Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
+ return getDataTable(iTransactionEventService.queryByClassifyIdList(pageParam,pageSize,classifyId,departmentId),iTransactionEventService.countNumByClassifyIdList(classifyId,departmentId));
}
/**
@@ -180,6 +219,7 @@
*/
@ApiOperation(value = "智能咨询",response = RecommendResult.class)
@GetMapping("/smartConsulting")
+ @Authorization
public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
return iTransactionEventService.smartConsulting(keyWord);
--
Gitblit v1.7.1