1.修改百度AI模型接口；

2.修改学校导出问题；
3.新增学校导入接口（未完成）

ruoyi-admin/src/main/java/com/ruoyi/mall/controller/MallSchoolController.java

@@ -4,14 +4,18 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.mall.domain.Bo.MallSchoolExcelBo;
+import com.ruoyi.mall.domain.Bo.MallTestSchoolRecordBo;
 import com.ruoyi.mall.domain.MallSchool;
 import com.ruoyi.mall.service.IMallSchoolService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -109,5 +113,16 @@ public class MallSchoolController extends BaseController
         return mallSchoolService.submitSchoolUser(mallSchool);
     }
 
+    /**
+     * 导入学校录取数据列表
+     */
+    @Log(title = "导入学校录取数据列表", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<MallSchoolExcelBo> util = new ExcelUtil<MallSchoolExcelBo>(MallSchoolExcelBo.class);
+        List<MallSchoolExcelBo> list = util.importExcel(file.getInputStream());
+        return AjaxResult.success(mallSchoolService.importTestSchoolRecord(list, updateSupport));
+    }
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ApiChatNewController.java

@@ -305,7 +305,7 @@ public class ApiChatNewController {
             logger.info("百度千帆AppBuilder 创建对话响应：" + res);
             conversation_id = objectMapper.readTree(res).get("conversation_id").asText();
         }
-        redisTemplate.boundValueOps("conversation_id_" + userId).set(conversation_id, 30, TimeUnit.DAYS);
+        redisTemplate.boundValueOps("conversation_id_" + userId).set(conversation_id, 1, TimeUnit.HOURS);
     }
 
 }

ruoyi-system/src/main/java/com/ruoyi/mall/domain/Bo/MallSchoolExcelBo.java

+package com.ruoyi.mall.domain.Bo;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+
+/**
+ * 学校对象 mall_school
+ *
+ * @author lsm
+ * @date 2023-10-18
+ */
+
+public class MallSchoolExcelBo
+{
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "批次")
+    private String batchName;
+
+    @Excel(name = "院校代码")
+    private String schoolNumber;
+
+    @Excel(name = "院校名称")
+    private String schoolName;
+
+    @Excel(name = "专业")
+    private String majorName;
+
+    @Excel(name = "一级专业分类")
+    private String majorName1;
+
+    @Excel(name = "二级专业分类")
+    private String majorName2;
+
+    @Excel(name = "招生计划人数")
+    private String acceptNum;
+
+    @Excel(name = "录取原则")
+    private String ruleStr;
+
+    @Excel(name = "参考分")
+    private String reference;
+
+    @Excel(name = "录取最低分")
+    private String acceptLowest;
+
+    @Excel(name = "录取前提")
+    private String acceptPremise;
+
+    @Excel(name = "年份")
+    private String acceptYear;
+
+    @Excel(name = "文化分数线")
+    private String cultureLowest;
+
+    @Excel(name = "联考分数线")
+    private String majorLowest;
+
+    @Excel(name = "学科",readConverterExp = "0=文科,1=理科")
+    private String subjectType;
+
+    @Excel(name = "学费")
+    private String schoolPrice;
+
+    public String getBatchName() {
+        return batchName;
+    }
+
+    public void setBatchName(String batchName) {
+        this.batchName = batchName;
+    }
+
+    public String getSchoolNumber() {
+        return schoolNumber;
+    }
+
+    public void setSchoolNumber(String schoolNumber) {
+        this.schoolNumber = schoolNumber;
+    }
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName;
+    }
+
+    public String getMajorName() {
+        return majorName;
+    }
+
+    public void setMajorName(String majorName) {
+        this.majorName = majorName;
+    }
+
+    public String getMajorName1() {
+        return majorName1;
+    }
+
+    public void setMajorName1(String majorName1) {
+        this.majorName1 = majorName1;
+    }
+
+    public String getMajorName2() {
+        return majorName2;
+    }
+
+    public void setMajorName2(String majorName2) {
+        this.majorName2 = majorName2;
+    }
+
+    public String getAcceptNum() {
+        return acceptNum;
+    }
+
+    public void setAcceptNum(String acceptNum) {
+        this.acceptNum = acceptNum;
+    }
+
+    public String getRuleStr() {
+        return ruleStr;
+    }
+
+    public void setRuleStr(String ruleStr) {
+        this.ruleStr = ruleStr;
+    }
+
+    public String getReference() {
+        return reference;
+    }
+
+    public void setReference(String reference) {
+        this.reference = reference;
+    }
+
+    public String getAcceptLowest() {
+        return acceptLowest;
+    }
+
+    public void setAcceptLowest(String acceptLowest) {
+        this.acceptLowest = acceptLowest;
+    }
+
+    public String getAcceptPremise() {
+        return acceptPremise;
+    }
+
+    public void setAcceptPremise(String acceptPremise) {
+        this.acceptPremise = acceptPremise;
+    }
+
+    public String getAcceptYear() {
+        return acceptYear;
+    }
+
+    public void setAcceptYear(String acceptYear) {
+        this.acceptYear = acceptYear;
+    }
+
+    public String getCultureLowest() {
+        return cultureLowest;
+    }
+
+    public void setCultureLowest(String cultureLowest) {
+        this.cultureLowest = cultureLowest;
+    }
+
+    public String getMajorLowest() {
+        return majorLowest;
+    }
+
+    public void setMajorLowest(String majorLowest) {
+        this.majorLowest = majorLowest;
+    }
+
+    public String getSubjectType() {
+        return subjectType;
+    }
+
+    public void setSubjectType(String subjectType) {
+        this.subjectType = subjectType;
+    }
+
+    public String getSchoolPrice() {
+        return schoolPrice;
+    }
+
+    public void setSchoolPrice(String schoolPrice) {
+        this.schoolPrice = schoolPrice;
+    }
+
+    @Override
+    public String toString() {
+        return "MallSchoolExcelBo{" +
+                "batchName='" + batchName + '\'' +
+                ", schoolNumber='" + schoolNumber + '\'' +
+                ", schoolName='" + schoolName + '\'' +
+                ", majorName='" + majorName + '\'' +
+                ", majorName1='" + majorName1 + '\'' +
+                ", majorName2='" + majorName2 + '\'' +
+                ", acceptNum='" + acceptNum + '\'' +
+                ", ruleStr='" + ruleStr + '\'' +
+                ", reference='" + reference + '\'' +
+                ", acceptLowest='" + acceptLowest + '\'' +
+                ", acceptPremise='" + acceptPremise + '\'' +
+                ", acceptYear='" + acceptYear + '\'' +
+                ", cultureLowest='" + cultureLowest + '\'' +
+                ", majorLowest='" + majorLowest + '\'' +
+                ", subjectType='" + subjectType + '\'' +
+                ", schoolPrice='" + schoolPrice + '\'' +
+                '}';
+    }
+}
+

ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptPlanMapper.java

@@ -159,4 +159,5 @@ public interface MallAcceptPlanMapper
      * @return
      */
     public int batchUpdate(@Param("list")List<MallAcceptPlan> list);
+    public int insertByList(@Param("list")List<MallAcceptPlan> list);
 }

ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallSchoolMapper.java

@@ -160,6 +160,7 @@ public interface MallSchoolMapper
 
     /**志愿自主选择 获取学校信息*/
     List<SchoolMajorVO> schoolListInfoForReport(@Param("sIds") List<Long> sIds);
+    public List<MallSchool> selectAllSchoolNames(@Param("schoolNames")List<String> schoolNames);
 
     /**
      * 志愿自主选择 ,分页查询
@@ -320,6 +321,7 @@ public interface MallSchoolMapper
      */
     public List<Long> selectAllSchoolIds(@Param("batchId")Long batchId);
 
+
     /**
      * 招生稳定学校
      * @param batchId

ruoyi-system/src/main/java/com/ruoyi/mall/service/IMallSchoolService.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.mall.domain.Bo.CheckingOutParamBo;
+import com.ruoyi.mall.domain.Bo.MallSchoolExcelBo;
 import com.ruoyi.mall.domain.Bo.MatchSchoolBO;
 import com.ruoyi.mall.domain.MallSchool;
 import com.ruoyi.mall.domain.MallSchoolBatchLink;
@@ -342,4 +343,6 @@ public interface IMallSchoolService
      */
     public MallSchool selectMallSchoolBySysUserId(Long sysUserId);
 
+    String importTestSchoolRecord(List<MallSchoolExcelBo> list, boolean updateSupport);
+
 }

ruoyi-system/src/main/resources/mapper/mall/MallAcceptPlanMapper.xml

@@ -411,4 +411,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+
+    <insert id="insertByList" >
+        <if test="schoolId != null">school_id,</if>
+        INSERT INTO mall_accept_plan (
+        batch_id,batch_id,plan_year,major_id,subject_type,accept_num,
+        school_price,accept_rule_id,little_score_limit,sort,
+        create_at,update_at,del_flag,link_id
+        ) VALUES
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.schoolId},
+            #{item.batchId},
+            #{item.planYear},
+            #{item.majorId},
+            #{item.subjectType},
+            #{item.acceptNum},
+            #{item.schoolPrice},
+            #{item.acceptRuleId},
+            #{item.littleScoreLimit},
+            #{item.sort},
+            #{item.createAt},
+            #{item.updateAt},
+            #{item.delFlag},
+            #{item.linkId}
+            )
+        </foreach>
+    </insert>
 </mapper>

ruoyi-system/src/main/resources/mapper/mall/MallSchoolMapper.xml

@@ -610,6 +610,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY ms.school_id
     </select>
+    <select id="selectAllSchoolNames" resultMap="MallSchoolResult">
+        <include refid="selectMallSchoolVo"/>
+        where del_flag = '0' and school_name in
+        <foreach collection="list" item="schoolNames" open="(" separator="," close=")">
+            #{schoolNames}
+        </foreach>
+    </select>
     <!--自主选择模拟填报查询学校-->
     <select id="selectRateSchoolList" resultType="com.ruoyi.mall.domain.Vo.SchoolMajorVO">
         select