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

dk-common/common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java

@@ -89,7 +89,7 @@ public class PlusDataPermissionHandler {
         // 获取数据权限配置
         DataPermission dataPermission = getDataPermission(mappedStatementId);
         // 获取当前登录用户信息
-        LoginUser currentUser = LoginHelper.getLoginUser();
+        LoginUser currentUser = DataPermissionHelper.getVariable("user");
         if (ObjectUtil.isNull(currentUser)) {
             currentUser = LoginHelper.getLoginUser();
             DataPermissionHelper.setVariable("user", currentUser);

dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java

@@ -36,7 +36,7 @@ import java.util.Map;
 @RequiredArgsConstructor
 @RequestMapping("/compare")
 @Validated
-@Tag(name="算法比对模块")
+@Tag(name="算法比对模块(驼峰传参)")
 public class AiCompareController extends BaseController {
 
 
@@ -75,7 +75,6 @@ public class AiCompareController extends BaseController {
 
     /**
      *  对比编辑
-     *
      * @param id 主键
      */
     @SaCheckPermission("sample:compare:query")
@@ -118,4 +117,15 @@ public class AiCompareController extends BaseController {
         return toAjax(aiCompareService.update(bo));
     }
 
+
+    /**
+     * 画框  提交
+     */
+    @SaCheckPermission("sample:compare:add")
+    @Log(title = "算法比对", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/pictureFrame")
+    public R<Void> pictureFrame(@Validated(AddGroup.class) @RequestBody Map<String,Object> compare) {
+        return toAjax(aiCompareService.pictureFrame(compare));
+    }
 }

dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java

@@ -1,6 +1,7 @@
 package org.dromara.sample.wayline.model.dto;
 
 
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -42,6 +43,9 @@ public class AiCompareDTO implements Serializable {
     /**航线名称*/
     private String waylineName;
 
+    /**航线id*/
+    private String waylineId;
+
     /**
      * 模板id  对应模板的jobId
      * */

dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/AiCompareEntity.java

@@ -28,6 +28,9 @@ public class AiCompareEntity extends BaseEntity {
 
     /**航线名称*/
     private String waylineName;
+
+    /**航线名称*/
+    private String waylineId;
     /**
      * 模板id
      * */

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

@@ -23,4 +23,6 @@ public interface IAiCompareService {
 
     AiCompareEntity getInfo(Long id);
     List<AiCompareMediaFileDTO> queryById(Long id);
+
+    Boolean pictureFrame(Map<String,Object> compare);
 }

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

@@ -73,10 +73,19 @@ public class AiCompareServiceImpl implements IAiCompareService {
         }
         List<AiCompareEntity> insertList =new ArrayList<>();
         for (Map<String,Object> bo : compareDTOList) {
-            Long queueId = Convert.toLong(bo.get("queueId"));
+            Long queueId = bo.containsKey("queueId") ? Convert.toLong(bo.get("queueId")) : null;
+            String waylineId = bo.containsKey("waylineId") ? Convert.toStr(bo.get("waylineId")) : null;
+            if(StrUtil.isBlank(waylineId)){
+                throw new RuntimeException("未获取到waylineId");
+            }
+            if(ObjectUtil.isNull(queueId)){
+                throw new RuntimeException("未获取到queueId");
+            }
+            String templateId = bo.containsKey("templateId") ? Convert.toStr(bo.get("templateId")) : null;
             AiCompareQueueEntity serviceInfo = aiCompareQueueService.getInfo(queueId);
             AiCompareEntity aiCompareEntity = new AiCompareEntity();
             LoginUser loginUser = LoginHelper.getLoginUser();
+            aiCompareEntity.setWaylineId(waylineId);
             aiCompareEntity.setWaylineName(serviceInfo.getWaylineName());
             aiCompareEntity.setJobId(serviceInfo.getJobId());
             aiCompareEntity.setJobName(serviceInfo.getJobName());
@@ -87,7 +96,6 @@ public class AiCompareServiceImpl implements IAiCompareService {
             aiCompareEntity.setCreateDept(loginUser.getDeptId());
             aiCompareEntity.setStatus(AiCompareStatusConstants.COMPARE_STATUS_1);
             aiCompareEntity.setCreateTime(new Date());
-            String templateId = Convert.toStr(bo.get("templateId"));
             if(ObjectUtil.isNotEmpty(templateId)){
                 aiCompareEntity.setTemplateId(templateId);
             }else {
@@ -109,16 +117,15 @@ public class AiCompareServiceImpl implements IAiCompareService {
         List<BatchResult> resultList = aiCompareMapper.insertOrUpdate(insertList, 10);
         System.out.println(resultList);
         List<Long> list =compareDTOList.stream().map(e->Convert.toLong(e.get("queueId"))).collect(Collectors.toList());
-       ;
         return  aiCompareQueueService.updateStatus(list,AiCompareStatusConstants.QUEUW_TYPE_1);
     }
 
     @Override
     public Boolean update(Map<String,Object> compareDTO) {
         AiCompareEntity aiCompareEntity =new AiCompareEntity();
-        Long id = Convert.toLong(compareDTO.get("id"));
+        Long id = compareDTO.containsKey("id") ? Convert.toLong(compareDTO.get("id")) : null;
+        String templateId = compareDTO.containsKey("templateId") ? Convert.toStr(compareDTO.get("templateId")) : null;
         aiCompareEntity.setId(id);
-        String templateId = Convert.toStr(compareDTO.get("templateId"));
         if(StrUtil.isNotEmpty(templateId)){
             aiCompareEntity.setTemplateId(templateId);
         }
@@ -137,4 +144,10 @@ public class AiCompareServiceImpl implements IAiCompareService {
         List<AiCompareMediaFileDTO> mediaFileDTOList = aiCompareMapper.listMediaFile(aiCompareEntity);
         return mediaFileDTOList;
     }
+
+    @Override
+    public Boolean pictureFrame(Map<String, Object> compare) {
+
+        return true;
+    }
 }

pom.xml

@@ -16,7 +16,7 @@
         <revision>2.2.2</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
         <spring-boot.version>3.2.11</spring-boot.version>
         <spring-cloud.version>2023.0.3</spring-cloud.version>
         <spring-boot-admin.version>3.2.3</spring-boot-admin.version>