|
@@ -2,18 +2,15 @@ package com.persagy.proxy.adm.controller;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
-import com.persagy.proxy.adm.constant.AdmCommonConstant;
|
|
|
import com.persagy.proxy.adm.model.AdmEquipment;
|
|
|
import com.persagy.proxy.adm.request.AdmCreateRequest;
|
|
|
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.common.entity.InstanceUrlParam;
|
|
|
+import com.persagy.proxy.adm.utils.AdmContextUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import javax.ws.rs.QueryParam;
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
@@ -27,24 +24,20 @@ import java.util.List;
|
|
|
public class AdmEquipmentController {
|
|
|
@Autowired
|
|
|
private IAdmEquipmentService service;
|
|
|
- @Value("${middleware.group.code}")
|
|
|
- private String groupCode;
|
|
|
|
|
|
|
|
|
* 统计
|
|
|
- * @param projectId
|
|
|
+ *
|
|
|
* @param request
|
|
|
* @return
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@PostMapping("/count")
|
|
|
- public AdmResponse count(@QueryParam("projectId") String projectId,
|
|
|
+ public AdmResponse count(
|
|
|
@RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
-
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
request.setName(AdmEquipment.OBJ_TYPE);
|
|
|
request.setOnlyCount(true);
|
|
|
- return service.doQuery(context, request, AdmEquipment.class);
|
|
|
+ return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmEquipment.class);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -54,11 +47,9 @@ public class AdmEquipmentController {
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@PostMapping("/create")
|
|
|
- public AdmResponse create(@RequestBody AdmCreateRequest<AdmEquipment> createRequest, @QueryParam("projectId") String projectId) throws Exception {
|
|
|
-
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ public AdmResponse create(@RequestBody AdmCreateRequest<AdmEquipment> createRequest) throws Exception {
|
|
|
List<AdmEquipment> vos = CollUtil.newArrayList(createRequest.getContent());
|
|
|
- vos = service.doInsertEuip(context, AdmEquipment.class, vos);
|
|
|
+ vos = service.doInsertEuip(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
|
|
|
return AdmResponse.success(vos);
|
|
|
}
|
|
|
|
|
@@ -69,10 +60,9 @@ public class AdmEquipmentController {
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@PostMapping("/delete")
|
|
|
- public AdmResponse delete(@QueryParam("projectId") String projectId, @RequestBody List<AdmEquipment> vos) throws Exception {
|
|
|
+ public AdmResponse delete( @RequestBody List<AdmEquipment> vos) throws Exception {
|
|
|
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
- service.doDelete(context, vos);
|
|
|
+ service.doDelete(AdmContextUtil.toDmpContext(), vos);
|
|
|
return AdmResponse.success();
|
|
|
}
|
|
|
|
|
@@ -84,29 +74,25 @@ public class AdmEquipmentController {
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@PostMapping("/update")
|
|
|
- public AdmResponse update(@RequestBody AdmCreateRequest<AdmEquipment> createRequest, @QueryParam("projectId") String projectId) throws Exception {
|
|
|
-
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ public AdmResponse update(@RequestBody AdmCreateRequest<AdmEquipment> createRequest) throws Exception {
|
|
|
List<AdmEquipment> vos = CollUtil.newArrayList(createRequest.getContent());
|
|
|
-
|
|
|
- vos = service.doUpdate(context, AdmEquipment.class, vos);
|
|
|
+
|
|
|
+ vos = service.doUpdate(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
|
|
|
return AdmResponse.success(vos);
|
|
|
}
|
|
|
|
|
|
|
|
|
* 查询
|
|
|
- * @param projectId
|
|
|
+ *
|
|
|
* @param request
|
|
|
* @return
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@PostMapping("/query")
|
|
|
- public AdmResponse query(@QueryParam("projectId") String projectId,
|
|
|
- @RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
+ public AdmResponse query(@RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
request.setName(AdmEquipment.OBJ_TYPE);
|
|
|
- return service.doQuery(context, request, AdmEquipment.class);
|
|
|
+ return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmEquipment.class);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -116,11 +102,9 @@ public class AdmEquipmentController {
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@GetMapping("/export")
|
|
|
- public AdmResponse exportInfos(@RequestBody AdmCreateRequest<AdmEquipment> admEquipment, @QueryParam("projectId") String projectId) throws Exception {
|
|
|
-
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ public AdmResponse exportInfos(@RequestBody AdmCreateRequest<AdmEquipment> admEquipment) throws Exception {
|
|
|
List<AdmEquipment> vos = CollUtil.newArrayList(admEquipment.getContent());
|
|
|
- vos = service.doUpdate(context, AdmEquipment.class, vos);
|
|
|
+ vos = service.doUpdate(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
|
|
|
return AdmResponse.success(vos);
|
|
|
}
|
|
|
|
|
@@ -132,33 +116,29 @@ public class AdmEquipmentController {
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@PostMapping("/import")
|
|
|
- public AdmResponse importInfos(@RequestBody AdmCreateRequest<AdmEquipment> admEquipment, @QueryParam("projectId") String projectId) throws Exception {
|
|
|
-
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ public AdmResponse importInfos(@RequestBody AdmCreateRequest<AdmEquipment> admEquipment) throws Exception {
|
|
|
List<AdmEquipment> vos = CollUtil.newArrayList(admEquipment.getContent());
|
|
|
- vos = service.doUpdate(context, AdmEquipment.class, vos);
|
|
|
+ vos = service.doUpdate(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
|
|
|
return AdmResponse.success(vos);
|
|
|
}
|
|
|
|
|
|
|
|
|
* 根据项目id查询所有的设备和部件
|
|
|
- * @param projectId
|
|
|
+ *
|
|
|
* @param request
|
|
|
* @return
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@GetMapping("/query-equip")
|
|
|
- public AdmResponse queryEquip(@QueryParam("projectId") String projectId,
|
|
|
+ public AdmResponse queryEquip(
|
|
|
@RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
-
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
|
|
|
if(StrUtil.isNotEmpty(request.getFilters())){
|
|
|
request.setFilters(String.join(";",request.getFilters(),"objType in ['equipment','component']"));
|
|
|
}else{
|
|
|
request.setFilters("objType in ['equipment','component']");
|
|
|
}
|
|
|
- return service.doQuery(context, request, AdmEquipment.class);
|
|
|
+ return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmEquipment.class);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -168,11 +148,9 @@ public class AdmEquipmentController {
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@PostMapping("/create-equip-pro")
|
|
|
- public AdmResponse createExt(@RequestBody AdmCreateRequest<AdmEquipment> admEquipment, @QueryParam("projectId") String projectId) throws Exception {
|
|
|
-
|
|
|
- InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
+ public AdmResponse createExt(@RequestBody AdmCreateRequest<AdmEquipment> admEquipment) throws Exception {
|
|
|
List<AdmEquipment> vos = CollUtil.newArrayList(admEquipment.getContent());
|
|
|
- vos = service.doInsertExt(context, AdmEquipment.class, vos);
|
|
|
+ vos = service.doInsertExt(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
|
|
|
return AdmResponse.success(vos);
|
|
|
}
|
|
|
|