Merge branch 'dev' of http://192.168.1.220:10080/chenweida/jw2.0 into dev

Conflicts:
	svr-lib-parent-pom/pom.xml
	svr/svr-base/pom.xml

svr/svr-base/src/main/java/com/yihu/jw/SvrBaseApplication.java

@@ -2,14 +2,7 @@ package com.yihu.jw;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.web.client.RestTemplate;
/**
 * Created by chenweida on 2017/5/10.

svr/svr-base/src/main/java/com/yihu/jw/base/service/FunctionService.java

@@ -11,8 +11,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */

svr/svr-base/src/main/java/com/yihu/jw/wx/controller/WxTemplateController.java

@@ -4,7 +4,6 @@ import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.wx.model.WxMenu;
import com.yihu.jw.wx.model.WxTemplate;
import com.yihu.jw.wx.service.WxTemplateService;
import io.swagger.annotations.ApiOperation;
@@ -40,7 +39,7 @@ public class WxTemplateController extends EnvelopRestController {
            @RequestBody String jsonData) {
        try {
            WxTemplate WxTemplate = toEntity(jsonData, WxTemplate.class);
            return Envelop.getSuccess(BaseContants.WxTemplate.message_success_update, WxTemplateService.updateWxTemplate(WxTemplate));
            return Envelop.getSuccess(BaseContants.WxTemplate.message_success_update, wxTemplateService.updateWxTemplate(WxTemplate));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -50,24 +49,24 @@ public class WxTemplateController extends EnvelopRestController {
    @DeleteMapping(value = BaseContants.WxTemplate.api_delete, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除微信模版", notes = "删除微信模版")
    public Envelop deleteWxTemplate(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) Integer id) {
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code) {
        try {
            WxTemplateService.deleteWxTemplate(id);
            wxTemplateService.deleteWxTemplate(code);
            return Envelop.getSuccess(BaseContants.WxTemplate.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseContants.WxTemplate.api_getById, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @GetMapping(value = BaseContants.WxTemplate.api_getByCode, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "根据id查找微信菜单", notes = "根据id查找微信菜单")
    public Envelop findById(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) Integer id
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
    ) {
        try {
            return Envelop.getSuccess(BaseContants.WxTemplate.message_success_find, WxTemplateService.findById(id));
            return Envelop.getSuccess(BaseContants.WxTemplate.message_success_find, wxTemplateService.findByCode(code));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }

svr/svr-base/src/main/java/com/yihu/jw/wx/dao/WxTemplateDao.java

@@ -1,7 +1,15 @@
package com.yihu.jw.wx.dao;
import com.yihu.jw.wx.model.WxTemplate;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class WxTemplateDao {
public interface WxTemplateDao extends PagingAndSortingRepository<WxTemplate, Long>, JpaSpecificationExecutor<WxTemplate> {
    @Query("from WxTemplate w where w.code = ?1 and w.status =0")
    WxTemplate findByCode(String code);
}

svr/svr-base/src/main/java/com/yihu/jw/wx/model/WxAccessToken.java

@@ -1,7 +1,7 @@
package com.yihu.jw.wx.model;// default package
import java.util.Date;
import javax.persistence.*;
import java.util.Date;
/**
 * 微信 accesstoken表
@@ -13,6 +13,16 @@ public class WxAccessToken implements java.io.Serializable {
	// Fields
	private Integer id;//业务id
	private String code;//业务code
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	private String wechatCode;//关联的微信code 关联表 Wx_Wechat
	private String accessToken;//调用微信返回的accesstoken
	private long addTimestamp;//创建时间
@@ -35,10 +45,9 @@ public class WxAccessToken implements java.io.Serializable {
		this.czrq = czrq;
	}
	/** full constructor */
	public WxAccessToken(Integer id, String wechatCode, String accessToken,
			long addTimestamp, Integer expiresIn, Date czrq) {
	public WxAccessToken(Integer id, String code, String wechatCode, String accessToken, long addTimestamp, Integer expiresIn, Date czrq) {
		this.id = id;
		this.code = code;
		this.wechatCode = wechatCode;
		this.accessToken = accessToken;
		this.addTimestamp = addTimestamp;

svr/svr-base/src/main/java/com/yihu/jw/wx/model/WxMenu.java

@@ -13,6 +13,34 @@ public class WxMenu implements java.io.Serializable {
	// Fields
	private Integer id;//菜单id
	public WxMenu(Integer id, String code, String wechatCode, String supMenucode, String type, String name, Integer sort, String url, String updateUser, Date updateTime, Date createTime, String createUser, String remark, Integer status) {
		this.id = id;
		this.code = code;
		this.wechatCode = wechatCode;
		this.supMenucode = supMenucode;
		this.type = type;
		this.name = name;
		this.sort = sort;
		this.url = url;
		this.updateUser = updateUser;
		this.updateTime = updateTime;
		this.createTime = createTime;
		this.createUser = createUser;
		this.remark = remark;
		this.status = status;
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	private String code;//业务code
	private String wechatCode;//关联的微信code 关联表 Wx_Wechat
	private String supMenucode;//父菜单id 如果是一级菜单 此字段为空
	private String type;//菜单类型 1 view 2click
@@ -44,22 +72,6 @@ public class WxMenu implements java.io.Serializable {
		this.id = id;
	}
	public WxMenu(Integer id, String wechatCode, String supMenucode, String type, String name, Integer sort, String url, String updateUser, Date updateTime, Date createTime, String createUser, String remark, Integer status) {
		this.id = id;
		this.wechatCode = wechatCode;
		this.supMenucode = supMenucode;
		this.type = type;
		this.name = name;
		this.sort = sort;
		this.url = url;
		this.updateUser = updateUser;
		this.updateTime = updateTime;
		this.createTime = createTime;
		this.createUser = createUser;
		this.remark = remark;
		this.status = status;
	}
	// Property accessors
	@Id
	@Column(name = "id", unique = true, nullable = false)

svr/svr-base/src/main/java/com/yihu/jw/wx/model/WxTemplate.java

@@ -1,7 +1,7 @@
package com.yihu.jw.wx.model;// default package
import java.util.Date;
import javax.persistence.*;
import java.util.Date;
/**
 * WxTemplate entity. @author MyEclipse Persistence Tools
@@ -25,7 +25,56 @@ public class WxTemplate implements java.io.Serializable {
	private String updateUserName;//修改人名称
	private Date updateTime;//修改时间
	private String remark;
	private Integer status; //状态 -1 已删除 0可用
	public WxTemplate(Integer id, String code, String name, String wechatCode, String templateCode, String value, String createUser, String createUserName, Date createTime, String updateUser, String updateUserName, Date updateTime, String remark, Integer status) {
		this.id = id;
		this.code = code;
		this.name = name;
		this.wechatCode = wechatCode;
		this.templateCode = templateCode;
		this.value = value;
		this.createUser = createUser;
		this.createUserName = createUserName;
		this.createTime = createTime;
		this.updateUser = updateUser;
		this.updateUserName = updateUserName;
		this.updateTime = updateTime;
		this.remark = remark;
		this.status = status;
	}
	public String getUpdateUser() {
		return updateUser;
	}
	public void setUpdateUser(String updateUser) {
		this.updateUser = updateUser;
	}
	public String getUpdateUserName() {
		return updateUserName;
	}
	public void setUpdateUserName(String updateUserName) {
		this.updateUserName = updateUserName;
	}
	public Date getUpdateTime() {
		return updateTime;
	}
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
	public Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	// Constructors
	/** default constructor */

svr/svr-base/src/main/java/com/yihu/jw/wx/service/WxTemplateService.java

@@ -1,9 +1,9 @@
package com.yihu.jw.wx.service;
import com.yihu.jw.base.model.Function;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.wx.dao.WxTemplateDao;
import com.yihu.jw.wx.model.WxTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
@@ -24,10 +24,37 @@ public class WxTemplateService {
        if (StringUtils.isEmpty(wxTemplate.getWechatCode())) {
            throw new ApiException(BaseContants.Function.message_fail_wechatCode_is_null, CommonContants.common_error_params_code);
        }
        Function functionTmp = functionDao.findByName(wxTemplate.getName());
        if (functionTmp != null) {
            throw new ApiException(BaseContants.Function.message_fail_name_exist, CommonContants.common_error_params_code);
        return wxTemplateDao.save(wxTemplate);
    }
    public WxTemplate updateWxTemplate(WxTemplate wxTemplate) {
        if (StringUtils.isEmpty(wxTemplate.getCode())) {
            throw new ApiException(BaseContants.WxTemplate.message_fail_code_is_null, CommonContants.common_error_params_code);
        }
        if (StringUtils.isEmpty(wxTemplate.getWechatCode())) {
            throw new ApiException(BaseContants.Function.message_fail_wechatCode_is_null, CommonContants.common_error_params_code);
        }
        if (StringUtils.isEmpty(wxTemplate.getId())) {
            throw new ApiException(BaseContants.Function.message_fail_id_is_null, CommonContants.common_error_params_code);
        }
        return wxTemplateDao.save(wxTemplate);
    }
    public void deleteWxTemplate(String code) {
        WxTemplate wxTemplate = wxTemplateDao.findByCode(code);
        if (wxTemplate == null) {
            throw new ApiException(BaseContants.WxTemplate.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        wxTemplate.setStatus(-1);
        wxTemplateDao.save(wxTemplate);
    }
    public WxTemplate findByCode(String code) {
        WxTemplate wxTemplate = wxTemplateDao.findByCode(code);
        if (wxTemplate == null) {
            throw new ApiException(BaseContants.WxTemplate.message_fail_code_no_exist, CommonContants.common_error_params_code);
        }
        return functionDao.save(wxTemplate);
        return wxTemplate;
    }
}