liquanyu / talkonline

Download as
Browse Code »

Commit c4b960e9125007bc6b921af25c6949f114549792

Authored by shiyang
1 parent 0fe2525c9d
Exists in master and in 1 other branch dev

推送文章时推送记录状态bug

Showing 1 changed file with 100 additions and 97 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushArticleTask.java View file @ c4b960e
... ... @@ -62,124 +62,127 @@
62 62 pushedart.setAid(lymsPushMessage.getAid());
63 63 pushedart.setCreatedtime(new Date());
64 64 pushedart.setIsread((byte) 0);
65   - //获取token失败
66   - if(StringUtil.isEmpty(AccessTokenServlet.accessToken)){
67   - //更新到LymsPushMessages记录
68   - lymsPushMessage.setState(2);//推送状态：0待推送 1成功 2失败。（在备注写失败原因）
69   - lymsPushMessage.setRemark("推送短消息"+(lymsPushMessage.getIsweixinOne()==1?"1":"2")+",获取token失败！");
70   - lymsPushMessage.setPushTime(new Date());
71   - lymsPushMessagesService.updateById(lymsPushMessage);
72   - //更新到LymsPushedart记录
73   - if(null==lymsPushMessage.getPushedartId()){
74   - pushedart.setIsweixinone(2);//是否推送短消息1（0否，1是 2推送失败）
75   - }else {
76   - pushedart.setIsweixintwo(2);//是否推送短消息2（0否，1是 2推送失败）
77   - }
78   - //LymsPushedart的主键id赋值,表示修改。找到以前的推送记录，修改短文字的推送状态
79   - //这里查询为了去掉推送文章的记录重复存
80   - QueryWrapper<LymsPushedart> queryWrapper2=new QueryWrapper<>();
81   - queryWrapper.eq("pid", lymsPushMessage.getPid());
82   - queryWrapper.eq("aid", lymsPushMessage.getAid());
83   - LymsPushedart lymsPushedart = lymsPushedartService.getOne(queryWrapper2);
84   - if(lymsPushedart!=null){
85   - lymsPushMessage.setPushedartId(lymsPushedart.getId());
86   - }
87   - pushedart.setId(lymsPushMessage.getPushedartId());
88   - lymsPushedartService.saveOrUpdate(pushedart);
89   - log.info("推送短消息"+(lymsPushMessage.getIsweixinOne()==1?"1":"2")+",获取token失败！");
90   - continue;
91   - }
92   - //公众号openId为空
93   - if(StringUtil.isEmpty(lymsPushMessage.getGzopenid())){
94   - //更新到LymsPushMessages记录
95   - lymsPushMessage.setState(2);//推送状态：0待推送 1成功 2失败。（在备注写失败原因）
96   - lymsPushMessage.setRemark(lymsPushMessage.getPname()+"：公众号openId为空！");
97   - lymsPushMessage.setPushTime(new Date());
98   - lymsPushMessagesService.updateById(lymsPushMessage);
99   - //更新到LymsPushedart记录
100   - if(null==lymsPushMessage.getPushedartId()){
101   - pushedart.setIsweixinone(2);//是否推送短消息1（0否，1是 2推送失败）
102   - }else {
103   - pushedart.setIsweixintwo(2);//是否推送短消息2（0否，1是 2推送失败）
104   - }
105   - //LymsPushedart的主键id赋值,表示修改。找到以前的推送记录，修改短文字的推送状态
106   - //这里查询为了去掉推送文章的记录重复存
107   - if(lymsPushMessage.getPushedartId()==null){
  65 + //推送公众号消息逻辑
  66 + if(lymsPushMessage.getIsweixinOne()==1||lymsPushMessage.getIsweixinTwo()==1){
  67 + //获取token失败
  68 + if(StringUtil.isEmpty(AccessTokenServlet.accessToken)){
  69 + //更新到LymsPushMessages记录
  70 + lymsPushMessage.setState(2);//推送状态：0待推送 1成功 2失败。（在备注写失败原因）
  71 + lymsPushMessage.setRemark("推送短消息"+(lymsPushMessage.getIsweixinOne()==1?"1":"2")+",获取token失败！");
  72 + lymsPushMessage.setPushTime(new Date());
  73 + lymsPushMessagesService.updateById(lymsPushMessage);
  74 + //更新到LymsPushedart记录
  75 + if(null==lymsPushMessage.getPushedartId()){
  76 + pushedart.setIsweixinone(2);//是否推送短消息1（0否，1是 2推送失败）
  77 + }else {
  78 + pushedart.setIsweixintwo(2);//是否推送短消息2（0否，1是 2推送失败）
  79 + }
  80 + //LymsPushedart的主键id赋值,表示修改。找到以前的推送记录，修改短文字的推送状态
  81 + //这里查询为了去掉推送文章的记录重复存
108 82 QueryWrapper<LymsPushedart> queryWrapper2=new QueryWrapper<>();
109   - queryWrapper2.eq("pid", lymsPushMessage.getPid());
110   - queryWrapper2.eq("aid", lymsPushMessage.getAid());
  83 + queryWrapper.eq("pid", lymsPushMessage.getPid());
  84 + queryWrapper.eq("aid", lymsPushMessage.getAid());
111 85 LymsPushedart lymsPushedart = lymsPushedartService.getOne(queryWrapper2);
112 86 if(lymsPushedart!=null){
113 87 lymsPushMessage.setPushedartId(lymsPushedart.getId());
114 88 }
  89 + pushedart.setId(lymsPushMessage.getPushedartId());
  90 + lymsPushedartService.saveOrUpdate(pushedart);
  91 + log.info("推送短消息"+(lymsPushMessage.getIsweixinOne()==1?"1":"2")+",获取token失败！");
  92 + continue;
115 93 }
116   - pushedart.setId(lymsPushMessage.getPushedartId());
117   - lymsPushedartService.saveOrUpdate(pushedart);
118   - log.info(lymsPushMessage.getPname()+"：公众号openId为空！");
119   - continue;
120   - }
121   - if(lymsPushMessage.getIsweixinOne()==1&&null==lymsPushMessage.getPushedartId()){
122   - //推送微信消息1
123   - Map<String,Object> map=new HashMap<>();
124   - map.put("first",new DataEntity(lymsPushMessage.getWeixTextOne(),"#173177"));
125   - map.put("keyword1",new DataEntity(lymsPushMessage.getPname(),"#173177"));
126   - map.put("keyword2",new DataEntity(lymsPushMessage.getHname(),"#173177"));
127   - map.put("keyword3",new DataEntity(lymsPushMessage.getDname(),"#173177"));
128   - map.put("remark",new DataEntity("预祝您早日康复","#173177"));
129   - Integer code= WeiXinUtil.SendWeChatMsg(lymsPushMessage.getGzopenid(), Constant.GZ_TEMPLATE_ID,map);
130   - if(null==code||code!=0){
  94 + //公众号openId为空
  95 + if(StringUtil.isEmpty(lymsPushMessage.getGzopenid())){
131 96 //更新到LymsPushMessages记录
132 97 lymsPushMessage.setState(2);//推送状态：0待推送 1成功 2失败。（在备注写失败原因）
133   - lymsPushMessage.setRemark("推送短消息1失败。。。"+lymsPushMessage.getPname()+"; code:"+code);
  98 + lymsPushMessage.setRemark(lymsPushMessage.getPname()+"：公众号openId为空！");
134 99 lymsPushMessage.setPushTime(new Date());
135 100 lymsPushMessagesService.updateById(lymsPushMessage);
136 101 //更新到LymsPushedart记录
137   - pushedart.setIsweixinone(2);//是否推送短消息1（0否，1是 2推送失败）
  102 + if(null==lymsPushMessage.getPushedartId()){
  103 + pushedart.setIsweixinone(2);//是否推送短消息1（0否，1是 2推送失败）
  104 + }else {
  105 + pushedart.setIsweixintwo(2);//是否推送短消息2（0否，1是 2推送失败）
  106 + }
138 107 //LymsPushedart的主键id赋值,表示修改。找到以前的推送记录，修改短文字的推送状态
  108 + //这里查询为了去掉推送文章的记录重复存
  109 + if(lymsPushMessage.getPushedartId()==null){
  110 + QueryWrapper<LymsPushedart> queryWrapper2=new QueryWrapper<>();
  111 + queryWrapper2.eq("pid", lymsPushMessage.getPid());
  112 + queryWrapper2.eq("aid", lymsPushMessage.getAid());
  113 + LymsPushedart lymsPushedart = lymsPushedartService.getOne(queryWrapper2);
  114 + if(lymsPushedart!=null){
  115 + lymsPushMessage.setPushedartId(lymsPushedart.getId());
  116 + }
  117 + }
139 118 pushedart.setId(lymsPushMessage.getPushedartId());
140 119 lymsPushedartService.saveOrUpdate(pushedart);
141   - log.info("推送短消息1失败！"+lymsPushMessage.getPname()+"; code:"+code);
  120 + log.info(lymsPushMessage.getPname()+"：公众号openId为空！");
142 121 continue;
143 122 }
144   - //成功标记记录1
145   - pushedart.setIsweixinone(1);//是否推送短消息1（0否，1是 2推送失败）
146   - //插入or更新到LymsPushedart记录
147   - lymsPushedartService.saveOrUpdate(pushedart);
148   - //更新到LymsPushMessages记录
149   - lymsPushMessage.setState(1);//推送状态：0待推送 1成功 2失败。（在备注写失败原因）
150   - lymsPushMessage.setPushTime(new Date());
151   - lymsPushMessagesService.updateById(lymsPushMessage);
152   - }else if(lymsPushMessage.getIsweixinTwo()==1){
153   - //LymsPushedart的主键id赋值,表示修改。找到以前的推送记录，修改短文字的推送状态
154   - pushedart.setId(lymsPushMessage.getPushedartId());
155   - //推送微信消息2
156   - Map<String,Object> map=new HashMap<>();
157   - map.put("first",new DataEntity(lymsPushMessage.getWeixTextTwo(),"#173177"));
158   - map.put("keyword1",new DataEntity(lymsPushMessage.getPname(),"#173177"));
159   - map.put("keyword2",new DataEntity(lymsPushMessage.getHname(),"#173177"));
160   - map.put("keyword3",new DataEntity(lymsPushMessage.getDname(),"#173177"));
161   - map.put("remark",new DataEntity("预祝您早日康复","#173177"));
162   - Integer code= WeiXinUtil.SendWeChatMsg(lymsPushMessage.getGzopenid(),Constant.GZ_TEMPLATE_ID,map);
163   - if(null==code||code!=0){
  123 + if(lymsPushMessage.getIsweixinOne()==1&&null==lymsPushMessage.getPushedartId()){
  124 + //推送微信消息1
  125 + Map<String,Object> map=new HashMap<>();
  126 + map.put("first",new DataEntity(lymsPushMessage.getWeixTextOne(),"#173177"));
  127 + map.put("keyword1",new DataEntity(lymsPushMessage.getPname(),"#173177"));
  128 + map.put("keyword2",new DataEntity(lymsPushMessage.getHname(),"#173177"));
  129 + map.put("keyword3",new DataEntity(lymsPushMessage.getDname(),"#173177"));
  130 + map.put("remark",new DataEntity("预祝您早日康复","#173177"));
  131 + Integer code= WeiXinUtil.SendWeChatMsg(lymsPushMessage.getGzopenid(), Constant.GZ_TEMPLATE_ID,map);
  132 + if(null==code||code!=0){
  133 + //更新到LymsPushMessages记录
  134 + lymsPushMessage.setState(2);//推送状态：0待推送 1成功 2失败。（在备注写失败原因）
  135 + lymsPushMessage.setRemark("推送短消息1失败。。。"+lymsPushMessage.getPname()+"; code:"+code);
  136 + lymsPushMessage.setPushTime(new Date());
  137 + lymsPushMessagesService.updateById(lymsPushMessage);
  138 + //更新到LymsPushedart记录
  139 + pushedart.setIsweixinone(2);//是否推送短消息1（0否，1是 2推送失败）
  140 + //LymsPushedart的主键id赋值,表示修改。找到以前的推送记录，修改短文字的推送状态
  141 + pushedart.setId(lymsPushMessage.getPushedartId());
  142 + lymsPushedartService.saveOrUpdate(pushedart);
  143 + log.info("推送短消息1失败！"+lymsPushMessage.getPname()+"; code:"+code);
  144 + continue;
  145 + }
  146 + //成功标记记录1
  147 + pushedart.setIsweixinone(1);//是否推送短消息1（0否，1是 2推送失败）
  148 + //插入or更新到LymsPushedart记录
  149 + lymsPushedartService.saveOrUpdate(pushedart);
164 150 //更新到LymsPushMessages记录
165   - lymsPushMessage.setState(2);//推送状态：0待推送 1成功 2失败。（在备注写失败原因）
166   - lymsPushMessage.setRemark("推送短消息2失败！"+lymsPushMessage.getPname()+"; code:"+code);
  151 + lymsPushMessage.setState(1);//推送状态：0待推送 1成功 2失败。（在备注写失败原因）
167 152 lymsPushMessage.setPushTime(new Date());
168 153 lymsPushMessagesService.updateById(lymsPushMessage);
169   - //更新到LymsPushedart记录
170   - pushedart.setIsweixintwo(2);//是否推送短消息2（0否，1是 2推送失败）
  154 + }else if(lymsPushMessage.getIsweixinTwo()==1){
  155 + //LymsPushedart的主键id赋值,表示修改。找到以前的推送记录，修改短文字的推送状态
  156 + pushedart.setId(lymsPushMessage.getPushedartId());
  157 + //推送微信消息2
  158 + Map<String,Object> map=new HashMap<>();
  159 + map.put("first",new DataEntity(lymsPushMessage.getWeixTextTwo(),"#173177"));
  160 + map.put("keyword1",new DataEntity(lymsPushMessage.getPname(),"#173177"));
  161 + map.put("keyword2",new DataEntity(lymsPushMessage.getHname(),"#173177"));
  162 + map.put("keyword3",new DataEntity(lymsPushMessage.getDname(),"#173177"));
  163 + map.put("remark",new DataEntity("预祝您早日康复","#173177"));
  164 + Integer code= WeiXinUtil.SendWeChatMsg(lymsPushMessage.getGzopenid(),Constant.GZ_TEMPLATE_ID,map);
  165 + if(null==code||code!=0){
  166 + //更新到LymsPushMessages记录
  167 + lymsPushMessage.setState(2);//推送状态：0待推送 1成功 2失败。（在备注写失败原因）
  168 + lymsPushMessage.setRemark("推送短消息2失败！"+lymsPushMessage.getPname()+"; code:"+code);
  169 + lymsPushMessage.setPushTime(new Date());
  170 + lymsPushMessagesService.updateById(lymsPushMessage);
  171 + //更新到LymsPushedart记录
  172 + pushedart.setIsweixintwo(2);//是否推送短消息2（0否，1是 2推送失败）
  173 + lymsPushedartService.saveOrUpdate(pushedart);
  174 + log.info("推送短消息2失败！"+lymsPushMessage.getPname()+"; code:"+code);
  175 + continue;
  176 + }
  177 + //成功标记记录2
  178 + pushedart.setIsweixintwo(1);//是否推送短消息1（0否，1是 2推送失败）
  179 + //插入or更新到LymsPushedart记录
171 180 lymsPushedartService.saveOrUpdate(pushedart);
172   - log.info("推送短消息2失败！"+lymsPushMessage.getPname()+"; code:"+code);
173   - continue;
  181 + //更新到LymsPushMessages记录
  182 + lymsPushMessage.setState(1);//推送状态：0待推送 1成功 2失败。（在备注写失败原因）
  183 + lymsPushMessage.setPushTime(new Date());
  184 + lymsPushMessagesService.updateById(lymsPushMessage);
174 185 }
175   - //成功标记记录2
176   - pushedart.setIsweixintwo(1);//是否推送短消息1（0否，1是 2推送失败）
177   - //插入or更新到LymsPushedart记录
178   - lymsPushedartService.saveOrUpdate(pushedart);
179   - //更新到LymsPushMessages记录
180   - lymsPushMessage.setState(1);//推送状态：0待推送 1成功 2失败。（在备注写失败原因）
181   - lymsPushMessage.setPushTime(new Date());
182   - lymsPushMessagesService.updateById(lymsPushMessage);
183 186 }
184 187 //更新到LymsPushMessages记录(推送的是文章的情况IsweixinOne和IsweixinTwo都是0的时候)
185 188 lymsPushMessage.setState(1);//推送状态：0待推送 1成功 2失败。（在备注写失败原因）