运行记录填报

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

@@ -34,11 +34,13 @@ import javax.annotation.security.PermitAll;
 import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
+import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.io.IOException;
+import java.util.stream.Collectors;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -79,7 +81,12 @@ public class IotOpeationFillController {
         List< IotDeviceRunLogDO > logDO = new ArrayList<>();
 
         for (IotOpeationFillSaveReqVO fill:fillList) {
+            IotDeviceRunLogDO logDO1 = new IotDeviceRunLogDO();
+            logDO1.setDeviceId(fill.getDeviceId());
+            List<IotDeviceRunLogDO> logList = iotOpeationFillService.getDeivceFillInfo(logDO1);
+
             IotDeviceRunLogDO deviceRunLogDO = new IotDeviceRunLogDO();
+
             deviceRunLogDO.setDeviceId(fill.getDeviceId());
             deviceRunLogDO.setDeviceCode(fill.getDeviceCode());
             deviceRunLogDO.setFillContent(fill.getFillContent());
@@ -87,6 +94,15 @@ public class IotOpeationFillController {
             deviceRunLogDO.setDeptId(fill.getDeptId());
             deviceRunLogDO.setCreateTime(LocalDateTime.now());
             deviceRunLogDO.setPointName(fill.getPointName());
+            if(logList.size()>0){
+                BigDecimal num1 = logList.get(0).getTotalRunTime();
+                BigDecimal num2 = new BigDecimal(fill.getFillContent());
+                deviceRunLogDO.setTotalRunTime(num1.add(num2));
+            }else{
+                BigDecimal num2 = new BigDecimal(fill.getFillContent());
+                deviceRunLogDO.setTotalRunTime(num2);
+            }
+
             logDO.add(deviceRunLogDO);
         }
         iotOpeationFillService.updateFill(createReqVO.get(0));
@@ -137,7 +153,19 @@ public class IotOpeationFillController {
     @Operation(summary = "获得运行记录填报分页")
     @PreAuthorize("@ss.hasPermission('rq:iot-opeation-fill:query')")
     public CommonResult<PageResult<IotOpeationFillOrderDO>> getIotOpeationFillPage1(@Valid IotOpeationFillPageReqVO pageReqVO) {
-        PageResult<IotOpeationFillOrderDO> fillList = iotOpeationFillService.fillList1(pageReqVO);
+
+        List<IotOpeationFillDO> pdList = iotOpeationFillService.pdList();
+        List<String> nameList  = pdList.stream().map(o -> o.getUserName()).collect(Collectors.toList());
+        List<Integer> idList  = pdList.stream().map(o -> o.getUserId()).collect(Collectors.toList());
+        PageResult<IotOpeationFillOrderDO> fillList = new PageResult<>();
+        boolean exists = pdList.stream()
+                .anyMatch(rh -> rh.getUserId()==pageReqVO.getUserId());
+        if(!exists){
+            fillList = iotOpeationFillService.fillList2(pageReqVO,idList,nameList);
+        }else{
+            fillList = iotOpeationFillService.fillList1(pageReqVO);
+        }
+
         return success(BeanUtils.toBean(fillList, IotOpeationFillOrderDO.class));
     }
 
@@ -181,6 +209,7 @@ public class IotOpeationFillController {
                 for (IotModelTemplateAttrsDO attrsDO:list) {
                     if(log.getPointName().equals(attrsDO.getName())){
                         attrsDO.setFillContent(log.getFillContent());
+                        attrsDO.setTotalRunTime(log.getTotalRunTime());
                     }
                 }
             }

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

@@ -76,5 +76,6 @@ public class IotOpeationFillPageReqVO extends PageParam {
     private String orderType;
     private int orderStatus;
     private int userId;
+    private String userName;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotmodeltemplateattrs/IotModelTemplateAttrsDO.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.math.BigDecimal;
+
 /**
  * PMS 功能优化 运行记录模板属性 DO
  *
@@ -101,5 +103,6 @@ public class IotModelTemplateAttrsDO extends BaseDO {
 
     private String modelAttr;
     private String fillContent;
+    private BigDecimal totalRunTime;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotopeationfill/IotOpeationFillDO.java

@@ -98,5 +98,7 @@ public class IotOpeationFillDO extends BaseDO {
     private String orderName;
     private String orderType;
     private int orderStatus;
+    private int userId;
+    private String userName;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotopeationfill/IotOpeationFillOrderDO.java

@@ -40,5 +40,7 @@ public class IotOpeationFillOrderDO extends BaseDO {
     private String orderName;
     private String orderType;
     private int orderStatus;
+    private String userName;
+    private int userId;
 
 }

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

@@ -7,6 +7,9 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotmodeltemplate.vo.IotModel
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmodeltemplate.IotModelTemplateDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import javax.validation.constraints.Negative;
+import java.util.List;
+
 /**
  * PMS 功能优化 设备模板 Mapper
  *
@@ -33,4 +36,6 @@ public interface IotModelTemplateMapper extends BaseMapperX<IotModelTemplateDO>
     default IotModelTemplateDO selectByDeviceCategoryId(Long deviceCategoryId){
         return selectOne(IotModelTemplateDO::getDeviceCategoryId, deviceCategoryId);
     };
+
+    List<IotModelTemplateDO> modelList();
 }

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

@@ -5,6 +5,7 @@ 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.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmodel.vo.IotModelPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmodeltemplateattrs.vo.IotModelTemplateAttrsRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillPageReqVO;
@@ -54,14 +55,24 @@ public interface IotOpeationFillMapper extends BaseMapperX<IotOpeationFillDO> {
     int insertFill(List<IotOpeationFillDO> vo);
     int insertFillOrder(List<IotOpeationFillDO> vo);
     List<IotOpeationFillDO> fillList(IotOpeationFillPageReqVO vo);
+    @TenantIgnore
     List<IotOpeationFillDO> fillListByUserId(IotOpeationFillPageReqVO vo);
     List<IotOpeationFillDO> fillListByDeptId(IotOpeationFillPageReqVO vo);
+    @TenantIgnore
+    List<IotOpeationFillDO> rdList();
+    @TenantIgnore
+    List<IotOpeationFillDO> ryList();
+    @TenantIgnore
+    List<IotOpeationFillDO> rhList();
+    @TenantIgnore
+    List<IotOpeationFillDO> pdList();
     List<IotOpeationFillDO> deviceList(IotOpeationFillPageReqVO vo);
 
     PageResult<IotOpeationFillDO> fillList1(IotOpeationFillPageReqVO vo);
 
 
     int insertLog(List<IotDeviceRunLogDO> logDO);
+    @TenantIgnore
     int updateFill(IotOpeationFillSaveReqVO vo);
     List<IotDeviceRunLogDO> getDeivceFillInfo(IotDeviceRunLogDO vo);
 }

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

@@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.iotmodeltemplateattrs.IotModel
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillOrderDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -27,6 +28,21 @@ public interface IotOpeationFillOrderMapper extends BaseMapperX<IotOpeationFillO
                 .likeIfPresent(IotOpeationFillOrderDO::getOrderName, reqVO.getOrderName())
                 .eqIfPresent(IotOpeationFillOrderDO::getOrderType, reqVO.getOrderType())
                 .eqIfPresent(IotOpeationFillOrderDO::getOrderStatus, reqVO.getOrderStatus())
+                .likeIfPresent(IotOpeationFillOrderDO::getUserName, reqVO.getUserName())
+                .eqIfPresent(IotOpeationFillOrderDO::getUserId, reqVO.getUserId())
+                .betweenIfPresent(IotOpeationFillOrderDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotOpeationFillOrderDO::getId));
+    }
+    default PageResult<IotOpeationFillOrderDO> selectPage1(IotOpeationFillPageReqVO reqVO,
+                                                           Collection<Integer> userIds,
+                                                           Collection<String> names) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotOpeationFillOrderDO>()
+                .eqIfPresent(IotOpeationFillOrderDO::getDeptId, reqVO.getDeptId())
+                .likeIfPresent(IotOpeationFillOrderDO::getOrderName, reqVO.getOrderName())
+                .eqIfPresent(IotOpeationFillOrderDO::getOrderType, reqVO.getOrderType())
+                .eqIfPresent(IotOpeationFillOrderDO::getOrderStatus, reqVO.getOrderStatus())
+                .inIfPresent(IotOpeationFillOrderDO::getUserName, names)
+                .inIfPresent(IotOpeationFillOrderDO::getUserId, userIds)
                 .betweenIfPresent(IotOpeationFillOrderDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(IotOpeationFillOrderDO::getId));
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/IotOperationFillJob.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.pms.job;
 
 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillPageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
@@ -35,11 +37,66 @@ public class IotOperationFillJob implements JobHandler {
     private IotOpeationFillMapper iotOpeationFillMapper;
 
     @Override
-    @TenantJob
+    @TenantIgnore
     public String execute(String param) throws Exception {
+        TenantContextHolder.setIgnore(true);
         System.out.println("***********创建运行记录填报工单开始执行*********8");
         List<IotOpeationFillDO> orderList = new ArrayList<>();
-        Long[] deptArray = {157L,158L,163L};
+        List<IotOpeationFillDO> pdList = iotOpeationFillMapper.pdList();
+        List<IotOpeationFillDO> rhList = iotOpeationFillMapper.rhList();
+        List<IotOpeationFillDO> rdList = iotOpeationFillMapper.rdList();
+        List<IotOpeationFillDO> ryList = iotOpeationFillMapper.ryList();
+
+        for (IotOpeationFillDO pd:pdList) {
+
+            IotOpeationFillDO fillDO = new IotOpeationFillDO();
+
+            boolean exists = rhList.stream()
+                    .anyMatch(rh -> rh.getDeptId().equals(pd.getDeptId()));
+            if(exists){
+                fillDO.setOrderName("瑞恒兴域"+LocalDate.now()+"运行记录填报");
+                fillDO.setDeptId(pd.getDeptId());
+                fillDO.setOrderStatus(0);
+                fillDO.setCreateTime(LocalDateTime.now());
+                fillDO.setUserName(pd.getUserName());
+                fillDO.setUserId(pd.getUserId());
+                orderList.add(fillDO);
+            }
+
+            boolean exists1 = rdList.stream()
+                    .anyMatch(rd -> rd.getDeptId().equals(pd.getDeptId()));
+
+            if(exists1){
+                fillDO.setOrderName("瑞都石油"+LocalDate.now()+"运行记录填报");
+                fillDO.setDeptId(pd.getDeptId());
+                fillDO.setOrderStatus(0);
+                fillDO.setCreateTime(LocalDateTime.now());
+                fillDO.setUserName(pd.getUserName());
+                fillDO.setUserId(pd.getUserId());
+                orderList.add(fillDO);
+            }
+
+            boolean exists2 = ryList.stream()
+                    .anyMatch(ry -> ry.getDeptId().equals(pd.getDeptId()));
+
+            if(exists2){
+                fillDO.setOrderName("瑞鹰国际"+LocalDate.now()+"运行记录填报");
+                fillDO.setDeptId(pd.getDeptId());
+                fillDO.setOrderStatus(0);
+                fillDO.setCreateTime(LocalDateTime.now());
+                fillDO.setUserName(pd.getUserName());
+                fillDO.setUserId(pd.getUserId());
+                orderList.add(fillDO);
+            }
+        }
+
+        iotOpeationFillMapper.insertFillOrder(orderList);
+
+
+
+
+
+       /* Long[] deptArray = {157L,158L,163L};
         for (Long a:deptArray) {
             IotOpeationFillDO fillDO = new IotOpeationFillDO();
             fillDO.setDeptId(a);
@@ -54,8 +111,8 @@ public class IotOperationFillJob implements JobHandler {
             fillDO.setOrderStatus(0);
             fillDO.setCreateTime(LocalDateTime.now());
             orderList.add(fillDO);
-        }
-        iotOpeationFillMapper.insertFillOrder(orderList);
+        }*/
+
         System.out.println("***********创建运行记录填报工单执行结束*********8");
 
         System.out.println("*****************插入运行记录设备表***********************");

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

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotmodeltemplate.vo.IotModel
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmodeltemplate.IotModelTemplateDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * PMS 功能优化 设备模板 Service 接口
@@ -67,4 +68,6 @@ public interface IotModelTemplateService {
      * @param status 状态
      */
     void updateDeviceTemplateStatus(Long id, Integer status);
+
+    List<IotModelTemplateDO> modelList();
 }

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

@@ -11,6 +11,8 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.List;
+
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_DEVICE_TEMPLATE_NOT_EXISTS;
 
@@ -84,4 +86,9 @@ public class IotModelTemplateServiceImpl implements IotModelTemplateService {
         iotModelTemplateMapper.updateById(updateObj);
     }
 
+    @Override
+    public List<IotModelTemplateDO> modelList() {
+        return iotModelTemplateMapper.modelList();
+    }
+
 }

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

@@ -4,6 +4,7 @@ import java.util.*;
 import javax.validation.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmodel.vo.IotModelPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmodeltemplateattrs.vo.IotModelTemplateAttrsRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillPageReqVO;
@@ -17,6 +18,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.iotmodel.IotModelDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmodeltemplateattrs.IotModelTemplateAttrsDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillOrderDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 
 /**
  * 运行记录填报 Service 接口
@@ -77,6 +79,12 @@ public interface IotOpeationFillService {
 
     PageResult<IotOpeationFillOrderDO> fillList1(IotOpeationFillPageReqVO vo);
 
+    List<IotOpeationFillDO> pdList();
+
+    PageResult<IotOpeationFillOrderDO> fillList2(IotOpeationFillPageReqVO vo,List<Integer> userIds,List<String> nickNames);
+
+
+
     int insertLog(List<IotDeviceRunLogDO> logDO);
 
     /**

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

@@ -26,6 +26,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 
+import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -45,6 +46,7 @@ public class IotOpeationFillServiceImpl implements IotOpeationFillService {
     @Resource
     private IotOpeationFillOrderMapper iotOpeationFillOrderMapper;
 
+
     @Override
     public Long createIotOpeationFill(IotOpeationFillSaveReqVO createReqVO) {
         // 插入
@@ -128,6 +130,17 @@ public class IotOpeationFillServiceImpl implements IotOpeationFillService {
         return iotOpeationFillOrderMapper.selectPage(vo);
     }
 
+    @Override
+    public List<IotOpeationFillDO> pdList() {
+        return iotOpeationFillMapper.pdList();
+    }
+
+    @Override
+    public PageResult<IotOpeationFillOrderDO> fillList2(IotOpeationFillPageReqVO vo,List<Integer> userIds,List<String> nickNames) {
+        return iotOpeationFillOrderMapper.selectPage1(vo,userIds,nickNames);
+    }
+
+
     @Override
     public int insertLog(List<IotDeviceRunLogDO> logDO) {
         return iotOpeationFillMapper.insertLog(logDO);

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

@@ -0,0 +1,13 @@
+<?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.iotmodeltemplate.IotModelTemplateMapper">
+
+
+    <select id="modelList"
+            resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotmodeltemplate.IotModelTemplateDO">
+        select * from yanfan.rq_iot_model_template
+    </select>
+
+
+
+</mapper>

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

@@ -38,10 +38,12 @@
 
     <insert id="insertFillOrder"
             parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
-        insert into rqiot.rq_iot_opeation_fill_order(dept_id,order_name,order_status,create_time,order_type)
+        insert into rqiot.rq_iot_opeation_fill_order(dept_id,order_name,
+        order_status,create_time,order_type,user_name,user_id)
         values
         <foreach collection="list" item="item" separator=",">
-            (#{item.deptId},#{item.orderName},#{item.orderStatus},#{item.createTime},#{item.orderType})
+            (#{item.deptId},#{item.orderName},#{item.orderStatus},
+            #{item.createTime},#{item.orderType},#{item.userName},#{item.userId})
         </foreach>
 
     </insert>
@@ -49,11 +51,11 @@
     <insert id="insertLog"
             parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicerunlog.IotDeviceRunLogDO">
         insert into rqiot.rq_iot_device_run_log
-            (dept_id,device_id,device_code,point_code,fill_content,create_time,point_name)
+            (dept_id,device_id,device_code,point_code,fill_content,create_time,point_name,total_run_time)
         values
         <foreach collection="list" item="item" separator=",">
             (#{item.deptId},#{item.deviceId},#{item.deviceCode},
-            #{item.pointCode},#{item.fillContent},#{item.createTime},#{item.pointName})
+            #{item.pointCode},#{item.fillContent},#{item.createTime},#{item.pointName},#{item.totalRunTime})
         </foreach>
 
     </insert>
@@ -92,13 +94,18 @@
 
     <select id="fillListByUserId" parameterType="cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillRespVO"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
-        SELECT * FROM
-        rqiot.rq_iot_opeation_fill
-        WHERE DATE(create_time) = CURDATE()
+        SELECT a.*,
+        b.name org_name FROM
+        rqiot.rq_iot_opeation_fill a,
+        rqiot.system_dept b
+        WHERE DATE(a.create_time) = CURDATE()
         <if test="userId != null  and userId != ''">
             and device_id in (select device_id from
             rqiot.rq_iot_device_person where person_id = #{userId})
         </if>
+        and
+        a.dept_id = b.id
+
     </select>
 
     <select id="fillListByDeptId" parameterType="cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillRespVO"
@@ -116,6 +123,49 @@
         </if>
     </select>
 
+    <select id="rhList"
+            resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
+        SELECT d1.id dept_id
+        FROM system_dept d1
+                 JOIN system_dept d2 ON d2.id = d1.parent_id
+        WHERE d2.parent_id = 157
+        union
+        select id from system_dept where id = 157
+    </select>
+
+    <select id="rdList"
+            resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
+        SELECT d1.id dept_id
+        FROM system_dept d1
+                 JOIN system_dept d2 ON d2.id = d1.parent_id
+        WHERE d2.parent_id = 163
+        union
+        select id from system_dept where id = 163
+    </select>
+
+    <select id="ryList"
+            resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
+        SELECT d1.id dept_id
+        FROM system_dept d1
+                 JOIN system_dept d2 ON d2.id = d1.parent_id
+        WHERE d2.parent_id = 158
+        union
+        select id from system_dept where id = 158
+    </select>
+
+    <select id="pdList" resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
+        select
+            distinct
+            a.id user_id,
+            a.nickname user_name,
+            a.dept_id
+        from
+            system_users a,
+            rq_iot_device_person b
+        where
+            a.id = b.person_id
+    </select>
+
     <select id="fillList1" parameterType="cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillRespVO"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
         SELECT * FROM