Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit c85667ce by lzy
Options

Merge branch 'retiredCadresDemo_zm' of… 

Merge branch 'retiredCadresDemo_zm' of git.xmmakeit.com:huangjiay/iot-platform-server into retiredCadresDemo_zm
parents 9ba9446f ac22fc92
Inline Side-by-side
Showing with 39 additions and 19 deletions
server-common/src/main/java/com/makeit/utils/redis/ScheduleLockUtil.java
...@@ -36,11 +36,12 @@ public class ScheduleLockUtil { ...@@ -36,11 +36,12 @@ public class ScheduleLockUtil {
} }
public static boolean lockWithLog(String key) { public static boolean lockWithLog(String key) {
boolean b = lock(key); // boolean b = lock(key);
if (!b) { // if (!b) {
logger.info("key:{} fail", key); // logger.info("key:{} fail", key);
} // }
return b; // return b;
return true;
} }
public static boolean lockWithLog(String key, long minute) { public static boolean lockWithLog(String key, long minute) {
......
server-service/src/main/java/com/makeit/service/demo/impl/DemoDeviceServiceImpl.java
...@@ -18,10 +18,13 @@ import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO ...@@ -18,10 +18,13 @@ import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Random;
/** /**
* <p> * <p>
...@@ -59,15 +62,29 @@ public class DemoDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev ...@@ -59,15 +62,29 @@ public class DemoDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
@Override @Override
public DemoHeartRespiratoryVO heartRate(DemoDeviceDTO dto) { public DemoHeartRespiratoryVO heartRate(DemoDeviceDTO dto) {
List<Integer> values = Arrays.asList(1,3,-1,2,0,-2,-3);
Random rand = new Random();
int n =rand.nextInt(values.size());
Integer value = values.get(n);
DemoHeartRespiratoryVO vo = new DemoHeartRespiratoryVO(); DemoHeartRespiratoryVO vo = new DemoHeartRespiratoryVO();
DemoDeviceEntity demoDeviceEntity = demoProductDeviceService.queryDeviceDetail(dto.getEntityCode(),true); DemoDeviceEntity demoDeviceEntity = demoProductDeviceService.queryDeviceDetail(dto.getEntityCode(),true);
if("3".equals(demoDeviceEntity.getStatus())){ if("3".equals(demoDeviceEntity.getStatus())){
for(DemoDeviceEntity.DeviceShadowDTO deviceShadowDTO : demoDeviceEntity.getDeviceShadowDTOList()){ for(DemoDeviceEntity.DeviceShadowDTO deviceShadowDTO : demoDeviceEntity.getDeviceShadowDTOList()){
if(deviceShadowDTO.getAttribute()!=null && "heartRate".equals(deviceShadowDTO.getAttribute().getAttributeCode())){ if(deviceShadowDTO.getAttribute()!=null && "heartRate".equals(deviceShadowDTO.getAttribute().getAttributeCode())){
vo.setHeartRate(deviceShadowDTO.getValue()); vo.setHeartRate(deviceShadowDTO.getValue());
Instant instant = Instant.ofEpochMilli(deviceShadowDTO.getValueTime()); // Instant instant = Instant.ofEpochMilli(deviceShadowDTO.getValueTime());
ZoneId zone = ZoneId.systemDefault(); // ZoneId zone = ZoneId.systemDefault();
vo.setTime(LocalDateTime.ofInstant(instant, zone)); // vo.setTime(LocalDateTime.ofInstant(instant, zone));
if(deviceShadowDTO.getValue()!=null && Integer.valueOf(deviceShadowDTO.getValue())>3){
// if(LocalDateTime.now().getSecond()%2==0){
// vo.setHeartRate(String.valueOf(Integer.valueOf(vo.getHeartRate())+1));
// }else {
// vo.setHeartRate(String.valueOf(Integer.valueOf(vo.getHeartRate())-1));
// }
vo.setHeartRate(String.valueOf(Integer.valueOf(vo.getHeartRate())+value));
}
vo.setTime(LocalDateTime.now());
} }
} }
......
server-service/src/main/java/com/makeit/task/DemoDeviceTask.java
...@@ -22,7 +22,6 @@ import com.makeit.service.platform.alarm.PlatAlarmRecordService; ...@@ -22,7 +22,6 @@ import com.makeit.service.platform.alarm.PlatAlarmRecordService;
import com.makeit.service.platform.device.PlatDeviceService; import com.makeit.service.platform.device.PlatDeviceService;
import com.makeit.service.saas.PlatTenantService; import com.makeit.service.saas.PlatTenantService;
import com.makeit.utils.DeviceCacheUtil; import com.makeit.utils.DeviceCacheUtil;
import com.makeit.utils.redis.ScheduleLockUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -33,10 +32,7 @@ import java.time.Instant; ...@@ -33,10 +32,7 @@ import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.ZoneOffset; import java.time.ZoneOffset;
import java.util.Collection; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Component @Component
...@@ -48,9 +44,14 @@ public class DemoDeviceTask { ...@@ -48,9 +44,14 @@ public class DemoDeviceTask {
private DemoProductDeviceService demoProductDeviceService; private DemoProductDeviceService demoProductDeviceService;
@Scheduled(cron = "0/1 * * * * ?") @Scheduled(cron = "*/1 * * * * ?")
public void syncDemoAlarm() { public void syncDemoAlarm() {
System.out.println("开始执行1"); log.info("syncDemoAlarm开始执行");
List<String> names = Arrays.asList("钟奕轩","林彦辰","周子恒","唐景晨");
Random rand = new Random();
int n =rand.nextInt(names.size());
String name = names.get(n);
log.info("name:"+name);
List<PlatAlarmRecord> records = platAlarmRecordService.list( List<PlatAlarmRecord> records = platAlarmRecordService.list(
new QueryWrapper<PlatAlarmRecord>().lambda().orderByDesc(PlatAlarmRecord::getAlarmDate) new QueryWrapper<PlatAlarmRecord>().lambda().orderByDesc(PlatAlarmRecord::getAlarmDate)
); );
...@@ -63,7 +64,7 @@ public class DemoDeviceTask { ...@@ -63,7 +64,7 @@ public class DemoDeviceTask {
if("1".equals(dto.getValue())){ if("1".equals(dto.getValue())){
PlatAlarmRecord alarmRecord = new PlatAlarmRecord(); PlatAlarmRecord alarmRecord = new PlatAlarmRecord();
alarmRecord.setAlarmType(PlatAlarmConfigEnum.AlarmTypeEnum.FALL.getValue()); alarmRecord.setAlarmType(PlatAlarmConfigEnum.AlarmTypeEnum.FALL.getValue());
alarmRecord.setContent("张三在房间内跌倒，请及时处理"); alarmRecord.setContent(name+"在房间内跌倒，请及时处理");
alarmRecord.setStatus(PlatAlarmRecordEnum.AlarmRecordStatusEnum.UNHANDLED.getValue()); alarmRecord.setStatus(PlatAlarmRecordEnum.AlarmRecordStatusEnum.UNHANDLED.getValue());
Instant instant = Instant.ofEpochMilli(dto.getValueTime()); Instant instant = Instant.ofEpochMilli(dto.getValueTime());
ZoneId zone = ZoneId.systemDefault(); ZoneId zone = ZoneId.systemDefault();
...@@ -83,12 +84,12 @@ public class DemoDeviceTask { ...@@ -83,12 +84,12 @@ public class DemoDeviceTask {
if("1".equals(dto.getValue()) && !record.getValueTime().equals(dto.getValueTime())){ if("1".equals(dto.getValue()) && !record.getValueTime().equals(dto.getValueTime())){
PlatAlarmRecord alarmRecord = new PlatAlarmRecord(); PlatAlarmRecord alarmRecord = new PlatAlarmRecord();
alarmRecord.setAlarmType(PlatAlarmConfigEnum.AlarmTypeEnum.FALL.getValue()); alarmRecord.setAlarmType(PlatAlarmConfigEnum.AlarmTypeEnum.FALL.getValue());
alarmRecord.setContent("张三在房间内跌倒，请及时处理"); alarmRecord.setContent(name+"在房间内跌倒，请及时处理");
alarmRecord.setStatus(PlatAlarmRecordEnum.AlarmRecordStatusEnum.UNHANDLED.getValue()); alarmRecord.setStatus(PlatAlarmRecordEnum.AlarmRecordStatusEnum.UNHANDLED.getValue());
Instant instant = Instant.ofEpochMilli(dto.getValueTime()); Instant instant = Instant.ofEpochMilli(dto.getValueTime());
ZoneId zone = ZoneId.systemDefault(); ZoneId zone = ZoneId.systemDefault();
alarmRecord.setAlarmDate(LocalDateTime.ofInstant(instant, zone)); alarmRecord.setAlarmDate(LocalDateTime.ofInstant(instant, zone));
// alarmRecord.setAlarmId(dto.getId()); alarmRecord.setAlarmId(dto.getId());
alarmRecord.setValueTime(dto.getValueTime()); alarmRecord.setValueTime(dto.getValueTime());
alarmRecord.setTenantId("1705124341248724993"); alarmRecord.setTenantId("1705124341248724993");
platAlarmRecordService.save(alarmRecord); platAlarmRecordService.save(alarmRecord);
...@@ -100,7 +101,8 @@ public class DemoDeviceTask { ...@@ -100,7 +101,8 @@ public class DemoDeviceTask {
} }
System.out.println("结束执行"); log.info("syncDemoAlarm结束执行");
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment