|
@@ -8,6 +8,7 @@ import com.persagy.proxy.adm.request.AdmQueryCriteria;
|
|
|
import com.persagy.proxy.adm.request.AdmResponse;
|
|
|
import com.persagy.proxy.adm.service.IAdmEquipmentService;
|
|
|
import com.persagy.proxy.adm.utils.AdmContextUtil;
|
|
|
+import com.persagy.proxy.adm.utils.ObjectNameUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
@@ -33,8 +34,7 @@ public class AdmEquipmentController {
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@PostMapping("/count")
|
|
|
- public AdmResponse count(
|
|
|
- @RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
+ public AdmResponse count(@RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
request.setName(AdmEquipment.OBJ_TYPE);
|
|
|
request.setOnlyCount(true);
|
|
|
return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmEquipment.class);
|
|
@@ -49,6 +49,15 @@ public class AdmEquipmentController {
|
|
|
@PostMapping("/create")
|
|
|
public AdmResponse create(@RequestBody AdmCreateRequest<AdmEquipment> createRequest) throws Exception {
|
|
|
List<AdmEquipment> vos = CollUtil.newArrayList(createRequest.getContent());
|
|
|
+ if(CollUtil.isEmpty(vos)){
|
|
|
+ return AdmResponse.success();
|
|
|
+ }
|
|
|
+ //创建设备
|
|
|
+ vos.stream().forEach(equipment -> {
|
|
|
+ if (StrUtil.isEmpty(equipment.getName())){
|
|
|
+ equipment.setName(ObjectNameUtil.objectName("设备-"));
|
|
|
+ }
|
|
|
+ });
|
|
|
vos = service.doInsertEuip(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
|
|
|
return AdmResponse.success(vos);
|
|
|
}
|
|
@@ -130,8 +139,7 @@ public class AdmEquipmentController {
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@GetMapping("/query-equip")
|
|
|
- public AdmResponse queryEquip(
|
|
|
- @RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
+ public AdmResponse queryEquip(@RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
//request.setName("equipment");
|
|
|
if(StrUtil.isNotEmpty(request.getFilters())){
|
|
|
request.setFilters(String.join(";",request.getFilters(),"objType in ['equipment','component']"));
|
|
@@ -150,6 +158,15 @@ public class AdmEquipmentController {
|
|
|
@PostMapping("/creat-equip-pro")
|
|
|
public AdmResponse createExt(@RequestBody AdmCreateRequest<AdmEquipment> admEquipment) throws Exception {
|
|
|
List<AdmEquipment> vos = CollUtil.newArrayList(admEquipment.getContent());
|
|
|
+ if(CollUtil.isEmpty(vos)){
|
|
|
+ return AdmResponse.success();
|
|
|
+ }
|
|
|
+ //创建设备
|
|
|
+ vos.stream().forEach(equipment -> {
|
|
|
+ if (StrUtil.isEmpty(equipment.getName())){
|
|
|
+ equipment.setName(ObjectNameUtil.objectName("设备-"));
|
|
|
+ }
|
|
|
+ });
|
|
|
vos = service.doInsertExt(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
|
|
|
return AdmResponse.success(vos);
|
|
|
}
|