更新 RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/outside/service/impl/OutSideServiceImpl.java
merge
This commit is contained in:
parent
51a92e9796
commit
84b24e8f0a
|
@ -36,6 +36,7 @@ public class OutSideServiceImpl implements OutSideService {
|
||||||
ObjectMapper objectMapper = new ObjectMapper();
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
JsonNode rootNode = objectMapper.readTree(jsonData);
|
JsonNode rootNode = objectMapper.readTree(jsonData);
|
||||||
for (JsonNode sensorNode : rootNode.get("sensorDatas")) {
|
for (JsonNode sensorNode : rootNode.get("sensorDatas")) {
|
||||||
|
if (sensorNode.get("flag").asInt()==1) {
|
||||||
sensorData.setSn(sn);
|
sensorData.setSn(sn);
|
||||||
sensorData.setFlag(sensorNode.get("flag").asText());
|
sensorData.setFlag(sensorNode.get("flag").asText());
|
||||||
sensorData.setDs(sensorNode.get("gas_value").asText());
|
sensorData.setDs(sensorNode.get("gas_value").asText());
|
||||||
|
@ -56,6 +57,7 @@ public class OutSideServiceImpl implements OutSideService {
|
||||||
sensorData.setReportTime(DateUtils.getTime());
|
sensorData.setReportTime(DateUtils.getTime());
|
||||||
outSideMapper.insertDevice(sensorData);
|
outSideMapper.insertDevice(sensorData);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return 1;
|
return 1;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
System.out.println(e);
|
System.out.println(e);
|
||||||
|
@ -76,8 +78,12 @@ public class OutSideServiceImpl implements OutSideService {
|
||||||
String lastMonth = previousMonth.format(formatter);
|
String lastMonth = previousMonth.format(formatter);
|
||||||
|
|
||||||
List<SensorMonth> list = outSideMapper.queryMonth(lastMonth);
|
List<SensorMonth> list = outSideMapper.queryMonth(lastMonth);
|
||||||
|
if(list.size()>0){
|
||||||
outSideMapper.insertMonth(list);
|
outSideMapper.insertMonth(list);
|
||||||
return 1;
|
return 1;
|
||||||
|
}else{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -87,16 +93,25 @@ public class OutSideServiceImpl implements OutSideService {
|
||||||
// 判断是否是数组
|
// 判断是否是数组
|
||||||
if (rootNode.isArray()) {
|
if (rootNode.isArray()) {
|
||||||
for (JsonNode node : rootNode) {
|
for (JsonNode node : rootNode) {
|
||||||
|
if (node.get("type").asInt()==5) {
|
||||||
SensorData sd = insertOldData(node);
|
SensorData sd = insertOldData(node);
|
||||||
|
outSideMapper.deleteSampleDevice(sd.getSn(),sd.getReportTime());
|
||||||
outSideMapper.insertDevice(sd);
|
outSideMapper.insertDevice(sd);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
SensorData sd = insertOldData(rootNode);
|
|
||||||
outSideMapper.insertDevice(sd);
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
// else {
|
||||||
|
// SensorData sd = insertOldData(rootNode);
|
||||||
|
// outSideMapper.insertDevice(sd);
|
||||||
|
// }
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Integer updateData(String date) {
|
||||||
|
return outSideMapper.updateData(date);
|
||||||
|
}
|
||||||
|
|
||||||
private static SensorData insertOldData(JsonNode node) {
|
private static SensorData insertOldData(JsonNode node) {
|
||||||
/**
|
/**
|
||||||
* sn: equipmentUId
|
* sn: equipmentUId
|
||||||
|
|
Loading…
Reference in New Issue