用户身份信息

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

@@ -7,13 +7,12 @@ import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
 import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
 import com.github.wxiaoqi.security.admin.mapper.AppUserPositionTempMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserPositionTempVo;
-import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -60,7 +59,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         }
         String phone = appUserPositionTempDTO.getPhone();
         Integer id = appUserPositionTempDTO.getId() == null ? 0 : appUserPositionTempDTO.getId();
-        Example example = new Example(AppUserPositionTempBiz.class);
+        Example example = new Example(AppUserPositionTemp.class);
         example.createCriteria().andEqualTo("phone", phone).andNotEqualTo("id", id).andEqualTo("isDel", 0);
         List<AppUserPositionTemp> list = selectByExample(example);
         if (list.size() > 0) {
@@ -76,10 +75,12 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         userPositionTemp.setUserId(userId);
         //编辑
         if (id == null || id == 0) {
-            updateSelectiveById(userPositionTemp);
-        } else { //保存
-            userPositionTemp.setCrtTime(Instant.now().toEpochMilli());
             insertSelective(userPositionTemp);
+        } else {
+            updateSelectiveById(userPositionTemp);
+        }
+        if (userId!=0){
+            detailBiz.updateUserPositionByUserId(userId,appUserPositionTempDTO.getPositionId());
         }
         return ObjectRestResponse.succ();
     }
@@ -138,8 +139,8 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return dataVO;
     }
 
-    public List<Map<String, Object>> importUserPostion(List<String[]> userPostionData) {
-
+    public Map<String,Object> importUserPostion(List<String[]> userPostionData) {
+        Map<String,Object> result = new HashMap<>(2);
         List<Map<String, Object>> errorResult = Lists.newArrayList();
         Map<String, Object> errorResultMap;
 
@@ -149,7 +150,13 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             String[] data = userPostionData.get(i);
             String name = data[0];
             String phone = data[1];
+            if (StringUtils.isEmpty(phone)){
+                throw new BaseException("手机号为空");
+            }
             String postionName = data[2];
+            if (StringUtils.isEmpty(postionName)){
+                throw new BaseException("身份为空");
+            }
             Integer postionId = null;
             try {
                 //根据手机号查询userId
@@ -165,19 +172,29 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 appUserPositionTemp.setName(name);
                 appUserPositionTemp.setPositionId(postionId);
                 appUserPositionTemp.setPhone(phone);
+                appUserPositionTemp.setUserId(0);
                 if (Objects.nonNull(userLogin)) {
                     //更新用户身份信息
                     detailBiz.updateUserPositionByUserId(userLogin.getId(), postionId);
+                    appUserPositionTemp.setUserId(userLogin.getId());
                 }
-                mapper.insertSelective(appUserPositionTemp);
-            } catch (Exception ex) {
+                mapper.insertWithIgnoreRepeat(appUserPositionTemp);
+            } catch (BaseException ex) {
+                errorResultMap = new HashMap<>(1);
+                errorResultMap.put("num", i);
+                errorResultMap.put("msg",ex.getMessage());
+                errorResult.add(errorResultMap);
+            }catch (Exception ex){
                 errorResultMap = new HashMap<>(1);
                 errorResultMap.put("num", i);
-                errorResultMap.put("data", Arrays.toString(data));
+                errorResultMap.put("msg","数据"+Arrays.toString(data)+"保存失败");
                 errorResult.add(errorResultMap);
             }
         }
-        return errorResult;
+         result.put("success",userPostionData.size()-errorResult.size());
+         result.put("error",errorResult.size());
+         result.put("data",errorResult);
+        return result;
     }
 
     private enum DataStatus {

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

 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;
-
 /**
  * 用户身份职位表
  * 
@@ -15,7 +12,7 @@ import java.util.List;
  * @email 18178966185@163.com
  * @date 2019-07-09 10:00:42
  */
-public interface AppUserPositionMapper extends Mapper<AppUserPosition>, IdListMapper {
+public interface AppUserPositionMapper extends Mapper<AppUserPosition>, IdListMapper<AppUserPosition,Integer> {
 
 
     AppUserPosition getExtractByUserId(@Param("userId")Integer userId);

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

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.mapper;
 
 
 import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
+import org.apache.ibatis.annotations.Insert;
 import tk.mybatis.mapper.common.Mapper;
 
 /**
@@ -14,4 +15,6 @@ import tk.mybatis.mapper.common.Mapper;
 public interface AppUserPositionTempMapper extends Mapper<AppUserPositionTemp> {
 
 
+    @Insert("INSERT IGNORE INTO `app_user_position_temp`(`user_id`,`phone`,`name`,`position_id`,`crt_time`)VALUES(#{userId},#{phone},#{name},#{positionId},#{crtTime})")
+    void insertWithIgnoreRepeat(AppUserPositionTemp appUserPositionTemp);
 }

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

@@ -14,11 +14,8 @@ 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
@@ -65,13 +62,13 @@ public class AppUserPositionController {
      * @return
      */
     @PostMapping("/excel/import")
-    public ObjectRestResponse<Void> importUserPostion(@RequestPart("file") MultipartFile userPostionExcel) {
+    public ObjectRestResponse<Map<String,Object>> importUserPostion(@RequestPart("file") MultipartFile userPostionExcel) {
         List<String[]> userPostionData = ExcelImport.getExcelData(userPostionExcel);
-        if (userPostionData.size() < 1) {
+        if (userPostionData.size() < 2) {
             return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
         }
         userPostionData.remove(0);
-        List<Map<String, Object>> result = appUserPositionTempBiz.importUserPostion(userPostionData);
+        Map<String,Object> result = appUserPositionTempBiz.importUserPostion(userPostionData);
         return ObjectRestResponse.succ(result);
     }