Merge branch 'server-165' of http://47.111.81.118:3000/uskycloud/usky-modules into fu-dev

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PatrolInspectionPersonnel.java

@@ -140,4 +140,14 @@ public class PatrolInspectionPersonnel implements Serializable {
      * 服务内容
      */
     private String serviceContent;
+
+    /**
+     * 所属派遣公司
+     */
+    private String dispatchCompany;
+
+    /**
+     * 所属保安从业公司
+     */
+    private String securityCompany;
 }

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

@@ -3,6 +3,7 @@ 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.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.agbox.RemotePatrolAgBoxService;
@@ -28,10 +29,7 @@ import com.usky.system.RemoteDeptService;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -94,6 +92,14 @@ public class PatrolInspectionAttendanceServiceImpl extends AbstractCrudService<P
 
         List<Map<String, Object>> resultList = new ArrayList<>();
 
+        List<Long> userIdList = new ArrayList<>();
+
+        for (PatrolInspectionAttendance attendance : attendancePage.getRecords()) {
+            userIdList.add(attendance.getOperatorId());
+        }
+        LambdaQueryWrapper<PatrolInspectionPersonnel> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.in(PatrolInspectionPersonnel::getUserId,userIdList);
+        List<PatrolInspectionPersonnel> personnelList = patrolInspectionPersonnelService.list(queryWrapper1);
         for (PatrolInspectionAttendance attendance : attendancePage.getRecords()) {
             Map<String, Object> map = new HashMap<>();
             map.put("id", attendance.getId());
@@ -112,6 +118,15 @@ public class PatrolInspectionAttendanceServiceImpl extends AbstractCrudService<P
             map.put("latitude", attendance.getLatitude());
             map.put("remarks", attendance.getRemarks());
             map.put("identificationNumber", attendance.getIdentificationNumber());
+            Integer attendanceIn = attendance.getOperatorId().intValue();
+            if (CollectionUtils.isNotEmpty(personnelList)){
+                for (PatrolInspectionPersonnel personnel : personnelList) {
+                    if (attendanceIn.equals(personnel.getUserId())){
+                        map.put("dispatchCompany", personnel.getDispatchCompany());
+                        map.put("securityCompany", personnel.getSecurityCompany());
+                    }
+                }
+            }
             resultList.add(map);
         }
         IPage<Map<String, Object>> resultPage = new Page<>();

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

@@ -136,7 +136,7 @@ public class PatrolInspectionEventServiceImpl extends AbstractCrudService<Patrol
         jsonObject.addProperty("infoType",2);
         jsonObject.addProperty("id",patrolInspectionEvent.getId());
         remoteMceService.addMce(jsonObject.toString());
-        String url = "http://sgdzpic.3322.org:5901";
+        String url = "http://192.168.10.118:5901";
         String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>  \n" +
                 "<Agent ID=\"SSJCZHQY0001\" Type=\"18\" Ver=\"1.2.0.0\">\n" +
                 "<DVRHeart State=\"1\" TotalSpace=\"XXXXX\" FreeSpace=\"XXXXXX\">\n" +

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

@@ -158,6 +158,8 @@ public class PatrolInspectionPersonnelServiceImpl extends AbstractCrudService<Pa
                 patrolInspectionPersonnelVo.setPhoneNumber(list.get(i).getPhoneNumber());
                 patrolInspectionPersonnelVo.setMainPosition(list.get(i).getMainPosition());
                 patrolInspectionPersonnelVo.setServiceContent(list.get(i).getServiceContent());
+                patrolInspectionPersonnelVo.setDispatchCompany(list.get(i).getDispatchCompany());
+                patrolInspectionPersonnelVo.setSecurityCompany(list.get(i).getSecurityCompany());
                 for (int j = 0; j < userList.size(); j++) {
                     if (list.get(i).getUserId().longValue() == userList.get(j).getUserId()) {
                         patrolInspectionPersonnelVo.setName(userList.get(j).getNickName());

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/PatrolInspectionPersonnelVo.java

@@ -141,4 +141,14 @@ public class PatrolInspectionPersonnelVo implements Serializable {
      */
     private String serviceContent;
 
+    /**
+     * 所属派遣公司
+     */
+    private String dispatchCompany;
+
+    /**
+     * 所属保安从业公司
+     */
+    private String securityCompany;
+
 }

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionPersonnelMapper.xml

@@ -27,6 +27,8 @@
         <result column="phone_number" property="phoneNumber" />
         <result column="main_position" property="mainPosition" />
         <result column="service_content" property="serviceContent" />
+        <result column="dispatch_company" property="dispatchCompany" />
+        <result column="security_company" property="securityCompany" />
     </resultMap>
 
 </mapper>