Merge branch 'han' of uskycloud/usky-modules into modules-zjy

service-sas/service-sas-biz/src/main/java/com/usky/sas/domain/SasPatrolUserParam.java

@@ -1,5 +1,8 @@
 package com.usky.sas.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 import lombok.Data;
@@ -15,6 +18,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
+@TableName("sas_patrol_user_param")
 public class SasPatrolUserParam implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -22,6 +26,7 @@ public class SasPatrolUserParam implements Serializable {
     /**
      * 主键id
      */
+    @TableId(value = "id", type = IdType.INPUT)
     private String id;
 
     /**

service-sas/service-sas-biz/src/main/java/com/usky/sas/mqtt/dto/EntranceEventInfo.java

@@ -0,0 +1,29 @@
+package com.usky.sas.mqtt.dto;
+
+import lombok.Data;
+
+/**
+ * 门禁事件详细信息
+ */
+@Data
+public class EntranceEventInfo {
+    private String id;
+    private String deviceId;
+    private Integer channel;
+    private Integer certifiedType;
+    private String certifiedNo;
+    private String name;
+    private String phone;
+    private String triggerTime;
+    private Integer eventCode;
+    private Integer certifiedTypeCode;
+    private String cardId;
+    private String visit;
+    private String houseCode;
+    private Integer similarity;
+    private String note;
+    private String picId;
+
+    // 图片信息
+    private EntranceEventPicInfo eventPic;
+}

service-sas/service-sas-biz/src/main/java/com/usky/sas/mqtt/dto/EntranceEventInfoResult.java

@@ -0,0 +1,11 @@
+package com.usky.sas.mqtt.dto;
+
+import lombok.Data;
+
+/**
+ * 门禁事件详细信息结果
+ */
+@Data
+public class EntranceEventInfoResult {
+    private EntranceEventInfo eventInfo;
+}

service-sas/service-sas-biz/src/main/java/com/usky/sas/mqtt/dto/EntranceEventInfoVo.java

@@ -0,0 +1,12 @@
+package com.usky.sas.mqtt.dto;
+
+import lombok.Data;
+
+/**
+ * 门禁事件HTTP详细信息响应VO
+ */
+@Data
+public class EntranceEventInfoVo {
+    private String id;
+    private EntranceEventInfoResult result;
+}

service-sas/service-sas-biz/src/main/java/com/usky/sas/mqtt/dto/EntranceEventPicInfo.java

@@ -0,0 +1,12 @@
+package com.usky.sas.mqtt.dto;
+
+import lombok.Data;
+
+/**
+ * 门禁事件图片信息
+ */
+@Data
+public class EntranceEventPicInfo {
+    private String url;
+    private String path;
+}

service-sas/service-sas-biz/src/main/java/com/usky/sas/mqtt/dto/PerceptionEventMessage.java

@@ -22,6 +22,7 @@ public class PerceptionEventMessage {
     private Integer eventSystem;
 
     // 图片信息
+    @com.fasterxml.jackson.annotation.JsonProperty("eventPic")
     private PicInfo perceptionPic;
 
     @Data

service-sas/service-sas-biz/src/main/java/com/usky/sas/service/impl/SasMapServiceImpl.java

@@ -86,9 +86,9 @@ public class SasMapServiceImpl extends AbstractCrudService<SasMapsMapper, SasMap
         IPage<SasMaps> page = new Page<>(request.getCurrent(), request.getSize());
         LambdaQueryWrapper<SasMaps> wrapper = new LambdaQueryWrapper<>();
         // 电子地图配置不展示：视频导出防护(1003)、实时电子巡检(1008) 模块的地图
-        wrapper.notIn(SasMaps::getType,
+/*        wrapper.notIn(SasMaps::getType,
                 SystemTypeCodeEnum.usbalarm.getCode(),
-                SystemTypeCodeEnum.patrol.getCode());
+                SystemTypeCodeEnum.patrol.getCode());*/
         if (request.getParentId() != null && !request.getParentId().isEmpty()) {
             wrapper.eq(SasMaps::getParentId, request.getParentId());
         }
@@ -320,11 +320,15 @@ public class SasMapServiceImpl extends AbstractCrudService<SasMapsMapper, SasMap
         entity.setDeviceId(item.getDeviceId());
         entity.setImgId(item.getImgId());
         entity.setType(item.getType());
+        entity.setBackgroundColor(item.getBackgroundColor());
         entity.setX(item.getX() != null ? BigDecimal.valueOf(item.getX()) : null);
         entity.setY(item.getY() != null ? BigDecimal.valueOf(item.getY()) : null);
         entity.setWidth(item.getWidth());
         entity.setHeight(item.getHeight());
         entity.setAngle(item.getAngle());
+        entity.setFontColor(item.getFontColor());
+        entity.setThickness(item.getThickness());
+        entity.setFontSize(item.getFontSize());
         entity.setText(item.getText());
         entity.setCreateTime(now);
         entity.setUpdateTime(now);

service-sas/service-sas-biz/src/main/java/com/usky/sas/service/vo/MapSaveWithDevicesRequest.java

@@ -46,6 +46,8 @@ public class MapSaveWithDevicesRequest {
 
         private String type;
 
+        private String backgroundColor;
+
         private Double x;
 
         private Double y;
@@ -56,6 +58,12 @@ public class MapSaveWithDevicesRequest {
 
         private Double angle;
 
+        private String fontColor;
+
+        private Integer thickness;
+
+        private Integer fontSize;
+
         private String text;
     }
 }