Procházet zdrojové kódy

加入小区时直接通知关注的所有用户

java110 před 5 roky
rodič
revize
87ed192c1e

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/rentingAppointment/RentingAppointmentDto.java

@@ -29,6 +29,7 @@ public class RentingAppointmentDto extends PageDto implements Serializable {
     private String tenantSex;
     private String storeId;
     private String roomId;
+    private String rentingId;
 
 
     private Date createTime;
@@ -148,4 +149,12 @@ public class RentingAppointmentDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getRentingId() {
+        return rentingId;
+    }
+
+    public void setRentingId(String rentingId) {
+        this.rentingId = rentingId;
+    }
 }

+ 7 - 0
java110-bean/src/main/java/com/java110/po/rentingAppointment/RentingAppointmentPo.java

@@ -16,6 +16,7 @@ public class RentingAppointmentPo implements Serializable {
     private String tenantSex;
     private String storeId;
     private String roomId;
+    private String rentingId;
 
     public String getMsg() {
         return msg;
@@ -113,5 +114,11 @@ public class RentingAppointmentPo implements Serializable {
         this.roomId = roomId;
     }
 
+    public String getRentingId() {
+        return rentingId;
+    }
 
+    public void setRentingId(String rentingId) {
+        this.rentingId = rentingId;
+    }
 }

+ 10 - 3
java110-db/src/main/resources/mapper/user/RentingAppointmentServiceDaoImplMapper.xml

@@ -8,9 +8,11 @@
     <!-- 保存租赁预约信息 add by wuxw 2018-07-03 -->
     <insert id="saveRentingAppointmentInfo" parameterType="Map">
         insert into renting_appointment(
-        msg,tenant_tel,tenant_name,appointment_time,appointment_room_id,appointment_id,remark,state,tenant_sex,store_id,room_id
+        msg,tenant_tel,tenant_name,appointment_time,appointment_room_id,appointment_id,remark,state,tenant_sex,store_id,
+        room_id,renting_id
         ) values (
-        #{msg},#{tenantTel},#{tenantName},#{appointmentTime},#{appointmentRoomId},#{appointmentId},#{remark},#{state},#{tenantSex},#{storeId},#{roomId}
+        #{msg},#{tenantTel},#{tenantName},#{appointmentTime},#{appointmentRoomId},#{appointmentId},#{remark},#{state},
+        #{tenantSex},#{storeId},#{roomId},#{rentingId}
         )
     </insert>
 
@@ -20,7 +22,8 @@
         select t.msg,t.tenant_tel,t.tenant_tel tenantTel,t.tenant_name,t.tenant_name
         tenantName,t.appointment_time,t.appointment_time appointmentTime,t.appointment_room_id,t.appointment_room_id
         appointmentRoomId,t.appointment_id,t.appointment_id appointmentId,t.remark,t.status_cd,t.status_cd
-        statusCd,t.state,t.tenant_sex,t.tenant_sex tenantSex,t.store_id,t.store_id storeId,t.room_id,t.room_id roomId,td.`name` stateName
+        statusCd,t.state,t.tenant_sex,t.tenant_sex tenantSex,t.store_id,t.store_id storeId,t.room_id,t.room_id roomId,
+        td.`name` stateName,t.renting_id rentingId
         from renting_appointment t
         LEFT JOIN t_dict td on t.state=td.status_cd and td.table_columns = 'state' and td.table_name = 'renting_appointment'
         where 1 =1
@@ -104,6 +107,10 @@
         <if test="roomId !=null and roomId != ''">
             , t.room_id= #{roomId}
         </if>
+        <if test="rentingId !=null and rentingId != ''">
+            ,t.renting_id= #{rentingId}
+        </if>
+
         where 1=1
         <if test="appointmentId !=null and appointmentId != ''">
             and t.appointment_id= #{appointmentId}

+ 49 - 4
service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java

@@ -1,6 +1,8 @@
 package com.java110.job.task.wechat;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.java110.core.factory.WechatFactory;
 import com.java110.dto.RoomDto;
 import com.java110.dto.community.CommunityDto;
@@ -22,9 +24,11 @@ import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.job.quartz.TaskSystemQuartz;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
@@ -66,6 +70,7 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
 
     //模板信息推送地址
     private static String sendMsgUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";
+    private static String getUser = "https://api.weixin.qq.com/cgi-bin/user/get?access_token=ACCESS_TOKEN";
 
 
     @Override
@@ -255,10 +260,7 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
     }
 
     private void sendAllOwner(NoticeDto noticeDto, String templateId, String accessToken) {
-        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
-        ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
-        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
-        doSend(ownerAppUserDtos, noticeDto, templateId, accessToken);
+        doSendToOpenId(noticeDto, templateId, accessToken, "");
     }
 
     private void doSend(List<OwnerAppUserDto> ownerAppUserDtos, NoticeDto noticeDto, String templateId, String accessToken) {
@@ -281,4 +283,47 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
         }
     }
 
+    private void doSendToOpenId(NoticeDto noticeDto, String templateId, String accessToken, String nextOpenid) {
+        String url = getUser.replace("ACCESS_TOKEN", accessToken);
+        if (!StringUtil.isEmpty(nextOpenid)) {
+            url += ("&next_openid=" + nextOpenid);
+        }
+        ResponseEntity<String> paramOut = outRestTemplate.getForEntity(url, String.class);
+
+        if (paramOut.getStatusCode() != HttpStatus.OK) {
+            throw new IllegalArgumentException(paramOut.getBody());
+        }
+
+        JSONObject paramOutObj = JSONObject.parseObject(paramOut.getBody());
+        if (paramOutObj.containsKey("errcode")) {
+            throw new IllegalArgumentException(paramOut.getBody());
+        }
+        JSONObject dataObj = paramOutObj.getJSONObject("data");
+        JSONArray openids = dataObj.getJSONArray("openid");
+        nextOpenid = paramOutObj.getString("next_openid");
+        String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL") + "/#/pages/notice/detail/detail?noticeId=";
+        for (int openIndex = 0; openIndex < openids.size(); openIndex++) {
+            String openId = openids.getString(openIndex);
+            Data data = new Data();
+            PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
+            templateMessage.setTemplate_id(templateId);
+            templateMessage.setTouser(openId);
+            data.setFirst(new Content(noticeDto.getTitle()));
+            data.setKeyword1(new Content(noticeDto.getTitle()));
+            data.setKeyword2(new Content(noticeDto.getStartTime()));
+            data.setKeyword3(new Content(noticeDto.getContext()));
+            data.setRemark(new Content("如有疑问请联系相关物业人员"));
+            templateMessage.setData(data);
+            templateMessage.setUrl(wechatUrl + noticeDto.getNoticeId());
+            logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
+            ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(sendMsgUrl + accessToken, JSON.toJSONString(templateMessage), String.class);
+            logger.info("微信模板返回内容:{}", responseEntity);
+        }
+
+        //(关注者列表已返回完时,返回next_openid为空)
+        if (!StringUtil.isEmpty(nextOpenid)) {
+            doSendToOpenId(noticeDto, templateId, accessToken, nextOpenid);
+        }
+    }
+
 }