pms 设备责任人调整日志

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicepersonlog/IotDevicePersonLogController.java

@@ -1,33 +1,42 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog;
 
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.*;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.IotDevicePersonLogPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.IotDevicePersonLogRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.IotDevicePersonLogSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicepersonlog.IotDevicePersonLogDO;
+import cn.iocoder.yudao.module.pms.service.IotDeviceService;
 import cn.iocoder.yudao.module.pms.service.iotdevicepersonlog.IotDevicePersonLogService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertListByFlatMap;
 
 @Tag(name = "管理后台 - 设备责任人日志")
 @RestController
@@ -37,6 +46,10 @@ public class IotDevicePersonLogController {
 
     @Resource
     private IotDevicePersonLogService iotDevicePersonLogService;
+    @Resource
+    private AdminUserApi adminUserApi;
+    @Resource
+    private IotDeviceService iotDeviceService;
 
     @PostMapping("/create")
     @Operation(summary = "创建设备责任人日志")
@@ -72,11 +85,80 @@ public class IotDevicePersonLogController {
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得设备责任人日志分页")
+    @Operation(summary = "获得设备责任人操作日志分页")
     @PreAuthorize("@ss.hasPermission('pms:iot-device-person-log:query')")
     public CommonResult<PageResult<IotDevicePersonLogRespVO>> getIotDevicePersonLogPage(@Valid IotDevicePersonLogPageReqVO pageReqVO) {
         PageResult<IotDevicePersonLogDO> pageResult = iotDevicePersonLogService.getIotDevicePersonLogPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, IotDevicePersonLogRespVO.class));
+        return success(new PageResult<>(buildDevicePersonList(pageResult.getList()), pageResult.getTotal()));
+    }
+
+    private List<IotDevicePersonLogRespVO> buildDevicePersonList(List<IotDevicePersonLogDO> devicePersons) {
+        if (CollUtil.isEmpty(devicePersons)) {
+            return Collections.emptyList();
+        }
+        // 修改前责任人 修改后责任人
+        List<Long> allPersonIds = devicePersons.stream()
+                .flatMap(log -> Stream.of(
+                        StrUtil.isNotBlank(log.getOldPersonIds()) ? log.getOldPersonIds().split(",") : new String[0],
+                        StrUtil.isNotBlank(log.getNewPersonIds()) ? log.getNewPersonIds().split(",") : new String[0]
+                ))
+                .flatMap(Arrays::stream)
+                .filter(id -> !id.isEmpty())
+                .map(String::trim)
+                .map(Long::parseLong)
+                .collect(Collectors.toList());
+        // 查询所有设备责任人姓名(修改前+修改后)
+        Map<Long, AdminUserRespDTO> personMap = adminUserApi.getUserMap(allPersonIds);
+        // 操作人
+        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertListByFlatMap(devicePersons,
+                status -> Stream.of(NumberUtils.parseLong(status.getCreator()))));
+        // 组装bom关联的设备信息
+        Map<Long, IotDeviceRespVO> deviceMap = iotDeviceService.getDeviceMap(convertListByFlatMap(devicePersons,
+                status -> Stream.of(status.getDeviceId())));
+        // 2. 转换成 VO
+        return BeanUtils.toBean(devicePersons, IotDevicePersonLogRespVO.class, personVO -> {
+            // 设置设备相关信息
+            MapUtils.findAndThen(deviceMap, personVO.getDeviceId(),
+                    device -> personVO.setDeviceName(device.getDeviceName()));
+            MapUtils.findAndThen(deviceMap, personVO.getDeviceId(),
+                    device -> personVO.setDeviceCode(device.getDeviceCode()));
+            MapUtils.findAndThen(userMap, NumberUtils.parseLong(personVO.getCreator()),
+                    user -> personVO.setCreatorName(user.getNickname()));
+            // 处理oldPersonNames
+            if (StrUtil.isNotBlank(personVO.getOldPersonIds())) {
+                String oldNames = Arrays.stream(personVO.getOldPersonIds().split(","))
+                        .map(String::trim)
+                        .map(id -> {
+                            try {
+                                long personId = Long.parseLong(id);
+                                AdminUserRespDTO user = personMap.get(personId);
+                                return user != null ? user.getNickname() : null;
+                            } catch (NumberFormatException e) {
+                                return null;
+                            }
+                        })
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.joining(","));
+                personVO.setOldPersonNames(oldNames);
+            }
+            // 处理newPersonNames
+            if (StrUtil.isNotBlank(personVO.getNewPersonIds())) {
+                String newNames = Arrays.stream(personVO.getNewPersonIds().split(","))
+                        .map(String::trim)
+                        .map(id -> {
+                            try {
+                                long personId = Long.parseLong(id);
+                                AdminUserRespDTO user = personMap.get(personId);
+                                return user != null ? user.getNickname() : null;
+                            } catch (NumberFormatException e) {
+                                return null;
+                            }
+                        })
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.joining(","));
+                personVO.setNewPersonNames(newNames);
+            }
+        });
     }
 
     @GetMapping("/export-excel")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicepersonlog/vo/IotDevicePersonLogPageReqVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicepersonlog/vo/IotDevicePersonLogRespVO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 设备责任人日志 Response VO")
 @Data
@@ -48,4 +48,24 @@ public class IotDevicePersonLogRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "设备编码", example = "YF001")
+    private String deviceCode;
+
+    @Schema(description = "设备名称", example = "钻机")
+    private String deviceName;
+
+    @Schema(description = "修改前责任人姓名 逗号分隔", example = "张三,李四")
+    private String oldPersonNames;
+
+    @Schema(description = "修改后责任人姓名 逗号分隔", example = "张三,李四")
+    private String newPersonNames;
+
+    @Schema(description = "创建人姓名", example = "张三")
+    private String creatorName;
+
+    @Schema(description = "创建人id", example = "101")
+    private String creator;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotdevicepersonlog/IotDevicePersonLogDO.java

@@ -1,18 +1,19 @@
 package cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicepersonlog;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.*;
 
 /**
  * 设备责任人日志 DO
  *
  * @author ruiqi
  */
-@TableName("rq_iot_device_person_log")
+@TableName(value = "rq_iot_device_person_log", autoResultMap = true)
 @KeySequence("rq_iot_device_person_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotdevicepersonlog/IotDevicePersonLogMapper.java

@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.pms.dal.mysql.iotdevicepersonlog;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.IotDevicePersonLogPageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicepersonlog.IotDevicePersonLogDO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.*;
 
 /**
  * 设备责任人日志 Mapper

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotdeviceperson/IotDevicePersonServiceImpl.java

@@ -8,9 +8,11 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevice
 import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceperson.IotDevicePersonDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicepersonlog.IotDevicePersonLogDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicestatuslog.IotDeviceStatusLogDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotdeviceperson.IotDevicePersonMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotdevicepersonlog.IotDevicePersonLogMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotdevicestatuslog.IotDeviceStatusLogMapper;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -44,6 +46,8 @@ public class IotDevicePersonServiceImpl implements IotDevicePersonService {
     private IotDeviceStatusLogMapper iotDeviceStatusLogMapper;
     @Resource
     private IotDeviceMapper iotDeviceMapper;
+    @Resource
+    private IotDevicePersonLogMapper iotDevicePersonLogMapper;
 
     @Override
     public Long createIotDevicePerson(IotDevicePersonSaveReqVO createReqVO) {
@@ -121,11 +125,30 @@ public class IotDevicePersonServiceImpl implements IotDevicePersonService {
         if (CollUtil.isEmpty(reqVOS)) {
             throw exception(IOT_DEVICE_PERSON_NOT_EXISTS);
         }
+
         // 保存设备与人员的关联关系时，先删除再新增
         List<Long> deviceIds = new ArrayList<>();
         reqVOS.forEach(relation -> {
             deviceIds.add(relation.getDeviceId());
         });
+        // 先查询出修改前的设备责任人
+        List<IotDevicePersonDO> oldDevicePersons = iotDevicePersonMapper.selectList("device_id", deviceIds);
+        // 把修改前的设备责任人 设置成 map<deviceId, personIds> 的格式
+        Map<Long, List<Long>> oldDevicePersonPair = new HashMap<>();
+        if (CollUtil.isNotEmpty(oldDevicePersons)) {
+            oldDevicePersons.forEach(devicePerson -> {
+                if (oldDevicePersonPair.containsKey(devicePerson.getDeviceId())) {
+                    List<Long> tempPersons = oldDevicePersonPair.get(devicePerson.getDeviceId());
+                    tempPersons.add(devicePerson.getPersonId());
+                    oldDevicePersonPair.put(devicePerson.getDeviceId(), tempPersons);
+                } else {
+                    List<Long> tempPersons = new ArrayList<>();
+                    tempPersons.add(devicePerson.getPersonId());
+                    oldDevicePersonPair.put(devicePerson.getDeviceId(), tempPersons);
+                }
+            });
+        }
+
         if (CollUtil.isNotEmpty(deviceIds)) {
             iotDevicePersonMapper.deleteByDeviceIds(deviceIds);;
         }
@@ -141,6 +164,45 @@ public class IotDevicePersonServiceImpl implements IotDevicePersonService {
         });
         // 批量保存 设备与 责任人的关联
         iotDevicePersonMapper.insertBatch(devicePersons);
+        // 记录设备责任人调整日志
+        // 先查询保存之前的设备责任人
+        // 将新的设备及责任人 设置成 map<deviceId, personIds> 格式
+        Map<Long, List<Long>> newDevicePersonPair = new HashMap<>();
+        Map<Long, String> deviceReasonPair = new HashMap<>();
+        reqVOS.forEach(devicePerson -> {
+            newDevicePersonPair.put(devicePerson.getDeviceId(), devicePerson.getUserIds());
+            deviceReasonPair.put(devicePerson.getDeviceId(), devicePerson.getReason());
+        });
+        // 将修改前的设备责任人 修改后的设备责任人对应关系 存储到 责任人调整日志表
+        List<IotDevicePersonLogDO> devicePersonLogDOS = new ArrayList<>();
+        if (CollUtil.isNotEmpty(newDevicePersonPair)) {
+            newDevicePersonPair.forEach((k,v) -> {
+                // k设备id v设备关联的责任人集合
+                IotDevicePersonLogDO devicePersonLog = new IotDevicePersonLogDO();
+                devicePersonLog.setDeviceId(k);
+                if (oldDevicePersonPair.containsKey(k)) {
+                    List<Long> oldPersonIds = oldDevicePersonPair.get(k);
+                    String oldPersonIdStrs = oldPersonIds.stream()
+                            .map(String::valueOf)
+                            .collect(Collectors.joining(","));
+                    devicePersonLog.setOldPersonIds(oldPersonIdStrs);
+                }
+                if (newDevicePersonPair.containsKey(k)) {
+                    List<Long> newPersonIds = newDevicePersonPair.get(k);
+                    String newPersonIdStrs = newPersonIds.stream()
+                            .map(String::valueOf)
+                            .collect(Collectors.joining(","));
+                    devicePersonLog.setNewPersonIds(newPersonIdStrs);
+                }
+                if (deviceReasonPair.containsKey(k)) {
+                    devicePersonLog.setReason(deviceReasonPair.get(k));
+                }
+                devicePersonLogDOS.add(devicePersonLog);
+            });
+            if (CollUtil.isNotEmpty(devicePersonLogDOS)) {
+                iotDevicePersonLogMapper.insertBatch(devicePersonLogDOS);
+            }
+        }
         return 1l;
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotdevicepersonlog/IotDevicePersonLogService.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.pms.service.iotdevicepersonlog;
 
-import java.util.*;
-import javax.validation.*;
-import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.*;
-import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicepersonlog.IotDevicePersonLogDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.IotDevicePersonLogPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.IotDevicePersonLogSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicepersonlog.IotDevicePersonLogDO;
+
+import javax.validation.Valid;
 
 /**
  * 设备责任人日志 Service 接口