From eb799045749bfe49a5f05808b7b6f1d8dc188b69 Mon Sep 17 00:00:00 2001 From: longda <17868877553@163.com> Date: Sat, 4 Aug 2018 16:42:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?2018/8/4=E6=95=B0=E6=8D=AE=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/info/controller/ColorController.java | 43 +++++++++++++++++++ .../com/pro/info/controller/controller.java | 4 -- .../java/com/pro/info/mapper/ColorMapper.java | 12 ++++++ src/main/java/com/pro/info/mapper/mapper.java | 4 -- .../com/pro/info/service/ColorService.java | 11 +++++ .../info/service/impl/ColorServiceImpl.java | 29 +++++++++++++ .../pro/info/service/impl/serviceimpl.java | 4 -- .../java/com/pro/info/service/service.java | 4 -- .../info/{mapper.xml => ColorMapper.xml} | 5 ++- src/main/web/WEB-INF/views/info/color.jsp | 41 ++++++++++++++++++ src/main/web/WEB-INF/views/info/info.jsp | 16 ------- src/main/web/WEB-INF/views/sys/home.jsp | 36 ++++++++-------- 12 files changed, 158 insertions(+), 51 deletions(-) create mode 100644 src/main/java/com/pro/info/controller/ColorController.java delete mode 100644 src/main/java/com/pro/info/controller/controller.java create mode 100644 src/main/java/com/pro/info/mapper/ColorMapper.java delete mode 100644 src/main/java/com/pro/info/mapper/mapper.java create mode 100644 src/main/java/com/pro/info/service/ColorService.java create mode 100644 src/main/java/com/pro/info/service/impl/ColorServiceImpl.java delete mode 100644 src/main/java/com/pro/info/service/impl/serviceimpl.java delete mode 100644 src/main/java/com/pro/info/service/service.java rename src/main/resources/mapper/info/{mapper.xml => ColorMapper.xml} (48%) create mode 100644 src/main/web/WEB-INF/views/info/color.jsp delete mode 100644 src/main/web/WEB-INF/views/info/info.jsp diff --git a/src/main/java/com/pro/info/controller/ColorController.java b/src/main/java/com/pro/info/controller/ColorController.java new file mode 100644 index 0000000..936cee5 --- /dev/null +++ b/src/main/java/com/pro/info/controller/ColorController.java @@ -0,0 +1,43 @@ +package com.pro.info.controller; + +import com.github.pagehelper.PageInfo; +import com.pro.info.entity.Color; +import com.pro.info.service.ColorService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/info") +public class ColorController { + @Autowired + private ColorService colorService; + + @RequestMapping("a") + public String aaa(){ + return "info/color"; + } + + + @RequestMapping(value = "colors") + @ResponseBody + public Map getColor(@RequestParam(value = "page",defaultValue = "1") Integer page,@RequestParam(value = "limit") Integer limit){ + List colors = colorService.getColor(); + System.out.println(colors.size()); + Map map = new HashMap(); + PageInfo pageInfo = new PageInfo(colors); + map.put("code",0); + map.put("data",colors); + map.put("count",colors.size()); + map.put("msg",""); + return map; + } + + +} diff --git a/src/main/java/com/pro/info/controller/controller.java b/src/main/java/com/pro/info/controller/controller.java deleted file mode 100644 index 9905725..0000000 --- a/src/main/java/com/pro/info/controller/controller.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pro.info.controller; - -public class controller { -} diff --git a/src/main/java/com/pro/info/mapper/ColorMapper.java b/src/main/java/com/pro/info/mapper/ColorMapper.java new file mode 100644 index 0000000..751a699 --- /dev/null +++ b/src/main/java/com/pro/info/mapper/ColorMapper.java @@ -0,0 +1,12 @@ +package com.pro.info.mapper; + +import com.pro.info.entity.Color; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; +import java.util.Map; + +@MapperScan +public interface ColorMapper { + List getColor(); +} diff --git a/src/main/java/com/pro/info/mapper/mapper.java b/src/main/java/com/pro/info/mapper/mapper.java deleted file mode 100644 index b54623a..0000000 --- a/src/main/java/com/pro/info/mapper/mapper.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pro.info.mapper; - -public class mapper { -} diff --git a/src/main/java/com/pro/info/service/ColorService.java b/src/main/java/com/pro/info/service/ColorService.java new file mode 100644 index 0000000..3f37af5 --- /dev/null +++ b/src/main/java/com/pro/info/service/ColorService.java @@ -0,0 +1,11 @@ +package com.pro.info.service; + +import com.pro.info.entity.Color; + +import java.util.List; + +public interface ColorService { + List getColor(); +//public PageInfo getColor(int page, int pageSize); + +} diff --git a/src/main/java/com/pro/info/service/impl/ColorServiceImpl.java b/src/main/java/com/pro/info/service/impl/ColorServiceImpl.java new file mode 100644 index 0000000..f7c12ca --- /dev/null +++ b/src/main/java/com/pro/info/service/impl/ColorServiceImpl.java @@ -0,0 +1,29 @@ +package com.pro.info.service.impl; + +import com.github.pagehelper.PageHelper; +import com.pro.info.entity.Color; +import com.pro.info.mapper.ColorMapper; +import com.pro.info.service.ColorService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ColorServiceImpl implements ColorService { + @Autowired + private ColorMapper colorMapper; + + + +// @Override +// public PageInfo getColor(int page, int pageSize) { +// PageHelper.startPage(page, pageSize); +// List list = colorMapper.getColor(); +// return new PageInfo(list); +// } + @Override + public List getColor() { + return colorMapper.getColor(); + } +} diff --git a/src/main/java/com/pro/info/service/impl/serviceimpl.java b/src/main/java/com/pro/info/service/impl/serviceimpl.java deleted file mode 100644 index 8b00d99..0000000 --- a/src/main/java/com/pro/info/service/impl/serviceimpl.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pro.info.service.impl; - -public class serviceimpl { -} diff --git a/src/main/java/com/pro/info/service/service.java b/src/main/java/com/pro/info/service/service.java deleted file mode 100644 index efab91e..0000000 --- a/src/main/java/com/pro/info/service/service.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pro.info.service; - -public class service { -} diff --git a/src/main/resources/mapper/info/mapper.xml b/src/main/resources/mapper/info/ColorMapper.xml similarity index 48% rename from src/main/resources/mapper/info/mapper.xml rename to src/main/resources/mapper/info/ColorMapper.xml index 926124d..3d8234d 100644 --- a/src/main/resources/mapper/info/mapper.xml +++ b/src/main/resources/mapper/info/ColorMapper.xml @@ -1,7 +1,10 @@ - + + \ No newline at end of file diff --git a/src/main/web/WEB-INF/views/info/color.jsp b/src/main/web/WEB-INF/views/info/color.jsp new file mode 100644 index 0000000..fbb79f4 --- /dev/null +++ b/src/main/web/WEB-INF/views/info/color.jsp @@ -0,0 +1,41 @@ +<%-- + Created by IntelliJ IDEA. + User: lenovo + Date: 2018/8/2 + Time: 15:40 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + Title + + + +
+ + + + + + diff --git a/src/main/web/WEB-INF/views/info/info.jsp b/src/main/web/WEB-INF/views/info/info.jsp deleted file mode 100644 index f84c64f..0000000 --- a/src/main/web/WEB-INF/views/info/info.jsp +++ /dev/null @@ -1,16 +0,0 @@ -<%-- - Created by IntelliJ IDEA. - User: lenovo - Date: 2018/8/2 - Time: 15:40 - To change this template use File | Settings | File Templates. ---%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - Title - - - - - diff --git a/src/main/web/WEB-INF/views/sys/home.jsp b/src/main/web/WEB-INF/views/sys/home.jsp index 2e66fe2..b5f9d5c 100644 --- a/src/main/web/WEB-INF/views/sys/home.jsp +++ b/src/main/web/WEB-INF/views/sys/home.jsp @@ -137,29 +137,29 @@
- + <%----%> -
- - - + <%----%> + <%--
--%> + <%----%> + 花色维护
-- Gitee From 58340058944944196dd3838687061fda46b52a3b Mon Sep 17 00:00:00 2001 From: longda <17868877553@163.com> Date: Mon, 6 Aug 2018 09:52:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?2018/8/6=E6=95=B0=E6=8D=AE=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/info/controller/ColorController.java | 4 ++ src/main/web/WEB-INF/views/info/color.jsp | 56 +++++++++++++++++-- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/pro/info/controller/ColorController.java b/src/main/java/com/pro/info/controller/ColorController.java index 936cee5..4fdd229 100644 --- a/src/main/java/com/pro/info/controller/ColorController.java +++ b/src/main/java/com/pro/info/controller/ColorController.java @@ -1,5 +1,6 @@ package com.pro.info.controller; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pro.info.entity.Color; import com.pro.info.service.ColorService; @@ -28,6 +29,9 @@ public class ColorController { @RequestMapping(value = "colors") @ResponseBody public Map getColor(@RequestParam(value = "page",defaultValue = "1") Integer page,@RequestParam(value = "limit") Integer limit){ + + PageHelper.startPage(page,limit); + System.out.println(page+"-------"+limit); List colors = colorService.getColor(); System.out.println(colors.size()); Map map = new HashMap(); diff --git a/src/main/web/WEB-INF/views/info/color.jsp b/src/main/web/WEB-INF/views/info/color.jsp index fbb79f4..139bc09 100644 --- a/src/main/web/WEB-INF/views/info/color.jsp +++ b/src/main/web/WEB-INF/views/info/color.jsp @@ -12,22 +12,68 @@ -
+
+ + + + + +
+ + + +
+ + + +