moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app内更新-更新状态时广播推送

Browse Source
This commit is contained in:
yeungchihang
2022-11-07 11:50:58 +08:00
parent dd954f01e9
commit 43c3a3e641
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AppVersionAdminService.java
View File

@@ -2,6 +2,10 @@ package com.accompany.admin.service.system;
import com.accompany.admin.base.AbstractCoreService;
import com.accompany.admin.common.BusinessException;
import com.accompany.business.service.SendSysMsgService;
import com.accompany.business.vo.AppVersionVo;
import com.accompany.common.config.SystemConfig;
import com.accompany.common.constant.Attach;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.GsonUtil;
import com.accompany.core.base.BaseMapper;
@@ -49,6 +53,8 @@ public class AppVersionAdminService extends AbstractCoreService<AppVersion, AppV
private AppVersionService appVersionService;
@Autowired
private SysConfAdminService sysConfNacosAdminService;
@Autowired
private SendSysMsgService sendSysMsgService;
public PageInfo<AppVersion> getVersionByPage(int page, int size, String os, String platform, String version) {
PageHelper.startPage(page, size);
@@ -214,6 +220,8 @@ public class AppVersionAdminService extends AbstractCoreService<AppVersion, AppV
throw new RuntimeException(e);
}
sendVersionMsg(entity);
AppVersion updateEntity = new AppVersion();
updateEntity.setStatus(Constant.AppVersion.online);
@@ -288,6 +296,15 @@ public class AppVersionAdminService extends AbstractCoreService<AppVersion, AppV
return count;
}
public void sendVersionMsg(AppVersion newVersion){
Attach attach = new Attach();
attach.setFirst(Constant.DefMsgType.Version);
attach.setSecond(Constant.DefMsgType.ForceUpdateVersion);
AppVersionVo vo = appVersionService.toVo(newVersion);
attach.setData(vo);
sendSysMsgService.broadCastMsg(SystemConfig.secretaryUid, GsonUtil.getGson().toJson(attach));
}
@Override
public boolean beforeInsert(AppVersion entity) {
Date now = new Date();

7
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AppVersionAdminController.java
View File

@@ -53,8 +53,6 @@ public class AppVersionAdminController extends BaseController {
private AppVersionAdminService appVersionAdminService;
@Autowired
private QinniuService qiuniuService;
@Autowired
private SendSysMsgService sendSysMsgService;
@Resource(name = "bizExecutor")
private TaskExecutor bizExecutor;
@Autowired
@@ -292,7 +290,7 @@ public class AppVersionAdminController extends BaseController {
/**
* 推送强制更新全服广播
*/
@RequestMapping(value = "/sendVersionMsg", method = RequestMethod.POST)
/*@RequestMapping(value = "/sendVersionMsg", method = RequestMethod.POST)
@ResponseBody
public void sendVersionMsg() {
Attach attach = new Attach();
@@ -300,6 +298,5 @@ public class AppVersionAdminController extends BaseController {
attach.setSecond(Constant.DefMsgType.ForceUpdateVersion);
sendSysMsgService.broadCastMsg(SystemConfig.secretaryUid, GsonUtil.getGson().toJson(attach));
writeJson(true, "推送成功");
}
}*/
}

24
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppVersionService.java
View File

@@ -335,6 +335,19 @@ public class AppVersionService extends BaseService {
return diff;
}
public AppVersionVo toVo(AppVersion data){
AppVersionVo appVersionVo = new AppVersionVo();
appVersionVo.setUpdateVersion(data.getVersion());
appVersionVo.setUpdateVersionDesc(data.getVersionDesc());
appVersionVo.setUpdateOs(data.getOs());
appVersionVo.setUpdateStatus(data.getStatus());
appVersionVo.setUpdateFileMd5(data.getFileMd5());
appVersionVo.setUpdateDownloadLink(data.getDownloadLink());
ReplaceDomainUtil.handlerForObject(appVersionVo);
return appVersionVo;
}
/**
* 查询最新版本
*
@@ -353,16 +366,7 @@ public class AppVersionService extends BaseService {
return null;
}
// 将最新的版本及描述加入Vo
AppVersionVo appVersionVo = new AppVersionVo();
appVersionVo.setUpdateVersion(newestVersion.getVersion());
appVersionVo.setUpdateVersionDesc(newestVersion.getVersionDesc());
appVersionVo.setUpdateOs(newestVersion.getOs());
appVersionVo.setUpdateStatus(newestVersion.getStatus());
appVersionVo.setUpdateFileMd5(newestVersion.getFileMd5());
appVersionVo.setUpdateDownloadLink(newestVersion.getDownloadLink());
ReplaceDomainUtil.handlerForObject(appVersionVo);
return appVersionVo;
return toVo(newestVersion);
}