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

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

@@ -55,7 +55,7 @@ public class ZjxlArticleContentController extends BaseController {
                                         @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlArticleContent> articleContentList = articleContentService.findArticleContentById(id,articleContentTitle,systemDictType,(pageNo-1)*pageSize,pageSize*pageNo);
            return write(200,"查询成功","data", PageUtil.getPage(articleContentList,pageNo,pageSize,articleContentService.allCount()));
            return write(200,"查询成功","data", PageUtil.getPage(articleContentList,pageNo,pageSize,articleContentService.allCount(id,articleContentTitle,systemDictType)));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");
@@ -96,7 +96,13 @@ public class ZjxlArticleContentController extends BaseController {
            articleContent.setArticleContentSort(articleContentSort);
            articleContent.setArticleContentIsLine(articleContentIsLine);
            articleContent.setArticleContentContent(CodeFilter.unReplace(articleContentContent));
            String  dictId = systemDictService.findSystemDictByCondition(articleContentType,articleContentClassify,articleContentSubclassify);
            if(StringUtils.isNoneBlank(dictId)){
                articleContent.setDictId(dictId);
            }
            else{
                return write(-1,"系统分类不存在");
            }
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
            articleContent.setArticleContentCreateTime(df.format(new Date()));// new Date()为获取当前系统时间
@@ -170,19 +176,11 @@ public class ZjxlArticleContentController extends BaseController {
            }
            logger.info("内容类型：articleContentType====="+articleContentType);
            logger.info("分类：articleContentClassify====="+articleContentClassify);
            List<ZjxlArticleContent> list = articleContentService.getArticleContentSubclassify(articleContentType,articleContentClassify);
            List<ZjxlSystemDict> list = articleContentService.getArticleContentSubclassify(articleContentType,articleContentClassify);
            if (list.size() > 0){
                return write(200,"操作成功","data",list);
            }else {
                ZjxlArticleContent content = new ZjxlArticleContent();
                List<ZjxlSystemDict> systemDictList = systemDictService.findNewsTypeA(new Integer(articleContentType),articleContentClassify);
                if (systemDictList.size() > 0){
                    for (int i=0;i<systemDictList.size();i++){
                        content.setArticleContentSubclassify(systemDictList.get(i).getSystemDictSubclassify());
                        list.add(content);
                    }
                }
             return write(200,"操作成功","data",list);
             return write(-1,"当前暂无可用子分类","data",list);
            }
        }catch (Exception e){
            e.printStackTrace();
@@ -205,6 +203,7 @@ public class ZjxlArticleContentController extends BaseController {
            logger.info("内容类型：articleContentType====="+articleContentType);
            logger.info("分类：articleContentClassify====="+articleContentClassify);
            logger.info("子分类：articleContentSubclassify====="+articleContentSubclassify);
            return write(200,"操作成功","data",articleContentService.getArticleContent(articleContentType,articleContentClassify,articleContentSubclassify));
        }catch (Exception e){
            e.printStackTrace();
@@ -223,7 +222,7 @@ public class ZjxlArticleContentController extends BaseController {
                               @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlArticleContent> articleContentList = articleContentService.findNewsList(id,articleContentClassify,articleContentSubclassify,3,(pageNo-1)*pageSize,pageSize*pageNo);
            return write(200,"查询成功","data", PageUtil.getPage(articleContentList,pageNo,pageSize,articleContentService.allNewsCount(articleContentClassify,articleContentSubclassify)));
            return write(200,"查询成功","data", PageUtil.getPage(articleContentList,pageNo,pageSize,articleContentService.allNewsCount(id,articleContentClassify,articleContentSubclassify)));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");
@@ -264,6 +263,13 @@ public class ZjxlArticleContentController extends BaseController {
            zjxlArticleContent.setArticleContentSubclassify(articleContentSubclassify);
            zjxlArticleContent.setArticleContentSort(articleContentSort);
            zjxlArticleContent.setArticleContentIsLine(articleContentIsLine);
            String  dictId = systemDictService.findSystemDictByCondition(articleContentType,articleContentClassify,articleContentSubclassify);
            if(StringUtils.isNoneBlank(dictId)){
                zjxlArticleContent.setDictId(dictId);
            }
            else{
                return write(-1,"系统分类不存在");
            }
            JSONObject result = articleContentService.updateArticleAllInfo(zjxlArticleContent);
            if (result.getInteger("status")==-1){
                return write(-1,"修改失败");
@@ -276,4 +282,16 @@ public class ZjxlArticleContentController extends BaseController {
    }
    @RequestMapping(value = "updateArticleDictId",method = RequestMethod.POST)
    @ApiOperation("修改文章系统Id")
    public String updateArticleDictId(){
        try {
            return write(200,"修改成功","data",articleContentService.updateArticleDictId());
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"请求失败");
        }
    }
}

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

@@ -6,6 +6,8 @@ import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/***
 * @ClassName: ZjxlArticleContentDao
 * @Description:
@@ -24,4 +26,7 @@ public interface ZjxlArticleContentDao extends PagingAndSortingRepository<ZjxlAr
    @Query("select a from ZjxlArticleContent a where a.articleContentId=?1")
    ZjxlArticleContent findById(String articleContentId);
    @Query("select a from ZjxlArticleContent a")
    List<ZjxlArticleContent> findAll();
}

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

@@ -24,6 +24,10 @@ public class ZjxlArticleContent {
    private Integer articleContentIsLine;
    private String articleContentCreateTime;
    private String articleContentContent;
    private String dictId;
    public ZjxlArticleContent() {
    }
    @Id
    public String getArticleContentId() {
@@ -113,4 +117,12 @@ public class ZjxlArticleContent {
    public void setArticleContentContent(String articleContentContent) {
        this.articleContentContent = articleContentContent;
    }
    public String getDictId() {
        return dictId;
    }
    public void setDictId(String dictId) {
        this.dictId = dictId;
    }
}

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

@@ -2,6 +2,7 @@ package cn.stylefeng.guns.zjxl.service;
import cn.stylefeng.guns.zjxl.dao.ZjxlArticleContentDao;
import cn.stylefeng.guns.zjxl.model.ZjxlArticleContent;
import cn.stylefeng.guns.zjxl.model.ZjxlSystemDict;
import cn.stylefeng.guns.zjxlUtil.BaseService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -31,27 +32,45 @@ public class ZjxlArticleContentService extends BaseService {
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private ZjxlSystemDictService systemDictService;
    @Autowired
    private ZjxlArticleContentDao articleContentDao;
    public List<ZjxlArticleContent> findArticleContentById(String id,String articleContentTitle,Integer systemDictType,Integer page,Integer pagesiz){
        String sql = "select * from zjxl_article_content where 1=1 ";
        if (StringUtils.isNotEmpty(id)){
            sql += " and article_content_id = '"+id+"'";
        String sql = "select ac.article_content_id,ac.article_content_title,ac.article_content_cover,ac.article_content_abstract,\n" +
                "sd.system_dict_type article_content_type,sd.system_dict_classify article_content_classify,sd.system_dict_subclassify article_content_subclassify,\n" +
                "ac.article_content_sort,ac.article_content_is_line,ac.article_content_create_time,ac.article_content_content,ac.dict_id\n" +
                "from zjxl_article_content ac \n" +
                "LEFT JOIN zjxl_system_dict sd on ac.dict_id = sd.system_dict_id\n" +
                "where 1=1  ";
        if (StringUtils.isNoneBlank(id)){
            sql += " and ac.article_content_id = '"+id+"' ";
        }
        if (StringUtils.isNotEmpty(articleContentTitle)){
            sql += " and article_content_title like '%"+articleContentTitle+"%'";
        if (StringUtils.isNoneBlank(articleContentTitle)){
            sql += " and ac.article_content_title like '%"+articleContentTitle+"%' ";
        }
        if (systemDictType != null && systemDictType > 0){
            sql += " and article_content_type = "+systemDictType+"";
            sql += " and sd.system_dict_type = "+systemDictType+" ";
        }
        sql += " order by article_content_sort asc,article_content_create_time desc limit "+page+" , "+pagesiz+"";
        sql += " order by ac.article_content_sort asc,ac.article_content_create_time desc limit "+page+" , "+pagesiz+"";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }
    public int allCount(){
        String sql = "select count(*) from zjxl_article_content ";
    public int allCount(String id,String articleContentTitle,Integer systemDictType){
        String sql = "select count(*) from zjxl_article_content ac LEFT JOIN zjxl_system_dict sd on ac.dict_id = sd.system_dict_id\n" +
                "where 1=1 ";
        if (StringUtils.isNoneBlank(id)){
            sql += " and ac.article_content_id = '"+id+"' ";
        }
        if (StringUtils.isNoneBlank(articleContentTitle)){
            sql += " and ac.article_content_title like '%"+articleContentTitle+"%' ";
        }
        if (systemDictType != null && systemDictType > 0){
            sql += " and sd.system_dict_type = "+systemDictType+" ";
        }
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
        return allCount;
    }
@@ -72,54 +91,82 @@ public class ZjxlArticleContentService extends BaseService {
        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";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    public List<ZjxlSystemDict> getLeftTabs(String articleContentType){
        String sql = "select * from zjxl_system_dict where system_dict_type = "+articleContentType+" and system_dict_is_line='1' group by system_dict_classify";
        List<ZjxlSystemDict> zjxlSystemDictList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlSystemDict.class));
        return zjxlSystemDictList;
    }
    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<ZjxlSystemDict> getArticleContentSubclassify(String articleContentType,String articleContentClassify){
        String sql = "select * from zjxl_system_dict where system_dict_type = "+articleContentType+" and system_dict_classify = '"+articleContentClassify+"' and system_dict_is_line='1'  group by system_dict_subclassify";
        List<ZjxlSystemDict> zjxlsystemDictList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlSystemDict.class));
        return zjxlsystemDictList;
        //SELECT * FROM zjxl_system_dict WHERE system_dict_type = 4 AND system_dict_classify = '公司介绍分类4'
    }
    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 asc ,article_content_create_time desc limit 1";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        StringBuffer sql = new  StringBuffer("select ac.article_content_id,ac.article_content_title,ac.article_content_cover,ac.article_content_abstract,\n" +
                "sd.system_dict_type article_content_type,sd.system_dict_classify article_content_classify,sd.system_dict_subclassify article_content_subclassify,\n" +
                "ac.article_content_sort,ac.article_content_is_line,ac.article_content_create_time,ac.article_content_content,ac.dict_id\n" +
                "from zjxl_article_content ac \n" +
                "INNER  JOIN zjxl_system_dict sd on ac.dict_id = sd.system_dict_id\n" +
                "where 1=1  ");
        if (StringUtils.isNoneBlank(articleContentType)){
            sql.append("and sd.system_dict_type='"+articleContentType+"' ");
        }
        if (StringUtils.isNoneBlank(articleContentClassify)){
            sql.append("and sd.system_dict_classify ='"+articleContentClassify+"' ");
        }
        if (StringUtils.isNoneBlank(articleContentSubclassify)){
            sql.append("and sd.system_dict_subclassify='"+articleContentSubclassify+"' ");
        }
        sql.append("order by ac.article_content_sort asc ,ac.article_content_create_time desc limit 1");
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }
    public List<ZjxlArticleContent> findNewsList(String id,String articleContentClassify,String articleContentSubclassify,Integer systemDictType,Integer page,Integer pagesiz){
        String sql = "select * from zjxl_article_content where 1=1 ";
        if (StringUtils.isNotEmpty(id)){
            sql += " and article_content_id = '"+id+"'";
        StringBuffer sql =new StringBuffer("select ac.article_content_id,ac.article_content_title,ac.article_content_cover,ac.article_content_abstract,\n" +
                "sd.system_dict_type article_content_type,sd.system_dict_classify article_content_classify,sd.system_dict_subclassify article_content_subclassify,\n" +
                "ac.article_content_sort,ac.article_content_is_line,ac.article_content_create_time,ac.article_content_content,ac.dict_id\n" +
                "from zjxl_article_content ac \n" +
                "INNER JOIN zjxl_system_dict sd on ac.dict_id = sd.system_dict_id\n" +
                "where 1=1 and ac.article_content_is_line = 1 and sd.system_dict_is_line =1 ") ;
        if (StringUtils.isNoneBlank(id)){
            sql.append(" and ac.article_content_id = '"+id+"' ") ;
        }
        if (StringUtils.isNotEmpty(articleContentClassify)){
            sql += " and article_content_classify = '"+articleContentClassify+"'";
        if (StringUtils.isNoneBlank(articleContentClassify)){
            sql.append(" and sd.system_dict_classify = '"+articleContentClassify+"' ");
        }
        if (StringUtils.isNotEmpty(articleContentSubclassify)){
            sql += " and article_content_subclassify = '"+articleContentSubclassify+"'";
        if (StringUtils.isNoneBlank(articleContentSubclassify)){
            sql.append(" and sd.system_dict_subclassify = '"+articleContentSubclassify+"' ");
        }
        if (systemDictType != null && systemDictType > 0){
            sql += " and article_content_type = "+systemDictType+"";
            sql.append(" and sd.system_dict_type = "+systemDictType+" ");
        }
        sql += " order by article_content_is_line desc,article_content_sort asc,article_content_create_time desc limit "+page+" , "+pagesiz+"";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        sql.append("ORDER BY ac.article_content_sort asc,ac.article_content_create_time desc limit "+page+" , "+pagesiz+" ");
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }
    public int allNewsCount(String articleContentClassify,String articleContentSubclassify){
        String sql = "select count(*) from zjxl_article_content where article_content_type = 3 ";
        if (StringUtils.isNotEmpty(articleContentClassify)){
            sql += " and article_content_classify = '"+articleContentClassify+"'";
    public int allNewsCount(String id,String articleContentClassify,String articleContentSubclassify){
        StringBuffer sql = new StringBuffer("\n" +
                "select count(1)\n" +
                "from zjxl_article_content ac \n" +
                "INNER JOIN zjxl_system_dict sd on ac.dict_id = sd.system_dict_id\n" +
                "where 1=1 and ac.article_content_is_line = 1 and sd.system_dict_is_line =1 and sd.system_dict_type = '3' ");
        if (StringUtils.isNoneBlank(id)){
            sql.append(" and ac.article_content_id = '"+id+"' ") ;
        }
        if (StringUtils.isNotEmpty(articleContentSubclassify)){
            sql += " and article_content_subclassify = '"+articleContentSubclassify+"'";
        if (StringUtils.isNoneBlank(articleContentClassify)){
            sql.append(" and sd.system_dict_classify = '"+articleContentClassify+"' ");
        }
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
        if (StringUtils.isNoneBlank(articleContentSubclassify)){
            sql.append(" and sd.system_dict_subclassify = '"+articleContentSubclassify+"' ");
        }
        Integer allCount = jdbcTemplate.queryForObject(sql.toString(), Integer.class);;
        return allCount;
    }
@@ -130,12 +177,17 @@ public class ZjxlArticleContentService extends BaseService {
    }
    public List<ZjxlArticleContent> findArticleAll(String articleContentType){
        String sql = "select * from zjxl_article_content where article_content_is_line = 1";
        StringBuffer sql = new StringBuffer("select ac.article_content_id,ac.article_content_title,ac.article_content_cover,ac.article_content_abstract,\n" +
                "sd.system_dict_type article_content_type,sd.system_dict_classify article_content_classify,sd.system_dict_subclassify article_content_subclassify,\n" +
                "ac.article_content_sort,ac.article_content_is_line,ac.article_content_create_time,ac.article_content_content,ac.dict_id\n" +
                "from zjxl_article_content ac \n" +
                "LEFT JOIN zjxl_system_dict sd on ac.dict_id = sd.system_dict_id\n" +
                "where 1=1 and ac.article_content_is_line = 1 and sd.system_dict_is_line =1 ");
        if (StringUtils.isNotEmpty(articleContentType)){
            sql += " and article_content_type = '"+articleContentType+"'";
            sql.append("and sd.system_dict_type ='"+articleContentType+"' ");
        }
        sql += " order by article_content_sort asc ,article_content_create_time desc ";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        sql.append("ORDER BY ac.article_content_sort asc,ac.article_content_create_time,sd.system_dict_subclassify desc ");
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }
@@ -155,4 +207,15 @@ public class ZjxlArticleContentService extends BaseService {
        return result;
    }
    public String updateArticleDictId(){
       List<ZjxlArticleContent> list = articleContentDao.findAll();
       list.forEach(article->{
           String  dictId = systemDictService.findSystemDictByCondition(article.getArticleContentType(),article.getArticleContentClassify(),article.getArticleContentSubclassify());
           article.setDictId(StringUtils.isBlank(dictId)?"":dictId);
           articleContentDao.save(article);
       });
       return null;
    }
}

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

@@ -51,6 +51,19 @@ public class ZjxlSystemDictService extends BaseService {
        return articleContentList;
    }
    public String findSystemDictByCondition(Integer systemDictType,String systemDictClassify,String systemDictSubclassify){
        String sql = "select system_dict_id from zjxl_system_dict where  system_dict_type ='"+systemDictType+"' " +
                "and system_dict_classify ='"+systemDictClassify+"' " +
                "and system_dict_subclassify = '"+systemDictSubclassify+"' ";
        String  articleContentList;
        try {
            articleContentList= jdbcTemplate.queryForObject(sql, String.class);
        }catch (Exception e){
            articleContentList ="";
        }
        return articleContentList;
    }
    public int findSystemDictExistByCondition(String id,Integer systemDictType,String systemDictClassify,String systemDictSubclassify){
        StringBuffer sql = new StringBuffer("select count(1) from zjxl_system_dict where 1=1 ");