lyhzzz 1 неделя назад
Родитель
Сommit
4a4ee5c271

+ 7 - 2
src/main/java/com/fdkankan/ucenter/entity/FeedbackOption.java

@@ -1,5 +1,6 @@
 package com.fdkankan.ucenter.entity;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -7,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fdkankan.ucenter.typehandle.JsonArrayTypeHandler;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -53,8 +56,8 @@ public class FeedbackOption implements Serializable {
     @TableField("sys_user_id")
     private Integer sysUserId;
 
-    @TableField("ai_option")
-    private String aiOption;
+    @TableField(typeHandler= JsonArrayTypeHandler.class)
+    private JSONArray aiOption;
 
     @TableField("model_api")
     private String modelApi;
@@ -65,5 +68,7 @@ public class FeedbackOption implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    @TableField("confidence_level")
+    private String confidenceLevel;
 
 }

+ 3 - 0
src/main/java/com/fdkankan/ucenter/entity/ScenePlus.java

@@ -128,4 +128,7 @@ public class ScenePlus implements Serializable {
      */
     @TableField("demo")
     private Integer demo;
+
+    @TableField("feedback_option_id")
+    private Integer feedbackOptionId;
 }

+ 25 - 0
src/main/java/com/fdkankan/ucenter/service/impl/InnerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.ucenter.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -67,6 +68,8 @@ public class InnerServiceImpl implements IInnerService {
 
     @Autowired
     private FYunFileServiceInterface fYunFileService;
+    @Autowired
+    IFeedbackOptionService feedbackOptionService;
 
     @Override
     public Result createTokenByNum(String num) {
@@ -212,6 +215,28 @@ public class InnerServiceImpl implements IInnerService {
                 }
                 return vo;
             }
+            if(plus.getFeedbackOptionId() != null){
+                FeedbackOption feedbackOption = feedbackOptionService.getById(plus.getFeedbackOptionId());
+                JSONArray aiOption = feedbackOption.getAiOption();
+                if(aiOption == null || aiOption.isEmpty()){
+                    return vo;
+                }
+                List<HashMap<String,Object>> list = new ArrayList<>();
+                for (Object object : aiOption) {
+                    Integer id  = (Integer) object;
+                    FeedbackOption feedbackOption1 = feedbackOptionService.getById(id);
+                    if(feedbackOption1 != null && StringUtils.isNotBlank(feedbackOption1.getModelApi())){
+                        HashMap<String, Object> map2 = new HashMap<>();
+                        map2.put("name",feedbackOption1.getNameCn());
+                        map2.put("url",feedbackOption1.getModelApi());
+                        map2.put("confidenceLevel",feedbackOption1.getConfidenceLevel());
+                        list.add(map2);
+                    }
+                }
+                if(!list.isEmpty()){
+                    vo.setModels(list);
+                }
+            }
         }
         throw new BusinessException(ResultCodeMsg.FAILURE_CODE_400002, ResultCodeMsg.FAILURE_MSG_400002);
     }

+ 0 - 3
src/main/java/com/fdkankan/ucenter/service/impl/LoginService.java

@@ -338,7 +338,4 @@ public class LoginService {
         return login(param);
     }
 
-    public static void main(String[] args) throws Exception{
-        System.out.println(AesUtil.encrypt("Zkturing@2025!"));
-    }
 }

+ 5 - 0
src/main/java/com/fdkankan/ucenter/vo/response/LaserSceneInfoVo.java

@@ -2,6 +2,9 @@ package com.fdkankan.ucenter.vo.response;
 
 import lombok.Data;
 
+import java.util.HashMap;
+import java.util.List;
+
 @Data
 public class LaserSceneInfoVo {
     private String num;
@@ -17,4 +20,6 @@ public class LaserSceneInfoVo {
     private Integer status;
     private Integer payStatus;
     private String title;
+
+    private List<HashMap<String,Object>> models;
 }