From 83d783425206cc1785982e819f36374ab0b245f0 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Sun, 5 Jun 2022 21:48:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/cal/controller/CalTeamController.java | 14 +- .../controller/CalTeamMemberController.java | 104 +++++++++++ .../com/ktg/mes/cal/domain/CalTeamMember.java | 164 ++++++++++++++++++ .../mes/cal/mapper/CalTeamMemberMapper.java | 61 +++++++ .../cal/service/ICalTeamMemberService.java | 61 +++++++ .../impl/CalTeamMemberServiceImpl.java | 96 ++++++++++ .../cal/service/impl/CalTeamServiceImpl.java | 96 ++++++++++ .../mapper/cal/CalTeamMemberMapper.xml | 112 ++++++++++++ 8 files changed, 701 insertions(+), 7 deletions(-) create mode 100644 ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamMemberController.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/cal/domain/CalTeamMember.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMemberMapper.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamMemberService.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamMemberServiceImpl.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamServiceImpl.java create mode 100644 ktg-mes/src/main/resources/mapper/cal/CalTeamMemberMapper.xml diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamController.java b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamController.java index e8d69f2..d237cbb 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamController.java @@ -28,7 +28,7 @@ import com.ktg.common.core.page.TableDataInfo; * @date 2022-06-05 */ @RestController -@RequestMapping("/cal/team") +@RequestMapping("/mes/cal/team") public class CalTeamController extends BaseController { @Autowired @@ -37,7 +37,7 @@ public class CalTeamController extends BaseController /** * 查询班组列表 */ - @PreAuthorize("@ss.hasPermi('cal:team:list')") + @PreAuthorize("@ss.hasPermi('mes:cal:team:list')") @GetMapping("/list") public TableDataInfo list(CalTeam calTeam) { @@ -49,7 +49,7 @@ public class CalTeamController extends BaseController /** * 导出班组列表 */ - @PreAuthorize("@ss.hasPermi('cal:team:export')") + @PreAuthorize("@ss.hasPermi('mes:cal:team:export')") @Log(title = "班组", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, CalTeam calTeam) @@ -62,7 +62,7 @@ public class CalTeamController extends BaseController /** * 获取班组详细信息 */ - @PreAuthorize("@ss.hasPermi('cal:team:query')") + @PreAuthorize("@ss.hasPermi('mes:cal:team:query')") @GetMapping(value = "/{teamId}") public AjaxResult getInfo(@PathVariable("teamId") Long teamId) { @@ -72,7 +72,7 @@ public class CalTeamController extends BaseController /** * 新增班组 */ - @PreAuthorize("@ss.hasPermi('cal:team:add')") + @PreAuthorize("@ss.hasPermi('mes:cal:team:add')") @Log(title = "班组", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody CalTeam calTeam) @@ -83,7 +83,7 @@ public class CalTeamController extends BaseController /** * 修改班组 */ - @PreAuthorize("@ss.hasPermi('cal:team:edit')") + @PreAuthorize("@ss.hasPermi('mes:cal:team:edit')") @Log(title = "班组", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody CalTeam calTeam) @@ -94,7 +94,7 @@ public class CalTeamController extends BaseController /** * 删除班组 */ - @PreAuthorize("@ss.hasPermi('cal:team:remove')") + @PreAuthorize("@ss.hasPermi('mes:cal:team:remove')") @Log(title = "班组", businessType = BusinessType.DELETE) @DeleteMapping("/{teamIds}") public AjaxResult remove(@PathVariable Long[] teamIds) diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamMemberController.java b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamMemberController.java new file mode 100644 index 0000000..52a01cd --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamMemberController.java @@ -0,0 +1,104 @@ +package com.ktg.mes.cal.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ktg.common.annotation.Log; +import com.ktg.common.core.controller.BaseController; +import com.ktg.common.core.domain.AjaxResult; +import com.ktg.common.enums.BusinessType; +import com.ktg.mes.cal.domain.CalTeamMember; +import com.ktg.mes.cal.service.ICalTeamMemberService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 班组成员Controller + * + * @author yinjinlu + * @date 2022-06-05 + */ +@RestController +@RequestMapping("/mes/cal/teammember") +public class CalTeamMemberController extends BaseController +{ + @Autowired + private ICalTeamMemberService calTeamMemberService; + + /** + * 查询班组成员列表 + */ + @PreAuthorize("@ss.hasPermi('mes:cal:teammember:list')") + @GetMapping("/list") + public TableDataInfo list(CalTeamMember calTeamMember) + { + startPage(); + List list = calTeamMemberService.selectCalTeamMemberList(calTeamMember); + return getDataTable(list); + } + + /** + * 导出班组成员列表 + */ + @PreAuthorize("@ss.hasPermi('mes:cal:teammember:export')") + @Log(title = "班组成员", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, CalTeamMember calTeamMember) + { + List list = calTeamMemberService.selectCalTeamMemberList(calTeamMember); + ExcelUtil util = new ExcelUtil(CalTeamMember.class); + util.exportExcel(response, list, "班组成员数据"); + } + + /** + * 获取班组成员详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:cal:teammember:query')") + @GetMapping(value = "/{memberId}") + public AjaxResult getInfo(@PathVariable("memberId") Long memberId) + { + return AjaxResult.success(calTeamMemberService.selectCalTeamMemberByMemberId(memberId)); + } + + /** + * 新增班组成员 + */ + @PreAuthorize("@ss.hasPermi('mes:cal:teammember:add')") + @Log(title = "班组成员", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody CalTeamMember calTeamMember) + { + return toAjax(calTeamMemberService.insertCalTeamMember(calTeamMember)); + } + + /** + * 修改班组成员 + */ + @PreAuthorize("@ss.hasPermi('mes:cal:teammember:edit')") + @Log(title = "班组成员", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody CalTeamMember calTeamMember) + { + return toAjax(calTeamMemberService.updateCalTeamMember(calTeamMember)); + } + + /** + * 删除班组成员 + */ + @PreAuthorize("@ss.hasPermi('mes:cal:teammember:remove')") + @Log(title = "班组成员", businessType = BusinessType.DELETE) + @DeleteMapping("/{memberIds}") + public AjaxResult remove(@PathVariable Long[] memberIds) + { + return toAjax(calTeamMemberService.deleteCalTeamMemberByMemberIds(memberIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/domain/CalTeamMember.java b/ktg-mes/src/main/java/com/ktg/mes/cal/domain/CalTeamMember.java new file mode 100644 index 0000000..3fd1be9 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/domain/CalTeamMember.java @@ -0,0 +1,164 @@ +package com.ktg.mes.cal.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ktg.common.annotation.Excel; +import com.ktg.common.core.domain.BaseEntity; + +/** + * 班组成员对象 cal_team_member + * + * @author yinjinlu + * @date 2022-06-05 + */ +public class CalTeamMember extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 班组成员ID */ + private Long memberId; + + /** 班组ID */ + @Excel(name = "班组ID") + private Long teamId; + + /** 用户ID */ + @Excel(name = "用户ID") + private Long userId; + + /** 用户名 */ + @Excel(name = "用户名") + private String userName; + + /** 用户昵称 */ + @Excel(name = "用户昵称") + private String nickName; + + /** 电话 */ + @Excel(name = "电话") + private String tel; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setMemberId(Long memberId) + { + this.memberId = memberId; + } + + public Long getMemberId() + { + return memberId; + } + public void setTeamId(Long teamId) + { + this.teamId = teamId; + } + + public Long getTeamId() + { + return teamId; + } + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getUserName() + { + return userName; + } + public void setNickName(String nickName) + { + this.nickName = nickName; + } + + public String getNickName() + { + return nickName; + } + public void setTel(String tel) + { + this.tel = tel; + } + + public String getTel() + { + return tel; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + public void setAttr2(String attr2) + { + this.attr2 = attr2; + } + + public String getAttr2() + { + return attr2; + } + public void setAttr3(Long attr3) + { + this.attr3 = attr3; + } + + public Long getAttr3() + { + return attr3; + } + public void setAttr4(Long attr4) + { + this.attr4 = attr4; + } + + public Long getAttr4() + { + return attr4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("memberId", getMemberId()) + .append("teamId", getTeamId()) + .append("userId", getUserId()) + .append("userName", getUserName()) + .append("nickName", getNickName()) + .append("tel", getTel()) + .append("remark", getRemark()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMemberMapper.java b/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMemberMapper.java new file mode 100644 index 0000000..06c81ac --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMemberMapper.java @@ -0,0 +1,61 @@ +package com.ktg.mes.cal.mapper; + +import java.util.List; +import com.ktg.mes.cal.domain.CalTeamMember; + +/** + * 班组成员Mapper接口 + * + * @author yinjinlu + * @date 2022-06-05 + */ +public interface CalTeamMemberMapper +{ + /** + * 查询班组成员 + * + * @param memberId 班组成员主键 + * @return 班组成员 + */ + public CalTeamMember selectCalTeamMemberByMemberId(Long memberId); + + /** + * 查询班组成员列表 + * + * @param calTeamMember 班组成员 + * @return 班组成员集合 + */ + public List selectCalTeamMemberList(CalTeamMember calTeamMember); + + /** + * 新增班组成员 + * + * @param calTeamMember 班组成员 + * @return 结果 + */ + public int insertCalTeamMember(CalTeamMember calTeamMember); + + /** + * 修改班组成员 + * + * @param calTeamMember 班组成员 + * @return 结果 + */ + public int updateCalTeamMember(CalTeamMember calTeamMember); + + /** + * 删除班组成员 + * + * @param memberId 班组成员主键 + * @return 结果 + */ + public int deleteCalTeamMemberByMemberId(Long memberId); + + /** + * 批量删除班组成员 + * + * @param memberIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCalTeamMemberByMemberIds(Long[] memberIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamMemberService.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamMemberService.java new file mode 100644 index 0000000..9ddd498 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamMemberService.java @@ -0,0 +1,61 @@ +package com.ktg.mes.cal.service; + +import java.util.List; +import com.ktg.mes.cal.domain.CalTeamMember; + +/** + * 班组成员Service接口 + * + * @author yinjinlu + * @date 2022-06-05 + */ +public interface ICalTeamMemberService +{ + /** + * 查询班组成员 + * + * @param memberId 班组成员主键 + * @return 班组成员 + */ + public CalTeamMember selectCalTeamMemberByMemberId(Long memberId); + + /** + * 查询班组成员列表 + * + * @param calTeamMember 班组成员 + * @return 班组成员集合 + */ + public List selectCalTeamMemberList(CalTeamMember calTeamMember); + + /** + * 新增班组成员 + * + * @param calTeamMember 班组成员 + * @return 结果 + */ + public int insertCalTeamMember(CalTeamMember calTeamMember); + + /** + * 修改班组成员 + * + * @param calTeamMember 班组成员 + * @return 结果 + */ + public int updateCalTeamMember(CalTeamMember calTeamMember); + + /** + * 批量删除班组成员 + * + * @param memberIds 需要删除的班组成员主键集合 + * @return 结果 + */ + public int deleteCalTeamMemberByMemberIds(Long[] memberIds); + + /** + * 删除班组成员信息 + * + * @param memberId 班组成员主键 + * @return 结果 + */ + public int deleteCalTeamMemberByMemberId(Long memberId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamMemberServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamMemberServiceImpl.java new file mode 100644 index 0000000..e09ebf9 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamMemberServiceImpl.java @@ -0,0 +1,96 @@ +package com.ktg.mes.cal.service.impl; + +import java.util.List; +import com.ktg.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.cal.mapper.CalTeamMemberMapper; +import com.ktg.mes.cal.domain.CalTeamMember; +import com.ktg.mes.cal.service.ICalTeamMemberService; + +/** + * 班组成员Service业务层处理 + * + * @author yinjinlu + * @date 2022-06-05 + */ +@Service +public class CalTeamMemberServiceImpl implements ICalTeamMemberService +{ + @Autowired + private CalTeamMemberMapper calTeamMemberMapper; + + /** + * 查询班组成员 + * + * @param memberId 班组成员主键 + * @return 班组成员 + */ + @Override + public CalTeamMember selectCalTeamMemberByMemberId(Long memberId) + { + return calTeamMemberMapper.selectCalTeamMemberByMemberId(memberId); + } + + /** + * 查询班组成员列表 + * + * @param calTeamMember 班组成员 + * @return 班组成员 + */ + @Override + public List selectCalTeamMemberList(CalTeamMember calTeamMember) + { + return calTeamMemberMapper.selectCalTeamMemberList(calTeamMember); + } + + /** + * 新增班组成员 + * + * @param calTeamMember 班组成员 + * @return 结果 + */ + @Override + public int insertCalTeamMember(CalTeamMember calTeamMember) + { + calTeamMember.setCreateTime(DateUtils.getNowDate()); + return calTeamMemberMapper.insertCalTeamMember(calTeamMember); + } + + /** + * 修改班组成员 + * + * @param calTeamMember 班组成员 + * @return 结果 + */ + @Override + public int updateCalTeamMember(CalTeamMember calTeamMember) + { + calTeamMember.setUpdateTime(DateUtils.getNowDate()); + return calTeamMemberMapper.updateCalTeamMember(calTeamMember); + } + + /** + * 批量删除班组成员 + * + * @param memberIds 需要删除的班组成员主键 + * @return 结果 + */ + @Override + public int deleteCalTeamMemberByMemberIds(Long[] memberIds) + { + return calTeamMemberMapper.deleteCalTeamMemberByMemberIds(memberIds); + } + + /** + * 删除班组成员信息 + * + * @param memberId 班组成员主键 + * @return 结果 + */ + @Override + public int deleteCalTeamMemberByMemberId(Long memberId) + { + return calTeamMemberMapper.deleteCalTeamMemberByMemberId(memberId); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamServiceImpl.java new file mode 100644 index 0000000..bae266e --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamServiceImpl.java @@ -0,0 +1,96 @@ +package com.ktg.mes.cal.service.impl; + +import java.util.List; +import com.ktg.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.cal.mapper.CalTeamMapper; +import com.ktg.mes.cal.domain.CalTeam; +import com.ktg.mes.cal.service.ICalTeamService; + +/** + * 班组Service业务层处理 + * + * @author yinjinlu + * @date 2022-06-05 + */ +@Service +public class CalTeamServiceImpl implements ICalTeamService +{ + @Autowired + private CalTeamMapper calTeamMapper; + + /** + * 查询班组 + * + * @param teamId 班组主键 + * @return 班组 + */ + @Override + public CalTeam selectCalTeamByTeamId(Long teamId) + { + return calTeamMapper.selectCalTeamByTeamId(teamId); + } + + /** + * 查询班组列表 + * + * @param calTeam 班组 + * @return 班组 + */ + @Override + public List selectCalTeamList(CalTeam calTeam) + { + return calTeamMapper.selectCalTeamList(calTeam); + } + + /** + * 新增班组 + * + * @param calTeam 班组 + * @return 结果 + */ + @Override + public int insertCalTeam(CalTeam calTeam) + { + calTeam.setCreateTime(DateUtils.getNowDate()); + return calTeamMapper.insertCalTeam(calTeam); + } + + /** + * 修改班组 + * + * @param calTeam 班组 + * @return 结果 + */ + @Override + public int updateCalTeam(CalTeam calTeam) + { + calTeam.setUpdateTime(DateUtils.getNowDate()); + return calTeamMapper.updateCalTeam(calTeam); + } + + /** + * 批量删除班组 + * + * @param teamIds 需要删除的班组主键 + * @return 结果 + */ + @Override + public int deleteCalTeamByTeamIds(Long[] teamIds) + { + return calTeamMapper.deleteCalTeamByTeamIds(teamIds); + } + + /** + * 删除班组信息 + * + * @param teamId 班组主键 + * @return 结果 + */ + @Override + public int deleteCalTeamByTeamId(Long teamId) + { + return calTeamMapper.deleteCalTeamByTeamId(teamId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/cal/CalTeamMemberMapper.xml b/ktg-mes/src/main/resources/mapper/cal/CalTeamMemberMapper.xml new file mode 100644 index 0000000..4fc82cc --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/cal/CalTeamMemberMapper.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + select member_id, team_id, user_id, user_name, nick_name, tel, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from cal_team_member + + + + + + + + insert into cal_team_member + + team_id, + user_id, + user_name, + nick_name, + tel, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{teamId}, + #{userId}, + #{userName}, + #{nickName}, + #{tel}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update cal_team_member + + team_id = #{teamId}, + user_id = #{userId}, + user_name = #{userName}, + nick_name = #{nickName}, + tel = #{tel}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where member_id = #{memberId} + + + + delete from cal_team_member where member_id = #{memberId} + + + + delete from cal_team_member where member_id in + + #{memberId} + + + \ No newline at end of file