Merge branch 'master' of http://gitlab.scsmile.cn/zxf/enterprise-platform

enterprise-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -340,7 +340,7 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
             userEntity = new UserEntity();
             userEntity.setStatus(1);
             userEntity.setOpenId(openId);
-            userEntity.setUserType(1);
+            userEntity.setUserType(2);
             userEntity.setRealName("微信用户");
             userEntity.setCreateTime(new Date());
             userEntity.setCreateUserId(1L);

enterprise-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java

@@ -55,7 +55,11 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model,"userType", IBaseEnum.getEnumMap(UserType.class));
+        Map<String,String> userType = new HashMap<>();
+        userType.put("0","系统用户");
+        userType.put("1","企业用户");
+        userType.put("2","访客");
+        this.addDict(model,"userType", userType);
         this.addDict(model,"status", UserStatus.getEnumMap());
         this.addDict(model, "roleIds", roleService.find(new RoleQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName())));
 

enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/CompanyApiController.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.busiz.applets.web;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -94,6 +95,7 @@ public class CompanyApiController extends AbstractBaseController<CompanyReq>{
      * 公司知识产权数量列表及推荐产品列表
      */
     @PostMapping(value = "companyInfo")
+    @UnAuth
     public Rest<Object> companyInfo(@RequestBody CompanyReq companyReq){
         String busiDesc = "公司详情";
         log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(companyReq));

enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/model/vo/BussinesscardRecordVo.java

@@ -19,5 +19,31 @@ public class BussinesscardRecordVo extends BaseEntityLong {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
-
+    /**
+     * 用户名
+     */
+    private String realName;
+    /**
+     * 昵称
+     */
+    private String nickName;
+    /**
+     * 用户邮箱
+     */
+    private String email;
+    /**
+     * 用户手机号
+     */
+    private String mobile;
+    /**
+     * 单位名称
+     */
+    private String companyName;
+    /** 开始 最后浏览时间 */
+    private String viewTimeStart;
+    /** 结束 最后浏览时间 */
+    private String viewTimeEnd;
+    /** 查看人id列表 */
+    private List <Long> viewIdList;
+    private String query;
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/model/vo/BussinesscardVo.java

@@ -21,4 +21,6 @@ public class BussinesscardVo extends BaseEntityLong {
     /**收藏状态**/
     private Integer favoriteStatus;
 
+    private Integer staffStatus;
+
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/service/impl/BussinesscardRecordServiceImpl.java

 package com.mortals.xhx.module.bussinesscard.service.impl;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.module.bussinesscard.model.BussinesscardEntity;
 import com.mortals.xhx.module.bussinesscard.model.BussinesscardRecordQuery;
+import com.mortals.xhx.module.feedback.model.FeedbackEntity;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,7 +23,6 @@ import com.mortals.xhx.module.bussinesscard.dao.BussinesscardRecordDao;
 import com.mortals.xhx.module.bussinesscard.model.BussinesscardRecordEntity;
 import com.mortals.xhx.module.bussinesscard.service.BussinesscardRecordService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.StringUtils;
 
 /**
 * BussinesscardRecordService
@@ -35,6 +38,28 @@ public class BussinesscardRecordServiceImpl extends AbstractCRUDServiceImpl<Buss
     @Autowired
     private UserService userService;
 
+    @Override
+    protected BussinesscardRecordEntity findBefore(BussinesscardRecordEntity params, PageInfo pageInfo, Context context) throws AppException {
+        if(StringUtils.isNotEmpty(params.getQuery())){
+            List<UserQuery> orConditionList = new ArrayList<>();
+            UserQuery phone = new UserQuery();
+            phone.setPhone(params.getQuery());
+            orConditionList.add(phone);
+            UserQuery realName = new UserQuery();
+            realName.setRealName(params.getQuery());
+            orConditionList.add(realName);
+            UserQuery query = new UserQuery();
+            query.setOrConditionList(orConditionList);
+            UserEntity userEntity = userService.selectOne(query);
+            if(userEntity!=null){
+                params.setViewId(userEntity.getId());
+            }else {
+                params.setViewId(-1L);
+            }
+        }
+        return params;
+    }
+
     @Override
     public void saveRecord(BussinesscardEntity bussinesscardEntity, Context context) {
         if(context!=null&&context.getUser()!=null) {
@@ -66,4 +91,26 @@ public class BussinesscardRecordServiceImpl extends AbstractCRUDServiceImpl<Buss
             }
         }
     }
+
+    @Override
+    protected void findAfter(BussinesscardRecordEntity params, PageInfo pageInfo, Context context, List<BussinesscardRecordEntity> list) throws AppException {
+        super.findAfter(params, pageInfo, context, list);
+        if(CollectionUtils.isNotEmpty(list)){
+            List<Long> userIdList = list.stream().map(BussinesscardRecordEntity::getCreateUserId).collect(Collectors.toList());
+            List<UserEntity> userList = userService.find(new UserQuery().idList(userIdList));
+            Map<Long,UserEntity> userMap = userList.parallelStream().collect(Collectors.toMap(x -> x.getId(), z -> z, (o, n) -> n));
+            list.forEach(item->{
+                UserEntity userEntity = userMap.get(item.getCreateUserId());
+                if(userEntity!=null) {
+                    item.setNickName(userEntity.getNickName());
+                    item.setRealName(userEntity.getRealName());
+                    item.setMobile(userEntity.getPhone());
+                    if(StringUtils.isEmpty(item.getEmail())) {
+                        item.setEmail(userEntity.getEmail());
+                    }
+                    item.setCompanyName(userEntity.getCompanyAdress());
+                }
+            });
+        }
+    }
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/bussinesscard/service/impl/BussinesscardServiceImpl.java

@@ -10,6 +10,8 @@ import com.mortals.xhx.module.favorites.model.FavoritesBusinesscardQuery;
 import com.mortals.xhx.module.favorites.service.FavoritesBusinesscardService;
 import com.mortals.xhx.module.position.model.PositionEntity;
 import com.mortals.xhx.module.position.service.PositionService;
+import com.mortals.xhx.module.staff.model.StaffEntity;
+import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
@@ -36,6 +38,8 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc
     private PositionService positionService;
     @Autowired
     private FavoritesBusinesscardService favoritesBusinesscardService;
+    @Autowired
+    private StaffService staffService;
 
     @Override
     protected void saveBefore(BussinesscardEntity entity, Context context) throws AppException {
@@ -75,12 +79,23 @@ public class BussinesscardServiceImpl extends AbstractCRUDServiceImpl<Bussinessc
                 entity.setPositionName(positionEntity.getPositionName());
             }
         }
+        StaffEntity staffEntity = staffService.getCache(String.valueOf(entity.getStaffId()));
+        if(staffEntity!=null){
+            entity.setStaffName(staffEntity.getName());
+            entity.setStaffStatus(staffEntity.getStaffStatus());
+        }
     }
 
     @Override
     public BussinesscardEntity get(Long key, Context context) throws AppException {
         BussinesscardEntity entity = this.dao.get(key);
+
         if(entity!=null){
+            StaffEntity staffEntity = staffService.getCache(String.valueOf(entity.getStaffId()));
+            if(staffEntity!=null){
+                entity.setStaffName(staffEntity.getName());
+                entity.setStaffStatus(staffEntity.getStaffStatus());
+            }
             if(context!=null && context.getUser()!=null) {
                 FavoritesBusinesscardEntity favoritesBusinesscardEntity = favoritesBusinesscardService.selectOne(new FavoritesBusinesscardQuery().bussinesscardId(entity.getId()).userId(context.getUser().getId()));
                 if(favoritesBusinesscardEntity!=null){

enterprise-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java

@@ -44,10 +44,26 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
             UserEntity userEntity = userService.get(context.getUser().getId());
             if(userEntity!=null){
                 entity.setFeedbackName(userEntity.getRealName());
+                entity.setPhotoPath(userEntity.getPhotoPath());
+                entity.setCompanyName(userEntity.getCompanyAdress());
+                if(StringUtils.isEmpty(entity.getContactInfo())){
+                    entity.setContactInfo(userEntity.getPhone());
+                }
+                if(StringUtils.isEmpty(entity.getEmail())){
+                    entity.setEmail(userEntity.getEmail());
+                }
             }
         }
     }
 
+    @Override
+    protected void updateBefore(FeedbackEntity entity, Context context) throws AppException {
+        super.saveBefore(entity,context);
+        if(StringUtils.isNotEmpty(entity.getReplyContent())){
+            entity.setReply(1);
+        }
+    }
+
     @Override
     protected void findAfter(FeedbackEntity params, PageInfo pageInfo, Context context, List<FeedbackEntity> list) throws AppException {
         super.findAfter(params, pageInfo, context, list);
@@ -56,10 +72,20 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
             List<UserEntity> userList = userService.find(new UserQuery().idList(userIdList));
             Map<Long,UserEntity> userMap = userList.parallelStream().collect(Collectors.toMap(x -> x.getId(), z -> z, (o, n) -> n));
             for(FeedbackEntity item:list){
+                if(StringUtils.isNotEmpty(item.getReplyContent())){
+                    item.setReply(1);
+                }
                 UserEntity userEntity = userMap.get(item.getCreateUserId());
                 if(userEntity!=null) {
                     item.setPhotoPath(userEntity.getPhotoPath());
                     item.setFeedbackName(userEntity.getRealName());
+                    item.setCompanyName(userEntity.getCompanyAdress());
+                    if(StringUtils.isEmpty(item.getEmail())){
+                        item.setEmail(userEntity.getEmail());
+                    }
+                    if(StringUtils.isEmpty(item.getContactInfo())){
+                        item.setContactInfo(userEntity.getPhone());
+                    }
                 }
             }
         }