优化 设备状态显示

java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java

@@ -35,6 +35,7 @@ public class ApiMachineDataVo implements Serializable {
 
 
     private String createTime;
+    private String heartbeatTime;
 
     public String getMachineId() {
         return machineId;
@@ -227,4 +228,12 @@ public class ApiMachineDataVo implements Serializable {
     public void setMachineAttrs(List<MachineAttrDto> machineAttrs) {
         this.machineAttrs = machineAttrs;
     }
+
+    public String getHeartbeatTime() {
+        return heartbeatTime;
+    }
+
+    public void setHeartbeatTime(String heartbeatTime) {
+        this.heartbeatTime = heartbeatTime;
+    }
 }

service-api/src/main/java/com/java110/api/listener/machine/ListMachinesListener.java

@@ -5,20 +5,18 @@ import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
-import com.java110.intf.community.ICommunityLocationInnerServiceSMO;
-import com.java110.intf.community.IFloorInnerServiceSMO;
-import com.java110.intf.common.IMachineInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.community.IUnitInnerServiceSMO;
 import com.java110.dto.RoomDto;
 import com.java110.dto.community.CommunityDto;
 import com.java110.dto.communityLocation.CommunityLocationDto;
 import com.java110.dto.machine.MachineDto;
 import com.java110.dto.unit.FloorAndUnitDto;
+import com.java110.intf.common.IMachineInnerServiceSMO;
+import com.java110.intf.community.*;
 import com.java110.utils.constant.ServiceCodeMachineConstant;
 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.api.machine.ApiMachineDataVo;
 import com.java110.vo.api.machine.ApiMachineVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +24,9 @@ import org.springframework.http.HttpMethod;
 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;
 
 
@@ -120,10 +120,32 @@ public class ListMachinesListener extends AbstractServiceApiListener {
 
     private void refreshMachineLocation(List<MachineDto> machines) {
         for (MachineDto machineDto : machines) {
+            freshMachineStateName(machineDto);
             getMachineLocation(machineDto);
         }
     }
 
+    private void freshMachineStateName(MachineDto machineDto) {
+        String heartbeatTime = machineDto.getHeartbeatTime();
+        try {
+            if (StringUtil.isEmpty(heartbeatTime)) {
+                machineDto.setStateName(machineDto.getStateName() + ";设备离线");
+            } 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() + ";设备离线");
+                } else {
+                    machineDto.setStateName(machineDto.getStateName() + ";设备在线");
+                }
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+            machineDto.setStateName(machineDto.getStateName() + ";设备离线");
+        }
+    }
+
     private void refreshMachines(List<MachineDto> machines) {
 
         //批量处理 小区
@@ -141,6 +163,7 @@ public class ListMachinesListener extends AbstractServiceApiListener {
     }
 
     private void getMachineLocation(MachineDto machineDto) {
+
         CommunityLocationDto communityLocationDto = new CommunityLocationDto();
         communityLocationDto.setCommunityId(machineDto.getCommunityId());
         communityLocationDto.setLocationId(machineDto.getLocationTypeCd());