diff --git a/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/SpeedUtils.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/SpeedUtils.java index e6ca2c3..1d9b47c 100644 --- a/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/SpeedUtils.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/utils/SpeedUtils.java @@ -146,8 +146,7 @@ public class SpeedUtils { switch (unit) { case "Gb": return new BigDecimal("1000000000"); case "Mb": return new BigDecimal("1000000"); - case "Kb": return new BigDecimal("1000"); - default: return BigDecimal.ONE; // bit + default: return new BigDecimal("1000"); //Kb } } public static String calculateUnit(List list, @@ -223,7 +222,7 @@ public class SpeedUtils { BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, - "bit" + "Kb" ); } diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmResourceRemoteController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmResourceRemoteController.java index c0a54c8..d46fa53 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmResourceRemoteController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmResourceRemoteController.java @@ -8,10 +8,12 @@ import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.rocketmq.domain.RmResourceRemote; import com.tongran.rocketmq.service.IRmResourceRemoteService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; -import java.util.Map; /** * 资源远程管理Controller @@ -48,7 +50,7 @@ public class RmResourceRemoteController extends BaseController pageDomain.setPageNum(rmResourceRemote.getPageNum()); pageDomain.setPageSize(rmResourceRemote.getPageSize()); startPage(pageDomain); - List> list = rmResourceRemoteService.getScriptResultByScriptId(rmResourceRemote); + List list = rmResourceRemoteService.getScriptResultByScriptId(rmResourceRemote); return getDataTable(list); } diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmResourceRemote.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmResourceRemote.java index 88bf943..1b86c2d 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmResourceRemote.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmResourceRemote.java @@ -61,4 +61,6 @@ public class RmResourceRemote extends BaseEntity private Integer resultFlag; /** 脚本id */ private Long scriptId; + /** 结果 */ + private String content; } diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmResourceRemoteService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmResourceRemoteService.java index c0f9502..ccd7cca 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmResourceRemoteService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IRmResourceRemoteService.java @@ -68,5 +68,5 @@ public interface IRmResourceRemoteService * @param rmResourceRemote * @return */ - List> getScriptResultByScriptId(RmResourceRemote rmResourceRemote); + List getScriptResultByScriptId(RmResourceRemote rmResourceRemote); } diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmResourceRemoteServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmResourceRemoteServiceImpl.java index b0b2c4b..aabca4c 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmResourceRemoteServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmResourceRemoteServiceImpl.java @@ -139,7 +139,7 @@ public class RmResourceRemoteServiceImpl implements IRmResourceRemoteService } @Override - public List> getScriptResultByScriptId(RmResourceRemote rmResourceRemote) { + public List getScriptResultByScriptId(RmResourceRemote rmResourceRemote) { // 脚本执行结果构建 List> scriptList = new ArrayList<>(); List reslutList = rmResourceRemoteMapper.selectRmResourceRemoteList(rmResourceRemote); @@ -155,12 +155,13 @@ public class RmResourceRemoteServiceImpl implements IRmResourceRemoteService Map map = new HashMap<>(); Date createTime = resourceRemote.getCreateTime(); String createTimeStr = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", createTime); + resourceRemote.setContent(resultSb + ""); map.put("createTime", createTimeStr); map.put("content", resultSb); map.put("clientId", resourceRemote.getClientId()); map.put("resultFlag", resourceRemote.getResultFlag()); scriptList.add(map); } - return scriptList; + return reslutList; } }