Skip to content

H
haoban-manage3.0
Commit 207cf344 by 墨竹
Options

fix：去除无效好办2.0引用

parent ac556257
Showing with 178 additions and 649 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/StatusEnum.java 0 → 100644
package com.gic.haoban.manage.api.enums;
/**
* Created by hua on 2018/7/18.
*/
public enum StatusEnum {
ALL(-1),
DEL(0),
NORMAL(1),
Preview(2);
private int value;
StatusEnum(int value) {
this.value = value;
}
public int getValue() {
return value;
}
public void setValue(int value) {
this.value = value;
}
}
haoban-manage3-operation-web/pom.xml
...@@ -115,11 +115,7 @@ ...@@ -115,11 +115,7 @@
<artifactId>haoban-contacts-manage-api</artifactId> <artifactId>haoban-contacts-manage-api</artifactId>
<version>${haoban-contacts-manage-api}</version> <version>${haoban-contacts-manage-api}</version>
</dependency> </dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-auth-api</artifactId>
<version>${haoban-auth-api}</version>
</dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>haoban-operation-api</artifactId> <artifactId>haoban-operation-api</artifactId>
...@@ -141,28 +137,6 @@ ...@@ -141,28 +137,6 @@
<artifactId>gic-thirdparty-api</artifactId> <artifactId>gic-thirdparty-api</artifactId>
<version>${gic-thirdparty-api}</version> <version>${gic-thirdparty-api}</version>
</dependency> </dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-message-api</artifactId>
<version>${haoban-message-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-app-announcement-api</artifactId>
<version>${haoban-app-announcement-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-communicate-api</artifactId>
<version>${haoban-communicate-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-mobile-app-api</artifactId>
<version>${haoban-mobile-app-api}</version>
</dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
...@@ -170,12 +144,12 @@ ...@@ -170,12 +144,12 @@
<version>${gic-thirdparty-sdk}</version> <version>${gic-thirdparty-sdk}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic.operation</groupId> <groupId>com.gic.operation</groupId>
<artifactId>gic-operation-api</artifactId> <artifactId>gic-operation-api</artifactId>
<version>${gic-operation-api}</version> <version>${gic-operation-api}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>gic-enterprise-api</artifactId> <artifactId>gic-enterprise-api</artifactId>
...@@ -204,6 +178,7 @@ ...@@ -204,6 +178,7 @@
<artifactId>sharing-core-api</artifactId> <artifactId>sharing-core-api</artifactId>
<version>${sharing-core-api}</version> <version>${sharing-core-api}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>haoban-app-customer-api</artifactId> <artifactId>haoban-app-customer-api</artifactId>
......
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/WebBaseController.java
package com.gic.haoban.manage.web.controller; package com.gic.haoban.manage.web.controller;
import com.gic.haoban.auth.api.dto.DisplayRelationShortInfoDTO;
import com.gic.haoban.auth.api.dto.UserRightDetailDTO;
import com.gic.haoban.common.utils.AuthRequestUtil;
import com.gic.haoban.common.utils.HaobanResponse; import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode; import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import org.apache.commons.collections.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
/** /**
* Created 2018/7/18. * Created 2018/7/18.
...@@ -42,37 +35,4 @@ public class WebBaseController { ...@@ -42,37 +35,4 @@ public class WebBaseController {
return response; return response;
} }
/**
* 获取登陆信息
*
* @return
*/
protected UserRightDetailDTO getLoginUser() {
return (UserRightDetailDTO) AuthRequestUtil.getSessionUser();
}
public boolean haveRight(List<DisplayRelationShortInfoDTO> list){
List<String> groupList = new ArrayList<String>();
List<String> storeList = new ArrayList<String>();
List<String> clerkList = new ArrayList<String>();
if(list==null){
return false;
}
for(DisplayRelationShortInfoDTO showDto :list){
if(showDto.getGroupId()!=null){
groupList.add(showDto.getGroupId());
}
if(showDto.getStoreId()!=null){
storeList.add(showDto.getStoreId());
}
if(showDto.getClerkId()!=null){
clerkList.add(showDto.getClerkId());
}
}
if(CollectionUtils.isEmpty(groupList) && CollectionUtils.isEmpty(storeList) && CollectionUtils.isEmpty(clerkList)){
return false;
}
return true;
}
} }
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/response/MenuDetailResponse.java deleted 100644 → 0
package com.gic.haoban.manage.web.response;
import com.gic.haoban.auth.api.dto.MenuRightDTO;
import java.io.Serializable;
import java.util.List;
/**
* Created 2018/12/27.
*
* @author hua
*/
public class MenuDetailResponse implements Serializable {
private MenuRightDTO top;
private List<MenuRightDTO> leftMenu;
private MenuRightDTO current;
public MenuRightDTO getTop() {
return top;
}
public void setTop(MenuRightDTO top) {
this.top = top;
}
public List<MenuRightDTO> getLeftMenu() {
return leftMenu;
}
public void setLeftMenu(List<MenuRightDTO> leftMenu) {
this.leftMenu = leftMenu;
}
public MenuRightDTO getCurrent() {
return current;
}
public void setCurrent(MenuRightDTO current) {
this.current = current;
}
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/response/RoleDetailResponse.java deleted 100644 → 0
package com.gic.haoban.manage.web.response;
import com.gic.haoban.auth.api.dto.MenuRightInfoDTO;
import com.gic.haoban.auth.api.dto.RoleDTO;
import java.io.Serializable;
import java.util.List;
/**
* Created 2018/12/17.
*
* @author hua
*/
public class RoleDetailResponse implements Serializable {
public RoleDTO role;
public List<MenuRightInfoDTO> menuRightList;
public RoleDTO getRole() {
return role;
}
public void setRole(RoleDTO role) {
this.role = role;
}
public List<MenuRightInfoDTO> getMenuRightList() {
return menuRightList;
}
public void setMenuRightList(List<MenuRightInfoDTO> menuRightList) {
this.menuRightList = menuRightList;
}
}
\ No newline at end of file
haoban-manage3-service/pom.xml
...@@ -81,21 +81,6 @@ ...@@ -81,21 +81,6 @@
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>haoban-contacts-api</artifactId>
<version>${haoban-contacts-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-contacts-manage-api</artifactId>
<version>${haoban-contacts-manage-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-auth-api</artifactId>
<version>${haoban-auth-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-enterprise-api</artifactId> <artifactId>gic-enterprise-api</artifactId>
<version>${gic-enterprise-api}</version> <version>${gic-enterprise-api}</version>
<exclusions> <exclusions>
...@@ -112,12 +97,6 @@ ...@@ -112,12 +97,6 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>haoban-message-api</artifactId>
<version>${haoban-message-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-wechat-api</artifactId> <artifactId>gic-wechat-api</artifactId>
<version>${gic-wechat-api}</version> <version>${gic-wechat-api}</version>
</dependency> </dependency>
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java
package com.gic.haoban.manage.service.service.out.impl; package com.gic.haoban.manage.service.service.out.impl;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import com.gic.haoban.manage.api.enums.*;
import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.clerk.api.dto.ClerkDTO; import com.gic.clerk.api.dto.ClerkDTO;
...@@ -30,55 +16,45 @@ import com.gic.haoban.base.api.common.BasePageInfo; ...@@ -30,55 +16,45 @@ import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.common.utils.PageUtil; import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.common.utils.UuidUtil; import com.gic.haoban.common.utils.UuidUtil;
import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi; import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
import com.gic.haoban.manage.api.dto.AuditDTO; import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.dto.AuditStaffDTO; import com.gic.haoban.manage.api.enums.*;
import com.gic.haoban.manage.api.dto.BatchAuditLogDTO;
import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
import com.gic.haoban.manage.api.dto.StoreAddressDTO;
import com.gic.haoban.manage.api.service.AuditApiService; import com.gic.haoban.manage.api.service.AuditApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService; import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService; import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService; import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.service.config.Config; import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
import com.gic.haoban.manage.service.dao.mapper.DepartmentMapper;
import com.gic.haoban.manage.service.dao.mapper.StaffMapper; import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanAuditMapper; import com.gic.haoban.manage.service.dao.mapper.TabHaobanAuditMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanBatchAuditLogMapper; import com.gic.haoban.manage.service.dao.mapper.TabHaobanBatchAuditLogMapper;
import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
import com.gic.haoban.manage.service.entity.TabHaobanAudit; import com.gic.haoban.manage.service.entity.TabHaobanAudit;
import com.gic.haoban.manage.service.entity.TabHaobanBatchAuditLog; import com.gic.haoban.manage.service.entity.TabHaobanBatchAuditLog;
import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
import com.gic.haoban.manage.service.entity.TabHaobanStaff; import com.gic.haoban.manage.service.entity.TabHaobanStaff;
import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
import com.gic.wechat.api.dto.qywx.ItemDTO;
import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* Created by tgs on 2020/2/9. * Created by tgs on 2020/2/9.
*/ */
@Service @Service
public class AuditApiServiceImpl implements AuditApiService{ public class AuditApiServiceImpl implements AuditApiService {
private static final Logger logger = LoggerFactory.getLogger(AuditApiServiceImpl.class); private static final Logger logger = LoggerFactory.getLogger(AuditApiServiceImpl.class);
@Autowired @Autowired
private TabHaobanAuditMapper auditMapper; private TabHaobanAuditMapper auditMapper;
@Autowired @Autowired
private DepartmentMapper departmentMapper;
@Autowired
private StaffMapper staffMapper; private StaffMapper staffMapper;
@Autowired @Autowired
private StoreService storeService; private StoreService storeService;
@Autowired @Autowired
private QywxSuiteApiService qywxSuiteApiService;
@Autowired
private Config config;
@Autowired
private WxEnterpriseMapper wxEnterpriseMapper;
@Autowired
private TabHaobanBatchAuditLogMapper tabHaobanBatchAuditLogMapper; private TabHaobanBatchAuditLogMapper tabHaobanBatchAuditLogMapper;
@Autowired @Autowired
private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService; private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
...@@ -92,71 +68,74 @@ public class AuditApiServiceImpl implements AuditApiService{ ...@@ -92,71 +68,74 @@ public class AuditApiServiceImpl implements AuditApiService{
private ClerkService clerkService; private ClerkService clerkService;
@Autowired @Autowired
private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService; private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
@Override @Override
public Page<AuditDTO> page(Integer auditType, String search,String wxEnterpriseId, public Page<AuditDTO> page(Integer auditType, String search, String wxEnterpriseId,
String enterpriseId,Integer auditStatus,Integer auditFlag, BasePageInfo pageInfo) { String enterpriseId, Integer auditStatus, Integer auditFlag, BasePageInfo pageInfo) {
//部门关联表修改，服务层调整 //部门关联表修改，服务层调整
List<String> departmentIds = new ArrayList<>(); List<String> departmentIds = new ArrayList<>();
List<String> staffIds = new ArrayList<>(); List<String> staffIds = new ArrayList<>();
List<String> storeIds = new ArrayList<>(); List<String> storeIds = new ArrayList<>();
if(StringUtils.isNotEmpty(search)){ if (StringUtils.isNotEmpty(search)) {
//获取企业列表 //获取企业列表
List<String> enterpriseIds = new ArrayList<>(); List<String> enterpriseIds = new ArrayList<>();
if(StringUtils.isEmpty(enterpriseId)){ if (StringUtils.isEmpty(enterpriseId)) {
List<EnterpriseDetailDTO> enterprises = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId); List<EnterpriseDetailDTO> enterprises = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
if(CollectionUtil.isNotEmpty(enterprises)){ if (CollectionUtil.isNotEmpty(enterprises)) {
List<String> searchEnterpriseIds = enterprises.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList()); List<String> searchEnterpriseIds = enterprises.stream().map(s -> s.getEnterpriseId()).collect(Collectors.toList());
enterpriseIds.addAll(searchEnterpriseIds); enterpriseIds.addAll(searchEnterpriseIds);
} }
}else{ } else {
enterpriseIds.add(enterpriseId); enterpriseIds.add(enterpriseId);
} }
//调gic接口查storeIds //调gic接口查storeIds
String[] strArray = new String[enterpriseIds.size()]; String[] strArray = new String[enterpriseIds.size()];
enterpriseIds.toArray(strArray); enterpriseIds.toArray(strArray);
List<StoreVo> list = storeService.queryStoreByName(strArray,search); List<StoreVo> list = storeService.queryStoreByName(strArray, search);
if(CollectionUtil.isNotEmpty(list)){ if (CollectionUtil.isNotEmpty(list)) {
List<String> storeIds1 = list.stream().map(s->s.getStoreId()).collect(Collectors.toList()); List<String> storeIds1 = list.stream().map(s -> s.getStoreId()).collect(Collectors.toList());
storeIds.addAll(storeIds1); storeIds.addAll(storeIds1);
} }
//模糊查staffName //模糊查staffName
List<TabHaobanStaff> staffList = staffMapper.listLikeName(search); List<TabHaobanStaff> staffList = staffMapper.listLikeName(search);
if(CollectionUtil.isNotEmpty(staffList)){ if (CollectionUtil.isNotEmpty(staffList)) {
List<String> staffIds2 = staffList.stream().map(s->s.getStaffId()).collect(Collectors.toList()); List<String> staffIds2 = staffList.stream().map(s -> s.getStaffId()).collect(Collectors.toList());
staffIds.addAll(staffIds2); staffIds.addAll(staffIds2);
} }
if(CollectionUtil.isEmpty(staffIds)){ if (CollectionUtil.isEmpty(staffIds)) {
staffIds.add("-999"); staffIds.add("-999");
} }
if(CollectionUtil.isEmpty(storeIds)){ if (CollectionUtil.isEmpty(storeIds)) {
storeIds.add("-999"); storeIds.add("-999");
} }
} }
PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize()); PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
com.github.pagehelper.Page<TabHaobanAudit> page = new com.github.pagehelper.Page<TabHaobanAudit>(); com.github.pagehelper.Page<TabHaobanAudit> page = new com.github.pagehelper.Page<TabHaobanAudit>();
if(CollectionUtil.isNotEmpty(storeIds)&&CollectionUtil.isNotEmpty(staffIds)){ if (CollectionUtil.isNotEmpty(storeIds) && CollectionUtil.isNotEmpty(staffIds)) {
page = auditMapper.pageForStoreIdsAndstaffIds(auditType, storeIds, staffIds, wxEnterpriseId,enterpriseId,auditStatus,auditFlag); page = auditMapper.pageForStoreIdsAndstaffIds(auditType, storeIds, staffIds, wxEnterpriseId, enterpriseId, auditStatus, auditFlag);
}else{ } else {
page = auditMapper.page(auditType, storeIds, staffIds, wxEnterpriseId,enterpriseId,auditStatus,auditFlag); page = auditMapper.page(auditType, storeIds, staffIds, wxEnterpriseId, enterpriseId, auditStatus, auditFlag);
} }
if(CollectionUtil.isNotEmpty( page.getResult())){ if (CollectionUtil.isNotEmpty(page.getResult())) {
List<String> commitStaffIds = page.getResult().stream().map(s->s.getCommitStaffId()).collect(Collectors.toList()); List<String> commitStaffIds = page.getResult().stream().map(s -> s.getCommitStaffId()).collect(Collectors.toList());
List<TabHaobanStaff> staffList = staffMapper.listByIds(commitStaffIds); List<TabHaobanStaff> staffList = staffMapper.listByIds(commitStaffIds);
Map<String,TabHaobanStaff> map = com.gic.commons.util.CollectionUtil.toMap(staffList, "staffId"); Map<String, TabHaobanStaff> map = com.gic.commons.util.CollectionUtil.toMap(staffList, "staffId");
for(TabHaobanAudit tab: page.getResult()){ for (TabHaobanAudit tab : page.getResult()) {
String commitStaffId = tab.getCommitStaffId(); String commitStaffId = tab.getCommitStaffId();
tab.setCommitStaffName(map.get(commitStaffId)==null?"":map.get(commitStaffId).getStaffName()); tab.setCommitStaffName(map.get(commitStaffId) == null ? "" : map.get(commitStaffId).getStaffName());
tab.setCommitStaffImg(map.get(commitStaffId)==null?"":map.get(commitStaffId).getHeadImg()); tab.setCommitStaffImg(map.get(commitStaffId) == null ? "" : map.get(commitStaffId).getHeadImg());
} }
} }
return PageUtil.changePageHelperToCurrentPage( page,AuditDTO.class); return PageUtil.changePageHelperToCurrentPage(page, AuditDTO.class);
} }
@Transactional @Transactional
@Override @Override
public String audit(String batchId,String auditId,String auditName,String optStaffId) { public String audit(String batchId, String auditId, String auditName, String optStaffId) {
TabHaobanAudit tab = auditMapper.selectByPrimaryKey(auditId); TabHaobanAudit tab = auditMapper.selectByPrimaryKey(auditId);
if(tab==null){ if (tab == null) {
return "审核项目不存在"; return "审核项目不存在";
} }
int auditType = tab.getAuditType(); int auditType = tab.getAuditType();
...@@ -164,7 +143,7 @@ public class AuditApiServiceImpl implements AuditApiService{ ...@@ -164,7 +143,7 @@ public class AuditApiServiceImpl implements AuditApiService{
tab.setUpdateTime(new Date()); tab.setUpdateTime(new Date());
tab.setAuditName(auditName); tab.setAuditName(auditName);
tab.setAuditStaffId(optStaffId); tab.setAuditStaffId(optStaffId);
if(auditType == AuditType.STORE_CHANGE.getCode()){ if (auditType == AuditType.STORE_CHANGE.getCode()) {
//门店信息变更 //门店信息变更
String storeId = tab.getCommitStoreId(); String storeId = tab.getCommitStoreId();
String oldValue = tab.getOldValue(); String oldValue = tab.getOldValue();
...@@ -178,46 +157,46 @@ public class AuditApiServiceImpl implements AuditApiService{ ...@@ -178,46 +157,46 @@ public class AuditApiServiceImpl implements AuditApiService{
//发送消息 //发送消息
String title = "门店信息修改通知"; String title = "门店信息修改通知";
String content = StoreFieldEnum.getValueName(changeField); String content = StoreFieldEnum.getValueName(changeField);
content = "["+content+"]"+"修改审核通过"; content = "[" + content + "]" + "修改审核通过";
TabHaobanAudit tab2 = auditMapper.selectByPrimaryKey(auditId); TabHaobanAudit tab2 = auditMapper.selectByPrimaryKey(auditId);
String staffId = tab2.getCommitStaffId(); String staffId = tab2.getCommitStaffId();
// this.sendMessageByStaffId(staffId, storeId, title, content); // this.sendMessageByStaffId(staffId, storeId, title, content);
//插入log //插入log
if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){ if (org.apache.commons.lang.StringUtils.isNotBlank(batchId)) {
insertBatchLog( batchId,AuditRsultType.success.getCode(), tab); insertBatchLog(batchId, AuditRsultType.success.getCode(), tab);
} }
this.sendMessageByStaffId(staffId, storeId, false, content, ""); this.sendMessageByStaffId(staffId, storeId, false, content, "");
} else if (auditType == AuditType.CLERK_BIND.getCode()) { } else if (auditType == AuditType.CLERK_BIND.getCode()) {
//门店导购绑定 //门店导购绑定
String oldValue = tab.getOldValue(); String oldValue = tab.getOldValue();
AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class); AuditStaffDTO obj = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
StaffClerkRelationDTO staffClerkRelation = staffClerkRelationApiService.getByCodeAndEnterpriseId(obj.getClerkCode(),tab.getEnterpriseId()); StaffClerkRelationDTO staffClerkRelation = staffClerkRelationApiService.getByCodeAndEnterpriseId(obj.getClerkCode(), tab.getEnterpriseId());
String staffId = obj.getStaffId(); String staffId = obj.getStaffId();
String storeId = tab.getCommitStoreId(); String storeId = tab.getCommitStoreId();
StaffClerkRelationDTO have = staffClerkRelationApiService.getOneByStoreIdAndStaffId(storeId, staffId); StaffClerkRelationDTO have = staffClerkRelationApiService.getOneByStoreIdAndStaffId(storeId, staffId);
if(have !=null){ if (have != null) {
tab.setAuditStatus(5); tab.setAuditStatus(5);
tab.setAuditReason("该成员在该门店下已经绑定过一个导购了"); tab.setAuditReason("该成员在该门店下已经绑定过一个导购了");
auditMapper.updateByPrimaryKeySelective(tab); auditMapper.updateByPrimaryKeySelective(tab);
if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){ if (org.apache.commons.lang.StringUtils.isNotBlank(batchId)) {
insertBatchLog( batchId,AuditRsultType.fail.getCode(),tab); insertBatchLog(batchId, AuditRsultType.fail.getCode(), tab);
} }
staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, obj.getStaffId(), obj.getClerkId(), tab.getAuditReason(), true); staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, obj.getStaffId(), obj.getClerkId(), tab.getAuditReason(), true);
return "该成员在该门店下已经绑定过一个导购了"; return "该成员在该门店下已经绑定过一个导购了";
} }
ClerkDTO clerkDTO = clerkService.getClerkByClerkId(obj.getClerkId()); ClerkDTO clerkDTO = clerkService.getClerkByClerkId(obj.getClerkId());
if(clerkDTO == null){ if (clerkDTO == null) {
tab.setAuditStatus(5); tab.setAuditStatus(5);
tab.setAuditReason("gic已删除该导购"); tab.setAuditReason("gic已删除该导购");
auditMapper.updateByPrimaryKeySelective(tab); auditMapper.updateByPrimaryKeySelective(tab);
if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){ if (org.apache.commons.lang.StringUtils.isNotBlank(batchId)) {
insertBatchLog( batchId,AuditRsultType.fail.getCode(),tab); insertBatchLog(batchId, AuditRsultType.fail.getCode(), tab);
} }
staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, obj.getStaffId(), obj.getClerkId(), tab.getAuditReason(), true); staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, obj.getStaffId(), obj.getClerkId(), tab.getAuditReason(), true);
return "gic已删除该导购"; return "gic已删除该导购";
}else{ } else {
if(staffClerkRelation == null){ if (staffClerkRelation == null) {
staffClerkRelation = new StaffClerkRelationDTO(); staffClerkRelation = new StaffClerkRelationDTO();
} }
staffClerkRelation.setEnterpriseId(tab.getEnterpriseId()); staffClerkRelation.setEnterpriseId(tab.getEnterpriseId());
...@@ -227,10 +206,10 @@ public class AuditApiServiceImpl implements AuditApiService{ ...@@ -227,10 +206,10 @@ public class AuditApiServiceImpl implements AuditApiService{
staffClerkRelation.setWxEnterpriseId(tab.getWxEnterpriseId()); staffClerkRelation.setWxEnterpriseId(tab.getWxEnterpriseId());
staffClerkRelation.setWxUserId(obj.getWxUserId()); staffClerkRelation.setWxUserId(obj.getWxUserId());
staffClerkRelation.setStaffId(obj.getStaffId()); staffClerkRelation.setStaffId(obj.getStaffId());
staffClerkRelationApiService.delAndInsert(staffClerkRelation,optStaffId, ChannelCodeEnum.AUDIT_BIND.getCode()); staffClerkRelationApiService.delAndInsert(staffClerkRelation, optStaffId, ChannelCodeEnum.AUDIT_BIND.getCode());
} }
if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){ if (org.apache.commons.lang.StringUtils.isNotBlank(batchId)) {
insertBatchLog( batchId,AuditRsultType.success.getCode(), tab); insertBatchLog(batchId, AuditRsultType.success.getCode(), tab);
} }
//同意绑定 //同意绑定
staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, obj.getStaffId(), obj.getClerkId(), "", false); staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, obj.getStaffId(), obj.getClerkId(), "", false);
...@@ -240,49 +219,50 @@ public class AuditApiServiceImpl implements AuditApiService{ ...@@ -240,49 +219,50 @@ public class AuditApiServiceImpl implements AuditApiService{
} else if (auditType == AuditType.CLERK_ADD.getCode()) { } else if (auditType == AuditType.CLERK_ADD.getCode()) {
//门店导购新增 //门店导购新增
String oldValue = tab.getOldValue(); String oldValue = tab.getOldValue();
AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class); AuditStaffDTO obj = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
String flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAddNew(tab.getCommitStoreId(), obj.getClerkCode(), obj.getSex(), obj.getClerkName(), obj.getPhoneNumber(), obj.getNationCode(), null); String flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAddNew(tab.getCommitStoreId(), obj.getClerkCode(), obj.getSex(), obj.getClerkName(), obj.getPhoneNumber(), obj.getNationCode(), null);
if(!"1".equals(flag)){ if (!"1".equals(flag)) {
//失败 //失败
tab.setAuditStatus(5); tab.setAuditStatus(5);
tab.setAuditReason(flag); tab.setAuditReason(flag);
auditMapper.updateByPrimaryKeySelective(tab); auditMapper.updateByPrimaryKeySelective(tab);
if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){ if (org.apache.commons.lang.StringUtils.isNotBlank(batchId)) {
insertBatchLog( batchId,AuditRsultType.fail.getCode(), tab); insertBatchLog(batchId, AuditRsultType.fail.getCode(), tab);
} }
return flag; return flag;
}else{ } else {
//成功 //成功
if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){ if (org.apache.commons.lang.StringUtils.isNotBlank(batchId)) {
insertBatchLog( batchId,1, tab); insertBatchLog(batchId, 1, tab);
} }
staffDepartmentRelatedApiService.sendClerkAdd(obj.getClerkName(), obj.getClerkCode(),tab.getCommitStoreId(), 1, ""); staffDepartmentRelatedApiService.sendClerkAdd(obj.getClerkName(), obj.getClerkCode(), tab.getCommitStoreId(), 1, "");
} }
}else if(auditType == AuditType.CLERK_DEL.getCode()){ } else if (auditType == AuditType.CLERK_DEL.getCode()) {
//门店导购删除 //门店导购删除
String oldValue = tab.getOldValue(); String oldValue = tab.getOldValue();
AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class); AuditStaffDTO obj = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
syncHaobanToGicServiceApi.delGicClerk(obj.getClerkId()); syncHaobanToGicServiceApi.delGicClerk(obj.getClerkId());
if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){ if (org.apache.commons.lang.StringUtils.isNotBlank(batchId)) {
insertBatchLog( batchId,AuditRsultType.success.getCode(),tab); insertBatchLog(batchId, AuditRsultType.success.getCode(), tab);
} }
//解绑日志 //解绑日志
StaffClerkRelationDTO relationDTO = staffClerkRelationApiService.getByClerkId(obj.getClerkId()); StaffClerkRelationDTO relationDTO = staffClerkRelationApiService.getByClerkId(obj.getClerkId());
if (null != relationDTO) { if (null != relationDTO) {
staffClerkRelationApiService.pushToBindLog(relationDTO.getStaffId(),optStaffId,BindTypeEnum.UNBIND.getVal(),ChannelCodeEnum.SELF_UNBIND.getCode(),relationDTO.getStaffClerkRelationId()); staffClerkRelationApiService.pushToBindLog(relationDTO.getStaffId(), optStaffId, BindTypeEnum.UNBIND.getVal(), ChannelCodeEnum.SELF_UNBIND.getCode(), relationDTO.getStaffClerkRelationId());
} }
staffClerkRelationApiService.delByClerkId(obj.getClerkId()); staffClerkRelationApiService.delByClerkId(obj.getClerkId());
staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab.getCommitStoreId(), 1, ""); staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(), tab.getCommitStoreId(), 1, "");
}else if(auditType == AuditType.CLERK_UNBIND.getCode()){ } else if (auditType == AuditType.CLERK_UNBIND.getCode()) {
//解绑申请，无需审核，直接通过 //解绑申请，无需审核，直接通过
} }
tab.setAuditStatus(1); tab.setAuditStatus(1);
auditMapper.updateByPrimaryKeySelective(tab); auditMapper.updateByPrimaryKeySelective(tab);
return ""; return "";
} }
@Override @Override
public void refuse(String auditId, String auditReason,String auditStaffId,String auditName) { public void refuse(String auditId, String auditReason, String auditStaffId, String auditName) {
TabHaobanAudit tab = new TabHaobanAudit(); TabHaobanAudit tab = new TabHaobanAudit();
tab.setAuditId(auditId); tab.setAuditId(auditId);
tab.setAuditStatus(2); tab.setAuditStatus(2);
...@@ -296,7 +276,7 @@ public class AuditApiServiceImpl implements AuditApiService{ ...@@ -296,7 +276,7 @@ public class AuditApiServiceImpl implements AuditApiService{
String oldValue = tab2.getOldValue(); String oldValue = tab2.getOldValue();
String enterpriseId = tab2.getEnterpriseId(); String enterpriseId = tab2.getEnterpriseId();
//发送消息 //发送消息
if(auditType == AuditType.STORE_CHANGE.getCode()){ if (auditType == AuditType.STORE_CHANGE.getCode()) {
String changeField = tab2.getChangeField(); String changeField = tab2.getChangeField();
// String title = "门店信息修改通知"; // String title = "门店信息修改通知";
String content = StoreFieldEnum.getValueName(changeField); String content = StoreFieldEnum.getValueName(changeField);
...@@ -306,25 +286,26 @@ public class AuditApiServiceImpl implements AuditApiService{ ...@@ -306,25 +286,26 @@ public class AuditApiServiceImpl implements AuditApiService{
this.sendMessageByStaffId(staffId, storeId, true, content, auditReason); this.sendMessageByStaffId(staffId, storeId, true, content, auditReason);
}else if(auditType == AuditType.CLERK_BIND.getCode()){ } else if (auditType == AuditType.CLERK_BIND.getCode()) {
AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class); AuditStaffDTO obj = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
String staffId = tab2.getCommitStaffId(); String staffId = tab2.getCommitStaffId();
staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, staffId, obj.getClerkId(), auditReason, true); staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, staffId, obj.getClerkId(), auditReason, true);
// staffDepartmentRelatedApiService.sendStaffBind(obj.getStaffId(), obj.getClerkCode(), tab2.getCommitStoreId(), 2, auditReason); // staffDepartmentRelatedApiService.sendStaffBind(obj.getStaffId(), obj.getClerkCode(), tab2.getCommitStoreId(), 2, auditReason);
} else if (auditType == AuditType.CLERK_ADD.getCode()) { } else if (auditType == AuditType.CLERK_ADD.getCode()) {
AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class); AuditStaffDTO obj = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
staffDepartmentRelatedApiService.sendClerkAdd(obj.getClerkName(), obj.getClerkCode(),tab2.getCommitStoreId(), 2, auditReason); staffDepartmentRelatedApiService.sendClerkAdd(obj.getClerkName(), obj.getClerkCode(), tab2.getCommitStoreId(), 2, auditReason);
}else if(auditType == AuditType.CLERK_DEL.getCode()) { } else if (auditType == AuditType.CLERK_DEL.getCode()) {
AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class); AuditStaffDTO obj = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab2.getCommitStoreId(), 2, auditReason); staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(), tab2.getCommitStoreId(), 2, auditReason);
} }
} }
@Override @Override
public int save(Integer auditType,String wxEnterpriseId, String enterpriseId, public int save(Integer auditType, String wxEnterpriseId, String enterpriseId,
String commitStaffId, String commitStoreId, String changeField, String commitStaffId, String commitStoreId, String changeField,
String oldValue, String newValue) { String oldValue, String newValue) {
TabHaobanStaff staff = staffMapper.selectByPrimaryKey(commitStaffId); TabHaobanStaff staff = staffMapper.selectByPrimaryKey(commitStaffId);
if(staff == null){ if (staff == null) {
return 0; return 0;
} }
TabHaobanAudit tab = new TabHaobanAudit(); TabHaobanAudit tab = new TabHaobanAudit();
...@@ -347,12 +328,13 @@ public class AuditApiServiceImpl implements AuditApiService{ ...@@ -347,12 +328,13 @@ public class AuditApiServiceImpl implements AuditApiService{
tab.setUpdateTime(new Date()); tab.setUpdateTime(new Date());
return auditMapper.insertSelective(tab); return auditMapper.insertSelective(tab);
} }
@Override @Override
public void editStoreInfo(String storeId, String changeField, public void editStoreInfo(String storeId, String changeField,
String oldValue, String newValue) { String oldValue, String newValue) {
logger.info("===================进11"); logger.info("===================进11");
StoreDTO store = storeService.getStore(storeId); StoreDTO store = storeService.getStore(storeId);
if(!StoreFieldEnum.STORE_IMAG.getValue().equals(changeField)){ if (!StoreFieldEnum.STORE_IMAG.getValue().equals(changeField)) {
//非门店图片修改 //非门店图片修改
logger.info("===================进222"); logger.info("===================进222");
StoreDetailDTO detailDTO = new StoreDetailDTO(); StoreDetailDTO detailDTO = new StoreDetailDTO();
...@@ -362,66 +344,66 @@ public class AuditApiServiceImpl implements AuditApiService{ ...@@ -362,66 +344,66 @@ public class AuditApiServiceImpl implements AuditApiService{
detailDTO.setStatus(2); detailDTO.setStatus(2);
detailDTO.setOpenTime(null); detailDTO.setOpenTime(null);
detailDTO.setCloseTime(null); detailDTO.setCloseTime(null);
getStoreDTO( detailDTO, changeField, oldValue, newValue); getStoreDTO(detailDTO, changeField, oldValue, newValue);
logger.info("detailDTO====================>为{}",JSONObject.toJSONString(detailDTO)); logger.info("detailDTO====================>为{}", JSONObject.toJSONString(detailDTO));
storeService.saveStore(detailDTO); storeService.saveStore(detailDTO);
// storeService.saveOrUpdateStore(store); // storeService.saveOrUpdateStore(store);
}else{ } else {
//门店图片修改 //门店图片修改
logger.info("===================进333"); logger.info("===================进333");
storeService.updateStorePhotos(storeId, newValue); storeService.updateStorePhotos(storeId, newValue);
} }
} }
void getStoreDTO(StoreDetailDTO store,String changeField,String oldValue,String newValue){
logger.info("==========================>changeField={}",changeField); void getStoreDTO(StoreDetailDTO store, String changeField, String oldValue, String newValue) {
if(StoreFieldEnum.BUSINESS_TIME_STRING.getValue().equals(changeField)){ logger.info("==========================>changeField={}", changeField);
if (StoreFieldEnum.BUSINESS_TIME_STRING.getValue().equals(changeField)) {
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
//营业时间 //营业时间
String [] newValues = newValue.split("-"); String[] newValues = newValue.split("-");
String openTime = newValues[0]; String openTime = newValues[0];
String closeTime = newValues[1]; String closeTime = newValues[1];
store.setOpenTime(openTime); store.setOpenTime(openTime);
store.setCloseTime(closeTime); store.setCloseTime(closeTime);
}else if(StoreFieldEnum.CONACTS_PHONE.getValue().equals(changeField)){ } else if (StoreFieldEnum.CONACTS_PHONE.getValue().equals(changeField)) {
//联系电话 //联系电话
store.setConactsPhone(newValue); store.setConactsPhone(newValue);
}else if(StoreFieldEnum.STORE_ADDRESS.getValue().equals(changeField)){ } else if (StoreFieldEnum.STORE_ADDRESS.getValue().equals(changeField)) {
logger.info("==========================>进来333"); logger.info("==========================>进来333");
//门店地址 //门店地址
StoreAddressDTO obj = JSONObject.parseObject(newValue,StoreAddressDTO.class); StoreAddressDTO obj = JSONObject.parseObject(newValue, StoreAddressDTO.class);
String areaId = obj.getAreaId(); String areaId = obj.getAreaId();
String storeAddress = obj.getStoreAddress(); String storeAddress = obj.getStoreAddress();
logger.info("==========================>areaId={},storeAddress={},newValue={}",areaId,storeAddress,newValue); logger.info("==========================>areaId={},storeAddress={},newValue={}", areaId, storeAddress, newValue);
String[] arr = storeAddress.split(" "); String[] arr = storeAddress.split(" ");
store.setAreaId(areaId); store.setAreaId(areaId);
store.setFullArea(arr[0]); store.setFullArea(arr[0]);
//避免多个空格造成数据混乱 //避免多个空格造成数据混乱
store.setStoreAddress(storeAddress.substring(storeAddress.indexOf(arr[0])+arr[0].length()+1)); store.setStoreAddress(storeAddress.substring(storeAddress.indexOf(arr[0]) + arr[0].length() + 1));
}else if(StoreFieldEnum.STORE_AREA.getValue().equals(changeField)){ } else if (StoreFieldEnum.STORE_AREA.getValue().equals(changeField)) {
//门店面积 //门店面积
store.setStoreArea(Double.parseDouble(newValue)); store.setStoreArea(Double.parseDouble(newValue));
}else if(StoreFieldEnum.STORE_NAME.getValue().equals(changeField)){ } else if (StoreFieldEnum.STORE_NAME.getValue().equals(changeField)) {
//门店名字 //门店名字
store.setStoreName(newValue); store.setStoreName(newValue);
// TabHaobanDepartment tab = departmentMapper.getByRelatedId(store.getStoreId()); } else if (StoreFieldEnum.STORE_IMAG.getValue().equals(changeField)) {
// tab.setDepartmentName(newValue);
// departmentMapper.updateByPrimaryKey(tab);
}else if(StoreFieldEnum.STORE_IMAG.getValue().equals(changeField)){
//门店图片 //门店图片
} }
} }
@Override @Override
public List<AuditDTO> listByStoreId(String storeId) { public List<AuditDTO> listByStoreId(String storeId) {
List<TabHaobanAudit> list = auditMapper.listByStoreId(storeId); List<TabHaobanAudit> list = auditMapper.listByStoreId(storeId);
List<AuditDTO> resultList = EntityUtil.changeEntityListByJSON(AuditDTO.class, list); List<AuditDTO> resultList = EntityUtil.changeEntityListByJSON(AuditDTO.class, list);
return resultList; return resultList;
} }
@Override @Override
public AuditDTO findByStoreIdAndChangeField(String storeId, public AuditDTO findByStoreIdAndChangeField(String storeId,
String changeField) { String changeField) {
TabHaobanAudit tab = auditMapper.findByStoreIdAndChangeField(storeId,changeField); TabHaobanAudit tab = auditMapper.findByStoreIdAndChangeField(storeId, changeField);
if(tab == null){ if (tab == null) {
return null; return null;
} }
return EntityUtil.changeEntityByJSON(AuditDTO.class, tab); return EntityUtil.changeEntityByJSON(AuditDTO.class, tab);
...@@ -501,19 +483,21 @@ public class AuditApiServiceImpl implements AuditApiService{ ...@@ -501,19 +483,21 @@ public class AuditApiServiceImpl implements AuditApiService{
audit.setUpdateTime(new Date()); audit.setUpdateTime(new Date());
auditMapper.insertSelective(EntityUtil.changeEntityByJSON(TabHaobanAudit.class, audit)); auditMapper.insertSelective(EntityUtil.changeEntityByJSON(TabHaobanAudit.class, audit));
} }
@Override @Override
public Page<AuditDTO> listByStaffId(String staffId, Integer auditType,Integer auditStatus,BasePageInfo pageInfo) { public Page<AuditDTO> listByStaffId(String staffId, Integer auditType, Integer auditStatus, BasePageInfo pageInfo) {
PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize()); PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
return PageUtil.changePageHelperToCurrentPage(auditMapper.listByStaffId(staffId,auditType,auditStatus),AuditDTO.class); return PageUtil.changePageHelperToCurrentPage(auditMapper.listByStaffId(staffId, auditType, auditStatus), AuditDTO.class);
} }
@Override @Override
public Page<AuditDTO> pageStoreListByParams(String storeId, BasePageInfo pageInfo, Integer auditType, public Page<AuditDTO> pageStoreListByParams(String storeId, BasePageInfo pageInfo, Integer auditType,
Integer auditStatus) { Integer auditStatus) {
PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize()); PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
return PageUtil.changePageHelperToCurrentPage(auditMapper.pageStoreListByParams(storeId,auditType,auditStatus),AuditDTO.class); return PageUtil.changePageHelperToCurrentPage(auditMapper.pageStoreListByParams(storeId, auditType, auditStatus), AuditDTO.class);
} }
public void insertBatchLog(String batchId,int auditResult,TabHaobanAudit tab){ public void insertBatchLog(String batchId, int auditResult, TabHaobanAudit tab) {
EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(tab.getEnterpriseId()); EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(tab.getEnterpriseId());
TabHaobanBatchAuditLog batTab = new TabHaobanBatchAuditLog(); TabHaobanBatchAuditLog batTab = new TabHaobanBatchAuditLog();
batTab.setAuditId(tab.getAuditId()); batTab.setAuditId(tab.getAuditId());
...@@ -524,7 +508,7 @@ public class AuditApiServiceImpl implements AuditApiService{ ...@@ -524,7 +508,7 @@ public class AuditApiServiceImpl implements AuditApiService{
batTab.setCommitName(tab.getCommitStaffName()); batTab.setCommitName(tab.getCommitStaffName());
batTab.setCommitTime(tab.getCommitTime()); batTab.setCommitTime(tab.getCommitTime());
batTab.setCreateTime(new Date()); batTab.setCreateTime(new Date());
batTab.setEnterpriseName(enterprise == null ?"":enterprise.getEnterpriseName()); batTab.setEnterpriseName(enterprise == null ? "" : enterprise.getEnterpriseName());
batTab.setStatus(1); batTab.setStatus(1);
batTab.setUpdateTime(new Date()); batTab.setUpdateTime(new Date());
tabHaobanBatchAuditLogMapper.insert(batTab); tabHaobanBatchAuditLogMapper.insert(batTab);
...@@ -534,26 +518,30 @@ public class AuditApiServiceImpl implements AuditApiService{ ...@@ -534,26 +518,30 @@ public class AuditApiServiceImpl implements AuditApiService{
public AuditDTO findById(String auditId) { public AuditDTO findById(String auditId) {
return EntityUtil.changeEntityByJSON(AuditDTO.class, auditMapper.selectByPrimaryKey(auditId)); return EntityUtil.changeEntityByJSON(AuditDTO.class, auditMapper.selectByPrimaryKey(auditId));
} }
@Override @Override
public void update(AuditDTO audit) { public void update(AuditDTO audit) {
audit.setUpdateTime(new Date()); audit.setUpdateTime(new Date());
auditMapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(TabHaobanAudit.class, audit)); auditMapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(TabHaobanAudit.class, audit));
} }
@Override @Override
public List<BatchAuditLogDTO> listBatchLog(String batchId) { public List<BatchAuditLogDTO> listBatchLog(String batchId) {
List<TabHaobanBatchAuditLog > list = tabHaobanBatchAuditLogMapper.listByBatchId(batchId); List<TabHaobanBatchAuditLog> list = tabHaobanBatchAuditLogMapper.listByBatchId(batchId);
return EntityUtil.changeEntityListByJSON(BatchAuditLogDTO.class, list); return EntityUtil.changeEntityListByJSON(BatchAuditLogDTO.class, list);
} }
@Override @Override
public AuditDTO findByBindRelatedIdAndAuditType(String relatedId, public AuditDTO findByBindRelatedIdAndAuditType(String relatedId,
int auditType) { int auditType) {
TabHaobanAudit tab = auditMapper.findByBindRelatedIdAndAuditType(relatedId, auditType); TabHaobanAudit tab = auditMapper.findByBindRelatedIdAndAuditType(relatedId, auditType);
return EntityUtil.changeEntityByJSON(AuditDTO.class, tab); return EntityUtil.changeEntityByJSON(AuditDTO.class, tab);
} }
@Override @Override
public boolean judgeHavePhoneNumberOrCode(String enterpriseId, public boolean judgeHavePhoneNumberOrCode(String enterpriseId,
String clerkCode, String phoneNumber) { String clerkCode, String phoneNumber) {
List<TabHaobanAudit> list = auditMapper.judgeHavePhoneNumberOrCode(enterpriseId,clerkCode,phoneNumber); List<TabHaobanAudit> list = auditMapper.judgeHavePhoneNumberOrCode(enterpriseId, clerkCode, phoneNumber);
return !CollectionUtil.isEmpty(list); return !CollectionUtil.isEmpty(list);
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java
package com.gic.haoban.manage.service.service.out.impl; package com.gic.haoban.manage.service.service.out.impl;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.gic.haoban.base.api.common.Constant;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.enums.SecretTypeEnum;
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;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.JSONResponse; import com.gic.api.base.commons.JSONResponse;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
...@@ -39,19 +13,34 @@ import com.gic.enterprise.api.dto.StoreGroupDTO; ...@@ -39,19 +13,34 @@ import com.gic.enterprise.api.dto.StoreGroupDTO;
import com.gic.enterprise.api.service.StoreGroupService; import com.gic.enterprise.api.service.StoreGroupService;
import com.gic.enterprise.api.service.StoreService; import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.base.api.common.Constant;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.common.utils.PageUtil; import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.common.utils.StringUtil; import com.gic.haoban.common.utils.StringUtil;
import com.gic.haoban.contacts.manage.api.dto.SyncJsonColumnDTO; import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.enums.SecretTypeEnum;
import com.gic.haoban.manage.api.service.DepartmentApiService; import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
import com.gic.haoban.manage.service.dao.mapper.DepartmentMapper; import com.gic.haoban.manage.service.dao.mapper.DepartmentMapper;
import com.gic.haoban.manage.service.entity.TabHaobanDepartment; import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated; import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
import com.gic.haoban.manage.service.entity.TabHaobanSyncErrorLog; import com.gic.haoban.manage.service.entity.TabHaobanSyncErrorLog;
import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated; import com.gic.haoban.manage.service.service.*;
import com.gic.haoban.manage.service.task.RouterConstant; import com.gic.haoban.manage.service.task.RouterConstant;
import com.gic.redis.data.util.RedisUtil; import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.service.qywx.QywxDepartmentApiService; import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@Service @Service
public class DepartmentApiServiceImpl implements DepartmentApiService { public class DepartmentApiServiceImpl implements DepartmentApiService {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/KafkaMessageServiceImpl.java
...@@ -10,26 +10,19 @@ import com.gic.commons.util.EntityUtil; ...@@ -10,26 +10,19 @@ import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GICMQClientUtil; import com.gic.commons.util.GICMQClientUtil;
import com.gic.dubbo.entity.ProviderLocalTag; import com.gic.dubbo.entity.ProviderLocalTag;
import com.gic.haoban.base.api.common.ServiceResponse; import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.contacts.manage.api.enums.StatusEnum;
import com.gic.haoban.manage.api.dto.FlushStoreMqDTO; import com.gic.haoban.manage.api.dto.FlushStoreMqDTO;
import com.gic.haoban.manage.api.dto.StaffClerkBindLogInfoDTO;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO; import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.enums.ChannelCodeEnum; import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
import com.gic.haoban.manage.api.enums.StatusEnum;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService; import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService; import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.service.pojo.BinlogBasePojo; import com.gic.haoban.manage.service.pojo.BinlogBasePojo;
import com.gic.haoban.manage.service.pojo.ClerkSyncPojo; import com.gic.haoban.manage.service.pojo.ClerkSyncPojo;
import com.gic.haoban.manage.service.pojo.GroupSyncPojo; import com.gic.haoban.manage.service.pojo.GroupSyncPojo;
import com.gic.haoban.manage.service.pojo.StoreSyncPojo; import com.gic.haoban.manage.service.pojo.StoreSyncPojo;
import com.gic.haoban.manage.service.service.StaffClerkBindLogService;
import com.gic.haoban.manage.service.service.StaffClerkRelationService; import com.gic.haoban.manage.service.service.StaffClerkRelationService;
import com.gic.haoban.manage.service.service.StoreRangeService; import com.gic.haoban.manage.service.service.StoreRangeService;
import com.gic.haoban.task.api.dto.MqMessageQo; import com.gic.haoban.task.api.dto.MqMessageQo;
import com.gic.mq.sdk.exception.RouterException;
import com.gic.qcloud.cmq.CMQClientException;
import com.gic.qcloud.cmq.CMQServerException;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.time.DateUtils;
import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -58,9 +51,6 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor ...@@ -58,9 +51,6 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
private StaffClerkRelationService staffClerkRelationService; private StaffClerkRelationService staffClerkRelationService;
@Autowired @Autowired
private StaffClerkBindLogService staffClerkBindLogService;
@Autowired
private StaffClerkRelationApiService staffClerkRelationApiService; private StaffClerkRelationApiService staffClerkRelationApiService;
@Autowired @Autowired
......
haoban-manage3-web/pom.xml
...@@ -113,11 +113,7 @@ ...@@ -113,11 +113,7 @@
<artifactId>poi-ooxml-schemas</artifactId> <artifactId>poi-ooxml-schemas</artifactId>
<version>3.9</version> <version>3.9</version>
</dependency> </dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-contacts-api</artifactId>
<version>${haoban-contacts-api}</version>
</dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>haoban-manage3-api</artifactId> <artifactId>haoban-manage3-api</artifactId>
...@@ -131,16 +127,6 @@ ...@@ -131,16 +127,6 @@
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>haoban-contacts-manage-api</artifactId>
<version>${haoban-contacts-manage-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-auth-api</artifactId>
<version>${haoban-auth-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-operation-api</artifactId> <artifactId>haoban-operation-api</artifactId>
<version>${haoban-operation-api}</version> <version>${haoban-operation-api}</version>
</dependency> </dependency>
...@@ -160,15 +146,11 @@ ...@@ -160,15 +146,11 @@
<artifactId>gic-thirdparty-api</artifactId> <artifactId>gic-thirdparty-api</artifactId>
<version>${gic-thirdparty-api}</version> <version>${gic-thirdparty-api}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>haoban-message-api</artifactId> <artifactId>gic-thirdparty-sdk</artifactId>
<version>${haoban-message-api}</version> <version>${gic-thirdparty-sdk}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-app-announcement-api</artifactId>
<version>${haoban-app-announcement-api}</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -178,28 +160,17 @@ ...@@ -178,28 +160,17 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-mobile-app-api</artifactId>
<version>${haoban-mobile-app-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-thirdparty-sdk</artifactId>
<version>${gic-thirdparty-sdk}</version>
</dependency>
<dependency>
<groupId>com.gic.operation</groupId> <groupId>com.gic.operation</groupId>
<artifactId>gic-operation-api</artifactId> <artifactId>gic-operation-api</artifactId>
<version>${gic-operation-api}</version> <version>${gic-operation-api}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>gic-enterprise-api</artifactId> <artifactId>gic-enterprise-api</artifactId>
<version>${gic-enterprise-api}</version> <version>${gic-enterprise-api}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>gic-clerk-api</artifactId> <artifactId>gic-clerk-api</artifactId>
...@@ -216,6 +187,7 @@ ...@@ -216,6 +187,7 @@
<artifactId>gic-cloud-data-api</artifactId> <artifactId>gic-cloud-data-api</artifactId>
<version>${gic-cloud-data-api}</version> <version>${gic-cloud-data-api}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>gic-cloud-web-service-api</artifactId> <artifactId>gic-cloud-web-service-api</artifactId>
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WebBaseController.java
package com.gic.haoban.manage.web.controller; package com.gic.haoban.manage.web.controller;
import com.gic.haoban.auth.api.dto.DisplayRelationShortInfoDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil; import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.common.utils.EntityUtil; import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.common.utils.HaobanResponse; import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.LoginDTO; import com.gic.haoban.manage.api.dto.LoginDTO;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode; import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import org.apache.commons.collections.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
/** /**
* Created 2018/7/18. * Created 2018/7/18.
...@@ -54,24 +49,4 @@ public class WebBaseController { ...@@ -54,24 +49,4 @@ public class WebBaseController {
return EntityUtil.changeEntityByJSON(LoginDTO.class, AuthWebRequestUtil.getLoginUser()); return EntityUtil.changeEntityByJSON(LoginDTO.class, AuthWebRequestUtil.getLoginUser());
} }
public boolean haveRight(List<DisplayRelationShortInfoDTO> list) {
List<String> groupList = new ArrayList<String>();
List<String> storeList = new ArrayList<String>();
List<String> clerkList = new ArrayList<String>();
if (list == null) {
return false;
}
for (DisplayRelationShortInfoDTO showDto : list) {
if (showDto.getGroupId() != null) {
groupList.add(showDto.getGroupId());
}
if (showDto.getStoreId() != null) {
storeList.add(showDto.getStoreId());
}
if (showDto.getClerkId() != null) {
clerkList.add(showDto.getClerkId());
}
}
return !CollectionUtils.isEmpty(groupList) || !CollectionUtils.isEmpty(storeList) || !CollectionUtils.isEmpty(clerkList);
}
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/response/MenuDetailResponse.java deleted 100644 → 0
package com.gic.haoban.manage.web.response;
import com.gic.haoban.auth.api.dto.MenuRightDTO;
import java.io.Serializable;
import java.util.List;
/**
* Created 2018/12/27.
*
* @author hua
*/
public class MenuDetailResponse implements Serializable {
private MenuRightDTO top;
private List<MenuRightDTO> leftMenu;
private MenuRightDTO current;
public MenuRightDTO getTop() {
return top;
}
public void setTop(MenuRightDTO top) {
this.top = top;
}
public List<MenuRightDTO> getLeftMenu() {
return leftMenu;
}
public void setLeftMenu(List<MenuRightDTO> leftMenu) {
this.leftMenu = leftMenu;
}
public MenuRightDTO getCurrent() {
return current;
}
public void setCurrent(MenuRightDTO current) {
this.current = current;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/response/RoleDetailResponse.java deleted 100644 → 0
package com.gic.haoban.manage.web.response;
import com.gic.haoban.auth.api.dto.MenuRightInfoDTO;
import com.gic.haoban.auth.api.dto.RoleDTO;
import java.io.Serializable;
import java.util.List;
/**
* Created 2018/12/17.
*
* @author hua
*/
public class RoleDetailResponse implements Serializable {
public RoleDTO role;
public List<MenuRightInfoDTO> menuRightList;
public RoleDTO getRole() {
return role;
}
public void setRole(RoleDTO role) {
this.role = role;
}
public List<MenuRightInfoDTO> getMenuRightList() {
return menuRightList;
}
public void setMenuRightList(List<MenuRightInfoDTO> menuRightList) {
this.menuRightList = menuRightList;
}
}
\ No newline at end of file
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/response/WebLoginResponse.java deleted 100644 → 0
package com.gic.haoban.manage.web.response;
import com.gic.haoban.manage.api.dto.EnterpriseDTO;
import java.io.Serializable;
import java.util.List;
/**
* Created 2018/12/28.
*
* @author hua
*/
public class WebLoginResponse implements Serializable {
private String userId;
private List<EnterpriseDTO> enterpriseList;
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public List<EnterpriseDTO> getEnterpriseList() {
return enterpriseList;
}
public void setEnterpriseList(List<EnterpriseDTO> enterpriseList) {
this.enterpriseList = enterpriseList;
}
}
haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
...@@ -96,6 +96,4 @@ ...@@ -96,6 +96,4 @@
retries="0" check="false"/> retries="0" check="false"/>
</beans> </beans>
haoban-manage3-wx/pom.xml
...@@ -14,10 +14,6 @@ ...@@ -14,10 +14,6 @@
<version>${libraryVersion}</version> <version>${libraryVersion}</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>haoban-manage3-wx Maven Webapp</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<commonVersion>3.0-SNAPSHOT</commonVersion> <commonVersion>3.0-SNAPSHOT</commonVersion>
...@@ -103,24 +99,10 @@ ...@@ -103,24 +99,10 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>haoban-contacts-api</artifactId>
<version>${haoban-contacts-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-manage3-api</artifactId> <artifactId>haoban-manage3-api</artifactId>
<version>${haoban-manage3-api}</version> <version>${haoban-manage3-api}</version>
</dependency> </dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-contacts-manage-api</artifactId>
<version>${haoban-contacts-manage-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-auth-api</artifactId>
<version>${haoban-auth-api}</version>
</dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>haoban-operation-api</artifactId> <artifactId>haoban-operation-api</artifactId>
...@@ -149,34 +131,15 @@ ...@@ -149,34 +131,15 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>haoban-message-api</artifactId>
<version>${haoban-message-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-app-announcement-api</artifactId>
<version>${haoban-app-announcement-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-communicate-api</artifactId> <artifactId>haoban-communicate-api</artifactId>
<version>${haoban-communicate-api}</version> <version>${haoban-communicate-api}</version>
</dependency> </dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-mobile-app-api</artifactId>
<version>${haoban-mobile-app-api}</version>
</dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>gic-thirdparty-sdk</artifactId> <artifactId>gic-thirdparty-sdk</artifactId>
<version>${gic-thirdparty-sdk}</version> <version>${gic-thirdparty-sdk}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic.operation</groupId> <groupId>com.gic.operation</groupId>
<artifactId>gic-operation-api</artifactId> <artifactId>gic-operation-api</artifactId>
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WebBaseController.java
package com.gic.haoban.manage.web.controller; package com.gic.haoban.manage.web.controller;
import com.gic.haoban.auth.api.dto.DisplayRelationShortInfoDTO;
import com.gic.haoban.base.api.common.pojo.dto.WellDoneLoginDTO; import com.gic.haoban.base.api.common.pojo.dto.WellDoneLoginDTO;
import com.gic.haoban.common.utils.AuthRequestWellDoneUtil; import com.gic.haoban.common.utils.AuthRequestWellDoneUtil;
import com.gic.haoban.common.utils.HaobanResponse; import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode; import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import org.apache.commons.collections.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
/** /**
* Created 2018/7/18. * Created 2018/7/18.
...@@ -54,24 +48,4 @@ public class WebBaseController { ...@@ -54,24 +48,4 @@ public class WebBaseController {
return AuthRequestWellDoneUtil.getLoginUser(); return AuthRequestWellDoneUtil.getLoginUser();
} }
public boolean haveRight(List<DisplayRelationShortInfoDTO> list){
List<String> groupList = new ArrayList<String>();
List<String> storeList = new ArrayList<String>();
List<String> clerkList = new ArrayList<String>();
if(list==null){
return false;
}
for(DisplayRelationShortInfoDTO showDto :list){
if(showDto.getGroupId()!=null){
groupList.add(showDto.getGroupId());
}
if(showDto.getStoreId()!=null){
storeList.add(showDto.getStoreId());
}
if(showDto.getClerkId()!=null){
clerkList.add(showDto.getClerkId());
}
}
return !CollectionUtils.isEmpty(groupList) || !CollectionUtils.isEmpty(storeList) || !CollectionUtils.isEmpty(clerkList);
}
} }
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/response/MenuDetailResponse.java deleted 100644 → 0
package com.gic.haoban.manage.web.response;
import com.gic.haoban.auth.api.dto.MenuRightDTO;
import java.io.Serializable;
import java.util.List;
/**
* Created 2018/12/27.
*
* @author hua
*/
public class MenuDetailResponse implements Serializable {
private MenuRightDTO top;
private List<MenuRightDTO> leftMenu;
private MenuRightDTO current;
public MenuRightDTO getTop() {
return top;
}
public void setTop(MenuRightDTO top) {
this.top = top;
}
public List<MenuRightDTO> getLeftMenu() {
return leftMenu;
}
public void setLeftMenu(List<MenuRightDTO> leftMenu) {
this.leftMenu = leftMenu;
}
public MenuRightDTO getCurrent() {
return current;
}
public void setCurrent(MenuRightDTO current) {
this.current = current;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/response/RoleDetailResponse.java deleted 100644 → 0
package com.gic.haoban.manage.web.response;
import com.gic.haoban.auth.api.dto.MenuRightInfoDTO;
import com.gic.haoban.auth.api.dto.RoleDTO;
import java.io.Serializable;
import java.util.List;
/**
* Created 2018/12/17.
*
* @author hua
*/
public class RoleDetailResponse implements Serializable {
public RoleDTO role;
public List<MenuRightInfoDTO> menuRightList;
public RoleDTO getRole() {
return role;
}
public void setRole(RoleDTO role) {
this.role = role;
}
public List<MenuRightInfoDTO> getMenuRightList() {
return menuRightList;
}
public void setMenuRightList(List<MenuRightInfoDTO> menuRightList) {
this.menuRightList = menuRightList;
}
}
\ No newline at end of file
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