统计违规项

src/inspect_report/api/tasksapi.py

@@ -565,7 +565,7 @@ class TasksApi(viewsets.ViewSet):
         start_date = req.data.get('start_date', (datetime.now() + timedelta(days=-1)).strftime('%Y-%m-%d'))
         end_date = req.data.get('end_date', datetime.now().strftime('%Y-%m-%d'))
         q_start_date = datetime.strptime(start_date, '%Y-%m-%d').date()
-        q_end_date = (datetime.strptime(end_date, '%Y-%m-%d') + + timedelta(days=1)).date()
+        q_end_date = (datetime.strptime(end_date, '%Y-%m-%d') + timedelta(days=1)).date()
 
         session_condition = {'create_date__gte': q_start_date, 'create_date__lt': q_end_date}
         if agent_name:

src/inspect_report/cron.py

@@ -38,10 +38,10 @@ def rule_stat(start_date=None, end_date=None):
         session_condition = {'taskId': t['id'], 'violationRuleCount__gt': 0}
         checks = tn.objects.filter(**session_condition).values('id', 'checkResult', 'agentName', 'customName', 'score',
                                                                'remainTime', 'taskId', 'sessionId')
-        rules_list = []
         for check in checks:
             result = check['checkResult']
             if result:
+                rules_list = []
                 data = json.loads(result)
                 for d in data:
                     if 'isViolation' in d.keys() and d['isViolation'] and 'rule' in d.keys() and 'name' in d['rule'].keys():
@@ -54,7 +54,8 @@ def rule_stat(start_date=None, end_date=None):
                                     'session_table_id': check['id']}
                         rules_list.append(RulesStat(**rule_obj))
                         stat_count += 1
-        RulesStat.objects.bulk_create(rules_list)
+                logger.info('rule stat num: [%s]', stat_count)
+                RulesStat.objects.bulk_create(rules_list)
     logger.info('[rule_stat]rule stat num: [%s]', stat_count)
     logger.info('[rule_stat]rule stat end.')