Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.service;
 
 import java.util.List;
 
+import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.manage.api.dto.QywxCorpInfoSimpleDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
@@ -17,7 +18,7 @@ public interface WxEnterpriseApiService {
 	 * 运维后台获取微信企业id列表
 	 * @return
 	 */
-	List<YwWxEnterpriseDTO> list();
+	List<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,String gicContactFlag,String version);
 	/**
 	 * 获取一个
 	 * @param wxEnterpriseId

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

@@ -5,11 +5,14 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.gic.commons.util.GlobalVar;
+import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
@@ -18,13 +21,14 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 @RestController
 public class EnterpriseController extends WebBaseController{
     private static final String LOGIN_URL = "/haoban-manage3-web/yw-login";
+	private static Logger logger  = LoggerFactory.getLogger(EnterpriseController.class);
 
 	@Autowired
 	private WxEnterpriseApiService wxEnterpriseApiService;
 	//企业列表
 	@RequestMapping("wx-enterprise-list")
-	public HaobanResponse wxEnterpriseList() {
-		List<YwWxEnterpriseDTO> list = wxEnterpriseApiService.list();
+	public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,String gicContactFlag,String version) {
+		List<YwWxEnterpriseDTO> list = wxEnterpriseApiService.list(pageInfo,keyword,gicContactFlag,version);
 		return resultResponse(HaoBanErrCode.ERR_1, list);
  
 	}
@@ -32,7 +36,7 @@ public class EnterpriseController extends WebBaseController{
 	@RequestMapping("yw-login")
 	public void ywLogin(String wxEnterpriseId,HttpServletResponse httpServletResponse) throws IOException {
         String host = GlobalVar.ctxPropertiesMap.get("haoban_service_host");
-        
+        logger.info("host============================>{}",host);
         String url=host+LOGIN_URL+"?wxEnterpriseId="+wxEnterpriseId;
         httpServletResponse.sendRedirect(url);
 	}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/LoginVO.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+import com.gic.haoban.manage.api.dto.StaffDTO;
+
+public class LoginVO implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private StaffDTO staffDTO;
+	
+	private  String wxEnterpriseId;
+
+	public StaffDTO getStaffDTO() {
+		return staffDTO;
+	}
+
+	public void setStaffDTO(StaffDTO staffDTO) {
+		this.staffDTO = staffDTO;
+	}
+
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+	
+	
+
+}

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

@@ -2,7 +2,9 @@ package com.gic.haoban.manage.service.dao.mapper;
 
 import java.util.List;
 
+import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface WxEnterpriseMapper {
@@ -18,7 +20,7 @@ public interface WxEnterpriseMapper {
 
     int updateByPrimaryKey(TabHaobanWxEnterprise record);
     
-    List<TabHaobanWxEnterprise> list();
+    List<TabHaobanWxEnterprise> list(@Param("keyword") String keyword,@Param("gicContactFlag") String gicContactFlag,@Param("version") String version);
 
     List<TabHaobanWxEnterprise> listBycorpId(@Param("corpId") String corpId);
 }
\ No newline at end of file

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

@@ -4,11 +4,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.Constant;
 import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
 import com.gic.haoban.manage.service.service.DepartmentService;
 import com.gic.wechat.api.dto.qywx.DepartmentDTO;
 import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -29,6 +31,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanWxApplication;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.service.WxApplicationService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.github.pagehelper.PageHelper;
 
 @Service
 public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
@@ -83,8 +86,9 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
 	}
 
 	@Override
-	public List<YwWxEnterpriseDTO> list() {
-		List<TabHaobanWxEnterprise>  list = wxEnterpriseMapper.list();
+	public List<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,String gicContactFlag,String version) {
+		PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageNum());
+		List<TabHaobanWxEnterprise>  list = wxEnterpriseMapper.list(keyword,gicContactFlag,version);
 		if(CollectionUtil.isEmpty(list)){
 			return new ArrayList<YwWxEnterpriseDTO>();
 		}