Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/feign/IUserService.java

@@ -29,7 +29,7 @@ public interface IUserService {
     AppUserInfo AppValidate(@RequestBody JwtAuthenticationRequest authenticationRequest);
 
     @RequestMapping(value = "/api/app/user/sendsms", method = RequestMethod.POST)
-    public JSONObject sendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList",defaultValue = "")String pointList);
+    public JSONObject sendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList", defaultValue = "")String pointList);
     @RequestMapping(value = "/api/app/user/register", method = RequestMethod.POST)
     public JSONObject register(   @RequestParam(value="username",defaultValue="")String  username,
                                   @RequestParam(value="mobilecode",defaultValue="")String mobilecode,

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

@@ -9,9 +9,11 @@ import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
 import com.github.wxiaoqi.security.admin.mapper.AppShareholderDetailMapper;
 import com.github.wxiaoqi.security.admin.vo.AppShareholderDetailVo;
 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.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
@@ -263,9 +265,9 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
      * 批量导入
      */
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public int importShareholder(List<String[]> shareholderData, Integer operatorId) {
+    public Map<String, Object> importShareholder(List<String[]> shareholderData, Integer operatorId) {
         List<AppShareholderDetail> appShareholderDetail = new ArrayList<>();
-        int size = wrapperData(shareholderData, operatorId);
+        Map<String, Object> mapResult = wrapperData(shareholderData, operatorId);
 
    /*int threadNums = shareholderData.size() / BORDER_NUM == 0 ? 1 : shareholderData.size() / BORDER_NUM;
         CountDownLatch latch = new CountDownLatch(threadNums);
@@ -283,26 +285,48 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                 throw new BaseException("导入数据失败");
             }
         }*/
-        return size;
+        return mapResult;
     }
 
     /**
      * @param subResultDate
      */
-    private int wrapperData(List<String[]> subResultDate, Integer operatorId) {
+    private Map<String, Object> wrapperData(List<String[]> subResultDate, Integer operatorId) {
+        Map<String, Object> result = new HashMap<>(1);
+        Map<String, Object> errorResultMap;
+        List<Map<String, Object>> errorResult = Lists.newArrayList();
+        //     Map<String, Object> exist;
+        List<Map<String, Object>> existResult = Lists.newArrayList();
         int size = subResultDate.get(0).length;
         int total = 0;
+        int exist = 0;
+        int error = 0;
         subResultDate.remove(0);
         for (String[] data : subResultDate) {
+            error++;
             data = Arrays.copyOf(data, size);
             String name = data[0];
             String phone = data[1];
             String companyName = data[2];
             String time = data[3];
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-            if (StringUtils.isNotBlank(name) && StringUtils.isNotBlank(phone) && StringUtils.isNotBlank(companyName)) {
             try {
-                    total++;
+                if (StringUtils.isBlank(phone)) {
+                    throw new BaseException("手机号为空");
+                }
+                if (StringUtils.isBlank(companyName)) {
+                    throw new BaseException("股东入股公司为空");
+                }
+                if (StringUtils.isBlank(name)) {
+                    throw new BaseException("股东名称为空");
+                }
+                if (StringUtils.isNotBlank(name)) {
+                    name.replaceAll(" ", "");
+                }
+                if (StringUtils.isNotBlank(companyName)) {
+                    name.replaceAll(" ", "");
+                }
+
                 Date relTime = StringUtils.isNoneBlank(time) ? formatter.parse(time) : null;
                 BranchCompany branchCompany = vehicleFeign.companyId(companyName);
                 if (branchCompany != null) {
@@ -322,6 +346,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                                 detailBiz.updateUserPositionByUserId(userId, positionId);
                             }
                         }
+                        exist++;
                         appShareholderDetailDTO.setUserId(userId);
                         appShareholderDetailDTO.setPositionId(positionId);
                         appShareholderDetailDTO.setCompanyId(branchCompany.getId());
@@ -333,6 +358,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                         appShareholderDetailDTO.setCrtTime(System.currentTimeMillis());
                         AppShareholderDetail appShareholderDetail = new AppShareholderDetail();
                         BeanUtils.copyProperties(appShareholderDetailDTO, appShareholderDetail);
+
                         //判断股东表是否有数据，有则不插入
                         Example example = new Example(AppShareholderDetail.class);
                         Example.Criteria criteria = example.createCriteria();
@@ -343,6 +369,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                         }
                         List<AppShareholderDetail> listappShareholderDetai = selectByExample(example);
                         if (listappShareholderDetai.size() == 0) {
+                            total++;
                             Integer id = appShareholderDetailDTO.getId() == null ? 0 : appShareholderDetailDTO.getId();
                             BeanUtils.copyProperties(appShareholderDetailDTO, appShareholderDetail);
                             appShareholderDetail.setPositionId(positionId);
@@ -353,11 +380,37 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                         }
                     }
                 }
-                } catch (ParseException e) {
-                    log.error("股东导入失败：【{}】", e);
+            } catch (BaseException ex) {
+                errorResultMap = new HashMap<>(1);
+                errorResultMap.put("num", error);
+                errorResultMap.put("msg", ex.getMessage());
+                errorResult.add(errorResultMap);
+            } catch (ArrayIndexOutOfBoundsException ex) {
+                errorResultMap = new HashMap<>(1);
+                errorResultMap.put("num", error);
+                String msg = "";
+                if (StringUtils.isEmpty(phone)) {
+                    msg += "手机号码缺失";
+                }
+                if (StringUtils.isEmpty(companyName)) {
+                    msg += ",股东入股公司确实";
+                }
+                if (StringUtils.isEmpty(name)) {
+                    msg += "股东姓名缺失";
                 }
+                errorResultMap.put("msg", msg);
+                errorResult.add(errorResultMap);
+            } catch (Exception ex) {
+                errorResultMap = new HashMap<>(1);
+                errorResultMap.put("num", error);
+                errorResultMap.put("msg", "数据" + Arrays.toString(data) + "保存失败");
+                errorResult.add(errorResultMap);
             }
         }
-        return total;
+        result.put("success", total);
+        result.put("error", errorResult.size());
+        result.put("data", errorResult);
+        result.put("exist", exist - total);
+        return result;
     }
 }

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

@@ -111,7 +111,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
 
     public void  save(AppUserAlipay appUserAlipay) {
         Example example=new Example(AppUserAlipay.class);
-        example.createCriteria().andEqualTo("userId", appUserAlipay.getUserId()).andEqualTo("isDel",0);
+        example.createCriteria().andEqualTo("userId", appUserAlipay.getUserId()).andEqualTo("isDel",0).andEqualTo("txAlipay", appUserAlipay.getTxAlipay());
         example.setOrderByClause("is_default desc");
         AppUserAlipay oldValue = mapper.selectOneByExample(example);
         if (oldValue != null) {

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

@@ -105,8 +105,11 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         userPositionTemp.setCompanyName(companyName);
         //编辑
         if (id == null || id == 0) {
-            insertSelective(userPositionTemp);
+            userPositionTemp.setIsQuit(0);
+            int ids = addUserFindId(userPositionTemp).getId();
+            appUserPositionTempDTO.setId(ids);
             //记录表插入
+            //  appUserPositionTempDTO.setId();
             appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempDTO, updUserId);
         } else {
             updateSelectiveById(userPositionTemp);
@@ -194,7 +197,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return dataVO;
     }
 
-    public Map<String, Object> importUserPostion(List<String[]> userPostionData,Integer operatorId) {
+    public Map<String, Object> importUserPostion(List<String[]> userPostionData, Integer operatorId) {
         Map<String, Object> result = new HashMap<>(2);
         List<Map<String, Object>> errorResult = Lists.newArrayList();
         Map<String, Object> errorResultMap;
@@ -282,6 +285,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                     //记录表插入
                     appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempNew, operatorId);
                 }
+
             } catch (BaseException ex) {
                 errorResultMap = new HashMap<>(1);
                 errorResultMap.put("num", i);
@@ -440,7 +444,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 //身份变更
                 if (StaffChangeStatusEnum.IDENTITY_CHANE.getCode() == changeStatus) {
                     //不是离职状态下
-                      if(Objects.nonNull(userPositionTemp.getIsQuit()) && userPositionTemp.getIsQuit()!=1){
+                    if (Objects.nonNull(userPositionTemp.getIsQuit()) && userPositionTemp.getIsQuit() != 1) {
                         postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
                         //更改为股东身份
                         loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);

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

@@ -51,12 +51,8 @@ public class AppShareholderDetailController {
                 return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
             }
 //            appShareholderData.remove(0);
-            try {
-                int effectSize = appShareholderDetailBiz.importShareholder(appShareholderData, operatorId);
-                return ObjectRestResponse.succ(effectSize);
-            } catch (BaseException ex) {
-                return ObjectRestResponse.createDefaultFail();
-            }
+            return ObjectRestResponse.succ(appShareholderDetailBiz.importShareholder(appShareholderData, operatorId))
+                    ;
         } catch (Exception e) {
             throw new BaseException(e);
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

@@ -71,7 +71,7 @@ public class AppUserRest {
      */
     @RequestMapping(value = "/user/sendsms", method = RequestMethod.POST)
     public @ResponseBody
-    JSONObject sendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList")String pointList){
+    JSONObject sendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList",defaultValue = "")String pointList){
         return appPermissionService.sendSMS(username,type, pointList);
     }