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

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

@@ -34,11 +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 = "1") @RequestParam(value = "page", required = false) Integer page,
                                         @ApiParam(name = "pagesize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pagesize", required = false) Integer pagesize){
                                         @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                         @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlArticleContent> articleContentList = articleContentService.findArticleContentById(id,articleContentTitle,systemDictType,page-1,pagesize);
            return write(200,"查询成功","data", PageUtil.getPage(articleContentList,page,pagesize,articleContentService.allCount()));
            List<ZjxlArticleContent> articleContentList = articleContentService.findArticleContentById(id,articleContentTitle,systemDictType,pageNo-1,pageSize);
            return write(200,"查询成功","data", PageUtil.getPage(articleContentList,pageNo,pageSize,articleContentService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");

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

@@ -50,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 = "1") @RequestParam(value = "page", required = false) Integer page,
                                 @ApiParam(name = "pagesize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pagesize", required = false) Integer pagesize){
                                 @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                 @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlBanner> banner = bannerService.findById(id,name,page-1,pagesize);
            return write(200,"查询成功","data",PageUtil.getPage(banner,page,pagesize,bannerService.allCount()));
            List<ZjxlBanner> banner = bannerService.findById(id,name,pageNo-1,pageSize);
            return write(200,"查询成功","data",PageUtil.getPage(banner,pageNo,pageSize,bannerService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败");

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

@@ -33,11 +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 = "1") @RequestParam(value = "page", required = false) Integer page,
                                      @ApiParam(name = "pagesize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pagesize", required = false) Integer pagesize){
                                      @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                      @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlCompanyCase> companyCaseList = companyCaseService.findById(id,name,page-1,pagesize);
            return write(200,"查询成功","data", PageUtil.getPage(companyCaseList,page,pagesize,companyCaseService.allCount()));
            List<ZjxlCompanyCase> companyCaseList = companyCaseService.findById(id,name,pageNo-1,pageSize);
            return write(200,"查询成功","data", PageUtil.getPage(companyCaseList,pageNo,pageSize,companyCaseService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");

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

@@ -34,11 +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 = "1") @RequestParam(value = "page", required = false) Integer page,
            @ApiParam(name = "pagesize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pagesize", required = false) Integer pagesize){
            @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
            @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlPartner> partnerList = partnerService.findPartenrById(id,name,page-1,pagesize);
            return write(200,"查询成功", "data", PageUtil.getPage(partnerList,page,pagesize,partnerService.allCount()));
            List<ZjxlPartner> partnerList = partnerService.findPartenrById(id,name,pageNo-1,pageSize);
            return write(200,"查询成功", "data", PageUtil.getPage(partnerList,pageNo,pageSize,partnerService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");

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

@@ -34,11 +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 = "1") @RequestParam(value = "page", required = false) Integer page,
                                                 @ApiParam(name = "pagesize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pagesize", required = false) Integer pagesize){
                                                 @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                                 @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlSystemDict> systemDictList = systemDictService.findSystemDictById(id,systemDictType,page-1,pagesize);
            return write(200,"查询成功","data", PageUtil.getPage(systemDictList,page,pagesize,systemDictService.allCount()));
            List<ZjxlSystemDict> systemDictList = systemDictService.findSystemDictById(id,systemDictType,pageNo-1,pageSize);
            return write(200,"查询成功","data", PageUtil.getPage(systemDictList,pageNo,pageSize,systemDictService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");