|
@@ -30,6 +30,7 @@ import com.szwl.model.param.PasswordParam;
|
|
import com.szwl.model.query.StatisticsParam;
|
|
import com.szwl.model.query.StatisticsParam;
|
|
import com.szwl.model.utils.DateUtils;
|
|
import com.szwl.model.utils.DateUtils;
|
|
import com.szwl.model.utils.PushUtils;
|
|
import com.szwl.model.utils.PushUtils;
|
|
|
|
+import com.szwl.model.vo.EquipmentVO;
|
|
import com.szwl.service.*;
|
|
import com.szwl.service.*;
|
|
import com.szwl.util.DownloadUtils;
|
|
import com.szwl.util.DownloadUtils;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
@@ -428,7 +429,15 @@ public class TEquipmentController {
|
|
}
|
|
}
|
|
// query.eq(TEquipment::getAdminId,adminId);
|
|
// query.eq(TEquipment::getAdminId,adminId);
|
|
List<TEquipment> list = tEquipmentService.list(query);
|
|
List<TEquipment> list = tEquipmentService.list(query);
|
|
- return R.ok(list);
|
|
|
|
|
|
+ List<EquipmentVO> equipmentVOS = new ArrayList<>();
|
|
|
|
+ for (TEquipment equipment : list) {
|
|
|
|
+ EquipmentVO equipmentVO = new EquipmentVO();
|
|
|
|
+ equipmentVO.setId(equipment.getId());
|
|
|
|
+ equipmentVO.setName(equipment.getName());
|
|
|
|
+ equipmentVO.setClientId(equipment.getClientId());
|
|
|
|
+ equipmentVOS.add(equipmentVO);
|
|
|
|
+ }
|
|
|
|
+ return R.ok(equipmentVOS);
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "查找设备")
|
|
@ApiOperation(value = "查找设备")
|
|
@@ -473,7 +482,15 @@ public class TEquipmentController {
|
|
if (StringUtils.isNotEmpty(equipment.getSn())) {
|
|
if (StringUtils.isNotEmpty(equipment.getSn())) {
|
|
oldEquipment.setSn(equipment.getSn());
|
|
oldEquipment.setSn(equipment.getSn());
|
|
}
|
|
}
|
|
- if (StringUtils.isNotEmpty(equipment.getName())) {
|
|
|
|
|
|
+ String name = equipment.getName();
|
|
|
|
+ if (StringUtils.isNotEmpty(name) && !name.equals(oldEquipment.getName())) {
|
|
|
|
+ LambdaQueryWrapper<TEquipment> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
+ queryWrapper.eq(TEquipment::getAdminId, oldEquipment.getAdminId());
|
|
|
|
+ queryWrapper.eq(TEquipment::getName, name);
|
|
|
|
+ TEquipment tEquipment = tEquipmentService.getOne(queryWrapper);
|
|
|
|
+ if (tEquipment != null) {
|
|
|
|
+ return R.fail(A0001);
|
|
|
|
+ }
|
|
oldEquipment.setName(equipment.getName());
|
|
oldEquipment.setName(equipment.getName());
|
|
}
|
|
}
|
|
if (StringUtils.isNotEmpty(equipment.getSelfName())) {
|
|
if (StringUtils.isNotEmpty(equipment.getSelfName())) {
|