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

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

@@ -1,12 +1,15 @@
package cn.stylefeng.guns.zjxl.cnotroller;
import cn.stylefeng.guns.zjxl.model.ZjxlCompanyCase;
import cn.stylefeng.guns.zjxl.service.ZjxlCompanyCaseService;
import cn.stylefeng.guns.zjxlUtil.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/***
@@ -16,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 * @Date: 2020/11/2 9:21
 */
@RestController
@Api(description = "公司官网主页")
@Api(description = "公司官网主页-公司案例")
@RequestMapping(value = "/zjxl/CompanyCase")
public class ZjxlCompanyCaseController extends BaseController {
@@ -24,13 +27,68 @@ public class ZjxlCompanyCaseController extends BaseController {
    private ZjxlCompanyCaseService companyCaseService;
    @RequestMapping(value = "/findCompanyCaseById", method = RequestMethod.GET)
    @ApiOperation(value = "根据Id查看CompanyCase")
    public String findCompanyCaseById(String id){
    @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 = "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",companyCaseService.findById(id));
            return write(200,"查询成功","data",companyCaseService.findById(id,name,page,pagesize));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");
        }
    }
    @RequestMapping(value = "/addCompanyCase", method = RequestMethod.POST)
    @ApiOperation(value = "添加公司案例")
    public String addCompanyCase(
            @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 = "关联案例", 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.setCompanyName(companyName);
            companyCase.setCompanyDescribe(companyDescribe);
            companyCase.setCompanyDefaultImg(companyDefaultImg);
            companyCase.setCompanyExchangeImg(companyExchangeImg);
            companyCase.setCompanyAssociatedCase(companyAssociatedCase);
            companyCase.setCompanyJumpUrl(companyJumpUrl);
            companyCase.setCompanySort(companySort);
            companyCase.setCompanyIsLine(companyIsLine);
            companyCase.setCompanyTestBannerId(companyTestBannerId);
            return write(200,"添加成功","data",companyCaseService.addCompanyCase(companyCase));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"添加失败");
        }
    }
    @RequestMapping(value = "/deleteCompanyCase", method = RequestMethod.DELETE)
    @ApiOperation(value = "根据id删除案例")
    public String deleteCompanyCase(String id){
        try{
            return write(200,"删除成功","data",companyCaseService.deleteCompanyCase(id));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"删除失败");
        }
    }
    @RequestMapping(value = "/updateIsLine", method = RequestMethod.POST)
    @ApiOperation(value = "根据id修改案例是否上线")
    public String updateIsLine(String id, Integer isLine){
        try{
            return write(200,"修改成功","data",companyCaseService.updateIsLine(id, isLine));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"修改失败");
        }
    }
}

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

@@ -0,0 +1,84 @@
package cn.stylefeng.guns.zjxl.cnotroller;
import cn.stylefeng.guns.zjxl.model.ZjxlPartner;
import cn.stylefeng.guns.zjxl.service.ZjxlPartnerService;
import cn.stylefeng.guns.zjxlUtil.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/***
 * @ClassName: ZjxlPartnerController
 * @Description: 公司官网-合作伙伴
 * @Auther: shi kejing
 * @Date: 2020/11/3 14:56
 */
@RestController
@Api(description = "公司官网-合作伙伴")
@RequestMapping(value = "/zjxl/partner")
public class ZjxlPartnerController extends BaseController {
    @Autowired
    private ZjxlPartnerService partnerService;
    @RequestMapping(value = "/findPartenrById", method = RequestMethod.GET)
    @ApiOperation("查询合作伙伴")
    public String findPartenrById(
            @ApiParam(name = "id", value = "partnerId", 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 = "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", partnerService.findPartenrById(id,name,page,pagesize));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");
        }
    }
    @RequestMapping(value = "/addPartenr", method = RequestMethod.POST)
    @ApiOperation(value = "添加合作伙伴")
    public String addPartenr(@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) @RequestParam(value = "partnerIsLine", required = false)Integer partnerIsLine){
        try {
            ZjxlPartner partner = new ZjxlPartner();
            partner.setPartnerName(partnerName);
            partner.setPartnerImg(partnerImg);
            partner.setPartnerSort(partnerSort);
            partner.setPartnerIsLine(partnerIsLine);
            return write(200,"添加成功","data",partnerService.addPartenr(partner));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"添加失败");
        }
    }
    @RequestMapping(value = "/updatePartner", method = RequestMethod.POST)
    @ApiOperation(value = "合作伙伴修改上线")
    public String updatePartner(String id, Integer isLine){
        try {
            return write(200,"修改上线成功","data",partnerService.updatePartner(id,isLine));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"修改上线失败");
        }
    }
    @RequestMapping(value = "/", method = RequestMethod.DELETE)
    @ApiOperation(value = "删除合作伙伴")
    public String deletePartner(String id){
        try {
            return write(200,"删除成功","data",partnerService.deletePartner(id));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"删除失败");
        }
    }
}

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

@@ -2,8 +2,10 @@ package cn.stylefeng.guns.zjxl.dao;
import cn.stylefeng.guns.zjxl.model.ZjxlCompanyCase;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.web.bind.annotation.RequestMapping;
/***
 * @ClassName: ZjxlCompanyCaseDao
@@ -15,4 +17,12 @@ public interface ZjxlCompanyCaseDao extends PagingAndSortingRepository<ZjxlCompa
    @Query("select a from ZjxlCompanyCase a where a.companyId = ?1")
    ZjxlCompanyCase findById(String id);
    @Modifying
    @Query("delete from ZjxlCompanyCase p where p.companyId = ?1")
    int deleteById(String id);
    @Modifying
    @Query("update ZjxlCompanyCase a set a.companyIsLine = ?2 where a.companyId = ?1")
    int updateIsLine(String id, Integer isLine);
}

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

@@ -0,0 +1,26 @@
package cn.stylefeng.guns.zjxl.dao;
import cn.stylefeng.guns.zjxl.model.ZjxlBanner;
import cn.stylefeng.guns.zjxl.model.ZjxlPartner;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/***
 * @ClassName: ZjxlPartnerDao
 * @Description:
 * @Auther: shi kejing
 * @Date: 2020/11/3 14:59
 */
public interface ZjxlPartnerDao extends PagingAndSortingRepository<ZjxlPartner, Long>, JpaSpecificationExecutor<ZjxlPartner> {
    @Modifying
    @Query("update ZjxlPartner a set a.partnerIsLine = ?2 where a.partnerId = ?1")
    int updatePartner(String id,Integer isLine);
    @Modifying
    @Query("delete from ZjxlPartner p where p.partnerId = ?1")
    int deleteById(String id);
}

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

@@ -1,5 +1,6 @@
package cn.stylefeng.guns.zjxl.model;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
@@ -31,7 +32,7 @@ public class ZjxlCompanyCase {
    private int companyIsLine;
    private int companyTestBannerId;
    private String companyTestBannerId;
    @Id
    public String getCompanyId() {
@@ -106,11 +107,11 @@ public class ZjxlCompanyCase {
        this.companyIsLine = companyIsLine;
    }
    public int getCompanyTestBannerId() {
    public String getCompanyTestBannerId() {
        return companyTestBannerId;
    }
    public void setCompanyTestBannerId(int companyTestBannerId) {
    public void setCompanyTestBannerId(String companyTestBannerId) {
        this.companyTestBannerId = companyTestBannerId;
    }
}

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

@@ -0,0 +1,62 @@
package cn.stylefeng.guns.zjxl.model;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/***
 * @ClassName: ZjxlPartner
 * @Description:
 * @Auther: shi kejing
 * @Date: 2020/11/3 14:53
 */
@Entity
@Table(name = "zjxl_partner")
public class ZjxlPartner {
    private String partnerId;
    private String partnerName;
    private String partnerImg;
    private Integer partnerSort;
    private Integer partnerIsLine;
    @Id
    public String getPartnerId() {
        return partnerId;
    }
    public void setPartnerId(String partnerId) {
        this.partnerId = partnerId;
    }
    public String getPartnerName() {
        return partnerName;
    }
    public void setPartnerName(String partnerName) {
        this.partnerName = partnerName;
    }
    public String getPartnerImg() {
        return partnerImg;
    }
    public void setPartnerImg(String partnerImg) {
        this.partnerImg = partnerImg;
    }
    public Integer getPartnerSort() {
        return partnerSort;
    }
    public void setPartnerSort(Integer partnerSort) {
        this.partnerSort = partnerSort;
    }
    public Integer getPartnerIsLine() {
        return partnerIsLine;
    }
    public void setPartnerIsLine(Integer partnerIsLine) {
        this.partnerIsLine = partnerIsLine;
    }
}

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

@@ -46,10 +46,10 @@ public class ZjxlBannerService extends BaseService {
       return bannerList;
    }
    public int addBanner(ZjxlBanner banner){
    public String addBanner(ZjxlBanner banner){
        banner.setBannerId(getCode());
        bannerDao.save(banner);
        return 1;
        ZjxlBanner bb = bannerDao.save(banner);
        return bb.getBannerId();
    }
    public int deleteBannerById(String id){

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

@@ -2,11 +2,16 @@ package cn.stylefeng.guns.zjxl.service;
import cn.stylefeng.guns.zjxl.dao.ZjxlCompanyCaseDao;
import cn.stylefeng.guns.zjxl.model.ZjxlCompanyCase;
import cn.stylefeng.guns.zjxlUtil.BaseService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Optional;
/***
@@ -17,14 +22,39 @@ import java.util.Optional;
 */
@Component
@Transactional(rollbackFor = Exception.class)
public class ZjxlCompanyCaseService {
public class ZjxlCompanyCaseService extends BaseService {
    @Autowired
    private ZjxlCompanyCaseDao companyCaseDao;
    @Autowired
    JdbcTemplate jdbcTemplate;
    public ZjxlCompanyCase findById(String id){
        return companyCaseDao.findById(id);
    public List<ZjxlCompanyCase> findById(String id, String name, 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+"'";
        }
        if (StringUtils.isNotEmpty(name)){
            sql += " and company_name = '"+name+"'";
        }
        sql += " order by company_sort desc limit "+page+" , "+pagesize+"";
        List<ZjxlCompanyCase> companyCaseList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlCompanyCase.class));
        return companyCaseList;
    }
    public String addCompanyCase(ZjxlCompanyCase companyCase){
        companyCase.setCompanyId(getCode());
        ZjxlCompanyCase companyCase1 = companyCaseDao.save(companyCase);
        return companyCase1.getCompanyId();
    }
    public int deleteCompanyCase(String id){
        companyCaseDao.deleteById(id);
        return 1;
    }
    public int updateIsLine(String id, Integer isLine){
        companyCaseDao.updateIsLine(id, isLine);
        return 1;
    }
}

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

@@ -0,0 +1,59 @@
package cn.stylefeng.guns.zjxl.service;
import cn.stylefeng.guns.zjxl.dao.ZjxlPartnerDao;
import cn.stylefeng.guns.zjxl.model.ZjxlPartner;
import cn.stylefeng.guns.zjxlUtil.BaseService;
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 java.util.List;
/***
 * @ClassName: ZjxlPartnerService
 * @Description:
 * @Auther: shi kejing
 * @Date: 2020/11/3 14:58
 */
@Component
@Transactional(rollbackFor = Exception.class)
public class ZjxlPartnerService extends BaseService {
    @Autowired
    private ZjxlPartnerDao partnerDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    public List<ZjxlPartner> findPartenrById(String id, String name, Integer page, Integer pagesize){
        String sql = "select * from zjxl_partner where 1=1";
        if (StringUtils.isNotEmpty(id)){
            sql += " and partner_id = '"+id+"' ";
        }
        if (StringUtils.isNotEmpty(name)){
            sql += " and partner_name like '%"+name+"%'";
        }
        sql += " order by partner_sort desc limit "+page+" , "+pagesize+"";
        List<ZjxlPartner> partnerList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlPartner.class));
        return partnerList;
    }
    public String addPartenr(ZjxlPartner partner){
        partner.setPartnerId(getCode());
        ZjxlPartner p = partnerDao.save(partner);
        return p.getPartnerId();
    }
    public int updatePartner(String id, Integer isLine){
        partnerDao.updatePartner(id,isLine);
        return 1;
    }
    public int deletePartner(String id){
        partnerDao.deleteById(id);
        return 1;
    }
}