合并

whole-estate/src/main/java/com/example/wholeestate/controller/PageImgController.java

@@ -1,9 +1,11 @@
 package com.example.wholeestate.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.example.wholeestate.common.base.BaseController;
 import com.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.common.uuid.IdGen;
 import com.example.wholeestate.model.PageImg;
 import com.example.wholeestate.service.IPageImgService;
 import io.swagger.annotations.Api;
@@ -11,12 +13,9 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -34,15 +33,32 @@ public class PageImgController extends BaseController {
 
     @Autowired
     private IPageImgService iPageImgService;
+    private IdGen idGen = IdGen.get();
+
+    @ApiOperation(value = "后台首页图片", notes = "后台首页图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "pageNum第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行"),
+            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "location",value = "图片位置" ),
+    })
+    @RequestMapping(value = "/pageImgList", method = RequestMethod.GET)
+    public ResponseBean apageImgSelect(
+            @RequestParam(defaultValue = "1") Integer pageNum,
+            @RequestParam(defaultValue = "10") Integer pageSize,
+            @RequestParam(value = "location",required = false)String location) {
+
+        ResponseBean responseBean = iPageImgService.apageImgSelect(pageNum, pageSize, location);
+        return responseBean;
+    }
 
     @ApiOperation(value = "后台首页图片", notes = "后台首页图片")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "id",value = "id为空时查所有" ),
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "id",value = "主键" ),
     })
-    @RequestMapping(value = "/pageIm", method = RequestMethod.GET)
-    public ResponseBean apageImgSelect(@RequestParam(value = "id",required = false)String id) {
+    @RequestMapping(value = "/pageImgDetail/{id}", method = RequestMethod.GET)
+    public ResponseBean pageImgDetail(@PathVariable(value = "id")String id) {
 
-        ResponseBean responseBean = iPageImgService.apageImgSelect(id);
+        ResponseBean responseBean = iPageImgService.pageImgDetail(id);
         return responseBean;
     }
 
@@ -68,35 +84,31 @@ public class PageImgController extends BaseController {
 
     @ApiOperation(value = "后台添加首页图片", notes = "后台添加首页图片")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "imgLocation",value = "图片位置" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "imgType",value = "图片类型" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "url",value = "url图片地址" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "orderNo",value = "orderNo排序" )
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "imgLocation图片地址;imgType图片类型;link链接地址;orderNo排序;url:图片地址")
     })
-    @RequestMapping(value = "/pageIm/add", method = RequestMethod.PUT)
-    public ResponseBean pageImAdd(@RequestParam(value = "imgLocation",required = false)String imgLocation,
-                                  @RequestParam(value = "imgType",required = false)String imgType,
-                                  @RequestParam(value = "url",required = false)String url,
-                                  @RequestParam(value = "orderNo",required = false)String orderNo) {
-        ResponseBean responseBean = iPageImgService.pageImAdd(imgLocation,imgType,url,orderNo);
+    @RequestMapping(value = "/pageIm/add", method = RequestMethod.POST)
+    public ResponseBean pageImAdd(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        PageImg pageimg = JSONObject.parseObject(parameter, PageImg.class);
+        pageimg.setStatus(1);
+        pageimg.setPageId(idGen.nextId()+"");
+        pageimg.setCreateDate(LocalDateTime.now());
+        iPageImgService.save(pageimg);
         return responseBean;
     }
 
     @ApiOperation(value = "后台添加首页图片修改", notes = "后台添加首页图片修改")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "id",value = "id" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "imgLocation",value = "图片位置" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "imgType",value = "图片类型" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "url",value = "url图片地址" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "String",name = "orderNo",value = "orderNo排序" )
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "pageId:主键;imgLocation图片地址;imgType图片类型;link链接地址;orderNo排序;url:图片地址")
     })
-    @RequestMapping(value = "/pageIm/update", method = RequestMethod.POST)
-    public ResponseBean pageImUpdate(@RequestParam(value = "imgLocation",required = false)String imgLocation,
-                                  @RequestParam(value = "imgType",required = false)String imgType,
-                                  @RequestParam(value = "url",required = false)String url,
-                                  @RequestParam(value = "orderNo",required = false)String orderNo,
-                                     @RequestParam(value = "id",required = false)String id) {
-        ResponseBean responseBean = iPageImgService.pageImUpdate(imgLocation,imgType,url,orderNo,id);
+    @RequestMapping(value = "/pageIm/update", method = RequestMethod.PUT)
+    public ResponseBean pageImUpdate(@RequestBody String parameter) {
+
+        ResponseBean responseBean = new ResponseBean();
+        PageImg pageimg = JSONObject.parseObject(parameter, PageImg.class);
+        QueryWrapper<PageImg> activityQueryWrapper = new QueryWrapper<>();
+        activityQueryWrapper.eq("page_id", pageimg.getPageId());
+        iPageImgService.update(pageimg, activityQueryWrapper);
         return responseBean;
     }
 
@@ -104,7 +116,7 @@ public class PageImgController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "Query",dataType = "String",name = "id",value = "id" ),
     })
-    @RequestMapping(value = "/pageImdelect/delect", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/pageImg/delete", method = RequestMethod.DELETE)
     public ResponseBean pageImdelect(@RequestParam(value = "id",required = false)String id) {
         ResponseBean responseBean = iPageImgService.pageImdelectDelect(id);
         return responseBean;

whole-estate/src/main/java/com/example/wholeestate/service/IPageImgService.java

@@ -13,12 +13,19 @@ import com.example.wholeestate.model.PageImg;
  * @since 2019-03-22
  */
 public interface IPageImgService extends IService<PageImg> {
+    /**
+     * 后台图片根据Id查
+     * @param location
+     * @return
+     */
+    ResponseBean apageImgSelect(Integer pageNum, Integer pageSize, String location);
+
     /**
      * 后台图片根据Id查
      * @param id
      * @return
      */
-    ResponseBean apageImgSelect(String id);
+    ResponseBean pageImgDetail(String id);
 
     /**
      * 后台图片添加

whole-estate/src/main/java/com/example/wholeestate/service/impl/PageImgServiceImpl.java

@@ -1,10 +1,13 @@
 package com.example.wholeestate.service.impl;
 
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.common.uuid.IdGen;
 import com.example.wholeestate.dao.PageImgMapper;
+import com.example.wholeestate.model.Activity;
 import com.example.wholeestate.model.PageImg;
 import com.example.wholeestate.service.IPageImgService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,20 +31,32 @@ private  PageImgMapper pageImgMapper;
 
     private IdGen idGen = IdGen.get();
     @Override
-    public ResponseBean apageImgSelect(String id) {
+    public ResponseBean apageImgSelect(Integer pageNum, Integer pageSize, String location) {
+        Page<PageImg> page = new Page<>();
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        page.setSize(pageSize == null ? 10 : pageSize);
+
         ResponseBean responseBean= new ResponseBean();
         QueryWrapper<PageImg> pageImgQueryWrapper = new QueryWrapper<>();
-        if (null!=id) {
-            pageImgQueryWrapper.eq("page_id", id);
-            PageImg rageImg = pageImgMapper.selectOne(pageImgQueryWrapper);
-            responseBean.addSuccess(rageImg);
-            return responseBean;
+        pageImgQueryWrapper.eq("status", 1);
+        if (null!=location) {
+            pageImgQueryWrapper.eq("img_location", location);
         }
-        List<PageImg> pageImgList= pageImgMapper.selectImgList();
+        IPage<PageImg> pageImgList= pageImgMapper.selectPage(page, pageImgQueryWrapper);
         responseBean.addSuccess(pageImgList);
         return responseBean;
     }
 
+    @Override
+    public ResponseBean pageImgDetail(String id) {
+        ResponseBean responseBean= new ResponseBean();
+        QueryWrapper<PageImg> pageImgQueryWrapper = new QueryWrapper<>();
+        pageImgQueryWrapper.eq("page_id", id);
+        PageImg rageImg = pageImgMapper.selectOne(pageImgQueryWrapper);
+        responseBean.addSuccess(rageImg);
+        return responseBean;
+    }
+
     @Override
     public ResponseBean pageImAdd(String imgLocation, String imgType, String url, String orderNo) {
         ResponseBean responseBean= new ResponseBean();