运行记录优化0926-1

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

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.pms.constant.PmsConstants;
 import cn.iocoder.yudao.module.pms.controller.admin.iotrhdailyreport.vo.IotRhDailyReportSaveReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectPlanDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillOrderDO;
@@ -312,11 +313,13 @@ public class IotOperationPlanJob implements JobHandler {
                     for (IotOpeationFillDO vir:verRPList) {
                         IotRhDailyReportSaveReqVO saveReqVO = new IotRhDailyReportSaveReqVO();
                         //查询队伍增压机状态
-                        /*IotDeviceDO devStatus = iotOpeationFillMapper.devStatus(vir);
+                        IotDeviceDO virDev = new IotDeviceDO();
+                        virDev.setDeptId(vir.getDeptId());
+                        IotDeviceDO devStatus = iotOpeationFillMapper.devStatus(virDev);
                         //不为空则为日报赋值
                         if(devStatus!=null){
-                            saveReqVO.setConstructionStatus(devStatus.getOrderStatus());
-                        }*/
+                            saveReqVO.setConstructionStatus(devStatus.getDeviceStatus());
+                        }
                         //当日注气量
                         saveReqVO.setDailyGasInjection(BigDecimal.valueOf(0.00));
                         //当日注水量
@@ -341,7 +344,7 @@ public class IotOperationPlanJob implements JobHandler {
 
 
         //发送钉钉通知
-        /*pmsThreadPoolTaskExecutor.execute(()->{
+        pmsThreadPoolTaskExecutor.execute(()->{
             try{
                 for (IotOpeationFillOrderDO order:orderList1) {
                     pmsMessage.sendMessage(order.getId(), order.getOrderName(), PmsConstants.GENERATE_OPERATION, (long)order.getUserId(), order.getMobile());
@@ -349,7 +352,7 @@ public class IotOperationPlanJob implements JobHandler {
             }catch (Exception e){
                 e.printStackTrace();
             }
-        });*/
+        });
 
 
         //正常工单设备

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

@@ -1049,10 +1049,11 @@
 
     <select id="devStatus" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO">
-        SELECT order_status
+        SELECT device_status
         FROM rq_iot_device
         WHERE dept_id = #{deptId}
           AND asset_class in (159,160)
+        LIMIT 1
     </select>
 
     <select id="isReport" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO"