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

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

@@ -68,7 +68,7 @@ public class ZjxlArticleContentController extends BaseController {
        try {
            ZjxlArticleContent articleContent = new ZjxlArticleContent();
            List<ZjxlArticleContent> list = articleContentService.findArticleAll();
            List<ZjxlArticleContent> list = articleContentService.findArticleAll(null);
            if (list.size() > 0){
                Iterator<ZjxlArticleContent> iterator = list.iterator();
                while (iterator.hasNext()){
@@ -209,9 +209,9 @@ public class ZjxlArticleContentController extends BaseController {
    @RequestMapping(value = "/findArticleAll", method = RequestMethod.GET)
    @ApiOperation(value = "获取所有文章")
    public String findArticleAll(){
    public String findArticleAll(@ApiParam(name = "articleContentType", value = "子分类") @RequestParam(value = "articleContentType", required = false) String articleContentType){
        try {
            return write(200,"查询成功","data", articleContentService.findArticleAll());
            return write(200,"查询成功","data", articleContentService.findArticleAll(articleContentType));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");

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

@@ -6,6 +6,7 @@ import cn.stylefeng.guns.zjxlUtil.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -53,4 +54,15 @@ public class ZjxlBasicInfoController extends BaseController {
            return write(-1,"编辑失败");
        }
    }
    @RequestMapping(value = "/findBasicInfo", method = RequestMethod.GET)
    @ApiOperation(value = "查看 基本信息")
    public String findBasicInfo(String basicInfoId){
        try {
            return write(200,"查看成功","data",basicInfoService.findBasicInfo(basicInfoId));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查看失败");
        }
    }
}

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

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
/***
@@ -39,6 +41,8 @@ public class ZjxlCompanyCaseController extends BaseController {
    private ZjxlCompanyCaseService companyCaseService;
    @Autowired
    private ZjxlArticleContentService articleContentService;
    @Value("${article.id_url}")
    private String idUrl;
    @RequestMapping(value = "/findCompanyCaseById", method = RequestMethod.GET)
    @ApiOperation(value = "查看CompanyCase")
@@ -69,11 +73,21 @@ public class ZjxlCompanyCaseController extends BaseController {
            @ApiParam(name = "companyTestBannerId", value = "测试用字段", required = false, defaultValue = "1") @RequestParam(value = "companyTestBannerId", required = false)String companyTestBannerId){
        try {
            ZjxlCompanyCase companyCase = new ZjxlCompanyCase();
            List<ZjxlCompanyCase> companyCases = companyCaseService.findAll();
            Iterator iterator = companyCases.iterator();
            while (iterator.hasNext()){
                if (companyName.equals(iterator.next())){
                    return write(-1,"该案例名称已存在");
                }
            }
            companyCase.setCompanyName(companyName);
            companyCase.setCompanyDescribe(companyDescribe);
            companyCase.setCompanyDefaultImg(companyDefaultImg);
            companyCase.setCompanyExchangeImg(companyExchangeImg);
            companyCase.setCompanyJumpUrl(companyJumpUrl);
            //http://172.26.0.30:8080/zjxl/zjxlArticleContent/findArticleContentById?articleContentTitle=&id=1&pageNo=1&pageSize=10&systemDictType=
            companyCase.setCompanyJumpUrl(idUrl+"id="+companyJumpUrl+"");
            companyCase.setCompanySort(companySort);
            companyCase.setCompanyIsLine(companyIsLine);
            companyCase.setCompanyTestBannerId(companyTestBannerId);
@@ -130,4 +144,59 @@ public class ZjxlCompanyCaseController extends BaseController {
            return write(-1,"修改失败");
        }
    }
    @RequestMapping(value = "/updateCompanyCase", method = RequestMethod.POST)
    @ApiOperation(value = "编辑公司案例")
    public String updateCompanyCase(
            @ApiParam(name = "companyId", value = "案例id", required = false) @RequestParam(value = "companyId", required = false)String companyId,
            @ApiParam(name = "companyName", value = "案例名称", required = false) @RequestParam(value = "companyName", required = false)String companyName,
            @ApiParam(name = "companyDescribe", value = "案例描述", required = false) @RequestParam(value = "companyDescribe", required = false)String companyDescribe,
            @ApiParam(name = "companyDefaultImg", value = "默认图片", required = false) @RequestParam(value = "companyDefaultImg", required = false)String companyDefaultImg,
            @ApiParam(name = "companyExchangeImg", value = "交互图片", required = false) @RequestParam(value = "companyExchangeImg", required = false)String companyExchangeImg,
            @ApiParam(name = "companyAssociatedCase", value = "关联案例(对应的文章id)", required = false) @RequestParam(value = "companyAssociatedCase", required = false)String companyAssociatedCase,
            @ApiParam(name = "companyJumpUrl", value = "跳转链接", required = false) @RequestParam(value = "companyJumpUrl", required = false)String companyJumpUrl,
            @ApiParam(name = "companySort", value = "排序", required = false) @RequestParam(value = "companySort", required = false)Integer companySort,
            @ApiParam(name = "companyIsLine", value = "是否上线", required = false, defaultValue = "0") @RequestParam(value = "companyIsLine", required = false)Integer companyIsLine,
            @ApiParam(name = "companyTestBannerId", value = "测试用字段", required = false, defaultValue = "1") @RequestParam(value = "companyTestBannerId", required = false)String companyTestBannerId){
        try {
            ZjxlCompanyCase companyCase = new ZjxlCompanyCase();
            companyCase.setCompanyId(companyId);
            List<ZjxlCompanyCase> companyCases = companyCaseService.findAll();
            Iterator iterator = companyCases.iterator();
            while (iterator.hasNext()){
                if (companyName.equals(iterator.next())){
                    return write(-1,"该案例名称已存在");
                }
            }
            companyCase.setCompanyName(companyName);
            companyCase.setCompanyDescribe(companyDescribe);
            companyCase.setCompanyDefaultImg(companyDefaultImg);
            companyCase.setCompanyExchangeImg(companyExchangeImg);
            //http://172.26.0.30:8080/zjxl/zjxlArticleContent/findArticleContentById?articleContentTitle=&id=1&pageNo=1&pageSize=10&systemDictType=
            companyCase.setCompanyJumpUrl(idUrl+"id="+companyJumpUrl+"");
            companyCase.setCompanySort(companySort);
            companyCase.setCompanyIsLine(companyIsLine);
            companyCase.setCompanyTestBannerId(companyTestBannerId);
            List<ZjxlArticleContent> caseA = articleContentService.findArticleContentById(companyAssociatedCase);
            if (caseA.size()>0){
                JSONObject object = new JSONObject();
                object.put("articleContentId",caseA.get(0).getArticleContentId());
                object.put("articleContentType",caseA.get(0).getArticleContentType());
                object.put("articleContentClassify",caseA.get(0).getArticleContentClassify());
                object.put("articleContentSubclassify",caseA.get(0).getArticleContentSubclassify());
                object.put("articleContentTitle",caseA.get(0).getArticleContentTitle());
                companyCase.setCompanyAssociatedCase(object.toString());
            }else {
                return write(-1,"添加案例不存在");
            }
            return write(200,"编辑成功","data",companyCaseService.updateCompanyCase(companyCase));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"编辑失败");
        }
    }
}

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
/***
@@ -59,6 +60,15 @@ public class ZjxlPartnerController extends BaseController {
                             @ApiParam(name = "partnerIsLine", value = "是否上线", required = false, defaultValue = "0") @RequestParam(value = "partnerIsLine", required = false)Integer partnerIsLine){
        try {
            ZjxlPartner partner = new ZjxlPartner();
            List<ZjxlPartner> partners = partnerService.findAll();
            Iterator iterator = partners.iterator();
            while (iterator.hasNext()){
                if (partnerName.equals(iterator.next())){
                    return write(-1,"该合作伙伴已存在");
                }
            }
            partner.setPartnerName(partnerName);
            partner.setPartnerImg(partnerImg);
            partner.setPartnerSort(partnerSort);
@@ -103,4 +113,36 @@ public class ZjxlPartnerController extends BaseController {
            return write(-1,"删除失败");
        }
    }
    @RequestMapping(value = "/updatePartenr", method = RequestMethod.POST)
    @ApiOperation(value = "编辑合作伙伴")
    public String updatePartenr(@ApiParam(name = "partnerId", value = "合作伙伴id", required = false) @RequestParam(value = "partnerId", required = false)String partnerId,
                                @ApiParam(name = "partnerName", value = "合作伙伴名称", required = false) @RequestParam(value = "partnerName", required = false)String partnerName,
                                @ApiParam(name = "partnerImg", value = "合作伙伴图片", required = false) @RequestParam(value = "partnerImg", required = false)String partnerImg,
                                @ApiParam(name = "partnerSort", value = "排序", required = false) @RequestParam(value = "partnerSort", required = false)Integer partnerSort,
                                @ApiParam(name = "partnerIsLine", value = "是否上线", required = false, defaultValue = "0") @RequestParam(value = "partnerIsLine", required = false)Integer partnerIsLine){
        try {
            ZjxlPartner partner = new ZjxlPartner();
            partner.setPartnerId(partnerId);
            List<ZjxlPartner> partners = partnerService.findAll();
            Iterator iterator = partners.iterator();
            while (iterator.hasNext()){
                if (partnerName.equals(iterator.next())){
                    return write(-1,"该合作伙伴已存在");
                }
            }
            partner.setPartnerName(partnerName);
            partner.setPartnerImg(partnerImg);
            partner.setPartnerSort(partnerSort);
            partner.setPartnerIsLine(partnerIsLine);
            return write(200,"添加成功","data",partnerService.updatePartenr(partner));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"添加失败");
        }
    }
}

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

@@ -1,5 +1,6 @@
package cn.stylefeng.guns.zjxl.dao;
import cn.stylefeng.guns.zjxl.model.ZjxlBanner;
import cn.stylefeng.guns.zjxl.model.ZjxlBasicInfo;
import cn.stylefeng.guns.zjxl.model.ZjxlPartner;
import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter;
@@ -24,4 +25,7 @@ public interface ZjxlBasicInfoDao extends PagingAndSortingRepository<ZjxlBasicIn
    @Query("delete from ZjxlBasicInfo p where p.basicInfoId = ?1")
    int deleteById(String id);
    @Query("select p from ZjxlBasicInfo p where p.basicInfoId = ?1")
    ZjxlBasicInfo findById(String id);
}

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

@@ -28,9 +28,9 @@ public class ZjxlCompanyCase {
    private String companyJumpUrl;
    private int companySort;
    private Integer companySort;
    private int companyIsLine;
    private Integer companyIsLine;
    private String companyTestBannerId;
@@ -93,19 +93,19 @@ public class ZjxlCompanyCase {
        this.companyJumpUrl = companyJumpUrl;
    }
    public int getCompanySort() {
    public Integer getCompanySort() {
        return companySort;
    }
    public void setCompanySort(int companySort) {
    public void setCompanySort(Integer companySort) {
        this.companySort = companySort;
    }
    public int getCompanyIsLine() {
    public Integer getCompanyIsLine() {
        return companyIsLine;
    }
    public void setCompanyIsLine(int companyIsLine) {
    public void setCompanyIsLine(Integer companyIsLine) {
        this.companyIsLine = companyIsLine;
    }

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

@@ -3,12 +3,14 @@ package cn.stylefeng.guns.zjxl.service;
import cn.stylefeng.guns.zjxl.dao.ZjxlArticleContentDao;
import cn.stylefeng.guns.zjxl.model.ZjxlArticleContent;
import cn.stylefeng.guns.zjxlUtil.BaseService;
import io.swagger.annotations.ApiParam;
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 org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -122,8 +124,11 @@ public class ZjxlArticleContentService extends BaseService {
        return articleContentList;
    }
    public List<ZjxlArticleContent> findArticleAll(){
    public List<ZjxlArticleContent> findArticleAll(String articleContentType){
        String sql = "select * from zjxl_article_content where article_content_is_line = 1";
        if (StringUtils.isNotEmpty(articleContentType)){
            sql += " and article_content_type = '"+articleContentType+"'";
        }
        sql += " order by concat(article_content_sort,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/ZjxlBasicInfoService.java

@@ -30,4 +30,9 @@ public class ZjxlBasicInfoService extends BaseService {
        ZjxlBasicInfo info = basicInfoDao.save(basicInfo);
        return info.getBasicInfoId();
    }
    public ZjxlBasicInfo findBasicInfo(String basicInfoId){
        ZjxlBasicInfo info = basicInfoDao.findById(basicInfoId);
        return info;
    }
}

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

@@ -48,12 +48,48 @@ public class ZjxlCompanyCaseService extends BaseService {
        return allCount;
    }
    public List<ZjxlCompanyCase> findAll(){
        String sql = "select * from zjxl_company_case where company_is_line = 1";
        List<ZjxlCompanyCase> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(ZjxlCompanyCase.class));
        return list;
    }
    public String addCompanyCase(ZjxlCompanyCase companyCase){
        companyCase.setCompanyId(getCode());
        ZjxlCompanyCase companyCase1 = companyCaseDao.save(companyCase);
        return companyCase1.getCompanyId();
    }
    public int updateCompanyCase(ZjxlCompanyCase cc){
        String sql = "update zjxl_company_case SET company_id = '"+cc.getCompanyId()+"'";
        if (StringUtils.isNotEmpty(cc.getCompanyName())){
            sql += " , set company_name = "+cc.getCompanyName()+" ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyDescribe())){
            sql += " , set company_describe = "+cc.getCompanyDescribe()+" ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyDefaultImg())){
            sql += " , set company_default_img = "+cc.getCompanyDefaultImg()+" ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyExchangeImg())){
            sql += " , set company_exchange_img = "+cc.getCompanyExchangeImg()+" ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyAssociatedCase())){
            sql += " , set company_associated_case = "+cc.getCompanyAssociatedCase()+" ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyJumpUrl())){
            sql += " , set company_jump_url = "+cc.getCompanyJumpUrl()+" ";
        }
        if (cc.getCompanySort() != null){
            sql += " , set company_sort = "+cc.getCompanySort()+" ";
        }
        if (cc.getCompanyIsLine() != null){
            sql += " , set company_is_line = "+cc.getCompanyIsLine()+" ";
        }
        int update = jdbcTemplate.update(sql);
        return update;
    }
    public int deleteCompanyCase(String id){
        companyCaseDao.deleteById(id);
        return 1;

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

@@ -1,6 +1,7 @@
package cn.stylefeng.guns.zjxl.service;
import cn.stylefeng.guns.zjxl.dao.ZjxlPartnerDao;
import cn.stylefeng.guns.zjxl.model.ZjxlBanner;
import cn.stylefeng.guns.zjxl.model.ZjxlPartner;
import cn.stylefeng.guns.zjxlUtil.BaseService;
import org.apache.commons.lang3.StringUtils;
@@ -53,6 +54,30 @@ public class ZjxlPartnerService extends BaseService {
        return p.getPartnerId();
    }
    public int updatePartenr(ZjxlPartner partner){
        String sql = "update zjxl_partner SET partner_id = '"+partner.getPartnerId()+"'";
        if (StringUtils.isNotEmpty(partner.getPartnerName())){
            sql += " , set partner_name = "+partner.getPartnerName()+" ";
        }
        if (StringUtils.isNotEmpty(partner.getPartnerImg())){
            sql += " , set partner_img = "+partner.getPartnerImg()+" ";
        }
        if (partner.getPartnerSort() != null){
            sql += " , set partner_sort = "+partner.getPartnerSort()+" ";
        }
        if (partner.getPartnerIsLine() != null){
            sql += " , set partner_is_line = "+partner.getPartnerIsLine()+" ";
        }
        int update = jdbcTemplate.update(sql);
        return update;
    }
    public List<ZjxlPartner> findAll(){
        String sql = "select * from zjxl_partner where partner_is_line = 1";
        List<ZjxlPartner> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(ZjxlPartner.class));
        return list;
    }
    public int updatePartner(String id, Integer isLine){
        partnerDao.updatePartner(id,isLine);
        return 1;

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

@@ -10,4 +10,7 @@ spring:
    max-pool-prepared-statement-per-connection-size: 20
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
  fastdfs_file_url: http://172.26.0.110:8888/
article:
  id_url: http://172.26.0.30:8080/zjxl/zjxlArticleContent/findArticleContentById?articleContentTitle=&pageNo=1&pageSize=10&systemDictType=&

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

@@ -10,4 +10,8 @@ spring:
    max-pool-prepared-statement-per-connection-size: 20
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
  fastdfs_file_url: http://172.26.0.110:8888/
# 有正式线之后，需要将ip修改为正式
article:
  id_url: http://172.26.0.30:8080/zjxl/zjxlArticleContent/findArticleContentById?articleContentTitle=&pageNo=1&pageSize=10&systemDictType=&

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

@@ -10,4 +10,7 @@ spring:
    max-pool-prepared-statement-per-connection-size: 20
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
  fastdfs_file_url: http://172.26.0.110:8888/
article:
  id_url: http://172.26.0.30:8080/zjxl/zjxlArticleContent/findArticleContentById?articleContentTitle=&pageNo=1&pageSize=10&systemDictType=&