预案演练代码提交

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillDictionaryController.java

@@ -91,4 +91,15 @@ public class CoreDrillDictionaryController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(coreDrillDictionaryService.deleteCoreDrillDictionaryByIds(ids));
     }
+
+    /**
+     * 查询预案演练库列表
+     */
+    @ApiOperation(value = "查询CoreDrillDictionary列表")
+    @RequiresPermissions("core:drillDictionary:list")
+    @GetMapping("/listData")
+    public AjaxResult list() {
+        return success(coreDrillDictionaryService.selectCoreDrillDictionaryList());
+    }
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/ICoreDrillDictionaryService.java

@@ -2,6 +2,7 @@ package com.xunmei.core.drill.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.IdName;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryInsertDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryPageDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryUpdateDto;
@@ -30,10 +31,10 @@ public interface ICoreDrillDictionaryService extends IService<CoreDrillDictionar
     /**
      * 查询预案演练库列表
      *
-     * @param coreDrillDictionary 预案演练库
+     * @param
      * @return 预案演练库集合
      */
-    List<CoreDrillDictionary> selectCoreDrillDictionaryList(CoreDrillDictionary coreDrillDictionary);
+    List<IdName<Integer,String>> selectCoreDrillDictionaryList();
 
     /**
      * 新增预案演练库

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillDictionaryServiceImpl.java

@@ -4,10 +4,12 @@ import java.util.Date;
 import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.DictConstants;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.IdName;
 import com.xunmei.common.core.domain.drill.domain.CoreDrillDictionary;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryInsertDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryPageDto;
@@ -27,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -71,17 +74,6 @@ public class CoreDrillDictionaryServiceImpl extends ServiceImpl<CoreDrillDiction
     }
 
     /**
-     * 查询预案演练库列表
-     *
-     * @param coreDrillDictionary 预案演练库
-     * @return 预案演练库
-     */
-    @Override
-    public List<CoreDrillDictionary> selectCoreDrillDictionaryList(CoreDrillDictionary coreDrillDictionary) {
-        return coreDrillDictionaryMapper.selectList(new QueryWrapper<>(coreDrillDictionary));
-    }
-
-    /**
      * 新增预案演练库
      *
      * @param request 预案演练库
@@ -112,7 +104,7 @@ public class CoreDrillDictionaryServiceImpl extends ServiceImpl<CoreDrillDiction
     @Override
     public int updateCoreDrillDictionary(CoreDrillDictionaryUpdateDto request) {
         final CoreDrillDictionary dictionary = new CoreDrillDictionary();
-        BeanUtils.copyProperties(request,dictionary);
+        BeanUtils.copyProperties(request, dictionary);
         return coreDrillDictionaryMapper.updateById(dictionary);
     }
 
@@ -137,4 +129,13 @@ public class CoreDrillDictionaryServiceImpl extends ServiceImpl<CoreDrillDiction
     public int deleteCoreDrillDictionaryById(Long id) {
         return coreDrillDictionaryMapper.deleteById(id);
     }
+
+
+    @Override
+    public List<IdName<Integer, String>> selectCoreDrillDictionaryList() {
+        List<CoreDrillDictionary> selectList = coreDrillDictionaryMapper.selectList(new LambdaQueryWrapper<CoreDrillDictionary>()
+                .eq(CoreDrillDictionary::getDeleted, 0)
+                .select(CoreDrillDictionary::getId, CoreDrillDictionary::getDrillTypeName));
+        return selectList.stream().map(coreDrillDictionary -> new IdName<>(coreDrillDictionary.getId(), coreDrillDictionary.getDrillTypeName())).collect(Collectors.toList());
+    }
 }