Merge remote-tracking branch 'origin/master'

src/main/java/com/ifish/daoImpl/PushListDaoImpl.java

@@ -47,6 +47,7 @@ public class PushListDaoImpl extends HibernateBaseDao<PushList, Integer> impleme
 			Criterion criterion = Restrictions.eq("pushType", PushTypeEnum.all_push.getKey());
 			queryList.add(criterion);
 		}
+		firstResult = firstResult - 1;
 		return this.findByCriteria(firstResult, pageSize,Order.desc("pushId"), queryList.toArray(new Criterion[queryList.size()]));
 	}
 

src/main/java/com/ifish/entity/PushList.java

@@ -21,7 +21,7 @@ public class PushList implements Serializable{
 	//设备ID
 	private Integer deviceId;
 	//看护报告ID
-	private Integer reportId;
+	private String reportId;
 	//推送手机类型
 	private String phoneType;
 	//显示名称
@@ -117,12 +117,15 @@ public class PushList implements Serializable{
 	public void setPushLink(String pushLink) {
 		this.pushLink = pushLink;
 	}
-	public Integer getReportId() {
+
+	public String getReportId() {
 		return reportId;
 	}
-	public void setReportId(Integer reportId) {
+
+	public void setReportId(String reportId) {
 		this.reportId = reportId;
 	}
+
 	public String getJpushStatus() {
 		return jpushStatus;
 	}

src/main/java/com/ifish/entity/hbm/PushList.hbm.xml

@@ -7,7 +7,7 @@
 			<generator class="identity"/>
 		</id>
 		<property name="userId" 		column="user_id" 		type="java.lang.Integer" />
-		<property name="reportId" 		column="report_id" 		type="java.lang.Integer" />
+		<property name="reportId" 		column="report_id" 		type="string" />
 		<property name="deviceId" 		column="device_id" 		type="java.lang.Integer" />
 		<property name="phoneType" 		column="phone_type" 	type="string" 		length="20"/>
 		<property name="showName" 		column="show_name" 		type="string" 		length="20"/>

src/main/java/com/ifish/serviceImpl/BaseServiceImpl.java

@@ -1109,7 +1109,7 @@ public class BaseServiceImpl implements BaseService {
                 else if (msgType.equals(PushTypeEnum.send_report.getKey())) {
                     String reportId = baseMap.get("reportId");
                     if (reportId != null) {
-                        pushList.setReportId(Integer.valueOf(reportId));
+                        pushList.setReportId(reportId);
                     }
                     pushList.setUserId(Integer.valueOf(userId));
                     pushList.setPhoneType(loginType);

src/main/java/com/ifish/util/WeChatUtils.java

@@ -54,6 +54,7 @@ public class WeChatUtils {
             HttpEntity accessTokenEntity = accessTokenResponse.getEntity();
             String accessTokenResult = EntityUtils.toString(accessTokenEntity, "UTF-8");
             JSONObject wechatToken = JSON.parseObject(accessTokenResult);
+            System.out.println("token : " + wechatToken);
             String openId = wechatToken.getString("openid");
             String accessToken = wechatToken.getString("access_token");
 
@@ -63,6 +64,7 @@ public class WeChatUtils {
             HttpResponse userInfoResponse = httpClient.execute(userInfoGet);
             HttpEntity userInfoEntity = userInfoResponse.getEntity();
             String userInfoResult = EntityUtils.toString(userInfoEntity, "UTF-8");
+            System.out.println("userInfo : " + userInfoResult);
             json = JSON.parseObject(userInfoResult);
         } catch (Exception e) {
            e.printStackTrace();