diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppSkillController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppSkillController.java index 7b744d0..4c38083 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppSkillController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppSkillController.java @@ -33,7 +33,7 @@ public class AppSkillController extends BaseController { /** * 列表 */ - @ApiOperation("获取工作经历详细信息") + @ApiOperation("获取技能列表") @GetMapping("/list") public TableDataInfo list(AppSkill appSkill){ startPage(); @@ -45,7 +45,7 @@ public class AppSkillController extends BaseController { /** * 信息 */ - @ApiOperation("获取工作经历详细信息") + @ApiOperation("获取技能详细信息") @GetMapping(value = "/{id}") public AjaxResult info(@PathVariable("id") Long id){ return success(appSkillService.getAppskillById(id)); @@ -54,7 +54,7 @@ public class AppSkillController extends BaseController { /** * 保存 */ - @ApiOperation("获取工作经历详细信息") + @ApiOperation("新增技能信息") @PostMapping("/add") public AjaxResult save(@RequestBody AppSkill appSkill){ return toAjax(appSkillService.insertAppskill(appSkill)); @@ -63,7 +63,7 @@ public class AppSkillController extends BaseController { /** * 修改 */ - @ApiOperation("获取工作经历详细信息") + @ApiOperation("修改技能详细信息") @PutMapping("/edit") public AjaxResult update(@RequestBody AppSkill appSkill){ return toAjax(appSkillService.updateAppskillById(appSkill)); @@ -72,7 +72,7 @@ public class AppSkillController extends BaseController { /** * 删除 */ - @ApiOperation("获取工作经历详细信息") + @ApiOperation("删除技能详细信息") @DeleteMapping("/{id}") public AjaxResult delete(@ApiParam("主键id") @PathVariable Long id){ return toAjax(appSkillService.removeAppskillIds(new Long[]{id})); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsSkillController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsSkillController.java new file mode 100644 index 0000000..9125229 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsSkillController.java @@ -0,0 +1,104 @@ +package com.ruoyi.cms.controller.cms; + + +import com.ruoyi.cms.service.AppSkillService; +import com.ruoyi.cms.service.IAppUserService; +import com.ruoyi.cms.util.RoleUtils; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.AppSkill; +import com.ruoyi.common.core.domain.entity.AppUser; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 用户技能信息 + * + * @author + * @email + * @date 2025-10-21 12:22:09 + */ +@RestController +@RequestMapping("/cms/appskill") +@Api(tags = "后台:用户技能") +public class CmsSkillController extends BaseController { + @Autowired + private AppSkillService appSkillService; + @Autowired + private IAppUserService appUserService; + + /** + * 列表 + */ + @ApiOperation("获取技能列表") + @GetMapping("/list") + public TableDataInfo list(AppSkill appSkill){ + startPage(); + List list=appSkillService.getList(appSkill); + return getDataTable(list); + } + + + /** + * 信息 + */ + @ApiOperation("获取技能详情") + @GetMapping(value = "/{id}") + public AjaxResult info(@PathVariable("id") Long id){ + return success(appSkillService.getAppskillById(id)); + } + + /** + * 保存 + */ + @ApiOperation("新增技能") + @Log(title = "技能", businessType = BusinessType.INSERT) + @PostMapping("/add") + public AjaxResult save(@RequestBody AppSkill appSkill){ + if(!SecurityUtils.isLogin()){ + AppUser appUser=appUserService.selectAppuserByIdcard(RoleUtils.getCurrentUseridCard()); + if(appUser==null){ + return AjaxResult.error("未传递userId!"); + } + appSkill.setUserId(appUser.getUserId()); + } + return toAjax(appSkillService.insertAppskill(appSkill)); + } + + /** + * 修改 + */ + @ApiOperation("修改技能") + @Log(title = "技能", businessType = BusinessType.UPDATE) + @PutMapping("/edit") + public AjaxResult update(@RequestBody AppSkill appSkill){ + if (appSkill.getId()==null){ + return AjaxResult.error("参数id未传递!"); + } + return toAjax(appSkillService.updateAppskillById(appSkill)); + } + + /** + * 删除 + */ + @Log(title = "删除技能", businessType = BusinessType.DELETE) + @ApiOperation("技能") + @DeleteMapping("/{id}") + public AjaxResult delete(@ApiParam("主键id") @PathVariable Long id){ + if(id==null){ + return AjaxResult.error("参数id未传递!"); + } + return toAjax(appSkillService.removeAppskillIds(new Long[]{id})); + } + +} diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java index cd40ae9..7ced463 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java @@ -1,5 +1,8 @@ package com.ruoyi.cms.controller.cms; +import com.ruoyi.cms.service.IAppUserService; +import com.ruoyi.cms.util.RoleUtils; +import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.common.core.domain.entity.UserWorkExperiences; import com.ruoyi.cms.service.UserWorkExperiencesService; import com.ruoyi.common.annotation.Log; @@ -7,7 +10,6 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +33,8 @@ public class UserWorkExperiencesController extends BaseController { @Autowired private UserWorkExperiencesService userWorkExperiencesService; + @Autowired + private IAppUserService appUserService; /** * 列表 @@ -66,7 +70,11 @@ public class UserWorkExperiencesController extends BaseController { @PostMapping public AjaxResult add(@RequestBody UserWorkExperiences userWorkExperiences){ if(userWorkExperiences.getUserId()==null){ - userWorkExperiences.setUserId(SecurityUtils.getUserId()); + AppUser appUser=appUserService.selectAppuserByIdcard(RoleUtils.getCurrentUseridCard()); + if(appUser==null){ + return AjaxResult.error("未传递userId!"); + } + userWorkExperiences.setUserId(appUser.getUserId()); } return toAjax(userWorkExperiencesService.insertWorkExperiences(userWorkExperiences)); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppSkill.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppSkill.java index 17a6ccd..a50e49b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppSkill.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppSkill.java @@ -26,7 +26,7 @@ public class AppSkill extends BaseEntity { * 主键id */ @TableId(value = "id",type = IdType.AUTO) - @ApiModelProperty("用户ID") + @ApiModelProperty("ID") private Long id; /** * 用户id