pms功能优化 功能优化2

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/ErrorCodeConstant.java

@@ -57,4 +57,5 @@ public interface ErrorCodeConstant{
     ErrorCode THINGS_MODEL_NOT_EXISTS = new ErrorCode(146, "物模型不存在");
     ErrorCode IOT_MAINTAIN_BOMS_NOT_EXISTS = new ErrorCode(147, "请选择维修工单对应BOM");
     ErrorCode IOT_SAP_PICKING_LIST_NOT_EXISTS = new ErrorCode(147, "PMS SAP 领料单不存在");
+    ErrorCode IOT_DEVICE_PERSON_NOT_EXISTS = new ErrorCode(148, "设备负责人分配不存在");
 }

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

@@ -1,20 +1,18 @@
 package cn.iocoder.yudao.module.pms.controller.admin;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 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.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.pms.controller.admin.vo.DeviceVO;
-import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
-import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonRelationSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorder.vo.IotMainWorkOrderRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.*;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.iotbom.IotBomDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.yanfan.ThingsModelDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.yanfan.YfDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.TDDeviceMapper;
@@ -22,13 +20,17 @@ import cn.iocoder.yudao.module.pms.service.DeviceServiceImpl;
 import cn.iocoder.yudao.module.pms.service.IotDeviceService;
 import cn.iocoder.yudao.module.pms.service.IotProductClassifyService;
 import cn.iocoder.yudao.module.pms.service.iotbom.IotBomService;
+import cn.iocoder.yudao.module.pms.service.iotdeviceperson.IotDevicePersonService;
 import cn.iocoder.yudao.module.pms.service.iotmodel.IotModelService;
 import cn.iocoder.yudao.module.pms.service.yanfan.YfDeviceService;
 import cn.iocoder.yudao.module.pms.util.IotDeviceConvert;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.supplier.service.product.SupplierService;
+import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSimpleRespVO;
+import cn.iocoder.yudao.module.system.convert.user.UserConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.dict.DictDataService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -78,6 +80,8 @@ public class IotDeviceController {
     private YfDeviceService yfDeviceService;
     @Autowired
     private DeviceServiceImpl deviceServiceImpl;
+    @Autowired
+    private IotDevicePersonService iotDevicePersonService;
 
     @PostMapping("/create")
     @Operation(summary = "创建设备台账")
@@ -86,6 +90,13 @@ public class IotDeviceController {
         return success(iotDeviceService.createIotDevice(createReqVO));
     }
 
+    @PostMapping("/saveDeviceStatuses")
+    @Operation(summary = "批量调整设备状态")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person:create')")
+    public CommonResult<Long> saveDeviceStatuses(@Valid @RequestBody List<IotDevicePersonRelationSaveReqVO> reqVOS) {
+        return success(null/*iotDevicePersonService.saveDeviceStatuses(reqVOS)*/);
+    }
+
     @PutMapping("/update")
     @Operation(summary = "更新设备台账")
     @PreAuthorize("@ss.hasPermission('rq:iot-device:update')")
@@ -159,6 +170,29 @@ public class IotDeviceController {
                 pageResult.getTotal()));
     }
 
+    @GetMapping({"/list-all-simple", "/simple-list"})
+    @Operation(summary = "获取设备精简信息列表", description = "只包含被开启的设备，主要用于前端的下拉选项")
+    public CommonResult<List<IotDeviceSimpleRespVO>> getSimpleDeviceList(@Valid IotDevicePageReqVO reqVO) {
+        List<IotDeviceDO> list = iotDeviceService.getSimpleDeviceList(reqVO);
+        return success(BeanUtils.toBean(list, IotDeviceSimpleRespVO.class));
+    }
+
+    @GetMapping("/responsiblePage")
+    @Operation(summary = "获得设备关联责任人 分页")
+    @PreAuthorize("@ss.hasPermission('rq:iot-device:query')")
+    public CommonResult<PageResult<IotDeviceRespVO>> responsiblePage(@Valid IotDevicePageReqVO pageReqVO) {
+        PageResult<IotDeviceDO> pageResult = iotDeviceService.getIotDevicePage(pageReqVO);
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return success(new PageResult<>(pageResult.getTotal()));
+        }
+        // 查询设备关联的 负责人
+        Map<Long, String> devicePersonNames = iotDevicePersonService.getIotDevicePerson(convertList(pageResult.getList(), IotDeviceDO::getId));
+        Map<Long, DeptDO> deptMap = deptService.getDeptMap(
+                convertList(pageResult.getList(), IotDeviceDO::getDeptId));
+        // return success(new PageResult<>(IotDeviceConvert.INSTANCE.convertList(pageResult.getList(), deptMap), pageResult.getTotal()));
+        return success(new PageResult<>(buildDevicePersonsList(pageResult.getList()), pageResult.getTotal()));
+    }
+
     @Autowired
     private TDDeviceMapper deviceMapper;
 
@@ -255,21 +289,21 @@ public class IotDeviceController {
      * @param devices
      * @return
      */
-    private List<IotDeviceRespVO> buildDeviceAssociateBomList(List<IotDeviceDO> devices) {
+    private List<IotDeviceRespVO> buildDevicePersonsList(List<IotDeviceDO> devices) {
         if (CollUtil.isEmpty(devices)) {
             return Collections.emptyList();
         }
         // 设备部门信息
         Map<Long, DeptDO> deptMap = deptService.getDeptMap(
                 convertList(devices, IotDeviceDO::getDeptId));
-        // 拼接设备分类关联的BOM节点信息
-        Map<Long, IotBomDO> bomMap = iotBomService.getBomMap(convertList(devices, IotDeviceDO::getAssetClass));
+        // 查询设备关联的 负责人
+        Map<Long, String> devicePersonNames = iotDevicePersonService.getIotDevicePerson(convertList(devices, IotDeviceDO::getId));
         // 2. 拼接数据
         return BeanUtils.toBean(devices, IotDeviceRespVO.class, (deviceVO) -> {
             // 2.1 拼接部门信息
             findAndThen(deptMap, deviceVO.getDeptId(), dept -> deviceVO.setDeptName(dept.getName()));
-            // 2.2 设备关联的BOM节点信息
-            findAndThen(bomMap, deviceVO.getAssetClass(), bom -> {deviceVO.setName(bom.getName()); deviceVO.setCode(bom.getCode());});
+            // 2.2 设备关联的负责人姓名
+            findAndThen(devicePersonNames, deviceVO.getId(), person -> deviceVO.setResponsibleNames(person));
         });
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdeviceperson/IotDevicePersonController.java

@@ -0,0 +1,102 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson;
+
+import cn.hutool.core.collection.CollUtil;
+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.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonRelationSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonRespVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceperson.IotDevicePersonDO;
+import cn.iocoder.yudao.module.pms.service.iotdeviceperson.IotDevicePersonService;
+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.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 设备负责人分配")
+@RestController
+@RequestMapping("/pms/iot-device-person")
+@Validated
+public class IotDevicePersonController {
+
+    @Resource
+    private IotDevicePersonService iotDevicePersonService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建设备负责人分配")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person:create')")
+    public CommonResult<Long> createIotDevicePerson(@Valid @RequestBody IotDevicePersonSaveReqVO createReqVO) {
+        return success(iotDevicePersonService.createIotDevicePerson(createReqVO));
+    }
+
+    @PostMapping("/saveDevicePersons")
+    @Operation(summary = "保存 设备与人员 的关联关系")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person:create')")
+    public CommonResult<Long> saveDevicePersonRelation(@Valid @RequestBody List<IotDevicePersonRelationSaveReqVO> reqVOS) {
+        return success(iotDevicePersonService.saveDevicePersons(reqVOS));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新设备负责人分配")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person:update')")
+    public CommonResult<Boolean> updateIotDevicePerson(@Valid @RequestBody IotDevicePersonSaveReqVO updateReqVO) {
+        iotDevicePersonService.updateIotDevicePerson(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除设备负责人分配")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person:delete')")
+    public CommonResult<Boolean> deleteIotDevicePerson(@RequestParam("id") Long id) {
+        iotDevicePersonService.deleteIotDevicePerson(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得设备负责人分配")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person:query')")
+    public CommonResult<IotDevicePersonRespVO> getIotDevicePerson(@RequestParam("id") Long id) {
+        IotDevicePersonDO iotDevicePerson = iotDevicePersonService.getIotDevicePerson(id);
+        return success(BeanUtils.toBean(iotDevicePerson, IotDevicePersonRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得设备负责人分配分页")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person:query')")
+    public CommonResult<PageResult<IotDevicePersonRespVO>> getIotDevicePersonPage(@Valid IotDevicePersonPageReqVO pageReqVO) {
+        PageResult<IotDevicePersonDO> pageResult = iotDevicePersonService.getIotDevicePersonPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotDevicePersonRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出设备负责人分配 Excel")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotDevicePersonExcel(@Valid IotDevicePersonPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotDevicePersonDO> list = iotDevicePersonService.getIotDevicePersonPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "设备负责人分配.xls", "数据", IotDevicePersonRespVO.class,
+                        BeanUtils.toBean(list, IotDevicePersonRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdeviceperson/vo/IotDevicePersonPageReqVO.java

@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo;
+
+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;
+
+@Schema(description = "管理后台 - 设备负责人分配分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotDevicePersonPageReqVO extends PageParam {
+
+    @Schema(description = "设备id", example = "30175")
+    private Long deviceId;
+
+    @Schema(description = "负责人id", example = "4801")
+    private Long personId;
+
+    @Schema(description = "开启状态 0启用  1停用", example = "1")
+    private Integer status;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdeviceperson/vo/IotDevicePersonRelationSaveReqVO.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Schema(description = "管理后台 - 设备负责人关联关系 Request VO")
+@Data
+public class IotDevicePersonRelationSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13572")
+    private Long id;
+
+    @Schema(description = "设备id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30175")
+    @NotNull(message = "设备id不能为空")
+    private Long deviceId;
+
+    @Schema(description = "负责人id 集合", example = "4801")
+    private List<Long> userIds;
+
+    @Schema(description = "开启状态 0启用  1停用", example = "1")
+    private Integer status;
+
+    @Schema(description = "原因", example = "随便")
+    private String reason;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdeviceperson/vo/IotDevicePersonRespVO.java

@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 设备负责人分配 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotDevicePersonRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13572")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "设备id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30175")
+    @ExcelProperty("设备id")
+    private Long deviceId;
+
+    @Schema(description = "负责人id", example = "4801")
+    @ExcelProperty("负责人id")
+    private Long personId;
+
+    @Schema(description = "开启状态 0启用  1停用", example = "1")
+    @ExcelProperty("开启状态 0启用  1停用")
+    private Integer status;
+
+    @Schema(description = "备注", example = "随便")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 扩展字段
+     */
+    private String personName;
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdeviceperson/vo/IotDevicePersonSaveReqVO.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 设备负责人分配新增/修改 Request VO")
+@Data
+public class IotDevicePersonSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13572")
+    private Long id;
+
+    @Schema(description = "设备id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30175")
+    @NotNull(message = "设备id不能为空")
+    private Long deviceId;
+
+    @Schema(description = "负责人id", example = "4801")
+    private Long personId;
+
+    @Schema(description = "开启状态 0启用  1停用", example = "1")
+    private Integer status;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+}

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

@@ -168,4 +168,7 @@ public class IotDeviceRespVO {
     @Schema(description = "最后在线时间")
     private String lastInlineTime;
 
+    @Schema(description = "负责人姓名 逗号分隔")
+    private String responsibleNames;
+
 }

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

@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.pms.controller.admin.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 设备台账 精简列表 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotDeviceSimpleRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6797")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "资产编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("资产编码")
+    private String deviceCode;
+
+    @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @ExcelProperty("设备名称")
+    private String deviceName;
+
+    @Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("品牌")
+    private Long brand;
+
+    @Schema(description = "规格型号")
+    @ExcelProperty("规格型号")
+    private String model;
+
+    @Schema(description = "所在部门", requiredMode = Schema.RequiredMode.REQUIRED, example = "8581")
+    @ExcelProperty("所在部门")
+    private Long deptId;
+
+    @Schema(description = "设备状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("设备状态")
+    private String deviceStatus;
+
+    @Schema(description = "资产性质", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("资产性质")
+    private String assetProperty;
+
+    @Schema(description = "图片", example = "https://www.iocoder.cn")
+    @ExcelProperty("图片")
+    private String picUrl;
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotdeviceperson/IotDevicePersonDO.java

@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceperson;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 设备负责人分配 DO
+ *
+ * @author ruiqi
+ */
+@TableName("rq_iot_device_person")
+@KeySequence("rq_iot_device_person_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotDevicePersonDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+    /**
+     * 负责人id
+     */
+    private Long personId;
+    /**
+     * 开启状态 0启用  1停用
+     */
+    private Integer status;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

@@ -54,6 +54,11 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
                 .orderByDesc(IotDeviceDO::getId));
     }
 
+    default List<IotDeviceDO> selectSimpleList(Collection<Long> deptIds) {
+        return selectList(new LambdaQueryWrapperX<IotDeviceDO>()
+                .inIfPresent(IotDeviceDO::getDeptId, deptIds));
+    }
+
     default PageResult<IotDeviceDO> selectTdPage(IotDevicePageReqVO reqVO, Collection<Long> deptIds, Collection<String> codes) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotDeviceDO>()
                 .inIfPresent(IotDeviceDO::getDeviceCode, codes)

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotdeviceperson/IotDevicePersonMapper.java

@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotdeviceperson;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+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.iotdeviceperson.vo.IotDevicePersonPageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceperson.IotDevicePersonDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 设备负责人分配 Mapper
+ *
+ * @author ruiqi
+ */
+@Mapper
+public interface IotDevicePersonMapper extends BaseMapperX<IotDevicePersonDO> {
+
+    default PageResult<IotDevicePersonDO> selectPage(IotDevicePersonPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotDevicePersonDO>()
+                .eqIfPresent(IotDevicePersonDO::getDeviceId, reqVO.getDeviceId())
+                .eqIfPresent(IotDevicePersonDO::getPersonId, reqVO.getPersonId())
+                .eqIfPresent(IotDevicePersonDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotDevicePersonDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(IotDevicePersonDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotDevicePersonDO::getId));
+    }
+
+    default List<IotDevicePersonDO> selectList(Collection<Long> ids) {
+        return selectList(new LambdaQueryWrapperX<IotDevicePersonDO>()
+                .inIfPresent(IotDevicePersonDO::getDeviceId, ids));
+    }
+
+    void deleteByDeviceIds(@Param("deviceIds") Collection<Long> deviceIds);
+
+}

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

@@ -60,6 +60,15 @@ public interface IotDeviceService {
      * @return 设备台账分页
      */
     PageResult<IotDeviceDO> getIotDevicePage(IotDevicePageReqVO pageReqVO);
+
+    /**
+     * 获得设备精简列表
+     *
+     * @param reqVO 分页查询
+     * @return 设备台账分页
+     */
+    List<IotDeviceDO> getSimpleDeviceList(IotDevicePageReqVO reqVO);
+
     PageResult<IotDeviceDO> getIotDeviceTdPage(IotDevicePageReqVO pageReqVO, List<String> codes);
 
     /**

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

@@ -20,17 +20,12 @@ import cn.iocoder.yudao.module.pms.dal.mysql.IotInfoClassifyMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotTreeMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.TDDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotmodel.IotModelMapper;
-import cn.iocoder.yudao.module.pms.dal.mysql.yanfan.ThingsModelMapper;
-import cn.iocoder.yudao.module.pms.dal.mysql.yanfan.YfDeviceMapper;
 import cn.iocoder.yudao.module.pms.service.yanfan.ThingsModelService;
 import cn.iocoder.yudao.module.pms.service.yanfan.YfDeviceService;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
 import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.dict.DictDataService;
-import com.baomidou.dynamic.datasource.annotation.Slave;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.ImmutableMap;
@@ -194,6 +189,16 @@ public class IotDeviceServiceImpl implements IotDeviceService {
         return iotDeviceMapper.selectPage(pageReqVO,ids);
     }
 
+    @Override
+    public List<IotDeviceDO> getSimpleDeviceList(IotDevicePageReqVO reqVO) {
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(reqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(reqVO.getDeptId());
+            ids.add(reqVO.getDeptId());
+        }
+        return iotDeviceMapper.selectSimpleList(ids);
+    }
+
     @Override
     public PageResult<IotDeviceDO> getIotDeviceTdPage(IotDevicePageReqVO pageReqVO, List<String> codes) {
         Set<Long> ids = new HashSet<>();

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

@@ -0,0 +1,74 @@
+package cn.iocoder.yudao.module.pms.service.iotdeviceperson;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonRelationSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceperson.IotDevicePersonDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备负责人分配 Service 接口
+ *
+ * @author ruiqi
+ */
+public interface IotDevicePersonService {
+
+    /**
+     * 创建设备负责人分配
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotDevicePerson(@Valid IotDevicePersonSaveReqVO createReqVO);
+
+    /**
+     * 更新设备负责人分配
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotDevicePerson(@Valid IotDevicePersonSaveReqVO updateReqVO);
+
+    /**
+     * 删除设备负责人分配
+     *
+     * @param id 编号
+     */
+    void deleteIotDevicePerson(Long id);
+
+    /**
+     * 获得设备负责人分配
+     *
+     * @param id 编号
+     * @return 设备负责人分配
+     */
+    IotDevicePersonDO getIotDevicePerson(Long id);
+
+    /**
+     * 获得设备负责人分配分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 设备负责人分配分页
+     */
+    PageResult<IotDevicePersonDO> getIotDevicePersonPage(IotDevicePersonPageReqVO pageReqVO);
+
+    /**
+     * 查询设备对应责任人 列表
+     *
+     * @param ids 设备编号 集合
+     * @return 设备负责人 姓名拼接
+     */
+    Map<Long, String> getIotDevicePerson(Collection<Long> ids);
+
+    /**
+     * 批量保存设备与人员的关联关系
+     *
+     * @param reqVOS 设备人员关联 集合
+     * @return 设备负责人 姓名拼接
+     */
+    Long saveDevicePersons(List<IotDevicePersonRelationSaveReqVO> reqVOS);
+}

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

@@ -0,0 +1,137 @@
+package cn.iocoder.yudao.module.pms.service.iotdeviceperson;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonRelationSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceperson.IotDevicePersonDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotdeviceperson.IotDevicePersonMapper;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_DEVICE_PERSON_NOT_EXISTS;
+
+/**
+ * 设备负责人分配 Service 实现类
+ *
+ * @author ruiqi
+ */
+@Service
+@Validated
+public class IotDevicePersonServiceImpl implements IotDevicePersonService {
+
+    @Resource
+    private IotDevicePersonMapper iotDevicePersonMapper;
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @Override
+    public Long createIotDevicePerson(IotDevicePersonSaveReqVO createReqVO) {
+        // 插入
+        IotDevicePersonDO iotDevicePerson = BeanUtils.toBean(createReqVO, IotDevicePersonDO.class);
+        iotDevicePersonMapper.insert(iotDevicePerson);
+        // 返回
+        return iotDevicePerson.getId();
+    }
+
+    @Override
+    public void updateIotDevicePerson(IotDevicePersonSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotDevicePersonExists(updateReqVO.getId());
+        // 更新
+        IotDevicePersonDO updateObj = BeanUtils.toBean(updateReqVO, IotDevicePersonDO.class);
+        iotDevicePersonMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotDevicePerson(Long id) {
+        // 校验存在
+        validateIotDevicePersonExists(id);
+        // 删除
+        iotDevicePersonMapper.deleteById(id);
+    }
+
+    private void validateIotDevicePersonExists(Long id) {
+        if (iotDevicePersonMapper.selectById(id) == null) {
+            throw exception(IOT_DEVICE_PERSON_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public IotDevicePersonDO getIotDevicePerson(Long id) {
+        return iotDevicePersonMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotDevicePersonDO> getIotDevicePersonPage(IotDevicePersonPageReqVO pageReqVO) {
+        return iotDevicePersonMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public Map<Long, String> getIotDevicePerson(Collection<Long> ids) {
+        List<IotDevicePersonDO> devicePersons = iotDevicePersonMapper.selectList(ids);
+        if (CollUtil.isEmpty(devicePersons)) {
+            return new HashMap<>();
+        }
+        List<Long> personIds = new ArrayList<>();
+        devicePersons.forEach(dp -> {
+            personIds.add(dp.getPersonId());
+        });
+        // 查询人员ids 对应的人员姓名集合
+        Map<Long, AdminUserRespDTO> users = adminUserApi.getUserMap(personIds);
+        // 设备和人员姓名匹配集合
+        Map<Long, String> devicePersonNames = new HashMap<>();
+        for (IotDevicePersonDO devicePerson : devicePersons) {
+            if (devicePersonNames.containsKey(devicePerson.getDeviceId())) {
+                String tempNames = devicePersonNames.get(devicePerson.getDeviceId());
+                Set<String> tempNameList = new HashSet<>(Arrays.asList(tempNames.split(",")));
+                String currentUserName = users.get(devicePerson.getPersonId()).getNickname();
+                tempNameList.add(currentUserName);
+                devicePersonNames.put(devicePerson.getDeviceId(), StringUtils.join(tempNameList, ","));
+            } else {
+                devicePersonNames.put(devicePerson.getDeviceId(), users.get(devicePerson.getPersonId()).getNickname());
+            }
+        }
+        return devicePersonNames;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long saveDevicePersons(List<IotDevicePersonRelationSaveReqVO> reqVOS) {
+        if (CollUtil.isEmpty(reqVOS)) {
+            throw exception(IOT_DEVICE_PERSON_NOT_EXISTS);
+        }
+        // 保存设备与人员的关联关系时，先删除再新增
+        List<Long> deviceIds = new ArrayList<>();
+        reqVOS.forEach(relation -> {
+            deviceIds.add(relation.getDeviceId());
+        });
+        if (CollUtil.isNotEmpty(deviceIds)) {
+            iotDevicePersonMapper.deleteByDeviceIds(deviceIds);;
+        }
+        List<IotDevicePersonDO> devicePersons = new ArrayList<>();
+        reqVOS.forEach(relation -> {
+            List<Long> userIds = relation.getUserIds();
+            userIds.forEach(userId -> {
+                IotDevicePersonDO devicePerson = new IotDevicePersonDO();
+                devicePerson.setDeviceId(relation.getDeviceId());
+                devicePerson.setPersonId(userId);
+                devicePersons.add(devicePerson);
+            });
+        });
+        // 批量保存 设备与 责任人的关联
+        iotDevicePersonMapper.insertBatch(devicePersons);
+        return 0l;
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotDevicePersonMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.pms.dal.mysql.iotdeviceperson.IotDevicePersonMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+    <select id="deleteByDeviceIds">
+        DELETE FROM rq_iot_device_person WHERE 1=1
+        <if test="deviceIds != null and deviceIds.size &gt; 0">
+            AND device_id IN
+            <foreach collection="deviceIds" index="index" item="key" open="(" separator="," close=")">
+                #{key}
+            </foreach>
+        </if>
+    </select>
+
+</mapper>

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java

@@ -8,7 +8,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApiImpl;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*;
 import cn.iocoder.yudao.module.system.convert.user.UserConvert;
@@ -30,6 +29,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -108,6 +108,21 @@ public class UserController {
                 pageResult.getTotal()));
     }
 
+    @GetMapping("/simpleUserList")
+    @Operation(summary = "获得部门下的用户列表")
+    @PreAuthorize("@ss.hasPermission('system:user:query')")
+    public CommonResult<List<UserRespVO>> simpleUserList(@Valid UserPageReqVO reqVO) {
+        // 获得用户分页列表
+        List<AdminUserDO> users = userService.getSimpleUserList(reqVO);
+        if (CollUtil.isEmpty(users)) {
+            return success(CollUtil.newArrayList());
+        }
+        // 拼接数据
+        Map<Long, DeptDO> deptMap = deptService.getDeptMap(
+                convertList(users, AdminUserDO::getDeptId));
+        return success(new ArrayList<UserRespVO>(UserConvert.INSTANCE.convertList(users, deptMap)));
+    }
+
     @GetMapping({"/list-all-simple", "/simple-list"})
     @Operation(summary = "获取用户精简信息列表", description = "只包含被开启的用户，主要用于前端的下拉选项")
     public CommonResult<List<UserSimpleRespVO>> getSimpleUserList() {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -37,6 +37,11 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .orderByDesc(AdminUserDO::getId));
     }
 
+    default List<AdminUserDO> selectSimpleList(Collection<Long> deptIds) {
+        return selectList(new LambdaQueryWrapperX<AdminUserDO>()
+                .inIfPresent(AdminUserDO::getDeptId, deptIds));
+    }
+
     default List<AdminUserDO> selectListByNickname(String nickname) {
         return selectList(new LambdaQueryWrapperX<AdminUserDO>().like(AdminUserDO::getNickname, nickname));
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java

@@ -217,4 +217,12 @@ public interface AdminUserService {
     boolean isPasswordMatch(String rawPassword, String encodedPassword);
 
     List<AdminUserDO> selectListByDept(Long deptId);
+
+    /**
+     * 获得用户简单信息列表
+     *
+     * @param reqVO 列表条件
+     * @return 用户列表
+     */
+    List<AdminUserDO> getSimpleUserList(UserPageReqVO reqVO);
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -523,6 +523,11 @@ public class AdminUserServiceImpl implements AdminUserService {
         return userMapper.selectListByDept(deptId);
     }
 
+    @Override
+    public List<AdminUserDO> getSimpleUserList(UserPageReqVO reqVO) {
+        return userMapper.selectSimpleList(getDeptCondition(reqVO.getDeptId()));
+    }
+
     /**
      * 对密码进行加密
      *