diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserMatchGroupAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserMatchGroupAppController.java new file mode 100644 index 00000000..b6889e35 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserMatchGroupAppController.java @@ -0,0 +1,38 @@ +package com.ruoyi.web.controller.app; + +import com.ruoyi.common.core.domain.Result; +import com.ruoyi.system.domain.TbUserMatchGroup; +import com.ruoyi.system.service.ITbUserMatchGroupService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + *

合伙人创建活动团

+ * @author clunt + */ +@Slf4j +@Api(tags = "App*合伙人创建活动团") +@RestController +@RequestMapping(value = "/app/matchGroup") +public class TbUserMatchGroupAppController { + + @Autowired + private ITbUserMatchGroupService tbUserMatchGroupService; + + @ResponseBody + @PostMapping("/add") + @ApiOperation(value = "创建活动团", httpMethod = "POST") + public Result addSave(@RequestBody TbUserMatchGroup tbUserMatchGroup) + { + int effectiveRows = tbUserMatchGroupService.insertTbUserMatchGroup(tbUserMatchGroup); + if(effectiveRows > 0){ + return Result.success("创建活动团成功!"); + }else { + return Result.error("创建活动团成功失败!"); + } + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserMatchGroupController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserMatchGroupController.java new file mode 100644 index 00000000..4c5ad2c0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserMatchGroupController.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.TbUserMatchGroup; +import com.ruoyi.system.service.ITbUserMatchGroupService; +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-16 + */ +@Controller +@RequestMapping("/system/group") +public class TbUserMatchGroupController extends BaseController +{ + private String prefix = "system/group"; + + @Autowired + private ITbUserMatchGroupService tbUserMatchGroupService; + + @RequiresPermissions("system:group:view") + @GetMapping() + public String group() + { + return prefix + "/group"; + } + + /** + * 查询媒婆团列表 + */ + @RequiresPermissions("system:group:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TbUserMatchGroup tbUserMatchGroup) + { + startPage(); + List list = tbUserMatchGroupService.selectTbUserMatchGroupList(tbUserMatchGroup); + return getDataTable(list); + } + + /** + * 导出媒婆团列表 + */ + @RequiresPermissions("system:group:export") + @Log(title = "媒婆团", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TbUserMatchGroup tbUserMatchGroup) + { + List list = tbUserMatchGroupService.selectTbUserMatchGroupList(tbUserMatchGroup); + ExcelUtil util = new ExcelUtil(TbUserMatchGroup.class); + return util.exportExcel(list, "媒婆团数据"); + } + + /** + * 新增媒婆团 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存媒婆团 + */ + @RequiresPermissions("system:group:add") + @Log(title = "媒婆团", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(TbUserMatchGroup tbUserMatchGroup) + { + return toAjax(tbUserMatchGroupService.insertTbUserMatchGroup(tbUserMatchGroup)); + } + + /** + * 修改媒婆团 + */ + @RequiresPermissions("system:group:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + TbUserMatchGroup tbUserMatchGroup = tbUserMatchGroupService.selectTbUserMatchGroupById(id); + mmap.put("tbUserMatchGroup", tbUserMatchGroup); + return prefix + "/edit"; + } + + /** + * 修改保存媒婆团 + */ + @RequiresPermissions("system:group:edit") + @Log(title = "媒婆团", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(TbUserMatchGroup tbUserMatchGroup) + { + return toAjax(tbUserMatchGroupService.updateTbUserMatchGroup(tbUserMatchGroup)); + } + + /** + * 删除媒婆团 + */ + @RequiresPermissions("system:group:remove") + @Log(title = "媒婆团", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(tbUserMatchGroupService.deleteTbUserMatchGroupByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/resources/templates/system/group/add.html b/ruoyi-admin/src/main/resources/templates/system/group/add.html new file mode 100644 index 00000000..cf1a0b4c --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/group/add.html @@ -0,0 +1,79 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/group/edit.html b/ruoyi-admin/src/main/resources/templates/system/group/edit.html new file mode 100644 index 00000000..af070e71 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/group/edit.html @@ -0,0 +1,80 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/group/group.html b/ruoyi-admin/src/main/resources/templates/system/group/group.html new file mode 100644 index 00000000..dcff5e94 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/group/group.html @@ -0,0 +1,146 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatchGroup.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatchGroup.java new file mode 100644 index 00000000..bdd3e21b --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatchGroup.java @@ -0,0 +1,74 @@ +package com.ruoyi.system.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 媒婆团对象 tb_user_match_group + * + * @author ruoyi + * @date 2023-12-16 + */ +@Data +@ApiModel(value = "媒婆团") +@EqualsAndHashCode(callSuper = true) +@TableName(value = "tb_user_match_group") +public class TbUserMatchGroup extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键id */ + private Long id; + + /** 合伙人id */ + @Excel(name = "合伙人id") + @ApiModelProperty(value = "合伙人id") + private Long matchId; + + /** 团名 */ + @Excel(name = "团名") + @ApiModelProperty(value = "团名") + private String groupName; + + /** 简介 */ + @Excel(name = "简介") + @ApiModelProperty(value = "简介") + private String groupDesc; + + /** 团类型:0.活动团 扩展字段,目前只有活动团 */ + @Excel(name = "团类型:0.活动团 扩展字段,目前只有活动团") + @ApiModelProperty(value = "团类型:0.活动团 扩展字段,目前只有活动团") + private Long groupType; + + /** 封面图片 */ + @Excel(name = "封面图片") + @ApiModelProperty(value = "封面图片") + private String logoUrl; + + /** 所在地 */ + @Excel(name = "所在地") + @ApiModelProperty(value = "所在地") + private String nativePlace; + + /** 省id */ + @Excel(name = "省id") + @ApiModelProperty(value = "省id") + private Long provinceId; + + /** 市id */ + @Excel(name = "市id") + @ApiModelProperty(value = "市id") + private Long cityId; + + /** 区id */ + @Excel(name = "区id") + @ApiModelProperty(value = "区id") + private Long district; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbUserMatchGroupMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbUserMatchGroupMapper.java new file mode 100644 index 00000000..6825dd59 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TbUserMatchGroupMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.TbUserMatchGroup; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 媒婆团Mapper接口 + * + * @author ruoyi + * @date 2023-12-16 + */ +public interface TbUserMatchGroupMapper extends BaseMapper +{ + /** + * 查询媒婆团 + * + * @param id 媒婆团主键 + * @return 媒婆团 + */ + public TbUserMatchGroup selectTbUserMatchGroupById(Long id); + + /** + * 查询媒婆团列表 + * + * @param tbUserMatchGroup 媒婆团 + * @return 媒婆团集合 + */ + public List selectTbUserMatchGroupList(TbUserMatchGroup tbUserMatchGroup); + + /** + * 新增媒婆团 + * + * @param tbUserMatchGroup 媒婆团 + * @return 结果 + */ + public int insertTbUserMatchGroup(TbUserMatchGroup tbUserMatchGroup); + + /** + * 修改媒婆团 + * + * @param tbUserMatchGroup 媒婆团 + * @return 结果 + */ + public int updateTbUserMatchGroup(TbUserMatchGroup tbUserMatchGroup); + + /** + * 删除媒婆团 + * + * @param id 媒婆团主键 + * @return 结果 + */ + public int deleteTbUserMatchGroupById(Long id); + + /** + * 批量删除媒婆团 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTbUserMatchGroupByIds(String[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITbUserMatchGroupService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITbUserMatchGroupService.java new file mode 100644 index 00000000..9af0c0e9 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITbUserMatchGroupService.java @@ -0,0 +1,62 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.TbUserMatchGroup; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 媒婆团Service接口 + * + * @author ruoyi + * @date 2023-12-16 + */ +public interface ITbUserMatchGroupService extends IService +{ + /** + * 查询媒婆团 + * + * @param id 媒婆团主键 + * @return 媒婆团 + */ + public TbUserMatchGroup selectTbUserMatchGroupById(Long id); + + /** + * 查询媒婆团列表 + * + * @param tbUserMatchGroup 媒婆团 + * @return 媒婆团集合 + */ + public List selectTbUserMatchGroupList(TbUserMatchGroup tbUserMatchGroup); + + /** + * 新增媒婆团 + * + * @param tbUserMatchGroup 媒婆团 + * @return 结果 + */ + public int insertTbUserMatchGroup(TbUserMatchGroup tbUserMatchGroup); + + /** + * 修改媒婆团 + * + * @param tbUserMatchGroup 媒婆团 + * @return 结果 + */ + public int updateTbUserMatchGroup(TbUserMatchGroup tbUserMatchGroup); + + /** + * 批量删除媒婆团 + * + * @param ids 需要删除的媒婆团主键集合 + * @return 结果 + */ + public int deleteTbUserMatchGroupByIds(String ids); + + /** + * 删除媒婆团信息 + * + * @param id 媒婆团主键 + * @return 结果 + */ + public int deleteTbUserMatchGroupById(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbUserMatchGroupServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbUserMatchGroupServiceImpl.java new file mode 100644 index 00000000..1add668a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbUserMatchGroupServiceImpl.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.TbUserMatchGroupMapper; +import com.ruoyi.system.domain.TbUserMatchGroup; +import com.ruoyi.system.service.ITbUserMatchGroupService; +import com.ruoyi.common.core.text.Convert; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 媒婆团Service业务层处理 + * + * @author ruoyi + * @date 2023-12-16 + */ +@Service +public class TbUserMatchGroupServiceImpl extends ServiceImpl implements ITbUserMatchGroupService +{ + @Autowired + private TbUserMatchGroupMapper tbUserMatchGroupMapper; + + /** + * 查询媒婆团 + * + * @param id 媒婆团主键 + * @return 媒婆团 + */ + @Override + public TbUserMatchGroup selectTbUserMatchGroupById(Long id) + { + return tbUserMatchGroupMapper.selectTbUserMatchGroupById(id); + } + + /** + * 查询媒婆团列表 + * + * @param tbUserMatchGroup 媒婆团 + * @return 媒婆团 + */ + @Override + public List selectTbUserMatchGroupList(TbUserMatchGroup tbUserMatchGroup) + { + return tbUserMatchGroupMapper.selectTbUserMatchGroupList(tbUserMatchGroup); + } + + /** + * 新增媒婆团 + * + * @param tbUserMatchGroup 媒婆团 + * @return 结果 + */ + @Override + public int insertTbUserMatchGroup(TbUserMatchGroup tbUserMatchGroup) + { + tbUserMatchGroup.setCreateTime(DateUtils.getNowDate()); + return tbUserMatchGroupMapper.insertTbUserMatchGroup(tbUserMatchGroup); + } + + /** + * 修改媒婆团 + * + * @param tbUserMatchGroup 媒婆团 + * @return 结果 + */ + @Override + public int updateTbUserMatchGroup(TbUserMatchGroup tbUserMatchGroup) + { + tbUserMatchGroup.setUpdateTime(DateUtils.getNowDate()); + return tbUserMatchGroupMapper.updateTbUserMatchGroup(tbUserMatchGroup); + } + + /** + * 批量删除媒婆团 + * + * @param ids 需要删除的媒婆团主键 + * @return 结果 + */ + @Override + public int deleteTbUserMatchGroupByIds(String ids) + { + return tbUserMatchGroupMapper.deleteTbUserMatchGroupByIds(Convert.toStrArray(ids)); + } + + /** + * 删除媒婆团信息 + * + * @param id 媒婆团主键 + * @return 结果 + */ + @Override + public int deleteTbUserMatchGroupById(Long id) + { + return tbUserMatchGroupMapper.deleteTbUserMatchGroupById(id); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/TbUserMatchGroupMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbUserMatchGroupMapper.xml new file mode 100644 index 00000000..d9079536 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/TbUserMatchGroupMapper.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + select id, match_id, group_name, group_desc, group_type, logo_url, native_place, province_id, city_id, district, create_time, update_time, remark from tb_user_match_group + + + + + + + + insert into tb_user_match_group + + match_id, + group_name, + group_desc, + group_type, + logo_url, + native_place, + province_id, + city_id, + district, + create_time, + update_time, + remark, + + + #{matchId}, + #{groupName}, + #{groupDesc}, + #{groupType}, + #{logoUrl}, + #{nativePlace}, + #{provinceId}, + #{cityId}, + #{district}, + #{createTime}, + #{updateTime}, + #{remark}, + + + + + update tb_user_match_group + + match_id = #{matchId}, + group_name = #{groupName}, + group_desc = #{groupDesc}, + group_type = #{groupType}, + logo_url = #{logoUrl}, + native_place = #{nativePlace}, + province_id = #{provinceId}, + city_id = #{cityId}, + district = #{district}, + create_time = #{createTime}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from tb_user_match_group where id = #{id} + + + + delete from tb_user_match_group where id in + + #{id} + + + + \ No newline at end of file