优化bug

java110

2020-06-23 7df9e55abdc5987a9a9b20614b0cc24b5c2d2915

 service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java

@@ -3,11 +3,14 @@
import com.alibaba.fastjson.JSON;
import com.java110.core.factory.WechatFactory;
import com.java110.core.smo.fee.IFeeInnerServiceSMO;
import com.java110.core.smo.store.ISmallWechatAttrInnerServiceSMO;
import com.java110.core.smo.store.ISmallWeChatInnerServiceSMO;
import com.java110.core.smo.user.IOwnerAppUserInnerServiceSMO;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.fee.BillOweFeeDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
import com.java110.dto.task.TaskDto;
import com.java110.entity.wechat.Content;
import com.java110.entity.wechat.Data;
@@ -21,7 +24,10 @@
import org.springframework.web.client.RestTemplate;

import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;

/**
 * @program: MicroCommunity
@@ -30,7 +36,7 @@
 * @create: 2020-06-15 13:35
 **/
@Component
public class PublicWeChatPushMessageTemplate extends TaskSystemQuartz{
public class PublicWeChatPushMessageTemplate extends TaskSystemQuartz {

    private static Logger logger = LoggerFactory.getLogger(PublicWeChatPushMessageTemplate.class);

@@ -39,6 +45,9 @@

    @Autowired
    private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl;

    @Autowired
    private ISmallWechatAttrInnerServiceSMO smallWechatAttrInnerServiceSMOImpl;

    @Autowired
    private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMOImpl;
@@ -50,45 +59,79 @@
    private static String sendMsgUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";

    //模板id
    private static String templateId = "ZF4j_ug2XW-UGwW1F-Gi4M1-51lpiu-PM89Oa6oZv6w";

    private static String DEFAULT_TEMPLATE_ID = "ZF4j_ug2XW-UGwW1F-Gi4M1-51lpiu-PM89Oa6oZv6w";


    @Override
    protected void process(TaskDto taskDto) throws Exception {
    protected void process(TaskDto taskDto) {
        logger.debug("开始执行微信模板信息推送" + taskDto.toString());

        // 获取小区
        List<CommunityDto> communityDtos = getAllCommunity();

        for (CommunityDto communityDto : communityDtos) {
            try {
                publishMsg(taskDto, communityDto);
            } catch (Exception e) {
                logger.error("推送消息失败", e);
            }
        }
    }

    private void publishMsg(TaskDto taskDto, CommunityDto communityDto) throws Exception {

//
//        String templateId = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.KEY_PROPERTY_FEE_TEMPLATE_ID);
//
//        templateId = StringUtil.isEmpty(templateId) ? DEFAULT_TEMPLATE_ID : templateId;

        //查询公众号配置
        SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
        smallWeChatDto.setWeChatType("1100");
        smallWeChatDto.setObjType(SmallWeChatDto.OBJ_TYPE_COMMUNITY);
        smallWeChatDto.setObjId(communityDto.getCommunityId());
        List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);

        if(smallWeChatDtos.size() <=0 || smallWeChatDto == null){
        if (smallWeChatDto == null || smallWeChatDtos.size() <= 0) {
            logger.info("未配置微信公众号信息,定时任务执行结束");
            return;
        }

        SmallWeChatDto weChatDto = smallWeChatDtos.get(0);
        String accessToken =  WechatFactory.getAccessToken(weChatDto.getAppId(),weChatDto.getAppSecret());

        if(accessToken == null || accessToken == ""){
            logger.info("推送微信模板,获取accessToken失败:{}",accessToken);

        SmallWechatAttrDto smallWechatAttrDto = new SmallWechatAttrDto();
        smallWechatAttrDto.setCommunityId(communityDto.getCommunityId());
        smallWechatAttrDto.setWechatId(weChatDto.getWeChatId());
        smallWechatAttrDto.setSpecCd(SmallWechatAttrDto.SPEC_CD_OWE_FEE_TEMPLATE);
        List<SmallWechatAttrDto> smallWechatAttrDtos = smallWechatAttrInnerServiceSMOImpl.querySmallWechatAttrs(smallWechatAttrDto);

        if (smallWechatAttrDtos == null || smallWechatAttrDtos.size() <= 0) {
            logger.info("未配置微信公众号消息模板");
            return;
        }

        String templateId = smallWechatAttrDtos.get(0).getValue();

        String accessToken = WechatFactory.getAccessToken(weChatDto.getAppId(), weChatDto.getAppSecret());

        if (accessToken == null || accessToken == "") {
            logger.info("推送微信模板,获取accessToken失败:{}", accessToken);
            return;
        }

        //根据小区id查询业主与公众号绑定信息
        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
        ownerAppUserDto.setCommunityId(weChatDto.getObjId());
        ownerAppUserDto.setAppType("WECHAT");
        List<OwnerAppUserDto>  ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
        ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);

        if(ownerAppUserDtos.size() <=0 || ownerAppUserDtos == null){
        if (ownerAppUserDtos.size() <= 0 || ownerAppUserDtos == null) {
            logger.info("未查询到业主与微信公众号绑定关系");
            return;
        }

        List<String> memberIdList = new ArrayList<>(ownerAppUserDtos.size());
        for(OwnerAppUserDto appUserDto :ownerAppUserDtos ){
        for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
            memberIdList.add(appUserDto.getMemberId());
        }

@@ -101,9 +144,9 @@
        List<BillOweFeeDto> billOweFeeDtos = feeInnerServiceSMOImpl.queryBillOweFees(billOweFeeDto);

        String url = sendMsgUrl + accessToken;
        for( BillOweFeeDto fee : billOweFeeDtos){
            for(OwnerAppUserDto appUserDto :ownerAppUserDtos ){
                if(fee.getOwnerId().equals(appUserDto.getMemberId())){
        for (BillOweFeeDto fee : billOweFeeDtos) {
            for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
                if (fee.getOwnerId().equals(appUserDto.getMemberId())) {
                    Date date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(fee.getFeeEndTime());
                    Calendar now = Calendar.getInstance();
                    now.setTime(date);
@@ -115,13 +158,13 @@
                    templateMessage.setTouser(appUserDto.getOpenId());
                    data.setFirst(new Content("物业费缴费提醒"));
                    data.setKeyword1(new Content(fee.getPayerObjName()));
                    data.setKeyword2(new Content(year+"年-"+month+"月"));
                    data.setKeyword2(new Content(year + "年-" + month + "月"));
                    data.setKeyword3(new Content(fee.getAmountOwed()));
                    data.setRemark(new Content("请您及时缴费,如有疑问请联系相关物业人员"));
                    templateMessage.setData(data);
                    logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
                    ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
                    logger.info("微信模板返回内容:{}",responseEntity);
                    logger.info("微信模板返回内容:{}", responseEntity);
                }
            }