org.springframework.boot
spring-boot-starter-test
diff --git a/wms/src/main/java/com/yc/wms/controller/MenuController.java b/wms/src/main/java/com/yc/wms/controller/MenuController.java
index fa018e9..f521400 100644
--- a/wms/src/main/java/com/yc/wms/controller/MenuController.java
+++ b/wms/src/main/java/com/yc/wms/controller/MenuController.java
@@ -1,18 +1,11 @@
package com.yc.wms.controller;
-import com.yc.wms.model.Menu;
-import com.yc.wms.service.MenuService;
-import com.yc.wms.until.Result;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
-
/**
*
* 前端控制器
@@ -25,17 +18,11 @@ import java.util.List;
@RequestMapping("/menu")
public class MenuController {
- @Autowired
- private MenuService menuService;
-
+
/**
* 查询菜单
* @param roleId
* @return
*/
- @GetMapping("/queryMenu")
- public Result queryMenu(@RequestParam String roleId) {
- List list=menuService.lambdaQuery().like(Menu::getMenuRight,roleId).list();
- return Result.success(list);
- }
+
}
diff --git a/wms/src/main/java/com/yc/wms/controller/UserController.java b/wms/src/main/java/com/yc/wms/controller/UserController.java
index 94c6e82..69ffc7c 100644
--- a/wms/src/main/java/com/yc/wms/controller/UserController.java
+++ b/wms/src/main/java/com/yc/wms/controller/UserController.java
@@ -1,13 +1,6 @@
package com.yc.wms.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yc.wms.model.Menu;
-import com.yc.wms.model.User;
import com.yc.wms.service.DcxService;
-import com.yc.wms.service.MenuService;
-import com.yc.wms.service.UserService;
import com.yc.wms.until.QueryPageUtil;
import com.yc.wms.until.Result;
import lombok.extern.slf4j.Slf4j;
@@ -15,13 +8,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
-import springfox.documentation.spring.web.json.Json;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
/**
@@ -37,11 +27,7 @@ import java.util.List;
@RequestMapping("/user")
public class UserController {
- @Autowired
- private UserService userService;
- @Autowired
- private MenuService menuService;
@Autowired
private DcxService dcxService;
@@ -51,7 +37,7 @@ public class UserController {
* 登录
*/
@PostMapping ("/login")
- public Result login(@RequestBody User user) {
+ public Result login(@RequestBody String user) {
// Result result = null;
// List list= userService.lambdaQuery()
// .eq(User::getUserNo,user.getUserNo())
@@ -133,71 +119,10 @@ public class UserController {
return dcxService.readJson(query);
}
- /**
- * @return
- * @param新增或修改
- */
- @PostMapping("/addorupdate")
- public Result addorupdate(@RequestBody User user) {
- Result results = null;
- boolean result = userService.saveOrUpdate(user);
- if (result) {
- results = Result.success();
- } else {
- results = Result.fail();
- }
- return results;
- }
- /**
- * @return
- * @param删除用户
- */
- @GetMapping("/deleteUser")
- public Result deleteUser(String ids) {
- Result result = null;
- if (ids != null && ids.length() > 0) {
- List uersIds = Arrays.asList(ids.split(","));
- for (String id : uersIds) {
- userService.removeById(Integer.parseInt(id));
- }
- result = Result.success();
- } else {
- result = Result.fail("参数为null");
- }
- return result;
- }
- /**
- * @return
- * @param判断账号是否存在
- */
- @GetMapping("/queryuserNo")
- public Result queryuserNo(@RequestParam String userNo, @RequestParam long id) {
- Result result = null;
- if (id > 0) {
- List list = userService.lambdaQuery().eq(User::getUserNo, userNo).list();
- if (list.size() > 0) {
- if (list.get(0).getId() == id && list.get(0).getUserNo().equals(userNo)) {
- result = Result.fail();
- } else {
- result = Result.success(list);
- }
- } else {
- result = Result.fail();
- }
- } else {
- List list = userService.lambdaQuery().eq(User::getUserNo, userNo).list();
- if (list.size() > 0) {
- result = Result.success(list);
- } else {
- result = Result.fail();
- }
- }
- return result;
- }
}
diff --git a/wms/src/main/java/com/yc/wms/mapper/MenuMapper.java b/wms/src/main/java/com/yc/wms/mapper/MenuMapper.java
deleted file mode 100644
index 07b2cca..0000000
--- a/wms/src/main/java/com/yc/wms/mapper/MenuMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.yc.wms.mapper;
-
-import com.yc.wms.model.Menu;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author wms
- * @since 2023-07-07
- */
-@Mapper
-public interface MenuMapper extends BaseMapper