refactor:代码优化

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

@@ -20,6 +20,7 @@ public interface MessageApiService {
 	 *
 	 * @param qywxCallBackDTO
 	 */
+	@Deprecated
 	void wxMessageReceive(QywxCallBackDTO qywxCallBackDTO);
 
 	/**

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

 package com.gic.haoban.manage.api.service;
 
-import java.util.List;
-import java.util.Set;
-
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.manage.api.dto.*;
 
+import java.util.List;
+import java.util.Set;
+
 public interface WxEnterpriseApiService {
 
 	/**
-	 * 接收企业回调信息
+	 * 好办接收企业微信回调信息
+	 *
 	 * @param dto
 	 */
 	void callbackReviceEnterprise(QywxCorpInfoSimpleDTO dto);
@@ -40,19 +41,21 @@ public interface WxEnterpriseApiService {
 
 	/**
 	 * 获取配置
+	 *
 	 * @param wxEnterpriseId
 	 * @param secretType
 	 * @param enterpriseId
 	 * @return
 	 */
-	public SecretSettingDTO getSecretSetting(String wxEnterpriseId,int secretType,String enterpriseId);
+	SecretSettingDTO getSecretSetting(String wxEnterpriseId, int secretType, String enterpriseId);
 
 	/**
 	 * 保存
+	 *
 	 * @param secretSettingDTO
 	 * @return
 	 */
-	public boolean saveSecretSetting(SecretSettingDTO secretSettingDTO);
+	boolean saveSecretSetting(SecretSettingDTO secretSettingDTO);
 
 	/**
 	 * secretList
@@ -66,7 +69,7 @@ public interface WxEnterpriseApiService {
 	 * @param secretId
 	 * @return
 	 */
-	public boolean delSecretSetting(String secretId);
+	boolean delSecretSetting(String secretId);
 
 	/**
 	 * 保存小程序配置
@@ -74,7 +77,7 @@ public interface WxEnterpriseApiService {
 	 * @param miniprogramSettingDTO
 	 * @return
 	 */
-	public boolean saveMiniprogramSetting(MiniprogramSettingDTO miniprogramSettingDTO);
+	boolean saveMiniprogramSetting(MiniprogramSettingDTO miniprogramSettingDTO);
 
 
 	/**
@@ -83,7 +86,7 @@ public interface WxEnterpriseApiService {
 	 * @param wxEnterpriseId
 	 * @return
 	 */
-	public List<MiniprogramSettingDTO> listMiniprogramSetting(String wxEnterpriseId);
+	List<MiniprogramSettingDTO> listMiniprogramSetting(String wxEnterpriseId);
 
 	/**
 	 * 获取单个小程序配置
@@ -92,30 +95,30 @@ public interface WxEnterpriseApiService {
 	 * @param enterpriseId
 	 * @return
 	 */
-	public MiniprogramSettingDTO getMiniprogramSettingByEid(String wxEnterpriseId, String enterpriseId);
+	MiniprogramSettingDTO getMiniprogramSettingByEid(String wxEnterpriseId, String enterpriseId);
 
 
-    /**
-     * 获取单个小程序配置
-     *
-     * @param wxEnterpriseId
-     * @param appId
-     * @return
-     */
-    public MiniprogramSettingDTO getMiniprogramSettingByAppId(String wxEnterpriseId, String appId);
+	/**
+	 * 获取单个小程序配置
+	 *
+	 * @param wxEnterpriseId
+	 * @param appId
+	 * @return
+	 */
+	MiniprogramSettingDTO getMiniprogramSettingByAppId(String wxEnterpriseId, String appId);
 
 	/**
 	 * 删除 小程序配置
 	 *
 	 * @return
 	 */
-	public boolean delMiniprogramSettingByEid(String id);
+	boolean delMiniprogramSettingByEid(String id);
 
 	/**
 	 * @param dto
 	 * @return
 	 */
-	public boolean saveWelcome(WelcomeDTO dto);
+	boolean saveWelcome(WelcomeDTO dto);
 
 	/**
 	 * 获取欢迎语
@@ -123,7 +126,7 @@ public interface WxEnterpriseApiService {
 	 * @param wxEnterpriseId
 	 * @return
 	 */
-	public WelcomeDTO getWelcome(String wxEnterpriseId);
+	WelcomeDTO getWelcome(String wxEnterpriseId);
 
 	/**
 	 * 获取欢迎语
@@ -131,7 +134,7 @@ public interface WxEnterpriseApiService {
 	 * @param wxEnterpriseId
 	 * @return
 	 */
-	public boolean setWelcome(String wxEnterpriseId, Integer openFlag);
+	boolean setWelcome(String wxEnterpriseId, Integer openFlag);
 
 	/**
 	 * 获取欢迎语
@@ -139,5 +142,5 @@ public interface WxEnterpriseApiService {
 	 * @param wxEnterpriseId
 	 * @return
 	 */
-	public boolean delWelcome(String wxEnterpriseId);
+	boolean delWelcome(String wxEnterpriseId);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/SecretSettingMapper.java

 package com.gic.haoban.manage.service.dao.mapper;
 
-import com.gic.haoban.manage.api.dto.SecretSettingDTO;
 import com.gic.haoban.manage.service.entity.TabSecretSetting;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import retrofit2.http.PATCH;
 
 import java.util.List;
 
@@ -43,10 +41,13 @@ public interface SecretSettingMapper {
 
     /**
      * 获取配置
+     *
      * @param wxEnterpriseId
      * @param secretType
      * @return
      */
-    TabSecretSetting getSecretSetting(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("secretType") int secretType, @Param("enterpriseId") String enterpriseId);
+    TabSecretSetting getSecretSetting(@Param("wxEnterpriseId") String wxEnterpriseId,
+                                      @Param("secretType") int secretType,
+                                      @Param("enterpriseId") String enterpriseId);
 
 }
\ No newline at end of file

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

@@ -6,7 +6,6 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.commons.util.GlobalInfo;
 import com.gic.commons.util.GlobalVar;
-import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.app.customer.service.api.service.InnerApiService;
 import com.gic.haoban.base.api.common.Constant;
 import com.gic.haoban.manage.api.dto.*;
@@ -19,7 +18,10 @@ import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
-import com.gic.haoban.manage.service.service.*;
+import com.gic.haoban.manage.service.service.DepartmentService;
+import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
+import com.gic.haoban.manage.service.service.StaffService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.thirdparty.api.dto.PicUploadResDTO;
 import com.gic.thirdparty.api.service.QQCloudPicService;
@@ -48,12 +50,10 @@ import java.util.Map;
 @Service("messageApiService")
 public class MessageApiServiceImpl implements MessageApiService {
     private static final Logger log = LogManager.getLogger(MessageApiServiceImpl.class);
-
+    private final String CONTACT_APP = "contactSuiteId";
     @Autowired
     private DepartmentService departmentService;
     @Autowired
-    private WxEnterpriseRelatedService wxEnterpriseRelatedService;
-    @Autowired
     private DepartmentApiService departmentApiService;
     @Autowired
     private WxEnterpriseService enterpriseService;
@@ -64,8 +64,6 @@ public class MessageApiServiceImpl implements MessageApiService {
     @Autowired
     private StaffApiService staffApiService;
     @Autowired
-    private WxApplicationService wxApplicationService;
-    @Autowired
     private Config config;
     @Autowired
     private QywxDepartmentApiService qywxDepartmentApiService;
@@ -76,11 +74,6 @@ public class MessageApiServiceImpl implements MessageApiService {
     @Autowired
     private InnerApiService innerApiService;
 
-    private final String CONTACT_APP = "contactSuiteId";
-
-    @Autowired
-    private StoreService storeService;
-
     @Autowired
     private StaffClerkRelationApiService staffClerkRelationApiService;