用户身份信息

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempFindDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/23 18:36
+ */
+@Data
+public class AppUserPositionTempFindDTO extends PageParam {
+     private String phone;
+     private String name;
+     private Integer status;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionTemp.java

@@ -43,9 +43,9 @@ public class AppUserPositionTemp implements Serializable {
 	@ApiModelProperty(value = "职位id")
     private Integer positionId;
 
-	@Column(name = "position_name")
+	@Column(name = "name")
 	@ApiModelProperty(value = "姓名")
-	private Integer positionName;
+	private String name;
 
 
     @Column(name = "crt_time")

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserPositionTempVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/9/23 18:38
+ */
+@Builder(toBuilder = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AppUserPositionTempVo {
+
+    private Integer id;
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "职位名")
+    private String positionName;
+
+    @ApiModelProperty(value = "数据状态 1：已核销 2：未核销")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionBiz.java

@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.github.wxiaoqi.security.admin.dto.UserPostionDTO;
 import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
 import org.apache.commons.collections.CollectionUtils;
+import org.jsoup.select.Collector;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -11,9 +12,10 @@ import com.github.wxiaoqi.security.admin.mapper.AppUserPositionMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 用户身份职位表
@@ -23,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * @date 2019-07-09 10:00:42
  */
 @Transactional
-@Service
+@Service("appUserPositionBiz")
 public class AppUserPositionBiz extends BaseBiz<AppUserPositionMapper,AppUserPosition> {
 
 
@@ -58,4 +60,19 @@ public class AppUserPositionBiz extends BaseBiz<AppUserPositionMapper,AppUserPos
         }
         return counter.get();
     }
+
+    public Map<Integer, AppUserPosition> findPostionIdAndPostionMapByIds(List<Integer> postionIds) {
+        Map<Integer,AppUserPosition> postionMap = new HashMap<>();
+        List<AppUserPosition> data= mapper.selectByIdList(postionIds);
+        if(CollectionUtils.isEmpty(data)){
+            return postionMap;
+        }
+        postionMap = data.stream().collect(Collectors.toMap(AppUserPosition::getId, Function.identity()));
+        return postionMap;
+    }
+
+    public Map<Integer, String> findPostionIdAndNameMap() {
+        List<AppUserPosition> postions = selectListAll();
+        return postions.stream().collect(Collectors.toMap(AppUserPosition::getId,AppUserPosition::getName));
+    }
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserPositionMapper.java

@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.admin.mapper;
 import com.github.wxiaoqi.security.admin.dto.UserPostionDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
 import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.additional.idlist.IdListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -14,7 +15,7 @@ import java.util.List;
  * @email 18178966185@163.com
  * @date 2019-07-09 10:00:42
  */
-public interface AppUserPositionMapper extends Mapper<AppUserPosition> {
+public interface AppUserPositionMapper extends Mapper<AppUserPosition>, IdListMapper {
 
 
     AppUserPosition getExtractByUserId(@Param("userId")Integer userId);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java

@@ -3,15 +3,22 @@ package com.github.wxiaoqi.security.admin.rest.admin;
 import com.github.wxiaoqi.security.admin.biz.AppUserPositionBiz;
 import com.github.wxiaoqi.security.admin.biz.AppUserPositionTempBiz;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
+import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempFindDTO;
 import com.github.wxiaoqi.security.admin.dto.UserPostionDTO;
+import com.github.wxiaoqi.security.admin.vo.AppUserPositionTempVo;
 import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.excel.ExcelImport;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author libin
@@ -54,12 +61,18 @@ public class AppUserPositionController {
 
     /**
      * 批量导入
-     * @param multipartFile
+     * @param userPostionExcel
      * @return
      */
     @PostMapping("/excel/import")
-    public ObjectRestResponse<Void> importUserPostion(@RequestPart("file") MultipartFile multipartFile) {
-        return ObjectRestResponse.succ();
+    public ObjectRestResponse<Void> importUserPostion(@RequestPart("file") MultipartFile userPostionExcel) {
+        List<String[]> userPostionData = ExcelImport.getExcelData(userPostionExcel);
+        if (userPostionData.size() < 1) {
+            return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
+        }
+        userPostionData.remove(0);
+        List<Map<String, Object>> result = appUserPositionTempBiz.importUserPostion(userPostionData);
+        return ObjectRestResponse.succ(result);
     }
 
     /**
@@ -73,4 +86,10 @@ public class AppUserPositionController {
         return ObjectRestResponse.succ();
     }
 
+    @PostMapping("/page")
+    public ObjectRestResponse<PageDataVO<AppUserPositionTempVo>> findWithPage(@RequestBody AppUserPositionTempFindDTO appUserPositionTempFindDTO){
+       PageDataVO<AppUserPositionTempVo>  dataVO =  appUserPositionTempBiz.findWithPage(appUserPositionTempFindDTO);
+       return ObjectRestResponse.succ(dataVO);
+    }
+
 }