Merge branch 'usky-zyj' of uskycloud/usky-modules into master

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/config/SyncPatrolInspectionEvent.java

@@ -0,0 +1,31 @@
+package com.usky.fire.service.config;
+
+import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.system.RemoteDictService;
+import com.usky.system.RemoteMceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Async;
+
+@Configuration
+public class SyncPatrolInspectionEvent {
+
+    @Autowired
+    private RemoteMceService remoteMceService;
+    @Autowired
+    private RemoteDictService remoteDictService;
+
+    @Async
+    public void sendAsyncMessage(Integer eventId,String eventName,Integer eventType){
+        String eventTypeName = remoteDictService.selectNameById("patrol_event_type",
+                eventType.toString());
+        JsonObject jsonObject = new JsonObject();
+        jsonObject.addProperty("infoTitle", eventName);
+        jsonObject.addProperty("infoContent",eventTypeName);
+        jsonObject.addProperty("infoType",2);
+        jsonObject.addProperty("userName", SecurityUtils.getUsername());
+        jsonObject.addProperty("id",eventId);
+        remoteMceService.addMce(jsonObject.toString());
+    }
+}

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

@@ -18,6 +18,7 @@ import com.usky.fire.service.PatrolInspectionEventService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.service.PatrolInspectionPersonnelService;
 import com.usky.fire.service.PatrolInspectionPlanScheduleService;
+import com.usky.fire.service.config.SyncPatrolInspectionEvent;
 import com.usky.fire.service.config.mqtt.MqttOutConfig;
 import com.usky.fire.service.config.rabbitmq.RabbitMQConfig;
 import com.usky.fire.service.vo.PatrolInspectionPlanRequestVO;
@@ -61,10 +62,7 @@ public class PatrolInspectionEventServiceImpl extends AbstractCrudService<Patrol
     @Resource
     private MqttOutConfig.MqttGateway mqttGateway;
     @Autowired
-    private RemoteMceService remoteMceService;
-    @Autowired
-    private RemoteDictService remoteDictService;
-
+    private SyncPatrolInspectionEvent syncPatrolInspectionEvent;
 
     @Override
     public CommonPage<PatrolInspectionEvent> patrolInspectionEventList(PatrolInspectionPlanRequestVO requestVO){
@@ -135,15 +133,8 @@ public class PatrolInspectionEventServiceImpl extends AbstractCrudService<Patrol
 //      rabbitTemplate.convertAndSend(rabbitMQConfig.patrolFEventExchange,"", JSONObject.toJSONString(map));
 
         this.save(patrolInspectionEvent);
-        String eventTypeName = remoteDictService.selectNameById("patrol_event_type",
-                patrolInspectionEvent.getEventType().toString());
-        JsonObject jsonObject = new JsonObject();
-        jsonObject.addProperty("infoTitle", patrolInspectionEvent.getEventName());
-        jsonObject.addProperty("infoContent",eventTypeName);
-        jsonObject.addProperty("infoType",2);
-        jsonObject.addProperty("userName",SecurityUtils.getUsername());
-        jsonObject.addProperty("id",patrolInspectionEvent.getId());
-        remoteMceService.addMce(jsonObject.toString());
+
+        syncPatrolInspectionEvent.sendAsyncMessage(patrolInspectionEvent.getId(),patrolInspectionEvent.getEventName(),patrolInspectionEvent.getEventType());
 
     }
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingFaceController.java

@@ -17,7 +17,9 @@ import com.usky.common.core.exception.BusinessException;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.meeting.annotation.FaceLog;
 import com.usky.meeting.domain.MeetingFace;
+import com.usky.meeting.domain.SysDept;
 import com.usky.meeting.mapper.MeetingFaceMapper;
+import com.usky.meeting.mapper.SysDeptMapper;
 import com.usky.meeting.repository.MeetingInfoRepository;
 import com.usky.meeting.service.MeetingFaceService;
 import com.usky.meeting.service.vo.DmpDeviceInfoVO;
@@ -59,6 +61,8 @@ public class MeetingFaceController {
     MeetingInfoRepository meetingInfoRepository;
     @Autowired
     private MeetingFaceMapper meetingFaceMapper;
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
 
     @PostMapping("/vef")
     @ApiOperation(value="人脸验证", notes="根据传入的base64编码和数据的base64编码进行对比")
@@ -75,21 +79,39 @@ public class MeetingFaceController {
             @RequestParam(required = false) String faceName,
             @RequestParam(required = false) String faceStatus,
             @RequestParam(required = false) Integer fid,
-            @RequestParam(required = false) Long userId
-            ){
+            @RequestParam(required = false) Long userId,
+            @RequestParam(required = false) Integer deptId
+    ){
         IPage<MeetingFace> page = faceService.page(new Page(current, size), new QueryWrapper<MeetingFace>()
                 .like(StrUtil.isNotBlank(faceName),"face_name",faceName)
                 .like(StrUtil.isNotBlank(faceStatus),"face_status",faceStatus)
                 .eq(fid != null,"fid",fid)
                 .eq(userId != null,"user_id",userId)
+                .eq(deptId != null,"dept_id",deptId)
                 .eq("tenant_id", SecurityUtils.getTenantId()));
         if(page.getRecords().size() > 0){
-            for (int i = 0; i < page.getRecords().size(); i++) {
-                if(Objects.nonNull(page.getRecords().get(i).getBindDevice()) || StringUtils.isNotBlank(page.getRecords().get(i).getBindDevice())){
-                    String[] deviceIdStr = page.getRecords().get(i).getBindDevice().split(",");
-                    Integer[] deviceIds = Arrays.stream(deviceIdStr).map(Integer::parseInt).toArray(Integer[]::new);
-                    List<DmpDeviceInfoVO> list = meetingFaceMapper.getDeviceInfo(Arrays.asList(deviceIds));
-                    page.getRecords().get(i).setDeviceInfos(list);
+//            for (int i = 0; i < page.getRecords().size(); i++) {
+//                if(Objects.nonNull(page.getRecords().get(i).getBindDevice()) || StringUtils.isNotBlank(page.getRecords().get(i).getBindDevice())){
+//                    String[] deviceIdStr = page.getRecords().get(i).getBindDevice().split(",");
+//                    Integer[] deviceIds = Arrays.stream(deviceIdStr).map(Integer::parseInt).toArray(Integer[]::new);
+//                    List<DmpDeviceInfoVO> list = meetingFaceMapper.getDeviceInfo(Arrays.asList(deviceIds));
+//                    page.getRecords().get(i).setDeviceInfos(list);
+//
+//                }
+//            }
+
+            QueryWrapper<SysDept> queryWrapper = Wrappers.query();
+            queryWrapper.eq("del_flag",0).eq("tenant_id",SecurityUtils.getTenantId());
+            List<SysDept> sysDeptList = sysDeptMapper.selectList(queryWrapper);
+            if(sysDeptList.size() > 0){
+                for (int i = 0; i < page.getRecords().size(); i++) {
+                    Integer deptId1 = page.getRecords().get(i).getDeptId();
+                    for (int j = 0; j < sysDeptList.size(); j++) {
+                        if(deptId1.equals(Integer.valueOf(sysDeptList.get(j).getDeptId().toString()))){
+                            page.getRecords().get(i).setSysDept(sysDeptList.get(j));
+                            break;
+                        }
+                    }
 
                 }
             }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingFace.java

@@ -93,4 +93,9 @@ public class MeetingFace implements Serializable {
     @TableField(exist = false)
     private List<DmpDeviceInfoVO> deviceInfos;
 
+    /**
+     * 部门信息
+     */
+    @TableField(exist = false)
+    private SysDept sysDept;
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/mapper/SysDeptMapper.java

@@ -2,6 +2,7 @@ package com.usky.meeting.mapper;
 
 import com.usky.meeting.domain.SysDept;
 import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @author zyj
  * @since 2024-03-18
  */
+@Repository
 public interface SysDeptMapper extends CrudMapper<SysDept> {
 
 }