| 
															
																@ -2,10 +2,12 @@ package cn.stylefeng.guns.zjxl.cnotroller; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																import cn.stylefeng.guns.config.FastDFSConfig; 
															 | 
															
															 | 
															
																import cn.stylefeng.guns.config.FastDFSConfig; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																import cn.stylefeng.guns.zjxl.model.UploadModel; 
															 | 
															
															 | 
															
																import cn.stylefeng.guns.zjxl.model.UploadModel; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																import cn.stylefeng.guns.zjxl.model.ZjxlArticleContent; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																import cn.stylefeng.guns.zjxl.model.ZjxlBanner; 
															 | 
															
															 | 
															
																import cn.stylefeng.guns.zjxl.model.ZjxlBanner; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																import cn.stylefeng.guns.zjxl.model.ret.BannerCompanyCaseRet; 
															 | 
															
															 | 
															
																import cn.stylefeng.guns.zjxl.model.ret.BannerCompanyCaseRet; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																import cn.stylefeng.guns.zjxl.model.ret.BaseResultModel; 
															 | 
															
															 | 
															
																import cn.stylefeng.guns.zjxl.model.ret.BaseResultModel; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																import cn.stylefeng.guns.zjxl.model.ret.ResultOneModel; 
															 | 
															
															 | 
															
																import cn.stylefeng.guns.zjxl.model.ret.ResultOneModel; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																import cn.stylefeng.guns.zjxl.service.ZjxlArticleContentService; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																import cn.stylefeng.guns.zjxl.service.ZjxlBannerService; 
															 | 
															
															 | 
															
																import cn.stylefeng.guns.zjxl.service.ZjxlBannerService; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																import cn.stylefeng.guns.zjxlUtil.BaseController; 
															 | 
															
															 | 
															
																import cn.stylefeng.guns.zjxlUtil.BaseController; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																import cn.stylefeng.guns.zjxlUtil.FastDFSUtil; 
															 | 
															
															 | 
															
																import cn.stylefeng.guns.zjxlUtil.FastDFSUtil; 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -48,6 +50,8 @@ public class ZjxlBannerCnotroller extends BaseController { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    @Autowired 
															 | 
															
															 | 
															
																    @Autowired 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    private ZjxlBannerService bannerService; 
															 | 
															
															 | 
															
																    private ZjxlBannerService bannerService; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																    @Autowired 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																    private ZjxlArticleContentService articleContentService; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    @Autowired 
															 | 
															
															 | 
															
																    @Autowired 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    FastDFSConfig fastDFSConfig; 
															 | 
															
															 | 
															
																    FastDFSConfig fastDFSConfig; 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -75,7 +79,7 @@ public class ZjxlBannerCnotroller extends BaseController { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    @ApiOperation(value = "添加banner") 
															 | 
															
															 | 
															
																    @ApiOperation(value = "添加banner") 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    public String addBanner(@ApiParam(name = "bannerName", value = "bannerName", required = false) @RequestParam(value = "bannerName", required = false)String bannerName, 
															 | 
															
															 | 
															
																    public String addBanner(@ApiParam(name = "bannerName", value = "bannerName", required = false) @RequestParam(value = "bannerName", required = false)String bannerName, 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                            @ApiParam(name = "bannerImage", value = "图片", required = false) @RequestParam(value = "bannerImage", required = false)String bannerImage, 
															 | 
															
															 | 
															
																                            @ApiParam(name = "bannerImage", value = "图片", required = false) @RequestParam(value = "bannerImage", required = false)String bannerImage, 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                            @ApiParam(name = "bannerType", value = "跳转方式", required = false) @RequestParam(value = "bannerType", required = false)Integer bannerType, 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                            @ApiParam(name = "bannerType", value = "跳转方式: 0-无  1-站内文章  2-外部链接", required = false) @RequestParam(value = "bannerType", required = false)Integer bannerType, 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                            @ApiParam(name = "bannerTypeUrl", value = "跳转链接", required = false) @RequestParam(value = "bannerTypeUrl", required = false)String bannerTypeUrl, 
															 | 
															
															 | 
															
																                            @ApiParam(name = "bannerTypeUrl", value = "跳转链接", required = false) @RequestParam(value = "bannerTypeUrl", required = false)String bannerTypeUrl, 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                            @ApiParam(name = "bannerSort", value = "排序", required = false) @RequestParam(value = "bannerSort", required = false)Integer bannerSort, 
															 | 
															
															 | 
															
																                            @ApiParam(name = "bannerSort", value = "排序", required = false) @RequestParam(value = "bannerSort", required = false)Integer bannerSort, 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                            @ApiParam(name = "bannerIsLine", value = "是否上线", required = false,defaultValue = "0") @RequestParam(value = "bannerIsLine", required = false)Integer bannerIsLine){ 
															 | 
															
															 | 
															
																                            @ApiParam(name = "bannerIsLine", value = "是否上线", required = false,defaultValue = "0") @RequestParam(value = "bannerIsLine", required = false)Integer bannerIsLine){ 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -85,7 +89,17 @@ public class ZjxlBannerCnotroller extends BaseController { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        banner.setBannerName(bannerName);//string 
															 | 
															
															 | 
															
																        banner.setBannerName(bannerName);//string 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        banner.setBannerSort(bannerSort); 
															 | 
															
															 | 
															
																        banner.setBannerSort(bannerSort); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        banner.setBannerType(bannerType); 
															 | 
															
															 | 
															
																        banner.setBannerType(bannerType); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        banner.setBannerTypeUrl(bannerTypeUrl); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        if (bannerType == 1){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            List<ZjxlArticleContent> articleContentList = articleContentService.findArticleContentById(bannerTypeUrl); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            JSONObject object = new JSONObject(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            object.put("articleContentId",articleContentList.get(0).getArticleContentId()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            object.put("articleContentType",articleContentList.get(0).getArticleContentType()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            object.put("articleContentClassify",articleContentList.get(0).getArticleContentClassify()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            object.put("articleContentSubclassify",articleContentList.get(0).getArticleContentSubclassify()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            banner.setBannerTypeUrl(object.toString()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        }else { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            banner.setBannerTypeUrl(bannerTypeUrl); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 
															 | 
															
															 | 
															
																        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        banner.setBannerCreateTime(df.format(new Date()));// new Date()为获取当前系统时间 
															 | 
															
															 | 
															
																        banner.setBannerCreateTime(df.format(new Date()));// new Date()为获取当前系统时间 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        try { 
															 | 
															
															 | 
															
																        try { 
															 |