巡更签到签退接入agbox、报告配置BUG修复

service-fire/service-fire-biz/pom.xml

@@ -88,6 +88,12 @@
             <artifactId>itextpdf</artifactId>
             <version>5.4.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-agbox-api</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionAttendanceServiceImpl.java

@@ -1,11 +1,13 @@
 package com.usky.fire.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
+import com.usky.agbox.RemotePatrolAgboxService;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.security.utils.SecurityUtils;
@@ -50,6 +52,9 @@ public class PatrolInspectionAttendanceServiceImpl extends AbstractCrudService<P
 
     @Autowired
     private PatrolInspectionPersonnelMapper patrolInspectionPersonnelMapper;
+
+    @Autowired
+    private RemotePatrolAgboxService remotePatrolAgboxService;
     @Override
     public IPage<Map<String, Object>> pageList(Integer pageNum, Integer pageSize, String operateCode, String operator, LocalDateTime startTime, LocalDateTime endTime) {
         IPage<PatrolInspectionAttendance> page = new Page<>(pageNum, pageSize);
@@ -127,6 +132,19 @@ public class PatrolInspectionAttendanceServiceImpl extends AbstractCrudService<P
         patrolInspectionAttendance.setDeviceCode(patrolInspectionAttendance.getDeviceCode());
         baseMapper.insert(patrolInspectionAttendance);
         patrolInspectionPersonnelService.updateSignStatus(patrolInspectionAttendance.getSignInType());
+        JSONObject jsonObj = new JSONObject();
+        jsonObj.put("deviceId", patrolInspectionAttendance.getDeviceCode());
+        jsonObj.put("triggerTime", LocalDateTime.now());
+        Integer eventCode = 17;
+        if(patrolInspectionAttendance.getSignInType().equals(0)){
+            eventCode=1;
+        }else {
+            eventCode=2;
+        }
+        jsonObj.put("eventCode", eventCode);
+        jsonObj.put("name", SecurityUtils.getUsername());
+        jsonObj.put("certifiedNo", patrolInspectionAttendance.getIdentificationNumber());
+        JSONObject a = remotePatrolAgboxService.addEvent(jsonObj.toJSONString());
     }
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReportConfigServiceImpl.java

@@ -95,6 +95,14 @@ public class ReportConfigServiceImpl extends AbstractCrudService<ReportConfigMap
                 queryWrapper2
                         .in(ReportIndexConfig::getSeniorIndex,indexIdList1);
                 List<ReportIndexConfig> list4 = reportIndexConfigService.list(queryWrapper2);
+                for (int k = 0; k < list3.size(); k++) {
+                    ReportIndex1Vo reportIndex1Vo = new ReportIndex1Vo();
+                    reportIndex1Vo.setId(list3.get(k).getId());
+                    reportIndex1Vo.setIndexCode(list3.get(k).getIndexCode());
+                    reportIndex1Vo.setIndexGrade(list3.get(k).getIndexGrade());
+                    reportIndex1Vo.setIndexName(list3.get(k).getIndexName());
+                    reportIndex1Vo.setIndexWeight(list3.get(k).getIndexWeight());
+                    reportIndex1Vo.setIndexDesc(list3.get(k).getIndexDesc());
                 if (CollectionUtils.isNotEmpty(list4)) {
                     List<Integer> indexIdList2 = new ArrayList<>();
                     for (int j = 0; j < list4.size(); j++) {
@@ -104,14 +112,7 @@ public class ReportConfigServiceImpl extends AbstractCrudService<ReportConfigMap
                     queryWrapper3
                             .in(ReportIndexConfig::getSeniorIndex,indexIdList2);
                     List<ReportIndexConfig> list5 = reportIndexConfigService.list(queryWrapper3);
-                    for (int k = 0; k < list3.size(); k++) {
-                        ReportIndex1Vo reportIndex1Vo = new ReportIndex1Vo();
-                        reportIndex1Vo.setId(list3.get(k).getId());
-                        reportIndex1Vo.setIndexCode(list3.get(k).getIndexCode());
-                        reportIndex1Vo.setIndexGrade(list3.get(k).getIndexGrade());
-                        reportIndex1Vo.setIndexName(list3.get(k).getIndexName());
-                        reportIndex1Vo.setIndexWeight(list3.get(k).getIndexWeight());
-                        reportIndex1Vo.setIndexDesc(list3.get(k).getIndexDesc());
+
                         List<ReportIndex2Vo> list6 = new ArrayList<>();
                         for (int l = 0; l < list4.size(); l++) {
                             List<ReportIndex3Vo> list7 = new ArrayList<>();