Przeglądaj źródła

运行记录1015-01

yuanchao 3 godzin temu
rodzic
commit
e24862b061

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

@@ -234,6 +234,9 @@ public interface IotOpeationFillMapper extends BaseMapperX<IotOpeationFillDO> {
     @TenantIgnore
     IotOpeationFillDO orderDO(IotOpeationFillDO fillDO);
 
+    @TenantIgnore
+    IotOpeationFillDO orderDO1(IotOpeationFillDO fillDO);
+
     @TenantIgnore
     List<IotOpeationFillDO> reportList(IotOpeationFillDO fillDO);
 

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

@@ -353,7 +353,19 @@ public class IotOpeationFillServiceImpl implements IotOpeationFillService {
 
                 List<IotOpeationFillOrderDO> childList = iotOpeationFillMapper.childList(orderDO);
 
-                int randomNum = generate8DigitInteger();
+                int randomNum;
+                IotOpeationFillDO exitDev;
+                IotOpeationFillDO fillDO = new IotOpeationFillDO();
+
+                do {
+                    // 生成8位随机整数
+                    randomNum = generate8DigitInteger();
+                    // 设置设备ID
+                    fillDO.setDeviceId((long) randomNum);
+                    // 检查数据库中是否已存在
+                    exitDev = iotOpeationFillMapper.orderDO1(fillDO);
+                } while (exitDev != null); // 如果存在则继续循环生成新的随机数
+
 
                 //如果是根节点,则证明该部门为小队并且属于瑞恒,创建对应日报虚拟设备
                 if(childList.size()==0){

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

@@ -1079,6 +1079,19 @@
             DATE(create_time) = #{createTime}
     </select>
 
+
+    <select id="orderDO1" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO"
+            resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
+        select
+            order_id
+        from
+            rq_iot_opeation_fill
+        where
+            device_id = #{deviceId}
+          and
+            DATE(create_time) = CURDATE()
+    </select>
+
     <select id="reportList" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
         SELECT DISTINCT