|
|
@ -4,6 +4,7 @@ package com.shxy.xymanager_service.impl;
|
|
|
|
import com.shxy.xymanager_common.entity.*;
|
|
|
|
import com.shxy.xymanager_common.entity.*;
|
|
|
|
import com.shxy.xymanager_common.exception.ApiException;
|
|
|
|
import com.shxy.xymanager_common.exception.ApiException;
|
|
|
|
import com.shxy.xymanager_common.util.JSONUtil;
|
|
|
|
import com.shxy.xymanager_common.util.JSONUtil;
|
|
|
|
|
|
|
|
import com.shxy.xymanager_common.util.StringUtils;
|
|
|
|
import com.shxy.xymanager_dao.dao.*;
|
|
|
|
import com.shxy.xymanager_dao.dao.*;
|
|
|
|
import com.shxy.xymanager_service.service.CmdService;
|
|
|
|
import com.shxy.xymanager_service.service.CmdService;
|
|
|
|
import com.shxy.xymanager_service.service.TerminalExtService;
|
|
|
|
import com.shxy.xymanager_service.service.TerminalExtService;
|
|
|
@ -105,10 +106,12 @@ public class MntnServiceImpl implements MntnService {
|
|
|
|
|
|
|
|
|
|
|
|
private HashMap<String, Object> buildCmdMap(MntnCmds cmd) throws Exception {
|
|
|
|
private HashMap<String, Object> buildCmdMap(MntnCmds cmd) throws Exception {
|
|
|
|
HashMap<String, Object> result = new HashMap<>();
|
|
|
|
HashMap<String, Object> result = new HashMap<>();
|
|
|
|
HashMap<String, Object> data = JSONUtil.json2Object(cmd.getCmd(), HashMap.class);
|
|
|
|
if (StringUtils.isNotBlank(cmd.getCmd())) {
|
|
|
|
result.putAll(data);
|
|
|
|
HashMap<String, Object> data = JSONUtil.json2Object(cmd.getCmd(), HashMap.class);
|
|
|
|
result.put("cid", cmd.getId());
|
|
|
|
result.putAll(data);
|
|
|
|
result.put("cmd", cmd.getName());
|
|
|
|
result.put("cid", cmd.getId());
|
|
|
|
|
|
|
|
result.put("cmd", cmd.getName());
|
|
|
|
|
|
|
|
}
|
|
|
|
if ("upgrade".equalsIgnoreCase(cmd.getName())) {
|
|
|
|
if ("upgrade".equalsIgnoreCase(cmd.getName())) {
|
|
|
|
result.put("isUpgrade", 1);
|
|
|
|
result.put("isUpgrade", 1);
|
|
|
|
result.put("sj", 1);
|
|
|
|
result.put("sj", 1);
|
|
|
|