Merge remote-tracking branch 'origin/dev_20250306_rz' into uat

ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/CarModelReqDTO.java

@@ -0,0 +1,41 @@
+package com.volvo.ai.analytic.center.dto.req;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CarModelReqDTO {
+
+    //@ApiModelProperty("燃料类型")
+    private Integer fuelType;
+
+    //@ApiModelProperty("是否包含主图  0 不包含  1 包含   默认不包含")
+    private Integer isContainMainImage;
+
+    //@ApiModelProperty("车型类型")
+    private Integer modelType;
+
+    //@ApiModelProperty("车型代码")
+    private String  modelCode;
+
+    //@ApiModelProperty("年款")
+    private String modelYear;
+
+    //@ApiModelProperty("是否有效  10041001 有效  10041002 无效")
+    private Integer isValid;
+
+    //@ApiModelProperty("是否是直售 10041001 是 10041002 否")
+    private Integer isDirectModel;
+
+    //@ApiModelProperty("是否在售(10041001:是 10041002: 否)")
+    private Integer onSale;
+
+    //@ApiModelProperty("车系ID")
+    private Integer seriesId;
+
+    //@ApiModelProperty("车型名称模糊查询")
+    private String modelName;
+}

ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/resp/CarModelRespDTO.java

@@ -0,0 +1,65 @@
+package com.volvo.ai.analytic.center.dto.resp;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CarModelRespDTO {
+
+    // ("燃料类型")
+    private Integer fuelType;
+
+    // ("公司代码")
+    private String companyCode;
+
+   // @ApiModelProperty("主图")
+    private String imageUrl;
+
+   // @ApiModelProperty("车型代码")
+    private String modelCode;
+
+   // @ApiModelProperty("车型描述（中文）")
+    private String modelDescriptionChinese;
+
+    // ("是否直售车型:10041001:是；10041002:否")
+    private Integer isDirectModel;
+
+   // ("车型描述（英文）")
+    private String modelDescriptionEnglish;
+
+    // ("车型名称")
+    private String modelName;
+
+   // ("车型名称英文")
+    private String modelNameEn;
+
+   // ("车型类型")
+    private Integer modelType;
+
+   // ("年款")
+    private String modelYear;
+
+    // ("车系代码")
+    private String seriesCode;
+
+    // ("车型id")
+    private Integer id;
+
+   // ("排序")
+    private Integer sort;
+
+    // ("是否有效  10041001 有效  10041002 无效")
+    private Integer isValid;
+
+    // ("是否在售(10041001:是 10041002: 否)")
+    private Integer onSale;
+
+    //@ApiModelProperty("车型名称 沃世界名称")
+    private String modelNameC;
+
+    //@ApiModelProperty("备注")
+    private String modelRemark;
+}

ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/resp/ResultDTO.java

@@ -0,0 +1,19 @@
+package com.volvo.ai.analytic.center.dto.resp;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ResultDTO<T> implements Serializable {
+
+    private static final long serialVersionUID = -1179271389084311472L;
+
+    private String returnCode;
+
+    private String returnMessage;
+
+    private String errMsg;
+
+    private T data;
+}

ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java

@@ -31,6 +31,9 @@ public class AiAnalysisRequestLogs extends BaseEntity {
     @TableField("business_response")
     private String businessResponse; // JSON 字符串
 
+    @TableField("dify_response")
+    private String difyResponse;
+
     @TableField("quest_status")
     private String questStatus;
 

ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/enums/BizEnum.java

@@ -14,7 +14,9 @@ import java.util.Objects;
 @Getter
 @ToString
 public enum BizEnum {
+    SUCCESS(200, "操作成功"),
 
+    FAIL(500, "操作失败"),
     BAD_REQUEST(4000, "参数不合法"),
     METHOD_NOT_ALLOWED(4001, "方法不允许"),
     MISS_PARAM(4002, "参数缺失"),

ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/enums/BusinessTypeEnum.java

@@ -5,7 +5,8 @@ import lombok.Getter;
 @Getter
 public enum BusinessTypeEnum {
 
-    COMMUNITYTARGET("CommunityTarget", "社区舆情分析")
+    COMMUNITYTARGET("CommunityTarget", "社区舆情分析"),
+    SMART_ASSISTANT("SMART_ASSISTANT", "智能助手")
     ;
 
     private String code;

ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/feign/RemoteCarModelClient.java

@@ -0,0 +1,18 @@
+package com.volvo.ai.analytic.center.feign;
+
+import com.volvo.ai.analytic.center.dto.req.CarModelReqDTO;
+import com.volvo.ai.analytic.center.dto.resp.CarModelRespDTO;
+import com.volvo.ai.analytic.center.dto.resp.ResultDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient(url = "${mse-in.url.domain}", contextId = "basic-data-client", value = "basicDataClient", path = "/2b/2b-basicdata-service")
+public interface RemoteCarModelClient {
+
+       @PostMapping(name = "查询车型", path = "/model/list")
+       ResultDTO<List<CarModelRespDTO>> queryCarModelList(@RequestBody CarModelReqDTO carModelReqDTO);
+
+}