Browse Source

对象关系接口修改

linhuili 3 years ago
parent
commit
0694367213

+ 19 - 5
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/controller/ObjectRelationController.java

@@ -11,6 +11,7 @@ import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.common.utils.ParamCheckUtil;
 import com.persagy.dmp.common.utils.ResultHelper;
+import com.persagy.dmp.define.entity.RelationDefine;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
@@ -90,15 +91,28 @@ public class ObjectRelationController {
         return ResultHelper.multi(voList);
     }
 
-    @PostMapping("/deleteOne")
+    /*@PostMapping("/deleteOne")
     public CommonResult delete(@RequestBody String id){
         service.delete(CollUtil.newArrayList(id));
         return ResultHelper.success();
-    }
+    }*/
 
+    /**
+     * 删除关系
+     * @param criteria
+     * @return
+     */
     @PostMapping("/delete")
-    public CommonResult deleteBatch(@RequestBody List<String> id){
-        service.delete(id);
-        return ResultHelper.success();
+    public CommonResult<List<ObjectRelation>> deleteBatch(@RequestBody QueryCriteria criteria){
+        if(criteria == null) {
+            throw new BusinessException(ResponseCode.A0400.getCode(), ResponseCode.A0400.getDesc());
+        }
+        QueryWrapper<ObjectRelation> wrapper = new QueryWrapper<>();
+        // 添加所属项目条件
+        ConditionUtil.ensureProjectCriteria(wrapper);
+        // 转换查询条件
+        QueryCriteriaHelper.toWrapper(wrapper, criteria);
+        List<ObjectRelation> delList = service.delete(wrapper);
+        return ResultHelper.multi(delList,delList.size());
     }
 }

+ 14 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/iservice/ObjectRelationIService.java

@@ -0,0 +1,14 @@
+package com.persagy.dmp.rwd.digital.iservice;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.persagy.dmp.define.entity.RelationDefine;
+import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
+
+/**
+ * 对象关系-IService
+ * @author linhuili
+ * @date 2021-08-17
+ */
+public interface ObjectRelationIService extends IService<ObjectRelation> {
+
+}

+ 16 - 0
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/iservice/impl/ObjectRelationIServiceImpl.java

@@ -0,0 +1,16 @@
+package com.persagy.dmp.rwd.digital.iservice.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.persagy.dmp.rwd.digital.dao.ObjectRelationMapper;
+import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
+import com.persagy.dmp.rwd.digital.iservice.ObjectRelationIService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 对象关系-IService
+ * @author linhuili
+ * @date 2021-08-17
+ */
+@Service
+public class ObjectRelationIServiceImpl extends ServiceImpl<ObjectRelationMapper, ObjectRelation> implements ObjectRelationIService {
+}

+ 3 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/IObjectRelationService.java

@@ -1,6 +1,7 @@
 package com.persagy.dmp.rwd.digital.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
 
@@ -44,7 +45,7 @@ public interface IObjectRelationService {
 
     /**
      * 删除
-     * @param idList 主键
+     * @param wrapper 删除条件
      */
-    void delete(List<String> idList);
+    List<ObjectRelation> delete(QueryWrapper wrapper);
 }

+ 47 - 4
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectRelationServiceImpl.java

@@ -1,16 +1,21 @@
 package com.persagy.dmp.rwd.digital.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.define.entity.RelationDefine;
 import com.persagy.dmp.rwd.basic.utils.DigitalMessageHelper;
 import com.persagy.dmp.rwd.digital.dao.ObjectRelationMapper;
 import com.persagy.dmp.rwd.digital.entity.ObjectRelation;
+import com.persagy.dmp.rwd.digital.iservice.ObjectRelationIService;
 import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -26,7 +31,14 @@ public class ObjectRelationServiceImpl implements IObjectRelationService {
     private ObjectRelationMapper dao;
     @Autowired
     private DigitalMessageHelper messageSender;
+    @Autowired
+    private ObjectRelationIService iService;
 
+    /**
+     * 查询对象关系数据
+     * @param queryWrapper 查询条件
+     * @return
+     */
     @Override
     public List<ObjectRelation> queryByCondition(Wrapper<ObjectRelation> queryWrapper) {
         return dao.selectList(queryWrapper);
@@ -37,18 +49,49 @@ public class ObjectRelationServiceImpl implements IObjectRelationService {
         return dao.selectPage(page, queryWrapper);
     }
 
+    /**
+     * 新增关系数据
+     * @param voList 待新增数据
+     * @return
+     */
     @Override
     public List<ObjectRelation> insert(List<ObjectRelation> voList) {
-        return null;
+        iService.saveOrUpdateBatch(voList);
+        return voList;
     }
 
+
+    /**
+     * 修改关系数据
+     * @param voList 修改条件
+     * @return
+     */
     @Override
     public List<ObjectRelation> update(List<ObjectRelation> voList) {
-        return null;
+        iService.saveOrUpdateBatch(voList);
+        return voList;
     }
 
+    /**
+     * 删除关系数据
+     * @param wrapper 删除条件
+     * @return
+     */
     @Override
-    public void delete(List<String> idList) {
-
+    public List<ObjectRelation> delete(QueryWrapper wrapper) {
+        //根据条件查询有效关系数据
+        wrapper.eq("valid",ValidEnum.TRUE.getType());
+        List<ObjectRelation> list = dao.selectList(wrapper);
+        if(list == null || list.size()<=0){
+            return new ArrayList<>();
+        }
+        //批量删除关系数据
+        for (ObjectRelation relation : list) {
+            relation.setValid(ValidEnum.FALSE.getType());
+        }
+        iService.saveOrUpdateBatch(list);
+        return list;
     }
+
+
 }