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

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

@@ -7,6 +7,8 @@ import cn.stylefeng.guns.zjxlUtil.PageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -26,6 +28,8 @@ import java.util.List;
@RequestMapping(value = "/zjxl/zjxlArticleContent")
public class ZjxlArticleContentController extends BaseController {
    private Logger logger = (Logger) LoggerFactory.getLogger(ZjxlArticleContentController.class);
    @Autowired
    private ZjxlArticleContentService articleContentService;
@@ -77,6 +81,10 @@ public class ZjxlArticleContentController extends BaseController {
    @ApiOperation(value = "删除文章管理")
    public String deleteArticleContent(@ApiParam(name = "id", value = "文章id") @RequestParam(value = "id") String id){
        try {
            if (id == null){
                logger.info("修改是否上线：id====="+id);
                return write(-1,"获取参数失败");
            }
            return write(200,"删除成功","data",articleContentService.deleteArticleContent(id));
        }catch (Exception e){
            e.printStackTrace();
@@ -89,6 +97,10 @@ public class ZjxlArticleContentController extends BaseController {
    public String updateArticleContent(@ApiParam(name = "id", value = "文章id") @RequestParam(value = "id") String id,
                                       @ApiParam(name = "isLine", value = "是否上线") @RequestParam(value = "isLine") Integer isLine){
        try {
            if (id == null || isLine == null){
                logger.info("修改是否上线：id====="+id+"，isLine===="+isLine);
                return write(-1,"获取参数失败");
            }
            return write(200,"修改上线成功","data",articleContentService.updateArticleContent(id,isLine));
        }catch (Exception e){
            e.printStackTrace();

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

@@ -7,6 +7,8 @@ import cn.stylefeng.guns.zjxlUtil.PageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -26,6 +28,8 @@ import java.util.List;
@RequestMapping(value = "/zjxl/CompanyCase")
public class ZjxlCompanyCaseController extends BaseController {
    private Logger logger = (Logger) LoggerFactory.getLogger(ZjxlCompanyCaseController.class);
    @Autowired
    private ZjxlCompanyCaseService companyCaseService;
@@ -78,6 +82,10 @@ public class ZjxlCompanyCaseController extends BaseController {
    @ApiOperation(value = "根据id删除案例")
    public String deleteCompanyCase(String id){
        try{
            if (id == null){
                logger.info("删除合作伙伴 id===== "+id);
                return write(-1,"获取参数失败");
            }
            return write(200,"删除成功","data",companyCaseService.deleteCompanyCase(id));
        }catch (Exception e){
            e.printStackTrace();
@@ -89,6 +97,10 @@ public class ZjxlCompanyCaseController extends BaseController {
    @ApiOperation(value = "根据id修改案例是否上线")
    public String updateIsLine(String id, Integer isLine){
        try{
            if (id == null || isLine == null){
                logger.info("修改是否上线：id====="+id+"，isLine===="+isLine);
                return write(-1,"获取参数失败");
                }
            return write(200,"修改成功","data",companyCaseService.updateIsLine(id, isLine));
        }catch (Exception e){
            e.printStackTrace();

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

@@ -7,6 +7,8 @@ import cn.stylefeng.guns.zjxlUtil.PageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -26,6 +28,8 @@ import java.util.List;
@RequestMapping(value = "/zjxl/partner")
public class ZjxlPartnerController extends BaseController {
    private Logger logger = (Logger) LoggerFactory.getLogger(ZjxlPartnerController.class);
    @Autowired
    private ZjxlPartnerService partnerService;
@@ -68,6 +72,10 @@ public class ZjxlPartnerController extends BaseController {
    @ApiOperation(value = "合作伙伴修改上线")
    public String updatePartner(String id, Integer isLine){
        try {
            if (id == null || isLine == null){
                logger.info("修改是否上线：id====="+id+"，isLine===="+isLine);
                return write(-1,"获取参数失败");
            }
            return write(200,"修改上线成功","data",partnerService.updatePartner(id,isLine));
        }catch (Exception e){
            e.printStackTrace();
@@ -79,6 +87,10 @@ public class ZjxlPartnerController extends BaseController {
    @ApiOperation(value = "删除合作伙伴")
    public String deletePartner(String id){
        try {
            if (id == null){
                logger.info("删除合作伙伴：id====="+id);
                return write(-1,"获取参数失败");
            }
            return write(200,"删除成功","data",partnerService.deletePartner(id));
        }catch (Exception e){
            e.printStackTrace();

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

@@ -7,6 +7,8 @@ import cn.stylefeng.guns.zjxlUtil.PageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -26,6 +28,8 @@ import java.util.List;
@Api(description = "系统管理字典")
public class ZjxlSystemDictController extends BaseController {
    private Logger logger = (Logger) LoggerFactory.getLogger(ZjxlSystemDictController.class);
    @Autowired
    private ZjxlSystemDictService systemDictService;
@@ -71,6 +75,10 @@ public class ZjxlSystemDictController extends BaseController {
    @ApiOperation(value = "删除字典")
    public String deleteSystemDict(@ApiParam(name = "id", value = "systemDictId", required = false) @RequestParam(value = "id", required = false)String id){
        try {
            if (id == null) {
                logger.info("删除合作伙伴：id====="+id);
                return write(-1,"获取参数失败");
            }
            return write(200,"删除成功","data",systemDictService.deleteSystemDict(id));
        }catch (Exception e){
            e.printStackTrace();
@@ -83,6 +91,10 @@ public class ZjxlSystemDictController extends BaseController {
    public String updateSystemDict(@ApiParam(name = "id", value = "systemDictId", required = false) @RequestParam(value = "id", required = false)String id,
                                   @ApiParam(name = "isLine", value = "是否上线", required = false) @RequestParam(value = "isLine", required = false)Integer isLine){
        try {
            if (id == null || isLine == null){
                logger.info("修改是否上线：id====="+id+"，isLine===="+isLine);
                return write(-1,"获取参数失败");
            }
            return write(200,"修改上线成功","data",systemDictService.updateSystemDict(id,isLine));
        }catch (Exception e){
            e.printStackTrace();