diff --git a/src/main/java/com/pro/info/controller/ColorController.java b/src/main/java/com/pro/info/controller/ColorController.java index ff56b3a82bf1f72cdfa0035aaa7539c69b775447..e0f460cb2cfc69aa23946493601e37578ee45bfb 100644 --- a/src/main/java/com/pro/info/controller/ColorController.java +++ b/src/main/java/com/pro/info/controller/ColorController.java @@ -4,11 +4,10 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pro.info.entity.Color; import com.pro.info.service.ColorService; +import com.pro.sys.entity.Result; 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 org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; @@ -20,27 +19,104 @@ public class ColorController { @Autowired private ColorService colorService; - @RequestMapping("a") - public String aaa(){ + /*** + * 去花色维护页面 + * @return + */ + @RequestMapping("color") + public String toColor(){ return "info/color"; } - @RequestMapping(value = "colors") + /*** + * 获取花色信息列表 + * @param page + * @param limit + * @return + */ + @RequestMapping(value = "colors",method= RequestMethod.GET) @ResponseBody - public Map getColor(@RequestParam(value = "page",defaultValue = "1") Integer page,@RequestParam(value = "limit") Integer limit){ + public Map getColor(@RequestParam(value = "page",defaultValue = "1") Integer page,@RequestParam(value = "limit") Integer limit,Color color){ PageHelper.startPage(page,limit); - System.out.println(page+"-------"+limit); - List colors = colorService.getColor(); + List colors = colorService.getColor(color); 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("data",pageInfo.getList()); + map.put("count",pageInfo.getTotal()); map.put("msg",""); return map; } + /*** + * 添加花色信息 + * @param color + * @return + */ + @RequestMapping(value = "addColor",method = RequestMethod.POST) + @ResponseBody + public Result addColor(Color color){ + colorService.addColor(color); + return Result.successResult("花色信息添加成功"); + } + /** + * 根据id查询花色信息 + * @param co_id + * @return + */ + @RequestMapping(value = "getColorById/{co_id}",method = RequestMethod.GET) + @ResponseBody + public Color getColorById(@PathVariable("co_id") Integer co_id){ + Color colorResult = colorService.getColorById(co_id); + return colorResult; + } + + /*** + * 修改花色信息 + * @param color + * @return + */ + @RequestMapping(value = "updateColor",method = RequestMethod.PUT) + @ResponseBody + public Result updateColor(@RequestBody Color color){ + colorService.updateColor(color); + return Result.successResult("花色信息修改成功"); + } + + /*** + * 修改花色状态 + * @param co_id + * @param co_status + * @return + */ + @RequestMapping( + value="updateColorsStatus/{co_id}/{co_status}", + method=RequestMethod.PUT) + @ResponseBody + public Result updateColorsStatus(@PathVariable Integer co_id, @PathVariable String co_status){ + Color color = new Color(); + color.setCo_id(co_id); + color.setCo_status(co_status); + colorService.updateColor(color); + return Result.successResult("花色状态修改成功！"); + } + + /*** + * 多条修改花色状态 + * @param co_ids + * @param co_status + * @return + */ + @RequestMapping( + value="updateColorsStatus/{co_status}", + method=RequestMethod.PUT) + @ResponseBody + public Result updateColorsStatus(@RequestBody Integer[] co_ids, @PathVariable String co_status){ + colorService.updateColorsStatus(co_ids,co_status); + return Result.successResult("花色状态修改成功！"); + } + } diff --git a/src/main/java/com/pro/info/mapper/ColorMapper.java b/src/main/java/com/pro/info/mapper/ColorMapper.java index 751a699c372bea9a03ce1a8ae1cb79f8585cd849..de3bc6f79296dacad58d02be49b229487727a2d8 100644 --- a/src/main/java/com/pro/info/mapper/ColorMapper.java +++ b/src/main/java/com/pro/info/mapper/ColorMapper.java @@ -8,5 +8,35 @@ import java.util.Map; @MapperScan public interface ColorMapper { - List getColor(); + /** + * 查询花色信息 + * @return + */ + List getColor(Color color); + + /*** + * 添加花色信息 + * @param color + */ + void addColor(Color color); + + /*** + * 根据id查询花色信息 + * @param co_id + * @return + */ + Color getColorById(Integer co_id); + + /*** + * 修改花色信息 + * @param color + */ + void updateColor(Color color); + + /*** + * 修改花色信息状态 + * @param co_ids + * @param co_status + */ + void updateColorsStatus(Integer[] co_ids, String co_status); } diff --git a/src/main/java/com/pro/info/service/ColorService.java b/src/main/java/com/pro/info/service/ColorService.java index 3f37af581de6e1aa06def869f5c2b0fe8b2f1597..24bff481964a56d03718a59663c7c7bc91ee554e 100644 --- a/src/main/java/com/pro/info/service/ColorService.java +++ b/src/main/java/com/pro/info/service/ColorService.java @@ -5,7 +5,35 @@ import com.pro.info.entity.Color; import java.util.List; public interface ColorService { - List getColor(); -//public PageInfo getColor(int page, int pageSize); + /*** + * 获取花色信息列表 + * @return + */ + List getColor(Color color); + /** + * 添加花色信息 + * @return + */ + void addColor(Color color); + + /*** + * 根据Id查询花色信息 + * @param co_id + * @return + */ + Color getColorById(Integer co_id); + + /*** + * 修改花色信息，除了状态 + * @param color + */ + void updateColor(Color color); + + /*** + * 修改花色信息状态 + * @param co_ids + * @param co_status + */ + void updateColorsStatus(Integer[] co_ids, String co_status); } diff --git a/src/main/java/com/pro/info/service/impl/ColorServiceImpl.java b/src/main/java/com/pro/info/service/impl/ColorServiceImpl.java index f7c12ca4cff97890013aa1a82c12522a15ed07fc..64d2568a77c6580bf0568c041f7d7c1b7dd1281d 100644 --- a/src/main/java/com/pro/info/service/impl/ColorServiceImpl.java +++ b/src/main/java/com/pro/info/service/impl/ColorServiceImpl.java @@ -14,16 +14,50 @@ public class ColorServiceImpl implements ColorService { @Autowired private ColorMapper colorMapper; + /** + * 获取花色信息列表 + * @return + */ + @Override + public List getColor(Color color) { + return colorMapper.getColor(color); + } + + /** + * 添加花色信息 + * @return + */ + @Override + public void addColor(Color color) { + colorMapper.addColor(color); + } + /*** + * 根据id查询花色信息 + * @param co_id + * @return + */ + @Override + public Color getColorById(Integer co_id) { + return colorMapper.getColorById(co_id); + } + + /*** + * 修改花色信息，除了状态 + * @param color + */ + @Override + public void updateColor(Color color) { + colorMapper.updateColor(color); + } -// @Override -// public PageInfo getColor(int page, int pageSize) { -// PageHelper.startPage(page, pageSize); -// List list = colorMapper.getColor(); -// return new PageInfo(list); -// } + /*** + * 修改花色信息状态 + * @param co_ids + * @param co_status + */ @Override - public List getColor() { - return colorMapper.getColor(); + public void updateColorsStatus(Integer[] co_ids, String co_status) { + colorMapper.updateColorsStatus(co_ids,co_status); } } diff --git a/src/main/java/com/pro/sys/controller/UserController.java b/src/main/java/com/pro/sys/controller/UserController.java new file mode 100644 index 0000000000000000000000000000000000000000..e56c6f31a820aa4768cb2d2aa15eb9476ee14789 --- /dev/null +++ b/src/main/java/com/pro/sys/controller/UserController.java @@ -0,0 +1,115 @@ +package com.pro.sys.controller; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.pro.sys.entity.Result; +import com.pro.sys.entity.User; +import com.pro.sys.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/sys") +public class UserController { + @Autowired + private UserService userService; + + /*** + * 用户修改密码 + * @param user + * @return + */ + @RequestMapping(value = "updateUserPwd",method = RequestMethod.PUT) + @ResponseBody + public Result updateUserPwd(@RequestBody User user){ + return userService.updateUserPwd(user); + } + + /*** + * 去用户维护界面 + * @return + */ + @RequestMapping("user") + public String toUser(){ + return "sys/user"; + } + /*** + * 获取用户信息列表 + * @param page + * @param limit + * @return + */ + @RequestMapping(value = "users",method= RequestMethod.GET) + @ResponseBody + public Map getColor(@RequestParam(value = "page",defaultValue = "1") Integer page, @RequestParam(value = "limit") Integer limit, User user){ + PageHelper.startPage(page,limit); + List users = userService.getUser(user); + Map map = new HashMap(); + PageInfo pageInfo = new PageInfo(users); + map.put("code",0); + map.put("data",pageInfo.getList()); + map.put("count",pageInfo.getTotal()); + map.put("msg",""); + return map; + } + /** + * 添加,修改 + */ + @RequestMapping(value = "saveUser", method = RequestMethod.POST) + @ResponseBody + public Result save(User user){ + return userService.save(user); + } + + /*** + * 获取单条用户信息 + */ + @RequestMapping( + value="/getUserById/{u_id}", + method=RequestMethod.GET + ) + @ResponseBody + public User getCustomerById(@PathVariable("u_id") String u_id){ + User user = userService.getUserById(u_id); + return user; + + } + /*** + * 修改用户状态 + * @param u_id + * @param u_status + * @return + */ + @RequestMapping( + value="updateUsersStatus/{u_id}/{u_status}", + method=RequestMethod.PUT) + @ResponseBody + public Result updateColorsStatus(@PathVariable String u_id, @PathVariable String u_status){ + User user = new User(); + user.setU_id(u_id); + user.setU_status(u_status); + return userService.save(user); + } + + /*** + * 多条修改花色状态 + * @param u_ids + * @param u_status + * @return + */ + @RequestMapping( + value="updateUsersStatus/{u_status}", + method=RequestMethod.PUT) + @ResponseBody + public Result updateColorsStatus(@RequestBody String[] u_ids, @PathVariable String u_status){ + return userService.updateUsersStatus(u_ids,u_status); + } + + + +} diff --git a/src/main/java/com/pro/sys/mapper/UserMapper.java b/src/main/java/com/pro/sys/mapper/UserMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..2507bc2de8c93abfe55e28da084a96c7663015c6 --- /dev/null +++ b/src/main/java/com/pro/sys/mapper/UserMapper.java @@ -0,0 +1,52 @@ +package com.pro.sys.mapper; + +import com.pro.sys.entity.User; +import org.apache.ibatis.annotations.Param; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +@MapperScan +public interface UserMapper { + /*** + * 用户修改密码 + * @param user + * @return + */ + int updateUserPwd(User user); + /*** + * 获取用户信息列表 + * @param user + * @return + */ + List getUser(User user); + + /*** + * 添加用户信息 + * @param user + * @return + */ + int saveUser(User user); + + /*** + * 修改用户信息 + * @param user + * @return + */ + int updateUser(User user); + + /*** + * 根据id 获得用户信息 + * @param u_id + * @return + */ + User getUserById(String u_id); + + /*** + * 多条修改状态 + * @param u_ids + * @param u_status + * @return + */ + int updateUsersStatus(@Param(value = "u_ids") String[] u_ids,@Param("u_status") String u_status); +} diff --git a/src/main/java/com/pro/sys/service/UserService.java b/src/main/java/com/pro/sys/service/UserService.java new file mode 100644 index 0000000000000000000000000000000000000000..b78005152ee8a26ccf27850fe8b6499ff0ab7e5d --- /dev/null +++ b/src/main/java/com/pro/sys/service/UserService.java @@ -0,0 +1,47 @@ +package com.pro.sys.service; + +import com.pro.sys.entity.Result; +import com.pro.sys.entity.User; + +import java.util.List; + + +public interface UserService { + /*** + * 用户修改密码 + * @param user + * @return + */ + Result updateUserPwd(User user); + + /*** + * 获取用户信息列表 + * @param user + * @return + */ + List getUser(User user); + + /*** + * 添加（修改）用户信息 + * @param user + * @return + */ + Result save(User user); + + /*** + * 根据id 查询 + * @param u_id + * @return + */ + User getUserById(String u_id); + + /*** + * 修改用户状态 + * @param u_ids + * @param u_status + * @return + */ + Result updateUsersStatus(String[] u_ids, String u_status); + + +} diff --git a/src/main/java/com/pro/sys/service/impl/UserServiceImpl.java b/src/main/java/com/pro/sys/service/impl/UserServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..d56b056383f2dab69b9d7d11f7e8a6c218bf6b55 --- /dev/null +++ b/src/main/java/com/pro/sys/service/impl/UserServiceImpl.java @@ -0,0 +1,84 @@ +package com.pro.sys.service.impl; + +import com.pro.sys.entity.Result; +import com.pro.sys.entity.User; +import com.pro.sys.mapper.UserMapper; +import com.pro.sys.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class UserServiceImpl implements UserService { + @Autowired + private UserMapper userMapper; + + /*** + * 用户修改密码 + * @param user + * @return + */ + @Override + public Result updateUserPwd(User user) { + if(userMapper.updateUserPwd(user)>0){ + return Result.successResult("密码修改成功"); + }else{ + return Result.failResult("密码修改失败"); + } + } + + /** + * 获取用户信息列表 + * @param user + * @return + */ + @Override + public List getUser(User user) { + return userMapper.getUser(user); + } + + /*** + * 添加（修改）用户信息 + * @param user + * @return + */ + @Override + public Result save(User user) { + if(user.getU_id()!=null && !"".equals(user.getU_id())){ + if(userMapper.updateUser(user)>0){ + return Result.successResult("用户信息修改成功"); + } + return Result.failResult("用户信息修改失败"); + }else{ + if(userMapper.saveUser(user)>0){ + return Result.successResult("用户信息添加成功"); + } + return Result.failResult("用户信息添加失败"); + } + } + + /*** + * 根据id 获得单条用户信息 + * @param u_id + * @return + */ + @Override + public User getUserById(String u_id) { + return userMapper.getUserById(u_id); + } + + /*** + * 多条修改状态 + * @param u_ids + * @param u_status + * @return + */ + @Override + public Result updateUsersStatus(String[] u_ids, String u_status) { + if(userMapper.updateUsersStatus(u_ids,u_status)>0){ + return Result.successResult("用户状态修改成功"); + } + return Result.failResult("用户信息修改失败"); + } +} diff --git a/src/main/resources/mapper/info/ColorMapper.xml b/src/main/resources/mapper/info/ColorMapper.xml index 3d8234d5740e9fb3a581ac5c4d87a4a92a24d15f..78039d197c9647c8b5f8578686df5923be85ca8a 100644 --- a/src/main/resources/mapper/info/ColorMapper.xml +++ b/src/main/resources/mapper/info/ColorMapper.xml @@ -2,9 +2,71 @@ - + select * from info_color + + co_status!=99 + + and co_status = #{co_status} + + + and co_id like concat('%',#{co_id},'%') + + + and co_name like concat('%',#{co_name},'%') + + + and co_remark like concat('%',#{co_remark},'%') + + + + + + + select ifnull(max(co_id),0)+1 from info_color + + insert into info_color values + (#{co_id},#{co_name},#{co_remark},'00') + + + + + + update + info_color + + + + co_name = #{co_name} , + + + co_remark = #{co_remark} , + + + co_status = #{co_status} + + + + where + co_id=#{co_id} + + + update + info_color + + set + co_status=#{param2} + + + 1 <> 1 or + + + co_id = #{co_id} + + + \ No newline at end of file diff --git a/src/main/resources/mapper/sys/UserMapper.xml b/src/main/resources/mapper/sys/UserMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..a6c9c279328444ea3fe2ff549bbdbf29459d5fe7 --- /dev/null +++ b/src/main/resources/mapper/sys/UserMapper.xml @@ -0,0 +1,71 @@ + + + + + + update sys_user + + + u_pwd = #{u_pwd}, + + + where u_id = #{u_id} + + + + + + insert into sys_user values + (UUID(),#{u_name},'123456','00') + + + + update + sys_user + + + + u_name = #{u_name} , + + + + u_status = #{u_status} + + + + where + u_id=#{u_id} + + + + + + update + sys_user + set + u_status=#{param2} + + 1 <> 1 or + + u_id = #{u_id} + + + + + \ 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 index 13914f40340ecc600144171c9ae09f33280e7ff3..fed76dee80564438628ed9643a2410afadaa4708 100644 --- a/src/main/web/WEB-INF/views/info/color.jsp +++ b/src/main/web/WEB-INF/views/info/color.jsp @@ -9,15 +9,71 @@ Title - + + + + +
+
+ +
+ + +
+ +
+ + + +
+ +
+ + +
+ +
+ + +
+ +
+ + + +
+
+
+
- - + +
@@ -53,33 +109,613 @@ + + + + + + + diff --git a/src/main/web/WEB-INF/views/sys/home.jsp b/src/main/web/WEB-INF/views/sys/home.jsp index 8eeb08a40ea168831bccb5f68d9dfe747285a262..e253bff4c59e01f2ed681cda6508ebf5b01d8fce 100644 --- a/src/main/web/WEB-INF/views/sys/home.jsp +++ b/src/main/web/WEB-INF/views/sys/home.jsp @@ -24,6 +24,42 @@ + + +
@@ -34,8 +70,11 @@ ${sessionScope.user.u_name} +
+
修改密码
+
退了
+
-
  • 退了
    • @@ -68,12 +107,89 @@
    + + diff --git a/src/main/web/WEB-INF/views/sys/user.jsp b/src/main/web/WEB-INF/views/sys/user.jsp new file mode 100644 index 0000000000000000000000000000000000000000..6c1e09199bed07d48b97ead446189f23b76e93b0 --- /dev/null +++ b/src/main/web/WEB-INF/views/sys/user.jsp @@ -0,0 +1,403 @@ +<%-- + Created by IntelliJ IDEA. + User: longda + Date: 2018/8/8 + Time: 18:04 + 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/static/js/common.js b/src/main/web/static/js/common.js new file mode 100644 index 0000000000000000000000000000000000000000..8aa18b7c750334221f5b1949e24a1d3fe2b8ed93 --- /dev/null +++ b/src/main/web/static/js/common.js @@ -0,0 +1,104 @@ +var opr={}; + +opr.ajaxWithConfirm=function(options){ + + var _this = this; + + var warnTitle = options.title?options.title:''; + var warnText = options.text?options.text:''; + + + + swal({ + title: warnTitle, + text: warnText, + icon: "warning", + buttons: ["取消",'确定'], + dangerMode: true, + }) + .then((ok) => { + + if (ok) { + _this.ajax(options); + } + + + }) + .catch(err => { + console.log(err); + if (err) { + swal("操作失败!", "请于管理员联系。", "error"); + } + }); + + + +}; + +opr.ajax=function(options){ + + var _this = this; + + var ajaxUrl = options.url?options.url:''; + var ajaxMethod = options.method?options.method:'GET'; + var ajaxData = options.data?options.data:undefined; + var ajaxContentType = options.contentType?options.contentType:undefined; + + var layer = options.layer?options.layer:undefined; + var layuiTable = options.layuiTable?options.layuiTable:undefined; + var layuiTableIns = options.layuiTableIns?options.layuiTableIns:undefined; + + //成功返回json后的回调，若回调返回true继续执行后续默认行为，否则不在执行后续默认行为 + this.responseOkHandler = options.responseOkHandler?options.responseOkHandler:undefined; + + + var index = layer.load(); // 加载层 + + $.ajax({ + url : ajaxUrl, + data:ajaxData, + method : ajaxMethod, + contentType:ajaxContentType, + dataType : 'json', + }).done(function(result) { + + layer.close(index); + + if(_this.responseOkHandler){ + if(!_this.responseOkHandler(result)){ + return; + } + + } + + + if (result.success) { + swal({ + text: result.message, + icon: "success", + buttons:false, + timer:1500 + }); + if(layuiTableIns)layuiTableIns.reload(); + + } else { + swal({ + title: result.message, + icon: "error", + button: "确定" + }); + } + + }).fail(function(xhr) { + layer.close(index); + swal({ + title: xhr.status, + icon: "error", + button: "确定" + }); + }); + + + + +}; \ No newline at end of file