Browse Source

导入用户

he2802 3 năm trước cách đây
mục cha
commit
4b73c7b1f0

+ 16 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -6,7 +6,10 @@ import java.util.*;
 
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import com.zhongzheng.common.core.domain.entity.SysUser;
+import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.alisms.service.IAliSmsService;
+import com.zhongzheng.modules.course.vo.CourseSectionImport;
 import com.zhongzheng.modules.grade.vo.ClassPeriodStudentExportVo;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.service.IUserService;
@@ -31,6 +34,7 @@ import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 客户端用户Controller
@@ -139,4 +143,16 @@ public class UserController extends BaseController {
     }
 
 
+    @ApiOperation("导入用户")
+    @Log(title = "导入用户", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('system:section:import')")
+    @PostMapping("/importData")
+    public AjaxResult<Map<String,Object>> importData(MultipartFile file, String importNo) throws Exception
+    {
+        ExcelUtil<UserImportAddBo> util = new ExcelUtil<UserImportAddBo>(UserImportAddBo.class);
+        List<UserImportAddBo> userList = util.importExcel(file.getInputStream());
+        Collections.reverse(userList);
+        Map<String, Object> rs = iUserService.importUser(userList);
+        return AjaxResult.success(rs);
+    }
 }

+ 4 - 1
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -727,7 +727,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return baseMapper.orderSum(userId);
     }
 
-
+    @Override
+    public Map<String, Object> importUser(List<UserImportAddBo> list) {
+        return null;
+    }
 
 
     /**

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserAddBo.java

@@ -144,4 +144,7 @@ public class UserAddBo {
     @ApiModelProperty("1在职 0离职")
     private Long jobStatus;
 
+    /** 导入编号 */
+    @ApiModelProperty("导入编号")
+    private String importNo;
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserEditBo.java

@@ -184,4 +184,8 @@ public class UserEditBo {
     @ApiModelProperty("1在职 0离职")
     private Long jobStatus;
 
+    /** 导入编号 */
+    @ApiModelProperty("导入编号")
+    private String importNo;
+
 }

+ 36 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserImportAddBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.user.bo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 客户端用户添加对象 user
+ *
+ * @author ruoyi
+ * @date 2021-06-08
+ */
+@Data
+@ApiModel("客户端导入用户添加对象")
+public class UserImportAddBo {
+
+    /** 真实姓名 */
+    @Excel(name = "*学员姓名")
+    @ApiModelProperty("真实姓名")
+    private String realname;
+    /** 身份证号 */
+    @Excel(name = "*学员身份证号码")
+    @ApiModelProperty("身份证号")
+    private String idCard;
+    /** 手机号码 */
+    @Excel(name = "*手机号码")
+    @ApiModelProperty("手机号码")
+    private String telphone;
+
+    @Excel(name = "科目")
+    @ApiModelProperty("科目,多个,拼接")
+    private String subjectNames;
+
+}

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserQueryBo.java

@@ -145,4 +145,8 @@ public class UserQueryBo extends BaseEntity {
 	/** 是否返回订单数量 */
 	@ApiModelProperty("是否返回订单数量 1带 0不带")
 	private Long getOrderNum;
+
+	/** 导入编号 */
+	@ApiModelProperty("导入编号")
+	private String importNo;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -190,4 +190,6 @@ private static final long serialVersionUID=1L;
     @TableField(exist = false)
     private Long goodsBankNum;
 
+    /** 导入编号 */
+    private String importNo;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -6,6 +6,7 @@ import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.vo.RanKingUser;
 import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
+import com.zhongzheng.modules.user.vo.UserSubscribeImport;
 import com.zhongzheng.modules.user.vo.UserVo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -102,5 +103,6 @@ public interface IUserService extends IService<User> {
 
 	Long orderSum(Long userId);
 
+	Map<String, Object> importUser(List<UserImportAddBo> list);
 
 }

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -240,6 +240,11 @@ public class UserVo {
 	@ApiModelProperty("商品题库数")
 	private Long goodsBankNum;
 
+	/** 导入编号 */
+	@Excel(name = "导入编号")
+	@ApiModelProperty("导入编号")
+	private String importNo;
+
 	/** 1在职 0离职 */
 	@Excel(name = "班級")
 	@ApiModelProperty("班級")

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="password" column="password"/>
         <result property="goodsCourseNum" column="goods_course_num"/>
         <result property="goodsBankNum" column="goods_bank_num"/>
+        <result property="importNo" column="import_no"/>
     </resultMap>