Merge branch 'master-customer-management' into dev

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

@@ -29,7 +29,10 @@ public class AppUserLogRemarkDTO {
      */
     private Integer levelId;
 
-
+    /**
+     * 照片url多张已","分割
+     */
+    private String photos;
 
 
 }

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

@@ -11,6 +11,7 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.Date;
+import java.util.List;
 
 /**
  * APP员工客户日志备注表
@@ -38,4 +39,12 @@ public class AppUserLogRemark {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date time;
 
+    /**
+     * 照片url地址","分割
+     */
+    private String photos;
+    /**
+     * 照片url地址
+     */
+    private List<String> photoList;
 }

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

@@ -22,13 +22,13 @@ import java.util.List;
 @Service
 @RequiredArgsConstructor(onConstructor_={@Autowired})
 public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> {
-    private final  AppUserLoginBiz appUserLoginBiz;
     private final AppUserDetailBiz appUserDetailBiz;
 
 
     public List<AppStaffUser> getAll(Integer id) {
         Example example = new Example(AppStaffUser.class);
         example.createCriteria().andEqualTo("suId",id).andEqualTo("isDel",0);
+        example.orderBy("crtTime").desc();
      return selectByExample(example);
     }
 

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

 package com.github.wxiaoqi.security.admin.biz;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.github.wxiaoqi.security.admin.dto.AppUserLogRemarkDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogRemark;
 import com.github.wxiaoqi.security.admin.mapper.AppUserLogRemarkMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -14,6 +16,8 @@ import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Transactional
 @Service
@@ -30,6 +34,7 @@ public class AppUserLogRemarkBiz extends BaseBiz<AppUserLogRemarkMapper, AppUser
         if (appUserLogRemarkDTO == null || StringUtils.isBlank(appUserLogRemarkDTO.getRemark()) || appUserLogRemarkDTO.getLevelId() == null) {
             ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
         }
+
         AppUserLogRemark appUserLogRemark = new AppUserLogRemark();
         BeanUtils.copyProperties(appUserLogRemarkDTO, appUserLogRemark);
         insertSelective(appUserLogRemark);
@@ -46,7 +51,15 @@ public class AppUserLogRemarkBiz extends BaseBiz<AppUserLogRemarkMapper, AppUser
         example.createCriteria().andEqualTo("levelId", levelId);
         example.orderBy("time").desc();
         List<AppUserLogRemark> list = selectByExample(example);
+        if (CollectionUtil.isNotEmpty(list)) {
+             list.parallelStream().peek(e -> {
+                if (!Objects.isNull(e)) {
+                    e.setPhotoList(Lists.newArrayList(e.getPhotos().split(",")));
+                }
+            }).count();
+        }
         return list;
+
     }
 
 

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

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.AppStaffUserBiz;
+import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
+import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
 import com.github.wxiaoqi.security.admin.entity.AppStaffUser;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -30,8 +33,10 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
     private final UserAuthConfig authConfig;
     private final HttpServletRequest request;
     private final PublicController publicController;
-    private final String POSITION_NAME="员工";
+    private final Integer POSITION_ID=4;
     private final UserAuthUtil userAuthUtil;
+    private final AppUserLoginBiz appUserLoginBiz;
+    private final AppUserDetailBiz appUserDetailBiz;
 
     /**
      * 获取该用户所用的客户
@@ -41,7 +46,7 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
     @GetMapping("/getAll")
     public  ObjectRestResponse<List<AppStaffUser>> getAll() throws Exception {
         AppUserDTO userDTO = (AppUserDTO) publicController.userDetailByToken(authConfig.getToken(request)).getData();
-        if (POSITION_NAME.equals(userDTO.getPositionName())) {
+        if (POSITION_ID.equals(userDTO.getPositionId())) {
             return ObjectRestResponse.succ(baseBiz.getAll(userDTO.getUserid())) ;
         }
      return ObjectRestResponse.succ();
@@ -52,8 +57,19 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
     @PostMapping(value = "")
     public ObjectRestResponse<AppStaffUser> add(@RequestBody AppStaffUser appStaffUser) throws Exception {
         IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(authConfig.getToken(request));
-        if (appStaffUser.getPhone().equals(infoFromToken.getUniqueName())) {
-           return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"不能绑定本人为客户");
+//        AppUserDTO appUserDTO = publicController.userDetailByUsername(appStaffUser.getPhone()).getData();
+
+        Integer positionId = null;
+        try {
+            positionId = appUserDetailBiz.getUserInfoById(
+                    appUserLoginBiz.getUserByUsername(appStaffUser.getPhone()).getId()
+            ).getPositionId();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if (appStaffUser.getPhone().equals(infoFromToken.getUniqueName())||POSITION_ID.equals(positionId)) {
+           return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"绑定错误");
         }
         appStaffUser.setSuId(Integer.valueOf(infoFromToken.getId()));
         if (baseBiz.select(appStaffUser)) {
@@ -92,8 +108,16 @@ public class AppStaffUserController extends BaseController<AppStaffUserBiz, AppS
     @ResponseBody
     public ObjectRestResponse update(@RequestBody AppStaffUser appStaffUser) throws Exception {
         IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(authConfig.getToken(request));
-        if (appStaffUser.getPhone().equals(infoFromToken.getUniqueName())) {
-            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"不能绑定本人为客户");
+        Integer positionId = null;
+        try {
+            positionId = appUserDetailBiz.getUserInfoById(
+                    appUserLoginBiz.getUserByUsername(appStaffUser.getPhone()).getId()
+            ).getPositionId();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (appStaffUser.getPhone().equals(infoFromToken.getUniqueName())||POSITION_ID.equals(positionId)) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"绑定错误");
         }
         appStaffUser.setSuId(Integer.valueOf(infoFromToken.getId()));
         if (baseBiz.select(appStaffUser)) {