Skip to content

H
haoban-manage3.0
Commit 2a46bb3c by fudahua
Options

fix

parent c4f41147
Showing with 197 additions and 84 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java
......@@ -19,6 +19,7 @@ import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
import com.gic.haoban.manage.service.service.*;
import com.gic.redis.data.anno.RedisCache;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
......@@ -816,6 +817,7 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
}
@Override
@RedisCache(value = "department-list-cache-${wxEnterpriseId}")
public List<DepartmentShortDTO> listAllDepartment(String wxEnterpriseId) {
List<DepartmentShortDTO> list = departmentService.listAllDepartment(wxEnterpriseId);
return list;
......
haoban-manage3-service/src/test/java/ServiceTest.java
......@@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.JSONResponse;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.TestApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
......@@ -56,6 +57,9 @@ public class ServiceTest {
@Autowired
private TestApiService testApiService;
@Autowired
private DepartmentApiService departmentApiService;
private final ExecutorService pools = Executors.newFixedThreadPool(50);
......@@ -63,15 +67,15 @@ public class ServiceTest {
public void test() {
int i=2000;
while (i-->0) {
int finalI = i;
pools.execute(new Runnable(){
@Override
public void run() {
testApiService.checkThread(finalI +"",100L);
}
});
departmentApiService.listAllDepartment(i+"");
}
}
try {
Thread.sleep(1000000L);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
// @Test
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/InfoController.java
......@@ -23,6 +23,7 @@ import com.gic.haoban.manage.web.qo.GetUserByMemberCodeQo;
import com.gic.haoban.manage.web.qo.MemberLoginQo;
import com.gic.haoban.manage.web.vo.AppStaffVo;
import com.gic.haoban.manage.web.vo.InfoVo;
import com.gic.haoban.manage.web.vo.StoreMemberVO;
import com.gic.haoban.manage.web.vo.StoreVO;
import com.gic.wechat.api.dto.qywx.UserDTO;
import com.gic.wechat.api.service.qywx.QywxCorpApiService;
......@@ -79,6 +80,9 @@ public class InfoController extends WebBaseController{
@Autowired
private StaffMemberRelationApiService staffMemberRelationApiService;
@Autowired
private StaffClerkRelationApiService staffClerkRelationApiService;
private static Logger logger= LoggerFactory.getLogger(InfoController.class);
......@@ -185,83 +189,91 @@ public class InfoController extends WebBaseController{
relatedDTO.setGicEnterpriseId(enterpriseDetailDTO.getEnterpriseId());
staffMemberRelationApiService.bindMemberAndStaff(relatedDTO);
ServiceResponse<List<DepartmentDTO>> response = departmentApiService.listStoreListByStaffId(staffDTO.getStaffId());
List<DepartmentDTO> result = response.getResult();
List<StoreVO> retList = new ArrayList<>();
if (response.getCode() == 1 && CollectionUtils.isNotEmpty(result)) {
List<StaffClerkInfoDTO> result = staffClerkRelationApiService.listBindDetailByStaffId(staffDTO.getStaffId());
// ServiceResponse<List<DepartmentDTO>> response = departmentApiService.listStoreListByStaffId(staffDTO.getStaffId());
// List<DepartmentDTO> result = response.getResult();
List<StoreMemberVO> retList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(result)) {
result.stream().forEach(dto -> {
StoreVO VO = new StoreVO();
VO.setDepartmentId(dto.getDepartmentId());
VO.setStoreId(dto.getRelatedId());//为空，则无该值
VO.setStoreName(dto.getDepartmentName());
VO.setWxEnterpriseId(dto.getWxEnterpriseId());
VO.setStoreImg("");//先置空
if (org.apache.commons.lang.StringUtils.isNotBlank(dto.getRelatedId())) {
StoreDTO storeDTO = storeService.getStore(dto.getRelatedId());
if (storeDTO != null) {
VO.setEnterpriseId(storeDTO.getEnterpriseId());
VO.setStoreImg(storeDTO.getImageUrl());//先置空
}
StoreMemberVO VO = new StoreMemberVO();
StoreDTO store = storeService.getStore(dto.getStoreId());
ClerkDTO clerkDTO = clerkService.getClerkByClerkId(dto.getClerkId());
if (null != store&&clerkDTO!=null) {
VO.setStoreId(dto.getStoreId());//为空，则无该值
VO.setStoreName(dto.getStoreName());
VO.setWxEnterpriseId(dto.getWxEnterpriseId());
VO.setEnterpriseId(store.getEnterpriseId());
VO.setStoreImg(store.getImageUrl());//先置空
VO.setClerkCode(clerkDTO.getClerkCode());
VO.setClerkType(clerkDTO.getClerkType());
VO.setStaffId(staffDTO.getStaffId());
VO.setClerkId(clerkDTO.getClerkId());
retList.add(VO);
}
VO.setCreateTime(dto.getCreateTime());
retList.add(VO);
// VO.setDepartmentId(dto.getDepartmentId());
});
//塞clerkCOde等基本信息
List<StaffDepartmentRelatedDTO> relateList = staffDepartmentRelatedApiService.listByStaffId(staffDTO.getStaffId());
Map<String,StaffDepartmentRelatedDTO> map = com.gic.commons.util.CollectionUtil.toMap(relateList, "departmentId");
for(StoreVO VO : retList){
StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = map.get(VO.getDepartmentId());
if(staffDepartmentRelatedDTO != null){
String clerkCode = staffDepartmentRelatedDTO.getClerkCode();
VO.setBindFlag(StringUtils.isEmpty(clerkCode)?0:1);
VO.setClerkCode(clerkCode);
VO.setStaffDepartmentRelatedId(staffDepartmentRelatedDTO.getStaffDepartmentRelatedId());
VO.setStaffId(staffDTO.getStaffId());
ClerkDTO clerkDTO = clerkService.getClerkByClerkCode(VO.getEnterpriseId(), clerkCode);
VO.setClerkId(clerkDTO == null?"":clerkDTO.getClerkId());
}else{
VO.setBindFlag(0);
}
}
//塞门店店长标志
ClerkMainStoreRelatedDTO mainStore = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(enterpriseDTO.getWxEnterpriseId(),staffDTO.getStaffId());
for(StoreVO VO : retList){
//查gic门店
StoreDTO storeDTO = storeService.getStore(VO.getStoreId());
List<StorePhotoDTO> imgList = storeService.getStoreImages(VO.getStoreId());
EnterpriseDetailDTO detail = wxEnterpriseRelatedApiService.getByEnterpriseId(storeDTO.getEnterpriseId());
VO.setWxEnterpriseRelatedId(detail.getWxEnterpriseRelatedId());
//已经绑定的门店
if(VO.getBindFlag()==1){
String clerkCode = VO.getClerkCode();
if(StringUtils.isEmpty(clerkCode)){
VO.setClerkType(0);
}else{
if(storeDTO != null){
//查gic门店店长
ClerkDTO clerkDTO = clerkService.getClerkByClerkId(storeDTO.getClerkId());
if(clerkDTO != null){
//code相同，则置为1
if(clerkCode.equals(clerkDTO.getClerkCode())){
VO.setClerkType(1);
}
}
}
}
}
if(CollectionUtil.isNotEmpty(imgList)){
VO.setStoreImg(imgList.get(0).getQcloudImageUrl());;
}
if(mainStore != null && mainStore.getStoreId().equals(VO.getStoreId())){
VO.setMainStoreFlag(1);
}else{
VO.setMainStoreFlag(0);
}
}
// //塞clerkCOde等基本信息
// List<StaffDepartmentRelatedDTO> relateList = staffDepartmentRelatedApiService.listByStaffId(staffDTO.getStaffId());
// Map<String,StaffDepartmentRelatedDTO> map = com.gic.commons.util.CollectionUtil.toMap(relateList, "departmentId");
// for(StoreVO VO : retList){
// StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = map.get(VO.getDepartmentId());
// if(staffDepartmentRelatedDTO != null){
// String clerkCode = staffDepartmentRelatedDTO.getClerkCode();
// VO.setBindFlag(StringUtils.isEmpty(clerkCode)?0:1);
// VO.setClerkCode(clerkCode);
// VO.setStaffDepartmentRelatedId(staffDepartmentRelatedDTO.getStaffDepartmentRelatedId());
// VO.setStaffId(staffDTO.getStaffId());
// ClerkDTO clerkDTO = clerkService.getClerkByClerkCode(VO.getEnterpriseId(), clerkCode);
// VO.setClerkId(clerkDTO == null?"":clerkDTO.getClerkId());
// }else{
// VO.setBindFlag(0);
// }
// }
//
//
// //塞门店店长标志
// ClerkMainStoreRelatedDTO mainStore = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(enterpriseDTO.getWxEnterpriseId(),staffDTO.getStaffId());
// for(StoreVO VO : retList){
// //查gic门店
// StoreDTO storeDTO = storeService.getStore(VO.getStoreId());
// List<StorePhotoDTO> imgList = storeService.getStoreImages(VO.getStoreId());
// EnterpriseDetailDTO detail = wxEnterpriseRelatedApiService.getByEnterpriseId(storeDTO.getEnterpriseId());
// VO.setWxEnterpriseRelatedId(detail.getWxEnterpriseRelatedId());
// //已经绑定的门店
// if(VO.getBindFlag()==1){
// String clerkCode = VO.getClerkCode();
// if(StringUtils.isEmpty(clerkCode)){
// VO.setClerkType(0);
// }else{
// if(storeDTO != null){
// //查gic门店店长
// ClerkDTO clerkDTO = clerkService.getClerkByClerkId(storeDTO.getClerkId());
// if(clerkDTO != null){
// //code相同，则置为1
// if(clerkCode.equals(clerkDTO.getClerkCode())){
// VO.setClerkType(1);
// }
// }
// }
// }
// }
// if(CollectionUtil.isNotEmpty(imgList)){
// VO.setStoreImg(imgList.get(0).getQcloudImageUrl());;
// }
//
// if(mainStore != null && mainStore.getStoreId().equals(VO.getStoreId())){
// VO.setMainStoreFlag(1);
// }else{
// VO.setMainStoreFlag(0);
// }
// }
user.setStoreList(retList);
}
return resultResponse(HaoBanErrCode.ERR_1, user);
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/MemberLoginQo.java
package com.gic.haoban.manage.web.qo;
import com.gic.haoban.manage.web.vo.StoreMemberVO;
import com.gic.haoban.manage.web.vo.StoreVO;
import java.io.Serializable;
......@@ -13,7 +14,7 @@ import java.util.List;
public class MemberLoginQo implements Serializable {
private String userId;
private String corpId;
private List<StoreVO> storeList;
private List<StoreMemberVO> storeList;
public String getUserId() {
return userId;
......@@ -31,11 +32,11 @@ public class MemberLoginQo implements Serializable {
this.corpId = corpId;
}
public List<StoreVO> getStoreList() {
public List<StoreMemberVO> getStoreList() {
return storeList;
}
public void setStoreList(List<StoreVO> storeList) {
public void setStoreList(List<StoreMemberVO> storeList) {
this.storeList = storeList;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StoreMemberVO.java 0 → 100644
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
import java.util.Date;
/**
* Created 2018/10/22.
*
* @author hua
*/
public class StoreMemberVO implements Serializable {
private static final long serialVersionUID = 1L;
private String storeId;
private String staffId;
private String storeName;
private String wxEnterpriseId;
private String enterpriseId;
private String clerkCode;
private String clerkId;
private String storeImg;
private int clerkType;
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getStoreImg() {
return storeImg;
}
public void setStoreImg(String storeImg) {
this.storeImg = storeImg;
}
public int getClerkType() {
return clerkType;
}
public void setClerkType(int clerkType) {
this.clerkType = clerkType;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment