From 7ba5730956fab5327b95110a8a70ff5ee025e35d Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 24 十月 2022 16:03:08 +0800
Subject: [PATCH] 放开短信测试
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 99 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 88 insertions(+), 11 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 3aabeaa..4cd935e 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -3,13 +3,19 @@
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.SysUser;
+import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ISysUserService;
+import com.dg.core.util.PermissionUtil;
+import com.dg.core.util.Snowflake;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.query.Param;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +33,12 @@
ISysUserService IUserService;
+ @Autowired
+ IGuideRepairOrderService iGuideRepairOrderService;
+
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
/**
* 查询列表
*
@@ -34,15 +46,19 @@
*/
@ApiOperation("用户列表接口")
@GetMapping("/getlist")
+ @Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
- @RequestParam(value = "pageSize",required = false) Integer pageSize)
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "keyword",required = false) String keyword,
+ @CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2");
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids);
- int num=IUserService.selectNum("2");
+ int num=IUserService.selectNum("2",keyword,ids);
return getDataTable(list,num);
}
@@ -70,22 +86,43 @@
return error("密码不能为空");
}
+ if(StringUtils.isEmpty(config.getPhonenumber()))
+ {
+ return error("手机号不能为空");
+ }
+
if(StringUtils.isEmpty(config.getUserName()))
{
return error("昵称不能为空");
}
- SysUser user = IUserService.getUserByAccount(config.getLoginName());
- if (user != null) {
- //提示用户名或密码错误
- return error("该账户已存在！");
+ if(StringUtils.isEmpty(config.getDepartmentId()))
+ {
+ return error("部门不能为空");
}
config.setUserType("2");
+ SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
+ if (user != null)
+ {
+ user.setPassword(config.getPassword());
+ user.setDepartmentId(config.getDepartmentId());
+ user.setUserName(config.getUserName());
+ user.setPhonenumber(config.getPhonenumber());
+ user.setLoginName(config.getLoginName());
+ user.setMasterIds(config.getMasterIds());
+ user.setRoleIds("2");
+ user.setUserType("2");
+ user.setStatus(config.getStatus());
+ user.setUpdateTime(LocalDateTime.now());
+ //提示用户名或密码错误
+ return toAjax(IUserService.updateConfig(user));
+ }
+ config.setRoleIds(2+"");
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
-
+ config.setUserId(Snowflake.getId()+"");
return toAjax(IUserService.insertConfig(config));
}
@@ -105,6 +142,12 @@
return error("userId不能为空");
}
+ if(StringUtils.isEmpty(config.getPhonenumber()))
+ {
+ return error("手机号不能为空");
+ }
+
+
if(StringUtils.isEmpty(config.getLoginName()))
{
return error("账户不能为空");
@@ -116,7 +159,7 @@
}
/**
- * 删除聊天记录
+ * 删除导办用户接口
*
* @return 结果
*/
@@ -129,11 +172,20 @@
{
return error("userId不能为空");
}
- return toAjax(IUserService.deleteConfigById(userId));
+
+ int a=iGuideRepairOrderService.countUser(userId,"2");
+ if(a>0)
+ {
+ return error("该人员有工单未处理完不能删除");
+ }
+ SysUser user=IUserService.selectData(userId,null,null);
+ user.setUserType("3");
+ user.setRoleIds("3");
+ return toAjax(IUserService.updateConfig(user));
}
/**
- * 修改空闲状态
+ * 修改导办用户空闲状态接口
*
* @param config 参数配置信息
* @return 结果
@@ -156,4 +208,29 @@
return toAjax(IUserService.updateConfig(config));
}
+ /**
+ * 根据部门id及分类id获取导办用户
+ *
+ * @return 结果
+ */
+ @ApiOperation("根据部门id及分类id获取导办用户")
+ @GetMapping("/selectListByDepartmentId")
+ @Authorization
+ public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId,
+ @RequestParam(value = "classifyId",required = false) String classifyId)
+ {
+ return ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
+ }
+
+ /**
+ * 查询导办用户列表（不分页）
+ * @return 结果
+ */
+ @ApiOperation(" 查询导办用户列表（不分页）")
+ @GetMapping("/queryList")
+ @Authorization
+ public ResultData queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
+ return ResultData.success(IUserService.queryList(2,keyWord));
+ }
+
}
--
Gitblit v1.7.1