fix:删除无效代码，代码优化

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffDepartmentRelatedApiService.java

 package com.gic.haoban.manage.api.service;
 
+import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
+
 import java.util.List;
 import java.util.Map;
 
-import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
-
 
 public interface StaffDepartmentRelatedApiService {
 
@@ -25,41 +25,49 @@ public interface StaffDepartmentRelatedApiService {
      */
     StaffDepartmentRelatedDTO getByStaffDepartmentRelatedId(String staffDepartmentRelatedId);
 
-    void deleteCode(StaffDepartmentRelatedDTO dto);
+	void deleteCode(StaffDepartmentRelatedDTO dto);
 
 	StaffDepartmentRelatedDTO getOneByClerkCodeAndDepartmentId(String clerkCode, String departmentId);
 
 	StaffDepartmentRelatedDTO getOneByStaffIdAndDepartmentId(String staffId, String departmentId);
 
-	Map<String,String>  getWxUserIdByClerkId(String clerkId);
-	
-	String getPageUrl(int type,String data);
-	
-	//发送消息，单人发送
-	boolean sendSingleMessage(String clerkId,String title,String content,String pageUrl);
+	Map<String, String> getWxUserIdByClerkId(String clerkId);
+
+	String getPageUrl(int type, String data);
+
+	/**
+	 * 发送消息，单人发送
+	 *
+	 * @param clerkId
+	 * @param title
+	 * @param content
+	 * @param pageUrl
+	 * @return
+	 */
+	boolean sendSingleMessage(String clerkId, String title, String content, String pageUrl);
 
 	/**
 	 * 单人消息发送通用方法
 	 *
-	 * @param clerkId : 接收人id
-	 * @param title : 通知标题
+	 * @param clerkId    : 接收人id
+	 * @param title      : 通知标题
 	 * @param contentMap : 时间集合, key 为类型, value : 内容(例如 接收事件 : 事件内容)
-	 * @param pageUrl : 跳转地址
+	 * @param pageUrl    : 跳转地址
 	 * @return : 返回是否发送成功
 	 */
 	Boolean sendSingleMessage(String clerkId, String title, Map<String, String> contentMap, String pageUrl);
 
 	//发送消息，带审核理由
-	public boolean sendAuditMessage(String clerkId, String title,String content, String pageUrl,int auditStatus, String auditReason);
+	boolean sendAuditMessage(String clerkId, String title, String content, String pageUrl, int auditStatus, String auditReason);
 
 	List<StaffDepartmentRelatedDTO> listByStaffIds(List<String> staffIds);
-	
-	public void sendClerkBind(String staffId,String clerkCode,String storeId,int auditStatus,String auditReason);
-	
-	public void sendStaffBind(String staffId,String clerkCode,String storeId,int auditStatus,String auditReason);
 
-	public void sendClerkAdd (String clerkName,String clerkCode,String storeId,int auditStatus,String auditReason);
+	void sendClerkBind(String staffId, String clerkCode, String storeId, int auditStatus, String auditReason);
+
+	void sendStaffBind(String staffId, String clerkCode, String storeId, int auditStatus, String auditReason);
+
+	void sendClerkAdd(String clerkName, String clerkCode, String storeId, int auditStatus, String auditReason);
 
-	public void sendClerkDel (String clerkName,String clerkCode,String storeId,int auditStatus,String auditReason);
+	void sendClerkDel(String clerkName, String clerkCode, String storeId, int auditStatus, String auditReason);
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java

@@ -14,11 +14,9 @@ import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
-import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
-import com.gic.haoban.manage.service.service.DepartmentService;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
 import com.gic.wechat.api.dto.qywx.ItemDTO;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
@@ -37,7 +35,7 @@ import java.util.*;
 
 @Service
 public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRelatedApiService {
-    private static Logger logger= LoggerFactory.getLogger(StaffDepartmentRelatedApiServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(StaffDepartmentRelatedApiServiceImpl.class);
 
 	@Autowired
 	private StaffDepartmentRelatedService staffDepartmentRelatedService;
@@ -50,10 +48,6 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	@Autowired
 	private WxEnterpriseMapper wxEnterpriseMapper;
 	@Autowired
-	private WxEnterpriseRelatedMapper wxEnterpriseRelatedMapper;
-	@Autowired
-	private DepartmentService departmentService;
-	@Autowired
 	private Config config;
 	@Autowired
 	private TabHaobanStaffClerkRelationMapper tabHaobanStaffClerkRelationMapper;
@@ -61,20 +55,19 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	private  StaffApiService staffApiService;
 
 	@Override
-	public List<StaffDepartmentRelatedDTO> listByDepartmentId(
-			String departmentId) {
+	public List<StaffDepartmentRelatedDTO> listByDepartmentId(String departmentId) {
 		List<TabHaobanStaffDepartmentRelated> list = staffDepartmentRelatedService.listByDepartmentId(departmentId);
 		List<StaffDepartmentRelatedDTO> resultList = EntityUtil.changeEntityListByJSON(StaffDepartmentRelatedDTO.class, list);
 		return resultList;
 	}
 
 	@Override
-	public List<StaffDepartmentRelatedDTO> listByDepartmentIds(
-			List<String> departmentIds) {
+	public List<StaffDepartmentRelatedDTO> listByDepartmentIds(List<String> departmentIds) {
 		List<TabHaobanStaffDepartmentRelated> list = staffDepartmentRelatedMapper.listByDepartmentIds(departmentIds);
 		List<StaffDepartmentRelatedDTO> resultList = EntityUtil.changeEntityListByJSON(StaffDepartmentRelatedDTO.class, list);
 		return resultList;
 	}
+
 	@Override
 	public void updateById(StaffDepartmentRelatedDTO dto) {
 		TabHaobanStaffDepartmentRelated tab = EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, dto);
@@ -187,13 +180,13 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		String wxUserId = staffDTO.getWxUserId();
 		String corpId = tabHaobanWxEnterprise.getCorpid();
 		String name = staffDTO.getStaffName();
-		if(content.length()>30){
+		if (content.length() > 30) {
 			content = content.substring(0, 26);
-			content = content+"...";
+			content = content + "...";
 		}
 		//先发送下，试试
 		QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
-		List<ItemDTO> items = new ArrayList();;
+		List<ItemDTO> items = new ArrayList();
 		ItemDTO dto1 = new ItemDTO();
 		ItemDTO dto2 = new ItemDTO();
 		ItemDTO dto3 = new ItemDTO();
@@ -269,17 +262,18 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	}
 
 	//导购删除，，审核记录，，消息发送
-	public void sendClerkDel (String clerkName,String clerkCode,String storeId,int auditStatus,String auditReason){
-        //TODO huang 发送店长，门店关联记录列表
-        String messageTitle = "门店导购变更";
-		String messageContent ="删除导购："+ clerkName+"（"+clerkCode+"）";
+	@Override
+	public void sendClerkDel(String clerkName, String clerkCode, String storeId, int auditStatus, String auditReason) {
+		//TODO huang 发送店长，门店关联记录列表
+		String messageTitle = "门店导购变更";
+		String messageContent = "删除导购：" + clerkName + "（" + clerkCode + "）";
 		JSONObject jsonObject = new JSONObject();
 		jsonObject.put("storeId", storeId);
 		String data = jsonObject.toJSONString();
-        ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(storeId);
-		if(gicClerk == null){
-			logger.info("店长不存在，发送消息失败{}",storeId);
-			return ;
+		ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(storeId);
+		if (gicClerk == null) {
+			logger.info("店长不存在，发送消息失败{}", storeId);
+			return;
 		}
 		TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(gicClerk.getClerkId());
 		if(tab == null){
@@ -301,17 +295,17 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		String corpId = map.get("corpId");
 		String name = map.get("clerkName");
 
-		if(jodd.util.StringUtil.isEmpty(wxUserId)){
-			logger.info("wxUserId不存在============clerkId={}",clerkId);
+		if (jodd.util.StringUtil.isEmpty(wxUserId)) {
+			logger.info("wxUserId不存在============clerkId={}", clerkId);
 			return false;
 		}
-		if(content.length()>30){
+		if (content.length() > 30) {
 			content = content.substring(0, 26);
-			content = content+"...";
+			content = content + "...";
 		}
 		//先发送下，试试
 		QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
-		List<ItemDTO> items = new ArrayList();;
+		List<ItemDTO> items = new ArrayList();
 		ItemDTO dto1 = new ItemDTO();
 		ItemDTO dto2 = new ItemDTO();
 		dto1.setKey("接收人");
@@ -320,8 +314,8 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		dto2.setValue(content);
 		items.add(dto1);
 		items.add(dto2);
-        ArrayList<String> list = new ArrayList<>();
-        list.add(wxUserId);
+		ArrayList<String> list = new ArrayList<>();
+		list.add(wxUserId);
 		messageDTO.setAppid(config.getAppid());
         messageDTO.setUserIds(list);
         messageDTO.setPage(pageUrl);
@@ -391,22 +385,22 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	@Override
 	public boolean sendAuditMessage(String staffId, String title,
 			String content, String pageUrl,int auditStatus, String auditReason) {
-		Map<String,String> map = getWxUserIdByStaffId(staffId);
+		Map<String, String> map = getWxUserIdByStaffId(staffId);
 		String wxUserId = map.get("wxUserId");
 		String corpId = map.get("corpId");
 		String name = map.get("staffName");
 
-		if(jodd.util.StringUtil.isEmpty(wxUserId)){
-			logger.info("wxUserId不存在============clerkId={}",staffId);
+		if (StringUtils.isEmpty(wxUserId)) {
+			logger.info("wxUserId不存在============clerkId={}", staffId);
 			return false;
 		}
-		if(content.length()>30){
+		if (content.length() > 30) {
 			content = content.substring(0, 26);
-			content = content+"...";
+			content = content + "...";
 		}
 		//先发送下，试试
 		QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
-		List<ItemDTO> items = new ArrayList();;
+		List<ItemDTO> items = new ArrayList();
 		ItemDTO dto1 = new ItemDTO();
 		ItemDTO dto2 = new ItemDTO();
 		ItemDTO dto3 = new ItemDTO();
@@ -440,6 +434,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		logger.info("发送===============》{}",b);
 		return b;
 	}
+
 	@Override
 	public String getPageUrl(int type, String data) {
 		String baseUrl = "/pages/route/index";