备注

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/controller/MainGoodsController.java

@@ -0,0 +1,98 @@
+package org.dromara.main.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.main.domain.bo.MainGoodsBo;
+import org.dromara.main.domain.vo.MainGoodsVo;
+import org.dromara.main.service.IMainGoodsService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/main/goods")
+public class MainGoodsController extends BaseController {
+
+    private final IMainGoodsService mainGoodsService;
+
+    /**
+     * 查询商品列表
+     */
+    @SaCheckPermission("main:goods:list")
+    @GetMapping("/list")
+    public TableDataInfo<MainGoodsVo> list(MainGoodsBo bo, PageQuery pageQuery) {
+        return mainGoodsService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出商品列表
+     */
+    @SaCheckPermission("main:goods:export")
+    @Log(title = "商品管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(MainGoodsBo bo, HttpServletResponse response) {
+        List<MainGoodsVo> list = mainGoodsService.queryList(bo);
+        ExcelUtil.exportExcel(list, "商品信息", MainGoodsVo.class, response);
+    }
+
+    /**
+     * 获取商品详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("main:goods:query")
+    @GetMapping("/{id}")
+    public R<MainGoodsVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return R.ok(mainGoodsService.queryById(id));
+    }
+
+    /**
+     * 新增商品
+     */
+    @SaCheckPermission("main:goods:add")
+    @Log(title = "商品管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody MainGoodsBo bo) {
+        return toAjax(mainGoodsService.insertByBo(bo));
+    }
+
+    /**
+     * 修改商品
+     */
+    @SaCheckPermission("main:goods:edit")
+    @Log(title = "商品管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MainGoodsBo bo) {
+        return toAjax(mainGoodsService.updateByBo(bo));
+    }
+
+    /**
+     * 删除商品
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("main:goods:remove")
+    @Log(title = "商品管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+        return toAjax(mainGoodsService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/controller/MainPositionController.java

@@ -0,0 +1,103 @@
+package org.dromara.main.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.main.domain.bo.MainPositionBo;
+import org.dromara.main.domain.vo.MainPositionVo;
+import org.dromara.main.service.IMainPositionService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 岗位管理
+ *
+ *
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/main/position")
+public class MainPositionController extends BaseController {
+
+    private final IMainPositionService mainPositionService;
+    private Long id;
+
+    /**
+     * 查询岗位列表
+     */
+    @SaCheckPermission("main:position:list")
+    @GetMapping("/list")
+    public TableDataInfo<MainPositionVo> list(MainPositionBo bo, PageQuery pageQuery) {
+        return TableDataInfo.build(mainPositionService.queryPageList(bo, pageQuery));
+    }
+
+    /**
+     * 导出岗位列表
+     */
+    @SaCheckPermission("main:position:export")
+    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(MainPositionBo bo, HttpServletResponse response) {
+        // 如果 IMainPositionService 有 queryList 方法则取消注释，否则可根据需要实现
+        // List<MainPositionVo> list = mainPositionService.queryList(bo);
+        // ExcelUtil.exportExcel(list, "岗位信息", MainPositionVo.class, response);
+    }
+
+    /**
+     * 获取岗位详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("main:position:query")
+    @GetMapping("/{id}")
+    public R<MainPositionVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        this.id = id;
+        return R.ok(mainPositionService.queryById(id));
+    }
+
+    /**
+     * 新增岗位
+     */
+    @SaCheckPermission("main:position:add")
+    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody MainPositionBo bo) {
+        return toAjax(mainPositionService.insertPosition(bo));
+    }
+
+    /**
+     * 修改岗位
+     */
+    @SaCheckPermission("main:position:edit")
+    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody MainPositionBo bo) {
+        return toAjax(mainPositionService.updatePosition(bo));
+    }
+
+    /**
+     * 删除岗位
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("main:position:remove")
+    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+        return toAjax(mainPositionService.removeByIds(List.of(ids)));
+    }
+}
+

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/domain/MainGoods.java

@@ -0,0 +1,86 @@
+package org.dromara.main.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("main_goods")
+public class MainGoods extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 商品ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 商品名称
+     */
+    private String productName;
+
+    /**
+     * 商品类型（1=签约）
+     */
+    private Integer productType;
+
+    /**
+     * 绑定岗位ID
+     */
+    private Long positionId;
+
+    /**
+     * 绑定岗位名称（冗余）
+     */
+    private String positionName;
+
+    /**
+     * 内容类型（1=富文本 2=链接）
+     */
+    private Integer contentType;
+
+    /**
+     * 商品内容（富文本HTML或链接URL）
+     */
+    private String content;
+
+    /**
+     * 定金
+     */
+    private BigDecimal deposit;
+
+    /**
+     * 尾款
+     */
+    private BigDecimal finalPayment;
+
+    /**
+     * 商品价格（定金+尾款）
+     */
+    private BigDecimal productPrice;
+
+    /**
+     * 商品图片链接
+     */
+    private String productImage;
+
+    /**
+     * 删除标志（0存在 1删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/domain/bo/MainGoodsBo.java

@@ -0,0 +1,83 @@
+package org.dromara.main.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.main.domain.MainGoods;
+
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MainGoods.class, reverseConvertGenerate = false)
+public class MainGoodsBo extends BaseEntity {
+
+    /**
+     * 商品ID
+     */
+    @NotNull(message = "商品ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 商品名称
+     */
+    @NotBlank(message = "商品名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String productName;
+
+    /**
+     * 商品类型（1=签约）
+     */
+    @NotNull(message = "商品类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer productType;
+
+    /**
+     * 绑定岗位ID
+     */
+    private Long positionId;
+
+    /**
+     * 绑定岗位名称（冗余）
+     */
+    private String positionName;
+
+    /**
+     * 内容类型（1=富文本 2=链接）
+     */
+    private Integer contentType;
+
+    /**
+     * 商品内容（富文本HTML或链接URL）
+     */
+    private String content;
+
+    /**
+     * 定金
+     */
+    private BigDecimal deposit;
+
+    /**
+     * 尾款
+     */
+    private BigDecimal finalPayment;
+
+    /**
+     * 商品价格（定金+尾款）
+     */
+    private BigDecimal productPrice;
+
+    /**
+     * 商品图片链接
+     */
+    private String productImage;
+
+}

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/domain/vo/MainGoodsVo.java

@@ -0,0 +1,84 @@
+package org.dromara.main.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.main.domain.MainGoods;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@AutoMapper(target = MainGoods.class)
+public class MainGoodsVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 商品ID
+     */
+    private Long id;
+
+    /**
+     * 商品名称
+     */
+    private String productName;
+
+    /**
+     * 商品类型（1=签约）
+     */
+    private Integer productType;
+
+    /**
+     * 绑定岗位ID
+     */
+    private Long positionId;
+
+    /**
+     * 绑定岗位名称（冗余）
+     */
+    private String positionName;
+
+    /**
+     * 内容类型（1=富文本 2=链接）
+     */
+    private Integer contentType;
+
+    /**
+     * 商品内容（富文本HTML或链接URL）
+     */
+    private String content;
+
+    /**
+     * 定金
+     */
+    private BigDecimal deposit;
+
+    /**
+     * 尾款
+     */
+    private BigDecimal finalPayment;
+
+    /**
+     * 商品价格（定金+尾款）
+     */
+    private BigDecimal productPrice;
+
+    /**
+     * 商品图片链接
+     */
+    private String productImage;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/mapper/MainGoodsMapper.java

@@ -0,0 +1,8 @@
+package org.dromara.main.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.main.domain.MainGoods;
+import org.dromara.main.domain.vo.MainGoodsVo;
+
+public interface MainGoodsMapper extends BaseMapperPlus<MainGoods, MainGoodsVo> {
+}

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/IMainGoodsService.java

@@ -0,0 +1,24 @@
+package org.dromara.main.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.main.domain.bo.MainGoodsBo;
+import org.dromara.main.domain.vo.MainGoodsVo;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface IMainGoodsService {
+
+    MainGoodsVo queryById(Long id);
+
+    TableDataInfo<MainGoodsVo> queryPageList(MainGoodsBo bo, PageQuery pageQuery);
+
+    List<MainGoodsVo> queryList(MainGoodsBo bo);
+
+    Boolean insertByBo(MainGoodsBo bo);
+
+    Boolean updateByBo(MainGoodsBo bo);
+
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/MainGoodsServiceImpl.java

@@ -0,0 +1,85 @@
+package org.dromara.main.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.main.domain.MainGoods;
+import org.dromara.main.domain.bo.MainGoodsBo;
+import org.dromara.main.domain.vo.MainGoodsVo;
+import org.dromara.main.mapper.MainGoodsMapper;
+import org.dromara.main.service.IMainGoodsService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+@RequiredArgsConstructor
+@Service
+public class MainGoodsServiceImpl implements IMainGoodsService {
+
+    private final MainGoodsMapper baseMapper;
+
+    @Override
+    public MainGoodsVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<MainGoodsVo> queryPageList(MainGoodsBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MainGoods> lqw = buildQueryWrapper(bo);
+        Page<MainGoodsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    @Override
+    public List<MainGoodsVo> queryList(MainGoodsBo bo) {
+        LambdaQueryWrapper<MainGoods> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MainGoods> buildQueryWrapper(MainGoodsBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<MainGoods> lqw = Wrappers.lambdaQuery();
+        lqw.like(ObjectUtil.isNotNull(bo.getProductName()), MainGoods::getProductName, bo.getProductName());
+        lqw.eq(ObjectUtil.isNotNull(bo.getProductType()), MainGoods::getProductType, bo.getProductType());
+        lqw.eq(ObjectUtil.isNotNull(bo.getPositionId()), MainGoods::getPositionId, bo.getPositionId());
+        lqw.eq(ObjectUtil.isNotNull(bo.getContentType()), MainGoods::getContentType, bo.getContentType());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(MainGoodsBo bo) {
+        MainGoods add = BeanUtil.toBean(bo, MainGoods.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(MainGoodsBo bo) {
+        MainGoods update = BeanUtil.toBean(bo, MainGoods.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    private void validEntityBeforeSave(MainGoods entity) {
+        // 在此处可以添加业务校验
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 在此处可以添加删除前的业务校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/MainStudentServiceImpl.java

@@ -13,9 +13,6 @@ import org.dromara.main.domain.MainStudentEducation;
 import org.dromara.main.domain.MainStudentExperience;
 import org.dromara.main.domain.MainStudentProject;
 import org.dromara.main.domain.bo.MainStudentBo;
-import org.dromara.main.domain.vo.MainStudentEducationVo;
-import org.dromara.main.domain.vo.MainStudentExperienceVo;
-import org.dromara.main.domain.vo.MainStudentProjectVo;
 import org.dromara.main.domain.vo.MainStudentVo;
 import org.dromara.main.mapper.MainStudentEducationMapper;
 import org.dromara.main.mapper.MainStudentExperienceMapper;
@@ -23,7 +20,6 @@ import org.dromara.main.mapper.MainStudentMapper;
 import org.dromara.main.mapper.MainStudentProjectMapper;
 import org.dromara.main.service.IMainStudentService;
 import org.springframework.stereotype.Service;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -126,4 +122,5 @@ public class MainStudentServiceImpl implements IMainStudentService {
         student.setUserType(userType);
         return baseMapper.updateById(student) > 0;
     }
+
 }