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 cda6e09..38c424c 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 @@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.HashMap; @RestController @Api(tags = {"命令相关接口"}) @@ -23,6 +24,24 @@ public class CmdController extends BaseController { @Resource CmdService cmdsService; + @GetMapping("listAction") + @ApiOperation("命令列表") + public ResponseReult> listAction() { + HashMap map = new HashMap<>(); + map.put("yw_cmd_android_reboot", "重启设备"); + map.put("yw_cmd_mcu_reboot", "MCU单片机重启"); + map.put("i1_cmd_set_i1_server_ip_port", "设置I1服务器"); + map.put("i1_cmd_set_xy_yw_ip_port", "设置运维服务器"); + map.put("i1_cmd_set_i1_heart_beat_time", "设置心跳周期"); + map.put("yw_cmd_upload_i1_zip_log", "上传日志"); + map.put("upgrade", "升级"); + map.put("yw_cmd_start_frpc", "开启frpc"); + map.put("yw_cmd_stop_frpc", "停止frpc"); + map.put("i1_cmd_stop_aging_test", "停止老化测试"); + map.put("updOta", "Ota升级"); + return ResponseReult.success(map); + } + @PostMapping("send") @ApiOperation("下达命令") public ResponseReult send(@RequestBody CmdModel model) throws Exception { 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 8db280e..3be1bb3 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 @@ -163,34 +163,34 @@ public class CmdServiceImpl implements CmdService { case "quickhb": this.quickhb(model); break; - case "reset": + case "yw_cmd_android_reboot": this.reset(model); break; - case "reset-mcu": + case "yw_cmd_mcu_reboot": this.resetmcu(model); break; - case "upload-logs": + case "yw_cmd_upload_i1_zip_log": this.uploadlogs(model); break; - case "set-cma": + case "i1_cmd_set_i1_server_ip_port": this.setcma(model); break; - case "set-mntn": + case "i1_cmd_set_xy_yw_ip_port": this.setmntn(model); break; - case "set-hb": + case "i1_cmd_set_i1_heart_beat_time": this.sethb(model); break; case "upgrade": this.upgrade(model); break; - case "start-frpc": + case "yw_cmd_start_frpc": this.startfrpc(model); break; - case "stop-frpc": + case "yw_cmd_stop_frpc": this.stopfrpc(model); break; - case "stop-aging-test": + case "i1_cmd_stop_aging_test": this.stopagingtest(model); break; default: @@ -282,150 +282,168 @@ public class CmdServiceImpl implements CmdService { } private void reset(CmdModel model) { - if (model.getTermId() == null) { - throw new ApiException("termId不能为空"); + if (CollectionUtils.isEmpty(model.getTermIds())) { + throw new ApiException("termIds不能为空"); } String name = "yw_cmd_android_reboot"; - MntnCmdsExample example = new MntnCmdsExample(); - MntnCmdsExample.Criteria criteria = example.createCriteria(); - criteria.andTermIdEqualTo(model.getTermId()); - criteria.andNameEqualTo(name); - cmdsMapper.deleteByExample(example); - MntnCmds cmd = new MntnCmds(); - cmd.setTermId(model.getTermId()); - cmd.setName(name); - cmd.setCreateTime(new Date()); - cmdsMapper.insert(cmd); + for (Integer termId : model.getTermIds()) { + MntnCmdsExample example = new MntnCmdsExample(); + MntnCmdsExample.Criteria criteria = example.createCriteria(); + criteria.andTermIdEqualTo(termId); + criteria.andNameEqualTo(name); + cmdsMapper.deleteByExample(example); + + MntnCmds cmd = new MntnCmds(); + cmd.setTermId(termId); + cmd.setName(name); + cmd.setCreateTime(new Date()); + cmdsMapper.insert(cmd); + } } private void resetmcu(CmdModel model) { - if (model.getTermId() == null) { - throw new ApiException("termId不能为空"); + if (CollectionUtils.isEmpty(model.getTermIds())) { + throw new ApiException("termIds不能为空"); } String name = "yw_cmd_mcu_reboot"; - MntnCmdsExample example = new MntnCmdsExample(); - MntnCmdsExample.Criteria criteria = example.createCriteria(); - criteria.andTermIdEqualTo(model.getTermId()); - criteria.andNameEqualTo(name); - cmdsMapper.deleteByExample(example); - MntnCmds cmd = new MntnCmds(); - cmd.setTermId(model.getTermId()); - cmd.setName(name); - cmd.setCreateTime(new Date()); - cmdsMapper.insert(cmd); + for (Integer termId : model.getTermIds()) { + MntnCmdsExample example = new MntnCmdsExample(); + MntnCmdsExample.Criteria criteria = example.createCriteria(); + criteria.andTermIdEqualTo(termId); + criteria.andNameEqualTo(name); + cmdsMapper.deleteByExample(example); + + MntnCmds cmd = new MntnCmds(); + cmd.setTermId(termId); + cmd.setName(name); + cmd.setCreateTime(new Date()); + cmdsMapper.insert(cmd); + } } private void uploadlogs(CmdModel model) { - if (model.getTermId() == null) { - throw new ApiException("termId不能为空"); + if (CollectionUtils.isEmpty(model.getTermIds())) { + throw new ApiException("termIds不能为空"); } else if (StringUtils.isBlank(model.getUrl())) { throw new ApiException("url不能为空"); } String name = "yw_cmd_upload_i1_zip_log"; - MntnCmdsExample example = new MntnCmdsExample(); - MntnCmdsExample.Criteria criteria = example.createCriteria(); - criteria.andTermIdEqualTo(model.getTermId()); - criteria.andNameEqualTo(name); - cmdsMapper.deleteByExample(example); - - HashMap map = new HashMap<>(); - map.put("url", model.getUrl()); - String json = JSONUtil.object2Json(map); - MntnCmds cmd = new MntnCmds(); - cmd.setTermId(model.getTermId()); - cmd.setName(name); - cmd.setCmd(json); - cmd.setCreateTime(new Date()); - cmdsMapper.insert(cmd); + 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("url", model.getUrl()); + 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 setcma(CmdModel model) { - if (model.getTermId() == null) { - throw new ApiException("termId不能为空"); + if (CollectionUtils.isEmpty(model.getTermIds())) { + throw new ApiException("termIds不能为空"); } else if (StringUtils.isBlank(model.getIp())) { throw new ApiException("ip不能为空"); } else if (model.getPort() == null) { throw new ApiException("port不能为空"); } String name = "i1_cmd_set_i1_server_ip_port"; - MntnCmdsExample example = new MntnCmdsExample(); - MntnCmdsExample.Criteria criteria = example.createCriteria(); - criteria.andTermIdEqualTo(model.getTermId()); - criteria.andNameEqualTo(name); - cmdsMapper.deleteByExample(example); - - HashMap map = new HashMap<>(); - map.put("value_str", model.getIp()); - map.put("value_int", model.getPort()); - String json = JSONUtil.object2Json(map); - MntnCmds cmd = new MntnCmds(); - cmd.setTermId(model.getTermId()); - cmd.setName(name); - cmd.setCmd(json); - cmd.setCreateTime(new Date()); - cmdsMapper.insert(cmd); + 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("value_str", model.getIp()); + map.put("value_int", model.getPort()); + 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 setmntn(CmdModel model) { - if (model.getTermId() == null) { - throw new ApiException("termId不能为空"); + if (CollectionUtils.isEmpty(model.getTermIds())) { + throw new ApiException("termIds不能为空"); } else if (StringUtils.isBlank(model.getIp())) { throw new ApiException("ip不能为空"); } else if (model.getPort() == null) { throw new ApiException("port不能为空"); } String name = "i1_cmd_set_xy_yw_ip_port"; - MntnCmdsExample example = new MntnCmdsExample(); - MntnCmdsExample.Criteria criteria = example.createCriteria(); - criteria.andTermIdEqualTo(model.getTermId()); - criteria.andNameEqualTo(name); - cmdsMapper.deleteByExample(example); - - HashMap map = new HashMap<>(); - map.put("value_str", model.getIp()); - map.put("value_int", model.getPort()); - String json = JSONUtil.object2Json(map); - MntnCmds cmd = new MntnCmds(); - cmd.setTermId(model.getTermId()); - cmd.setName(name); - cmd.setCmd(json); - cmd.setCreateTime(new Date()); - cmdsMapper.insert(cmd); + 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("value_str", model.getIp()); + map.put("value_int", model.getPort()); + 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 sethb(CmdModel model) { - if (model.getTermId() == null) { - throw new ApiException("termId不能为空"); + if (CollectionUtils.isEmpty(model.getTermIds())) { + throw new ApiException("termIds不能为空"); } else if (model.getHb() == null) { throw new ApiException("hb不能为空"); } String name = "i1_cmd_set_i1_heart_beat_time"; - MntnCmdsExample example = new MntnCmdsExample(); - MntnCmdsExample.Criteria criteria = example.createCriteria(); - criteria.andTermIdEqualTo(model.getTermId()); - criteria.andNameEqualTo(name); - cmdsMapper.deleteByExample(example); - HashMap map = new HashMap<>(); - map.put("value_int", model.getHb()); - String json = JSONUtil.object2Json(map); - - MntnCmds cmd = new MntnCmds(); - cmd.setTermId(model.getTermId()); - cmd.setName(name); - cmd.setCmd(json); - cmd.setCreateTime(new Date()); - cmdsMapper.insert(cmd); + 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("value_int", model.getHb()); + 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 upgrade(CmdModel model) { - if (model.getTermId() == null) { - throw new ApiException("termId不能为空"); + if (CollectionUtils.isEmpty(model.getTermIds())) { + throw new ApiException("termIds不能为空"); } else if (StringUtils.isBlank(model.getUrl())) { throw new ApiException("url不能为空"); } else if (StringUtils.isBlank(model.getMd5())) { @@ -434,24 +452,27 @@ public class CmdServiceImpl implements CmdService { throw new ApiException("fn不能为空"); } String name = "upgrade"; - MntnCmdsExample example = new MntnCmdsExample(); - MntnCmdsExample.Criteria criteria = example.createCriteria(); - criteria.andTermIdEqualTo(model.getTermId()); - criteria.andNameEqualTo(name); - cmdsMapper.deleteByExample(example); - - HashMap map = new HashMap<>(); - map.put("url", model.getUrl()); - map.put("md5", model.getMd5()); - map.put("fileName", model.getFn()); - String json = JSONUtil.object2Json(map); - MntnCmds cmd = new MntnCmds(); - cmd.setTermId(model.getTermId()); - cmd.setName(name); - cmd.setCmd(json); - cmd.setCreateTime(new Date()); - cmdsMapper.insert(cmd); + 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("url", model.getUrl()); + map.put("md5", model.getMd5()); + map.put("fileName", model.getFn()); + 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 startfrpc(CmdModel model) { @@ -500,38 +521,44 @@ public class CmdServiceImpl implements CmdService { } private void stopfrpc(CmdModel model) { - if (model.getTermId() == null) { - throw new ApiException("termId不能为空"); + if (CollectionUtils.isEmpty(model.getTermIds())) { + throw new ApiException("termIds不能为空"); } String name = "yw_cmd_stop_frpc"; - MntnCmdsExample example = new MntnCmdsExample(); - MntnCmdsExample.Criteria criteria = example.createCriteria(); - criteria.andTermIdEqualTo(model.getTermId()); - criteria.andNameEqualTo(name); - cmdsMapper.deleteByExample(example); - MntnCmds cmd = new MntnCmds(); - cmd.setTermId(model.getTermId()); - cmd.setName(name); - cmd.setCreateTime(new Date()); - cmdsMapper.insert(cmd); + for (Integer termId : model.getTermIds()) { + MntnCmdsExample example = new MntnCmdsExample(); + MntnCmdsExample.Criteria criteria = example.createCriteria(); + criteria.andTermIdEqualTo(termId); + criteria.andNameEqualTo(name); + cmdsMapper.deleteByExample(example); + + MntnCmds cmd = new MntnCmds(); + cmd.setTermId(termId); + cmd.setName(name); + cmd.setCreateTime(new Date()); + cmdsMapper.insert(cmd); + } } private void stopagingtest(CmdModel model) { - if (model.getTermId() == null) { - throw new ApiException("termId不能为空"); + if (CollectionUtils.isEmpty(model.getTermIds())) { + throw new ApiException("termIds不能为空"); } String name = "i1_cmd_stop_aging_test"; - MntnCmdsExample example = new MntnCmdsExample(); - MntnCmdsExample.Criteria criteria = example.createCriteria(); - criteria.andTermIdEqualTo(model.getTermId()); - criteria.andNameEqualTo(name); - cmdsMapper.deleteByExample(example); - MntnCmds cmd = new MntnCmds(); - cmd.setTermId(model.getTermId()); - cmd.setName(name); - cmd.setCreateTime(new Date()); - cmdsMapper.insert(cmd); + for (Integer termId : model.getTermIds()) { + MntnCmdsExample example = new MntnCmdsExample(); + MntnCmdsExample.Criteria criteria = example.createCriteria(); + criteria.andTermIdEqualTo(termId); + criteria.andNameEqualTo(name); + cmdsMapper.deleteByExample(example); + + MntnCmds cmd = new MntnCmds(); + cmd.setTermId(termId); + cmd.setName(name); + cmd.setCreateTime(new Date()); + cmdsMapper.insert(cmd); + } } }