Merge branch 'master' of shikejing/guns-separation into master

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlArticleContentController.java

@@ -3,6 +3,7 @@ package cn.stylefeng.guns.zjxl.cnotroller;
import cn.stylefeng.guns.zjxl.model.ZjxlArticleContent;
import cn.stylefeng.guns.zjxl.service.ZjxlArticleContentService;
import cn.stylefeng.guns.zjxlUtil.BaseController;
import cn.stylefeng.guns.zjxlUtil.PageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/***
 * @ClassName: ZjxlArticleContentController
 * @Description:文章内容管理
@@ -31,10 +34,11 @@ public class ZjxlArticleContentController extends BaseController {
    public String findArticleContentById(@ApiParam(name = "id", value = "文章id", required = false) @RequestParam(value = "id", required = false)String id,
                                         @ApiParam(name = "articleContentTitle", value = "文章标题", required = false) @RequestParam(value = "articleContentTitle", required = false)String articleContentTitle,
                                         @ApiParam(name = "systemDictType", value = "内容类型 1-产品与服务  2-公司案例  3-新闻中心  4-关于我们", required = false) @RequestParam(value = "systemDictType", required = false)Integer systemDictType,
                                         @ApiParam(name = "page", value = "第几页", defaultValue = "0") @RequestParam(value = "page", required = false) Integer page,
                                         @ApiParam(name = "page", value = "第几页", defaultValue = "1") @RequestParam(value = "page", required = false) Integer page,
                                         @ApiParam(name = "pagesize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pagesize", required = false) Integer pagesize){
        try {
            return write(200,"查询成功","data",articleContentService.findArticleContentById(id,articleContentTitle,systemDictType,page,pagesize));
            List<ZjxlArticleContent> articleContentList = articleContentService.findArticleContentById(id,articleContentTitle,systemDictType,page-1,pagesize);
            return write(200,"查询成功","data", PageUtil.getPage(articleContentList,page,pagesize,articleContentService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlBannerCnotroller.java

@@ -8,6 +8,7 @@ import cn.stylefeng.guns.zjxl.model.ret.BaseResultModel;
import cn.stylefeng.guns.zjxl.model.ret.ResultOneModel;
import cn.stylefeng.guns.zjxl.service.ZjxlBannerService;
import cn.stylefeng.guns.zjxlUtil.BaseController;
import cn.stylefeng.guns.zjxlUtil.PageUtil;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.node.ObjectNode;
import io.swagger.annotations.Api;
@@ -21,7 +22,9 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
/***
@@ -47,11 +50,11 @@ public class ZjxlBannerCnotroller extends BaseController {
    @ApiOperation(value = "查看banner列表")
    public String findBannerById(@ApiParam(name = "id", value = "bannerId", required = false) @RequestParam(value = "id", required = false)String id,
                                 @ApiParam(name = "name", value = "bannerName", required = false) @RequestParam(value = "name", required = false)String name,
                                 @ApiParam(name = "page", value = "第几页", defaultValue = "0") @RequestParam(value = "page", required = false) Integer page,
                                 @ApiParam(name = "page", value = "第几页", defaultValue = "1") @RequestParam(value = "page", required = false) Integer page,
                                 @ApiParam(name = "pagesize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pagesize", required = false) Integer pagesize){
        try {
            List<ZjxlBanner> banner = bannerService.findById(id,name,page,pagesize);
            return write(200,"查询成功","data",banner);
            List<ZjxlBanner> banner = bannerService.findById(id,name,page-1,pagesize);
            return write(200,"查询成功","data",PageUtil.getPage(banner,page,pagesize,bannerService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败");

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlCompanyCaseController.java

@@ -3,6 +3,7 @@ package cn.stylefeng.guns.zjxl.cnotroller;
import cn.stylefeng.guns.zjxl.model.ZjxlCompanyCase;
import cn.stylefeng.guns.zjxl.service.ZjxlCompanyCaseService;
import cn.stylefeng.guns.zjxlUtil.BaseController;
import cn.stylefeng.guns.zjxlUtil.PageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/***
 * @ClassName: ZjxlCompanyCaseController
 * @Description:
@@ -30,10 +33,11 @@ public class ZjxlCompanyCaseController extends BaseController {
    @ApiOperation(value = "查看CompanyCase")
    public String findCompanyCaseById(@ApiParam(name = "id", value = "companyId", required = false) @RequestParam(value = "id", required = false)String id,
                                      @ApiParam(name = "name", value = "companyName", required = false) @RequestParam(value = "name", required = false)String name,
                                      @ApiParam(name = "page", value = "第几页", defaultValue = "0") @RequestParam(value = "page", required = false) Integer page,
                                      @ApiParam(name = "page", value = "第几页", defaultValue = "1") @RequestParam(value = "page", required = false) Integer page,
                                      @ApiParam(name = "pagesize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pagesize", required = false) Integer pagesize){
        try {
            return write(200,"查询成功","data",companyCaseService.findById(id,name,page,pagesize));
            List<ZjxlCompanyCase> companyCaseList = companyCaseService.findById(id,name,page-1,pagesize);
            return write(200,"查询成功","data", PageUtil.getPage(companyCaseList,page,pagesize,companyCaseService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlPartnerController.java

@@ -3,6 +3,7 @@ package cn.stylefeng.guns.zjxl.cnotroller;
import cn.stylefeng.guns.zjxl.model.ZjxlPartner;
import cn.stylefeng.guns.zjxl.service.ZjxlPartnerService;
import cn.stylefeng.guns.zjxlUtil.BaseController;
import cn.stylefeng.guns.zjxlUtil.PageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/***
 * @ClassName: ZjxlPartnerController
 * @Description: 公司官网-合作伙伴
@@ -31,10 +34,11 @@ public class ZjxlPartnerController extends BaseController {
    public String findPartenrById(
            @ApiParam(name = "id", value = "partnerId", required = false) @RequestParam(value = "id", required = false)String id,
            @ApiParam(name = "name", value = "partnername", required = false) @RequestParam(value = "name", required = false)String name,
            @ApiParam(name = "page", value = "第几页", defaultValue = "0") @RequestParam(value = "page", required = false) Integer page,
            @ApiParam(name = "page", value = "第几页", defaultValue = "1") @RequestParam(value = "page", required = false) Integer page,
            @ApiParam(name = "pagesize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pagesize", required = false) Integer pagesize){
        try {
            return write(200,"查询成功", "data", partnerService.findPartenrById(id,name,page,pagesize));
            List<ZjxlPartner> partnerList = partnerService.findPartenrById(id,name,page-1,pagesize);
            return write(200,"查询成功", "data", PageUtil.getPage(partnerList,page,pagesize,partnerService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlSystemDictController.java

@@ -3,6 +3,7 @@ package cn.stylefeng.guns.zjxl.cnotroller;
import cn.stylefeng.guns.zjxl.model.ZjxlSystemDict;
import cn.stylefeng.guns.zjxl.service.ZjxlSystemDictService;
import cn.stylefeng.guns.zjxlUtil.BaseController;
import cn.stylefeng.guns.zjxlUtil.PageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/***
 * @ClassName: ZjxlSystemDictController
 * @Description:
@@ -31,10 +34,11 @@ public class ZjxlSystemDictController extends BaseController {
    public String findSystemDictById(            @ApiParam(name = "id", value = "systemDictId", required = false) @RequestParam(value = "id", required = false)String id,
//                                                 @ApiParam(name = "name", value = "partnername", required = false) @RequestParam(value = "name", required = false)String name,
                                                 @ApiParam(name = "systemDictType", value = "类型 1-产品与服务  2-公司案例  3-新闻中心  4-关于我们", required = false) @RequestParam(value = "systemDictType", required = false)Integer systemDictType,
                                                 @ApiParam(name = "page", value = "第几页", defaultValue = "0") @RequestParam(value = "page", required = false) Integer page,
                                                 @ApiParam(name = "page", value = "第几页", defaultValue = "1") @RequestParam(value = "page", required = false) Integer page,
                                                 @ApiParam(name = "pagesize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pagesize", required = false) Integer pagesize){
        try {
            return write(200,"查询成功","data",systemDictService.findSystemDictById(id,systemDictType,page,pagesize));
            List<ZjxlSystemDict> systemDictList = systemDictService.findSystemDictById(id,systemDictType,page-1,pagesize);
            return write(200,"查询成功","data", PageUtil.getPage(systemDictList,page,pagesize,systemDictService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlArticleContentService.java

@@ -44,6 +44,12 @@ public class ZjxlArticleContentService extends BaseService {
        return articleContentList;
    }
    public int allCount(){
        String sql = "select count(*) from zjxl_article_content ";
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
        return allCount;
    }
    public String addArticleContent(ZjxlArticleContent articleContent){
        articleContent.setArticleContentId(getCode());
        ZjxlArticleContent content = articleContentDao.save(articleContent);

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlBannerService.java

@@ -46,6 +46,12 @@ public class ZjxlBannerService extends BaseService {
       return bannerList;
    }
    public int allCount(){
        String sql = "select count(*) from zjxl_banner ";
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
        return allCount;
    }
    public String addBanner(ZjxlBanner banner){
        banner.setBannerId(getCode());
        ZjxlBanner bb = bannerDao.save(banner);

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlCompanyCaseService.java

@@ -42,6 +42,12 @@ public class ZjxlCompanyCaseService extends BaseService {
        return companyCaseList;
    }
    public int allCount(){
        String sql = "select count(*) from zjxl_company_case ";
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
        return allCount;
    }
    public String addCompanyCase(ZjxlCompanyCase companyCase){
        companyCase.setCompanyId(getCode());
        ZjxlCompanyCase companyCase1 = companyCaseDao.save(companyCase);

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlPartnerService.java

@@ -41,6 +41,12 @@ public class ZjxlPartnerService extends BaseService {
        return partnerList;
    }
    public int allCount(){
        String sql = "select count(*) from zjxl_partner ";
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
        return allCount;
    }
    public String addPartenr(ZjxlPartner partner){
        partner.setPartnerId(getCode());
        ZjxlPartner p = partnerDao.save(partner);

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlSystemDictService.java

@@ -46,6 +46,12 @@ public class ZjxlSystemDictService extends BaseService {
        return systemDictList;
    }
    public int allCount(){
        String sql = "select count(*) from zjxl_system_dict ";
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
        return allCount;
    }
    public int updateSystemDict(String id, Integer isLine){
        systemDictDao.updateBySystemDictId(id,isLine);
        return 1;

guns-main/src/main/java/cn/stylefeng/guns/zjxlUtil/PageUtil.java

@@ -0,0 +1,41 @@
package cn.stylefeng.guns.zjxlUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.jdbc.core.JdbcTemplate;
import java.util.*;
/***
 * @ClassName: PageUtil
 * @Description:
 * @Auther: shi kejing
 * @Date: 2020/11/5 13:55
 */
public class PageUtil {
    public static Map<String ,Object> getPage(List object, int pageNo, int pageSize, Integer allCount) {
        Map<String,Object> map = new HashMap<>();
        Integer totalPage = 0;
        Integer totalRows = allCount;
        if (totalRows>0){
            map.put("pageNo",pageNo);
            map.put("pageSize",pageSize);
            if(totalRows%pageSize==0){
                totalPage=totalRows/pageSize;
            }else{
                totalPage=totalRows/pageSize+1;
            }
            map.put("totalPage",totalPage);//所有的数据一共多少页
            map.put("totalRows",totalRows);//所有数据的条数
            map.put("rows",object);
            List list = new ArrayList();
            for (int i=1; i <= totalPage; i++){
                list.add(i);
            }
            map.put("rainbow",list);
        }
        return map;
    }
}