diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/CmdController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/CmdController.java index ba43287..77c07e2 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/CmdController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/CmdController.java @@ -49,6 +49,7 @@ public class CmdController extends BaseController { list.add(new ActionModel(14, "push_file", "推送文件")); list.add(new ActionModel(15, "upd_cfg", "修改配置文件")); list.add(new ActionModel(16, "list_files", "列出目录下的文件名")); + list.add(new ActionModel(17, "yw_app_upd_ota", "App增量更新")); return ResponseReult.success(list); } diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java index 2b52f86..1bb37d0 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java @@ -32,7 +32,7 @@ public class TermSetController extends BaseController { @Autowired TermSetService termSetService; - @Resource + @Autowired StoreCameraScheduleTask cameraScheduleTask; @ApiOperation(value = "声光报警", notes = "声光报警", httpMethod = "POST") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/CmdModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/CmdModel.java index 15690be..1ffe006 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/CmdModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/CmdModel.java @@ -35,4 +35,8 @@ public class CmdModel { private Integer noSpecData; private Long mTime; private String filter; + private String oldurl; + private String otaurl; + private String appurl; + private String key; } diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/StoreCameraScheduleTask.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/StoreCameraScheduleTask.java index eb3edd1..f0ba783 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/StoreCameraScheduleTask.java +++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/StoreCameraScheduleTask.java @@ -53,7 +53,7 @@ public class StoreCameraScheduleTask { } @Scheduled(initialDelay = 60000, fixedDelay = 60000) - private void store() { + public void store() { Iterator it = Constants.scheduleRequestMap.keySet().iterator(); while (shutdown == 0 && it.hasNext()) { Integer requestid = it.next(); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CmdServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CmdServiceImpl.java index 47f8410..a565090 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CmdServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CmdServiceImpl.java @@ -246,6 +246,9 @@ public class CmdServiceImpl implements CmdService { case "upgrade": this.upgrade(model); break; + case "yw_app_upd_ota": + this.appUpdOta(model); + break; case "upd_cfg": this.updateCfg(model); break; @@ -664,6 +667,46 @@ public class CmdServiceImpl implements CmdService { } } + private void appUpdOta(CmdModel model) { + if (CollectionUtils.isEmpty(model.getTermIds())) { + throw new ApiException("termIds不能为空"); + } else if (StringUtils.isBlank(model.getOldurl())) { + throw new ApiException("oldurl不能为空"); + } else if (StringUtils.isBlank(model.getMd5())) { + throw new ApiException("md5不能为空"); + } else if (StringUtils.isBlank(model.getOtaurl())) { + throw new ApiException("otaurl不能为空"); + } else if (StringUtils.isBlank(model.getAppurl())) { + throw new ApiException("appurl不能为空"); + } else if (StringUtils.isBlank(model.getKey())) { + throw new ApiException("key不能为空"); + } + String name = "yw_app_upd_ota"; + + for (Integer termId : model.getTermIds()) { + MntnCmdsExample example = new MntnCmdsExample(); + MntnCmdsExample.Criteria criteria = example.createCriteria(); + criteria.andTermIdEqualTo(termId); + criteria.andNameEqualTo(name); + cmdsMapper.deleteByExample(example); + + HashMap map = new HashMap<>(); + map.put("oldurl", model.getOldurl()); + map.put("otaurl", model.getOtaurl()); + map.put("appurl", model.getAppurl()); + map.put("md5", model.getMd5()); + map.put("key", model.getKey()); + String json = JSONUtil.object2Json(map); + + MntnCmds cmd = new MntnCmds(); + cmd.setTermId(termId); + cmd.setName(name); + cmd.setCmd(json); + cmd.setCreateTime(new Date()); + cmdsMapper.insert(cmd); + } + } + private void dlFile(CmdModel model) { if (CollectionUtils.isEmpty(model.getTermIds())) { throw new ApiException("termIds不能为空");