diff --git a/src/main/java/com/pro/bus/controller/PlanController.java b/src/main/java/com/pro/bus/controller/PlanController.java new file mode 100644 index 0000000000000000000000000000000000000000..115111117d1d238d083bd2e64ae621ad7e6255e2 --- /dev/null +++ b/src/main/java/com/pro/bus/controller/PlanController.java @@ -0,0 +1,163 @@ +package com.pro.bus.controller; + +import com.github.pagehelper.PageInfo; +import com.pro.bus.entity.Plan; +import com.pro.bus.service.PlanService; +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.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping(value = "/bus") +public class PlanController{ + @Autowired + private PlanService planService; + + /** + *查询计划 + * @param page + * @param pageSize + * @param plan + * @return + */ + @RequiresPermissions("/bus/planmanager") + @RequestMapping("planList") + @ResponseBody + public Map getPlan(@RequestParam(value = "page",defaultValue = "1") int page, @RequestParam(value = "limit",required = false) int pageSize, Plan plan){ + System.out.println(plan); +Map map = new HashMap(); +PageInfo plans = planService.getPlan(page,pageSize,plan); + map.put("code", 0); + map.put("msg", ""); + map.put("count", plans.getTotal()); + map.put("data", plans.getList()); + return map; + } +/* +去计划页面 + */ +@RequiresPermissions("/bus/planmanager") + @RequestMapping("planmanager") + public String toPlan(Model model){ + List colors = planService.getColorName(); + List customers = planService.getCustomerName(); + List standards = planService.getStandardName(); + model.addAttribute("colors",colors); + model.addAttribute("customers",customers); + model.addAttribute("standards",standards); + return "bus/plan"; + } + + /** + * 删除单个 + * @param plan_id + * @return + */ + @RequiresPermissions("/bus/planmanager") + @RequestMapping(value = "/delete/{plan_id}",method= RequestMethod.DELETE) +@ResponseBody + public Result deleteById(@PathVariable("plan_id") Integer plan_id){ + planService.deleteById(plan_id); +return Result.successResult("删除成功"); + } + + /** + * 添加计划 + * @param plan + * @return + */ + @RequiresPermissions("/bus/planmanager") + @RequestMapping("addPlan") + @ResponseBody + public Result addPlan(Plan plan) { + planService.addPlan(plan); + return Result.successResult("添加成功"); + + } + + /** + * 按照id查询 + * @param plan_id + * @return + */ + @RequiresPermissions("/bus/planmanager") + @RequestMapping( + value = "/plan/{plan_id}" + + ) + @ResponseBody + public Plan getPlanById(@PathVariable("plan_id") Integer plan_id) { + + Plan plan = planService.getPlanById(plan_id); + return plan; + + } + + /** + * 修改计划 + * @param plan + * @return + */ + @RequiresPermissions("/bus/planmanager") + @RequestMapping("updatePlan") + @ResponseBody + public Result updatePlan(@RequestBody Plan plan) { + planService.updatePlan(plan); + return Result.successResult("修改成功"); + } + + /** + * 修改状态 + * @param plan_id + * @param plan_status + * @return + */ + @RequiresPermissions("/bus/planmanager") + @RequestMapping(value = "/plan/status/{plan_id}/{plan_status}") + @ResponseBody + public Result updatePlanStatus(@PathVariable Integer plan_id, @PathVariable Integer plan_status) { + Plan plan = new Plan(); + plan.setPlan_id(plan_id); + plan.setPlan_status(plan_status); + planService.updatePlan(plan); + return Result.successResult("修改成功"); + } + + /** + * 修改多个状态 + * @param plan_ids + * @param plan_status + * @return + */ + @RequiresPermissions("/bus/planmanager") + @RequestMapping(value = "/plan/status/{plan_status}") + @ResponseBody + public Result updatePlanStatus(@RequestBody Integer[] plan_ids,@PathVariable Integer plan_status){ +planService.updatePlanStatus(plan_ids,plan_status); +return Result.successResult("修改成功"); + } + + /** + * 删除计划 + * @param plan_ids + * @return + */ + @RequiresPermissions("/bus/planmanager") + @RequestMapping(value = "delete") + @ResponseBody + public Result delete(@RequestBody Integer[] plan_ids){ + planService.delete(plan_ids); + return Result.successResult("删除成功"); + } + +} diff --git a/src/main/java/com/pro/bus/mapper/PlanMapper.java b/src/main/java/com/pro/bus/mapper/PlanMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..47989db89ab2a872df89110e349f576dc635de4d --- /dev/null +++ b/src/main/java/com/pro/bus/mapper/PlanMapper.java @@ -0,0 +1,23 @@ +package com.pro.bus.mapper; + +import com.pro.bus.entity.Plan; +import com.pro.info.entity.Color; +import com.pro.info.entity.Customer; +import com.pro.info.entity.Standard; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +@MapperScan +public interface PlanMapper { + public List getPlan(Plan plan); + public void deleteById(Integer plan_id); + public List getCustomerName(); + public List getColorName(); + public List getStandardName(); + public void addPlan(Plan plan); + public Plan getPlanById(Integer plan_id); + public void updatePlan(Plan plan); + public void updatePlanStatus(Integer[] plan_ids,Integer plan_status); +} + diff --git a/src/main/java/com/pro/bus/service/PlanService.java b/src/main/java/com/pro/bus/service/PlanService.java new file mode 100644 index 0000000000000000000000000000000000000000..2058a1ac4628162995e67f4dd0ca332132320d6d --- /dev/null +++ b/src/main/java/com/pro/bus/service/PlanService.java @@ -0,0 +1,25 @@ +package com.pro.bus.service; + +import com.github.pagehelper.PageInfo; +import com.pro.bus.entity.Plan; +import com.pro.info.entity.Color; +import com.pro.info.entity.Customer; +import com.pro.info.entity.Standard; + +import java.util.List; + +public interface PlanService { + public PageInfo getPlan(int page, int pageSize, Plan plan); + public void deleteById(Integer plan_id); + public List getCustomerName(); + public List getColorName(); + public List getStandardName(); + public void addPlan(Plan plan); + public Plan getPlanById(Integer plan_id); + public void updatePlan(Plan plan); + public void updatePlanStatus(Integer[] plan_ids,Integer plan_status); + public void delete(Integer[] plan_ids); + + + +} diff --git a/src/main/java/com/pro/bus/service/impl/PlanServiceImpl.java b/src/main/java/com/pro/bus/service/impl/PlanServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..54e7845a65a53cf4b3ae84658ce2dd81cf104777 --- /dev/null +++ b/src/main/java/com/pro/bus/service/impl/PlanServiceImpl.java @@ -0,0 +1,85 @@ +package com.pro.bus.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.pro.bus.entity.Plan; +import com.pro.bus.mapper.PlanMapper; +import com.pro.bus.service.PlanService; +import com.pro.info.entity.Color; +import com.pro.info.entity.Customer; +import com.pro.info.entity.Standard; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class PlanServiceImpl implements PlanService { + @Autowired +private PlanMapper planMapper; + + @Override + public PageInfo getPlan(int page, int pageSize, Plan plan) { + PageHelper.startPage(page,pageSize); + List plans = planMapper.getPlan(plan); + System.out.println(plans); + PageInfo planPageInfo = new PageInfo(plans); + + return planPageInfo; + } + + @Override + public void deleteById(Integer plan_id) { + planMapper.deleteById(plan_id); + + } + + @Override + public List getCustomerName() { + return planMapper.getCustomerName(); + + } + + @Override + public List getColorName() { + return planMapper.getColorName(); + + } + + @Override + public List getStandardName() { + return planMapper.getStandardName(); + + } + + @Override + public void addPlan(Plan plan) { + planMapper.addPlan(plan); + + } + + @Override + public Plan getPlanById(Integer plan_id) { + return planMapper.getPlanById(plan_id); + + } + + @Override + public void updatePlan(Plan plan) { + planMapper.updatePlan(plan); + + } + + @Override + public void updatePlanStatus(Integer[] plan_ids, Integer plan_status) { + planMapper.updatePlanStatus(plan_ids,plan_status); + + } + + @Override + public void delete(Integer[] plan_ids) { + for (Integer id:plan_ids) { + planMapper.deleteById(id); + } + } +} diff --git a/src/main/java/com/pro/info/controller/CustomerController.java b/src/main/java/com/pro/info/controller/CustomerController.java index 3caab42a590ce7389773a307a0b1ba1a8494e1c3..dfb0451e2b53678809488642fdf779a23cdca581 100644 --- a/src/main/java/com/pro/info/controller/CustomerController.java +++ b/src/main/java/com/pro/info/controller/CustomerController.java @@ -5,6 +5,7 @@ import com.pro.info.entity.Customer; import com.pro.info.service.CustomerService; 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.*; @@ -26,6 +27,7 @@ public class CustomerController { * @param pageSize * @return */ + @RequiresPermissions("/info/customer") @RequestMapping("customerList") @ResponseBody public Map getCustomer(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "limit", required = false) int pageSize, Customer customer) { @@ -48,6 +50,7 @@ public class CustomerController { /* 去客户维护页面 */ + @RequiresPermissions("/info/customer") @RequestMapping("customer") public String toCustomer() { return "info/customer"; @@ -58,6 +61,7 @@ public class CustomerController { * * @param customer */ + @RequiresPermissions("/info/customer") @RequestMapping("addCustomer") @ResponseBody public Result addCustomer(Customer customer) { @@ -72,6 +76,7 @@ public class CustomerController { * @param cus_id * @return */ + @RequiresPermissions("/info/customer") @RequestMapping( value = "/customer/{cid}" @@ -90,6 +95,7 @@ public class CustomerController { * @param customer * @return */ + @RequiresPermissions("/info/customer") @RequestMapping("updateCustomer") @ResponseBody public Result updateCustomer(@RequestBody Customer customer) { @@ -100,6 +106,7 @@ public class CustomerController { /* 修改状态 */ + @RequiresPermissions("/info/customer") @RequestMapping(value = "/customer/status/{cus_id}/{cus_status}") @ResponseBody public Result updateCustomerStatus(@PathVariable Integer cus_id, @PathVariable String cus_status) { @@ -117,6 +124,7 @@ public class CustomerController { * @param cus_status * @return */ + @RequiresPermissions("/info/customer") @RequestMapping(value = "/customer/status/{cus_status}") @ResponseBody public Result updateCustomerStatus(@RequestBody Integer[] cus_ids, @PathVariable String cus_status) { diff --git a/src/main/java/com/pro/info/service/CustomerService.java b/src/main/java/com/pro/info/service/CustomerService.java index 8b1b27c75265c5c775d643943b0d071b2fb8012a..a23a46bb43a1561b95eb4f4ea898c97d37de4412 100644 --- a/src/main/java/com/pro/info/service/CustomerService.java +++ b/src/main/java/com/pro/info/service/CustomerService.java @@ -3,6 +3,9 @@ package com.pro.info.service; import com.github.pagehelper.PageInfo; import com.pro.info.entity.Customer; + +import java.util.List; + public interface CustomerService { /** * 客户查询 diff --git a/src/main/java/com/pro/mobile/controller/MobileLoginController.java b/src/main/java/com/pro/mobile/controller/MobileLoginController.java new file mode 100644 index 0000000000000000000000000000000000000000..ba0e25f9269b43a27bed9f26215e642fe5185b1b --- /dev/null +++ b/src/main/java/com/pro/mobile/controller/MobileLoginController.java @@ -0,0 +1,21 @@ +package com.pro.mobile.controller; + +import com.pro.mobile.service.MobileLoginService; + +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.RequestMapping; + +@Controller +@RequestMapping(value = "/mobile") +public class MobileLoginController { +@Autowired +private MobileLoginService mobileLoginService; +@RequiresPermissions("/sys/login") +@RequestMapping(value = "login") +public String toLogin(){ + return "mobile/m_login"; +} + +} diff --git a/src/main/java/com/pro/mobile/controller/xx.java b/src/main/java/com/pro/mobile/controller/xx.java deleted file mode 100644 index 8c6cec35aaf0debf0482e19ef8eb83466ff8981a..0000000000000000000000000000000000000000 --- a/src/main/java/com/pro/mobile/controller/xx.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pro.mobile.controller; - -public class xx { -} diff --git a/src/main/java/com/pro/mobile/entity/xx.java b/src/main/java/com/pro/mobile/entity/User.java similarity index 62% rename from src/main/java/com/pro/mobile/entity/xx.java rename to src/main/java/com/pro/mobile/entity/User.java index 28edc8fe4183a4757f0a9945bb42f42f9628b84c..1a629fee19f92905b9925be4924ce02ffe8f9f24 100644 --- a/src/main/java/com/pro/mobile/entity/xx.java +++ b/src/main/java/com/pro/mobile/entity/User.java @@ -1,4 +1,4 @@ package com.pro.mobile.entity; -public class xx { +public class User { } diff --git a/src/main/java/com/pro/mobile/mapper/MobileLoginMapper.java b/src/main/java/com/pro/mobile/mapper/MobileLoginMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..9a56e29a16fb66f800dd3d7834ac794c420f7ff9 --- /dev/null +++ b/src/main/java/com/pro/mobile/mapper/MobileLoginMapper.java @@ -0,0 +1,8 @@ +package com.pro.mobile.mapper; + +import org.mybatis.spring.annotation.MapperScan; + +@MapperScan +public interface MobileLoginMapper { + +} diff --git a/src/main/java/com/pro/mobile/mapper/xx.java b/src/main/java/com/pro/mobile/mapper/xx.java deleted file mode 100644 index a9a4fc5a98cc45ad197d23c1baff3627b5eca2f8..0000000000000000000000000000000000000000 --- a/src/main/java/com/pro/mobile/mapper/xx.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pro.mobile.mapper; - -public class xx { -} diff --git a/src/main/java/com/pro/mobile/service/xx.java b/src/main/java/com/pro/mobile/service/MobileLoginService.java similarity index 47% rename from src/main/java/com/pro/mobile/service/xx.java rename to src/main/java/com/pro/mobile/service/MobileLoginService.java index 90be3f7f32077ea5550d119647c69bb66f3075a2..6ac1587e3480d430194876798292851e171e1526 100644 --- a/src/main/java/com/pro/mobile/service/xx.java +++ b/src/main/java/com/pro/mobile/service/MobileLoginService.java @@ -1,4 +1,4 @@ package com.pro.mobile.service; -public class xx { +public interface MobileLoginService { } diff --git a/src/main/java/com/pro/mobile/service/impl/MobileMobileLoginServiceImpl.java b/src/main/java/com/pro/mobile/service/impl/MobileMobileLoginServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..956c5901b578ea976c750dec9759125f42af39e3 --- /dev/null +++ b/src/main/java/com/pro/mobile/service/impl/MobileMobileLoginServiceImpl.java @@ -0,0 +1,13 @@ +package com.pro.mobile.service.impl; + +import com.pro.mobile.mapper.MobileLoginMapper; +import com.pro.mobile.service.MobileLoginService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class MobileMobileLoginServiceImpl implements MobileLoginService { + @Autowired + private MobileLoginMapper mobileLoginMapper; + +} diff --git a/src/main/java/com/pro/mobile/service/impl/xx.java b/src/main/java/com/pro/mobile/service/impl/xx.java deleted file mode 100644 index ad3bfc5f42bbb94ea45107b2c393bb52c6518cff..0000000000000000000000000000000000000000 --- a/src/main/java/com/pro/mobile/service/impl/xx.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pro.mobile.service.impl; - -public class xx { -} diff --git a/src/main/resources/mapper/bus/PlanMapper.xml b/src/main/resources/mapper/bus/PlanMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..03d1862a2cfd1a6efa10e54e65113004cbe7c683 --- /dev/null +++ b/src/main/resources/mapper/bus/PlanMapper.xml @@ -0,0 +1,125 @@ + + + + + + + + delete from bus_plan where plan_id=#{plan_id} + + + + + + + + select ifnull(max(plan_id),0)+1 from bus_plan + +insert into bus_plan values(#{plan_id},#{standard_id},#{cus_id},#{co_id},#{plan_xh},#{plan_month},#{plan_num},#{plan_type},#{plan_date},#{plan_person},'0'); + + + + + update + bus_plan + + + + standard_name = #{standard_name} , + + + cus_name = #{cus_name} , + + + co_name = #{co_name}, + + + plan_xh = #{plan_xh}, + + + plan_month = #{plan_month}, + + + plan_num = #{plan_num}, + + + plan_type = #{plan_type}, + + + plan_date = #{plan_date}, + + + plan_person = #{plan_person}, + + + plan_status = #{plan_status} + + + + where + plan_id=#{plan_id} + + + update bus_plan + set + plan_status=#{param2} + + 1 <> 1 or + + plan_id=#{plan_id} + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/mobile/LoginMapper.xml b/src/main/resources/mapper/mobile/LoginMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..a41b9bc46e9f5cabf548c46cbcce1be4c0a87af1 --- /dev/null +++ b/src/main/resources/mapper/mobile/LoginMapper.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/web/WEB-INF/views/bus/plan.jsp b/src/main/web/WEB-INF/views/bus/plan.jsp new file mode 100644 index 0000000000000000000000000000000000000000..3112f0ce34ff065ba7bb728745cbed30cd33e93c --- /dev/null +++ b/src/main/web/WEB-INF/views/bus/plan.jsp @@ -0,0 +1,788 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%-- + 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/moblie/m_login.jsp b/src/main/web/WEB-INF/views/moblie/m_login.jsp new file mode 100644 index 0000000000000000000000000000000000000000..5bcbea844acdd5f1ca105d8f1affcfd881bc4f80 --- /dev/null +++ b/src/main/web/WEB-INF/views/moblie/m_login.jsp @@ -0,0 +1,30 @@ +<%-- + Created by IntelliJ IDEA. + User: lenovo + Date: 2018/8/14 + Time: 14:14 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + + Title + + + +
+
+
{{ title }}
+
+
+ + +
+
+
登录
+
+
技术支持:XXX软件有限公司
+
+ + diff --git a/src/main/web/WEB-INF/views/moblie/mobile.jsp b/src/main/web/WEB-INF/views/moblie/mobile.jsp deleted file mode 100644 index 93cf7d16ae2b3c2fc77673e5149e0519140dbbab..0000000000000000000000000000000000000000 --- a/src/main/web/WEB-INF/views/moblie/mobile.jsp +++ /dev/null @@ -1,16 +0,0 @@ -<%-- - Created by IntelliJ IDEA. - User: lenovo - Date: 2018/8/14 - Time: 14:14 - To change this template use File | Settings | File Templates. ---%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - Title - - - - -