Merge branch 'master' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone

dk-api/api-system/src/main/java/org/dromara/system/api/RemotePostService.java

@@ -8,4 +8,6 @@ public interface RemotePostService {
     List<RemotePostVo> listPost();
 
     String getPostCode(String labelCode);
+
+    String getFlowCode(String labelCode);
 }

dk-api/api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java

@@ -127,10 +127,10 @@ public interface RemoteWorkflowService {
     List<RemoteUserVo> currentTaskAllUser(Long taskId);
 
     /**
-     * 根据岗位code拿到预警流程编码
+     * 根据标签code拿到预警流程编码
-     * @param postCode
+     * @param labelCode
      * @return
      */
-    String getFlowCode(String postCode);
+    String getFlowCode(String labelCode);
 
 }

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java

@@ -282,7 +282,8 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
             return;
         }
         RedisOpsUtils.setWithExpire(device.getDeviceSn(), device, 180);
-
+        List<DeviceQrtzEntity> qrtzEntityList = deviceQrtzMapper.selectList(new LambdaQueryWrapper<DeviceQrtzEntity>().eq(DeviceQrtzEntity::getDeviceSn, device.getDeviceSn()).eq(DeviceQrtzEntity::getStatus, DeviceQrtzConstants.QRTZ_STATUS_1));
+        if(!qrtzEntityList.isEmpty()){
             // 获取当前日期
             LocalDateTime currentDate = LocalDateTime.now();
             // 定义日期格式
@@ -340,6 +341,8 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
 
                 }
             }
+        }
+
 
     }
 }

dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/SDKWaylineService.java

@@ -114,7 +114,7 @@ public class SDKWaylineService extends AbstractWaylineService {
             }
 
             LambdaQueryWrapper<DeviceQrtzFileEntity> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(DeviceQrtzFileEntity::getStatus, DeviceQrtzConstants.QRTZ_FILE_STATUS_1).eq(DeviceQrtzFileEntity::getDeviceSn,response.getGateway());
+            wrapper.eq(DeviceQrtzFileEntity::getStatus, DeviceQrtzConstants.QRTZ_FILE_STATUS_2).eq(DeviceQrtzFileEntity::getDeviceSn,response.getGateway());
             List<DeviceQrtzFileEntity> fileEntityList = deviceQrtzFileMapper.selectList(wrapper);
             if (FlighttaskStatusEnum.OK != statusEnum) {
                 job.setCode(eventsReceiver.getResult().getCode());

dk-modules/system/src/main/java/org/dromara/system/domain/AiLabel.java

@@ -53,5 +53,10 @@ public class AiLabel  {
      */
     private String aiEn;
 
+    /**
+     * 流程code
+     */
+    private String flowCode;
+
 
 }

dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelBo.java

@@ -73,4 +73,6 @@ public class AiLabelBo {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
+
+    private String flowCode;
 }

dk-modules/system/src/main/java/org/dromara/system/domain/vo/AiLabelVo.java

@@ -59,5 +59,10 @@ public class AiLabelVo implements Serializable {
      */
     private String aiEn;
 
+    /**
+     * 流程code
+     */
+    private String flowCode;
+
 
 }

dk-modules/system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java

@@ -7,6 +7,7 @@ import org.dromara.system.api.RemotePostService;
 import org.dromara.system.api.domain.vo.RemotePostVo;
 import org.dromara.system.domain.bo.SysPostBo;
 import org.dromara.system.domain.vo.SysPostVo;
+import org.dromara.system.service.IAiLabelService;
 import org.dromara.system.service.ISysPostService;
 
 import org.springframework.stereotype.Service;
@@ -27,6 +28,8 @@ public class RemotePostServiceImpl implements RemotePostService {
 
     private final ISysPostService sysPostService;
 
+    private final IAiLabelService aiLabelService;
+
     @Override
     public List<RemotePostVo> listPost() {
         List<SysPostVo> sysPostVos = sysPostService.selectPostList(new SysPostBo());
@@ -46,4 +49,9 @@ public class RemotePostServiceImpl implements RemotePostService {
     public String getPostCode(String labelCode) {
         return sysPostService.getPostCode(labelCode);
     }
+
+    @Override
+    public String getFlowCode(String labelCode) {
+        return  aiLabelService.getFlowCode(labelCode);
+    }
 }

dk-modules/system/src/main/java/org/dromara/system/service/IAiLabelService.java

@@ -72,4 +72,6 @@ public interface IAiLabelService {
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     List<AiLabel> queryListByLabel(List<Long> labelIds);
+
+    String getFlowCode(String labelCode);
 }

dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLabelServiceImpl.java

@@ -143,4 +143,9 @@ public class AiLabelServiceImpl implements IAiLabelService {
         queryWrapper.in(!labelIds.isEmpty(),"label_id",labelIds);
         return this.baseMapper.selectList(queryWrapper);
     }
+
+    @Override
+    public String getFlowCode(String labelCode) {
+        return this.baseMapper.selectOne(new LambdaQueryWrapper<AiLabel>().eq(AiLabel::getLabelEn, labelCode)).getFlowCode();
+    }
 }

dk-modules/workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java

@@ -114,9 +114,7 @@ public class RemoteWorkflowServiceImpl implements RemoteWorkflowService {
     @Override
     public String getFlowCode(String labelCode){
         //标签名称
-        String postCode  = remotePostService.getPostCode(labelCode);
+        return remotePostService.getFlowCode(labelCode);
-
-        return flwDefinitionService.getFlowCode(postCode);
     }
 
     @Override