From 27d48268c5384c8e809c2d37f3da851e92d96c3a Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期四, 30 三月 2023 17:33:26 +0800
Subject: [PATCH] 个人模块的所有内容
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java | 1
zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyServiceImpl.java | 18 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAutobiographyController.java | 119 +++++++++++++++++++
zhang-content/src/main/java/com/ruoyi/domain/ZAutobiography.java | 155 +------------------------
ruoyi-admin/src/main/resources/application-druid.yml | 1
zhang-content/src/main/java/com/ruoyi/service/ZAutobiographyService.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 33 ++---
7 files changed, 163 insertions(+), 169 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAutobiographyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAutobiographyController.java
index 3a3d4ca..bf1eb78 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAutobiographyController.java
+++ b/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)));
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index 03fffb3..5e294e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -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);
}
-
-
-
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 7fb6bb7..045d564 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/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!
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
index 495ffc2..6950431 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
@@ -327,7 +327,6 @@
/**
* 鍒ゆ柇缁欏畾鐨剆et鍒楄〃涓槸鍚﹀寘鍚暟缁刟rray 鍒ゆ柇缁欏畾鐨勬暟缁刟rray涓槸鍚﹀寘鍚粰瀹氱殑鍏冪礌value
*
- * @param set 缁欏畾鐨勯泦鍚�
* @param array 缁欏畾鐨勬暟缁�
* @return boolean 缁撴灉
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZAutobiography.java b/zhang-content/src/main/java/com/ruoyi/domain/ZAutobiography.java
index 16a6f46..848395f 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZAutobiography.java
+++ b/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 +
- "}";
- }
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZAutobiographyService.java b/zhang-content/src/main/java/com/ruoyi/service/ZAutobiographyService.java
index 477fa68..c028f34 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZAutobiographyService.java
+++ b/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);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyServiceImpl.java
index 5600651..6e8ee6e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyServiceImpl.java
+++ b/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);
+ }
}
--
Gitblit v1.9.1