From a2fe05df1d03a088081fa5148fb4fd995740eb72 Mon Sep 17 00:00:00 2001 From: Zhang Liguo <482370576@qq.com> Date: Mon, 25 Dec 2023 14:17:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9Ecate=E5=92=8Clist=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lovenav/controller/ConfigController.java | 29 ++++++++++++------- .../com/lovenav/controller/NavController.java | 4 ++- .../controller/UrlAndCateController.java | 1 + .../lovenav/controller/UrlListController.java | 20 ++++++++++--- .../lovenav/controller/UserController.java | 23 +++++++++++++++ src/main/java/com/lovenav/dao/NavDao.java | 6 ++-- .../java/com/lovenav/dao/UrlCateListDao.java | 6 ++-- src/main/java/com/lovenav/dao/UrlListDao.java | 3 +- src/main/java/com/lovenav/entity/Config.java | 14 ++++----- .../java/com/lovenav/service/NavService.java | 4 ++- .../lovenav/service/UrlCateListService.java | 3 ++ .../com/lovenav/service/UrlListService.java | 1 + .../java/com/lovenav/service/UserService.java | 4 +++ .../service/serviceImpl/NavServiceImpl.java | 9 ++++-- .../serviceImpl/UrlCateListServiceImpl.java | 8 +++++ .../serviceImpl/UrlLiserServiceImpl.java | 13 +++++++++ .../service/serviceImpl/UserServiceImpl.java | 19 ++++++++++++ src/main/resources/mybatis/ConfigDao.xml | 12 ++++---- src/main/resources/mybatis/UrlCateListDao.xml | 11 +++++-- src/main/resources/mybatis/UrlListDao.xml | 8 ++++- 20 files changed, 158 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/lovenav/controller/ConfigController.java b/src/main/java/com/lovenav/controller/ConfigController.java index 39d8dc0..3bc8924 100644 --- a/src/main/java/com/lovenav/controller/ConfigController.java +++ b/src/main/java/com/lovenav/controller/ConfigController.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.text.SimpleDateFormat; import java.util.Date; @RestController @@ -20,9 +21,9 @@ public class ConfigController { @RequestMapping("/updateConfig") public String updateConfig(Config config){ Date date=new Date(); - int date1=Integer.valueOf(date.toString()); - config.setUpdatetime(date1); - if (config==null){ + try { + config.setUpdatetime(date.getTime()); + if (config.getName().equals("")||config.getValue().equals("")){ return "配置文件不能为空！"; } if (configService.updateConfig(config)==1){ @@ -32,18 +33,24 @@ public class ConfigController { else if (configService.updateConfig(config)==2){ return "不存在名称为"+config.getName()+"的配置文件，请先添加！"; } - return "更新失败！"; + return "更新失败！";}catch (NullPointerException e){ + return "请输入配置信息！"; + } } @RequestMapping("/addConfigString") public String addConfig(Config config){ - if (config.getName()==null||config.getValue()==null){ - return "属性值不能为空"; - }else { - Date date=new Date(); - int date1=Integer.valueOf(date.toString()); - config.setUpdatetime(date1); - return configService.addConfig(config); + try { + if (config.getName().equals("")||config.getValue().equals("")){ + return "属性值不能为空"; + }else { + Date date=new Date(); + config.setUpdatetime(date.getTime()); + return configService.addConfig(config); + } + }catch (NullPointerException e){ + return "请输入配置信息"; } + } } diff --git a/src/main/java/com/lovenav/controller/NavController.java b/src/main/java/com/lovenav/controller/NavController.java index 3124af0..3df5bfe 100644 --- a/src/main/java/com/lovenav/controller/NavController.java +++ b/src/main/java/com/lovenav/controller/NavController.java @@ -6,6 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.HashMap; + @RestController public class NavController { @Autowired @@ -34,7 +36,7 @@ public class NavController { } @RequestMapping("/selectAllNav") - public String selectAllNav(){ + public HashMap selectAllNav(){ return navService.selectAllNav(); } diff --git a/src/main/java/com/lovenav/controller/UrlAndCateController.java b/src/main/java/com/lovenav/controller/UrlAndCateController.java index f3c473f..c95a77a 100644 --- a/src/main/java/com/lovenav/controller/UrlAndCateController.java +++ b/src/main/java/com/lovenav/controller/UrlAndCateController.java @@ -675,4 +675,5 @@ public class UrlAndCateController { return JSONObject.toJSONString(result); } + } diff --git a/src/main/java/com/lovenav/controller/UrlListController.java b/src/main/java/com/lovenav/controller/UrlListController.java index e999443..64a8d15 100644 --- a/src/main/java/com/lovenav/controller/UrlListController.java +++ b/src/main/java/com/lovenav/controller/UrlListController.java @@ -9,10 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Set; +import java.util.*; @RestController public class UrlListController { @@ -119,4 +116,19 @@ public class UrlListController { result.put("data",urlListService.TopEight()); return JSONObject.toJSONString(result); } + + @RequestMapping("/getCateAndListNum") + public HashMapgetCateAndListNum(UrlCateList urlCateList){ + HashMapmap=new HashMap<>(); + if (urlCateList.getUserId()==null){ + map.put("msg","用户ID不能为空"); + return map; + } + List ss=new ArrayList<>(); + ss= (List) urlCateListService.countAllCateByUser(urlCateList).get("cateNum"); + map.put("cateNum", String.valueOf(ss.size())); + map.put("urlListNum", String.valueOf(urlListService.countUrlListByUserId(ss))); + return map; + + } } diff --git a/src/main/java/com/lovenav/controller/UserController.java b/src/main/java/com/lovenav/controller/UserController.java index e3a68b4..70fb31c 100644 --- a/src/main/java/com/lovenav/controller/UserController.java +++ b/src/main/java/com/lovenav/controller/UserController.java @@ -196,4 +196,27 @@ public class UserController { return userService.getAllUsers(); } + @RequestMapping("/updateUserDetails") + public String updateUserDetails(User user){ + if (user==null){ + return "用户不能为空！"; + } + return userService.updateUserMessage(user); + } + + @RequestMapping("/deleteUser") + public String deleteUser(User user){ + if (user==null){ + return "请输入删除的用户的信息ID！"; + } + return userService.deleteUser(user); + + } +// @RequestMapping("/updateStatus") +// public String updateStatus(User user){ +// if (user==null){ +// return "用户不能为空！"; +// } +// return userService.updateUserMessage(user); +// } } diff --git a/src/main/java/com/lovenav/dao/NavDao.java b/src/main/java/com/lovenav/dao/NavDao.java index c04327d..1e8d4f8 100644 --- a/src/main/java/com/lovenav/dao/NavDao.java +++ b/src/main/java/com/lovenav/dao/NavDao.java @@ -1,9 +1,11 @@ package com.lovenav.dao; import com.lovenav.entity.Nav; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; +import java.util.HashMap; import java.util.List; @Repository @@ -22,6 +24,6 @@ public interface NavDao { int updateByPrimaryKey(Nav record); Nav selectAlreadyExist(Nav nav); - - List