文章内容管理和系统管理字典列表查询增加 类型字段

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

@@ -30,10 +30,11 @@ public class ZjxlArticleContentController extends BaseController {
    @ApiOperation(value = "查询文章管理列表")
    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 = "pagesize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pagesize", required = false) Integer pagesize){
        try {
            return write(200,"查询成功","data",articleContentService.findArticleContentById(id,articleContentTitle,page,pagesize));
            return write(200,"查询成功","data",articleContentService.findArticleContentById(id,articleContentTitle,systemDictType,page,pagesize));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");

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

@@ -30,10 +30,11 @@ public class ZjxlSystemDictController extends BaseController {
    @ApiOperation("查询系统管理字典")
    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 = "pagesize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pagesize", required = false) Integer pagesize){
        try {
            return write(200,"查询成功","data",systemDictService.findSystemDictById(id,page,pagesize));
            return write(200,"查询成功","data",systemDictService.findSystemDictById(id,systemDictType,page,pagesize));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");

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

@@ -28,7 +28,7 @@ public class ZjxlArticleContentService extends BaseService {
    @Autowired
    private ZjxlArticleContentDao articleContentDao;
    public List<ZjxlArticleContent> findArticleContentById(String id,String articleContentTitle,Integer page,Integer pagesiz){
    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+"'";
@@ -36,6 +36,9 @@ public class ZjxlArticleContentService extends BaseService {
        if (StringUtils.isNotEmpty(articleContentTitle)){
            sql += " and article_content_title like '%"+articleContentTitle+"%'";
        }
        if (systemDictType != null && systemDictType > 0){
            sql += " and article_content_type = "+systemDictType+"";
        }
        sql += " order by article_content_sort desc limit "+page+" , "+pagesiz+"";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;

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

@@ -33,11 +33,14 @@ public class ZjxlSystemDictService extends BaseService {
        return dict.getSystemDictId();
    }
    public List<ZjxlSystemDict> findSystemDictById(String id,Integer page,Integer pagesize){
    public List<ZjxlSystemDict> findSystemDictById(String id,Integer systemDictType,Integer page,Integer pagesize){
        String sql = "select * from zjxl_system_dict where 1=1 ";
        if (StringUtils.isNotEmpty(id)){
            sql += " and system_dict_id = '"+id+"'";
        }
        if (systemDictType != null && systemDictType > 0){
            sql += " and system_dict_type = "+systemDictType+"";
        }
        sql += " order by system_dict_sort desc limit "+page+" , "+pagesize+"";
        List<ZjxlSystemDict> systemDictList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlSystemDict.class));
        return systemDictList;