luobo 4 rokov pred
rodič
commit
6f7a06a117

+ 114 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbFamilyAlbumController.java

@@ -0,0 +1,114 @@
+package com.ruoyi.web.controller.api;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+import java.util.List;
+import java.util.Arrays;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.ruoyi.common.utils.StringUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.app.domain.TbFamilyAlbum;
+import com.ruoyi.app.service.ITbFamilyAlbumService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 家族相簿
+ * 
+ * @author luobo
+ * @date 2020-10-12
+ */
+@Api(value = "家族相簿", tags = "家族相簿")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/album" )
+public class TbFamilyAlbumController extends BaseController {
+
+    private final ITbFamilyAlbumService iTbFamilyAlbumService;
+
+    /**
+     * 查询家族相簿列表
+     */
+    @ApiOperation("查询家族相簿列表")
+    @PreAuthorize("@ss.hasPermi('system:album:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbFamilyAlbum tbFamilyAlbum)
+    {
+        startPage();
+        List<TbFamilyAlbum> list = iTbFamilyAlbumService.queryList(tbFamilyAlbum);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出家族相簿列表
+     */
+    @ApiOperation("导出家族相簿列表")
+    @PreAuthorize("@ss.hasPermi('system:album:export')" )
+    @Log(title = "家族相簿" , businessType = BusinessType.EXPORT)
+    @GetMapping("/export" )
+    public AjaxResult export(TbFamilyAlbum tbFamilyAlbum) {
+        LambdaQueryWrapper<TbFamilyAlbum> lqw = new LambdaQueryWrapper<TbFamilyAlbum>(tbFamilyAlbum);
+        List<TbFamilyAlbum> list = iTbFamilyAlbumService.list(lqw);
+        ExcelUtil<TbFamilyAlbum> util = new ExcelUtil<TbFamilyAlbum>(TbFamilyAlbum. class);
+        return util.exportExcel(list, "album" );
+    }
+
+    /**
+     * 获取家族相簿详细信息
+     */
+    @ApiOperation("获取家族相簿详细信息")
+    @PreAuthorize("@ss.hasPermi('system:album:query')" )
+    @GetMapping(value = "/{id}" )
+    public AjaxResult getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iTbFamilyAlbumService.getById(id));
+    }
+
+    /**
+     * 新增家族相簿
+     */
+    @ApiOperation("新增家族相簿")
+    @PreAuthorize("@ss.hasPermi('system:album:add')" )
+    @Log(title = "家族相簿" , businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TbFamilyAlbum tbFamilyAlbum) {
+        return toAjax(iTbFamilyAlbumService.save(tbFamilyAlbum) ? 1 : 0);
+    }
+
+    /**
+     * 修改家族相簿
+     */
+    @ApiOperation("修改家族相簿")
+    @PreAuthorize("@ss.hasPermi('system:album:edit')" )
+    @Log(title = "家族相簿" , businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TbFamilyAlbum tbFamilyAlbum) {
+        return toAjax(iTbFamilyAlbumService.updateById(tbFamilyAlbum) ? 1 : 0);
+    }
+
+    /**
+     * 删除家族相簿
+     */
+    @ApiOperation("删除家族相簿")
+    @PreAuthorize("@ss.hasPermi('system:album:remove')" )
+    @Log(title = "家族相簿" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}" )
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(iTbFamilyAlbumService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

+ 96 - 0
ruoyi-system/src/main/java/com/ruoyi/app/domain/TbFamilyAlbum.java

@@ -0,0 +1,96 @@
+package com.ruoyi.app.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.ruoyi.common.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 家族相簿
+ * 
+ * @author luobo
+ * @date 2020-10-12
+ */
+@Data
+@ApiModel(value = "家族相簿")
+@ToString
+@EqualsAndHashCode
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_family_album")
+public class TbFamilyAlbum implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /** ID */
+    @ApiModelProperty(value="ID")
+    @TableId(value = "id")
+    private Long id;
+
+    /** 家族id */
+    @ApiModelProperty(value="家族id")
+    @Excel(name = "家族id")
+    private Long familyId;
+
+    /** 相簿标题名称 */
+    @ApiModelProperty(value="相簿标题名称")
+    @Excel(name = "相簿标题名称")
+    private String title;
+
+    /** 相簿描述 */
+    @ApiModelProperty(value="相簿描述")
+    @Excel(name = "相簿描述")
+    private String contents;
+
+    /** 默认图片url(应该获取第一张图片作为默认) */
+    @ApiModelProperty(value="默认图片url(应该获取第一张图片作为默认)")
+    @Excel(name = "默认图片url(应该获取第一张图片作为默认)")
+    private String url;
+
+    /** 创建者 */
+    @ApiModelProperty(value="创建者")
+    private Long createBy;
+
+    /** 创建时间 */
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    /** 更新者 */
+    @ApiModelProperty(value="更新者")
+    private Long updateBy;
+
+    /** 更新时间 */
+    @ApiModelProperty(value="更新时间")
+    private Date updateTime;
+
+    /** 备注 */
+    @ApiModelProperty(value="备注")
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 状态 */
+    @ApiModelProperty(value="状态")
+    @Excel(name = "状态")
+    private String status;
+
+    /** 删除标志(0代表存在 1代表删除) */
+    @ApiModelProperty(value="删除标志(0代表存在 1代表删除)")
+    @TableLogic
+    private String delFlag;
+
+    @ApiModelProperty(value = "家族信息")
+    @TableField(exist = false)
+    private TbFamily family;
+}

+ 14 - 0
ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbFamilyAlbumMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.app.mapper;
+
+import com.ruoyi.app.domain.TbFamilyAlbum;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 家族相簿
+ *
+ * @author luobo
+ * @date 2020-10-12
+ */
+public interface TbFamilyAlbumMapper extends BaseMapper<TbFamilyAlbum> {
+
+}

+ 20 - 0
ruoyi-system/src/main/java/com/ruoyi/app/service/ITbFamilyAlbumService.java

@@ -0,0 +1,20 @@
+package com.ruoyi.app.service;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.app.domain.TbFamilyAlbum;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 家族相簿
+ *
+ * @author luobo
+ * @date 2020-10-12
+ */
+public interface ITbFamilyAlbumService extends IService<TbFamilyAlbum> {
+
+    List<TbFamilyAlbum> queryList(TbFamilyAlbum entity);
+
+}

+ 48 - 0
ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyAlbumServiceImpl.java

@@ -0,0 +1,48 @@
+package com.ruoyi.app.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.app.domain.TbFamily;
+import com.ruoyi.app.service.ITbFamilyService;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.app.mapper.TbFamilyAlbumMapper;
+import com.ruoyi.app.domain.TbFamilyAlbum;
+import com.ruoyi.app.service.ITbFamilyAlbumService;
+
+import java.util.List;
+
+/**
+ * 家族相簿
+ *
+ * @author luobo
+ * @date 2020-10-12
+ */
+@Service
+public class TbFamilyAlbumServiceImpl extends ServiceImpl<TbFamilyAlbumMapper, TbFamilyAlbum> implements ITbFamilyAlbumService {
+    @Autowired
+    private ITbFamilyService familyService;
+
+
+    @Override
+    public List<TbFamilyAlbum> queryList(TbFamilyAlbum  entity) {
+        LambdaQueryWrapper<TbFamilyAlbum> lqw = new LambdaQueryWrapper<TbFamilyAlbum>();
+        if (entity.getFamilyId() != null){
+            lqw.eq(TbFamilyAlbum::getFamilyId ,entity.getFamilyId());
+        }
+        if (StringUtils.isNotBlank(entity.getTitle())){
+            lqw.eq(TbFamilyAlbum::getTitle ,entity.getTitle());
+        }
+        if (StringUtils.isNotBlank(entity.getStatus())){
+            lqw.eq(TbFamilyAlbum::getStatus ,entity.getStatus());
+        }
+        List<TbFamilyAlbum> list = this.list(lqw);
+        list.forEach(item->{
+           TbFamily family = familyService.getById(item.getFamilyId());
+           item.setFamily(family);
+        });
+
+        return list;
+    }
+}

+ 23 - 0
ruoyi-system/src/main/resources/mapper/app/TbFamilyAlbumMapper.xml

@@ -0,0 +1,23 @@
+<?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">
+<mapper namespace="com.ruoyi.app.mapper.TbFamilyAlbumMapper">
+    
+    <resultMap type="TbFamilyAlbum" id="TbFamilyAlbumResult">
+        <result property="id"    column="id"    />
+        <result property="familyId"    column="family_id"    />
+        <result property="title"    column="title"    />
+        <result property="contents"    column="contents"    />
+        <result property="url"    column="url"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="status"    column="status"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+
+</mapper>