wms / wms4_shenzhenxinyi · Commits

Commit cd6fb2c533d12d444368068d9d514249e059948d

Authored by 谭毅彬
1 parent 07fd519e

消息推送BUG修复 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 7 changed files with 28 additions and 35 deletions
ant-design-vue-jeecg/src/components/tools/HeaderNotice.vue
  View file @cd6fb2c
... ... @@ -195,7 +195,7 @@ export default {
195 195 this.$router.push({
196 196 path: '/system/shipment/ShipmentHeaderList'
197 197 });
198   - }else {
  198 + } else {
199 199 this.$refs.ShowAnnouncement.detail(record);
200 200 }
201 201 },
... ... @@ -208,7 +208,7 @@ export default {
208 208 var that = this;
209 209 putAction(that.url.readAllMsg).then((res) => {
210 210 if (res.success) {
211   - that.$message.success(res.message);
  211 + // that.$message.success(res.message);
212 212 that.loadData();
213 213 }
214 214 });
... ...
ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue
  View file @cd6fb2c
... ... @@ -168,7 +168,7 @@ export default {
168 168 onOk: function () {
169 169 putAction(that.url.readAllMsg).then((res) => {
170 170 if (res.success) {
171   - that.$message.success(res.message);
  171 + // that.$message.success(res.message);
172 172 that.loadData();
173 173 // that.syncHeadNotic();
174 174 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
  View file @cd6fb2c
... ... @@ -267,8 +267,7 @@ public class SysAnnouncementController {
267 267 webSocket.sendMessage(obj.toJSONString());
268 268 } else {
269 269 // 2.插入用户通告阅读标记表记录
270   - String userId = sysAnnouncement.getUserIds();
271   - String[] userIds = userId.substring(0, (userId.length() - 1)).split(",");
  270 + String[] userIds = sysAnnouncement.getUserIds().split(",");
272 271 // String anntId = sysAnnouncement.getId();
273 272 // Date refDate = new Date();
274 273 JSONObject obj = new JSONObject();
... ... @@ -459,22 +458,21 @@ public class SysAnnouncementController {
459 458 SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(anntId);
460 459 if (sysAnnouncement == null) {
461 460 result.error500("未找到对应实体");
  461 + return result;
  462 + }
  463 + if (sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) {
  464 + obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
  465 + obj.put(WebsocketConst.MSG_ID, sysAnnouncement.getId());
  466 + obj.put(WebsocketConst.MSG_TXT, sysAnnouncement.getTitile());
  467 + webSocket.sendMessage(obj.toJSONString());
462 468 } else {
463   - if (sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) {
464   - obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
  469 + // 2.插入用户通告阅读标记表记录
  470 + if (oConvertUtils.isNotEmpty(sysAnnouncement.getUserIds())) {
  471 + String[] userIds = sysAnnouncement.getUserIds().split(",");
  472 + obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
465 473 obj.put(WebsocketConst.MSG_ID, sysAnnouncement.getId());
466 474 obj.put(WebsocketConst.MSG_TXT, sysAnnouncement.getTitile());
467   - webSocket.sendMessage(obj.toJSONString());
468   - } else {
469   - // 2.插入用户通告阅读标记表记录
470   - String userId = sysAnnouncement.getUserIds();
471   - if (oConvertUtils.isNotEmpty(userId)) {
472   - String[] userIds = userId.substring(0, (userId.length() - 1)).split(",");
473   - obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
474   - obj.put(WebsocketConst.MSG_ID, sysAnnouncement.getId());
475   - obj.put(WebsocketConst.MSG_TXT, sysAnnouncement.getTitile());
476   - webSocket.sendMessage(userIds, obj.toJSONString());
477   - }
  475 + webSocket.sendMessage(userIds, obj.toJSONString());
478 476 }
479 477 }
480 478 } else {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
  View file @cd6fb2c
... ... @@ -244,9 +244,10 @@ public class SysAnnouncementSendController {
244 244 updateWrapper.last("where user_id ='" + userId + "'");
245 245 SysAnnouncementSend announcementSend = new SysAnnouncementSend();
246 246 sysAnnouncementSendService.update(announcementSend, updateWrapper);
247   -// JSONObject socketParams = new JSONObject();
248   -// socketParams.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
249   -// webSocket.sendMessage(socketParams.toJSONString());
  247 + JSONObject socketParams = new JSONObject();
  248 + socketParams.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
  249 + socketParams.put(WebsocketConst.MSG_TXT, "消息全部已读");
  250 + webSocket.sendMessage(socketParams.toJSONString());
250 251 result.setSuccess(true);
251 252 result.setMessage("全部已读");
252 253 return result;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
  View file @cd6fb2c
... ... @@ -58,14 +58,10 @@ public class SysAnnouncementServiceImpl extends ServiceImpl&lt;SysAnnouncementMappe
58 58 @Transactional
59 59 @Override
60 60 public void saveAnnouncement(SysAnnouncement sysAnnouncement) {
61   - if (CommonConstant.MSG_TYPE_ALL.equals(sysAnnouncement.getMsgType())) {
62   - sysAnnouncementMapper.insert(sysAnnouncement);
63   - } else {
64   - // 1.插入通告表记录
65   - sysAnnouncementMapper.insert(sysAnnouncement);
  61 + sysAnnouncementMapper.insert(sysAnnouncement);
  62 + if (!sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) {
66 63 // 2.插入用户通告阅读标记表记录
67   - String userId = sysAnnouncement.getUserIds();
68   - String[] userIds = userId.substring(0, (userId.length() - 1)).split(",");
  64 + String[] userIds = sysAnnouncement.getUserIds().split(",");
69 65 Integer anntId = sysAnnouncement.getId();
70 66 Date refDate = new Date();
71 67 for (int i = 0; i < userIds.length; i++) {
... ... @@ -208,7 +204,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl&lt;SysAnnouncementMappe
208 204 String userId = sysAnnouncement.getUserIds();
209 205 if (oConvertUtils.isNotEmpty(userId) && sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_UESR)) {
210 206 // 2.补充新的通知用户数据
211   - String[] userIds = userId.substring(0, (userId.length() - 1)).split(",");
  207 + String[] userIds = sysAnnouncement.getUserIds().split(",");
212 208 Integer anntId = sysAnnouncement.getId();
213 209 Date refDate = new Date();
214 210 for (int i = 0; i < userIds.length; i++) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java
  View file @cd6fb2c
... ... @@ -799,9 +799,8 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
799 799 } else {
800 800 // 将userId转为username
801 801 String[] userIds = null;
802   - String userId = announcement.getUserIds();
803   - if (oConvertUtils.isNotEmpty(userId)) {
804   - userIds = userId.substring(0, (userId.length() - 1)).split(",");
  802 + if (oConvertUtils.isNotEmpty(announcement.getUserIds())) {
  803 + userIds = announcement.getUserIds().split(",");
805 804 } else {
806 805 LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<>();
807 806 queryWrapper.eq(SysAnnouncementSend::getAnntId, announcement.getId());
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java
  View file @cd6fb2c
... ... @@ -772,10 +772,9 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
772 772 String usernameString = "";
773 773 if (!isToAll) {
774 774 // 将userId转为username
775   - String userId = announcement.getUserIds();
776 775 String[] userIds = null;
777   - if (oConvertUtils.isNotEmpty(userId)) {
778   - userIds = userId.substring(0, (userId.length() - 1)).split(",");
  776 + if (oConvertUtils.isNotEmpty(announcement.getUserIds())) {
  777 + userIds = announcement.getUserIds().split(",");
779 778 } else {
780 779 LambdaQueryWrapper<SysAnnouncementSend> queryWrapper = new LambdaQueryWrapper<>();
781 780 queryWrapper.eq(SysAnnouncementSend::getAnntId, announcement.getId());
... ...