Skip to content

G
gic-store
Commit b5835148 by 陶光胜
Options

storeinfoId notin

parent be3fc7d4
Showing with 115 additions and 0 deletions
gic-store-api/pom.xml
......@@ -95,6 +95,57 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<skip>true</skip>
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
<targetJdk>1.8</targetJdk>
<printFailingErrors>true</printFailingErrors>
<excludes>
<exclude>**/FixClassTypeResolver.java</exclude>
</excludes>
&lt;!&ndash; 代码检查规则 &ndash;&gt;
<rulesets>
<ruleset>rulesets/java/gic-ali-comment.xml</ruleset>
<ruleset>rulesets/java/gic-ali-naming.xml</ruleset>
<ruleset>rulesets/java/gic-ali-concurrent.xml</ruleset>
<ruleset>rulesets/java/gic-ali-constant.xml</ruleset>
<ruleset>rulesets/java/gic-ali-exception.xml</ruleset>
<ruleset>rulesets/java/gic-ali-flowcontrol.xml</ruleset>
<ruleset>rulesets/java/gic-ali-oop.xml</ruleset>
<ruleset>rulesets/java/gic-ali-orm.xml</ruleset>
<ruleset>rulesets/java/gic-ali-other.xml</ruleset>
<ruleset>rulesets/java/gic-ali-set.xml</ruleset>
<ruleset>rulesets/java/gic-common.xml</ruleset>
</rulesets>
</configuration>
<executions>
&lt;!&ndash; 绑定pmd:pmd到site生命周期 &ndash;&gt;
<execution>
<id>pmd-pmd-site</id>
<phase>site</phase>
<goals>
<goal>pmd</goal>
</goals>
</execution>
</executions>
&lt;!&ndash; p3c依赖 &ndash;&gt;
<dependencies>
<dependency>
<groupId>com.alibaba.p3c</groupId>
<artifactId>p3c-pmd</artifactId>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-platform-config</artifactId>
<version>${gic-platform-config}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
......
gic-store-api/src/main/java/com/gic/store/dto/StoreSearchDTO.java
......@@ -17,6 +17,7 @@ public class StoreSearchDTO implements Serializable {
private String storeIds;
private String storeInfoIds;
private String storeIdsOfNot;
private String storeInfoIdsOfNot;
private Integer storeBrandId;
private String searchJson;
private String authSearchJson;
......
gic-store-service/pom.xml
......@@ -224,6 +224,57 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<skip>true</skip>
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
<targetJdk>1.8</targetJdk>
<printFailingErrors>true</printFailingErrors>
<excludes>
<exclude>**/FixClassTypeResolver.java</exclude>
</excludes>
&lt;!&ndash; 代码检查规则 &ndash;&gt;
<rulesets>
<ruleset>rulesets/java/gic-ali-comment.xml</ruleset>
<ruleset>rulesets/java/gic-ali-naming.xml</ruleset>
<ruleset>rulesets/java/gic-ali-concurrent.xml</ruleset>
<ruleset>rulesets/java/gic-ali-constant.xml</ruleset>
<ruleset>rulesets/java/gic-ali-exception.xml</ruleset>
<ruleset>rulesets/java/gic-ali-flowcontrol.xml</ruleset>
<ruleset>rulesets/java/gic-ali-oop.xml</ruleset>
<ruleset>rulesets/java/gic-ali-orm.xml</ruleset>
<ruleset>rulesets/java/gic-ali-other.xml</ruleset>
<ruleset>rulesets/java/gic-ali-set.xml</ruleset>
<ruleset>rulesets/java/gic-common.xml</ruleset>
</rulesets>
</configuration>
<executions>
&lt;!&ndash; 绑定pmd:pmd到site生命周期 &ndash;&gt;
<execution>
<id>pmd-pmd-site</id>
<phase>site</phase>
<goals>
<goal>pmd</goal>
</goals>
</execution>
</executions>
&lt;!&ndash; p3c依赖 &ndash;&gt;
<dependencies>
<dependency>
<groupId>com.alibaba.p3c</groupId>
<artifactId>p3c-pmd</artifactId>
<version>2.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-platform-config</artifactId>
<version>${gic-platform-config}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
......@@ -1700,6 +1700,18 @@ public class StoreApiServiceImpl implements StoreApiService {
_list.add(notJSON);
enterpriseJson = QueryConditionAssemblyUtil.createListQueryNode(_list, OperateEnum.OPERATE_AND);
}
/****build notIn storeInfoId*****/
if(StringUtils.isNotBlank(storeSearchDTO.getStoreInfoIdsOfNot())){
List<JSONObject> list = new ArrayList<>();
json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREINFOID.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getStoreInfoIdsOfNot());
list.add(json);
JSONObject notJson = QueryConditionAssemblyUtil.createListQueryNode(list, OperateEnum.OPERATE_AND_NOT);
List<JSONObject> list1 = new ArrayList<>();
list1.add(enterpriseJson);
list1.add(notJson);
enterpriseJson = QueryConditionAssemblyUtil.createListQueryNode(list1, OperateEnum.OPERATE_AND);
}
return enterpriseJson;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment