消息通知

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

@@ -110,4 +110,7 @@ public interface IotOpeationFillMapper extends BaseMapperX<IotOpeationFillDO> {
 
     @TenantIgnore
     int upLocation(DeviceZHBDDO zhbddo);
+    @TenantIgnore
+    IotOpeationFillDO getFillById(IotOpeationFillDO fillDO);
+
 }

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

@@ -123,9 +123,8 @@ public class IotOperationFillJob implements JobHandler {
                 .filter(obj -> idList.contains(obj.getUserId()))
                 .collect(Collectors.toList());
 
-        if (CollUtil.isNotEmpty(orderList1)) {
-            TenantUtils.execute(1L, () -> iotOpeationFillOrderMapper.insertBatch(orderList1));
-        }
+        iotOpeationFillOrderMapper.insertBatch(orderList1);
+
 
         pmsThreadPoolTaskExecutor.execute(()->{
             try{

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/message/PmsMessage.java

@@ -27,7 +27,9 @@ public class PmsMessage {
 
     public void sendMessage(Long businessId, String name, String businessType, Long userId, String mobile){
 
-        IotOpeationFillDO fillDO = iotOpeationFillService.getIotOpeationFill(businessId);
+        IotOpeationFillDO fill = new IotOpeationFillDO();
+        fill.setId(businessId);
+        IotOpeationFillDO fillDO = iotOpeationFillService.getFillById(fill);
 
         Map<String, Object> templateParams = new HashMap<>();
 

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

@@ -50,6 +50,8 @@ public interface IotOpeationFillService {
      */
     IotOpeationFillDO getIotOpeationFill(Long id);
 
+    IotOpeationFillDO getFillById(IotOpeationFillDO fillDO);
+
     /**
      * 获得运行记录填报分页
      *

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

@@ -82,6 +82,11 @@ public class IotOpeationFillServiceImpl implements IotOpeationFillService {
         return iotOpeationFillMapper.selectById(id);
     }
 
+    @Override
+    public IotOpeationFillDO getFillById(IotOpeationFillDO fillDO) {
+        return iotOpeationFillMapper.getFillById(fillDO);
+    }
+
     @Override
     public PageResult<IotOpeationFillDO> getIotOpeationFillPage(IotOpeationFillPageReqVO pageReqVO) {
         return iotOpeationFillMapper.selectPage(pageReqVO);

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

@@ -29,6 +29,10 @@
             c.device_status in ('sg','dm')
     </select>
 
+    <select id="getFillById" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO"
+            resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
+        select * from rqiot.rq_iot_opeation_fill_order where id = #{id}
+    </select>
 
 
     <select id="getFillDevices1"