Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventApplicationUserNoticeServiceImpl.java

@@ -1,5 +1,12 @@
package com.panzhihua.service_grid.service.impl;

import java.util.Date;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,15 +17,11 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventApplicationUserNoticeDetailsVO;
import com.panzhihua.common.model.vos.grid.EventApplicationUserNoticeVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.dao.EventApplicationUserNoticeMapper;
import com.panzhihua.service_grid.model.dos.EventApplicationUserNoticeDO;
import com.panzhihua.service_grid.service.EventApplicationUserNoticeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -27,20 +30,24 @@
 */
@Slf4j
@Service
public class EventApplicationUserNoticeServiceImpl extends ServiceImpl<EventApplicationUserNoticeMapper, EventApplicationUserNoticeDO> implements EventApplicationUserNoticeService {
public class EventApplicationUserNoticeServiceImpl
    extends ServiceImpl<EventApplicationUserNoticeMapper, EventApplicationUserNoticeDO>
    implements EventApplicationUserNoticeService {

    @Resource
    private EventApplicationUserNoticeMapper eventApplicationUserNoticeMapper;

    /**
     * 新增用户协议和隐私政策信息
     * 
     * @param eventApplicationUserNoticeAddDTO
     * @return 新增结果
     */
    public R add(EventApplicationUserNoticeAddDTO eventApplicationUserNoticeAddDTO){
    public R add(EventApplicationUserNoticeAddDTO eventApplicationUserNoticeAddDTO) {
        EventApplicationUserNoticeDO eventApplicationUserNoticeDO = new EventApplicationUserNoticeDO();
        BeanUtils.copyProperties(eventApplicationUserNoticeAddDTO, eventApplicationUserNoticeDO);
        eventApplicationUserNoticeDO.setCreateAt(new Date());
        if(eventApplicationUserNoticeMapper.insert(eventApplicationUserNoticeDO)>0){
        if (eventApplicationUserNoticeMapper.insert(eventApplicationUserNoticeDO) > 0) {
            return R.ok();
        }
        return R.fail();
@@ -48,14 +55,15 @@

    /**
     * 修改用户协议和隐私政策信息
     * 
     * @param eventApplicationUserNoticeEditDTO
     * @return 维护结果
     */
    public R edit(EventApplicationUserNoticeEditDTO eventApplicationUserNoticeEditDTO){
    public R edit(EventApplicationUserNoticeEditDTO eventApplicationUserNoticeEditDTO) {
        EventApplicationUserNoticeDO eventApplicationUserNoticeDO = new EventApplicationUserNoticeDO();
        BeanUtils.copyProperties(eventApplicationUserNoticeEditDTO, eventApplicationUserNoticeDO);
        //eventApplicationUserNoticeDO.setUpdateAt(new Date());
        if(eventApplicationUserNoticeMapper.updateById(eventApplicationUserNoticeDO)>0){
        // eventApplicationUserNoticeDO.setUpdateAt(new Date());
        if (eventApplicationUserNoticeMapper.updateById(eventApplicationUserNoticeDO) > 0) {
            return R.ok();
        }
        return R.fail();
@@ -63,15 +71,17 @@

    /**
     * 分页查找用户协议和隐私政策信息
     * 
     * @param pageEventApplicationUserNoticeDTO
     * @return 维护结果
     */
    public R<IPage<EventApplicationUserNoticeVO>> query(PageEventApplicationUserNoticeDTO pageEventApplicationUserNoticeDTO){
        Page page = new Page(1,10);
        if(pageEventApplicationUserNoticeDTO.getPageNum()!=null) {
    public R<IPage<EventApplicationUserNoticeVO>>
        query(PageEventApplicationUserNoticeDTO pageEventApplicationUserNoticeDTO) {
        Page page = new Page(1, 10);
        if (pageEventApplicationUserNoticeDTO.getPageNum() != null) {
            page.setCurrent(pageEventApplicationUserNoticeDTO.getPageNum());
        }
        if(pageEventApplicationUserNoticeDTO.getPageSize()!=null) {
        if (pageEventApplicationUserNoticeDTO.getPageSize() != null) {
            page.setSize(pageEventApplicationUserNoticeDTO.getPageSize());
        }
        return R.ok(eventApplicationUserNoticeMapper.findByPage(page, pageEventApplicationUserNoticeDTO));
@@ -79,22 +89,26 @@

    /**
     * 删除用户协议和隐私政策信息
     * 
     * @param EventApplicationUserNoticeDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EventApplicationUserNoticeDeleteDTO EventApplicationUserNoticeDeleteDTO){
    public R delete(EventApplicationUserNoticeDeleteDTO EventApplicationUserNoticeDeleteDTO) {
        return R.fail();
    }

    /**
     * 查询用户协议和隐私政策信息详细信息
     * @param id 用户协议和隐私政策信息 id
     * 
     * @param id
     *            用户协议和隐私政策信息 id
     * @return 查找结果
     */
    public R<EventApplicationUserNoticeDetailsVO> eventApplicationUserNoticeDetails(Long id){
    public R<EventApplicationUserNoticeDetailsVO> eventApplicationUserNoticeDetails(Long id) {
        EventApplicationUserNoticeDO eventApplicationUserNoticeDO = eventApplicationUserNoticeMapper.selectById(id);
        if(eventApplicationUserNoticeDO!=null) {
            EventApplicationUserNoticeDetailsVO eventApplicationUserNoticeDetailsVO = new EventApplicationUserNoticeDetailsVO();
        if (eventApplicationUserNoticeDO != null) {
            EventApplicationUserNoticeDetailsVO eventApplicationUserNoticeDetailsVO =
                new EventApplicationUserNoticeDetailsVO();
            BeanUtils.copyProperties(eventApplicationUserNoticeDO, eventApplicationUserNoticeDetailsVO);
            return R.ok(eventApplicationUserNoticeDetailsVO);
        }