feat: 增加查询i2同步记录

dev
huangfeng 1 year ago
parent 74f92248ed
commit d88afc2fbc

@ -1,6 +1,7 @@
package com.xydl.cac.controller; package com.xydl.cac.controller;
import com.xydl.cac.entity.I2syncConfig; import com.xydl.cac.entity.I2syncConfig;
import com.xydl.cac.entity.I2syncRecord;
import com.xydl.cac.entity.ModevType; import com.xydl.cac.entity.ModevType;
import com.xydl.cac.exception.BusinessException; import com.xydl.cac.exception.BusinessException;
import com.xydl.cac.model.Response; import com.xydl.cac.model.Response;
@ -72,4 +73,11 @@ public class I2syncController extends BasicController {
return Response.success("OK"); return Response.success("OK");
} }
@GetMapping("listRecord")
@ApiOperation("查询导出记录")
public Response<List<I2syncRecord>> listRecord(Integer modevtypeId) {
List<I2syncRecord> result = service.listRecord(modevtypeId);
return Response.success(result);
}
} }

@ -34,4 +34,7 @@ public class I2syncRecord {
@Column(name = "last_d_time") @Column(name = "last_d_time")
private Date lastDTime; private Date lastDTime;
@Transient
private NSensor sensor;
} }

@ -2,6 +2,7 @@ package com.xydl.cac.service;
import com.xydl.cac.entity.I2syncConfig; import com.xydl.cac.entity.I2syncConfig;
import com.xydl.cac.entity.I2syncRecord;
import com.xydl.cac.entity.ModevType; import com.xydl.cac.entity.ModevType;
import java.util.List; import java.util.List;
@ -19,4 +20,6 @@ public interface I2syncService {
void addConfig(I2syncConfig item); void addConfig(I2syncConfig item);
void delConfig(Integer id); void delConfig(Integer id);
List<I2syncRecord> listRecord(Integer modevtypeId);
} }

@ -2,6 +2,7 @@ package com.xydl.cac.service.impl;
import com.alibaba.excel.util.StringUtils; import com.alibaba.excel.util.StringUtils;
import com.xydl.cac.entity.*; import com.xydl.cac.entity.*;
import com.xydl.cac.exception.BusinessException;
import com.xydl.cac.repository.*; import com.xydl.cac.repository.*;
import com.xydl.cac.service.I2syncService; import com.xydl.cac.service.I2syncService;
import com.xydl.cac.service.ModevTypeService; import com.xydl.cac.service.ModevTypeService;
@ -14,6 +15,7 @@ import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional;
@Service @Service
@Slf4j @Slf4j
@ -28,6 +30,10 @@ public class I2syncServiceImpl implements I2syncService {
I2syncFieldRepository syncFieldRepository; I2syncFieldRepository syncFieldRepository;
@Resource @Resource
I2syncConfigRepository configRepository; I2syncConfigRepository configRepository;
@Resource
I2syncRecordRepository recordRepository;
@Resource
NSensorRepository sensorRepository;
@Override @Override
public List<ModevType> listFieldConfig() { public List<ModevType> listFieldConfig() {
@ -93,4 +99,16 @@ public class I2syncServiceImpl implements I2syncService {
configRepository.deleteById(id); configRepository.deleteById(id);
} }
@Override
public List<I2syncRecord> listRecord(Integer modevtypeId) {
List<I2syncRecord> list = recordRepository.findByModevtypeId(modevtypeId);
for (I2syncRecord record : list) {
List<NSensor> sensorList = sensorRepository.findByDevId(record.getEqmid());
if (!CollectionUtils.isEmpty(sensorList)) {
record.setSensor(sensorList.get(0));
}
}
return list;
}
} }

Loading…
Cancel
Save