From 181c8ae3c57f882f370ae152bd5d6bc99f0fd554 Mon Sep 17 00:00:00 2001 From: whb <17803890193@163.com> Date: Wed, 26 Jun 2024 11:49:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=85=E7=AE=A1=E5=AD=A6?= =?UTF-8?q?=E4=B9=A0=E6=B5=8B=E8=AF=84=E4=B8=80=E4=B8=AAExcel=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=A4=9A=E4=B8=AA=E6=A8=A1=E5=9D=97=E9=A2=98=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/AdminExcelErrorMessage.java | 26 +++++++ .../entity/AdminExcelErrorMessageExample.java | 70 +++++++++++++++++++ .../sztzjy/digital_credit/entity/Topic.java | 4 ++ .../mapper/AdminExcelErrorMessageMapper.java | 5 +- .../service/impl/AdminBlockServiceImpl.java | 3 +- .../service/impl/AdminHashServiceIml.java | 8 ++- .../util/excel/MyExcelListener.java | 10 ++- .../mappers/AdminExcelErrorMessageMapper.xml | 32 ++++++--- 8 files changed, 141 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/sztzjy/digital_credit/entity/AdminExcelErrorMessage.java b/src/main/java/com/sztzjy/digital_credit/entity/AdminExcelErrorMessage.java index 87e8a88..72a560b 100644 --- a/src/main/java/com/sztzjy/digital_credit/entity/AdminExcelErrorMessage.java +++ b/src/main/java/com/sztzjy/digital_credit/entity/AdminExcelErrorMessage.java @@ -1,24 +1,42 @@ package com.sztzjy.digital_credit.entity; +import io.swagger.annotations.ApiModelProperty; +/** + * + * @author whb + * admin_excel_error_message + */ public class AdminExcelErrorMessage { + @ApiModelProperty("id") private Integer id; + @ApiModelProperty("题目") private String topicName; + @ApiModelProperty("题目类型") private String topicType; + @ApiModelProperty("题目ID") private String topicId; + @ApiModelProperty("状态") private String state; + @ApiModelProperty("错误信息") private String resultMsg; + @ApiModelProperty("归属模块") private String module; + @ApiModelProperty("用户ID") private String userid; + @ApiModelProperty("提交状态") private Integer submissionState; + @ApiModelProperty("所属模块") + private String ascription; + public Integer getId() { return id; } @@ -90,4 +108,12 @@ public class AdminExcelErrorMessage { public void setSubmissionState(Integer submissionState) { this.submissionState = submissionState; } + + public String getAscription() { + return ascription; + } + + public void setAscription(String ascription) { + this.ascription = ascription == null ? null : ascription.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/digital_credit/entity/AdminExcelErrorMessageExample.java b/src/main/java/com/sztzjy/digital_credit/entity/AdminExcelErrorMessageExample.java index 78b9ffc..0a12016 100644 --- a/src/main/java/com/sztzjy/digital_credit/entity/AdminExcelErrorMessageExample.java +++ b/src/main/java/com/sztzjy/digital_credit/entity/AdminExcelErrorMessageExample.java @@ -713,6 +713,76 @@ public class AdminExcelErrorMessageExample { addCriterion("submission_state not between", value1, value2, "submissionState"); return (Criteria) this; } + + public Criteria andAscriptionIsNull() { + addCriterion("ascription is null"); + return (Criteria) this; + } + + public Criteria andAscriptionIsNotNull() { + addCriterion("ascription is not null"); + return (Criteria) this; + } + + public Criteria andAscriptionEqualTo(String value) { + addCriterion("ascription =", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionNotEqualTo(String value) { + addCriterion("ascription <>", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionGreaterThan(String value) { + addCriterion("ascription >", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionGreaterThanOrEqualTo(String value) { + addCriterion("ascription >=", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionLessThan(String value) { + addCriterion("ascription <", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionLessThanOrEqualTo(String value) { + addCriterion("ascription <=", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionLike(String value) { + addCriterion("ascription like", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionNotLike(String value) { + addCriterion("ascription not like", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionIn(List values) { + addCriterion("ascription in", values, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionNotIn(List values) { + addCriterion("ascription not in", values, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionBetween(String value1, String value2) { + addCriterion("ascription between", value1, value2, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionNotBetween(String value1, String value2) { + addCriterion("ascription not between", value1, value2, "ascription"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/src/main/java/com/sztzjy/digital_credit/entity/Topic.java b/src/main/java/com/sztzjy/digital_credit/entity/Topic.java index 5135328..bb33041 100644 --- a/src/main/java/com/sztzjy/digital_credit/entity/Topic.java +++ b/src/main/java/com/sztzjy/digital_credit/entity/Topic.java @@ -17,6 +17,10 @@ public class Topic extends StuLearningAssessment { // @ExcelProperty(index = 0) + @ExcelProperty(value = "模块") + @ExcelValid(message = "【模块】不能有空数据！") + private String topicModule; + // value 指定excel中某列的标题名称 @ExcelProperty(value = "题型") @ExcelValid(message = "【题型】不能有空数据！") diff --git a/src/main/java/com/sztzjy/digital_credit/mapper/AdminExcelErrorMessageMapper.java b/src/main/java/com/sztzjy/digital_credit/mapper/AdminExcelErrorMessageMapper.java index 3682b10..ed37b3d 100644 --- a/src/main/java/com/sztzjy/digital_credit/mapper/AdminExcelErrorMessageMapper.java +++ b/src/main/java/com/sztzjy/digital_credit/mapper/AdminExcelErrorMessageMapper.java @@ -1,13 +1,10 @@ package com.sztzjy.digital_credit.mapper; - import com.sztzjy.digital_credit.entity.AdminExcelErrorMessage; import com.sztzjy.digital_credit.entity.AdminExcelErrorMessageExample; -import org.apache.ibatis.annotations.Mapper; +import java.util.List; import org.apache.ibatis.annotations.Param; -import java.util.List; -@Mapper public interface AdminExcelErrorMessageMapper { long countByExample(AdminExcelErrorMessageExample example); diff --git a/src/main/java/com/sztzjy/digital_credit/service/impl/AdminBlockServiceImpl.java b/src/main/java/com/sztzjy/digital_credit/service/impl/AdminBlockServiceImpl.java index abd0c82..f9d5dec 100644 --- a/src/main/java/com/sztzjy/digital_credit/service/impl/AdminBlockServiceImpl.java +++ b/src/main/java/com/sztzjy/digital_credit/service/impl/AdminBlockServiceImpl.java @@ -155,8 +155,7 @@ public class AdminBlockServiceImpl implements AdminBlockService { try { - EasyExcel.read(file.getInputStream(), Topic.class, new MyExcelListener(stuLearningAssessmentMapper, stuBlockProductWithBLOBs.getModule() - , stuBlockProductWithBLOBs.getUserId())).sheet().doRead(); + EasyExcel.read(file.getInputStream(), Topic.class, new MyExcelListener(stuLearningAssessmentMapper, stuBlockProductWithBLOBs.getModule(), stuBlockProductWithBLOBs.getUserId())).sheet().doRead(); } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/com/sztzjy/digital_credit/service/impl/AdminHashServiceIml.java b/src/main/java/com/sztzjy/digital_credit/service/impl/AdminHashServiceIml.java index d4329fb..2d1a61a 100644 --- a/src/main/java/com/sztzjy/digital_credit/service/impl/AdminHashServiceIml.java +++ b/src/main/java/com/sztzjy/digital_credit/service/impl/AdminHashServiceIml.java @@ -175,7 +175,13 @@ public class AdminHashServiceIml implements AdminHashService { AdminExcelErrorMessageExample messageExample = new AdminExcelErrorMessageExample(); messageExample.createCriteria().andUseridEqualTo(stuBlockProductWithBLOBs.getUserId()).andModuleEqualTo(stuBlockProductWithBLOBs.getModule()).andStateEqualTo("1"); List messages = adminExcelErrorMessageMapper.selectByExample(messageExample); - return messages; + if (messages.isEmpty()) + { + return null; + }else { + return messages; + } + } diff --git a/src/main/java/com/sztzjy/digital_credit/util/excel/MyExcelListener.java b/src/main/java/com/sztzjy/digital_credit/util/excel/MyExcelListener.java index 3263a3b..e761830 100644 --- a/src/main/java/com/sztzjy/digital_credit/util/excel/MyExcelListener.java +++ b/src/main/java/com/sztzjy/digital_credit/util/excel/MyExcelListener.java @@ -91,14 +91,20 @@ public class MyExcelListener implements ReadListener { // max = max + 1; // } for (int i = 0; i < cachedDataList.size(); i++) { + + if (cachedDataList.get(i).getTopicModule()== null) + { + break; + } + String s = UUID.randomUUID().toString().replaceAll("-", ""); cachedDataList.get(i).setTopicId(s); - cachedDataList.get(i).setModule(module); + cachedDataList.get(i).setModule(cachedDataList.get(i).getTopicModule()); cachedDataList.get(i).setLogic(1); // cachedDataList.get(i).setTopicNumber(BigDecimal.valueOf(max+i)); mapper.insertData(cachedDataList.get(i)); } - // mapper.insertBatch(cachedDataList); + //mapper.insertBatch(cachedDataList); } // 异常处理 diff --git a/src/main/resources/mappers/AdminExcelErrorMessageMapper.xml b/src/main/resources/mappers/AdminExcelErrorMessageMapper.xml index 0c3548a..1cc33b0 100644 --- a/src/main/resources/mappers/AdminExcelErrorMessageMapper.xml +++ b/src/main/resources/mappers/AdminExcelErrorMessageMapper.xml @@ -1,6 +1,6 @@ - + @@ -11,6 +11,7 @@ + @@ -71,7 +72,8 @@ - id, topic_name, topic_type, topic_id, state, result_msg, module, userId, submission_state + id, topic_name, topic_type, topic_id, state, result_msg, module, userId, submission_state, + ascription @@ -210,6 +218,9 @@ submission_state = #{record.submissionState,jdbcType=INTEGER}, + + ascription = #{record.ascription,jdbcType=VARCHAR}, + @@ -225,7 +236,8 @@ result_msg = #{record.resultMsg,jdbcType=VARCHAR}, module = #{record.module,jdbcType=VARCHAR}, userId = #{record.userid,jdbcType=VARCHAR}, - submission_state = #{record.submissionState,jdbcType=INTEGER} + submission_state = #{record.submissionState,jdbcType=INTEGER}, + ascription = #{record.ascription,jdbcType=VARCHAR} @@ -257,6 +269,9 @@ submission_state = #{submissionState,jdbcType=INTEGER}, + + ascription = #{ascription,jdbcType=VARCHAR}, + where id = #{id,jdbcType=INTEGER} @@ -269,7 +284,8 @@ result_msg = #{resultMsg,jdbcType=VARCHAR}, module = #{module,jdbcType=VARCHAR}, userId = #{userid,jdbcType=VARCHAR}, - submission_state = #{submissionState,jdbcType=INTEGER} + submission_state = #{submissionState,jdbcType=INTEGER}, + ascription = #{ascription,jdbcType=VARCHAR} where id = #{id,jdbcType=INTEGER} \ No newline at end of file