|
@@ -1,8 +1,12 @@
|
|
|
package com.persagy.dmp.rwd.define.controller;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.fasterxml.jackson.databind.JsonNode;
|
|
|
+import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
|
import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
|
|
@@ -11,10 +15,16 @@ import com.persagy.dmp.common.constant.ResponseCode;
|
|
|
import com.persagy.dmp.common.context.AppContext;
|
|
|
import com.persagy.dmp.common.exception.BusinessException;
|
|
|
import com.persagy.dmp.common.model.response.CommonResult;
|
|
|
+import com.persagy.dmp.common.utils.JsonHelper;
|
|
|
import com.persagy.dmp.common.utils.ResultHelper;
|
|
|
import com.persagy.dmp.define.entity.ObjectInfoDefine;
|
|
|
+import com.persagy.dmp.define.entity.ObjectTypeDefine;
|
|
|
+import com.persagy.dmp.digital.entity.ObjectDigital;
|
|
|
+import com.persagy.dmp.digital.entity.ObjectRelation;
|
|
|
import com.persagy.dmp.mybatis.utils.ConditionUtil;
|
|
|
import com.persagy.dmp.rwd.define.service.IObjectInfoService;
|
|
|
+import com.persagy.dmp.rwd.define.service.IObjectTypeService;
|
|
|
+import lombok.RequiredArgsConstructor;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
@@ -32,10 +42,11 @@ import java.util.List;
|
|
|
*/
|
|
|
@RestController
|
|
|
@RequestMapping("/rwd/def/funcid")
|
|
|
+@RequiredArgsConstructor
|
|
|
public class ObjectInfoController {
|
|
|
|
|
|
- @Autowired
|
|
|
- private IObjectInfoService service;
|
|
|
+ private final IObjectInfoService service;
|
|
|
+ private final IObjectTypeService objectTypeService;
|
|
|
|
|
|
@PostMapping("")
|
|
|
public CommonResult<List<ObjectInfoDefine>> query(@RequestBody QueryCriteria criteria) {
|
|
@@ -48,6 +59,8 @@ public class ObjectInfoController {
|
|
|
objCriteria.remove(CommonConstant.TYPE);
|
|
|
}
|
|
|
QueryWrapper<ObjectInfoDefine> wrapper = new QueryWrapper<>();
|
|
|
+ // 处理classCode
|
|
|
+ ensureClassCode(criteria);
|
|
|
// 添加所属项目条件
|
|
|
ConditionUtil.ensureProjectCriteria(wrapper);
|
|
|
// 转换查询条件
|
|
@@ -67,6 +80,39 @@ public class ObjectInfoController {
|
|
|
}
|
|
|
return ResultHelper.multi(page.getRecords(), page.getTotal());
|
|
|
}
|
|
|
+ /***
|
|
|
+ * Description: 处理对象类型,如果父级id存在则加上父级id
|
|
|
+ * @param criteria : 查询参数
|
|
|
+ * @return : void
|
|
|
+ * @author : lijie
|
|
|
+ * @date :2021/9/9 18:25
|
|
|
+ * Update By lijie 2021/9/9 18:25
|
|
|
+ */
|
|
|
+ private void ensureClassCode(QueryCriteria criteria) {
|
|
|
+ ObjectNode objectNode = criteria.getCriteria();
|
|
|
+ if (!objectNode.has(ObjectDigital.CLASS_CODE_HUM)){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ JsonNode jsonNode = objectNode.get(ObjectDigital.CLASS_CODE_HUM);
|
|
|
+ if (!jsonNode.isTextual()){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ String classCode = jsonNode.asText();
|
|
|
+ LambdaQueryWrapper<ObjectTypeDefine> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(ObjectTypeDefine::getCode,classCode);
|
|
|
+ queryWrapper.eq(ObjectTypeDefine::getValid,true);
|
|
|
+ List<ObjectTypeDefine> objectTypeDefines = objectTypeService.queryByCondition(queryWrapper);
|
|
|
+ if (CollUtil.isEmpty(objectTypeDefines)){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ ObjectTypeDefine objectTypeDefine = objectTypeDefines.get(0);
|
|
|
+ ArrayNode arrayNode = JsonHelper.objectMapper.createArrayNode();
|
|
|
+ arrayNode.add(classCode);
|
|
|
+ if (StrUtil.isNotBlank(objectTypeDefine.getParentCode())){
|
|
|
+ arrayNode.add(objectTypeDefine.getParentCode());
|
|
|
+ }
|
|
|
+ objectNode.put(ObjectDigital.CLASS_CODE_HUM,arrayNode);
|
|
|
+ }
|
|
|
|
|
|
@PostMapping("/create")
|
|
|
public CommonResult<ObjectInfoDefine> create(@Valid @RequestBody ObjectInfoDefine vo){
|