添加相册图片

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbFamilyAlbumController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/family/TbFamilyAlbumController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.api;
+package com.ruoyi.web.controller.api.family;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
@@ -7,7 +7,6 @@ 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;
@@ -23,8 +22,8 @@ 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.app.family.album.domain.TbFamilyAlbum;
+import com.ruoyi.app.family.album.service.ITbFamilyAlbumService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -37,7 +36,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @Api(value = "家族相簿", tags = "家族相簿")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/system/album" )
+@RequestMapping("/system/family/album" )
 public class TbFamilyAlbumController extends BaseController {
 
     private final ITbFamilyAlbumService iTbFamilyAlbumService;
@@ -76,7 +75,7 @@ public class TbFamilyAlbumController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:album:query')" )
     @GetMapping(value = "/{id}" )
     public AjaxResult getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iTbFamilyAlbumService.getById(id));
+        return AjaxResult.success(iTbFamilyAlbumService.getEntityById(id));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/family/TbFamilyPhotoController.java

@@ -0,0 +1,131 @@
+package com.ruoyi.web.controller.api.family;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.ruoyi.app.family.photo.domain.TbFamilyPhoto;
+import com.ruoyi.app.family.photo.service.ITbFamilyPhotoService;
+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.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 家族相簿照片
+ * 
+ * @author luobo
+ * @date 2020-10-14
+ */
+@Api(value = "家族相簿照片", tags = "家族相簿照片")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/family/photo" )
+public class TbFamilyPhotoController extends BaseController {
+
+    private final ITbFamilyPhotoService iTbFamilyPhotoService;
+
+    /**
+     * 查询家族相簿照片列表
+     */
+    @ApiOperation("查询家族相簿照片列表")
+    @PreAuthorize("@ss.hasPermi('system:familyPhoto:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbFamilyPhoto tbFamilyPhoto)
+    {
+        startPage();
+        LambdaQueryWrapper<TbFamilyPhoto> lqw = new LambdaQueryWrapper<TbFamilyPhoto>();
+        if (tbFamilyPhoto.getFamilyId() != null){
+            lqw.eq(TbFamilyPhoto::getFamilyId ,tbFamilyPhoto.getFamilyId());
+        }
+        if (tbFamilyPhoto.getAlbumId() != null){
+            lqw.eq(TbFamilyPhoto::getAlbumId ,tbFamilyPhoto.getAlbumId());
+        }
+        if (StringUtils.isNotBlank(tbFamilyPhoto.getTitle())){
+            lqw.eq(TbFamilyPhoto::getTitle ,tbFamilyPhoto.getTitle());
+        }
+        if (StringUtils.isNotBlank(tbFamilyPhoto.getUrl())){
+            lqw.eq(TbFamilyPhoto::getUrl ,tbFamilyPhoto.getUrl());
+        }
+        if (StringUtils.isNotBlank(tbFamilyPhoto.getStatus())){
+            lqw.eq(TbFamilyPhoto::getStatus ,tbFamilyPhoto.getStatus());
+        }
+        List<TbFamilyPhoto> list = iTbFamilyPhotoService.list(lqw);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出家族相簿照片列表
+     */
+    @ApiOperation("导出家族相簿照片列表")
+    @PreAuthorize("@ss.hasPermi('system:familyPhoto:export')" )
+    @Log(title = "家族相簿照片" , businessType = BusinessType.EXPORT)
+    @GetMapping("/export" )
+    public AjaxResult export(TbFamilyPhoto tbFamilyPhoto) {
+        LambdaQueryWrapper<TbFamilyPhoto> lqw = new LambdaQueryWrapper<TbFamilyPhoto>(tbFamilyPhoto);
+        List<TbFamilyPhoto> list = iTbFamilyPhotoService.list(lqw);
+        ExcelUtil<TbFamilyPhoto> util = new ExcelUtil<TbFamilyPhoto>(TbFamilyPhoto. class);
+        return util.exportExcel(list, "familyPhoto" );
+    }
+
+    /**
+     * 获取家族相簿照片详细信息
+     */
+    @ApiOperation("获取家族相簿照片详细信息")
+    @PreAuthorize("@ss.hasPermi('system:familyPhoto:query')" )
+    @GetMapping(value = "/{id}" )
+    public AjaxResult getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iTbFamilyPhotoService.getById(id));
+    }
+
+    /**
+     * 新增家族相簿照片
+     */
+    @ApiOperation("新增家族相簿照片")
+    @PreAuthorize("@ss.hasPermi('system:familyPhoto:add')" )
+    @Log(title = "家族相簿照片" , businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TbFamilyPhoto tbFamilyPhoto) {
+        return toAjax(iTbFamilyPhotoService.save(tbFamilyPhoto) ? 1 : 0);
+    }
+
+    /**
+     * 修改家族相簿照片
+     */
+    @ApiOperation("修改家族相簿照片")
+    @PreAuthorize("@ss.hasPermi('system:familyPhoto:edit')" )
+    @Log(title = "家族相簿照片" , businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TbFamilyPhoto tbFamilyPhoto) {
+        return toAjax(iTbFamilyPhotoService.updateById(tbFamilyPhoto) ? 1 : 0);
+    }
+
+    /**
+     * 删除家族相簿照片
+     */
+    @ApiOperation("删除家族相簿照片")
+    @PreAuthorize("@ss.hasPermi('system:familyPhoto:remove')" )
+    @Log(title = "家族相簿照片" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}" )
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(iTbFamilyPhotoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbFamilyAlbum.java → ruoyi-system/src/main/java/com/ruoyi/app/family/album/domain/TbFamilyAlbum.java

@@ -1,6 +1,7 @@
-package com.ruoyi.app.domain;
+package com.ruoyi.app.family.album.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.app.domain.TbFamily;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbFamilyAlbumMapper.java → ruoyi-system/src/main/java/com/ruoyi/app/family/album/mapper/TbFamilyAlbumMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.app.mapper;
+package com.ruoyi.app.family.album.mapper;
 
-import com.ruoyi.app.domain.TbFamilyAlbum;
+import com.ruoyi.app.family.album.domain.TbFamilyAlbum;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbFamilyAlbumService.java → ruoyi-system/src/main/java/com/ruoyi/app/family/album/service/ITbFamilyAlbumService.java

@@ -1,8 +1,7 @@
-package com.ruoyi.app.service;
+package com.ruoyi.app.family.album.service;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.app.domain.TbFamilyAlbum;
+import com.ruoyi.app.family.album.domain.TbFamilyAlbum;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -17,4 +16,5 @@ public interface ITbFamilyAlbumService extends IService<TbFamilyAlbum> {
 
     List<TbFamilyAlbum> queryList(TbFamilyAlbum entity);
 
+    TbFamilyAlbum getEntityById(Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyAlbumServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/app/family/album/service/impl/TbFamilyAlbumServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.app.service.impl;
+package com.ruoyi.app.family.album.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.app.domain.TbFamily;
@@ -7,9 +7,9 @@ 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 com.ruoyi.app.family.album.mapper.TbFamilyAlbumMapper;
+import com.ruoyi.app.family.album.domain.TbFamilyAlbum;
+import com.ruoyi.app.family.album.service.ITbFamilyAlbumService;
 
 import java.util.List;
 
@@ -45,4 +45,14 @@ public class TbFamilyAlbumServiceImpl extends ServiceImpl<TbFamilyAlbumMapper, T
 
         return list;
     }
+
+    @Override
+    public TbFamilyAlbum getEntityById(Long id) {
+        TbFamilyAlbum item = this.getById(id);
+        if (item!=null){
+            TbFamily family = familyService.getById(item.getFamilyId());
+            item.setFamily(family);
+        }
+        return item;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/app/family/photo/domain/TbFamilyPhoto.java

@@ -0,0 +1,92 @@
+package com.ruoyi.app.family.photo.domain;
+
+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 com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 家族相簿照片
+ * 
+ * @author luobo
+ * @date 2020-10-14
+ */
+@Data
+@ApiModel(value = "家族相簿照片")
+@ToString
+@EqualsAndHashCode
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_family_photo")
+public class TbFamilyPhoto implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /** ID */
+    @ApiModelProperty(value="ID")
+    @TableId(value = "id")
+    private Long id;
+
+    /** 家族 */
+    @ApiModelProperty(value="家族")
+    @Excel(name = "家族")
+    private Long familyId;
+
+    /** 相簿 */
+    @ApiModelProperty(value="相簿")
+    @Excel(name = "相簿")
+    private Long albumId;
+
+    /** 标题 */
+    @ApiModelProperty(value="标题")
+    @Excel(name = "标题")
+    private String title;
+
+    /** 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代表删除）")
+    private String delFlag;
+}

ruoyi-system/src/main/java/com/ruoyi/app/family/photo/mapper/TbFamilyPhotoMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.app.family.photo.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.app.family.photo.domain.TbFamilyPhoto;
+
+/**
+ * 家族相簿照片
+ *
+ * @author luobo
+ * @date 2020-10-14
+ */
+public interface TbFamilyPhotoMapper extends BaseMapper<TbFamilyPhoto> {
+
+}

ruoyi-system/src/main/java/com/ruoyi/app/family/photo/service/ITbFamilyPhotoService.java

@@ -0,0 +1,15 @@
+package com.ruoyi.app.family.photo.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.app.family.photo.domain.TbFamilyPhoto;
+
+/**
+ * 家族相簿照片
+ *
+ * @author luobo
+ * @date 2020-10-14
+ */
+public interface ITbFamilyPhotoService extends IService<TbFamilyPhoto> {
+
+}

ruoyi-system/src/main/java/com/ruoyi/app/family/photo/service/impl/TbFamilyPhotoServiceImpl.java

@@ -0,0 +1,19 @@
+package com.ruoyi.app.family.photo.service.impl;
+
+import com.ruoyi.app.family.photo.domain.TbFamilyPhoto;
+import com.ruoyi.app.family.photo.mapper.TbFamilyPhotoMapper;
+import com.ruoyi.app.family.photo.service.ITbFamilyPhotoService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+
+/**
+ * 家族相簿照片
+ *
+ * @author luobo
+ * @date 2020-10-14
+ */
+@Service
+public class TbFamilyPhotoServiceImpl extends ServiceImpl<TbFamilyPhotoMapper, TbFamilyPhoto> implements ITbFamilyPhotoService {
+
+}

ruoyi-system/src/main/resources/mapper/app/TbFamilyAlbumMapper.xml → ruoyi-system/src/main/resources/mapper/app/family/TbFamilyAlbumMapper.xml

@@ -2,7 +2,7 @@
 <!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">
+<mapper namespace="com.ruoyi.app.family.album.mapper.TbFamilyAlbumMapper">
     
     <resultMap type="TbFamilyAlbum" id="TbFamilyAlbumResult">
         <result property="id"    column="id"    />

ruoyi-system/src/main/resources/mapper/app/family/TbFamilyPhotoMapper.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.family.photo.mapper.TbFamilyPhotoMapper">
+    
+    <resultMap type="TbFamilyPhoto" id="TbFamilyPhotoResult">
+        <result property="id"    column="id"    />
+        <result property="familyId"    column="family_id"    />
+        <result property="albumId"    column="album_id"    />
+        <result property="title"    column="title"    />
+        <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>