Sfoglia il codice sorgente

Merge branch '1.0' of codeup.aliyun.com:5ec7ea24405cdab50f3fd8f0/galaxis/manatee into 1.0

WoNiu 4 anni fa
parent
commit
a5e08f2459

+ 0 - 17
pom.xml

@@ -119,23 +119,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <profiles>
-        <profile>
-            <id>java11</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.glassfish.jaxb</groupId>
-                    <artifactId>jaxb-runtime</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-
     <build>
         <plugins>
             <plugin>

+ 3 - 2
src/main/java/com/galaxis/manatee/service/impl/ChuanyunServiceImpl.java

@@ -107,10 +107,12 @@ public class ChuanyunServiceImpl implements ChuanyunService {
         var objectMapper=new ObjectMapper();
         var start=0;
         var flag=true;
+        List<String> matchersString=new ArrayList<>();
+        matchersString.add("Status_2,1");
         while (flag){
             try {
                 //从氚云查询数据
-                var filter= Filter.instance(start,start+pageSize,true);
+                var filter= Filter.instance(start,start+pageSize,true,Filter.AND,matchersString);
                 var chuanyunFindAllResponse=chuanYunManager.findAll(code,filter);
                 if(chuanyunFindAllResponse.getReturnData()==null){
                     flag=false;
@@ -134,7 +136,6 @@ public class ChuanyunServiceImpl implements ChuanyunService {
                         ChuanyunSaveDTO chuanyunSaveDTO=chuanYunManager.update(code,chuanyunUpdateDeptDO.getObjectId(),groupProjectUpdateString);
                         if(chuanyunSaveDTO.getSuccessful()){
                             log.info(chuanyunUpdateDeptDO.getObjectId()+"更新项目拥有者成功");
-
                         }else{
                             log.warn(chuanyunUpdateDeptDO.getObjectId()+"更新项目拥有者失败");
                             log.warn(chuanyunUpdateDeptDO+"");

File diff suppressed because it is too large
+ 3 - 6
src/main/java/com/galaxis/manatee/task/ChuanyunBasicDataScheduledTask.java