456
whywhyo
2023-05-25 df6b610c57536058d1292a086d56e49dab0acf46
456
4个文件已修改
6个文件已添加
239 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MemoBookController.java 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-druid.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/mapper/MemoBookMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/MemoBookService.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/MemoBookServiceImpl.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/resources/mapper.system/MemoBookMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MemoBookController.java
New file
@@ -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();
        }
    }
}
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")
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")
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")
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
zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java
New file
@@ -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;
}
zhang-content/src/main/java/com/ruoyi/mapper/MemoBookMapper.java
New file
@@ -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> {
}
zhang-content/src/main/java/com/ruoyi/service/MemoBookService.java
New file
@@ -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);
}
zhang-content/src/main/java/com/ruoyi/service/impl/MemoBookServiceImpl.java
New file
@@ -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);
    }
}
zhang-content/src/main/resources/mapper.system/MemoBookMapper.xml
New file
@@ -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>