From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 107 insertions(+), 11 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 43439b1..f58bfe8 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
@@ -4,23 +4,37 @@
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.AjaxResult;
+import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
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;
import com.dg.core.db.manual.pojo.Search;
+import com.dg.core.file.FtpConstants;
+import com.dg.core.file.MimeTypeUtils;
+import com.dg.core.file.SFTPUtil;
+import com.dg.core.service.IAutomessageSmartConsultingService;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.InputStream;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
+import java.util.UUID;
+
+import static com.dg.core.file.FileTypeUploadUtils.assertAllowed;
@Api(tags = {"导办事项管理接口"})
@RestController
@@ -34,6 +48,9 @@
@Autowired(required = true)
IOrganizationChartService iOrganizationChartService;
+
+ @Autowired(required = true)
+ IAutomessageSmartConsultingService iAutomessageSmartConsultingService;
/**
* 查询导办事务详情
@@ -61,15 +78,45 @@
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "keyword",required = false) String keyword,
@RequestParam(value = "classifyGrade",required = false) String classifyGrade,
+ @RequestParam(value = "departmentId",required = false) String departmentId,
@CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
- List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
- classifyGrade,ids);
- int num=iTransactionEventService.countNum(keyword,classifyGrade,ids);
+ List<TransactionEvent> list;
+ int num;
+ if (departmentId!=null&&departmentId.length()>0){
+ List<String> ids=iOrganizationChartService.getDepartmentId(departmentId);
+ list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
+ classifyGrade,ids);
+ num=iTransactionEventService.countNum(keyword,classifyGrade,ids);
+
+ }else {
+ list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
+ classifyGrade,null);
+ num=iTransactionEventService.countNum(keyword,classifyGrade,null);
+ }
+ return getDataTable(list,num);
+ }
+
+ /**
+ * 导办事物列表
+ * @param
+ * @return
+ */
+ @ApiOperation("根据部门id获取导办事物列表")
+ @PostMapping("/department/getList")
+ @Authorization
+ public TableDataInfo<TransactionEvent> selectConfigList(@RequestBody List<String> DepartmentId,
+ @CurrentUser SysUser sysUser)
+ {
+ if(DepartmentId==null||DepartmentId.size()<1)
+ {
+ DepartmentId=null;
+ }
+ List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,DepartmentId);
+ int num=iTransactionEventService.countNum(null,null,DepartmentId);
return getDataTable(list,num);
}
@@ -80,9 +127,9 @@
*/
@ApiOperation(value = "导办事物列表(不分页)",response = TransactionEvent.class)
@GetMapping("/selectList")
- public TableDataInfo selectList()
+ public TableDataInfo selectList(@RequestParam(value = "keyWord",required = false) String keyWord)
{
- return getDataTable(iTransactionEventService.selectList());
+ return getDataTable(iTransactionEventService.selectList(keyWord));
}
/**
@@ -151,7 +198,11 @@
{
Assert.notNull(Id, "Id 不能为空");
- return toAjax(iTransactionEventService.deleteConfigById(Id));
+ int i = iTransactionEventService.deleteConfigById(Id);
+ if (i>0)
+ return ResultData.success("删除成功");
+ else
+ return ResultData.error("删除失败可能该工单有单据");
}
/**
@@ -187,7 +238,7 @@
@GetMapping("/queryByClassifyIdConfigList")
public TableDataInfo queryByClassifyIdConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam("classifyId") String classifyId,
+ @RequestParam(value = "classifyId",required = false) String classifyId,
@RequestParam(required = false,name="departmentId") Integer departmentId){
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
@@ -233,9 +284,15 @@
*/
@ApiOperation(value = "智能咨询",response = RecommendResult.class)
@GetMapping("/smartConsulting")
- public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
+ public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord,@CurrentUser SysUser sysUser){
+ AutomessageSmartConsulting automessageSmartConsulting = new AutomessageSmartConsulting();
+ if (sysUser!=null){
+ automessageSmartConsulting.setCreateUserId(sysUser.getUserId());
+ }
+ automessageSmartConsulting.setType(2);
+ automessageSmartConsulting.setCreateTime(LocalDateTime.now());
+ iAutomessageSmartConsultingService.add(automessageSmartConsulting);
return iTransactionEventService.smartConsulting(keyWord);
-
}
@@ -245,7 +302,8 @@
*/
@ApiOperation(value = "办事指南复制",response = ResultData.class)
@GetMapping("/copy")
- public ResultData copy(@RequestParam("Id") String Id)
+ @Authorization
+ public ResultData copy(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
if(StringUtils.isEmpty(Id))
{
@@ -257,11 +315,49 @@
{
return ResultData.error("复制项不存在");
}
+
+ transactionEvent.setDepartmentId(sysUser.getDepartmentId());
+ transactionEvent.setMatterName(transactionEvent.getMatterName()+"(副本)");
+
transactionEvent.setId(null);
return toAjax(iTransactionEventService.insertConfig(transactionEvent));
}
+ /**
+ * 办事指南根据分类id筛选
+ * @return
+ */
+ @ApiOperation(value = "办事指南根据分类id筛选",response = ResultData.class)
+ @GetMapping("/selectClassifyList")
+ @Authorization
+ public TableDataInfo<TransactionEvent> selectClassifyList(@RequestParam("ids") List<String> ids)
+ {
+ if(ids==null || ids.size()<1)
+ {
+ ids=null;
+ }
+ return getDataTable(iTransactionEventService.selectClassifyList(ids));
+ }
+
+ @ApiOperation("文件导入")
+ @PostMapping("/import")
+ public ResultData uploadFiles(MultipartFile file) throws Exception
+ {
+ boolean a = false;
+ String fileName = file.getOriginalFilename();
+ Integer b = iTransactionEventService.batchImport(fileName, file);
+ if (b == 3) {//
+ return ResultData.success("全部导入成功");//全部导入成功
+ } else if (b == 2) {
+ return ResultData.success("部分导入成功");//部分导入成功
+ } else if (b == 0) {
+ return ResultData.error("部分失败");//导入失败
+ }
+ return ResultData.error("部分失败");//导入失败
+ }
+
+
--
Gitblit v1.7.1