From 48fbaf151a5c075aac215a8c0a56b241205e0a22 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Fri, 15 Dec 2023 11:42:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E4=BC=99=E4=BA=BA=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/TbUserMatchController.java | 127 ++++++++++++++++ .../resources/templates/system/match/add.html | 112 ++++++++++++++ .../templates/system/match/edit.html | 117 +++++++++++++++ .../templates/system/match/match.html | 138 ++++++++++++++++++ .../com/ruoyi/system/domain/TbUserMatch.java | 67 +++++++++ .../system/mapper/TbUserMatchMapper.java | 62 ++++++++ .../system/service/ITbUserMatchService.java | 62 ++++++++ .../service/impl/TbUserMatchServiceImpl.java | 98 +++++++++++++ .../mapper/system/TbUserMatchMapper.xml | 104 +++++++++++++ 9 files changed, 887 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserMatchController.java create mode 100644 ruoyi-admin/src/main/resources/templates/system/match/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/match/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/match/match.html create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatch.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbUserMatchMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ITbUserMatchService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbUserMatchServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/TbUserMatchMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserMatchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserMatchController.java new file mode 100644 index 00000000..1280ba57 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserMatchController.java @@ -0,0 +1,127 @@ +package com.ruoyi.web.controller.system; + +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.TbUserMatch; +import com.ruoyi.system.service.ITbUserMatchService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 合伙人信息Controller + * + * @author ruoyi + * @date 2023-12-15 + */ +@Controller +@RequestMapping("/system/match") +public class TbUserMatchController extends BaseController +{ + private String prefix = "system/match"; + + @Autowired + private ITbUserMatchService tbUserMatchService; + + @RequiresPermissions("system:match:view") + @GetMapping() + public String match() + { + return prefix + "/match"; + } + + /** + * 查询合伙人信息列表 + */ + @RequiresPermissions("system:match:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TbUserMatch tbUserMatch) + { + startPage(); + List list = tbUserMatchService.selectTbUserMatchList(tbUserMatch); + return getDataTable(list); + } + + /** + * 导出合伙人信息列表 + */ + @RequiresPermissions("system:match:export") + @Log(title = "合伙人信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TbUserMatch tbUserMatch) + { + List list = tbUserMatchService.selectTbUserMatchList(tbUserMatch); + ExcelUtil util = new ExcelUtil(TbUserMatch.class); + return util.exportExcel(list, "合伙人信息数据"); + } + + /** + * 新增合伙人信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存合伙人信息 + */ + @RequiresPermissions("system:match:add") + @Log(title = "合伙人信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TbUserMatch tbUserMatch) + { + return toAjax(tbUserMatchService.insertTbUserMatch(tbUserMatch)); + } + + /** + * 修改合伙人信息 + */ + @RequiresPermissions("system:match:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + TbUserMatch tbUserMatch = tbUserMatchService.selectTbUserMatchById(id); + mmap.put("tbUserMatch", tbUserMatch); + return prefix + "/edit"; + } + + /** + * 修改保存合伙人信息 + */ + @RequiresPermissions("system:match:edit") + @Log(title = "合伙人信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TbUserMatch tbUserMatch) + { + return toAjax(tbUserMatchService.updateTbUserMatch(tbUserMatch)); + } + + /** + * 删除合伙人信息 + */ + @RequiresPermissions("system:match:remove") + @Log(title = "合伙人信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(tbUserMatchService.deleteTbUserMatchByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/resources/templates/system/match/add.html b/ruoyi-admin/src/main/resources/templates/system/match/add.html new file mode 100644 index 00000000..be079e8b --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/match/add.html @@ -0,0 +1,112 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/match/edit.html b/ruoyi-admin/src/main/resources/templates/system/match/edit.html new file mode 100644 index 00000000..aa87ff99 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/match/edit.html @@ -0,0 +1,117 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/match/match.html b/ruoyi-admin/src/main/resources/templates/system/match/match.html new file mode 100644 index 00000000..4e396d6e --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/match/match.html @@ -0,0 +1,138 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatch.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatch.java new file mode 100644 index 00000000..dcccdd20 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatch.java @@ -0,0 +1,67 @@ +package com.ruoyi.system.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 合伙人信息对象 tb_user_match + * + * @author ruoyi + * @date 2023-12-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "tb_user_match") +public class TbUserMatch extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键id */ + private Long id; + + /** 用户id */ + @Excel(name = "用户id") + @ApiModelProperty(value = "用户id") + private Long userId; + + /** 合伙人级别 0.初级 1.高级 2.区域 */ + @Excel(name = "合伙人级别 0.初级 1.高级 2.区域") + @ApiModelProperty(value = "合伙人级别 0.初级 1.高级 2.区域") + private Long matchType; + + /** 绑定手机号 */ + @Excel(name = "绑定手机号") + @ApiModelProperty(value = "绑定手机号") + private String phone; + + /** 平台昵称 */ + @Excel(name = "平台昵称") + @ApiModelProperty(value = "平台昵称") + private String nickName; + + /** 真是姓名 */ + @Excel(name = "真是姓名") + @ApiModelProperty(value = "真是姓名") + private String realName; + + /** 职业 */ + @Excel(name = "职业") + @ApiModelProperty(value = "职业") + private String matchJob; + + /** 支付宝账户 */ + @Excel(name = "支付宝账户") + @ApiModelProperty(value = "支付宝账户") + private String zfbNumber; + + /** 资源群体 */ + @Excel(name = "资源群体") + @ApiModelProperty(value = "资源群体") + private String matchContent; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbUserMatchMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbUserMatchMapper.java new file mode 100644 index 00000000..1e81b980 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbUserMatchMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.TbUserMatch; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 合伙人信息Mapper接口 + * + * @author ruoyi + * @date 2023-12-15 + */ +public interface TbUserMatchMapper extends BaseMapper +{ + /** + * 查询合伙人信息 + * + * @param id 合伙人信息主键 + * @return 合伙人信息 + */ + public TbUserMatch selectTbUserMatchById(Long id); + + /** + * 查询合伙人信息列表 + * + * @param tbUserMatch 合伙人信息 + * @return 合伙人信息集合 + */ + public List selectTbUserMatchList(TbUserMatch tbUserMatch); + + /** + * 新增合伙人信息 + * + * @param tbUserMatch 合伙人信息 + * @return 结果 + */ + public int insertTbUserMatch(TbUserMatch tbUserMatch); + + /** + * 修改合伙人信息 + * + * @param tbUserMatch 合伙人信息 + * @return 结果 + */ + public int updateTbUserMatch(TbUserMatch tbUserMatch); + + /** + * 删除合伙人信息 + * + * @param id 合伙人信息主键 + * @return 结果 + */ + public int deleteTbUserMatchById(Long id); + + /** + * 批量删除合伙人信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTbUserMatchByIds(String[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITbUserMatchService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITbUserMatchService.java new file mode 100644 index 00000000..b8ed4fc4 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITbUserMatchService.java @@ -0,0 +1,62 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.TbUserMatch; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 合伙人信息Service接口 + * + * @author ruoyi + * @date 2023-12-15 + */ +public interface ITbUserMatchService extends IService +{ + /** + * 查询合伙人信息 + * + * @param id 合伙人信息主键 + * @return 合伙人信息 + */ + public TbUserMatch selectTbUserMatchById(Long id); + + /** + * 查询合伙人信息列表 + * + * @param tbUserMatch 合伙人信息 + * @return 合伙人信息集合 + */ + public List selectTbUserMatchList(TbUserMatch tbUserMatch); + + /** + * 新增合伙人信息 + * + * @param tbUserMatch 合伙人信息 + * @return 结果 + */ + public int insertTbUserMatch(TbUserMatch tbUserMatch); + + /** + * 修改合伙人信息 + * + * @param tbUserMatch 合伙人信息 + * @return 结果 + */ + public int updateTbUserMatch(TbUserMatch tbUserMatch); + + /** + * 批量删除合伙人信息 + * + * @param ids 需要删除的合伙人信息主键集合 + * @return 结果 + */ + public int deleteTbUserMatchByIds(String ids); + + /** + * 删除合伙人信息信息 + * + * @param id 合伙人信息主键 + * @return 结果 + */ + public int deleteTbUserMatchById(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbUserMatchServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbUserMatchServiceImpl.java new file mode 100644 index 00000000..db924716 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbUserMatchServiceImpl.java @@ -0,0 +1,98 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.TbUserMatchMapper; +import com.ruoyi.system.domain.TbUserMatch; +import com.ruoyi.system.service.ITbUserMatchService; +import com.ruoyi.common.core.text.Convert; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 合伙人信息Service业务层处理 + * + * @author ruoyi + * @date 2023-12-15 + */ +@Service +public class TbUserMatchServiceImpl extends ServiceImpl implements ITbUserMatchService +{ + @Autowired + private TbUserMatchMapper tbUserMatchMapper; + + /** + * 查询合伙人信息 + * + * @param id 合伙人信息主键 + * @return 合伙人信息 + */ + @Override + public TbUserMatch selectTbUserMatchById(Long id) + { + return tbUserMatchMapper.selectTbUserMatchById(id); + } + + /** + * 查询合伙人信息列表 + * + * @param tbUserMatch 合伙人信息 + * @return 合伙人信息 + */ + @Override + public List selectTbUserMatchList(TbUserMatch tbUserMatch) + { + return tbUserMatchMapper.selectTbUserMatchList(tbUserMatch); + } + + /** + * 新增合伙人信息 + * + * @param tbUserMatch 合伙人信息 + * @return 结果 + */ + @Override + public int insertTbUserMatch(TbUserMatch tbUserMatch) + { + tbUserMatch.setCreateTime(DateUtils.getNowDate()); + return tbUserMatchMapper.insertTbUserMatch(tbUserMatch); + } + + /** + * 修改合伙人信息 + * + * @param tbUserMatch 合伙人信息 + * @return 结果 + */ + @Override + public int updateTbUserMatch(TbUserMatch tbUserMatch) + { + tbUserMatch.setUpdateTime(DateUtils.getNowDate()); + return tbUserMatchMapper.updateTbUserMatch(tbUserMatch); + } + + /** + * 批量删除合伙人信息 + * + * @param ids 需要删除的合伙人信息主键 + * @return 结果 + */ + @Override + public int deleteTbUserMatchByIds(String ids) + { + return tbUserMatchMapper.deleteTbUserMatchByIds(Convert.toStrArray(ids)); + } + + /** + * 删除合伙人信息信息 + * + * @param id 合伙人信息主键 + * @return 结果 + */ + @Override + public int deleteTbUserMatchById(Long id) + { + return tbUserMatchMapper.deleteTbUserMatchById(id); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/TbUserMatchMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbUserMatchMapper.xml new file mode 100644 index 00000000..d003c11c --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/TbUserMatchMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + select id, user_id, match_type, phone, nick_name, real_name, match_job, zfb_number, match_content, create_time, update_time, remark from tb_user_match + + + + + + + + insert into tb_user_match + + user_id, + match_type, + phone, + nick_name, + real_name, + match_job, + zfb_number, + match_content, + create_time, + update_time, + remark, + + + #{userId}, + #{matchType}, + #{phone}, + #{nickName}, + #{realName}, + #{matchJob}, + #{zfbNumber}, + #{matchContent}, + #{createTime}, + #{updateTime}, + #{remark}, + + + + + update tb_user_match + + user_id = #{userId}, + match_type = #{matchType}, + phone = #{phone}, + nick_name = #{nickName}, + real_name = #{realName}, + match_job = #{matchJob}, + zfb_number = #{zfbNumber}, + match_content = #{matchContent}, + create_time = #{createTime}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from tb_user_match where id = #{id} + + + + delete from tb_user_match where id in + + #{id} + + + + \ No newline at end of file