巡检统计

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/order/IotInspectOrderController.java

@@ -14,13 +14,12 @@ import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.vo.*;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceSimple;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDetailDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectPlanDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectRouteDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.*;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderDetailMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderDeviceMapper;
 import cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant;
 import cn.iocoder.yudao.module.pms.service.IotDeviceService;
 import cn.iocoder.yudao.module.pms.service.inspect.IotInspectOrderDetailService;
@@ -47,6 +46,7 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.time.ZoneId;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -76,6 +76,8 @@ public class IotInspectOrderController {
     private DeptApi deptApi;
     @Autowired
     private IotDeviceMapper iotDeviceMapper;
+    @Autowired
+    private IotInspectOrderDeviceMapper iotInspectOrderDeviceMapper;
 
     @PostMapping("/create")
     @Operation(summary = "创建巡检工单")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/order/device/IotInspectOrderDevicePageReqVO.java

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.pms.controller.admin.inspect.order.device;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+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 IotInspectOrderDevicePageReqVO extends PageParam {
+
+    @Schema(description = "工单id", example = "23412")
+    private Long orderId;
+
+    @Schema(description = "设备id", example = "11270")
+    private Long deviceId;
+
+    @Schema(description = "设备编码")
+    private String deviceCode;
+
+    @Schema(description = "设备名称", example = "张三")
+    private String deviceName;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "部门id", example = "26620")
+    private Long deptId;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/order/device/IotInspectOrderDeviceRespVO.java

@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.pms.controller.admin.inspect.order.device;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 巡检工单设备 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotInspectOrderDeviceRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20616")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "工单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "23412")
+    @ExcelProperty("工单id")
+    private Long orderId;
+
+    @Schema(description = "设备id", requiredMode = Schema.RequiredMode.REQUIRED, example = "11270")
+    @ExcelProperty("设备id")
+    private Long deviceId;
+
+    @Schema(description = "设备编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("设备编码")
+    private String deviceCode;
+
+    @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("设备名称")
+    private String deviceName;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "部门id", example = "26620")
+    @ExcelProperty("部门id")
+    private Long deptId;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/order/device/IotInspectOrderDeviceSaveReqVO.java

@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.pms.controller.admin.inspect.order.device;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.*;
+
+@Schema(description = "管理后台 - 巡检工单设备新增/修改 Request VO")
+@Data
+public class IotInspectOrderDeviceSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20616")
+    private Long id;
+
+    @Schema(description = "工单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "23412")
+    @NotNull(message = "工单id不能为空")
+    private Long orderId;
+
+    @Schema(description = "设备id", requiredMode = Schema.RequiredMode.REQUIRED, example = "11270")
+    @NotNull(message = "设备id不能为空")
+    private Long deviceId;
+
+    @Schema(description = "设备编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "设备编码不能为空")
+    private String deviceCode;
+
+    @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @NotEmpty(message = "设备名称不能为空")
+    private String deviceName;
+
+    @Schema(description = "部门id", example = "26620")
+    private Long deptId;
+
+}

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

@@ -318,9 +318,11 @@ public class IotStaticController {
             ids = deptService.getChildDeptIdListFromCache(vo.getDeptId());
             ids.add(vo.getDeptId());
         }
-        List<IotInspectOrderDO> iotInspectOrderDOS = iotInspectOrderMapper.selectListStat(vo, ids);
-        Map<String, Long> order = iotInspectOrderDOS.stream().collect(Collectors.groupingBy(IotInspectOrderDO::getStatus, Collectors.counting()));
-        return CommonResult.success(order);
+        Long todo = iotInspectOrderMapper.selectCount(vo, ids,"todo");
+        Long finished = iotInspectOrderMapper.selectCount(vo, ids,"finished");
+        Long ignore = iotInspectOrderMapper.selectCount(vo, ids,"ignore");
+//        Map<String, Long> order = iotInspectOrderDOS.stream().collect(Collectors.groupingBy(IotInspectOrderDO::getStatus, Collectors.counting()));
+        return CommonResult.success(ImmutableMap.of("todo",todo,"finished",finished,"ignore",ignore));
     }
 
     @GetMapping("/inspect/statuss/{dept}")

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

@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.module.pms.controller.admin.vo;
+
+import lombok.Data;
+
+@Data
+public class IotDeviceSimple {
+    private Long id;
+    private String deviceCode;
+    private String deviceName;
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/inspect/IotInspectOrderDeviceDO.java

@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.inspect;
+
+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;
+
+/**
+ * 巡检工单设备 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("rq_iot_inspect_order_device")
+@KeySequence("rq_iot_inspect_order_device_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotInspectOrderDeviceDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 工单id
+     */
+    private Long orderId;
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+}

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

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorder.vo.IotMainW
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotCarDevicePlateVO;
 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.IotDeviceSimple;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -343,4 +344,5 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
     List<IotDeviceRespVO> deviceAlarmDistances(@Param("sortedDeviceIds") Collection<Long> sortedDeviceIds,
                                            @Param("deviceIds") Collection<Long> deviceIds,
                                            @Param("mainBomDeviceIds") Collection<Long> mainBomDeviceIds);
+    List<IotDeviceSimple> selectCodeAndNameList();
 }

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

@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.inspect;
+
+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.module.pms.controller.admin.inspect.order.device.IotInspectOrderDevicePageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDeviceDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 巡检工单设备 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface IotInspectOrderDeviceMapper extends BaseMapperX<IotInspectOrderDeviceDO> {
+
+    default PageResult<IotInspectOrderDeviceDO> selectPage(IotInspectOrderDevicePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotInspectOrderDeviceDO>()
+                .eqIfPresent(IotInspectOrderDeviceDO::getOrderId, reqVO.getOrderId())
+                .eqIfPresent(IotInspectOrderDeviceDO::getDeviceId, reqVO.getDeviceId())
+                .eqIfPresent(IotInspectOrderDeviceDO::getDeviceCode, reqVO.getDeviceCode())
+                .likeIfPresent(IotInspectOrderDeviceDO::getDeviceName, reqVO.getDeviceName())
+                .betweenIfPresent(IotInspectOrderDeviceDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(IotInspectOrderDeviceDO::getDeptId, reqVO.getDeptId())
+                .orderByDesc(IotInspectOrderDeviceDO::getId));
+    }
+
+}

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

@@ -70,4 +70,12 @@ public interface IotInspectOrderMapper extends BaseMapperX<IotInspectOrderDO> {
                         .inIfPresent(IotInspectOrderDO::getDeptId, ids)
                 );
     }
+
+    default Long selectCount(IotCountDataDO vo, Set<Long> ids, String status) {
+        return selectCount(new LambdaQueryWrapperX<IotInspectOrderDO>()
+                .betweenIfPresent(IotInspectOrderDO::getCreateTime, vo.getCreateTime())
+                .eq(IotInspectOrderDO::getStatus, status)
+                .inIfPresent(IotInspectOrderDO::getDeptId, ids)
+        );
+    }
 }

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

@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.pms.service.inspect;
+
+import java.util.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.device.IotInspectOrderDevicePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.device.IotInspectOrderDeviceSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDeviceDO;
+
+import javax.validation.Valid;
+
+/**
+ * 巡检工单设备 Service 接口
+ *
+ * @author 超级管理员
+ */
+public interface IotInspectOrderDeviceService {
+
+    /**
+     * 创建巡检工单设备
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotInspectOrderDevice(@Valid IotInspectOrderDeviceSaveReqVO createReqVO);
+
+    /**
+     * 更新巡检工单设备
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotInspectOrderDevice(@Valid IotInspectOrderDeviceSaveReqVO updateReqVO);
+
+    /**
+     * 删除巡检工单设备
+     *
+     * @param id 编号
+     */
+    void deleteIotInspectOrderDevice(Long id);
+
+    /**
+     * 获得巡检工单设备
+     *
+     * @param id 编号
+     * @return 巡检工单设备
+     */
+    IotInspectOrderDeviceDO getIotInspectOrderDevice(Long id);
+
+    /**
+     * 获得巡检工单设备分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 巡检工单设备分页
+     */
+    PageResult<IotInspectOrderDeviceDO> getIotInspectOrderDevicePage(IotInspectOrderDevicePageReqVO pageReqVO);
+
+}

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

@@ -0,0 +1,76 @@
+package cn.iocoder.yudao.module.pms.service.inspect;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.device.IotInspectOrderDevicePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.device.IotInspectOrderDeviceSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDeviceDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderDeviceMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+
+/**
+ * 巡检工单设备 Service 实现类
+ *
+ * @author 超级管理员
+ */
+@Service
+@Validated
+public class IotInspectOrderDeviceServiceImpl implements IotInspectOrderDeviceService {
+
+    @Resource
+    private IotInspectOrderDeviceMapper iotInspectOrderDeviceMapper;
+
+    @Override
+    public Long createIotInspectOrderDevice(IotInspectOrderDeviceSaveReqVO createReqVO) {
+        // 插入
+        IotInspectOrderDeviceDO iotInspectOrderDevice = BeanUtils.toBean(createReqVO, IotInspectOrderDeviceDO.class);
+        iotInspectOrderDeviceMapper.insert(iotInspectOrderDevice);
+        // 返回
+        return iotInspectOrderDevice.getId();
+    }
+
+    @Override
+    public void updateIotInspectOrderDevice(IotInspectOrderDeviceSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotInspectOrderDeviceExists(updateReqVO.getId());
+        // 更新
+        IotInspectOrderDeviceDO updateObj = BeanUtils.toBean(updateReqVO, IotInspectOrderDeviceDO.class);
+        iotInspectOrderDeviceMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotInspectOrderDevice(Long id) {
+        // 校验存在
+        validateIotInspectOrderDeviceExists(id);
+        // 删除
+        iotInspectOrderDeviceMapper.deleteById(id);
+    }
+
+    private void validateIotInspectOrderDeviceExists(Long id) {
+        if (iotInspectOrderDeviceMapper.selectById(id) == null) {
+            throw exception(new ErrorCode(222,"不存在"));
+        }
+    }
+
+    @Override
+    public IotInspectOrderDeviceDO getIotInspectOrderDevice(Long id) {
+        return iotInspectOrderDeviceMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotInspectOrderDeviceDO> getIotInspectOrderDevicePage(IotInspectOrderDevicePageReqVO pageReqVO) {
+        return iotInspectOrderDeviceMapper.selectPage(pageReqVO);
+    }
+
+}

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

@@ -15,14 +15,12 @@ import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.vo.IotInspectO
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.route.vo.IotInspectRouteRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdeviceperson.vo.IotDevicePersonPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceSimple;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.*;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdeviceperson.IotDevicePersonDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
-import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectItemMapper;
-import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderDetailMapper;
-import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderMapper;
-import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectPlanMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.inspect.*;
 import cn.iocoder.yudao.module.pms.message.PmsMessage;
 import cn.iocoder.yudao.module.pms.service.IotDeviceService;
 import cn.iocoder.yudao.module.pms.service.iotdeviceperson.IotDevicePersonService;
@@ -81,6 +79,8 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
     private IotDeviceService iotDeviceService;
     @Autowired
     private DeptApi deptApi;
+    @Autowired
+    private IotInspectOrderDeviceMapper iotInspectOrderDeviceMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -343,6 +343,20 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
             CompletableFuture.runAsync(()->{
                 //发送消息
                 pmsMessage.sendMessage(iotInspectOrderDO.getId(), iotInspectOrderDO.getInspectOrderTitle(), PmsConstants.GENERATE_INSPECT, k, user.getMobile());
+                List<IotDeviceSimple> iotDeviceDOS = iotDeviceMapper.selectCodeAndNameList();
+                //写入子表
+                Set<Long> collect = results.stream().map(IotInspectOrderDetailDO::getDeviceId).collect(Collectors.toSet());
+                List<IotInspectOrderDeviceDO> inspectDevices = new ArrayList<>();
+                collect.forEach(deviceId -> iotDeviceDOS.stream().filter(g -> deviceId.equals(g.getId())).findFirst().ifPresent(iotDeviceDO -> {
+                    IotInspectOrderDeviceDO iotInspectOrderDeviceDO = new IotInspectOrderDeviceDO();
+                    iotInspectOrderDeviceDO.setDeviceId(deviceId);
+                    iotInspectOrderDeviceDO.setOrderId(iotInspectOrderDO.getId());
+                    iotInspectOrderDeviceDO.setDeviceName(iotDeviceDO.getDeviceName());
+                    iotInspectOrderDeviceDO.setDeviceCode(iotDeviceDO.getDeviceCode());
+                    iotInspectOrderDeviceDO.setDeleted(false);
+                    inspectDevices.add(iotInspectOrderDeviceDO);
+                }));
+                iotInspectOrderDeviceMapper.insertBatch(inspectDevices);
             });
         });
     }

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

@@ -523,4 +523,15 @@
             deleted = 0
           AND device_name REGEXP '([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z][A-Z0-9]{4,7}[A-Z0-9挂学警港澳使领])';
     </select>
+
+    <select id="selectCodeAndNameList"
+            resultType="cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceSimple">
+        SELECT
+            id,
+            device_code as deviceCode,
+            device_name as deviceName
+        FROM rq_iot_device
+        WHERE
+            deleted = 0
+    </select>
 </mapper>