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

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

@@ -7,6 +7,7 @@ import cn.stylefeng.guns.zjxlUtil.PageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -107,4 +108,55 @@ public class ZjxlArticleContentController extends BaseController {
            return write(-1,"修改上线失败");
        }
    }
    @RequestMapping(value = "/getLeftTabs", method = RequestMethod.GET)
    @ApiOperation(value = "根据每个内容类型获取对应的分类")
    public String getLeftTabs(@ApiParam(name = "articleContentType", value = "内容类型 1-产品与服务  2-公司案例  3-新闻中心  4-关于我们") @RequestParam(value = "articleContentType") String articleContentType){
        try {
            if (StringUtils.isEmpty(articleContentType)){
                logger.info("内容类型：articleContentType====="+articleContentType);
                return write(-1,"获取参数失败");
            }
            return write(200,"操作成功","data",articleContentService.getLeftTabs(articleContentType));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"操作失败");
        }
    }
    @RequestMapping(value = "/getArticleContentSubclassify", method = RequestMethod.GET)
    @ApiOperation(value = "根据每个分类获取对应的子分类")
    public String getArticleContentSubclassify(@ApiParam(name = "articleContentType", value = "内容类型 1-产品与服务  2-公司案例  3-新闻中心  4-关于我们") @RequestParam(value = "articleContentType") String articleContentType,
                                               @ApiParam(name = "articleContentClassify", value = "分类") @RequestParam(value = "articleContentClassify") String articleContentClassify){
        try {
            if (StringUtils.isEmpty(articleContentType) || StringUtils.isEmpty(articleContentClassify)){
                logger.info("内容类型：articleContentType====="+articleContentType);
                logger.info("分类：articleContentClassify====="+articleContentClassify);
                return write(-1,"获取参数失败");
            }
            return write(200,"操作成功","data",articleContentService.getArticleContentSubclassify(articleContentType,articleContentClassify));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"操作失败");
        }
    }
    @RequestMapping(value = "/getArticleContent", method = RequestMethod.GET)
    @ApiOperation(value = "根据子分类获取对应的文章(排序最高的文章)")
    public String getArticleContent(@ApiParam(name = "articleContentType", value = "内容类型 1-产品与服务  2-公司案例  3-新闻中心  4-关于我们") @RequestParam(value = "articleContentType") String articleContentType,
                                    @ApiParam(name = "articleContentClassify", value = "分类") @RequestParam(value = "articleContentClassify") String articleContentClassify,
                                    @ApiParam(name = "articleContentSubclassify", value = "子分类") @RequestParam(value = "articleContentSubclassify") String articleContentSubclassify){
        try {
            if (StringUtils.isEmpty(articleContentType) || StringUtils.isEmpty(articleContentClassify) || StringUtils.isEmpty(articleContentSubclassify)){
                logger.info("内容类型：articleContentType====="+articleContentType);
                logger.info("分类：articleContentClassify====="+articleContentClassify);
                logger.info("子分类：articleContentSubclassify====="+articleContentSubclassify);
                return write(-1,"获取参数失败");
            }
            return write(200,"操作成功","data",articleContentService.getArticleContent(articleContentType,articleContentClassify,articleContentSubclassify));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"操作失败");
        }
    }
}

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

@@ -0,0 +1,51 @@
package cn.stylefeng.guns.zjxl.cnotroller;
import cn.stylefeng.guns.zjxl.model.ZjxlCompanyCase;
import cn.stylefeng.guns.zjxl.model.ZjxlNewsCenter;
import cn.stylefeng.guns.zjxl.service.ZjxlNewsCenterService;
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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 java.util.List;
/***
 * @ClassName: ZjxlNewsCenterController
 * @Description:
 * @Auther: shi kejing
 * @Date: 2020/11/17 14:22
 */
@RestController
@Api(description = "公司官网主页-新闻中心列表页")
@RequestMapping(value = "/zjxl/newsCenter")
public class ZjxlNewsCenterController extends BaseController {
    private Logger logger = (Logger) LoggerFactory.getLogger(ZjxlCompanyCaseController.class);
    @Autowired
    private ZjxlNewsCenterService newsCenterService;
    @RequestMapping(value = "/findNewsCenterById", method = RequestMethod.GET)
    @ApiOperation(value = "查看CompanyCase")
    public String findNewsCenterById(@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 = "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<ZjxlNewsCenter> newsCenterList = newsCenterService.findById(id,pageNo-1,pageSize);
            return write(200,"查询成功","data", PageUtil.getPage(newsCenterList,pageNo,pageSize,newsCenterService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");
        }
    }
}

guns-main/src/main/java/cn/stylefeng/guns/zjxl/dao/ZjxlNewsCenterDao.java

@@ -0,0 +1,17 @@
package cn.stylefeng.guns.zjxl.dao;
import cn.stylefeng.guns.zjxl.model.ZjxlNewsCenter;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/***
 * @ClassName: ZjxlNewsCenterDao
 * @Description:
 * @Auther: shi kejing
 * @Date: 2020/11/17 14:17
 */
public interface ZjxlNewsCenterDao extends PagingAndSortingRepository<ZjxlNewsCenter, Long>, JpaSpecificationExecutor<ZjxlNewsCenter> {
}

guns-main/src/main/java/cn/stylefeng/guns/zjxl/model/ZjxlNewsCenter.java

@@ -0,0 +1,89 @@
package cn.stylefeng.guns.zjxl.model;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/***
 * @ClassName: ZjxlNewsCenter
 * @Description: 官网主页新闻中心
 * @Auther: shi kejing
 * @Date: 2020/11/17 14:13
 */
@Entity
@Table(name = "zjxl_news_center")
public class ZjxlNewsCenter {
    private String newsCenterId;
    private String newsCenterTitle;
    private String newsCenterAbstract;
    private String newsCenterContent;
    private String newsCenterImage;
    private String newsCenterUrl;
    private String newsCenterCreateTime;
    private String newsCenterSort;
    @Id
    public String getNewsCenterId() {
        return newsCenterId;
    }
    public void setNewsCenterId(String newsCenterId) {
        this.newsCenterId = newsCenterId;
    }
    public String getNewsCenterTitle() {
        return newsCenterTitle;
    }
    public void setNewsCenterTitle(String newsCenterTitle) {
        this.newsCenterTitle = newsCenterTitle;
    }
    public String getNewsCenterAbstract() {
        return newsCenterAbstract;
    }
    public void setNewsCenterAbstract(String newsCenterAbstract) {
        this.newsCenterAbstract = newsCenterAbstract;
    }
    public String getNewsCenterContent() {
        return newsCenterContent;
    }
    public void setNewsCenterContent(String newsCenterContent) {
        this.newsCenterContent = newsCenterContent;
    }
    public String getNewsCenterImage() {
        return newsCenterImage;
    }
    public void setNewsCenterImage(String newsCenterImage) {
        this.newsCenterImage = newsCenterImage;
    }
    public String getNewsCenterUrl() {
        return newsCenterUrl;
    }
    public void setNewsCenterUrl(String newsCenterUrl) {
        this.newsCenterUrl = newsCenterUrl;
    }
    public String getNewsCenterCreateTime() {
        return newsCenterCreateTime;
    }
    public void setNewsCenterCreateTime(String newsCenterCreateTime) {
        this.newsCenterCreateTime = newsCenterCreateTime;
    }
    public String getNewsCenterSort() {
        return newsCenterSort;
    }
    public void setNewsCenterSort(String newsCenterSort) {
        this.newsCenterSort = newsCenterSort;
    }
}

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

@@ -65,4 +65,22 @@ public class ZjxlArticleContentService extends BaseService {
        articleContentDao.updateByArticleContentId(id, isLine);
        return 1;
    }
    public List<ZjxlArticleContent> getLeftTabs(String articleContentType){
        String sql = "select * from zjxl_article_content where article_content_type = "+articleContentType+" group by article_content_classify,article_content_subclassify";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }
    public List<ZjxlArticleContent> getArticleContentSubclassify(String articleContentType,String articleContentClassify){
        String sql = "select * from zjxl_article_content where article_content_type = "+articleContentType+" and article_content_classify = '"+articleContentClassify+"' group by article_content_subclassify";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }
    public List<ZjxlArticleContent> getArticleContent(String articleContentType,String articleContentClassify,String articleContentSubclassify){
        String sql = "select * from zjxl_article_content where article_content_type = "+articleContentType+" and article_content_classify = '"+articleContentClassify+"' and article_content_subclassify = '"+articleContentSubclassify+"' order by article_content_sort desc limit 1";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }
}

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

@@ -0,0 +1,47 @@
package cn.stylefeng.guns.zjxl.service;
import cn.stylefeng.guns.zjxl.dao.ZjxlNewsCenterDao;
import cn.stylefeng.guns.zjxl.model.ZjxlCompanyCase;
import cn.stylefeng.guns.zjxl.model.ZjxlNewsCenter;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/***
 * @ClassName: ZjxlNewsCenterService
 * @Description:
 * @Auther: shi kejing
 * @Date: 2020/11/17 14:18
 */
@Component
@Transactional(rollbackFor = Exception.class)
public class ZjxlNewsCenterService {
    @Autowired
    JdbcTemplate jdbcTemplate;
    @Autowired
    private ZjxlNewsCenterDao newsCenterDao;
    public List<ZjxlNewsCenter> findById(String id, Integer page, Integer pagesize){
        String sql = "select a.* from zjxl_news_center a where 1=1";
        if (StringUtils.isNotEmpty(id)){
            sql += " and news_center_id = '"+id+"'";
        }
        sql += " order by news_center_sort desc limit "+page+" , "+pagesize+"";
        List<ZjxlNewsCenter> companyCaseList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlNewsCenter.class));
        return companyCaseList;
    }
    public int allCount(){
        String sql = "select count(*) from zjxl_news_center ";
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
        return allCount;
    }
}