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

@@ -1,12 +1,17 @@
package cn.stylefeng.guns.zjxl.cnotroller;
import cn.stylefeng.guns.zjxl.model.ZjxlArticleContent;
import cn.stylefeng.guns.zjxl.model.ZjxlSystemDict;
import cn.stylefeng.guns.zjxl.service.ZjxlArticleContentService;
import cn.stylefeng.guns.zjxl.service.ZjxlSystemDictService;
import cn.stylefeng.guns.zjxlUtil.BaseController;
import cn.stylefeng.guns.zjxlUtil.PageUtil;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jdk.nashorn.internal.ir.WithNode;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,6 +42,9 @@ public class ZjxlArticleContentController extends BaseController {
    @Autowired
    private ZjxlArticleContentService articleContentService;
    @Autowired
    private ZjxlSystemDictService systemDictService;
    @RequestMapping(value = "/findArticleContentById", method = RequestMethod.GET)
    @ApiOperation(value = "查询文章管理列表")
    public String findArticleContentById(@ApiParam(name = "id", value = "文章id", required = false) @RequestParam(value = "id", required = false)String id,
@@ -68,12 +76,13 @@ 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()){
                    if (articleContentTitle.equals(iterator.next()));
                    return write(-1,"改文章已存在");
                    if (articleContentTitle.equals(iterator.next().getArticleContentTitle())){
                        return write(-1,"改文章已存在");
                    }
                }
            }
@@ -160,7 +169,20 @@ public class ZjxlArticleContentController extends BaseController {
            }
            logger.info("内容类型：articleContentType====="+articleContentType);
            logger.info("分类：articleContentClassify====="+articleContentClassify);
            return write(200,"操作成功","data",articleContentService.getArticleContentSubclassify(articleContentType,articleContentClassify));
            List<ZjxlArticleContent> 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);
            }
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"操作失败");
@@ -209,12 +231,48 @@ 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,"查询失败");
        }
    }
    @RequestMapping(value = "updateArticleAllInfo",method = RequestMethod.POST)
    @ApiOperation("修改文章信息")
    public String updateArticleAllInfo(@ApiParam(name="id",value = "文章id",required = true)@RequestParam(value = "id",required = true)String id,
                                       @ApiParam(name = "articleContentTitle", value = "文章标题", required = false) @RequestParam(value = "articleContentTitle", required = false)String articleContentTitle,
                                       @ApiParam(name = "articleContentCover", value = "封面", required = false) @RequestParam(value = "articleContentCover", required = false)String articleContentCover,
                                       @ApiParam(name = "articleContentAbstract", value = "摘要", required = false) @RequestParam(value = "articleContentAbstract", required = false) String articleContentAbstract,
                                       @ApiParam(name = "articleContentContent", value = "内容", required = false) @RequestParam(value = "articleContentContent", required = false) String articleContentContent,
                                       @ApiParam(name = "articleContentType", value = "内容类型 1-产品与服务  2-公司案例  3-新闻中心  4-关于我们", required = false) @RequestParam(value = "articleContentType", required = false)Integer articleContentType,
                                       @ApiParam(name = "articleContentClassify", value = "分类", required = false) @RequestParam(value = "articleContentClassify", required = false)String articleContentClassify,
                                       @ApiParam(name = "articleContentSubclassify", value = "子分类", required = false) @RequestParam(value = "articleContentSubclassify", required = false)String articleContentSubclassify,
                                       @ApiParam(name = "articleContentSort", value = "排序", required = false) @RequestParam(value = "articleContentSort", required = false)Integer articleContentSort,
                                       @ApiParam(name = "articleContentIsLine", value = "是否上线", required = false, defaultValue = "0") @RequestParam(value = "articleContentIsLine", required = false)Integer articleContentIsLine){
        try {
            ZjxlArticleContent zjxlArticleContent = new ZjxlArticleContent();
            zjxlArticleContent.setArticleContentId(id);
            zjxlArticleContent.setArticleContentTitle(articleContentTitle);
            zjxlArticleContent.setArticleContentCover(articleContentCover);
            zjxlArticleContent.setArticleContentAbstract(articleContentAbstract);
            zjxlArticleContent.setArticleContentContent(articleContentContent);
            zjxlArticleContent.setArticleContentType(articleContentType);
            zjxlArticleContent.setArticleContentClassify(articleContentClassify);
            zjxlArticleContent.setArticleContentSubclassify(articleContentSubclassify);
            zjxlArticleContent.setArticleContentSort(articleContentSort);
            zjxlArticleContent.setArticleContentIsLine(articleContentIsLine);
            JSONObject result = articleContentService.updateArticleAllInfo(zjxlArticleContent);
            if (result.getInteger("status")==-1){
                return write(-1,"修改失败");
            }
            return write(200,"修改成功","data",result.getJSONObject("articleInfo"));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"修改失败");
        }
    }
}

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

@@ -78,6 +78,17 @@ public class ZjxlBannerCnotroller extends BaseController {
        }
    }
    @RequestMapping(value = "/findByIsLine", method = RequestMethod.GET)
    @ApiOperation(value = "所有上线的合作伙伴")
    public String findByIsLine(){
        try {
            return write(200,"查询成功","data",bannerService.findByIsLine());
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败");
        }
    }
    @RequestMapping(value = "/addBanner", method = RequestMethod.POST)
    @ApiOperation(value = "添加banner")
    public String addBanner(@ApiParam(name = "bannerName", value = "bannerName", required = false) @RequestParam(value = "bannerName", required = false)String bannerName,
@@ -127,7 +138,7 @@ public class ZjxlBannerCnotroller extends BaseController {
    @RequestMapping(value = "/deleteBannerById", method = RequestMethod.POST)
    @ApiOperation(value = "删除banner")
    public String deleteBannerById(String id){
    public String deleteBannerById(@RequestParam(value = "id",required=true) String id){
        try {
            logger.info("删除banner，参数"+id);
            if(id == null){

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;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
/***
 * @ClassName: ZjxlBasicInfoController
@@ -47,10 +49,29 @@ public class ZjxlBasicInfoController extends BaseController {
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
            basicInfo.setBasicInfoCreateTime(df.format(new Date()));// new Date()为获取当前系统时间
            Iterable<ZjxlBasicInfo> iterable = basicInfoService.findBasicInfo(null);
            if (basicInfoTel.length() > 0){
                Iterator<ZjxlBasicInfo> iterator = iterable.iterator();
                while (iterator.hasNext()){
                    basicInfoService.deleteBasicInfo(iterator.next().getBasicInfoId());
                }
            }
            return write(200,"编辑成功","data",basicInfoService.addBasicInfo(basicInfo));
        }catch (Exception e){
            e.printStackTrace();
            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,10 +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);
            //http://172.26.0.30:8080/zjxl/zjxlArticleContent/findArticleContentById?articleContentTitle=&id=1&pageNo=1&pageSize=10&systemDictType=
//            companyCase.setCompanyJumpUrl(idUrl+"id="+companyJumpUrl+"");
            companyCase.setCompanyJumpUrl(companyJumpUrl);
            companyCase.setCompanySort(companySort);
            companyCase.setCompanyIsLine(companyIsLine);
@@ -130,4 +145,60 @@ 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.setCompanyJumpUrl(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,47 @@ 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,"添加失败");
        }
    }
    @RequestMapping(value = "/findPartenrAll", method = RequestMethod.GET)
    @ApiOperation("查询所有已经上线的合作伙伴")
    public String findPartenrAll(){
        try {
            return write(200,"查询成功", "data", partnerService.findPartenrAll());
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");
        }
    }
}

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

@@ -4,6 +4,7 @@ import cn.stylefeng.guns.zjxl.model.ZjxlSystemDict;
import cn.stylefeng.guns.zjxl.service.ZjxlSystemDictService;
import cn.stylefeng.guns.zjxlUtil.BaseController;
import cn.stylefeng.guns.zjxlUtil.PageUtil;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -129,4 +130,43 @@ public class ZjxlSystemDictController extends BaseController {
        }
    }
    @RequestMapping(value = "/findAllType", method = RequestMethod.GET)
    @ApiOperation("获取系统字典的所有分类")
    public String findAllType(){
        try {
            List<ZjxlSystemDict> systemDictList = systemDictService.findAllType();
            return write(200,"查询成功","data", systemDictList);
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");
        }
    }
    @RequestMapping(value = "/updateSystemDictInfo", method = RequestMethod.POST)
    @ApiOperation("修改字典表信息")
    public String updateSystemDictInfo(
            @ApiParam(name = "id", value = "字典ID", required = true)@RequestParam(value = "id", required = true) String id,
            @ApiParam(name = "systemDictType", value = "类型 1-产品与服务  2-公司案例  3-新闻中心  4-关于我们", required = false)@RequestParam(value = "systemDictType", required = false) Integer systemDictType,
            @ApiParam(name = "systemDictClassify", value = "分类", required = false)@RequestParam(value = "systemDictClassify", required = false) String systemDictClassify,
            @ApiParam(name = "systemDictSubclassify", value = "子分类", required = false)@RequestParam(value = "systemDictSubclassify", required = false) String systemDictSubclassify,
            @ApiParam(name = "systemDictSort", value = "排序", required = false)@RequestParam(value = "systemDictSort", required = false) Integer systemDictSort,
            @ApiParam(name = "systemDictIsLine", value = "是否上线", required = false, defaultValue = "0")@RequestParam(value = "systemDictIsLine", required = false) Integer systemDictIsLine){
        try {
            JSONObject result = systemDictService.updateSystemDictInfo(id,systemDictType,systemDictClassify,systemDictSubclassify,systemDictSort,systemDictIsLine);
            if (result.getInteger("status")==0){
                return write(-1,"该分类已存在，请勿重复添加","data","");
            }
            if (result.getInteger("status")==-1){
                return write(-1,"该字典ID不存在","data","");
            }
            if (result.getInteger("status")==-2){
                return write(-1,"传入参数不符合，存在空字符串","data","");
            }
            return write(200,"修改成功","data",result.getJSONObject("dictInfo"));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"添加失败");
        }
    }
}

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

@@ -21,4 +21,7 @@ public interface ZjxlArticleContentDao extends PagingAndSortingRepository<ZjxlAr
    @Modifying
    @Query("update ZjxlArticleContent a set a.articleContentIsLine = ?2 where a.articleContentId = ?1 ")
    int updateByArticleContentId(String id,Integer isLine);
    @Query("select a from ZjxlArticleContent a where a.articleContentId=?1")
    ZjxlArticleContent findById(String articleContentId);
}

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/dao/ZjxlSystemDictDao.java

@@ -22,4 +22,7 @@ public interface ZjxlSystemDictDao extends PagingAndSortingRepository<ZjxlSystem
    @Modifying
    @Query("update ZjxlSystemDict a set a.systemDictIsLine = ?2 where a.systemDictId = ?1")
    int updateBySystemDictId(String id, Integer isLine);
    @Query(" select a from ZjxlSystemDict a where a.systemDictId = ?1")
    ZjxlSystemDict findBySystemDictId(String systemDictId);
}

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,13 +3,19 @@ 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 com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
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.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/***
@@ -67,7 +73,7 @@ public class ZjxlArticleContentService extends BaseService {
    }
    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";
        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;
    }
@@ -76,6 +82,7 @@ public class ZjxlArticleContentService extends BaseService {
        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;
        //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){
@@ -99,7 +106,7 @@ public class ZjxlArticleContentService extends BaseService {
        if (systemDictType != null && systemDictType > 0){
            sql += " and article_content_type = "+systemDictType+"";
        }
        sql += " order by article_content_sort,article_content_create_time desc limit "+page+" , "+pagesiz+"";
        sql += " order by concat(article_content_sort,article_content_create_time) desc limit "+page+" , "+pagesiz+"";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }
@@ -122,11 +129,30 @@ 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;
    }
    public JSONObject updateArticleAllInfo(ZjxlArticleContent zjxlArticleContent){
        ZjxlArticleContent tmp = articleContentDao.findById(zjxlArticleContent.getArticleContentId());
        JSONObject result = new JSONObject();
        if (tmp==null){
            result.put("status",-1);
        }
        else{
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
            zjxlArticleContent.setArticleContentCreateTime(df.format(new Date()));
            articleContentDao.save(zjxlArticleContent);
            result.put("status",1);
        }
        result.put("articleInfo", JSON.toJSONString(zjxlArticleContent));
        return result;
    }
}

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

@@ -26,7 +26,7 @@ import java.util.List;
 * @Date: 2020/10/30 17:26
 */
@Component
@Transactional(rollbackFor = Exception.class)
@Transactional
public class ZjxlBannerService extends BaseService {
    @Autowired
@@ -43,13 +43,13 @@ public class ZjxlBannerService extends BaseService {
        if (StringUtils.isNotEmpty(name)){
            sql += " AND banner_name LIKE '%"+name+"%'";
        }
        sql += " ORDER BY concat(banner_sort,banner_create_time) DESC LIMIT "+page+" , "+pagesize+" ";
        sql += " and banner_is_line = 1 ORDER BY concat(banner_sort,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 ";
        String sql = "select count(*) from zjxl_banner where banner_is_line = 1 ";
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
        return allCount;
    }
@@ -114,4 +114,10 @@ public class ZjxlBannerService extends BaseService {
        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";
        List<ZjxlBanner> bannerList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ZjxlBanner.class));
        return bannerList;
    }
}

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

@@ -30,4 +30,14 @@ public class ZjxlBasicInfoService extends BaseService {
        ZjxlBasicInfo info = basicInfoDao.save(basicInfo);
        return info.getBasicInfoId();
    }
    public Iterable<ZjxlBasicInfo> findBasicInfo(String basicInfoId){
        ZjxlBasicInfo info = basicInfoDao.findById(basicInfoId);
        Iterable<ZjxlBasicInfo> infoIterable = basicInfoDao.findAll();
        return infoIterable;
    }
    public void deleteBasicInfo(String basicInfoId){
        basicInfoDao.deleteById(basicInfoId);
    }
}

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

@@ -48,12 +48,49 @@ 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 += " ,  company_name = '"+cc.getCompanyName()+"' ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyDescribe())){
            sql += " ,  company_describe = '"+cc.getCompanyDescribe()+"' ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyDefaultImg())){
            sql += " ,  company_default_img = '"+cc.getCompanyDefaultImg()+"' ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyExchangeImg())){
            sql += " ,  company_exchange_img = '"+cc.getCompanyExchangeImg()+"' ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyAssociatedCase())){
            sql += " ,  company_associated_case = '"+cc.getCompanyAssociatedCase()+"' ";
        }
        if (StringUtils.isNotEmpty(cc.getCompanyJumpUrl())){
            sql += " ,  company_jump_url = '"+cc.getCompanyJumpUrl()+"' ";
        }
        if (cc.getCompanySort() != null){
            sql += " ,  company_sort = "+cc.getCompanySort()+" ";
        }
        if (cc.getCompanyIsLine() != null){
            sql += " ,  company_is_line = "+cc.getCompanyIsLine()+" ";
        }
        sql += " where company_id = '"+cc.getCompanyId()+"' ";
        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;
@@ -41,6 +42,12 @@ public class ZjxlPartnerService extends BaseService {
        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";
        List<ZjxlPartner> partnerList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlPartner.class));
        return partnerList;
    }
    public int allCount(){
        String sql = "select count(*) from zjxl_partner ";
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;
@@ -53,6 +60,31 @@ 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 += " ,  partner_name = '"+partner.getPartnerName()+"' ";
        }
        if (StringUtils.isNotEmpty(partner.getPartnerImg())){
            sql += " ,  partner_img = '"+partner.getPartnerImg()+"' ";
        }
        if (partner.getPartnerSort() != null){
            sql += " ,  partner_sort = "+partner.getPartnerSort()+" ";
        }
        if (partner.getPartnerIsLine() != null){
            sql += " ,  partner_is_line = "+partner.getPartnerIsLine()+" ";
        }
        sql += " where partner_id = '"+partner.getPartnerId()+"' ";
        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/java/cn/stylefeng/guns/zjxl/service/ZjxlSystemDictService.java

@@ -4,6 +4,9 @@ import cn.stylefeng.guns.zjxl.dao.ZjxlSystemDictDao;
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;
import jdk.nashorn.internal.ir.ReturnNode;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -11,6 +14,8 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/***
@@ -86,4 +91,49 @@ public class ZjxlSystemDictService extends BaseService {
        List<ZjxlSystemDict> systemDictList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlSystemDict.class));
        return systemDictList;
    }
    public JSONObject updateSystemDictInfo(String systemDictId,Integer systemDictType,String systemDictClassify,String systemDictSubclassify,Integer systemDictSort,Integer systemDictIsLine){
        JSONObject result = new JSONObject();
        ZjxlSystemDict zjxlSystemDict = systemDictDao.findBySystemDictId(systemDictId);
        if (zjxlSystemDict ==null){
            result.put("status",-1);
        }
        int systemDictClassifyList = findSystemDictClassify(systemDictClassify);
        //查询子分类是否存在
        int systemDictSubclassifyList = findSystemDictSubclassify(systemDictSubclassify);
        if (systemDictClassifyList>0&&systemDictSubclassifyList>0){
            result.put("status",0);
        }
        else{
            if (StringUtils.isBlank(systemDictClassify)||StringUtils.isBlank(systemDictSubclassify)){
                result.put("status",-2);
            }
            else{
                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
                zjxlSystemDict.setSystemDictCreateTime(df.format(new Date()));
                zjxlSystemDict.setSystemDictType(systemDictType);
                zjxlSystemDict.setSystemDictClassify(systemDictClassify);
                zjxlSystemDict.setSystemDictSubclassify(systemDictSubclassify);
                zjxlSystemDict.setSystemDictSort(systemDictSort);
                zjxlSystemDict.setSystemDictIsLine(systemDictIsLine);
                systemDictDao.save(zjxlSystemDict);
                result.put("status",1);
            }
        }
        result.put("dictInfo", JSON.toJSONString(zjxlSystemDict));
        return result;
    }
    public List<ZjxlSystemDict> findAllType(){
        String sql = "select * from zjxl_system_dict where system_dict_is_line = 1 group by system_dict_type";
        List<ZjxlSystemDict> systemDictList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlSystemDict.class));
        return systemDictList;
    }
    public List<ZjxlSystemDict> findNewsTypeA(Integer systemDictType,String articleContentClassify){
        String sql = "select * from zjxl_system_dict where system_dict_type = "+systemDictType+"    AND system_dict_classify = '"+articleContentClassify+"' group by system_dict_subclassify";
        List<ZjxlSystemDict> systemDictList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlSystemDict.class));
        return systemDictList;
    }
}

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=&