|
@@ -34,7 +34,6 @@ import com.persagy.proxy.adm.utils.AdmContextUtil;
|
|
|
import com.persagy.proxy.adm.utils.AdmQueryCriteriaHelper;
|
|
|
import com.persagy.proxy.common.entity.DmpResult;
|
|
|
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;
|
|
@@ -51,8 +50,6 @@ import java.util.stream.Collectors;
|
|
|
@RequestMapping("/equip-query")
|
|
|
public class AdmReportEquipController {
|
|
|
|
|
|
- @Value("${middleware.group.code}")
|
|
|
- private String groupCode;
|
|
|
@Autowired
|
|
|
private IAdmDictService dictService;
|
|
|
@Autowired
|
|
@@ -182,7 +179,7 @@ public class AdmReportEquipController {
|
|
|
* 资产相关暂未支持
|
|
|
*/
|
|
|
@PostMapping("/creat-propertys")
|
|
|
- public AdmResponse batchCreation(@RequestBody AdmCreateRequest<AdmEquipment> createRequest, @QueryParam("projectId") String projectId) {
|
|
|
+ public AdmResponse batchCreation(@RequestBody AdmCreateRequest<AdmEquipment> createRequest ) {
|
|
|
//return EquipmentService.batchCreationProperty(request)
|
|
|
return null;
|
|
|
}
|
|
@@ -203,7 +200,7 @@ public class AdmReportEquipController {
|
|
|
}
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
queryCriteria.setOnlyCount(true);
|
|
|
- List<ObjectNode> euipCom = DigitalObjectFacade.query(groupCode,AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null, queryCriteria);
|
|
|
+ List<ObjectNode> euipCom = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null, queryCriteria);
|
|
|
if(CollUtil.isNotEmpty(euipCom)){
|
|
|
return AdmResponse.success(euipCom);
|
|
|
}else{
|
|
@@ -227,7 +224,7 @@ public class AdmReportEquipController {
|
|
|
criteria.put("classCode", criteria.get("category").textValue());
|
|
|
criteria.remove("category");
|
|
|
}
|
|
|
- List<ObjectNode> euipCom = DigitalObjectFacade.query(groupCode,AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null, queryCriteria);
|
|
|
+ List<ObjectNode> euipCom = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null, queryCriteria);
|
|
|
if(CollUtil.isNotEmpty(euipCom)){
|
|
|
return AdmResponse.success(euipCom);
|
|
|
}else{
|
|
@@ -305,7 +302,7 @@ public class AdmReportEquipController {
|
|
|
relationTo.put("objFrom", objFrom);
|
|
|
criteriaEquip.putPOJO("relationTo",relationTo);
|
|
|
queryCriteria.setCriteria(criteriaEquip);
|
|
|
- List<ObjectNode> equips = DigitalObjectFacade.query(groupCode,AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
+ List<ObjectNode> equips = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
return AdmResponse.success(equips);
|
|
|
}
|
|
|
|
|
@@ -320,7 +317,7 @@ public class AdmReportEquipController {
|
|
|
request.setName(AdmSystem.OBJ_TYPE);
|
|
|
QueryCriteria queryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(request);
|
|
|
queryCriteria.setSize(500L);
|
|
|
- List<ObjectNode> objectNodeList = DigitalObjectFacade.query(groupCode,AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
+ List<ObjectNode> objectNodeList = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
if(CollUtil.isEmpty(objectNodeList)){
|
|
|
return AdmResponse.success();
|
|
|
}
|
|
@@ -337,7 +334,7 @@ public class AdmReportEquipController {
|
|
|
admSystemMap.keySet().stream().forEach(id -> arrayNode.add(id));
|
|
|
queryCriteriaRelation.setCriteria(criteria);
|
|
|
|
|
|
- List<ObjectRelation> relations = DigitalRelationFacade.query(groupCode,AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null,queryCriteriaRelation);
|
|
|
+ List<ObjectRelation> relations = DigitalRelationFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null,queryCriteriaRelation);
|
|
|
if(CollUtil.isEmpty(relations)){
|
|
|
AdmResponse.success();
|
|
|
}
|
|
@@ -350,7 +347,7 @@ public class AdmReportEquipController {
|
|
|
ArrayNode array = criteriaEquip.putObject("id").putArray("$in");
|
|
|
relationMap.keySet().stream().forEach(id -> array.add(id));
|
|
|
queryCriteriaEqu.setCriteria(criteriaEquip);
|
|
|
- List<ObjectNode> equips = DigitalObjectFacade.query(groupCode,AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null,queryCriteriaEqu);
|
|
|
+ List<ObjectNode> equips = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null,queryCriteriaEqu);
|
|
|
List<AdmEquipment> equipsList = JSONUtil.toList(equips.toString(), AdmEquipment.class);
|
|
|
Map<String, AdmEquipment> admEquipmentMap = CollUtil.fieldValueMap(equipsList, BaseEntity.PROP_ID);
|
|
|
|
|
@@ -375,11 +372,11 @@ public class AdmReportEquipController {
|
|
|
* 查询项目下的所有设备和部件的类型、以及类型名称
|
|
|
*/
|
|
|
@GetMapping("/equip-compon-category")
|
|
|
- public AdmResponse equipORComponCategory(@QueryParam("projectId") String projectId){
|
|
|
+ public AdmResponse equipORComponCategory(){
|
|
|
//return EquipORComponCategoryService.getEquipORComponCategory()
|
|
|
RequestData requestData = new RequestData();
|
|
|
- if(StrUtil.isNotEmpty(projectId)){
|
|
|
- requestData.setProjectId(projectId);
|
|
|
+ if(StrUtil.isNotEmpty(AdmContextUtil.toDmpContext().getProjectId())){
|
|
|
+ requestData.setProjectId(AdmContextUtil.toDmpContext().getProjectId());
|
|
|
}
|
|
|
requestData.setObjTypes(CollUtil.newHashSet(AdmEquipment.OBJ_TYPE, AdmComponent.OBJ_TYPE));
|
|
|
List<Map<String, Object>> result = DigitalObjectSimpleFacade.queryDefineInfoByObjType(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(),AdmContextUtil.toDmpContext().getAppId(),null,requestData);
|
|
@@ -407,7 +404,7 @@ public class AdmReportEquipController {
|
|
|
* TODO 资产相关功能暂时不提供,之后根据业务进行需求处理
|
|
|
*/
|
|
|
@PostMapping("/equip-r-property")
|
|
|
- public AdmResponse equipRelationshipProperty(@RequestBody AdmCreateRequest<AdmProperty> createRequest, @QueryParam("projectId") String projectId) {
|
|
|
+ public AdmResponse equipRelationshipProperty(@RequestBody AdmCreateRequest<AdmProperty> createRequest ) {
|
|
|
//return EquipmentComService.equipPro(request)
|
|
|
return null;
|
|
|
}
|
|
@@ -487,7 +484,7 @@ public class AdmReportEquipController {
|
|
|
}
|
|
|
});
|
|
|
queryCriteriaEuip.setCriteria(criteriaEquip);
|
|
|
- List<ObjectNode> equipList = DigitalObjectFacade.query(groupCode,AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null, queryCriteriaEuip);
|
|
|
+ List<ObjectNode> equipList = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null, queryCriteriaEuip);
|
|
|
if(CollUtil.isEmpty(equipList)){
|
|
|
return AdmResponse.success(equipComDelList);
|
|
|
}
|
|
@@ -530,7 +527,7 @@ public class AdmReportEquipController {
|
|
|
arrayNode.add(node.get("modelId").textValue());
|
|
|
});
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
- List<ObjectNode> floorList = DigitalObjectFacade.query(groupCode,AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
+ List<ObjectNode> floorList = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
if(CollUtil.isEmpty(floorList)){
|
|
|
return AdmResponse.success();
|
|
|
}
|
|
@@ -556,7 +553,7 @@ public class AdmReportEquipController {
|
|
|
criteriaEquip.putPOJO("modelId", modelId);
|
|
|
|
|
|
queryCriteriaEuip.setCriteria(criteriaEquip);
|
|
|
- List<ObjectNode> equipList = DigitalObjectFacade.query(groupCode,AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null, queryCriteriaEuip);
|
|
|
+ List<ObjectNode> equipList = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null, queryCriteriaEuip);
|
|
|
if(CollUtil.isEmpty(equipList)){
|
|
|
return AdmResponse.success(equipComDelList);
|
|
|
}
|
|
@@ -733,7 +730,7 @@ public class AdmReportEquipController {
|
|
|
* 统计设备信息点与总数据占比
|
|
|
*/
|
|
|
@PostMapping("/info-point")
|
|
|
- public AdmResponse infoPoint(@QueryParam("projectId") String projectId) {
|
|
|
+ public AdmResponse infoPoint() {
|
|
|
//return customSqlService.infoPoints()
|
|
|
|
|
|
JSONObject gatherInfoPoint = calInfoPointByObjType(AdmEquipment.OBJ_TYPE, false, false);
|
|
@@ -748,9 +745,9 @@ public class AdmReportEquipController {
|
|
|
* 统计设备信息点与需采集数据占比
|
|
|
*/
|
|
|
@PostMapping("/gather-info-point")
|
|
|
- public AdmResponse gatherInfoPoint(@QueryParam("projectId") String projectId) {
|
|
|
+ public AdmResponse gatherInfoPoint() {
|
|
|
//return customSqlService.gatherInfoPoints()
|
|
|
- if(StrUtil.isEmpty(projectId)){
|
|
|
+ if(StrUtil.isEmpty(AdmContextUtil.toDmpContext().getProjectId())){
|
|
|
return AdmResponse.failure(ResponseCode.A0400.getCode());
|
|
|
}
|
|
|
|
|
@@ -763,8 +760,8 @@ public class AdmReportEquipController {
|
|
|
* 统计系统信息点与需采集数据占比
|
|
|
*/
|
|
|
@PostMapping("/system-info-point")
|
|
|
- public AdmResponse systemInfoPoin(@QueryParam("projectId") String projectId) {
|
|
|
- if(StrUtil.isEmpty(projectId)){
|
|
|
+ public AdmResponse systemInfoPoin() {
|
|
|
+ if(StrUtil.isEmpty(AdmContextUtil.toDmpContext().getProjectId())){
|
|
|
return AdmResponse.failure(ResponseCode.A0400.getCode());
|
|
|
}
|
|
|
|
|
@@ -777,14 +774,14 @@ public class AdmReportEquipController {
|
|
|
* 台账中待删除的对象 数量统计
|
|
|
*/
|
|
|
@PostMapping("/del-equip-comm-pro")
|
|
|
- public AdmResponse deleteObj(@QueryParam("projectId") String projectId){
|
|
|
+ public AdmResponse deleteObj(){
|
|
|
QueryCriteria queryCriteria = new QueryCriteria();
|
|
|
ObjectNode criteria = JsonNodeFactory.instance.objectNode();
|
|
|
criteria.put("taskState", -1);
|
|
|
criteria.put("objType","['equipment','component']");
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
queryCriteria.setOnlyCount(true);
|
|
|
- List<ObjectNode> euipCom = DigitalObjectFacade.query(groupCode,AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null, queryCriteria);
|
|
|
+ List<ObjectNode> euipCom = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(),AdmCommonConstant.APP_ID,null, queryCriteria);
|
|
|
if(CollUtil.isNotEmpty(euipCom)){
|
|
|
return AdmResponse.success(euipCom);
|
|
|
}else{
|
|
@@ -798,10 +795,10 @@ public class AdmReportEquipController {
|
|
|
* @return 返回对象列表
|
|
|
*/
|
|
|
@PostMapping("/type")
|
|
|
- public AdmResponse equipType(@QueryParam("projectId") String projectId){
|
|
|
+ public AdmResponse equipType(){
|
|
|
RequestData requestData = new RequestData();
|
|
|
- if(StrUtil.isNotEmpty(projectId)){
|
|
|
- requestData.setProjectId(projectId);
|
|
|
+ if(StrUtil.isNotEmpty(AdmContextUtil.toDmpContext().getProjectId())){
|
|
|
+ requestData.setProjectId(AdmContextUtil.toDmpContext().getProjectId());
|
|
|
}
|
|
|
requestData.setObjType(AdmEquipment.OBJ_TYPE);
|
|
|
List<Map<String, Object>> result = DigitalObjectSimpleFacade.queryDefineInfoByObjType(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(),AdmContextUtil.toDmpContext().getAppId(),null,requestData);
|
|
@@ -937,7 +934,7 @@ public class AdmReportEquipController {
|
|
|
}
|
|
|
admQueryCriteriaObj.setName(objType);
|
|
|
QueryCriteria queryCriteriaSys = AdmQueryCriteriaHelper.toDmpCriteria(admQueryCriteriaObj);
|
|
|
- List<ObjectNode> admObjList = DigitalObjectFacade.query(groupCode, AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteriaSys);
|
|
|
+ List<ObjectNode> admObjList = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteriaSys);
|
|
|
|
|
|
//2 获取动态 静态 信息点
|
|
|
// 2.1 根据objType获取定义
|
|
@@ -980,7 +977,7 @@ public class AdmReportEquipController {
|
|
|
criteria.put("valid","['0','1']");
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
queryCriteria.setOnlyCount(true);
|
|
|
- List<ObjectInfoDefine> totalInfo = DigitalObjectInfoFacade.query(groupCode, AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
+ List<ObjectInfoDefine> totalInfo = DigitalObjectInfoFacade.query(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
controlInfoCounts = totalInfo.size();
|
|
|
criteria.remove("valid");
|
|
|
}
|
|
@@ -992,7 +989,7 @@ public class AdmReportEquipController {
|
|
|
criteria.put("valid","['0','1']");
|
|
|
}
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
- List<ObjectInfoDefine> staticInfoCode = DigitalObjectInfoFacade.query(groupCode, AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
+ List<ObjectInfoDefine> staticInfoCode = DigitalObjectInfoFacade.query(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
criteria.remove("category");
|
|
|
|
|
|
//动态信息点
|
|
@@ -1000,7 +997,7 @@ public class AdmReportEquipController {
|
|
|
category.put("$ne","STATIC");
|
|
|
criteria.putPOJO("category", category);
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
- List<ObjectInfoDefine> dynamicInfoCode = DigitalObjectInfoFacade.query(groupCode, AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
+ List<ObjectInfoDefine> dynamicInfoCode = DigitalObjectInfoFacade.query(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
//4 计算已采集的和需要采集的信息点占比
|
|
|
//return customSqlService.systemInfoPoins()
|
|
|
Map<String, Integer> hashMap = calculate(dynamicInfoCode, staticInfoCode, admObjList, 1);
|