Explorar el Código

feature(红白名单功能开发): 红白名单功能开发

红白名单功能开发
mazq hace 3 años
padre
commit
38251094d7

+ 1 - 1
dcuc-app-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.2.1-tjdsj-SNAPSHOT</version>
+        <version>2.2.2-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 8 - 0
dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/IApplyInfoFacade.java

@@ -286,4 +286,12 @@ public interface IApplyInfoFacade {
      */
     @PostMapping(value = "getListByCodes")
     List<ApplyInfo> getListByCodes(@RequestBody List<String> appCodes);
+
+    /**
+     * 条件查询-不分页
+     * @param searchDTO
+     * @return
+     */
+    @PostMapping("appInfoSearch")
+    List<ApplyInfo> appInfoSearch(@RequestBody SearchDTO searchDTO);
 }

+ 1 - 1
dcuc-app-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.2.1-tjdsj-SNAPSHOT</version>
+        <version>2.2.2-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/enumresources/ResourceTypeEnum.java

@@ -17,9 +17,9 @@ public enum ResourceTypeEnum {
     private String resourceProvider;
     private String resourceType;
 
-    ResourceTypeEnum(String resourceId, String resouProvider, String resourceType) {
+    ResourceTypeEnum(String resourceId, String resourceProvider, String resourceType) {
         this.resourceId = resourceId;
-        this.resourceProvider = resouProvider;
+        this.resourceProvider = resourceProvider;
         this.resourceType = resourceType;
     }
 

+ 2 - 2
dcuc-app-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.2.1-tjdsj-SNAPSHOT</version>
+        <version>2.2.2-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -120,7 +120,7 @@
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-auth-api</artifactId>
-            <version>2.3.1-tjdsj-SNAPSHOT</version>
+            <version>2.3.3-tjdsj-SNAPSHOT</version>
         </dependency>
         <!--配置 dcuc 结束-->
 

+ 5 - 0
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/ApplyInfoFacade.java

@@ -71,6 +71,11 @@ public class ApplyInfoFacade implements IApplyInfoFacade {
         return applyInfoService.getListByCodes(appCodes);
     }
 
+    @Override
+    public List<ApplyInfo> appInfoSearch(SearchDTO searchDTO) {
+        return applyInfoService.appInfoSearch(searchDTO);
+    }
+
     @Override
     public String getNewSort() {
         return applyInfoService.getNewSort();

+ 7 - 0
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/IApplyInfoService.java

@@ -254,4 +254,11 @@ public interface IApplyInfoService extends IBaseService<ApplyInfo, String> {
      * @return
      */
     List<ApplyInfo> getListByCodes(List<String> appCodes);
+
+    /**
+     * 条件查询-不分页
+     * @param searchDTO
+     * @return
+     */
+    List<ApplyInfo> appInfoSearch(SearchDTO searchDTO);
 }

+ 5 - 0
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/impl/ApplyInfoServiceImpl.java

@@ -391,6 +391,11 @@ public class ApplyInfoServiceImpl extends BaseMybatisService<ApplyInfo, String>
         return applyInfoMapper.selectList(wrapper);
     }
 
+    @Override
+    public List<ApplyInfo> appInfoSearch(SearchDTO searchDTO) {
+        return applyInfoMapper.findBySearchable(Searchable.toSearchable(searchDTO));
+    }
+
     private List<ApplyInfo> loadInfo(InputStream inputStream) throws IOException, ParseException {
         //根据指定的文件输入流导入Excel从而产生Workbook对象
         Workbook wb0 = new HSSFWorkbook(inputStream);

+ 2 - 2
pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dragoninfo</groupId>
     <artifactId>dcuc-app</artifactId>
-    <version>2.2.1-tjdsj-SNAPSHOT</version>
+    <version>2.2.2-tjdsj-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>dcuc-app-api</module>
@@ -18,7 +18,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <!--revisions需写死,用于标识打包的版本号,不可删除-->
-        <revision>2.0.0-tjdsj-SNAPSHOT</revision>
+        <revision>2.2.2-tjdsj-SNAPSHOT</revision>
         <duceap.version>2.1.0-SNAPSHOT</duceap.version>
         <oracle.version>11.2.0.1.0</oracle.version>
         <mysql.version>5.1.49</mysql.version>