feats

src/main/java/com/shigongli/controller/CommController.java

@@ -3,14 +3,20 @@ package com.shigongli.controller;
 import com.shigongli.common.BaseController;
 import com.shigongli.common.OSSUtils;
 import com.shigongli.common.ResponseBean;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 
+@Api(tags = "通用")
+@RestController
+@RequestMapping("/")
 public class CommController extends BaseController {
 
     @Autowired

src/main/java/com/shigongli/controller/TaMetaImageController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.shigongli.common.BaseController;
+import com.shigongli.common.OSSUtils;
 import com.shigongli.common.ResponseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,6 +20,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.shigongli.service.ITaMetaImageService;
 import com.shigongli.entity.TaMetaImage;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
 
 /**
  * <p>
@@ -39,81 +43,91 @@ public class TaMetaImageController extends BaseController {
     @Autowired
     public ITaMetaImageService iTaMetaImageService;
 
+    @Autowired
+    OSSUtils ossUtils;
 
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/taMetaImage",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taMetaImageList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaMetaImage> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaMetaImage> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaMetaImage> result = iTaMetaImageService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
 
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/taMetaImage",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taMetaImageList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//		    IPage<TaMetaImage> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaMetaImage> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<TaMetaImage> result = iTaMetaImageService.page(pg, queryWrapper);
+//            return ResponseBean.success(result);
+//    }
+//
     /**
      * 保存对象
      * @param taMetaImage 实体对象
      * @return
      */
-    @RequestMapping(value="/taMetaImage",method= RequestMethod.POST)
+    @RequestMapping(value="/mp/taMetaImage",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taMetaImageAdd(@ApiParam("保存内容") @RequestBody TaMetaImage taMetaImage) throws Exception{
-
-        if (iTaMetaImageService.save(taMetaImage)){
-            return ResponseBean.success(taMetaImage);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
+    public ResponseBean taMetaImageAdd(@RequestParam("file") MultipartFile multipartFile) throws Exception{
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taMetaImage/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taMetaImageDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaMetaImageService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
+        try {
+            String image = ossUtils.putObject(multipartFile, "/shigongli/images/");
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taMetaImage 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taMetaImage/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taMetaImageUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaMetaImage taMetaImage) throws Exception{
+            TaMetaImage taMetaImage = new TaMetaImage();
+            taMetaImage.setImage(image);
 
-        if (iTaMetaImageService.updateById(taMetaImage)){
-            return ResponseBean.success(iTaMetaImageService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            iTaMetaImageService.save(taMetaImage);
+            return ResponseBean.success(taMetaImage);
+        } catch (IOException e) {
+            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
-    }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taMetaImage/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taMetaImageGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaMetaImageService.getById(id));
     }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taMetaImage/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taMetaImageDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaMetaImageService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taMetaImage 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taMetaImage/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taMetaImageUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaMetaImage taMetaImage) throws Exception{
+//
+//        if (iTaMetaImageService.updateById(taMetaImage)){
+//            return ResponseBean.success(iTaMetaImageService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taMetaImage/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taMetaImageGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaMetaImageService.getById(id));
+//    }
 }

src/main/java/com/shigongli/controller/TaMetaImageTagController.java

@@ -20,6 +20,10 @@ import com.shigongli.service.ITaMetaImageTagService;
 import com.shigongli.entity.TaMetaImageTag;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
     * 图片标签 前端控制器
@@ -49,13 +53,12 @@ public class TaMetaImageTagController extends BaseController {
     @RequestMapping(value="/taMetaImageTag",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taMetaImageTagList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                           @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           @ApiParam("标签ID") @RequestParam(value ="tagId") String tagId) throws Exception{
 
 		    IPage<TaMetaImageTag> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaMetaImageTag> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
 
-            IPage<TaMetaImageTag> result = iTaMetaImageTagService.page(pg, queryWrapper);
+            IPage<TaMetaImageTag> result = iTaMetaImageTagService.pagedBy(pg, tagId);
             return ResponseBean.success(result);
     }
 
@@ -66,54 +69,72 @@ public class TaMetaImageTagController extends BaseController {
      */
     @RequestMapping(value="/taMetaImageTag",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taMetaImageTagAdd(@ApiParam("保存内容") @RequestBody TaMetaImageTag taMetaImageTag) throws Exception{
+    public ResponseBean taMetaImageTagAdd(@ApiParam("保存内容") @RequestBody List<Map<String, String>> datas) throws Exception{
+        List<String> tagIds = new ArrayList<>();
+        List<TaMetaImageTag> taMetaImageTags = new ArrayList<>();
 
-        if (iTaMetaImageTagService.save(taMetaImageTag)){
-            return ResponseBean.success(taMetaImageTag);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
+        for (Map<String, String> item: datas) {
+            String tagId = item.get("tagId");
+            String imageId = item.get("imageId");
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taMetaImageTag/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taMetaImageTagDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaMetaImageTagService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
+            TaMetaImageTag taMetaImageTag = new TaMetaImageTag();
+            taMetaImageTag.setImageId(imageId);
+            taMetaImageTag.setTagId(tagId);
+            taMetaImageTags.add(taMetaImageTag);
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taMetaImageTag 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taMetaImageTag/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taMetaImageTagUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaMetaImageTag taMetaImageTag) throws Exception{
-
-        if (iTaMetaImageTagService.updateById(taMetaImageTag)){
-            return ResponseBean.success(iTaMetaImageTagService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            if (!tagIds.contains(tagId)) {
+                tagIds.add(tagId);
+            }
         }
-    }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taMetaImageTag/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taMetaImageTagGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaMetaImageTagService.getById(id));
+        // 先清除所有数据
+        iTaMetaImageTagService.removeAllBy(tagIds);
+
+        // 再保存所有
+        iTaMetaImageTagService.saveBatch(taMetaImageTags);
+
+        return ResponseBean.success("ok");
     }
+
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taMetaImageTag/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taMetaImageTagDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaMetaImageTagService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taMetaImageTag 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taMetaImageTag/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taMetaImageTagUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaMetaImageTag taMetaImageTag) throws Exception{
+//
+//        if (iTaMetaImageTagService.updateById(taMetaImageTag)){
+//            return ResponseBean.success(iTaMetaImageTagService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taMetaImageTag/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taMetaImageTagGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaMetaImageTagService.getById(id));
+//    }
 }

src/main/java/com/shigongli/entity/TaMateTag.java

@@ -27,7 +27,7 @@ public class TaMateTag implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "ID")
-    @TableId(value = "tag_id", type = IdType.INPUT)
+    @TableId(value = "tag_id", type = IdType.UUID)
     private String tagId;
 
     @ApiModelProperty(value = "标签")

src/main/java/com/shigongli/entity/TaMetaImage.java

@@ -27,7 +27,7 @@ public class TaMetaImage implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "图片id")
-    @TableId(value = "image_id", type = IdType.INPUT)
+    @TableId(value = "image_id", type = IdType.UUID)
     private String imageId;
 
     @ApiModelProperty(value = "图片地址")

src/main/java/com/shigongli/entity/TaMetaImageTag.java

@@ -35,5 +35,7 @@ public class TaMetaImageTag implements Serializable {
     @ApiModelProperty(value = "标签ID")
     private String tagId;
 
+    private String tagName;
 
+    private String image;
 }

src/main/java/com/shigongli/mapper/TaMetaImageTagMapper.java

@@ -3,6 +3,9 @@ package com.shigongli.mapper;
 import com.shigongli.entity.TaMetaImageTag;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaMetaImageTagMapper extends BaseMapper<TaMetaImageTag> {
 
+    int removeAllBy(@Param("tagIds") List<String> tagIds);
 }

src/main/java/com/shigongli/service/ITaMetaImageTagService.java

@@ -1,8 +1,11 @@
 package com.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.shigongli.entity.TaMetaImageTag;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 图片标签 服务类
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaMetaImageTagService extends IService<TaMetaImageTag> {
 
+    void removeAllBy(List<String> tagIds);
+
+    IPage<TaMetaImageTag> pagedBy(IPage<TaMetaImageTag> pg, String tagId);
 }

src/main/java/com/shigongli/service/impl/TaMetaImageTagServiceImpl.java

@@ -1,11 +1,15 @@
 package com.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.shigongli.entity.TaMetaImageTag;
 import com.shigongli.mapper.TaMetaImageTagMapper;
 import com.shigongli.service.ITaMetaImageTagService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 图片标签 服务实现类
@@ -17,4 +21,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaMetaImageTagServiceImpl extends ServiceImpl<TaMetaImageTagMapper, TaMetaImageTag> implements ITaMetaImageTagService {
 
+    @Autowired
+    TaMetaImageTagMapper taMetaImageTagMapper;
+
+    @Override
+    public void removeAllBy(List<String> tagIds) {
+        if (tagIds == null || tagIds.size() < 1) {
+            return;
+        }
+
+        taMetaImageTagMapper.removeAllBy(tagIds);
+    }
+
+    @Override
+    public IPage<TaMetaImageTag> pagedBy(IPage<TaMetaImageTag> pg, String tagId) {
+        return null;
+    }
 }

src/main/resources/mapper/TaMetaImageTagMapper.xml

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.shigongli.mapper.TaMetaImageTagMapper">
 
+    <delete id="removeAllBy">
+        delete from ta_meta_image_tag
+        where tag_id in	WHERE id IN
+        <foreach collection="tagIds" item="id" index="index" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>