From df6b610c57536058d1292a086d56e49dab0acf46 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期四, 25 五月 2023 20:12:37 +0800
Subject: [PATCH] 456
---
zhang-content/src/main/java/com/ruoyi/service/impl/MemoBookServiceImpl.java | 62 +++++++++++++++
ruoyi-admin/src/main/resources/application-druid.yml | 4
zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java | 38 +++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MemoBookController.java | 69 +++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java | 8 ++
zhang-content/src/main/java/com/ruoyi/mapper/MemoBookMapper.java | 16 ++++
zhang-content/src/main/java/com/ruoyi/service/MemoBookService.java | 18 ++++
zhang-content/src/main/resources/mapper.system/MemoBookMapper.xml | 8 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java | 8 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java | 8 ++
10 files changed, 237 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MemoBookController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MemoBookController.java
new file mode 100644
index 0000000..95c324a
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MemoBookController.java
@@ -0,0 +1,69 @@
+package com.ruoyi.web.controller.zhang;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.domain.MemoBook;
+import com.ruoyi.domain.ZHonor;
+import com.ruoyi.service.MemoBookService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
+
+/**
+ * @Author Jinquan_Ou
+ * @Description
+ * @Date 2023-05-25 18:55
+ * @Version 1.0.0
+ **/
+@RestController
+@RequestMapping("/memoBook")
+public class MemoBookController {
+
+ @Autowired
+ private MemoBookService memoBookService;
+
+ /**
+ * 鏌ヨ鎵�鏈夎褰�
+ */
+ @GetMapping("/all")
+ public AjaxResult listAll(Long fid,Long cid){
+ return memoBookService.selectDataList(fid,cid);
+ }
+
+ /**
+ * 鏍规嵁Id鏌ヨ
+ */
+ @GetMapping()
+ public AjaxResult getById(Long id){
+ return AjaxResult.success(memoBookService.getById(id));
+ }
+
+
+ @PostMapping()
+ public AjaxResult saveData(@RequestBody MemoBook memoBook){
+ return memoBookService.mySave(memoBook);
+ }
+
+ @PutMapping()
+ public AjaxResult updateData(@RequestBody MemoBook memoBook){
+ boolean b = memoBookService.updateById(memoBook);
+ if (b){
+ return AjaxResult.success();
+ }else {
+ return AjaxResult.error();
+ }
+ }
+
+ @DeleteMapping()
+ public AjaxResult deleteData(Long id){
+ boolean b = memoBookService.removeById(id);
+ if (b){
+ return AjaxResult.success();
+ }else {
+ return AjaxResult.error();
+ }
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
index d20ca2b..c64c92b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
@@ -51,6 +51,14 @@
}
/**
+ * 鏍规嵁id鏌ヨ
+ */
+ @GetMapping()
+ public AjaxResult listById(Long id){
+ return AjaxResult.success(zHonorService.getById(id));
+ }
+
+ /**
* 妯℃澘
*/
@GetMapping("/model")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
index 51afe5e..5f85dcb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
@@ -49,6 +49,14 @@
}
/**
+ * 鏍规嵁id鏌ヨ
+ */
+ @GetMapping()
+ public AjaxResult listById(Long id){
+ return AjaxResult.success(zSecretService.getById(id));
+ }
+
+ /**
* 妯℃澘
*/
@GetMapping("/model")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
index f938ef0..9884102 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
@@ -50,6 +50,14 @@
}
/**
+ * 鏍规嵁id鏌ヨ
+ */
+ @GetMapping()
+ public AjaxResult listById(Long id){
+ return AjaxResult.success(zfCollectionService.getById(id));
+ }
+
+ /**
* 鑾峰彇瀵煎叆妯℃澘
*/
@PostMapping("/model")
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 045d564..b2e66b2 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,8 +6,8 @@
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
+ 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!
# password: 123456
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java b/zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java
new file mode 100644
index 0000000..0b65b89
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java
@@ -0,0 +1,38 @@
+package com.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author Jinquan_Ou
+ * @Description
+ * @Date 2023-05-25 18:51
+ * @Version 1.0.0
+ **/
+@Data
+@TableName("memo_book")
+public class MemoBook implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ private Long fid;
+
+ private Long cid;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date happenTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+
+ private String content;
+
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/MemoBookMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/MemoBookMapper.java
new file mode 100644
index 0000000..ecd7dc7
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/MemoBookMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.MemoBook;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author Jinquan_Ou
+ * @Description
+ * @Date 2023-05-25 18:57
+ * @Version 1.0.0
+ **/
+@Mapper
+public interface MemoBookMapper extends BaseMapper<MemoBook> {
+
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/MemoBookService.java b/zhang-content/src/main/java/com/ruoyi/service/MemoBookService.java
new file mode 100644
index 0000000..19713f7
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/MemoBookService.java
@@ -0,0 +1,18 @@
+package com.ruoyi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.MemoBook;
+
+/**
+ * @Author Jinquan_Ou
+ * @Description
+ * @Date 2023-05-25 18:57
+ * @Version 1.0.0
+ **/
+public interface MemoBookService extends IService<MemoBook> {
+ AjaxResult mySave(MemoBook memoBook);
+
+
+ AjaxResult selectDataList(Long fid, Long cid);
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MemoBookServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MemoBookServiceImpl.java
new file mode 100644
index 0000000..91ebfee
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MemoBookServiceImpl.java
@@ -0,0 +1,62 @@
+package com.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.MemoBook;
+import com.ruoyi.mapper.MemoBookMapper;
+import com.ruoyi.service.MemoBookService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+/**
+ * @Author Jinquan_Ou
+ * @Description
+ * @Date 2023-05-25 18:58
+ * @Version 1.0.0
+ **/
+@Service
+public class MemoBookServiceImpl extends ServiceImpl<MemoBookMapper, MemoBook> implements MemoBookService {
+
+ private boolean unionCondition(MemoBook memoBook){
+ LambdaQueryWrapper<MemoBook> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(StringUtils.isNotEmpty(memoBook.getContent()),MemoBook::getContent,memoBook.getContent())
+ .eq(memoBook.getCid()!=null,MemoBook::getCid,memoBook.getCid())
+ .eq(memoBook.getFid()!=null,MemoBook::getFid,memoBook.getFid());
+ List<MemoBook> list = list(lqw);
+ if (list.size()>0){
+ return false;
+ }else {
+ return true;
+ }
+ }
+
+ @Override
+ public AjaxResult mySave(MemoBook memoBook) {
+ if(unionCondition(memoBook)){
+ save(memoBook);
+ return AjaxResult.success();
+ }else {
+ return AjaxResult.error("涓嶈兘鎻掑叆閲嶅鏁版嵁");
+ }
+ }
+
+ @Override
+ public AjaxResult selectDataList(Long fid, Long cid) {
+ LambdaQueryWrapper<MemoBook> lqw = new LambdaQueryWrapper<>();
+ if(fid==null || cid==null){
+ throw new RuntimeException("绯荤粺鍑虹幇閿欒");
+ }
+
+ lqw.eq(MemoBook::getFid,fid)
+ .eq(MemoBook::getCid,cid);
+
+ lqw.orderByDesc(MemoBook::getCreateTime);
+
+ List<MemoBook> result = list(lqw);
+ return AjaxResult.success(result);
+
+ }
+
+}
diff --git a/zhang-content/src/main/resources/mapper.system/MemoBookMapper.xml b/zhang-content/src/main/resources/mapper.system/MemoBookMapper.xml
new file mode 100644
index 0000000..778210f
--- /dev/null
+++ b/zhang-content/src/main/resources/mapper.system/MemoBookMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--namespace=缁戝畾涓�涓搴旂殑Dao/Mapper鎺ュ彛-->
+<mapper namespace="com.ruoyi.mapper.MemoBookMapper">
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1