diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/ErpCategoryController.java b/src/main/java/com/mini/mybigscreen/biz/controller/ErpCategoryController.java index 34f4280..dd0546d 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/ErpCategoryController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/ErpCategoryController.java @@ -1,6 +1,7 @@ package com.mini.mybigscreen.biz.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mini.mybigscreen.Model.Message; import com.mini.mybigscreen.Model.Result; @@ -31,9 +32,9 @@ public class ErpCategoryController { @GetMapping("list") public Result> getList(String categoryType) { - QueryWrapper query = new QueryWrapper<>(); - query.eq(StrUtil.isNotBlank(categoryType), "category_type", categoryType) - .orderByDesc("create_time"); + LambdaQueryWrapper query = new LambdaQueryWrapper() + .eq(StrUtil.isNotBlank(categoryType), ErpCategory::getCategoryType, categoryType) + .orderByDesc(ErpCategory::getCreateTime); return Result.success(categoryService.list(query)); } diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/ErpTransactionFlowController.java b/src/main/java/com/mini/mybigscreen/biz/controller/ErpTransactionFlowController.java index 0b3a5c8..a8deb12 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/ErpTransactionFlowController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/ErpTransactionFlowController.java @@ -1,6 +1,7 @@ package com.mini.mybigscreen.biz.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mini.mybigscreen.Model.Message; import com.mini.mybigscreen.Model.PageResult; @@ -34,12 +35,12 @@ public class ErpTransactionFlowController { @GetMapping("list") public Result getList(Integer pageNum, Integer pageSize, String accountId, String flowName, String transactionType, String categoryId) { - QueryWrapper query = new QueryWrapper<>(); - query.like(StrUtil.isNotBlank(flowName), "flow_name", flowName) - .eq(StrUtil.isNotBlank(accountId), "account_id", accountId) - .eq(StrUtil.isNotBlank(categoryId), "category_id", categoryId) - .eq(StrUtil.isNotBlank(transactionType), "transaction_type", transactionType) - .orderByDesc("create_time"); + LambdaQueryWrapper query = new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(flowName), ErpTransactionFlow::getFlowName, flowName) + .eq(StrUtil.isNotBlank(accountId), ErpTransactionFlow::getAccountId, accountId) + .eq(StrUtil.isNotBlank(categoryId), ErpTransactionFlow::getCategoryId, categoryId) + .eq(StrUtil.isNotBlank(transactionType), ErpTransactionFlow::getTransactionType, transactionType) + .orderByDesc(ErpTransactionFlow::getCreateTime); List list = flowService.list(query); PageUtil util = new PageUtil<>(pageNum, pageSize, list); PageResult result = new PageResult<>(util.OkData(), pageNum, pageSize, list.size()); diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/HomeMenuController.java b/src/main/java/com/mini/mybigscreen/biz/controller/HomeMenuController.java index c43323c..51618d6 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/HomeMenuController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/HomeMenuController.java @@ -1,6 +1,7 @@ package com.mini.mybigscreen.biz.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mini.mybigscreen.Model.Menu; import com.mini.mybigscreen.Model.Message; @@ -35,11 +36,12 @@ public class HomeMenuController { @GetMapping("list") public Result getList(String menuName, String path, String ustatus, String menuId) { - QueryWrapper query = new QueryWrapper<>(); - query.like(StrUtil.isNotBlank(menuName), "menu_name", menuName) - .like(StrUtil.isNotBlank(path), "path", path) - .eq(StrUtil.isNotBlank(ustatus), "ustatus", ustatus) - .orderByAsc("sort").orderByDesc("create_time"); + LambdaQueryWrapper query = new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(menuName), HomeMenu::getMenuName, menuName) + .like(StrUtil.isNotBlank(path), HomeMenu::getPath, path) + .eq(StrUtil.isNotBlank(ustatus), HomeMenu::getUstatus, ustatus) + .orderByAsc(HomeMenu::getSort) + .orderByDesc(HomeMenu::getCreateTime); List allHomeMenus = menuService.list(query); if (StrUtil.isNotBlank(menuId)) { Map menuMap = allHomeMenus.stream() @@ -91,14 +93,14 @@ public class HomeMenuController { @GetMapping("treeList") public Result getTreeList() { List menuList = new ArrayList<>(); - QueryWrapper query = new QueryWrapper<>(); - query.eq("ustatus", "1") - .eq("parent_id", "0") - .orderByAsc("sort"); - List pMenus = menuService.list(query); + LambdaQueryWrapper parentQuery = new LambdaQueryWrapper() + .eq(HomeMenu::getUstatus, "1") + .eq(HomeMenu::getParentId, "0") + .orderByAsc(HomeMenu::getSort); + List pMenus = menuService.list(parentQuery); for (HomeMenu menu : pMenus) { - QueryWrapper childQuery = new QueryWrapper<>(); - childQuery.eq("parent_id", menu.getMenuId()); + LambdaQueryWrapper childQuery = new LambdaQueryWrapper() + .eq(HomeMenu::getParentId, menu.getMenuId()); List childMenus = menuService.list(childQuery); List treeMenus = childMenus.stream() .map(homeMenu -> { @@ -108,6 +110,7 @@ public class HomeMenuController { return treeMenu; }) .collect(Collectors.toList()); + menuList.add(new TreeMenu(menu.getMenuId(), menu.getMenuName(), treeMenus)); } return Result.success(menuList); @@ -117,14 +120,14 @@ public class HomeMenuController { @GetMapping("userList") public Result getUserList() { List menuList = new ArrayList<>(); - QueryWrapper query = new QueryWrapper<>(); - query.eq("ustatus", "1") - .eq("parent_id", "0") - .orderByAsc("sort"); - List pMenus = menuService.list(query); + LambdaQueryWrapper parentQuery = new LambdaQueryWrapper() + .eq(HomeMenu::getUstatus, "1") + .eq(HomeMenu::getParentId, "0") + .orderByAsc(HomeMenu::getSort); + List pMenus = menuService.list(parentQuery); for (HomeMenu menu : pMenus) { - QueryWrapper childQuery = new QueryWrapper<>(); - childQuery.eq("parent_id", menu.getMenuId()); + LambdaQueryWrapper childQuery = new LambdaQueryWrapper() + .eq(HomeMenu::getParentId, menu.getMenuId()); List childMenus = menuService.list(childQuery); menuList.add(new Menu( menu.getMenuId(), diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/HomeUserController.java b/src/main/java/com/mini/mybigscreen/biz/controller/HomeUserController.java index ac94e41..264297e 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/HomeUserController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/HomeUserController.java @@ -1,6 +1,7 @@ package com.mini.mybigscreen.biz.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.mini.mybigscreen.Model.Message; @@ -35,11 +36,11 @@ public class HomeUserController { @GetMapping("list") public Result getList(Integer pageNum, Integer pageSize, String userName, String uname, String ustatus) { - QueryWrapper query = new QueryWrapper<>(); - query.like(StrUtil.isNotBlank(uname), "uname", uname) - .eq(StrUtil.isNotBlank(ustatus), "ustatus", ustatus) - .eq(StrUtil.isNotBlank(userName), "user_name", userName) - .orderByDesc("create_time"); + LambdaQueryWrapper query = new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(uname), HomeUser::getUname, uname) + .eq(StrUtil.isNotBlank(ustatus), HomeUser::getUstatus, ustatus) + .eq(StrUtil.isNotBlank(userName), HomeUser::getUserName, userName) + .orderByDesc(HomeUser::getCreateTime); List list = userService.list(query); PageUtil util = new PageUtil<>(pageNum, pageSize, list); PageResult result = new PageResult<>(util.OkData(), pageNum, pageSize, list.size()); diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/IndexInfoController.java b/src/main/java/com/mini/mybigscreen/biz/controller/IndexInfoController.java index aad08c9..4f7522f 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/IndexInfoController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/IndexInfoController.java @@ -1,6 +1,7 @@ package com.mini.mybigscreen.biz.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mini.mybigscreen.Model.Message; import com.mini.mybigscreen.Model.Result; @@ -30,9 +31,9 @@ public class IndexInfoController { @GetMapping("list") public Result getList(String indexCode) { - QueryWrapper query = new QueryWrapper<>(); - query.eq(StrUtil.isNotBlank(indexCode), "index_code", indexCode) - .orderByAsc("sort"); + LambdaQueryWrapper query = new LambdaQueryWrapper() + .eq(StrUtil.isNotBlank(indexCode), IndexInfo::getIndexCode, indexCode) + .orderByAsc(IndexInfo::getSort); return Result.success(infoService.list(query)); } diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/ItemInfoController.java b/src/main/java/com/mini/mybigscreen/biz/controller/ItemInfoController.java index 1fa9daf..2ed016a 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/ItemInfoController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/ItemInfoController.java @@ -1,6 +1,7 @@ package com.mini.mybigscreen.biz.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mini.mybigscreen.Model.Message; import com.mini.mybigscreen.Model.Result; @@ -33,11 +34,10 @@ public class ItemInfoController { @GetMapping("list") public Result> getList(String itemCode, String reqParam) { - QueryWrapper query = new QueryWrapper<>(); - query.eq("item_code", itemCode) - .eq(StrUtil.isNotBlank(reqParam), "req_param", reqParam) - .eq("ym", DateUtils.dsValue()) - ; + LambdaQueryWrapper query = new LambdaQueryWrapper() + .eq(ItemInfo::getItemCode, itemCode) + .eq(StrUtil.isNotBlank(reqParam), ItemInfo::getReqParam, reqParam) + .eq(ItemInfo::getYm, DateUtils.dsValue()); return Result.success(infoService.list(query)); } diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/WebsiteStorageController.java b/src/main/java/com/mini/mybigscreen/biz/controller/WebsiteStorageController.java index f4cd608..771b0e5 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/WebsiteStorageController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/WebsiteStorageController.java @@ -1,6 +1,7 @@ package com.mini.mybigscreen.biz.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mini.mybigscreen.Model.Message; import com.mini.mybigscreen.Model.PageResult; @@ -35,9 +36,9 @@ public class WebsiteStorageController { @GetMapping("list") public Result getList(Integer pageNum, Integer pageSize, String websiteName) { - QueryWrapper query = new QueryWrapper<>(); - query.like(StrUtil.isNotBlank(websiteName), "website_name", websiteName) - .orderByDesc("create_time"); + LambdaQueryWrapper query = new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(websiteName), WebsiteStorage::getWebsiteName, websiteName) + .orderByDesc(WebsiteStorage::getCreateTime); List list = storageService.list(query); PageUtil util = new PageUtil<>(pageNum, pageSize, list); PageResult result = new PageResult<>(util.OkData(), pageNum, pageSize, list.size());