fix: 去除不用的

dev
huangfeng 1 year ago
parent 9b3e959ae9
commit 6b0546f5f4

@ -109,9 +109,6 @@ public class Modev {
@Column(name = "secondEid") @Column(name = "secondEid")
private Integer secondEid; private Integer secondEid;
@Column(name = "icdid")
private Integer icdid;
@ApiModelProperty("主设备名称") @ApiModelProperty("主设备名称")
@Transient @Transient
private String zsbname; private String zsbname;

@ -15,7 +15,4 @@ public interface ModevRepository extends JpaRepository<Modev, Integer>, JpaSpeci
List<Modev> findByZsbidAndName(Integer zsbid, String name); List<Modev> findByZsbidAndName(Integer zsbid, String name);
List<Modev> findByIcdidAndIdIsNot(Integer icdid, Integer id);
List<Modev> findByIcdidIsNotNull();
} }

@ -16,5 +16,4 @@ public interface ModevService {
Modev detail(Integer id) throws Exception; Modev detail(Integer id) throws Exception;
void bindicd(Integer id, Integer icdid) throws Exception;
} }

@ -85,15 +85,4 @@ public class ModevServiceImpl implements ModevService {
return optional.get(); return optional.get();
} }
@Override
public void bindicd(Integer id, Integer icdid) throws Exception {
Modev entity = repository.findById(id).orElse(null);
if (entity != null) {
entity.setIcdid(icdid);
repository.save(entity);
} else {
throw new BusinessException("未找到对应的检测装置");
}
}
} }

@ -198,7 +198,7 @@ public class NSensorServiceImpl implements NSensorService {
for (Modev item : list) { for (Modev item : list) {
NSensor sensor = item.transform(); NSensor sensor = item.transform();
List<NSensor> slist = repository.findByDevId(sensor.getDevId()); List<NSensor> slist = repository.findByDevId(sensor.getDevId());
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(slist)) {
this.add(sensor); this.add(sensor);
success++; success++;
} else { } else {

Loading…
Cancel
Save