Merge branch 'master' of http://192.168.1.220:10080/Amoy2/guns-separation

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

@@ -54,7 +54,7 @@ public class ZjxlArticleContentController extends BaseController {
                                         @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,pageNo-1,pageSize);
            List<ZjxlArticleContent> articleContentList = articleContentService.findArticleContentById(id,articleContentTitle,systemDictType,pageNo-1,pageSize*pageNo);
            return write(200,"查询成功","data", PageUtil.getPage(articleContentList,pageNo,pageSize,articleContentService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
@@ -222,7 +222,7 @@ public class ZjxlArticleContentController extends BaseController {
                               @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.findNewsList(id,articleContentClassify,articleContentSubclassify,3,pageNo-1,pageSize);
            List<ZjxlArticleContent> articleContentList = articleContentService.findNewsList(id,articleContentClassify,articleContentSubclassify,3,pageNo-1,pageSize*pageNo);
            return write(200,"查询成功","data", PageUtil.getPage(articleContentList,pageNo,pageSize,articleContentService.allNewsCount(articleContentClassify,articleContentSubclassify)));
        }catch (Exception e){
            e.printStackTrace();

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

@@ -70,7 +70,7 @@ public class ZjxlBannerCnotroller extends BaseController {
                                 @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,pageNo-1,pageSize);
            List<ZjxlBanner> banner = bannerService.findById(id,name,pageNo-1,pageSize*pageNo);
            return write(200,"查询成功","data",PageUtil.getPage(banner,pageNo,pageSize,bannerService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
@@ -198,7 +198,7 @@ public class ZjxlBannerCnotroller extends BaseController {
        if (bannerSort != null){
            banner.setBannerSort(bannerSort);
        }
        List<ZjxlBanner> bannerList = bannerService.findBannerAll();
        List<ZjxlBanner> bannerList = bannerService.findBannerAllByCondition(bannerId);
        if (bannerList.size() > 0){
            Iterator<ZjxlBanner> bannerIterator = bannerList.iterator();
            while (bannerIterator.hasNext()){
@@ -280,7 +280,7 @@ public class ZjxlBannerCnotroller extends BaseController {
                                 @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                 @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "1") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            return write(200,"查询成功","data",bannerService.findBannerByIsOnLine(pageNo-1,pageSize));
            return write(200,"查询成功","data",bannerService.findBannerByIsOnLine(pageNo-1,pageSize*pageNo));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败");

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

@@ -48,11 +48,12 @@ 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 = "lineStatus", value = "上线状态0 不上线 1上线 ", required = false) @RequestParam(value = "lineStatus", defaultValue ="",required = false)String lineStatus,
                                      @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,pageNo-1,pageSize);
            return write(200,"查询成功","data", PageUtil.getPage(companyCaseList,pageNo,pageSize,companyCaseService.allCount()));
            List<ZjxlCompanyCase> companyCaseList = companyCaseService.findById(id,name,lineStatus,pageNo-1,pageSize*pageNo);
            return write(200,"查询成功","data", PageUtil.getPage(companyCaseList,pageNo,pageSize,companyCaseService.allCount(id,name,lineStatus)));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");

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

@@ -41,7 +41,7 @@ public class ZjxlNewsCenterController extends BaseController {
                                      @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);
            List<ZjxlNewsCenter> newsCenterList = newsCenterService.findById(id,pageNo-1,pageSize*pageNo);
            return write(200,"查询成功","data", PageUtil.getPage(newsCenterList,pageNo,pageSize,newsCenterService.allCount()));
        }catch (Exception e){
            e.printStackTrace();

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

@@ -44,7 +44,7 @@ public class ZjxlPartnerController extends BaseController {
            @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,pageNo-1,pageSize);
            List<ZjxlPartner> partnerList = partnerService.findPartenrById(id,name,pageNo-1,pageSize*pageNo);
            return write(200,"查询成功", "data", PageUtil.getPage(partnerList,pageNo,pageSize,partnerService.allCount()));
        }catch (Exception e){
            e.printStackTrace();

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

@@ -44,8 +44,8 @@ public class ZjxlSystemDictController extends BaseController {
                                                 @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,pageNo-1,pageSize);
            return write(200,"查询成功","data", PageUtil.getPage(systemDictList,pageNo,pageSize,systemDictService.allCount()));
            List<ZjxlSystemDict> systemDictList = systemDictService.findSystemDictById(id,systemDictType,pageNo-1,pageSize*pageNo);
            return write(200,"查询成功","data", PageUtil.getPage(systemDictList,pageNo,pageSize,systemDictService.allCount(systemDictType+"")));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");

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

@@ -45,7 +45,7 @@ public class ZjxlArticleContentService extends BaseService {
        if (systemDictType != null && systemDictType > 0){
            sql += " and article_content_type = "+systemDictType+"";
        }
        sql += " order by concat(article_content_sort,article_content_create_time) desc limit "+page+" , "+pagesiz+"";
        sql += " order by article_content_sort asc,article_content_create_time desc limit "+page+" , "+pagesiz+"";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }
@@ -86,7 +86,7 @@ public class ZjxlArticleContentService extends BaseService {
    }
    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 concat(article_content_sort,article_content_create_time) desc limit 1";
        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));
        return articleContentList;
    }
@@ -106,7 +106,7 @@ public class ZjxlArticleContentService extends BaseService {
        if (systemDictType != null && systemDictType > 0){
            sql += " and article_content_type = "+systemDictType+"";
        }
        sql += " order by concat(article_content_sort,article_content_create_time) desc limit "+page+" , "+pagesiz+"";
        sql += " order by article_content_sort asc,article_content_create_time desc limit "+page+" , "+pagesiz+"";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }
@@ -134,7 +134,7 @@ public class ZjxlArticleContentService extends BaseService {
        if (StringUtils.isNotEmpty(articleContentType)){
            sql += " and article_content_type = '"+articleContentType+"'";
        }
        sql += " order by concat(article_content_sort,article_content_create_time) desc ";
        sql += " order by article_content_sort asc ,article_content_create_time desc ";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }

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

@@ -43,13 +43,13 @@ public class ZjxlBannerService extends BaseService {
        if (StringUtils.isNotEmpty(name)){
            sql += " AND banner_name LIKE '%"+name+"%'";
        }
        sql += " and banner_is_line = 1 ORDER BY concat(banner_sort,banner_create_time) DESC LIMIT "+page+" , "+pagesize+" ";
        sql += " ORDER BY banner_sort asc ,banner_create_time DESC LIMIT "+page+" , "+pagesize+" ";
        List<ZjxlBanner> bannerList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ZjxlBanner.class));
       return bannerList;
    }
    public int allCount(){
        String sql = "select count(*) from zjxl_banner where banner_is_line = 1 ";
        String sql = "select count(*) from zjxl_banner ";
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
        return allCount;
    }
@@ -98,7 +98,7 @@ public class ZjxlBannerService extends BaseService {
    public List<ZjxlBanner> findBannerByIsOnLine(Integer page,Integer pagesize){
        String sql = "SELECT * FROM `guns-separation`.zjxl_banner WHERE banner_is_line=1";
        sql += " ORDER BY concat(banner_sort,banner_create_time) DESC  ";
        sql += " ORDER BY banner_sort asc,banner_create_time DESC  ";
        List<ZjxlBanner> bannerList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ZjxlBanner.class));
        return bannerList;
    }
@@ -115,8 +115,14 @@ public class ZjxlBannerService extends BaseService {
        return bannerList;
    }
    public List<ZjxlBanner> findBannerAllByCondition(String bannerId){
        String sql = "SELECT * FROM `guns-separation`.zjxl_banner WHERE banner_is_line=1 and  banner_id <>'"+bannerId+"' ";
        List<ZjxlBanner> bannerList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ZjxlBanner.class));
        return bannerList;
    }
    public List<ZjxlBanner> findByIsLine(){
        String sql = "SELECT * FROM `guns-separation`.zjxl_banner WHERE  banner_is_line = 1 ORDER BY concat(banner_sort,banner_create_time) DESC";
        String sql = "SELECT * FROM `guns-separation`.zjxl_banner WHERE  banner_is_line = 1 ORDER BY banner_sort asc,banner_create_time DESC";
        List<ZjxlBanner> bannerList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ZjxlBanner.class));
        return bannerList;
    }

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

@@ -29,7 +29,7 @@ public class ZjxlCompanyCaseService extends BaseService {
    @Autowired
    JdbcTemplate jdbcTemplate;
    public List<ZjxlCompanyCase> findById(String id, String name, Integer page, Integer pagesize){
    public List<ZjxlCompanyCase> findById(String id, String name,String lineStatus,Integer page, Integer pagesize){
        String sql = "select a.* from zjxl_company_case a where 1=1";
        if (StringUtils.isNotEmpty(id)){
            sql += " and company_id = '"+id+"'";
@@ -37,13 +37,25 @@ public class ZjxlCompanyCaseService extends BaseService {
        if (StringUtils.isNotEmpty(name)){
            sql += " and company_name like '%"+name+"%'";
        }
        sql += " order by concat(company_sort,company_create_time) desc limit "+page+" , "+pagesize+"";
        if (StringUtils.isNoneBlank(lineStatus)){
            sql += " and company_is_line ='"+lineStatus+"' ";
        }
        sql += " order by company_sort asc,company_create_time DESC limit "+page+" , "+pagesize+"";
        List<ZjxlCompanyCase> companyCaseList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlCompanyCase.class));
        return companyCaseList;
    }
    public int allCount(){
        String sql = "select count(*) from zjxl_company_case ";
    public int allCount(String id, String name,String lineStatus){
        String sql = "select count(*) from zjxl_company_case a where 1=1";
        if (StringUtils.isNotEmpty(id)){
            sql += " and company_id = '"+id+"'";
        }
        if (StringUtils.isNotEmpty(name)){
            sql += " and company_name like '%"+name+"%'";
        }
        if (StringUtils.isNoneBlank(lineStatus)){
            sql += " and company_is_line ='"+lineStatus+"' ";
        }
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
        return allCount;
    }

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

@@ -33,7 +33,7 @@ public class ZjxlNewsCenterService {
        if (StringUtils.isNotEmpty(id)){
            sql += " and news_center_id = '"+id+"'";
        }
        sql += " order by news_center_sort desc limit "+page+" , "+pagesize+"";
        sql += " order by news_center_sort asc limit "+page+" , "+pagesize+"";
        List<ZjxlNewsCenter> companyCaseList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlNewsCenter.class));
        return companyCaseList;
    }

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

@@ -37,13 +37,13 @@ public class ZjxlPartnerService extends BaseService {
        if (StringUtils.isNotEmpty(name)){
            sql += " and partner_name like '%"+name+"%'";
        }
        sql += " order by concat(partner_sort,partner_create_time) desc limit "+page+" , "+pagesize+"";
        sql += " order by partner_sort asc,partner_create_time desc limit "+page+" , "+pagesize+"";
        List<ZjxlPartner> partnerList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlPartner.class));
        return partnerList;
    }
    public List<ZjxlPartner> findPartenrAll(){
        String sql = "select * from zjxl_partner where partner_is_line = 1 order by concat(partner_sort,partner_create_time) desc";
        String sql = "select * from zjxl_partner where partner_is_line = 1 order by partner_sort asc,partner_create_time desc ";
        List<ZjxlPartner> partnerList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlPartner.class));
        return partnerList;
    }

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

@@ -51,6 +51,24 @@ public class ZjxlSystemDictService extends BaseService {
        return articleContentList;
    }
    public int findSystemDictClassifyByCondition(String systemDictClassify,String dictId){
        String sql = "select count(1) from zjxl_system_dict where system_dict_classify = '"+systemDictClassify+"' ";
        if (StringUtils.isNoneBlank(dictId)){
            sql +="and system_dict_id <>'"+dictId+"' ";
        }
        Integer articleContentList = jdbcTemplate.queryForObject(sql, Integer.class);
        return articleContentList;
    }
    public int findSystemDictSubclassifyByCondition(String systemDictSubclassify,String dictId){
        String sql = "select count(1) from zjxl_system_dict where system_dict_subclassify = '"+systemDictSubclassify+"' ";
        if (StringUtils.isNoneBlank(dictId)){
            sql +="and system_dict_id <>'"+dictId+"' ";
        }
        Integer articleContentList = jdbcTemplate.queryForObject(sql, Integer.class);
        return articleContentList;
    }
    public List<ZjxlSystemDict> findSystemDictById(String id,Integer systemDictType,Integer page,Integer pagesize){
        String sql = "select * from zjxl_system_dict where 1=1 ";
@@ -60,13 +78,16 @@ public class ZjxlSystemDictService extends BaseService {
        if (systemDictType != null && systemDictType > 0){
            sql += " and system_dict_type = "+systemDictType+"";
        }
        sql += " order by concat(system_dict_sort,system_dict_create_time) desc limit "+page+" , "+pagesize+"";
        sql += " order by system_dict_sort asc,system_dict_create_time desc limit "+page+" , "+pagesize+"";
        List<ZjxlSystemDict> systemDictList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlSystemDict.class));
        return systemDictList;
    }
    public int allCount(){
    public int allCount(String systemDictType){
        String sql = "select count(*) from zjxl_system_dict ";
        if (StringUtils.isNoneBlank(systemDictType)){
            sql +="where  system_dict_type ='"+systemDictType+"'";
        }
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
        return allCount;
    }
@@ -87,7 +108,7 @@ public class ZjxlSystemDictService extends BaseService {
        if (systemDictType != null && systemDictType > 0){
            sql += " and system_dict_type = "+systemDictType+"";
        }
        sql += " group by system_dict_classify ";
        sql += " and system_dict_is_line ='1' group by system_dict_classify ";
        List<ZjxlSystemDict> systemDictList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlSystemDict.class));
        return systemDictList;
    }
@@ -97,16 +118,19 @@ public class ZjxlSystemDictService extends BaseService {
        ZjxlSystemDict zjxlSystemDict = systemDictDao.findBySystemDictId(systemDictId);
        if (zjxlSystemDict ==null){
            result.put("status",-1);
            return result;
        }
        int systemDictClassifyList = findSystemDictClassify(systemDictClassify);
        int systemDictClassifyList = findSystemDictClassifyByCondition(systemDictClassify,systemDictId);
        //查询子分类是否存在
        int systemDictSubclassifyList = findSystemDictSubclassify(systemDictSubclassify);
        int systemDictSubclassifyList = findSystemDictSubclassifyByCondition(systemDictSubclassify,systemDictId);
        if (systemDictClassifyList>0&&systemDictSubclassifyList>0){
            result.put("status",0);
            return result;
        }
        else{
            if (StringUtils.isBlank(systemDictClassify)||StringUtils.isBlank(systemDictSubclassify)){
                result.put("status",-2);
                return result;
            }
            else{
                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式

guns-main/src/main/resources/application-prod.yml

@@ -1,10 +1,11 @@
# Mysql数据库
spring:
  profiles: prod
  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://172.26.0.104/guns-separation?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT
    username: ssgg
    password: ssgg@jkzl2019
    url: jdbc:mysql://172.26.0.114:3306/guns-separation?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT
    username: root
    password: jkzlehr
    # 连接池大小根据实际情况调整
    max-active: 20
    max-pool-prepared-statement-per-connection-size: 20