花城E+bug更新

101captain

2022-05-17 9e42a7700dcc2dacb67b0b175e99c2c395179fce

花城E+bug更新

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java

@@ -461,7 +461,7 @@
        try {
            // String openId = "oMIR-5S9rpsWAVUUrNKoVDQbn5Mw";//zj的openid
            String openId = "oMIR-5dWyNyWCCKMl7-kYzvyHOjs";// lyq的openid
            String accessToken = util.getAppAccessToken();
            String accessToken = util.getAccessToken();
            // sendSubscribeHDJJKS(openId,accessToken,"测试活动即将开始标题","2021-08-04 13:00:00","成都市","50");//活动即将开始
            // sendSubscribeHDQX(openId,accessToken,"取消活动测试标题","2021-08-04 13:00:00");//活动取消
            // sendSubscribeHDBG(openId,accessToken,"活动名称","2021-08-05","活动变更地址","2021-08-06","活动地址");//活动变更

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxXCXTempSend.java

@@ -12,6 +12,7 @@
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.http.entity.ContentType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Component;
@@ -24,6 +25,9 @@

import lombok.extern.slf4j.Slf4j;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;

@Slf4j
@Component
public class WxXCXTempSend extends BaseController {
@@ -33,9 +37,10 @@
    private static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
    private static String APP_IMAGE_URL = "https://www.psciio.com//idcard/8fa82cfba258498eab2fa818220fb592.jpg";
    private static String APP_IMAGE_NAME = "5.jpg";
    @Autowired
    private StringRedisTemplate redisTemplate;
    @Resource
    private RedisTemplate redisTemplate;

    private static WxXCXTempSend wxXCXTempSend;
    /**
     * url转变为 MultipartFile对象
     *
@@ -83,26 +88,26 @@
     * @return
     */
    public String getAccessToken() throws Exception {
        // String accessToken = ;
        // Boolean aBoolean = redisTemplate.hasKey(SecurityConstants.APPLETS_ACCESS_TOKEN);
        // ValueOperations<String, String> valueOperations = redisTemplate.opsForValue();
        // if(aBoolean){
        // Long expireTime = Long.parseLong(valueOperations.get(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME));
        // if(expireTime <= System.currentTimeMillis()){
        // redisTemplate.delete(SecurityConstants.APPLETS_ACCESS_TOKEN);//如果过期则删除
        // redisTemplate.delete(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME);//如果过期则删除
        //
        // valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN, accessToken);
        // valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME, System.currentTimeMillis() + 1100000 + "");
        // }else{
        // accessToken = valueOperations.get(SecurityConstants.APPLETS_ACCESS_TOKEN);
        // }
        // }else{
        // accessToken = getAppAccessToken();
        // valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN, accessToken);
        // valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME, System.currentTimeMillis() + 1100000 + "");
        // }
        return getAppAccessToken();
         String accessToken = "";
         Boolean aBoolean = wxXCXTempSend.redisTemplate.hasKey(SecurityConstants.APPLETS_ACCESS_TOKEN);
         ValueOperations<String, String> valueOperations = wxXCXTempSend.redisTemplate.opsForValue();
         if(aBoolean){
         Long expireTime = Long.parseLong(valueOperations.get(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME));
         if(expireTime <= System.currentTimeMillis()){
             wxXCXTempSend.redisTemplate.delete(SecurityConstants.APPLETS_ACCESS_TOKEN);//如果过期则删除
             wxXCXTempSend.redisTemplate.delete(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME);//如果过期则删除

         valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN, accessToken);
         valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME, System.currentTimeMillis() + 1100000 + "");
         }else{
         accessToken = valueOperations.get(SecurityConstants.APPLETS_ACCESS_TOKEN);
         }
         }else{
         accessToken = getAppAccessToken();
         valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN, accessToken);
         valueOperations.set(SecurityConstants.APPLETS_ACCESS_TOKEN_TIME, System.currentTimeMillis() + 1100000 + "");
         }
        return accessToken;
    }

    public String getAppAccessToken() throws Exception {
@@ -272,4 +277,10 @@
        return null;
    }

    @PostConstruct
    public void init() {
        wxXCXTempSend = this;
        wxXCXTempSend.redisTemplate = this.redisTemplate;
    }

}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java

@@ -191,7 +191,7 @@
                    if (!ObjectUtils.isEmpty(activitySignVOS)) {
                        try {
                            WxXCXTempSend util = new WxXCXTempSend();
                            String accessToken = util.getAppAccessToken();
                            String accessToken = util.getAccessToken();
                            // 遍历参与活动人员列表
                            activitySignVOS.forEach(activitySignVO1 -> {
                                Long aLong = activitySignVO1.getId();
@@ -933,7 +933,7 @@
                                    result += "…";
                                }
                                R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),4);
                                WxUtil.sendSubscribeSHZT(openid, util.getAppAccessToken(), "微心愿",
                                WxUtil.sendSubscribeSHZT(openid, util.getAccessToken(), "微心愿",
                                    DateUtils.format(comActMicroWishVO1.getExamineAt(), DateUtils.ymdhms_format),
                                    result,sysTemplateConfigVO.getData().getTemplateId());
                            } catch (Exception e) {
@@ -975,7 +975,7 @@
                            WxXCXTempSend util = new WxXCXTempSend();
                            R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),4);
                            try {
                                WxUtil.sendSubscribeSHZT(openid, util.getAppAccessToken(), "微心愿",
                                WxUtil.sendSubscribeSHZT(openid, util.getAccessToken(), "微心愿",
                                    DateUtils.format(comActMicroWishVO1.getExamineAt(), DateUtils.ymdhms_format),
                                    "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                            } catch (Exception e) {
@@ -1062,7 +1062,7 @@
                                result = result.substring(0, 4);
                                result += "…";
                            }
                            WxUtil.sendSubscribeSHZT(openid, util.getAppAccessToken(), "随手拍",
                            WxUtil.sendSubscribeSHZT(openid, util.getAccessToken(), "随手拍",
                                DateUtils.format(comActEasyPhotoVO1.getExamineAt(), DateUtils.ymdhms_format), result,sysTemplateConfigVO.getData().getTemplateId());
                        } catch (Exception e) {
                            log.error("消息推送失败，失败原因：" + e.getMessage());
@@ -1089,7 +1089,7 @@
                        String openid = userResult.getData().toString();
                        WxXCXTempSend util = new WxXCXTempSend();
                        try {
                            WxUtil.sendSubscribeSHZT(openid, util.getAppAccessToken(), "随手拍",
                            WxUtil.sendSubscribeSHZT(openid, util.getAccessToken(), "随手拍",
                                DateUtils.format(comActEasyPhotoVO1.getExamineAt(), DateUtils.ymdhms_format), "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                        } catch (Exception e) {
                            log.error("消息推送失败，失败原因：" + e.getMessage());

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java

@@ -455,7 +455,7 @@
                    R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),5);
                    WxXCXTempSend util = new WxXCXTempSend();
                    try {
                        WxUtil.sendSubscribeRZSH(openid, util.getAppAccessToken(), "志愿者认证",
                        WxUtil.sendSubscribeRZSH(openid, util.getAccessToken(), "志愿者认证",
                            DateUtils.format(comMngVolunteerMngVO1.getCreateAt(), DateUtils.ymdhms_format), "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                    } catch (Exception e) {
                        log.error("消息推送失败，失败原因：" + e.getMessage());
@@ -475,7 +475,7 @@
                    R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),5);
                    WxXCXTempSend util = new WxXCXTempSend();
                    try {
                        WxUtil.sendSubscribeRZSH(openid, util.getAppAccessToken(), "志愿者认证",
                        WxUtil.sendSubscribeRZSH(openid, util.getAccessToken(), "志愿者认证",
                            DateUtils.format(comMngVolunteerMngVO1.getCreateAt(), DateUtils.ymdhms_format),
                            "审核驳回，驳回原因：" + comMngVolunteerMngVO1.getRejectReson(),sysTemplateConfigVO.getData().getTemplateId());
                    } catch (Exception e) {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java

@@ -723,7 +723,7 @@
                    R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),5);
                    WxXCXTempSend util = new WxXCXTempSend();
                    try {
                        WxUtil.sendSubscribeRZSH(openid, util.getAppAccessToken(), "党员认证",
                        WxUtil.sendSubscribeRZSH(openid, util.getAccessToken(), "党员认证",
                            DateUtils.format(vo1.getCreateAt(), DateUtils.ymdhms_format), "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                    } catch (Exception e) {
                        log.error("消息推送失败，失败原因：" + e.getMessage());
@@ -754,7 +754,7 @@
                        R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),5);
                        WxXCXTempSend util = new WxXCXTempSend();
                        try {
                            WxUtil.sendSubscribeRZSH(openid, util.getAppAccessToken(), "党员认证",
                            WxUtil.sendSubscribeRZSH(openid, util.getAccessToken(), "党员认证",
                                DateUtils.format(vo1.getCreateAt(), DateUtils.ymdhms_format),
                                "审核驳回，驳回原因：" + partyBuildingMemberVO.getRefuseReason(),sysTemplateConfigVO.getData().getTemplateId());
                        } catch (Exception e) {

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/HouseApi.java

@@ -101,7 +101,7 @@
                String openid = userResult.getData().toString();
                WxXCXTempSend util = new WxXCXTempSend();
                try {
                    WxUtil.sendSubscribeSHZT(openid, util.getAppAccessToken(), "房屋租售",
                    WxUtil.sendSubscribeSHZT(openid, util.getAccessToken(), "房屋租售",
                        DateUtils.format(nowDate, DateUtils.ymdhms_format), "审核通过",sysTemplateConfigVO.getData().getTemplateId());
                } catch (Exception e) {
                    log.error("消息推送失败，失败原因：" + e.getMessage());
@@ -136,7 +136,7 @@
                        result = result.substring(0, 4);
                        result += "…";
                    }
                    WxUtil.sendSubscribeSHZT(openid, util.getAppAccessToken(), "房屋租售",
                    WxUtil.sendSubscribeSHZT(openid, util.getAccessToken(), "房屋租售",
                        DateUtils.format(nowDate, DateUtils.ymdhms_format), result,sysTemplateConfigVO.getData().getTemplateId());
                } catch (Exception e) {
                    log.error("消息推送失败，失败原因：" + e.getMessage());

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -2244,7 +2244,7 @@
                try {
                    WxXCXTempSend util = new WxXCXTempSend();
                    R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(eldersAuthFeedbackAddDTO.getAreaCode(),5);
                    String accessToken = util.getAppAccessToken();
                    String accessToken = util.getAccessToken();
                    WxUtil.sendSubscribeRZSH(openid, accessToken, "高龄认证",
                        DateUtils.format(eldersAuthDO.getCreateAt(), DateUtils.ymdhms_format),
                        eldersAuthFeedbackAddDTO.getFeedBack(),sysTemplateConfigVO.getData().getTemplateId());

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java

@@ -48,7 +48,7 @@
           WxXCXTempSend util = new WxXCXTempSend();
           String accessToken = null;
           try {
               accessToken = util.getXQAppAccessToken();
               accessToken = util.getAccessToken();
           } catch (Exception e) {
               e.printStackTrace();
           }
@@ -66,7 +66,7 @@
                    WxXCXTempSend util = new WxXCXTempSend();
                    String accessToken = null;
                    try {
                        accessToken = util.getXQAppAccessToken();
                        accessToken = util.getAccessToken();
                    } catch (Exception e) {
                        e.printStackTrace();
                    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/schedule/AcidSchedule.java

@@ -41,7 +41,7 @@
           WxXCXTempSend util = new WxXCXTempSend();
           String accessToken = null;
           try {
               accessToken = util.getXQAppAccessToken();
               accessToken = util.getAccessToken();
           } catch (Exception e) {
               e.printStackTrace();
           }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -170,7 +170,7 @@
            if (!activitySignVOS.isEmpty()) {
                try {
                    WxXCXTempSend util = new WxXCXTempSend();
                    String accessToken = util.getAppAccessToken();
                    String accessToken = util.getAccessToken();
                    ComActDO comActDO=comActDAO.selectById(comActActivityDO.getCommunityId());
                    R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),1);
                    activitySignVOS.forEach(activitySignVO1 -> {
@@ -853,7 +853,7 @@
        if (!actActivityList.isEmpty()) {
            WxXCXTempSend util = new WxXCXTempSend();
            try {
                String accessToken = util.getAppAccessToken();
                String accessToken = util.getAccessToken();
                actActivityList.forEach(actActivity -> {
                    ComActDO comActDO=comActDAO.selectById(actActivity.getCommunityId());
                    R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),9);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java

@@ -623,7 +623,7 @@
                    SysTemplateConfig sysTemplateConfig=sysTemplateConfigDao.selectOne(new QueryWrapper<SysTemplateConfig>().lambda().eq(SysTemplateConfig::getAreaCode, grantRewardDTO.getAreaCode()).eq(SysTemplateConfig::getType,7));
                    WxXCXTempSend util = new WxXCXTempSend();
                    try {
                        WxUtil.sendSubscribeJLDZ(openid, util.getAppAccessToken(), "随手拍有奖活动",
                        WxUtil.sendSubscribeJLDZ(openid, util.getAccessToken(), "随手拍有奖活动",
                            grantRewardDTO.getAmount(), activityType,sysTemplateConfig.getTemplateId());
                    } catch (Exception e) {
                        log.error("消息推送失败，失败原因：" + e.getMessage());

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java

@@ -209,7 +209,7 @@
                ComActDO comActDO=comActDAO.selectById(comActMessageBackVO.getCommunityId());
                R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),2);
                try {
                    WxUtil.sendSubscribeLYHF(openid, util.getAppAccessToken(), comActMessageBackVO.getUserName(),
                    WxUtil.sendSubscribeLYHF(openid, util.getAccessToken(), comActMessageBackVO.getUserName(),
                        DateUtils.format(new Date(), DateUtils.ymdhms_format), comActMessageBackVO.getMsgContent(),r.getData().getTemplateId());
                } catch (Exception e) {
                    log.error("消息推送失败，失败原因：" + e.getMessage());

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java

@@ -258,7 +258,7 @@
                    if (map != null) {
                        String openid = map.get("openid");
                        try {
                            WxUtil.sendSubscribeYYTX(openid, util.getAppAccessToken(), "预约成功",
                            WxUtil.sendSubscribeYYTX(openid, util.getAccessToken(), "预约成功",
                                    reserveDO.getTitle(), reserveRecordDO.getName(), makeHandleDTO.getMakeTime(),sysTemplateConfigVO.getData().getTemplateId());
                        } catch (Exception e) {
                            log.error("消息推送失败，失败原因：" + e.getMessage());
@@ -273,7 +273,7 @@
                    if (map != null) {
                        String openid = map.get("openid");
                        try {
                            WxUtil.sendSubscribeYYTX(openid, util.getAppAccessToken(), "预约失败",
                            WxUtil.sendSubscribeYYTX(openid, util.getAccessToken(), "预约失败",
                                    reserveDO.getTitle(), reserveRecordDO.getName(), DateUtils.format(reserveRecordDO.getReserveTime(),DateUtils.ymdhms_format),sysTemplateConfigVO.getData().getTemplateId());
                        } catch (Exception e) {
                            log.error("消息推送失败，失败原因：" + e.getMessage());

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletServiceImpl.java

@@ -255,7 +255,7 @@
            SysTemplateConfig sysTemplateConfig=sysTemplateConfigDao.selectOne(new QueryWrapper<SysTemplateConfig>().lambda().eq(SysTemplateConfig::getAreaCode, comActDO.getAreaCode()).eq(SysTemplateConfig::getType,7));
            WxXCXTempSend util = new WxXCXTempSend();
            try {
                WxUtil.sendSubscribeJLDZ(openid, util.getAppAccessToken(), "随手拍有奖活动",
                WxUtil.sendSubscribeJLDZ(openid, util.getAccessToken(), "随手拍有奖活动",
                    amount.setScale(2, RoundingMode.HALF_UP), activityTypeName,sysTemplateConfig.getTemplateId());
            } catch (Exception e) {
                log.error("消息推送失败，失败原因：" + e.getMessage());

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java

@@ -190,7 +190,7 @@
            String openid = map.get("openid");
            try {
                WxXCXTempSend util = new WxXCXTempSend();
                String accessToken = util.getAppAccessToken();
                String accessToken = util.getAccessToken();
                R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(areaCode,5);
                WxUtil.sendSubscribeRZSH(openid, accessToken, name,
                        DateUtils.format(new Date(), DateUtils.ymdhms_format),

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java

@@ -164,7 +164,7 @@
            String openid = map.get("openid");
            try {
                WxXCXTempSend util = new WxXCXTempSend();
                String accessToken = util.getAppAccessToken();
                String accessToken = util.getAccessToken();
                R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(areaCode,5);
                WxUtil.sendSubscribeRZSH(openid, accessToken, name,
                        DateUtils.format(new Date(), DateUtils.ymdhms_format),

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxDataUtil.java

@@ -16,7 +16,7 @@
    String accessToken;
    {
        try {
            accessToken = wxXCXTempSend.getXQAppAccessToken();
            accessToken = wxXCXTempSend.getAccessToken();
        } catch (Exception e) {
            e.printStackTrace();
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml

@@ -68,7 +68,7 @@
            (select count(id) from com_mng_population where village_id = cmb.village_id and floor = cmb.`name`) as populationNum
        FROM
            com_mng_building AS cmb
            LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmb.village_id
            inner JOIN com_mng_village AS cmv ON cmv.village_id = cmb.village_id
            <where>
                <if test="pageBuildingListDto.communityId != null">
                    and cmb.act_id = #{pageBuildingListDto.communityId}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -955,7 +955,7 @@
                // 实名认证成功推送订阅消息给用户
                try {
                    WxXCXTempSend util = new WxXCXTempSend();
                    String accessToken = util.getAppAccessToken();
                    String accessToken = util.getAccessToken();
                    SysTemplateConfig sysTemplateConfig=sysTemplateConfigDao.selectOne(new QueryWrapper<SysTemplateConfig>().lambda().eq(SysTemplateConfig::getAreaCode, loginUserInfoVO.getComActVO()).eq(SysTemplateConfig::getType,5));
                    // 用户实名认证推送消息
                    WxUtil.sendSubscribeRZSH(user.getOpenid(), accessToken, "实名认证",