From b75bcfe76be7d11253cfb361e44a9996dd9b9a39 Mon Sep 17 00:00:00 2001 From: longda <17868877553@163.com> Date: Mon, 13 Aug 2018 16:40:11 +0800 Subject: [PATCH] =?UTF-8?q?2018/8/13=E5=9D=AF=E5=B8=83=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/bus/controller/ProcessController.java | 72 +++++++-- .../com/pro/bus/mapper/ProcessMapper.java | 16 ++ .../com/pro/bus/service/ProcessService.java | 14 ++ .../bus/service/impl/ProcessServiceImpl.java | 27 ++++ .../pro/info/controller/ColorController.java | 8 + .../pro/sys/controller/UserController.java | 22 ++- .../resources/mapper/bus/ProcessMapper.xml | 30 +++- src/main/web/WEB-INF/views/bus/process.jsp | 140 ++++++++++++++++-- src/main/web/WEB-INF/views/info/color.jsp | 12 +- src/main/web/WEB-INF/views/sys/_role.jsp | 48 ++++++ src/main/web/WEB-INF/views/sys/user.jsp | 14 +- 11 files changed, 350 insertions(+), 53 deletions(-) create mode 100644 src/main/web/WEB-INF/views/sys/_role.jsp diff --git a/src/main/java/com/pro/bus/controller/ProcessController.java b/src/main/java/com/pro/bus/controller/ProcessController.java index 17b6547..b6f12d2 100644 --- a/src/main/java/com/pro/bus/controller/ProcessController.java +++ b/src/main/java/com/pro/bus/controller/ProcessController.java @@ -9,6 +9,8 @@ import com.pro.info.entity.Color; import com.pro.info.entity.Customer; import com.pro.info.entity.Standard; import com.pro.sys.entity.Result; +import com.pro.sys.entity.User; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -23,20 +25,22 @@ import java.util.Map; public class ProcessController { @Autowired private ProcessService processService; + /*** * 去坯布准备页面 * @return */ + @RequiresPermissions("/bus/rawcloth") @RequestMapping("rawcloth") - public String toProcess(Model model){ + public String toProcess(Model model) { List colors = processService.getColorName(); List customers = processService.getCustomerName(); List standards = processService.getStandardName(); List plans = processService.getPlanId(); - model.addAttribute("colors",colors); - model.addAttribute("customers",customers); - model.addAttribute("standards",standards); - model.addAttribute("plans",plans); + model.addAttribute("colors", colors); + model.addAttribute("customers", customers); + model.addAttribute("standards", standards); + model.addAttribute("plans", plans); return "bus/process"; } @@ -47,26 +51,28 @@ public class ProcessController { * @param process * @return */ - @RequestMapping(value = "getProcess",method = RequestMethod.GET) + @RequiresPermissions("/bus/rawcloth") + @RequestMapping(value = "getProcess", method = RequestMethod.GET) @ResponseBody - public Map getProcess(@RequestParam(value = "page",defaultValue = "1") Integer page, @RequestParam(value = "limit") Integer limit, Process process){ - PageHelper.startPage(page,limit); + public Map getProcess(@RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "limit") Integer limit, Process process) { + PageHelper.startPage(page, limit); List processes = processService.getProcess(process); - Map map = new HashMap(); + Map map = new HashMap(); PageInfo pageInfo = new PageInfo(processes); - map.put("code",0); - map.put("data",pageInfo.getList()); - map.put("count",pageInfo.getTotal()); - map.put("msg",""); + map.put("code", 0); + map.put("data", pageInfo.getList()); + map.put("count", pageInfo.getTotal()); + map.put("msg", ""); return map; } /** * 添加,修改 */ + @RequiresPermissions("/bus/rawcloth") @RequestMapping(value = "save", method = RequestMethod.POST) @ResponseBody - public Result save(Process process){ + public Result save(Process process) { return processService.save(process); } @@ -75,9 +81,43 @@ public class ProcessController { * @param process_id * @return */ - @RequestMapping(value = "getProcessById/{process_id}",method = RequestMethod.GET) + @RequiresPermissions("/bus/rawcloth") + @RequestMapping(value = "getProcessById/{process_id}", method = RequestMethod.GET) @ResponseBody - public Process getProcessById(@PathVariable("process_id") Integer process_id){ + public Process getProcessById(@PathVariable("process_id") Integer process_id) { return processService.getProcessById(process_id); } + + /*** + * 删除坯布处理信息 + * @param process_ids + * @return + */ + @RequiresPermissions("/bus/rawcloth") + @RequestMapping( + value = "deleteById", + method = RequestMethod.DELETE + ) + @ResponseBody + public Result delete(@RequestBody Integer[] process_ids) { + return processService.deleteById(process_ids); + } + + /*** + * 修改坯布准备状态 + * @param process_id + * @param process_status + * @return + */ + @RequiresPermissions("/bus/rawcloth") + @RequestMapping( + value="updateProcessStatus/{process_id}/{process_status}", + method=RequestMethod.PUT) + @ResponseBody + public Result updateProcessStatus(@PathVariable Integer process_id, @PathVariable String process_status){ + Process process = new Process(); + process.setProcess_id(process_id); + process.setProcess_status(process_status); + return processService.save(process); + } } diff --git a/src/main/java/com/pro/bus/mapper/ProcessMapper.java b/src/main/java/com/pro/bus/mapper/ProcessMapper.java index 2ea909f..57cf804 100644 --- a/src/main/java/com/pro/bus/mapper/ProcessMapper.java +++ b/src/main/java/com/pro/bus/mapper/ProcessMapper.java @@ -5,6 +5,7 @@ import com.pro.bus.entity.Process; import com.pro.info.entity.Color; import com.pro.info.entity.Customer; import com.pro.info.entity.Standard; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.mybatis.spring.annotation.MapperScan; @@ -48,4 +49,19 @@ public interface ProcessMapper { * @return */ int update(Process process); + + /*** + * 删除坯布准备信息 + * @param process_ids + * @return + */ + int deleteById(@Param("process_ids") Integer[] process_ids); + + /*** + * 修改坯布准备状态 + * @param process_ids + * @param process_status + * @return + */ + int updateProcessStatus(Integer[] process_ids, String process_status); } diff --git a/src/main/java/com/pro/bus/service/ProcessService.java b/src/main/java/com/pro/bus/service/ProcessService.java index 2938e9e..62619ef 100644 --- a/src/main/java/com/pro/bus/service/ProcessService.java +++ b/src/main/java/com/pro/bus/service/ProcessService.java @@ -6,6 +6,7 @@ import com.pro.info.entity.Color; import com.pro.info.entity.Customer; import com.pro.info.entity.Standard; import com.pro.sys.entity.Result; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -35,4 +36,17 @@ public interface ProcessService { */ Process getProcessById(Integer process_id); + /*** + * 删除坯布准备信息 + * @param process_ids + * @return + */ + Result deleteById(Integer[] process_ids); + /*** + * 修改坯布准备状态 + * @param process_ids + * @param process_status + * @return + */ + Result updateProcessStatus(@Param("process_ids") Integer[] process_ids, @Param("process_status") String process_status); } diff --git a/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java b/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java index 656bd3e..38467ea 100644 --- a/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java +++ b/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java @@ -78,4 +78,31 @@ public class ProcessServiceImpl implements ProcessService { public Process getProcessById(Integer process_id) { return processMapper.getProcessById(process_id); } + + /*** + * 删除坯布准备信息 + * @param process_ids + * @return + */ + @Override + public Result deleteById(Integer[] process_ids) { + if(processMapper.deleteById(process_ids)>0){ + return Result.successResult("删除成功"); + } + return Result.failResult("删除失败"); + } + + /*** + * 修改坯布准备状态 + * @param process_ids + * @param process_status + * @return + */ + @Override + public Result updateProcessStatus(Integer[] process_ids, String process_status) { + if(processMapper.updateProcessStatus(process_ids,process_status)>0){ + return Result.successResult("状态修改成功"); + } + return Result.failResult("状态修改失败"); + } } diff --git a/src/main/java/com/pro/info/controller/ColorController.java b/src/main/java/com/pro/info/controller/ColorController.java index e0f460c..01d170f 100644 --- a/src/main/java/com/pro/info/controller/ColorController.java +++ b/src/main/java/com/pro/info/controller/ColorController.java @@ -5,6 +5,7 @@ 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.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -23,6 +24,7 @@ public class ColorController { * 去花色维护页面 * @return */ + @RequiresPermissions("/info/color") @RequestMapping("color") public String toColor(){ return "info/color"; @@ -34,6 +36,7 @@ public class ColorController { * @param limit * @return */ + @RequiresPermissions("/info/color") @RequestMapping(value = "colors",method= RequestMethod.GET) @ResponseBody public Map getColor(@RequestParam(value = "page",defaultValue = "1") Integer page,@RequestParam(value = "limit") Integer limit,Color color){ @@ -55,6 +58,7 @@ public class ColorController { * @param color * @return */ + @RequiresPermissions("/info/color") @RequestMapping(value = "addColor",method = RequestMethod.POST) @ResponseBody public Result addColor(Color color){ @@ -66,6 +70,7 @@ public class ColorController { * @param co_id * @return */ + @RequiresPermissions("/info/color") @RequestMapping(value = "getColorById/{co_id}",method = RequestMethod.GET) @ResponseBody public Color getColorById(@PathVariable("co_id") Integer co_id){ @@ -78,6 +83,7 @@ public class ColorController { * @param color * @return */ + @RequiresPermissions("/info/color") @RequestMapping(value = "updateColor",method = RequestMethod.PUT) @ResponseBody public Result updateColor(@RequestBody Color color){ @@ -91,6 +97,7 @@ public class ColorController { * @param co_status * @return */ + @RequiresPermissions("/info/color") @RequestMapping( value="updateColorsStatus/{co_id}/{co_status}", method=RequestMethod.PUT) @@ -109,6 +116,7 @@ public class ColorController { * @param co_status * @return */ + @RequiresPermissions("/info/color") @RequestMapping( value="updateColorsStatus/{co_status}", method=RequestMethod.PUT) diff --git a/src/main/java/com/pro/sys/controller/UserController.java b/src/main/java/com/pro/sys/controller/UserController.java index caa8c08..c20f3e3 100644 --- a/src/main/java/com/pro/sys/controller/UserController.java +++ b/src/main/java/com/pro/sys/controller/UserController.java @@ -6,6 +6,7 @@ import com.pro.sys.entity.Result; import com.pro.sys.entity.Role; import com.pro.sys.entity.User; import com.pro.sys.service.UserService; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -26,6 +27,7 @@ public class UserController { * @param user * @return */ + @RequiresPermissions("/sys/user") @RequestMapping(value = "updateUserPwd",method = RequestMethod.PUT) @ResponseBody public Result updateUserPwd(@RequestBody User user){ @@ -36,6 +38,7 @@ public class UserController { * 去用户维护界面 * @return */ + @RequiresPermissions("/sys/user") @RequestMapping("user") public String toUser(){ return "sys/user"; @@ -46,9 +49,10 @@ public class UserController { * @param limit * @return */ + @RequiresPermissions("/sys/user") @RequestMapping(value = "users",method= RequestMethod.GET) @ResponseBody - public Map getColor(@RequestParam(value = "page",defaultValue = "1") Integer page, @RequestParam(value = "limit") Integer limit, User user){ + public Map getUser(@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(); @@ -62,6 +66,7 @@ public class UserController { /** * 添加,修改 */ + @RequiresPermissions("/sys/user") @RequestMapping(value = "saveUser", method = RequestMethod.POST) @ResponseBody public Result save(User user){ @@ -71,12 +76,13 @@ public class UserController { /*** * 获取单条用户信息 */ + @RequiresPermissions("/sys/user") @RequestMapping( value="/getUserById/{u_id}", method=RequestMethod.GET ) @ResponseBody - public User getCustomerById(@PathVariable("u_id") String u_id){ + public User getUserById(@PathVariable("u_id") String u_id){ User user = userService.getUserById(u_id); return user; @@ -87,11 +93,12 @@ public class UserController { * @param u_status * @return */ + @RequiresPermissions("/sys/user") @RequestMapping( value="updateUsersStatus/{u_id}/{u_status}", method=RequestMethod.PUT) @ResponseBody - public Result updateColorsStatus(@PathVariable String u_id, @PathVariable String u_status){ + public Result updateUsersStatus(@PathVariable String u_id, @PathVariable String u_status){ User user = new User(); user.setU_id(u_id); user.setU_status(u_status); @@ -99,16 +106,17 @@ public class UserController { } /*** - * 多条修改花色状态 + * 多条修改用户状态 * @param u_ids * @param u_status * @return */ + @RequiresPermissions("/sys/user") @RequestMapping( value="updateUsersStatus/{u_status}", method=RequestMethod.PUT) @ResponseBody - public Result updateColorsStatus(@RequestBody String[] u_ids, @PathVariable String u_status){ + public Result updateUsersStatus(@RequestBody String[] u_ids, @PathVariable String u_status){ return userService.updateUsersStatus(u_ids,u_status); } @@ -118,12 +126,13 @@ public class UserController { * @param model * @return */ + @RequiresPermissions("/sys/user") @RequestMapping(value = "getUserRole/{u_id}",method = RequestMethod.GET) public String toUserRole(@PathVariable String u_id, Model model){ List roles = userService.getUserRole(u_id); model.addAttribute("roleList",roles); model.addAttribute("u_id",u_id); - return "sys/userRole"; + return "sys/_role"; } /*** @@ -132,6 +141,7 @@ public class UserController { * @param u_id * @return */ + @RequiresPermissions("/sys/user") @RequestMapping( value="setUserRole/{u_id}", method=RequestMethod.PUT) diff --git a/src/main/resources/mapper/bus/ProcessMapper.xml b/src/main/resources/mapper/bus/ProcessMapper.xml index 22b537b..d2f461e 100644 --- a/src/main/resources/mapper/bus/ProcessMapper.xml +++ b/src/main/resources/mapper/bus/ProcessMapper.xml @@ -4,6 +4,11 @@ @@ -26,7 +31,7 @@ process_id = #{process_id}, - plan_id = #{plan_id}, + plan_id = #{plan_id}, process_cus = #{process_cus}, @@ -90,7 +95,30 @@ check_person = #{check_person}, + + process_status = #{process_status}, + where process_id = #{process_id} + + delete from bus_process + + + process_id = #{process_id} + + + + + + update bus_process + + process_status = #{process_status} + + + process_id = #{process_id} + + + + \ No newline at end of file diff --git a/src/main/web/WEB-INF/views/bus/process.jsp b/src/main/web/WEB-INF/views/bus/process.jsp index 60b4600..afb8f58 100644 --- a/src/main/web/WEB-INF/views/bus/process.jsp +++ b/src/main/web/WEB-INF/views/bus/process.jsp @@ -12,12 +12,31 @@ Title + - + +
+
+ +
+ + +
+ +
+ + +
+
+
+
@@ -221,6 +248,20 @@ diff --git a/src/main/web/WEB-INF/views/info/color.jsp b/src/main/web/WEB-INF/views/info/color.jsp index 2af8e6b..651dae2 100644 --- a/src/main/web/WEB-INF/views/info/color.jsp +++ b/src/main/web/WEB-INF/views/info/color.jsp @@ -11,22 +11,15 @@ Title -
-
+
@@ -189,7 +182,6 @@ elem: '#color-table' , url: 'colors' //数据接口 , page: true - , size: 'sm' , limit: 5 , limits: [5, 10, 15] , cols: [[ //表头 diff --git a/src/main/web/WEB-INF/views/sys/_role.jsp b/src/main/web/WEB-INF/views/sys/_role.jsp new file mode 100644 index 0000000..1056bf7 --- /dev/null +++ b/src/main/web/WEB-INF/views/sys/_role.jsp @@ -0,0 +1,48 @@ +<%-- + Created by IntelliJ IDEA. + User: longda + Date: 2018/8/9 + Time: 15:34 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + +
+ +
+ +
+ + + + +
+
+
+
+ + +
+
+
+ + \ No newline at end of file diff --git a/src/main/web/WEB-INF/views/sys/user.jsp b/src/main/web/WEB-INF/views/sys/user.jsp index 7bfda6a..0c6c3e1 100644 --- a/src/main/web/WEB-INF/views/sys/user.jsp +++ b/src/main/web/WEB-INF/views/sys/user.jsp @@ -11,22 +11,15 @@ Title -
-
+
@@ -46,7 +39,7 @@ class="layui-input">
- +
@@ -154,7 +147,6 @@ elem: '#user-table' , url: 'users' //数据接口 , page: true - , size: 'sm' , limit: 5 , limits: [5, 10, 15] , cols: [[ //表头 -- Gitee