From 2c22d1837a5c37c37d52871a38b59eff19e60ede Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 08 十一月 2022 11:15:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/system/controller/UserController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/crm/system/controller/UserController.java b/src/main/java/com/zy/crm/system/controller/UserController.java
index 1c760a5..e7d8a71 100644
--- a/src/main/java/com/zy/crm/system/controller/UserController.java
+++ b/src/main/java/com/zy/crm/system/controller/UserController.java
@@ -2,20 +2,22 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
import com.zy.crm.common.web.BaseController;
+import com.zy.crm.manager.entity.result.KeyValueVo;
import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.RoleService;
import com.zy.crm.system.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -69,7 +71,7 @@
return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
}
- @RequestMapping(value = "/mat/page/auth")
+ @RequestMapping(value = "/user/page/auth")
@ManagerAuth
public R page(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -109,8 +111,10 @@
if (userService.selectCount(new EntityWrapper<User>().eq("mobile", user.getMobile()))>0) {
return R.error("鎵嬫満鍙峰凡瀛樺湪");
}
+ user.setHostId(getHostId());
user.setStatus(1);
user.setCreateTime(new Date());
+ user.setPassword("827ccb0eea8a706c4c34a16891f84e7b"); //娣诲姞鐢ㄦ埛鏃讹紝榛樿瀵嗙爜 12345
userService.insert(user);
return R.ok();
}
@@ -171,4 +175,26 @@
return R.ok(result);
}
+
+ /*************************************** xm-select ***********************************************/
+
+ // xm-select 鎼滅储鍟嗗搧鍒楄〃
+ @RequestMapping("/user/all/get/kv")
+ @ManagerAuth
+ public R getUserDataKV(@RequestParam(required = false) String condition) {
+ Wrapper<User> wrapper = new EntityWrapper<User>()
+ .andNew().like("username", condition).or().like("nickname", condition)
+ .orderBy("create_time", false);
+ List<User> users = userService.selectPage(new Page<>(1, 30), wrapper).getRecords();
+ List<KeyValueVo> valueVos = new ArrayList<>();
+ for (User user : users) {
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(user.getNickname());
+ vo.setValue(user.getId());
+ valueVos.add(vo);
+ }
+ return R.ok().add(valueVos);
+ }
+
+
}
--
Gitblit v1.9.1