From 8ec6a1df9a4212be30a11797e03b4c6cf46f4c27 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 22 七月 2022 13:24:45 +0800
Subject: [PATCH] 优化代码 属性加入ID
---
service-common/src/main/java/com/java110/common/cmd/machine/ListMachineCmd.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machine/ListMachineCmd.java b/service-common/src/main/java/com/java110/common/cmd/machine/ListMachineCmd.java
index 274acf4..ce64e15 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machine/ListMachineCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machine/ListMachineCmd.java
@@ -20,32 +20,30 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.log.LoggerFactory;
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.community.CommunityLocationDto;
+import com.java110.dto.machine.MachineDto;
import com.java110.dto.unit.FloorAndUnitDto;
import com.java110.intf.common.IMachineInnerServiceSMO;
-import com.java110.intf.common.IMachineV1InnerServiceSMO;
import com.java110.intf.community.*;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
-import com.java110.vo.ResultVo;
import com.java110.vo.api.machine.ApiMachineDataVo;
import com.java110.vo.api.machine.ApiMachineVo;
+import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-import com.java110.dto.machine.MachineDto;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import java.text.ParseException;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
-import java.util.ArrayList;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.HttpStatus;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
/**
@@ -61,7 +59,7 @@
@Java110Cmd(serviceCode = "machine.listMachines")
public class ListMachineCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(ListMachineCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(ListMachineCmd.class);
@Autowired
private IMachineInnerServiceSMO machineInnerServiceSMOImpl;
@@ -129,20 +127,20 @@
String heartbeatTime = machineDto.getHeartbeatTime();
try {
if (StringUtil.isEmpty(heartbeatTime)) {
- machineDto.setStateName(machineDto.getStateName() + ";璁惧绂荤嚎");
+ machineDto.setStateName("璁惧绂荤嚎");
} else {
Calendar calendar = Calendar.getInstance();
calendar.setTime(DateUtil.getDateFromString(heartbeatTime, DateUtil.DATE_FORMATE_STRING_A));
calendar.add(Calendar.MINUTE, 2);
if (calendar.getTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
- machineDto.setStateName(machineDto.getStateName() + ";璁惧绂荤嚎");
+ machineDto.setStateName("璁惧绂荤嚎");
} else {
- machineDto.setStateName(machineDto.getStateName() + ";璁惧鍦ㄧ嚎");
+ machineDto.setStateName("璁惧鍦ㄧ嚎");
}
}
} catch (ParseException e) {
e.printStackTrace();
- machineDto.setStateName(machineDto.getStateName() + ";璁惧绂荤嚎");
+ machineDto.setStateName("璁惧绂荤嚎");
}
}
--
Gitblit v1.8.0