ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAutobiographyController.java
@@ -1,9 +1,24 @@ package com.ruoyi.web.controller.zhang; import org.springframework.web.bind.annotation.RequestMapping; 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.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZAutobiography; import com.ruoyi.service.ZAutobiographyService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.websocket.server.PathParam; import java.util.Arrays; import java.util.List; /** * <p> @@ -13,9 +28,107 @@ * @author ojq * @since 2023-03-14 */ @Slf4j @RestController @RequestMapping("/zAutobiography") public class ZAutobiographyController { public class ZAutobiographyController extends BaseController { @Resource ZAutobiographyService zAutobiographyService; /** * 返回关于本用户的所有自传 * @return */ @GetMapping("/all") public AjaxResult listAll(){ SysUser user = SecurityUtils.getLoginUser().getUser(); Long userId = user.getUserId(); List<ZAutobiography> zAutobiographys = zAutobiographyService.selectAutobiographyList(userId); return AjaxResult.success(zAutobiographys); } /** * 返回特定时期的个人自传 */ @GetMapping("/byTerm") public AjaxResult listByTerm(@PathParam("termId")Integer termId){ SysUser user = SecurityUtils.getLoginUser().getUser(); Long userId = user.getUserId(); List<ZAutobiography> zAutobiographys=zAutobiographyService.listByTerm(userId,termId); return AjaxResult.success(zAutobiographys); } // /** // * 导出个人自传记录列表 // */ //// @PreAuthorize("@ss.hasPermi('system:property:export')") // @Log(title = "个人自传记录", businessType = BusinessType.EXPORT) // @PostMapping("/export") // public void export(HttpServletResponse response, ZAutobiography zAutobiography) // { // SysUser user = SecurityUtils.getLoginUser().getUser(); // Long userId = user.getUserId(); // // List<ZAutobiography> list = zAutobiographyService.selectExperienceList(userId); // log.info("导出记录为:{}",list); // ExcelUtil<ZAutobiography> util = new ExcelUtil<>(ZAutobiography.class); // util.exportExcel(response, list, "个人自传记录数据"); // } //// // // /** // * 导入个人自传记录列表 // */ // @Log(title = "用户管理", businessType = BusinessType.IMPORT) // @PostMapping("/importData") // public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception // { // SysUser user = SecurityUtils.getLoginUser().getUser(); // Long userId = user.getUserId(); // // boolean flag=zAutobiographyService.importExcel(file,userId); // if(flag){ // return AjaxResult.success("导入数据成功"); // } // return AjaxResult.error("导入数据失败"); // } /** * 新增或者修改个人自传记录 */ // @PreAuthorize("@ss.hasPermi('system:property:add')") @Log(title = "个人自传记录", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ZAutobiography zAutobiography) { SysUser user = SecurityUtils.getLoginUser().getUser(); Long userId = user.getUserId(); zAutobiography.setUserId(userId); return toAjax(zAutobiographyService.saveOrUpdate(zAutobiography)); } // /** // * 修改个人自传记录 // */ //// @PreAuthorize("@ss.hasPermi('system:property:edit')") // @Log(title = "个人自传记录", businessType = BusinessType.UPDATE) // @PutMapping // public AjaxResult edit(@RequestBody ZAutobiography zAutobiography) // { // return toAjax(zAutobiographyService.updateById(zAutobiography)); // } // /** * 批量删除个人自传记录 */ // @PreAuthorize("@ss.hasPermi('system:property:remove')") @Log(title = "个人自传记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(zAutobiographyService.removeByIds(Arrays.asList(ids))); } }
@@ -26,7 +26,7 @@ /** * <p> * 前端控制器 * 前端控制器 * </p> * * @author ojq @@ -54,13 +54,12 @@ // @PreAuthorize("@ss.hasPermi('system:property:export')") @Log(title = "个人详细信息记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ZInfoUser zInfoUser) { public void export(HttpServletResponse response, ZInfoUser zInfoUser) { SysUser user = SecurityUtils.getLoginUser().getUser(); Long userId = user.getUserId(); zInfoUser.setUserId(userId); List<ZInfoUser> list = zInfoUserService.selectByCondition(zInfoUser); log.info("导出记录为:{}",list); log.info("导出记录为:{}", list); ExcelUtil<ZInfoUser> util = new ExcelUtil<>(ZInfoUser.class); util.exportExcel(response, list, "个人详细信息记录数据"); } @@ -70,14 +69,13 @@ */ @Log(title = "用户管理", businessType = BusinessType.IMPORT) @PostMapping("/importData") public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception { public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception { SysUser user = SecurityUtils.getLoginUser().getUser(); Long userId = user.getUserId(); ExcelUtil<ZInfoUser> util = new ExcelUtil<>(ZInfoUser.class); List<ZInfoUser> eventList = util.importExcel(file.getInputStream()); log.info("个人详细信息列表为：{}",eventList); if(eventList.size()>1){ log.info("个人详细信息列表为：{}", eventList); if (eventList.size() > 1) { return AjaxResult.error("导入个人信息只能有一条记录"); } @@ -96,21 +94,21 @@ */ // @PreAuthorize("@ss.hasPermi('system:property:query')") @GetMapping() public AjaxResult getInfo() { public AjaxResult getInfo() { SysUser user = SecurityUtils.getLoginUser().getUser(); Long userId = user.getUserId(); return success(zInfoUserService.getById(userId)); return AjaxResult.success(zInfoUserService.getById(userId)); } // /** * 新增、修改个人详细信息记录 */ // @PreAuthorize("@ss.hasPermi('system:property:add')") @Log(title = "个人详细信息记录", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ZInfoUser zInfoUser) { public AjaxResult add(@RequestBody ZInfoUser zInfoUser) { SysUser user = SecurityUtils.getLoginUser().getUser(); Long userId = user.getUserId(); zInfoUser.setUserId(userId); @@ -128,14 +126,14 @@ // return toAjax(zInfoUserService.updateById(zInfoUser)); // } // /** * 删除个人详细信息记录 */ // @PreAuthorize("@ss.hasPermi('system:property:remove')") @Log(title = "个人详细信息记录", businessType = BusinessType.DELETE) @DeleteMapping() public AjaxResult remove() { public AjaxResult remove() { SysUser user = SecurityUtils.getLoginUser().getUser(); Long userId = user.getUserId(); return toAjax(zInfoUserService.removeById(userId)); @@ -147,14 +145,11 @@ */ @GetMapping("/relation") public AjaxResult listMyRelation(){ public AjaxResult listMyRelation() { SysUser user = SecurityUtils.getLoginUser().getUser(); Long userId = user.getUserId(); return zInfoUserService.searchMyRelation(userId); } } ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,6 +6,7 @@ druid: # 主库数据源 master: # url: jdbc:mysql://47.93.189.255:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: ZhangApp123! ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
@@ -327,7 +327,6 @@ /** * 判断给定的set列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value * * @param set 给定的集合 * @param array 给定的数组 * @return boolean 结果 */ zhang-content/src/main/java/com/ruoyi/domain/ZAutobiography.java
@@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; /** @@ -13,167 +15,28 @@ * @author ojq * @since 2023-03-14 */ @Data @TableName("z_autobiography") public class ZAutobiography implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private Integer id; private Long id; /** * 用户id */ private Integer userId; private Long userId; /** * 婴儿期 * 时期 */ private String infancy; private Integer type; /** * 幼儿期 * 自传内容 */ private String childhood; private String content; /** * 小学 */ private String pri; /** * 初中 */ private String mid; /** * 高中 */ private String senior; /** * 大学 */ private String college; /** * 研究生 */ private String postgraduate; /** * 工作 */ private String job; /** * 结婚 */ private String marry; public Integer getId() { return id; } public void setId(Integer id) { this.id = id; } public Integer getUserId() { return userId; } public void setUserId(Integer userId) { this.userId = userId; } public String getInfancy() { return infancy; } public void setInfancy(String infancy) { this.infancy = infancy; } public String getChildhood() { return childhood; } public void setChildhood(String childhood) { this.childhood = childhood; } public String getPri() { return pri; } public void setPri(String pri) { this.pri = pri; } public String getMid() { return mid; } public void setMid(String mid) { this.mid = mid; } public String getSenior() { return senior; } public void setSenior(String senior) { this.senior = senior; } public String getCollege() { return college; } public void setCollege(String college) { this.college = college; } public String getPostgraduate() { return postgraduate; } public void setPostgraduate(String postgraduate) { this.postgraduate = postgraduate; } public String getJob() { return job; } public void setJob(String job) { this.job = job; } public String getMarry() { return marry; } public void setMarry(String marry) { this.marry = marry; } @Override public String toString() { return "ZAutobiography{" + "id=" + id + ", userId=" + userId + ", infancy=" + infancy + ", childhood=" + childhood + ", pri=" + pri + ", mid=" + mid + ", senior=" + senior + ", college=" + college + ", postgraduate=" + postgraduate + ", job=" + job + ", marry=" + marry + "}"; } } zhang-content/src/main/java/com/ruoyi/service/ZAutobiographyService.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.domain.ZAutobiography; import java.util.List; /** * <p> * 服务类 @@ -14,4 +16,7 @@ */ public interface ZAutobiographyService extends IService<ZAutobiography> { List<ZAutobiography> selectAutobiographyList(Long userId); List<ZAutobiography> listByTerm(Long userId,Integer termId); } zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyServiceImpl.java
@@ -1,11 +1,14 @@ package com.ruoyi.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.domain.ZAutobiography; import com.ruoyi.mapper.ZAutobiographyMapper; import com.ruoyi.service.ZAutobiographyService; import org.springframework.stereotype.Service; import java.util.List; /** * <p> @@ -18,4 +21,19 @@ @Service public class ZAutobiographyServiceImpl extends ServiceImpl<ZAutobiographyMapper, ZAutobiography> implements ZAutobiographyService { @Override public List<ZAutobiography> selectAutobiographyList(Long userId) { LambdaQueryWrapper<ZAutobiography> lqw = new LambdaQueryWrapper<>(); lqw.eq(ZAutobiography::getUserId,userId); return list(lqw); } @Override public List<ZAutobiography> listByTerm(Long userId,Integer termId) { LambdaQueryWrapper<ZAutobiography> lqw = new LambdaQueryWrapper<>(); lqw.eq(ZAutobiography::getUserId,userId); lqw.eq(ZAutobiography::getType,termId); return list(lqw); } }
