excel 上传提交

wisenergy-mapper/src/main/resources/mapper/PayRecordMapper.xml

@@ -6,10 +6,10 @@
         <id column="id" property="id"/>
         <result column="user_id" property="userId"/>
         <result column="type" property="type"/>
-        <result column="card_number" property="cardNumber"/>
+        <result column="card_id" property="cardId"/>
         <result column="money" property="money"/>
         <result column="result" property="result"/>
-        <result column="limit" property="limit"/>
+        <result column="pay_limit" property="payLimit"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
     </resultMap>
@@ -24,20 +24,20 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,type, card_id,money,result,limit, create_time,update_time
+        user_id,type, card_id,money,result,pay_limit, create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{userId},#{type},#{cardNumber},#{money},#{result},#{limit},now(),now()
+        #{userId},#{type},#{cardId},#{money},#{result},#{payLimit},now(),now()
     </sql>
 
     <sql id="updateCondition">
         <if test="userId != null">user_id = #{userId},</if>
         <if test="type != null">type =#{type},</if>
-        <if test="cardNumber != null">card_number =#{cardNumber},</if>
+        <if test="cardId != null">card_id =#{cardId},</if>
         <if test="money != null">money =#{money},</if>
         <if test="result != null">result =#{result},</if>
-        <if test="limit != null">limit =#{limit},</if>
+        <if test="payLimit != null">pay_limit =#{payLimit},</if>
         update_time =now()
     </sql>
 
@@ -45,10 +45,10 @@
         <if test="id != null">id = #{id}</if>
         <if test="userId != null">and user_id = #{userId}</if>
         <if test="type != null">and type =#{type}</if>
-        <if test="cardNumber != null">and card_number =#{cardNumber}</if>
+        <if test="cardId != null">and card_id =#{cardId}</if>
         <if test="money != null">and money =#{money}</if>
         <if test="result != null">and result =#{result}</if>
-        <if test="limit != null">and limit =#{limit}</if>
+        <if test="payLimit != null">and pay_limit =#{payLimit}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
     </sql>
@@ -62,15 +62,16 @@
         )
     </insert>
     <select id="getList" resultType="cn.wisenergy.model.vo.PayRecordShowVo">
-        select id as recordId,type,result,limit,create_time as payTime
+        select
+        <include refid="cols_all"/>
         from
         <include refid="table"/>
         <where>
             <if test="userId != null">
                 user_id=#{userId}
             </if>
-            limit #{startNum},#{endNum}
             order by create_time desc
+            limit #{startNum},#{endNum}
         </where>
     </select>
 

wisenergy-mapper/src/main/resources/mapper/SchemeMapper.xml

@@ -47,7 +47,8 @@
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
     </sql>
 
-    <insert id="add" parameterType="cn.wisenergy.model.app.SchemeInfo" keyProperty="id" useGeneratedKeys="true">
+    <insert id="add" parameterType="cn.wisenergy.model.app.SchemeInfo" keyProperty="id"
+    keyColumn="id"  useGeneratedKeys="true">
         insert into
         <include refid="table"/>
         (<include refid="cols_exclude_id"/>)

wisenergy-model/src/main/java/cn/wisenergy/model/app/PayRecord.java

@@ -56,7 +56,7 @@ public class PayRecord implements Serializable {
      * 充值次数
      */
     @ApiModelProperty(value = "充值次数",name = "limit")
-    private Integer limit;
+    private Integer payLimit;
 
     /**
      * 创建时间

wisenergy-model/src/main/java/cn/wisenergy/model/app/SchemeInfo.java

@@ -4,6 +4,7 @@ import cn.wisenergy.model.common.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -11,8 +12,9 @@ import java.util.Date;
 /**
  * @author 86187
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-@ApiModel(value = "SchemeInnfo")
+@ApiModel(value = "SchemeInfo")
 public class SchemeInfo extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 7020644673356401949L;
     /**

wisenergy-model/src/main/java/cn/wisenergy/model/app/Volunteer.java

@@ -92,8 +92,8 @@ public class Volunteer extends BaseEntity implements Serializable {
     /**
      * 计划投档数
      */
-    @ApiModelProperty(value = "计划投档数", name = "castArchivesNum")
-    @ExcelProperty(value = "计划投档数")
+    @ApiModelProperty(value = "投档计划数", name = "castArchivesNum")
+    @ExcelProperty(value = "投档计划数")
     private Integer castArchivesNum;
 
     /**

wisenergy-service/src/main/java/cn/wisenergy/service/app/VolunteerService.java

 package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.SchemeInfo;
 import cn.wisenergy.model.app.Volunteer;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
@@ -38,4 +39,6 @@ public interface VolunteerService extends IService<Volunteer> {
      * @throws IOException 异常
      */
     void ceshi(MultipartFile file, HttpServletResponse response) throws IOException;
+
+    R<SchemeInfo> add(SchemeInfo schemeInfo);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/VolunteerServiceImpl.java

@@ -36,6 +36,9 @@ public class VolunteerServiceImpl extends ServiceImpl<VolunteerMapper, Volunteer
     @Autowired
     private SchemeMapper schemeMapper;
 
+    @Autowired
+    private VolunteerService volunteerService;
+
     @Override
     public R<Boolean> batchAdd(List<Volunteer> list) {
         return null;
@@ -52,15 +55,20 @@ public class VolunteerServiceImpl extends ServiceImpl<VolunteerMapper, Volunteer
         if (!valid) {
             throw new BaseException("请传入Excel文件");
         }
+        VolunteerListener excelListener = new VolunteerListener();
 
-        //1、保存方案信息
+        //2.读取数据进行入库操作
+        EasyExcel.read(file.getInputStream(), Volunteer.class, new VolunteerListener()).sheet().doRead();
+        List<Volunteer> list = excelListener.getList();
+
+        //3、保存方案和志愿信息
         SchemeInfo schemeInfo = new SchemeInfo();
         schemeInfo.setSchemeName(schemeName);
         schemeInfo.setType(type);
         schemeInfo.setUploadTime(new Date());
         schemeInfo.setIsDelete(0);
 
-        saveSchemeAndVolunteer(schemeInfo, file);
+        saveSchemeAndVolunteer(schemeInfo, list);
     }
 
     @Override
@@ -69,33 +77,51 @@ public class VolunteerServiceImpl extends ServiceImpl<VolunteerMapper, Volunteer
             throw new BaseException("操作错误");
         }
 
+        VolunteerListener excelListener = new VolunteerListener();
+
         //判断文件类型=
         boolean valid = this.validContentType(file.getOriginalFilename());
         if (!valid) {
             throw new BaseException("请传入Excel文件");
         }
         //2.读取数据进行入库操作
-        EasyExcel.read(file.getInputStream(), Volunteer.class, new VolunteerListener(this)).sheet().doRead();
+        EasyExcel.read(file.getInputStream(), Volunteer.class, excelListener).sheet().doRead();
+        List<Volunteer> sult = excelListener.getList();
+        log.info("返回的excel集合：" + sult);
+        log.info("返回的excel集合：" + sult);
+        for (Volunteer volunteer : sult) {
+
+        }
+    }
+
+    @Override
+    public R<SchemeInfo> add(SchemeInfo schemeInfo) {
+        int count = schemeMapper.add(schemeInfo);
+        log.info("返回对象：" + schemeInfo);
+
+        int id = schemeInfo.getId();
+        log.info("主键id:" + id);
+        return R.ok(schemeInfo);
     }
 
     /**
      * 保存方案和志愿信息
      *
      * @param schemeInfo 方案信息
-     * @param file       志愿文件
-     * @throws IOException 异常
+     * @param list       志愿信息
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveSchemeAndVolunteer(SchemeInfo schemeInfo, MultipartFile file) throws IOException {
-
+    public void saveSchemeAndVolunteer(SchemeInfo schemeInfo, List<Volunteer> list) {
         //1、保存方案信息
-        int count = schemeMapper.add(schemeInfo);
+        int count = schemeMapper.insert(schemeInfo);
         if (count == 0) {
             throw new RuntimeException("保存方案信息失败!");
         }
 
-        //2.读取数据进行入库操作
-        EasyExcel.read(file.getInputStream(), Volunteer.class, new VolunteerListener(this)).sheet().doRead();
+        //保存志愿信息
+        for (Volunteer volunteer : list) {
+
+        }
     }
 
     /**

wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerListener.java

@@ -15,14 +15,13 @@ import java.util.stream.Collectors;
 
 /**
  * Excel批量添加社区居民  监听器
+ *
+ * @author 86187
  */
 @Slf4j
 public class VolunteerListener extends AnalysisEventListener<Volunteer> {
 
-    private List<Volunteer> list;
-
-    private VolunteerService volunteerService;
-
+    private List<Volunteer> list=new ArrayList<>();
     private final int batch = 50000;
 
     /**
@@ -36,11 +35,6 @@ public class VolunteerListener extends AnalysisEventListener<Volunteer> {
     private boolean isCorrectFormat = true;
 
 
-    public VolunteerListener(VolunteerService volunteerService) {
-        this.volunteerService = volunteerService;
-        list = new ArrayList<>();
-    }
-
     /**
      * 这个每一条数据解析都会来调用  ==
      *
@@ -56,6 +50,9 @@ public class VolunteerListener extends AnalysisEventListener<Volunteer> {
         log.info("解析到一条志愿数据>>>>>>>>>>：{}", volunteer);
         //此处做校验  本次没有校验
         if (volunteer != null) {
+            volunteer.setIsDelete(0);
+            volunteer.setCreateTime(new Date());
+            volunteer.setUpdateTime(new Date());
             if (StringUtils.isEmpty(volunteer.getMajorName())) {
                 throw new RuntimeException("专业不能为空！");
             }
@@ -99,17 +96,6 @@ public class VolunteerListener extends AnalysisEventListener<Volunteer> {
 
             list.add(volunteer);
         }
-
-        //每500条插入一次数据库
-        if (list.size() >= batch) {
-            //判断数据库是否已有手机号的数据
-            log.info("invoke批量插入志愿数据，条数为>>>>>>>>>>：{}", list.size());
-            if (list.size() > 0) {
-                volunteerService.saveBatch(list);
-            }
-            //保存后清除，防止大量数据导致内存耗尽
-            list.clear();
-        }
     }
 
     /**
@@ -119,16 +105,28 @@ public class VolunteerListener extends AnalysisEventListener<Volunteer> {
      */
     @Override
     public void doAfterAllAnalysed(AnalysisContext analysisContext) {
-        log.info("doAfterAllAnalysed解析玩一个志愿sheet工作表>>>>>>>>>>");
-        //如果集合不为空
-        if (!CollectionUtils.isEmpty(list)) {
-            log.info("批量插入志愿数据，条数为>>>>>>>>>>：{}", list.size());
-            if (list.size() > 0) {
-                volunteerService.saveBatch(list);
-            }
-        }
+//        log.info("doAfterAllAnalysed解析玩一个志愿sheet工作表>>>>>>>>>>");
+//        //如果集合不为空
+//        if (!CollectionUtils.isEmpty(list)) {
+//            log.info("批量插入志愿数据，条数为>>>>>>>>>>：{}", list.size());
+//            if (list.size() > 0) {
+//                volunteerService.saveBatch(list);
+//            }
+//        }
+    }
+
+
+    public List<Volunteer> getList() {
+        List<Volunteer> result = new ArrayList<>();
+        result.addAll(list);
+        return result;
     }
 
+    public void setList(List<Volunteer> list) {
+        this.list = list;
+    }
+
+
     /**
      * 校验导入模板表头是否正确
      *

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeController.java

@@ -2,13 +2,11 @@ package cn.wisenergy.web.admin.controller.app;
 
 import cn.wisenergy.common.expection.BaseException;
 import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.SchemeQueryRecord;
+import cn.wisenergy.model.app.SchemeInfo;
 import cn.wisenergy.model.vo.SchemeQueryVo;
-import cn.wisenergy.model.vo.SchemeRecordQueryVo;
 import cn.wisenergy.model.vo.VolunteerVo;
 import cn.wisenergy.service.app.SchemeService;
 import cn.wisenergy.service.app.VolunteerService;
-import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -22,6 +20,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
+ * @author 86187
  * @ Description: PC-方案
  * @ Author     : 86187
  * @ Date       : 2021/1/14 10:50
@@ -71,8 +70,18 @@ public class SchemeController {
             throw new BaseException("操作错误");
         }
 
-        volunteerService.ceshi(file,  response);
+        volunteerService.ceshi(file, response);
         return R.ok("添加成功");
     }
 
+    @ApiOperation(value = "测试主键自增", notes = "测试主键自增")
+    @ApiImplicitParam(name = "schemeInfo", value = "信息", dataType = "SchemeInfo")
+    @PostMapping("/add")
+    public R<SchemeInfo> add(@RequestBody SchemeInfo schemeInfo) {
+
+        R<SchemeInfo> scheme = volunteerService.add(schemeInfo);
+        log.info("scheme:" + scheme);
+        return scheme;
+    }
+
 }