修改配置接口

core/src/main/java/com/mooctest/crowd/domain/dao/ConfigurationDao.java

@@ -1,13 +1,16 @@
 package com.mooctest.crowd.domain.dao;
 
 import com.mooctest.crowd.domain.model.ConfigurationPO;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
 
 import javax.transaction.Transactional;
 import java.util.List;
 
 @Transactional
-public interface ConfigurationDao extends CrudRepository<ConfigurationPO, Long> {
+public interface ConfigurationDao extends CrudRepository<ConfigurationPO, Long>, PagingAndSortingRepository<ConfigurationPO, Long>, JpaRepository<ConfigurationPO, Long>, JpaSpecificationExecutor<ConfigurationPO> {
 
     List<ConfigurationPO> findAll();
 }

core/src/main/java/com/mooctest/crowd/domain/repository/CommonRepo.java

@@ -272,9 +272,16 @@ public class CommonRepo {
         return applicationTypePO.get().getName();
     }
 
+    public Map<String, String> getConfigurationListMap() {
+        return configurationDao.findAll().stream()
+                .collect(Collectors.toMap(configurationPO -> configurationPO.getName(), configurationPO -> configurationPO.getValue()));
+    }
+
+
     public Map<String, String> getApplicationCodeNameMap() {
         return applicationTypeDao.findAll().stream()
                 .collect(Collectors.toMap(applicationTypePO -> applicationTypePO.getCode(), applicationTypePO -> applicationTypePO.getName()));
+
     }
 
     public String getFieldCodeByFieldName(String name) {
@@ -317,9 +324,4 @@ public class CommonRepo {
         }
         return testTypePO.get().getCode();
     }
-
-    public Map<String, String> getConfigurationList() {
-        return configurationDao.findAll().stream()
-                .collect(Collectors.toMap(configurationPO -> configurationPO.getName(), configurationPO -> configurationPO.getValue()));
-    }
 }

site/src/main/java/com/mooctest/crowd/site/data/vo/ConfigurationVO.java

@@ -15,4 +15,6 @@ import java.util.Map;
 @AllArgsConstructor
 public class ConfigurationVO implements Serializable{
     private Map<String, String> configurationList;
+
+
 }

site/src/main/java/com/mooctest/crowd/site/service/CommonService.java

@@ -57,5 +57,5 @@ public interface CommonService {
 
     List<Map.Entry<String, Long>> getAgencyProjectCount();
 
-    Map<String, String> getConfigurationList();
+    ConfigurationVO getConfigurationListMap();
 }

site/src/main/java/com/mooctest/crowd/site/service/impl/CommonServiceImpl.java

@@ -319,8 +319,8 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
-    public Map<String, String> getConfigurationList() {
-        return commonRepo.getConfigurationList();
+    public ConfigurationVO getConfigurationListMap() {
+        return new ConfigurationVO(commonRepo.getConfigurationListMap());
     }
 
     Pageable getPageable(SearchConditionVO searchConditionVO) {