fix：

1、修复合并冲突

app/src/main/java/com/yiring/app/excel/dept/DepartmentExportExcel.java

@@ -37,6 +37,9 @@ public class DepartmentExportExcel implements Serializable {
     @ExcelColumn(title = "手机号码")
     String mobile;
 
+    @ExcelColumn(title = "电子邮箱")
+    String email;
+
     @ExcelColumn(title = "状态")
     String enable;
 
@@ -49,6 +52,7 @@ public class DepartmentExportExcel implements Serializable {
         if (ObjectUtil.isNotEmpty(department.getLeader())) {
             departmentExportExcel.setRealName(department.getLeader().getRealName());
             departmentExportExcel.setMobile(department.getLeader().getMobile());
+            departmentExportExcel.setEmail(department.getLeader().getEmail());
         }
 
         return departmentExportExcel;

app/src/main/java/com/yiring/app/excel/key/KeyAlarmExportExcel.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.excel.key;
 
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
 import com.github.liaochong.myexcel.core.annotation.ExcelModel;
 import com.yiring.app.domain.key.KeyAlarm;
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Data;
@@ -38,10 +38,10 @@ public class KeyAlarmExportExcel implements Serializable {
     String uuid;
 
     @ExcelColumn(title = "报警时间")
-    LocalDateTime createTime;
+    String createTime;
 
     @ExcelColumn(title = "结束时间")
-    LocalDateTime endTime;
+    String endTime;
 
     @ExcelColumn(title = "报警类型")
     String type;
@@ -56,8 +56,8 @@ public class KeyAlarmExportExcel implements Serializable {
         return KeyAlarmExportExcel
             .builder()
             .areaId(keyAlarm.getAreaId())
-            .createTime(keyAlarm.getCreateTime())
-            .endTime(keyAlarm.getUpdateTime())
+            .createTime(LocalDateTimeUtil.format(keyAlarm.getCreateTime(), "yyyy-MM-dd hh:mm:ss"))
+            .endTime(LocalDateTimeUtil.format(keyAlarm.getUpdateTime(), "yyyy-MM-dd hh:mm:ss"))
             .type("按键报警")
             .enable(keyAlarm.getEnable())
             .build();

app/src/main/java/com/yiring/app/job/MockZyMessageJob.java

@@ -133,7 +133,7 @@ public class MockZyMessageJob {
         JSONObject params = new JSONObject();
         params.put("tagId", mockTag());
         params.put("entityId", "4376");
-        params.put("areaId", mockAreaId());
+        params.put("areaId", 1L);
         params.put("raiseTime", System.currentTimeMillis());
         params.put("x", 100);
         params.put("y", 100);

app/src/main/java/com/yiring/app/param/key/KeyAlarmLogFindParam.java

@@ -27,6 +27,9 @@ public class KeyAlarmLogFindParam implements Serializable {
     @Serial
     private static final long serialVersionUID = -7238582681776938388L;
 
+    @ApiModelProperty(value = "主键", example = "1")
+    Long id;
+
     @ApiModelProperty(value = "通知方式", example = "SMS/APP")
     PushMessage.Type type;
 

app/src/main/java/com/yiring/app/service/dept/impl/DepartmentServiceImpl.java

@@ -161,7 +161,10 @@ public class DepartmentServiceImpl implements DepartmentService {
         List<DepartmentExportExcel> departmentExportExcels = ListUtil.toList();
         hashMap.forEach((k, v) -> {
             DepartmentExportExcel departmentExportExcel = DepartmentExportExcel.transform(v);
-            if (v.getEnable() == departmentExportParam.getEnable()) {
+            if (
+                v.getEnable() == departmentExportParam.getEnable() ||
+                ObjectUtil.isEmpty(departmentExportParam.getEnable())
+            ) {
                 departmentExportExcel.setName(k);
                 departmentExportExcels.add(departmentExportExcel);
             }
@@ -314,9 +317,32 @@ public class DepartmentServiceImpl implements DepartmentService {
                     String subName = name.substring(0, lastIndexOf);
                     Department hashDept = hashMap.get(subName);
 
+                    // 通过姓名和电话号码找到用户
+                    Optional<User> userOptional = userRepository.findOne(
+                        Example.of(
+                            User
+                                .builder()
+                                .realName(departmentImportExcel.getRealName())
+                                .mobile(departmentImportExcel.getMobile())
+                                .build()
+                        )
+                    );
+
                     ZyDepartmentAddParam zyDepartmentAddParam = ZyDepartmentAddParam.transform(department, FACTORY_ID);
                     zyDepartmentAddParam.setDeptName(name.substring(lastIndexOf + 1));
                     zyDepartmentAddParam.setParentId(hashDept.getLinkId());
+
+                    // 赋予用户
+                    if (userOptional.isPresent()) {
+                        User user = userOptional.get();
+                        department.setLeader(user);
+
+                        // zy
+                        zyDepartmentAddParam.setLeader(user.getRealName());
+                        zyDepartmentAddParam.setPhone(user.getMobile());
+                        zyDepartmentAddParam.setEmail(user.getEmail());
+                    }
+
                     JSONObject jsonObject = departmentClient.deptAdd(
                         JSONUtil.toJsonStr(zyDepartmentAddParam),
                         ZyUtil.clientLogin()

app/src/main/java/com/yiring/app/service/key/impl/KeyAlarmLogServiceImpl.java

@@ -46,6 +46,12 @@ public class KeyAlarmLogServiceImpl implements KeyAlarmLogService {
         Specification<KeyAlarmLog> specification = (root, cq, cb) -> {
             List<Predicate> predicates = ListUtil.toList();
 
+            if (ObjectUtil.isNotEmpty(param.getId())) {
+                predicates.add(
+                    cb.equal(root.get(KeyAlarmLog.Fields.keyAlarm).get(BasicEntity.Fields.id), param.getId())
+                );
+            }
+
             if (ObjectUtil.isNotEmpty(param.getMobile())) {
                 predicates.add(
                     cb.like(root.get(KeyAlarmLog.Fields.user).get(User.Fields.mobile), "%" + param.getMobile() + "%")
@@ -57,10 +63,10 @@ public class KeyAlarmLogServiceImpl implements KeyAlarmLogService {
             }
 
             if (ObjectUtil.isNotEmpty(param.getType())) {
-                predicates.add(cb.equal(root.get(KeyAlarmLog.Fields.types), param.getType()));
+                predicates.add(cb.equal(root.get(KeyAlarmLog.Fields.types), param.getType().toString()));
             }
 
-            Order order = cb.desc(root.get(BasicEntity.Fields.createTime));
+            Order order = cb.desc(root.get(KeyAlarmLog.Fields.user).get(User.Fields.realName));
 
             return cq.orderBy(order).where(predicates.toArray(new Predicate[0])).getRestriction();
         };

app/src/main/java/com/yiring/app/service/key/impl/KeyAlarmServiceImpl.java

@@ -33,6 +33,7 @@ import javax.persistence.criteria.Predicate;
 import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -78,11 +79,11 @@ public class KeyAlarmServiceImpl implements KeyAlarmService {
             }
 
             if (ObjectUtil.isNotEmpty(param.getCreateTime())) {
-                predicates.add(cb.lessThan(root.get(BasicEntity.Fields.createTime), param.getCreateTime()));
+                predicates.add(cb.greaterThan(root.get(BasicEntity.Fields.createTime), param.getCreateTime()));
             }
 
             if (ObjectUtil.isNotEmpty(param.getEndTime())) {
-                predicates.add(cb.greaterThan(root.get(BasicEntity.Fields.updateTime), param.getEndTime()));
+                predicates.add(cb.lessThan(root.get(BasicEntity.Fields.updateTime), param.getEndTime()));
             }
 
             Order order = cb.desc(root.get(BasicEntity.Fields.createTime));
@@ -109,8 +110,8 @@ public class KeyAlarmServiceImpl implements KeyAlarmService {
                         .build();
                     keyAlarmVo.setUser(userVo);
                 }
-                Optional<KeyAlarmRule> keyAlarmRuleOptional = keyAlarmRuleRepository.findById(
-                    leader.getDepartment().getId()
+                Optional<KeyAlarmRule> keyAlarmRuleOptional = keyAlarmRuleRepository.findOne(
+                    Example.of(KeyAlarmRule.builder().department(leader.getDepartment()).build())
                 );
 
                 if (keyAlarmRuleOptional.isPresent()) {
@@ -118,6 +119,7 @@ public class KeyAlarmServiceImpl implements KeyAlarmService {
                     Set<User> users = keyAlarmRule.getUsers();
                     List<String> names = users.stream().map(User::getRealName).collect(Collectors.toList());
                     keyAlarmVo.setReceiver(StrUtil.join(",", names));
+                    keyAlarmVo.setTypes(keyAlarmRule.getTypes().split(","));
                 }
                 return keyAlarmVo;
             })
@@ -171,8 +173,8 @@ public class KeyAlarmServiceImpl implements KeyAlarmService {
                     keyAlarmExportExcel.setRealName(leader.getRealName());
                     keyAlarmExportExcel.setUuid(leader.getUuid());
                 }
-                Optional<KeyAlarmRule> keyAlarmRuleOptional = keyAlarmRuleRepository.findById(
-                    leader.getDepartment().getId()
+                Optional<KeyAlarmRule> keyAlarmRuleOptional = keyAlarmRuleRepository.findOne(
+                    Example.of(KeyAlarmRule.builder().department(leader.getDepartment()).build())
                 );
 
                 if (keyAlarmRuleOptional.isPresent()) {

app/src/main/java/com/yiring/app/vo/key/KeyAlarmVo.java

@@ -50,6 +50,9 @@ public class KeyAlarmVo implements Serializable {
     @ApiModelProperty(value = "报警类型", example = "按键报警")
     String type;
 
+    @ApiModelProperty(value = "通知方式", example = "APP,SMS")
+    String[] types;
+
     @ApiModelProperty(value = "报警接收人", example = "张三、李四")
     String receiver;
 

basic-auth/src/main/java/com/yiring/auth/vo/role/RoleVo.java

@@ -3,6 +3,7 @@ package com.yiring.auth.vo.role;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yiring.auth.domain.role.Role;
 import com.yiring.auth.vo.permission.PermissionVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -42,4 +43,8 @@ public class RoleVo implements Serializable {
 
     @ApiModelProperty("权限")
     List<PermissionVo> permissions;
+
+    public static RoleVo transform(Role role) {
+        return RoleVo.builder().id(role.getId()).uid(role.getUid()).name(role.getName()).build();
+    }
 }

basic-auth/src/main/java/com/yiring/auth/vo/user/UserVo.java

@@ -12,6 +12,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 
@@ -73,7 +74,9 @@ public class UserVo implements Serializable {
             .deptId(user.getDepartment().getId())
             .build();
 
-        if (ObjectUtil.isNotEmpty(user.getRoles())) {}
+        if (ObjectUtil.isNotEmpty(user.getRoles())) {
+            userVo.setRoles(user.getRoles().stream().map(RoleVo::transform).collect(Collectors.toSet()));
+        }
 
         return userVo;
     }