diff --git a/ruoyi-admin/src/main/java/com/ruoyi/mall/controller/MallSchoolController.java b/ruoyi-admin/src/main/java/com/ruoyi/mall/controller/MallSchoolController.java index 805cafcd203e9535a7ba02bf2a3864871b8c7779..1d3130b529b70bb6d7914a7dc7b8e66c67354975 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/mall/controller/MallSchoolController.java +++ b/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 util = new ExcelUtil(MallSchoolExcelBo.class); + List list = util.importExcel(file.getInputStream()); + return AjaxResult.success(mallSchoolService.importTestSchoolRecord(list, updateSupport)); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ApiChatNewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ApiChatNewController.java index b976180f6c8963060c39d23506b53ddf0df5682b..ecbde7153ca6e3d57062f13e33bdb9e0d587b6c3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ApiChatNewController.java +++ b/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); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/domain/Bo/MallSchoolExcelBo.java b/ruoyi-system/src/main/java/com/ruoyi/mall/domain/Bo/MallSchoolExcelBo.java new file mode 100644 index 0000000000000000000000000000000000000000..6f847e50771f53e592a42d3cf41432e555f660c0 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/domain/Bo/MallSchoolExcelBo.java @@ -0,0 +1,218 @@ +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 + '\'' + + '}'; + } +} + diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptPlanMapper.java b/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptPlanMapper.java index 68d8f86828b5c541bcf46b16acfcb6d610db1b8b..d217964a0fdbbf6f7e88bd9d0ee4ffa9194d93b9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptPlanMapper.java +++ b/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 list); + public int insertByList(@Param("list")List list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallSchoolMapper.java b/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallSchoolMapper.java index 749618262675f58df3f61b72a8339fc8a645f722..053ef2578d8b79e6af8b503dfb072c9314e275d4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallSchoolMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallSchoolMapper.java @@ -160,6 +160,7 @@ public interface MallSchoolMapper /**志愿自主选择 获取学校信息*/ List schoolListInfoForReport(@Param("sIds") List sIds); + public List selectAllSchoolNames(@Param("schoolNames")List schoolNames); /** * 志愿自主选择 ,分页查询 @@ -320,6 +321,7 @@ public interface MallSchoolMapper */ public List selectAllSchoolIds(@Param("batchId")Long batchId); + /** * 招生稳定学校 * @param batchId diff --git a/ruoyi-system/src/main/java/com/ruoyi/mall/service/IMallSchoolService.java b/ruoyi-system/src/main/java/com/ruoyi/mall/service/IMallSchoolService.java index 5e79bd7341e5567380e279ebf633fce432a9ceb1..22f61e7dbbb991203011d52dcfb3296fd9e984fb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/mall/service/IMallSchoolService.java +++ b/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 list, boolean updateSupport); + } diff --git a/ruoyi-system/src/main/resources/mapper/mall/MallAcceptPlanMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/MallAcceptPlanMapper.xml index 90fac0ccc58eae570ca36944f4fa158d7eb3a179..64528e4528d04ac3fac057f2684f2f9c474e5bf5 100644 --- a/ruoyi-system/src/main/resources/mapper/mall/MallAcceptPlanMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/mall/MallAcceptPlanMapper.xml @@ -411,4 +411,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + school_id, + 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 + + ( + #{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} + ) + + diff --git a/ruoyi-system/src/main/resources/mapper/mall/MallSchoolMapper.xml b/ruoyi-system/src/main/resources/mapper/mall/MallSchoolMapper.xml index 6fee7c89fe169dee6cccbd2219291de8f5209d80..e1ec01d7ff9511b01a2932e92a0be09d9099542f 100644 --- a/ruoyi-system/src/main/resources/mapper/mall/MallSchoolMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/mall/MallSchoolMapper.xml @@ -610,6 +610,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY ms.school_id +