|
@@ -7,7 +7,6 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
import com.persagy.dmp.basic.utils.JsonNodeUtils;
|
|
import com.persagy.dmp.basic.utils.JsonNodeUtils;
|
|
-import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
|
|
|
|
import com.persagy.dmp.common.constant.CommonConstant;
|
|
import com.persagy.dmp.common.constant.CommonConstant;
|
|
import com.persagy.dmp.common.constant.ResponseCode;
|
|
import com.persagy.dmp.common.constant.ResponseCode;
|
|
import com.persagy.dmp.common.context.AppContext;
|
|
import com.persagy.dmp.common.context.AppContext;
|
|
@@ -16,8 +15,11 @@ import com.persagy.dmp.common.model.response.CommonResult;
|
|
import com.persagy.dmp.common.utils.ParamCheckUtil;
|
|
import com.persagy.dmp.common.utils.ParamCheckUtil;
|
|
import com.persagy.dmp.common.utils.ResultHelper;
|
|
import com.persagy.dmp.common.utils.ResultHelper;
|
|
import com.persagy.dmp.mybatis.utils.ConditionUtil;
|
|
import com.persagy.dmp.mybatis.utils.ConditionUtil;
|
|
|
|
+import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
|
|
|
|
+import com.persagy.dmp.rwd.basic.dto.RequestData;
|
|
import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
|
|
import com.persagy.dmp.rwd.digital.entity.ObjectDigital;
|
|
import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
|
|
import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
|
|
|
|
+import com.persagy.dmp.rwd.digital.service.ProjectBusinessService;
|
|
import com.persagy.dmp.rwd.digital.utils.ObjectDigitalCriteriaHelper;
|
|
import com.persagy.dmp.rwd.digital.utils.ObjectDigitalCriteriaHelper;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -40,14 +42,17 @@ public class ObjectDigitalController{
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private IObjectDigitalService service;
|
|
private IObjectDigitalService service;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ProjectBusinessService projectBusinessService;
|
|
|
|
|
|
@PostMapping("/query")
|
|
@PostMapping("/query")
|
|
|
|
+ @Deprecated
|
|
public CommonResult<List<ObjectNode>> query(@RequestBody QueryCriteria criteria) {
|
|
public CommonResult<List<ObjectNode>> query(@RequestBody QueryCriteria criteria) {
|
|
if(criteria == null) {
|
|
if(criteria == null) {
|
|
throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
|
|
throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
|
|
}
|
|
}
|
|
//基础参数校验
|
|
//基础参数校验
|
|
- ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
|
|
|
|
|
|
+ ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE);
|
|
|
|
|
|
QueryWrapper<ObjectDigital> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<ObjectDigital> wrapper = new QueryWrapper<>();
|
|
// 添加所属项目条件
|
|
// 添加所属项目条件
|
|
@@ -56,13 +61,20 @@ public class ObjectDigitalController{
|
|
ObjectDigitalCriteriaHelper.ensureExtraCond(criteria.getCriteria());
|
|
ObjectDigitalCriteriaHelper.ensureExtraCond(criteria.getCriteria());
|
|
// 转换查询条件
|
|
// 转换查询条件
|
|
QueryCriteriaHelper.toWrapper(wrapper, criteria);
|
|
QueryCriteriaHelper.toWrapper(wrapper, criteria);
|
|
- Page page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
|
|
|
|
|
|
+ Page page = QueryCriteriaHelper.toPage(criteria);
|
|
|
|
+ if(criteria.isOnlyCount()) {
|
|
|
|
+ Integer total = service.queryCount(wrapper);
|
|
|
|
+ page.setTotal(total);
|
|
|
|
+ } else {
|
|
|
|
+ page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
|
|
|
|
+ }
|
|
// 处理扩展属性
|
|
// 处理扩展属性
|
|
List<ObjectNode> records = JsonNodeUtils.toListNode(page.getRecords(), ObjectDigital.EXTRA_COLUMN, criteria.getWithColumns());
|
|
List<ObjectNode> records = JsonNodeUtils.toListNode(page.getRecords(), ObjectDigital.EXTRA_COLUMN, criteria.getWithColumns());
|
|
return ResultHelper.multi(records, page.getTotal());
|
|
return ResultHelper.multi(records, page.getTotal());
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping("/createOne")
|
|
@PostMapping("/createOne")
|
|
|
|
+ @Deprecated
|
|
public CommonResult<ObjectDigital> create(@Valid @RequestBody ObjectNode node){
|
|
public CommonResult<ObjectDigital> create(@Valid @RequestBody ObjectNode node){
|
|
//基础参数校验
|
|
//基础参数校验
|
|
ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
|
|
ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
|
|
@@ -76,6 +88,7 @@ public class ObjectDigitalController{
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping("/create")
|
|
@PostMapping("/create")
|
|
|
|
+ @Deprecated
|
|
public CommonResult<List<ObjectDigital>> createBatch(@Valid @RequestBody ArrayNode array){
|
|
public CommonResult<List<ObjectDigital>> createBatch(@Valid @RequestBody ArrayNode array){
|
|
//基础参数校验
|
|
//基础参数校验
|
|
ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
|
|
ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
|
|
@@ -88,6 +101,7 @@ public class ObjectDigitalController{
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping("/updateOne")
|
|
@PostMapping("/updateOne")
|
|
|
|
+ @Deprecated
|
|
public CommonResult<ObjectDigital> update(@Valid @RequestBody ObjectNode node){
|
|
public CommonResult<ObjectDigital> update(@Valid @RequestBody ObjectNode node){
|
|
//基础参数校验
|
|
//基础参数校验
|
|
ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
|
|
ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
|
|
@@ -101,6 +115,7 @@ public class ObjectDigitalController{
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping("/update")
|
|
@PostMapping("/update")
|
|
|
|
+ @Deprecated
|
|
public CommonResult<List<ObjectDigital>> updateBatch(@Valid @RequestBody ArrayNode array){
|
|
public CommonResult<List<ObjectDigital>> updateBatch(@Valid @RequestBody ArrayNode array){
|
|
//基础参数校验
|
|
//基础参数校验
|
|
ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
|
|
ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE,CommonConstant.QUERY_PROJECTID);
|
|
@@ -113,6 +128,7 @@ public class ObjectDigitalController{
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping("/deleteOne")
|
|
@PostMapping("/deleteOne")
|
|
|
|
+ @Deprecated
|
|
public CommonResult delete(@RequestBody String id){
|
|
public CommonResult delete(@RequestBody String id){
|
|
if(StringUtils.isEmpty(id)){
|
|
if(StringUtils.isEmpty(id)){
|
|
throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
|
|
throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
|
|
@@ -122,6 +138,9 @@ public class ObjectDigitalController{
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping("/delete")
|
|
@PostMapping("/delete")
|
|
|
|
+ @Deprecated
|
|
|
|
+ public CommonResult deleteBatch(@RequestBody List<String> id){
|
|
|
|
+ service.delete(id);
|
|
public CommonResult deleteBatch(@RequestBody List<String> ids){
|
|
public CommonResult deleteBatch(@RequestBody List<String> ids){
|
|
if(ids == null || ids.size()<=0){
|
|
if(ids == null || ids.size()<=0){
|
|
throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
|
|
throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
|
|
@@ -129,6 +148,35 @@ public class ObjectDigitalController{
|
|
service.delete(ids);
|
|
service.delete(ids);
|
|
return ResultHelper.success();
|
|
return ResultHelper.success();
|
|
}
|
|
}
|
|
|
|
+ /***
|
|
|
|
+ * Description: 根据项目id集合批量查询项目信息
|
|
|
|
+ * @param idList : 项目id集合
|
|
|
|
+ * @return : com.persagy.dmp.common.model.response.CommonResult<com.fasterxml.jackson.databind.node.ObjectNode>
|
|
|
|
+ * @author : lijie
|
|
|
|
+ * @date :2021/8/18 15:55
|
|
|
|
+ * Update By lijie 2021/8/18 15:55
|
|
|
|
+ */
|
|
|
|
+ @PostMapping("/batchQueryProjectByIds")
|
|
|
|
+ public CommonResult<List<ObjectDigital>> batchQueryProjectByIds(@RequestBody List<String> idList) {
|
|
|
|
+ //基础参数校验
|
|
|
|
+ ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE);
|
|
|
|
+ return projectBusinessService.batchQueryProjectByIds(idList);
|
|
|
|
+ }
|
|
|
|
+ /***
|
|
|
|
+ * Description: 根据管理分区id批量查询项目信息
|
|
|
|
+ * @param requestData : 请求参数
|
|
|
|
+ * @return : com.persagy.dmp.common.model.response.CommonResult<com.fasterxml.jackson.databind.node.ObjectNode>
|
|
|
|
+ * @author : lijie
|
|
|
|
+ * @date :2021/8/18 15:55
|
|
|
|
+ * Update By lijie 2021/8/18 15:55
|
|
|
|
+ */
|
|
|
|
+ @PostMapping("/batchQueryProjectByGroupManageZoneIds")
|
|
|
|
+ public CommonResult<List<ObjectDigital>> batchQueryProjectByGroupManageZoneIds(@RequestBody RequestData requestData) {
|
|
|
|
+ //基础参数校验
|
|
|
|
+ ParamCheckUtil.checkParam(CommonConstant.QUERY_GROUPCODE);
|
|
|
|
+ return projectBusinessService.batchQueryProjectByGroupManageZoneIds(requestData.getGroupManageZoneIds());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
/**
|
|
/**
|
|
* 创建默认条件
|
|
* 创建默认条件
|