From 60f67dcd573981d2ba92cb47c44bc65d65a6871a Mon Sep 17 00:00:00 2001 From: wuminglong Date: Fri, 26 Jul 2019 15:14:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=8D=E5=8A=A1=E4=B8=AD?= =?UTF-8?q?=E5=BF=833?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bmw-admin/src/main/resources/application.yml | 4 +- .../src/main/resources/generator.yml | 4 +- .../controller/AttendantController.java | 127 ++++++++++++ .../controller/MemberController.java | 127 ++++++++++++ .../controller/OrderController.java | 127 ++++++++++++ .../controller/OrderViewController.java | 29 --- .../bmw/servicecenter/domain/Attendant.java | 174 ++++++++++++++++ .../com/bmw/servicecenter/domain/Member.java | 173 ++++++++++++++++ .../com/bmw/servicecenter/domain/Order.java | 63 ++++++ .../servicecenter/mapper/AttendantMapper.java | 62 ++++++ .../servicecenter/mapper/MemberMapper.java | 62 ++++++ .../bmw/servicecenter/mapper/OrderMapper.java | 62 ++++++ .../service/IAttendantService.java | 54 +++++ .../servicecenter/service/IMemberService.java | 54 +++++ .../servicecenter/service/IOrderService.java | 54 +++++ .../service/impl/AttendantServiceImpl.java | 83 ++++++++ .../service/impl/MemberServiceImpl.java | 83 ++++++++ .../service/impl/OrderServiceImpl.java | 83 ++++++++ .../mapper/servicecenter/AttendantMapper.xml | 118 +++++++++++ .../mapper/servicecenter/MemberMapper.xml | 118 +++++++++++ .../mapper/servicecenter/OrderMapper.xml | 73 +++++++ .../servicecenter/attendant/add.html | 108 ++++++++++ .../servicecenter/attendant/attendant.html | 196 ++++++++++++++++++ .../servicecenter/attendant/edit.html | 109 ++++++++++ .../templates/servicecenter/member/add.html | 108 ++++++++++ .../templates/servicecenter/member/edit.html | 109 ++++++++++ .../servicecenter/member/member.html | 196 ++++++++++++++++++ .../templates/servicecenter/order/add.html | 54 +++++ .../templates/servicecenter/order/edit.html | 55 +++++ .../templates/servicecenter/order/order.html | 115 ++++++++++ sql/mwu_2019726 | 116 +++++++++++ 31 files changed, 2867 insertions(+), 33 deletions(-) create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/AttendantController.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/MemberController.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/OrderController.java delete mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/OrderViewController.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/domain/Attendant.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/domain/Member.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/domain/Order.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/mapper/AttendantMapper.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/mapper/MemberMapper.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/mapper/OrderMapper.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/IAttendantService.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/IMemberService.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/IOrderService.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/impl/AttendantServiceImpl.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/impl/MemberServiceImpl.java create mode 100644 bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/impl/OrderServiceImpl.java create mode 100644 bmw-servicecenter/src/main/resources/mapper/servicecenter/AttendantMapper.xml create mode 100644 bmw-servicecenter/src/main/resources/mapper/servicecenter/MemberMapper.xml create mode 100644 bmw-servicecenter/src/main/resources/mapper/servicecenter/OrderMapper.xml create mode 100644 bmw-servicecenter/src/main/resources/templates/servicecenter/attendant/add.html create mode 100644 bmw-servicecenter/src/main/resources/templates/servicecenter/attendant/attendant.html create mode 100644 bmw-servicecenter/src/main/resources/templates/servicecenter/attendant/edit.html create mode 100644 bmw-servicecenter/src/main/resources/templates/servicecenter/member/add.html create mode 100644 bmw-servicecenter/src/main/resources/templates/servicecenter/member/edit.html create mode 100644 bmw-servicecenter/src/main/resources/templates/servicecenter/member/member.html create mode 100644 bmw-servicecenter/src/main/resources/templates/servicecenter/order/add.html create mode 100644 bmw-servicecenter/src/main/resources/templates/servicecenter/order/edit.html create mode 100644 bmw-servicecenter/src/main/resources/templates/servicecenter/order/order.html create mode 100644 sql/mwu_2019726 diff --git a/bmw-admin/src/main/resources/application.yml b/bmw-admin/src/main/resources/application.yml index 133f9ad42..c517d6d3d 100644 --- a/bmw-admin/src/main/resources/application.yml +++ b/bmw-admin/src/main/resources/application.yml @@ -1,7 +1,7 @@ # 项目相关配置 ruoyi: # 名称 - name: RuoYi + name: BMW # 版本 version: 3.4.0 # 版权年份 @@ -9,7 +9,7 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - profile: D:/ruoyi/uploadPath + profile: D:/bmw/uploadPath # 获取ip地址开关 addressEnabled: true diff --git a/bmw-generator/src/main/resources/generator.yml b/bmw-generator/src/main/resources/generator.yml index c403c613b..949e369bb 100644 --- a/bmw-generator/src/main/resources/generator.yml +++ b/bmw-generator/src/main/resources/generator.yml @@ -4,8 +4,8 @@ gen: # 作者 author: bmw # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.bmw.system + packageName: com.bmw.servicecenter # 自动去除表前缀,默认是true autoRemovePre: true # 表前缀(类名不会包含表前缀) - tablePrefix: sys_ \ No newline at end of file + tablePrefix: sc_ \ No newline at end of file diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/AttendantController.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/AttendantController.java new file mode 100644 index 000000000..12e0f68e3 --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/AttendantController.java @@ -0,0 +1,127 @@ +package com.bmw.servicecenter.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.bmw.common.annotation.Log; +import com.bmw.common.enums.BusinessType; +import com.bmw.servicecenter.domain.Attendant; +import com.bmw.servicecenter.service.IAttendantService; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.utils.poi.ExcelUtil; + +/** + * 服务员 信息操作处理 + * + * @author bmw + * @date 2019-07-26 + */ +@Controller +@RequestMapping("/servicecenter/attendant") +public class AttendantController extends BaseController +{ + private String prefix = "servicecenter/attendant"; + + @Autowired + private IAttendantService attendantService; + + @RequiresPermissions("servicecenter:attendant:view") + @GetMapping() + public String attendant() + { + return prefix + "/attendant"; + } + + /** + * 查询服务员列表 + */ + @RequiresPermissions("servicecenter:attendant:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(Attendant attendant) + { + startPage(); + List list = attendantService.selectAttendantList(attendant); + return getDataTable(list); + } + + + /** + * 导出服务员列表 + */ + @RequiresPermissions("servicecenter:attendant:export") + @PostMapping("/export") + @ResponseBody + public AjaxResult export(Attendant attendant) + { + List list = attendantService.selectAttendantList(attendant); + ExcelUtil util = new ExcelUtil(Attendant.class); + return util.exportExcel(list, "attendant"); + } + + /** + * 新增服务员 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存服务员 + */ + @RequiresPermissions("servicecenter:attendant:add") + @Log(title = "服务员", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(Attendant attendant) + { + return toAjax(attendantService.insertAttendant(attendant)); + } + + /** + * 修改服务员 + */ + @GetMapping("/edit/{attendantId}") + public String edit(@PathVariable("attendantId") Long attendantId, ModelMap mmap) + { + Attendant attendant = attendantService.selectAttendantById(attendantId); + mmap.put("attendant", attendant); + return prefix + "/edit"; + } + + /** + * 修改保存服务员 + */ + @RequiresPermissions("servicecenter:attendant:edit") + @Log(title = "服务员", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(Attendant attendant) + { + return toAjax(attendantService.updateAttendant(attendant)); + } + + /** + * 删除服务员 + */ + @RequiresPermissions("servicecenter:attendant:remove") + @Log(title = "服务员", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(attendantService.deleteAttendantByIds(ids)); + } + +} diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/MemberController.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/MemberController.java new file mode 100644 index 000000000..22144877c --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/MemberController.java @@ -0,0 +1,127 @@ +package com.bmw.servicecenter.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.bmw.common.annotation.Log; +import com.bmw.common.enums.BusinessType; +import com.bmw.servicecenter.domain.Member; +import com.bmw.servicecenter.service.IMemberService; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.utils.poi.ExcelUtil; + +/** + * 客户 信息操作处理 + * + * @author bmw + * @date 2019-07-26 + */ +@Controller +@RequestMapping("/servicecenter/member") +public class MemberController extends BaseController +{ + private String prefix = "servicecenter/member"; + + @Autowired + private IMemberService memberService; + + @RequiresPermissions("servicecenter:member:view") + @GetMapping() + public String member() + { + return prefix + "/member"; + } + + /** + * 查询客户列表 + */ + @RequiresPermissions("servicecenter:member:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(Member member) + { + startPage(); + List list = memberService.selectMemberList(member); + return getDataTable(list); + } + + + /** + * 导出客户列表 + */ + @RequiresPermissions("servicecenter:member:export") + @PostMapping("/export") + @ResponseBody + public AjaxResult export(Member member) + { + List list = memberService.selectMemberList(member); + ExcelUtil util = new ExcelUtil(Member.class); + return util.exportExcel(list, "member"); + } + + /** + * 新增客户 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存客户 + */ + @RequiresPermissions("servicecenter:member:add") + @Log(title = "客户", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(Member member) + { + return toAjax(memberService.insertMember(member)); + } + + /** + * 修改客户 + */ + @GetMapping("/edit/{memberId}") + public String edit(@PathVariable("memberId") Long memberId, ModelMap mmap) + { + Member member = memberService.selectMemberById(memberId); + mmap.put("member", member); + return prefix + "/edit"; + } + + /** + * 修改保存客户 + */ + @RequiresPermissions("servicecenter:member:edit") + @Log(title = "客户", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(Member member) + { + return toAjax(memberService.updateMember(member)); + } + + /** + * 删除客户 + */ + @RequiresPermissions("servicecenter:member:remove") + @Log(title = "客户", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(memberService.deleteMemberByIds(ids)); + } + +} diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/OrderController.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/OrderController.java new file mode 100644 index 000000000..c7cf19770 --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/OrderController.java @@ -0,0 +1,127 @@ +package com.bmw.servicecenter.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.bmw.common.annotation.Log; +import com.bmw.common.enums.BusinessType; +import com.bmw.servicecenter.domain.Order; +import com.bmw.servicecenter.service.IOrderService; +import com.bmw.common.core.controller.BaseController; +import com.bmw.common.core.page.TableDataInfo; +import com.bmw.common.core.domain.AjaxResult; +import com.bmw.common.utils.poi.ExcelUtil; + +/** + * 订单 信息操作处理 + * + * @author bmw + * @date 2019-07-26 + */ +@Controller +@RequestMapping("/servicecenter/order") +public class OrderController extends BaseController +{ + private String prefix = "servicecenter/order"; + + @Autowired + private IOrderService orderService; + + @RequiresPermissions("servicecenter:order:view") + @GetMapping() + public String order() + { + return prefix + "/order"; + } + + /** + * 查询订单列表 + */ + @RequiresPermissions("servicecenter:order:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(Order order) + { + startPage(); + List list = orderService.selectOrderList(order); + return getDataTable(list); + } + + + /** + * 导出订单列表 + */ + @RequiresPermissions("servicecenter:order:export") + @PostMapping("/export") + @ResponseBody + public AjaxResult export(Order order) + { + List list = orderService.selectOrderList(order); + ExcelUtil util = new ExcelUtil(Order.class); + return util.exportExcel(list, "order"); + } + + /** + * 新增订单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存订单 + */ + @RequiresPermissions("servicecenter:order:add") + @Log(title = "订单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(Order order) + { + return toAjax(orderService.insertOrder(order)); + } + + /** + * 修改订单 + */ + @GetMapping("/edit/{orderId}") + public String edit(@PathVariable("orderId") Long orderId, ModelMap mmap) + { + Order order = orderService.selectOrderById(orderId); + mmap.put("order", order); + return prefix + "/edit"; + } + + /** + * 修改保存订单 + */ + @RequiresPermissions("servicecenter:order:edit") + @Log(title = "订单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(Order order) + { + return toAjax(orderService.updateOrder(order)); + } + + /** + * 删除订单 + */ + @RequiresPermissions("servicecenter:order:remove") + @Log(title = "订单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(orderService.deleteOrderByIds(ids)); + } + +} diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/OrderViewController.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/OrderViewController.java deleted file mode 100644 index 4f9475396..000000000 --- a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/controller/OrderViewController.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.bmw.servicecenter.controller; -import com.bmw.common.core.controller.BaseController; -import com.bmw.common.core.page.TableDataInfo; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - - -/** - * @author mwu - * @date 2019/7/26 - */ - -@Controller -@RequestMapping("/order") -public class OrderViewController extends BaseController { - - @RequiresPermissions("order:list:view") - @GetMapping ("/list") - @ResponseBody - public TableDataInfo list() - { - System.out.println("订单列表"); - return null; - } -} diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/domain/Attendant.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/domain/Attendant.java new file mode 100644 index 000000000..86bc1f1e2 --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/domain/Attendant.java @@ -0,0 +1,174 @@ +package com.bmw.servicecenter.domain; + + +import com.bmw.common.core.domain.BaseEntity; +import com.bmw.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 服务员表 sc_attendant + * + * @author bmw + * @date 2019-07-26 + */ +public class Attendant extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 客户ID */ + private Long attendantId; + /** 用户昵称 */ + private String attendantName; + /** 用户邮箱 */ + private String email; + /** 手机号码 */ + private String phonenumber; + /** 用户性别(0男 1女 2未知) */ + private String sex; + /** 头像路径 */ + private String avatar; + /** 密码 */ + private String password; + /** 盐加密 */ + private String salt; + /** 帐号状态(0正常 1停用) */ + private String status; + /** 删除标志(0代表存在 2代表删除) */ + private String delFlag; + /** 最后登陆IP */ + private String loginIp; + /** 最后登陆时间 */ + private Date loginDate; + + public void setAttendantId(Long attendantId) + { + this.attendantId = attendantId; + } + + public Long getAttendantId() + { + return attendantId; + } + public void setAttendantName(String attendantName) + { + this.attendantName = attendantName; + } + + public String getAttendantName() + { + return attendantName; + } + public void setEmail(String email) + { + this.email = email; + } + + public String getEmail() + { + return email; + } + public void setPhonenumber(String phonenumber) + { + this.phonenumber = phonenumber; + } + + public String getPhonenumber() + { + return phonenumber; + } + public void setSex(String sex) + { + this.sex = sex; + } + + public String getSex() + { + return sex; + } + public void setAvatar(String avatar) + { + this.avatar = avatar; + } + + public String getAvatar() + { + return avatar; + } + public void setPassword(String password) + { + this.password = password; + } + + public String getPassword() + { + return password; + } + public void setSalt(String salt) + { + this.salt = salt; + } + + public String getSalt() + { + return salt; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + public void setLoginIp(String loginIp) + { + this.loginIp = loginIp; + } + + public String getLoginIp() + { + return loginIp; + } + public void setLoginDate(Date loginDate) + { + this.loginDate = loginDate; + } + + public Date getLoginDate() + { + return loginDate; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("attendantId", getAttendantId()) + .append("attendantName", getAttendantName()) + .append("email", getEmail()) + .append("phonenumber", getPhonenumber()) + .append("sex", getSex()) + .append("avatar", getAvatar()) + .append("password", getPassword()) + .append("salt", getSalt()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("loginIp", getLoginIp()) + .append("loginDate", getLoginDate()) + .append("createTime", getCreateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/domain/Member.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/domain/Member.java new file mode 100644 index 000000000..cb15dc454 --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/domain/Member.java @@ -0,0 +1,173 @@ +package com.bmw.servicecenter.domain; + + +import com.bmw.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 客户表 sc_member + * + * @author bmw + * @date 2019-07-26 + */ +public class Member extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 客户ID */ + private Long memberId; + /** 用户昵称 */ + private String memberName; + /** 用户邮箱 */ + private String email; + /** 手机号码 */ + private String phonenumber; + /** 用户性别(0男 1女 2未知) */ + private String sex; + /** 头像路径 */ + private String avatar; + /** 密码 */ + private String password; + /** 盐加密 */ + private String salt; + /** 帐号状态(0正常 1停用) */ + private String status; + /** 删除标志(0代表存在 2代表删除) */ + private String delFlag; + /** 最后登陆IP */ + private String loginIp; + /** 最后登陆时间 */ + private Date loginDate; + + public void setMemberId(Long memberId) + { + this.memberId = memberId; + } + + public Long getMemberId() + { + return memberId; + } + public void setMemberName(String memberName) + { + this.memberName = memberName; + } + + public String getMemberName() + { + return memberName; + } + public void setEmail(String email) + { + this.email = email; + } + + public String getEmail() + { + return email; + } + public void setPhonenumber(String phonenumber) + { + this.phonenumber = phonenumber; + } + + public String getPhonenumber() + { + return phonenumber; + } + public void setSex(String sex) + { + this.sex = sex; + } + + public String getSex() + { + return sex; + } + public void setAvatar(String avatar) + { + this.avatar = avatar; + } + + public String getAvatar() + { + return avatar; + } + public void setPassword(String password) + { + this.password = password; + } + + public String getPassword() + { + return password; + } + public void setSalt(String salt) + { + this.salt = salt; + } + + public String getSalt() + { + return salt; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + public void setLoginIp(String loginIp) + { + this.loginIp = loginIp; + } + + public String getLoginIp() + { + return loginIp; + } + public void setLoginDate(Date loginDate) + { + this.loginDate = loginDate; + } + + public Date getLoginDate() + { + return loginDate; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("memberId", getMemberId()) + .append("memberName", getMemberName()) + .append("email", getEmail()) + .append("phonenumber", getPhonenumber()) + .append("sex", getSex()) + .append("avatar", getAvatar()) + .append("password", getPassword()) + .append("salt", getSalt()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("loginIp", getLoginIp()) + .append("loginDate", getLoginDate()) + .append("createTime", getCreateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/domain/Order.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/domain/Order.java new file mode 100644 index 000000000..c16363e63 --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/domain/Order.java @@ -0,0 +1,63 @@ +package com.bmw.servicecenter.domain; + + +import com.bmw.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 订单表 sc_order + * + * @author bmw + * @date 2019-07-26 + */ +public class Order extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 订单ID */ + private Long orderId; + /** 客户ID */ + private Long memberId; + /** 服务员ID */ + private Long attendantId; + + public void setOrderId(Long orderId) + { + this.orderId = orderId; + } + + public Long getOrderId() + { + return orderId; + } + public void setMemberId(Long memberId) + { + this.memberId = memberId; + } + + public Long getMemberId() + { + return memberId; + } + public void setAttendantId(Long attendantId) + { + this.attendantId = attendantId; + } + + public Long getAttendantId() + { + return attendantId; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("orderId", getOrderId()) + .append("memberId", getMemberId()) + .append("attendantId", getAttendantId()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/mapper/AttendantMapper.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/mapper/AttendantMapper.java new file mode 100644 index 000000000..0eddf502d --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/mapper/AttendantMapper.java @@ -0,0 +1,62 @@ +package com.bmw.servicecenter.mapper; + +import com.bmw.servicecenter.domain.Attendant; +import java.util.List; + +/** + * 服务员 数据层 + * + * @author bmw + * @date 2019-07-26 + */ +public interface AttendantMapper +{ + /** + * 查询服务员信息 + * + * @param attendantId 服务员ID + * @return 服务员信息 + */ + public Attendant selectAttendantById(Long attendantId); + + /** + * 查询服务员列表 + * + * @param attendant 服务员信息 + * @return 服务员集合 + */ + public List selectAttendantList(Attendant attendant); + + /** + * 新增服务员 + * + * @param attendant 服务员信息 + * @return 结果 + */ + public int insertAttendant(Attendant attendant); + + /** + * 修改服务员 + * + * @param attendant 服务员信息 + * @return 结果 + */ + public int updateAttendant(Attendant attendant); + + /** + * 删除服务员 + * + * @param attendantId 服务员ID + * @return 结果 + */ + public int deleteAttendantById(Long attendantId); + + /** + * 批量删除服务员 + * + * @param attendantIds 需要删除的数据ID + * @return 结果 + */ + public int deleteAttendantByIds(String[] attendantIds); + +} \ No newline at end of file diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/mapper/MemberMapper.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/mapper/MemberMapper.java new file mode 100644 index 000000000..0d5e615b3 --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/mapper/MemberMapper.java @@ -0,0 +1,62 @@ +package com.bmw.servicecenter.mapper; + +import com.bmw.servicecenter.domain.Member; +import java.util.List; + +/** + * 客户 数据层 + * + * @author bmw + * @date 2019-07-26 + */ +public interface MemberMapper +{ + /** + * 查询客户信息 + * + * @param memberId 客户ID + * @return 客户信息 + */ + public Member selectMemberById(Long memberId); + + /** + * 查询客户列表 + * + * @param member 客户信息 + * @return 客户集合 + */ + public List selectMemberList(Member member); + + /** + * 新增客户 + * + * @param member 客户信息 + * @return 结果 + */ + public int insertMember(Member member); + + /** + * 修改客户 + * + * @param member 客户信息 + * @return 结果 + */ + public int updateMember(Member member); + + /** + * 删除客户 + * + * @param memberId 客户ID + * @return 结果 + */ + public int deleteMemberById(Long memberId); + + /** + * 批量删除客户 + * + * @param memberIds 需要删除的数据ID + * @return 结果 + */ + public int deleteMemberByIds(String[] memberIds); + +} \ No newline at end of file diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/mapper/OrderMapper.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/mapper/OrderMapper.java new file mode 100644 index 000000000..172fc2de7 --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/mapper/OrderMapper.java @@ -0,0 +1,62 @@ +package com.bmw.servicecenter.mapper; + +import com.bmw.servicecenter.domain.Order; +import java.util.List; + +/** + * 订单 数据层 + * + * @author bmw + * @date 2019-07-26 + */ +public interface OrderMapper +{ + /** + * 查询订单信息 + * + * @param orderId 订单ID + * @return 订单信息 + */ + public Order selectOrderById(Long orderId); + + /** + * 查询订单列表 + * + * @param order 订单信息 + * @return 订单集合 + */ + public List selectOrderList(Order order); + + /** + * 新增订单 + * + * @param order 订单信息 + * @return 结果 + */ + public int insertOrder(Order order); + + /** + * 修改订单 + * + * @param order 订单信息 + * @return 结果 + */ + public int updateOrder(Order order); + + /** + * 删除订单 + * + * @param orderId 订单ID + * @return 结果 + */ + public int deleteOrderById(Long orderId); + + /** + * 批量删除订单 + * + * @param orderIds 需要删除的数据ID + * @return 结果 + */ + public int deleteOrderByIds(String[] orderIds); + +} \ No newline at end of file diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/IAttendantService.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/IAttendantService.java new file mode 100644 index 000000000..704d6a790 --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/IAttendantService.java @@ -0,0 +1,54 @@ +package com.bmw.servicecenter.service; + +import com.bmw.servicecenter.domain.Attendant; +import java.util.List; + +/** + * 服务员 服务层 + * + * @author bmw + * @date 2019-07-26 + */ +public interface IAttendantService +{ + /** + * 查询服务员信息 + * + * @param attendantId 服务员ID + * @return 服务员信息 + */ + public Attendant selectAttendantById(Long attendantId); + + /** + * 查询服务员列表 + * + * @param attendant 服务员信息 + * @return 服务员集合 + */ + public List selectAttendantList(Attendant attendant); + + /** + * 新增服务员 + * + * @param attendant 服务员信息 + * @return 结果 + */ + public int insertAttendant(Attendant attendant); + + /** + * 修改服务员 + * + * @param attendant 服务员信息 + * @return 结果 + */ + public int updateAttendant(Attendant attendant); + + /** + * 删除服务员信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteAttendantByIds(String ids); + +} diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/IMemberService.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/IMemberService.java new file mode 100644 index 000000000..93a681d7f --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/IMemberService.java @@ -0,0 +1,54 @@ +package com.bmw.servicecenter.service; + +import com.bmw.servicecenter.domain.Member; +import java.util.List; + +/** + * 客户 服务层 + * + * @author bmw + * @date 2019-07-26 + */ +public interface IMemberService +{ + /** + * 查询客户信息 + * + * @param memberId 客户ID + * @return 客户信息 + */ + public Member selectMemberById(Long memberId); + + /** + * 查询客户列表 + * + * @param member 客户信息 + * @return 客户集合 + */ + public List selectMemberList(Member member); + + /** + * 新增客户 + * + * @param member 客户信息 + * @return 结果 + */ + public int insertMember(Member member); + + /** + * 修改客户 + * + * @param member 客户信息 + * @return 结果 + */ + public int updateMember(Member member); + + /** + * 删除客户信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteMemberByIds(String ids); + +} diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/IOrderService.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/IOrderService.java new file mode 100644 index 000000000..0836b34ea --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/IOrderService.java @@ -0,0 +1,54 @@ +package com.bmw.servicecenter.service; + +import com.bmw.servicecenter.domain.Order; +import java.util.List; + +/** + * 订单 服务层 + * + * @author bmw + * @date 2019-07-26 + */ +public interface IOrderService +{ + /** + * 查询订单信息 + * + * @param orderId 订单ID + * @return 订单信息 + */ + public Order selectOrderById(Long orderId); + + /** + * 查询订单列表 + * + * @param order 订单信息 + * @return 订单集合 + */ + public List selectOrderList(Order order); + + /** + * 新增订单 + * + * @param order 订单信息 + * @return 结果 + */ + public int insertOrder(Order order); + + /** + * 修改订单 + * + * @param order 订单信息 + * @return 结果 + */ + public int updateOrder(Order order); + + /** + * 删除订单信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteOrderByIds(String ids); + +} diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/impl/AttendantServiceImpl.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/impl/AttendantServiceImpl.java new file mode 100644 index 000000000..04e832c76 --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/impl/AttendantServiceImpl.java @@ -0,0 +1,83 @@ +package com.bmw.servicecenter.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bmw.servicecenter.mapper.AttendantMapper; +import com.bmw.servicecenter.domain.Attendant; +import com.bmw.servicecenter.service.IAttendantService; +import com.bmw.common.core.text.Convert; + +/** + * 服务员 服务层实现 + * + * @author bmw + * @date 2019-07-26 + */ +@Service +public class AttendantServiceImpl implements IAttendantService +{ + @Autowired + private AttendantMapper attendantMapper; + + /** + * 查询服务员信息 + * + * @param attendantId 服务员ID + * @return 服务员信息 + */ + @Override + public Attendant selectAttendantById(Long attendantId) + { + return attendantMapper.selectAttendantById(attendantId); + } + + /** + * 查询服务员列表 + * + * @param attendant 服务员信息 + * @return 服务员集合 + */ + @Override + public List selectAttendantList(Attendant attendant) + { + return attendantMapper.selectAttendantList(attendant); + } + + /** + * 新增服务员 + * + * @param attendant 服务员信息 + * @return 结果 + */ + @Override + public int insertAttendant(Attendant attendant) + { + return attendantMapper.insertAttendant(attendant); + } + + /** + * 修改服务员 + * + * @param attendant 服务员信息 + * @return 结果 + */ + @Override + public int updateAttendant(Attendant attendant) + { + return attendantMapper.updateAttendant(attendant); + } + + /** + * 删除服务员对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteAttendantByIds(String ids) + { + return attendantMapper.deleteAttendantByIds(Convert.toStrArray(ids)); + } + +} diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/impl/MemberServiceImpl.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/impl/MemberServiceImpl.java new file mode 100644 index 000000000..c1dd3ef39 --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/impl/MemberServiceImpl.java @@ -0,0 +1,83 @@ +package com.bmw.servicecenter.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bmw.servicecenter.mapper.MemberMapper; +import com.bmw.servicecenter.domain.Member; +import com.bmw.servicecenter.service.IMemberService; +import com.bmw.common.core.text.Convert; + +/** + * 客户 服务层实现 + * + * @author bmw + * @date 2019-07-26 + */ +@Service +public class MemberServiceImpl implements IMemberService +{ + @Autowired + private MemberMapper memberMapper; + + /** + * 查询客户信息 + * + * @param memberId 客户ID + * @return 客户信息 + */ + @Override + public Member selectMemberById(Long memberId) + { + return memberMapper.selectMemberById(memberId); + } + + /** + * 查询客户列表 + * + * @param member 客户信息 + * @return 客户集合 + */ + @Override + public List selectMemberList(Member member) + { + return memberMapper.selectMemberList(member); + } + + /** + * 新增客户 + * + * @param member 客户信息 + * @return 结果 + */ + @Override + public int insertMember(Member member) + { + return memberMapper.insertMember(member); + } + + /** + * 修改客户 + * + * @param member 客户信息 + * @return 结果 + */ + @Override + public int updateMember(Member member) + { + return memberMapper.updateMember(member); + } + + /** + * 删除客户对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteMemberByIds(String ids) + { + return memberMapper.deleteMemberByIds(Convert.toStrArray(ids)); + } + +} diff --git a/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/impl/OrderServiceImpl.java b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/impl/OrderServiceImpl.java new file mode 100644 index 000000000..10638da0c --- /dev/null +++ b/bmw-servicecenter/src/main/java/com/bmw/servicecenter/service/impl/OrderServiceImpl.java @@ -0,0 +1,83 @@ +package com.bmw.servicecenter.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.bmw.servicecenter.mapper.OrderMapper; +import com.bmw.servicecenter.domain.Order; +import com.bmw.servicecenter.service.IOrderService; +import com.bmw.common.core.text.Convert; + +/** + * 订单 服务层实现 + * + * @author bmw + * @date 2019-07-26 + */ +@Service +public class OrderServiceImpl implements IOrderService +{ + @Autowired + private OrderMapper orderMapper; + + /** + * 查询订单信息 + * + * @param orderId 订单ID + * @return 订单信息 + */ + @Override + public Order selectOrderById(Long orderId) + { + return orderMapper.selectOrderById(orderId); + } + + /** + * 查询订单列表 + * + * @param order 订单信息 + * @return 订单集合 + */ + @Override + public List selectOrderList(Order order) + { + return orderMapper.selectOrderList(order); + } + + /** + * 新增订单 + * + * @param order 订单信息 + * @return 结果 + */ + @Override + public int insertOrder(Order order) + { + return orderMapper.insertOrder(order); + } + + /** + * 修改订单 + * + * @param order 订单信息 + * @return 结果 + */ + @Override + public int updateOrder(Order order) + { + return orderMapper.updateOrder(order); + } + + /** + * 删除订单对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteOrderByIds(String ids) + { + return orderMapper.deleteOrderByIds(Convert.toStrArray(ids)); + } + +} diff --git a/bmw-servicecenter/src/main/resources/mapper/servicecenter/AttendantMapper.xml b/bmw-servicecenter/src/main/resources/mapper/servicecenter/AttendantMapper.xml new file mode 100644 index 000000000..0cde0569e --- /dev/null +++ b/bmw-servicecenter/src/main/resources/mapper/servicecenter/AttendantMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + select attendant_id, attendant_name, email, phonenumber, sex, avatar, password, salt, status, del_flag, login_ip, login_date, create_time, remark from sc_attendant + + + + + + + + insert into sc_attendant + + attendant_name, + email, + phonenumber, + sex, + avatar, + password, + salt, + status, + del_flag, + login_ip, + login_date, + create_time, + remark, + + + #{attendantName}, + #{email}, + #{phonenumber}, + #{sex}, + #{avatar}, + #{password}, + #{salt}, + #{status}, + #{delFlag}, + #{loginIp}, + #{loginDate}, + #{createTime}, + #{remark}, + + + + + update sc_attendant + + attendant_name = #{attendantName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + salt = #{salt}, + status = #{status}, + del_flag = #{delFlag}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + create_time = #{createTime}, + remark = #{remark}, + + where attendant_id = #{attendantId} + + + + delete from sc_attendant where attendant_id = #{attendantId} + + + + delete from sc_attendant where attendant_id in + + #{attendantId} + + + + \ No newline at end of file diff --git a/bmw-servicecenter/src/main/resources/mapper/servicecenter/MemberMapper.xml b/bmw-servicecenter/src/main/resources/mapper/servicecenter/MemberMapper.xml new file mode 100644 index 000000000..cb2ff50cc --- /dev/null +++ b/bmw-servicecenter/src/main/resources/mapper/servicecenter/MemberMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + select member_id, member_name, email, phonenumber, sex, avatar, password, salt, status, del_flag, login_ip, login_date, create_time, remark from sc_member + + + + + + + + insert into sc_member + + member_name, + email, + phonenumber, + sex, + avatar, + password, + salt, + status, + del_flag, + login_ip, + login_date, + create_time, + remark, + + + #{memberName}, + #{email}, + #{phonenumber}, + #{sex}, + #{avatar}, + #{password}, + #{salt}, + #{status}, + #{delFlag}, + #{loginIp}, + #{loginDate}, + #{createTime}, + #{remark}, + + + + + update sc_member + + member_name = #{memberName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + salt = #{salt}, + status = #{status}, + del_flag = #{delFlag}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + create_time = #{createTime}, + remark = #{remark}, + + where member_id = #{memberId} + + + + delete from sc_member where member_id = #{memberId} + + + + delete from sc_member where member_id in + + #{memberId} + + + + \ No newline at end of file diff --git a/bmw-servicecenter/src/main/resources/mapper/servicecenter/OrderMapper.xml b/bmw-servicecenter/src/main/resources/mapper/servicecenter/OrderMapper.xml new file mode 100644 index 000000000..a594f3044 --- /dev/null +++ b/bmw-servicecenter/src/main/resources/mapper/servicecenter/OrderMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + select order_id, member_id, attendant_id, remark, create_time from sc_order + + + + + + + + insert into sc_order + + member_id, + attendant_id, + remark, + create_time, + + + #{memberId}, + #{attendantId}, + #{remark}, + #{createTime}, + + + + + update sc_order + + member_id = #{memberId}, + attendant_id = #{attendantId}, + remark = #{remark}, + create_time = #{createTime}, + + where order_id = #{orderId} + + + + delete from sc_order where order_id = #{orderId} + + + + delete from sc_order where order_id in + + #{orderId} + + + + \ No newline at end of file diff --git a/bmw-servicecenter/src/main/resources/templates/servicecenter/attendant/add.html b/bmw-servicecenter/src/main/resources/templates/servicecenter/attendant/add.html new file mode 100644 index 000000000..c02600d3f --- /dev/null +++ b/bmw-servicecenter/src/main/resources/templates/servicecenter/attendant/add.html @@ -0,0 +1,108 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/bmw-servicecenter/src/main/resources/templates/servicecenter/attendant/attendant.html b/bmw-servicecenter/src/main/resources/templates/servicecenter/attendant/attendant.html new file mode 100644 index 000000000..b6f2062c1 --- /dev/null +++ b/bmw-servicecenter/src/main/resources/templates/servicecenter/attendant/attendant.html @@ -0,0 +1,196 @@ + + + + + + +
+
+
+
+
+
    +
  • + 用户昵称: +
  • + +
  • + 用户邮箱: +
  • + +
  • + 手机号码: +
  • + +
  • + 用户性别(0男 1女 2未知): +
  • + +
  • + 头像路径: +
  • + +
  • + 密码: +
  • + +
  • + 盐加密: +
  • + +
  • + 帐号状态(0正常 1停用): +
  • + +
  • + 删除标志(0代表存在 2代表删除): +
  • + +
  • + 最后登陆IP: +
  • + +
  • + 最后登陆时间: +
  • + +
  • + 创建时间: +
  • + +
  • + 备注: +
  • + +
  • +  搜索 +  重置 +
  • +
+
+
+
+ + +
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/bmw-servicecenter/src/main/resources/templates/servicecenter/attendant/edit.html b/bmw-servicecenter/src/main/resources/templates/servicecenter/attendant/edit.html new file mode 100644 index 000000000..4675e47e9 --- /dev/null +++ b/bmw-servicecenter/src/main/resources/templates/servicecenter/attendant/edit.html @@ -0,0 +1,109 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/bmw-servicecenter/src/main/resources/templates/servicecenter/member/add.html b/bmw-servicecenter/src/main/resources/templates/servicecenter/member/add.html new file mode 100644 index 000000000..5c90357c5 --- /dev/null +++ b/bmw-servicecenter/src/main/resources/templates/servicecenter/member/add.html @@ -0,0 +1,108 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/bmw-servicecenter/src/main/resources/templates/servicecenter/member/edit.html b/bmw-servicecenter/src/main/resources/templates/servicecenter/member/edit.html new file mode 100644 index 000000000..d12342592 --- /dev/null +++ b/bmw-servicecenter/src/main/resources/templates/servicecenter/member/edit.html @@ -0,0 +1,109 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/bmw-servicecenter/src/main/resources/templates/servicecenter/member/member.html b/bmw-servicecenter/src/main/resources/templates/servicecenter/member/member.html new file mode 100644 index 000000000..555d06ec7 --- /dev/null +++ b/bmw-servicecenter/src/main/resources/templates/servicecenter/member/member.html @@ -0,0 +1,196 @@ + + + + + + +
+
+
+
+
+
    +
  • + 用户昵称: +
  • + +
  • + 用户邮箱: +
  • + +
  • + 手机号码: +
  • + +
  • + 用户性别(0男 1女 2未知): +
  • + +
  • + 头像路径: +
  • + +
  • + 密码: +
  • + +
  • + 盐加密: +
  • + +
  • + 帐号状态(0正常 1停用): +
  • + +
  • + 删除标志(0代表存在 2代表删除): +
  • + +
  • + 最后登陆IP: +
  • + +
  • + 最后登陆时间: +
  • + +
  • + 创建时间: +
  • + +
  • + 备注: +
  • + +
  • +  搜索 +  重置 +
  • +
+
+
+
+ + +
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/bmw-servicecenter/src/main/resources/templates/servicecenter/order/add.html b/bmw-servicecenter/src/main/resources/templates/servicecenter/order/add.html new file mode 100644 index 000000000..2b4dab723 --- /dev/null +++ b/bmw-servicecenter/src/main/resources/templates/servicecenter/order/add.html @@ -0,0 +1,54 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/bmw-servicecenter/src/main/resources/templates/servicecenter/order/edit.html b/bmw-servicecenter/src/main/resources/templates/servicecenter/order/edit.html new file mode 100644 index 000000000..02e1e6ac1 --- /dev/null +++ b/bmw-servicecenter/src/main/resources/templates/servicecenter/order/edit.html @@ -0,0 +1,55 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/bmw-servicecenter/src/main/resources/templates/servicecenter/order/order.html b/bmw-servicecenter/src/main/resources/templates/servicecenter/order/order.html new file mode 100644 index 000000000..211d8662b --- /dev/null +++ b/bmw-servicecenter/src/main/resources/templates/servicecenter/order/order.html @@ -0,0 +1,115 @@ + + + + + + +
+
+
+
+
+
    +
  • + 客户ID: +
  • + +
  • + 服务员ID: +
  • + +
  • + 备注: +
  • + +
  • + 创建时间: +
  • + +
  • +  搜索 +  重置 +
  • +
+
+
+
+ + +
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/sql/mwu_2019726 b/sql/mwu_2019726 new file mode 100644 index 000000000..5999ec357 --- /dev/null +++ b/sql/mwu_2019726 @@ -0,0 +1,116 @@ +drop table if exists sc_order; +CREATE TABLE + sc_order + ( + order_id bigint NOT NULL AUTO_INCREMENT COMMENT '订单ID', + member_id bigint COMMENT '客户ID', + attendant_id bigint COMMENT '服务员ID', + remark VARCHAR(500) COMMENT '备注', + create_time DATETIME COMMENT '创建时间', + PRIMARY KEY (order_id) + ) + ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='订单信息表'; + +drop table if exists sc_member; +CREATE TABLE + sc_member + ( + member_id bigint NOT NULL AUTO_INCREMENT COMMENT '客户ID', + member_name VARCHAR(30) NOT NULL COMMENT '用户昵称', + email VARCHAR(50) COMMENT '用户邮箱', + phonenumber VARCHAR(11) COMMENT '手机号码', + sex CHAR(1) DEFAULT '0' COMMENT '用户性别(0男 1女 2未知)', + avatar VARCHAR(100) COMMENT '头像路径', + password VARCHAR(50) COMMENT '密码', + salt VARCHAR(20) COMMENT '盐加密', + status CHAR(1) DEFAULT '0' COMMENT '帐号状态(0正常 1停用)', + del_flag CHAR(1) DEFAULT '0' COMMENT '删除标志(0代表存在 2代表删除)', + login_ip VARCHAR(50) COMMENT '最后登陆IP', + login_date DATETIME COMMENT '最后登陆时间', + create_time DATETIME COMMENT '创建时间', + remark VARCHAR(500) COMMENT '备注', + PRIMARY KEY (member_id) + ) + ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='客户信息表'; + +drop table if exists sc_attendant; +CREATE TABLE + sc_attendant + ( + attendant_id bigint NOT NULL AUTO_INCREMENT COMMENT '客户ID', + attendant_name VARCHAR(30) NOT NULL COMMENT '用户昵称', + email VARCHAR(50) COMMENT '用户邮箱', + phonenumber VARCHAR(11) COMMENT '手机号码', + sex CHAR(1) DEFAULT '0' COMMENT '用户性别(0男 1女 2未知)', + avatar VARCHAR(100) COMMENT '头像路径', + password VARCHAR(50) COMMENT '密码', + salt VARCHAR(20) COMMENT '盐加密', + status CHAR(1) DEFAULT '0' COMMENT '帐号状态(0正常 1停用)', + del_flag CHAR(1) DEFAULT '0' COMMENT '删除标志(0代表存在 2代表删除)', + login_ip VARCHAR(50) COMMENT '最后登陆IP', + login_date DATETIME COMMENT '最后登陆时间', + create_time DATETIME COMMENT '创建时间', + remark VARCHAR(500) COMMENT '备注', + PRIMARY KEY (attendant_id) + ) + ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='服务员信息表'; + + -- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('客户', '3', '1', '/servicecenter/member', 'C', '0', 'servicecenter:member:view', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '客户菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('客户查询', @parentId, '1', '#', 'F', '0', 'servicecenter:member:list', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('客户新增', @parentId, '2', '#', 'F', '0', 'servicecenter:member:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('客户修改', @parentId, '3', '#', 'F', '0', 'servicecenter:member:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('客户删除', @parentId, '4', '#', 'F', '0', 'servicecenter:member:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('订单', '3', '1', '/servicecenter/order', 'C', '0', 'servicecenter:order:view', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '订单菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('订单查询', @parentId, '1', '#', 'F', '0', 'servicecenter:order:list', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('订单新增', @parentId, '2', '#', 'F', '0', 'servicecenter:order:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('订单修改', @parentId, '3', '#', 'F', '0', 'servicecenter:order:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('订单删除', @parentId, '4', '#', 'F', '0', 'servicecenter:order:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('服务员', '3', '1', '/servicecenter/attendant', 'C', '0', 'servicecenter:attendant:view', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '服务员菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('服务员查询', @parentId, '1', '#', 'F', '0', 'servicecenter:attendant:list', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('服务员新增', @parentId, '2', '#', 'F', '0', 'servicecenter:attendant:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('服务员修改', @parentId, '3', '#', 'F', '0', 'servicecenter:attendant:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('服务员删除', @parentId, '4', '#', 'F', '0', 'servicecenter:attendant:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');