lyhzzz 1 rok pred
rodič
commit
7ce6fba3de

+ 15 - 13
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -264,19 +264,21 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
         }
         for (SceneVo record : page.getRecords()) {
-            if(record.getStatus() !=0 && (param.getType() == 2 || param.getType() == 6)){
-                JSONObject ssObj = ssSceneMap.get(record.getNum());
-                if(ssObj!=null){
-                    record.setSceneName(ssObj.getString("title"));
-                    record.setThumb(ssObj.getString("thumb"));
-                    record.setWebSite(ssObj.getString("webSite"));
-                    record.setIsObj(ssObj.getInteger("buildObjStatus"));
-                    record.setViewCount(ssObj.getInteger("viewCount"));
-                    record.setStatus(toFdStatus(ssObj.getInteger("status")));
-                    record.setAlgorithmTime(ssObj.getString("algorithmTime"));
-                }else{
-                    record.setStatus(-1);
-                    record.setWebSite(null);
+            if(record.getStatus() != 0){
+                if(param.getType() == 2 || param.getType() == 6){
+                    JSONObject ssObj = ssSceneMap.get(record.getNum());
+                    if(ssObj!=null){
+                        record.setSceneName(ssObj.getString("title"));
+                        record.setThumb(ssObj.getString("thumb"));
+                        record.setWebSite(ssObj.getString("webSite"));
+                        record.setIsObj(ssObj.getInteger("buildObjStatus"));
+                        record.setViewCount(ssObj.getInteger("viewCount"));
+                        record.setStatus(toFdStatus(ssObj.getInteger("status")));
+                        record.setAlgorithmTime(ssObj.getString("algorithmTime"));
+                    }else{
+                        record.setStatus(-1);
+                        record.setWebSite(null);
+                    }
                 }
             }
 

+ 1 - 1
src/main/java/com/fdkankan/manage/task/DingdingService.java

@@ -51,7 +51,7 @@ public class DingdingService {
             BigDecimal divideCount = dbCount.divide(totalCount,2,RoundingMode.HALF_DOWN);
             BigDecimal thresholdCount = new BigDecimal(threshold).setScale(2,RoundingMode.HALF_DOWN);
             log.info("modelThreshold--{},{},{},{}",threshold,divideCount,thresholdCount,divideCount.compareTo(thresholdCount));
-            if(divideCount.compareTo(thresholdCount) >= 0 ){
+            if(divideCount.compareTo(thresholdCount) < 0 ){
                 this.sendDingDingMsg(size);
             }
         }catch (Exception e){