Selaa lähdekoodia

项目修改、消息修改

liliang4869 7 vuotta sitten
vanhempi
commit
75d75b0863
24 muutettua tiedostoa jossa 711 lisäystä ja 387 poistoa
  1. 21 0
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  2. 19 0
      src/main/java/com/goafanti/app/controller/AppUserController.java
  3. 24 1
      src/main/java/com/goafanti/business/bo/JtBusinessProjectResult.java
  4. 2 2
      src/main/java/com/goafanti/business/controller/JtBusinessController.java
  5. 1 1
      src/main/java/com/goafanti/business/service/JtBusinessService.java
  6. 8 2
      src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java
  7. 65 2
      src/main/java/com/goafanti/common/controller/WebpageController.java
  8. 412 355
      src/main/java/com/goafanti/common/mapper/JpushEasemobAccountMapper.xml
  9. 5 6
      src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml
  10. 1 1
      src/main/java/com/goafanti/common/mapper/NewsMapper.xml
  11. 11 2
      src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml
  12. 2 1
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  13. 1 0
      src/main/java/com/goafanti/common/model/News.java
  14. 3 0
      src/main/java/com/goafanti/news/service/NewsService.java
  15. 80 0
      src/main/java/com/goafanti/user/bo/ClientListBo.java
  16. 11 0
      src/main/java/com/goafanti/user/service/JpushEasemobAccountService.java
  17. 27 0
      src/main/java/com/goafanti/user/service/impl/JpushEasemobAccountServiceImpl.java
  18. 2 0
      src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java
  19. 11 11
      src/main/webapp/WEB-INF/views/common.html
  20. 1 0
      src/main/webapp/WEB-INF/views/portal/companyProfile.html
  21. 1 1
      src/main/webapp/WEB-INF/views/portal/index.html
  22. 1 0
      src/main/webapp/WEB-INF/views/portal/service/patent.html
  23. 1 1
      src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html
  24. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html

+ 21 - 0
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -41,6 +41,7 @@ import com.goafanti.easemob.EasemobUtils;
 import com.goafanti.user.bo.InputOrganizationIdentity;
 import com.goafanti.user.bo.InputOrganizationIdentity;
 import com.goafanti.user.bo.InputUser;
 import com.goafanti.user.bo.InputUser;
 import com.goafanti.user.bo.InputUserIdentity;
 import com.goafanti.user.bo.InputUserIdentity;
+import com.goafanti.user.service.JpushEasemobAccountService;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserService;
 import com.goafanti.user.service.UserService;
@@ -58,6 +59,8 @@ public class AdminApiController extends CertifyApiController {
 	private PasswordUtil					passwordUtil;
 	private PasswordUtil					passwordUtil;
 	@Resource
 	@Resource
 	private AdminService					adminService;
 	private AdminService					adminService;
+	@Resource
+	private JpushEasemobAccountService 		jpushEasemobAccountService;
 	@Autowired
 	@Autowired
 	EasemobUtils							easemobUtils;
 	EasemobUtils							easemobUtils;
 
 
@@ -369,4 +372,22 @@ public class AdminApiController extends CertifyApiController {
 		//res.setData(organizationIdentityService.updateOrgDetail(oi, saveSign, level));
 		//res.setData(organizationIdentityService.updateOrgDetail(oi, saveSign, level));
 		return res;
 		return res;
 	}
 	}
+	
+	
+	/**
+	 * 团体用户明细
+	 * 
+	 * type 0-个人  1-单位
+	 */
+	@RequestMapping(value = "/listJpushUser", method = RequestMethod.GET)
+	public Result getJpushUser(Integer type,Integer pageNo,Integer pageSize) {
+		Result res = new Result();
+		if(type==null ||(type!=0 && type !=1)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","类型错误"));
+			return res;
+		}
+		res.setData(jpushEasemobAccountService.findJpushClientsByType(type, pageNo, pageSize));
+		return res;
+	}
+	
 }
 }

+ 19 - 0
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -25,11 +25,13 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.dao.JpushEasemobAccountMapper;
 import com.goafanti.common.enums.AchievementFields;
 import com.goafanti.common.enums.AchievementFields;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.enums.DemandFields;
 import com.goafanti.common.enums.DemandFields;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.common.model.Demand;
 import com.goafanti.common.model.Demand;
+import com.goafanti.common.model.JpushEasemobAccount;
 import com.goafanti.common.model.MessageConsumer;
 import com.goafanti.common.model.MessageConsumer;
 import com.goafanti.common.model.MessageFromSystem;
 import com.goafanti.common.model.MessageFromSystem;
 import com.goafanti.common.model.MessageProducer;
 import com.goafanti.common.model.MessageProducer;
@@ -175,6 +177,23 @@ public class AppUserController extends BaseApiController {
 		return res;
 		return res;
 	}
 	}
 	
 	
+	/*
+	 * 更新极光推送
+	 * 
+	 * */
+	
+	@RequestMapping(value = "/updateJpushAccount",method = RequestMethod.POST)
+	private Result updateJpush(String uuid,String registrationId,String easemobName,String easemobPass,String uid){
+		Result res = new Result();
+		//更新 jpush_easemob_account
+		JpushEasemobAccount jpushEasemobAccount=messageService.selectSynAccByUid(uid);
+		if(jpushEasemobAccount==null) {
+			messageService.addJpushEasemobAccount(uuid, uid, easemobName, easemobPass);
+		}
+		messageService.updateJpushEasemobAccount(uuid, registrationId, easemobName,easemobPass);
+		return res;
+	}
+	
 	/**
 	/**
 	 * 读取消息
 	 * 读取消息
 	 * @param messageId
 	 * @param messageId

+ 24 - 1
src/main/java/com/goafanti/business/bo/JtBusinessProjectResult.java

@@ -4,7 +4,7 @@ import com.goafanti.common.model.JtBusinessProject;
 
 
 public class JtBusinessProjectResult extends JtBusinessProject {
 public class JtBusinessProjectResult extends JtBusinessProject {
 	private Integer module;
 	private Integer module;
-
+	
 	public Integer getModule() {
 	public Integer getModule() {
 		return module;
 		return module;
 	}
 	}
@@ -30,9 +30,32 @@ public class JtBusinessProjectResult extends JtBusinessProject {
 	public String getCompanyName() {
 	public String getCompanyName() {
 		return companyName;
 		return companyName;
 	}
 	}
+String companyId;
+
+	public String getCompanyId() {
+	return companyId;
+}
+
+public void setCompanyId(String companyId) {
+	this.companyId = companyId;
+}
 
 
 	public void setCompanyName(String companyName) {
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
 		this.companyName = companyName;
 	}
 	}
 	
 	
+	@Override
+	public String getMaxImgUrl() {
+		// TODO Auto-generated method stub
+		if(super.getMaxImgUrl()!=null && !super.getMaxImgUrl().contains("."))return null;
+		return super.getMaxImgUrl();
+	}
+	
+	@Override
+	public String getMinImgUrl() {
+		// TODO Auto-generated method stub
+		if(super.getMinImgUrl()!=null && !super.getMinImgUrl().contains("."))return null;
+		return super.getMinImgUrl();
+	}
+	
 }
 }

+ 2 - 2
src/main/java/com/goafanti/business/controller/JtBusinessController.java

@@ -25,9 +25,9 @@ public class JtBusinessController extends CertifyApiController {
 	}
 	}
 	
 	
 	@RequestMapping(value="/jtProject/list", method=RequestMethod.GET)
 	@RequestMapping(value="/jtProject/list", method=RequestMethod.GET)
-	public Result getProjectList(String topId,String secondId,String name,Integer pageSize,Integer pageNo,Integer privateProject,Integer auditStatus,Integer module,Integer isHot,Integer orderType,Integer orderSort) {
+	public Result getProjectList(String topId,String secondId,String name,Integer pageSize,Integer pageNo,Integer privateProject,Integer auditStatus,Integer module,Integer isHot,Integer orderType,Integer orderSort,String ownerId) {
 		Result result=new Result();
 		Result result=new Result();
-		result.setData(jtBusinessService.getProjects(topId,secondId,name,pageSize,pageNo,privateProject,auditStatus,module,isHot,orderType,orderSort));
+		result.setData(jtBusinessService.getProjects(topId,secondId,name,pageSize,pageNo,privateProject,auditStatus,module,isHot,orderType,orderSort,ownerId));
 		return result;
 		return result;
 	}
 	}
 	
 	

+ 1 - 1
src/main/java/com/goafanti/business/service/JtBusinessService.java

@@ -16,7 +16,7 @@ public interface JtBusinessService {
 	JtBusinessProjectResult getBusinessProjectDetail(String id);
 	JtBusinessProjectResult getBusinessProjectDetail(String id);
 	JtBusinessCategoryTree getCategoryTree(String id);
 	JtBusinessCategoryTree getCategoryTree(String id);
 	List<JtBusinessCategoryBo>getCategoryBoList(Integer module);
 	List<JtBusinessCategoryBo>getCategoryBoList(Integer module);
-	Pagination<JtBusinessProjectResult>getProjects(String topId,String secondId,String name,Integer pageSize,Integer pageNo,Integer privateProject,Integer auditStatus,Integer module,Integer isHot,Integer orderType,Integer orderSort); 
+	Pagination<JtBusinessProjectResult>getProjects(String topId,String secondId,String name,Integer pageSize,Integer pageNo,Integer privateProject,Integer auditStatus,Integer module,Integer isHot,Integer orderType,Integer orderSort,String ownerId); 
 	int insertCategory(JtBusinessCategory jtBusinessCategory);
 	int insertCategory(JtBusinessCategory jtBusinessCategory);
 	int deleteCategoryById(String id);
 	int deleteCategoryById(String id);
 	JtBusinessCategory getCategoryById(String id);
 	JtBusinessCategory getCategoryById(String id);

+ 8 - 2
src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java

@@ -33,7 +33,7 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 	JtBusinessProjectMapper jtBusinessProjectMapper;
 	JtBusinessProjectMapper jtBusinessProjectMapper;
 	@Override
 	@Override
 	public JtBusinessCategory getBusinessCategoryByLayerAndName(Integer layer, String name) {
 	public JtBusinessCategory getBusinessCategoryByLayerAndName(Integer layer, String name) {
-		// TODO Auto-generated method stub
+		// TODO Auto-generated method stub 
 		return jtBusinessCategoryMapper.getBusinessCategoryByLayerAndName(layer, name);
 		return jtBusinessCategoryMapper.getBusinessCategoryByLayerAndName(layer, name);
 	}
 	}
 
 
@@ -67,14 +67,17 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 
 
 	/*
 	/*
 	 * 登录用户0     项目列表页1  privateProject
 	 * 登录用户0     项目列表页1  privateProject
+	 * ownerId优先级高于privateProject
 	 * 
 	 * 
 	 * ordetType---0 发布时间  1价格  2成交量
 	 * ordetType---0 发布时间  1价格  2成交量
 	 * orderSort ----0大->小   1小->大
 	 * orderSort ----0大->小   1小->大
+	 * 
+	 * 
 	 * */
 	 * */
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
 	public Pagination<JtBusinessProjectResult> getProjects(String topId, String secondId, String name, Integer pageSize,
 	public Pagination<JtBusinessProjectResult> getProjects(String topId, String secondId, String name, Integer pageSize,
-			Integer pageNo,Integer privateProject,Integer auditStatus,Integer module,Integer isHot,Integer orderType,Integer orderSort) {
+			Integer pageNo,Integer privateProject,Integer auditStatus,Integer module,Integer isHot,Integer orderType,Integer orderSort,String ownerId) {
 		if(orderType==null)orderType=0;
 		if(orderType==null)orderType=0;
 		if(orderSort==null)orderSort=0;
 		if(orderSort==null)orderSort=0;
 		// TODO Auto-generated method stub
 		// TODO Auto-generated method stub
@@ -94,6 +97,9 @@ if(auditStatus!=null ) {
 		}
 		}
 		if(privateProject!=null && privateProject ==0)
 		if(privateProject!=null && privateProject ==0)
 		params.put("ownerId", TokenManager.getUserId());
 		params.put("ownerId", TokenManager.getUserId());
+		if(StringUtils.isNotBlank(ownerId)) {
+			params.put("ownerId", ownerId);
+		}
 		if(module!=null)params.put("module", module);
 		if(module!=null)params.put("module", module);
 		if(isHot!=null)params.put("isHot", isHot);
 		if(isHot!=null)params.put("isHot", isHot);
 		if(orderType!=null)params.put("orderType", orderType);
 		if(orderType!=null)params.put("orderType", orderType);

+ 65 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.controller;
 package com.goafanti.common.controller;
 
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
@@ -19,6 +21,7 @@ import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
 import com.goafanti.banners.service.BannersService;
 import com.goafanti.business.bo.JtBusinessCategoryBo;
 import com.goafanti.business.bo.JtBusinessCategoryBo;
 import com.goafanti.business.bo.JtBusinessCategoryTree;
 import com.goafanti.business.bo.JtBusinessCategoryTree;
+import com.goafanti.business.bo.JtBusinessProjectResult;
 import com.goafanti.business.service.JtBusinessService;
 import com.goafanti.business.service.JtBusinessService;
 import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.bo.fieldGlossoryBo;
 import com.goafanti.common.bo.fieldGlossoryBo;
@@ -43,10 +46,12 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.bo.DemandListBo;
 import com.goafanti.demand.bo.DemandListBo;
 import com.goafanti.demand.service.DemandInterestService;
 import com.goafanti.demand.service.DemandInterestService;
 import com.goafanti.demand.service.DemandService;
 import com.goafanti.demand.service.DemandService;
+import com.goafanti.user.bo.OrgIdentityBo;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserService;
 import com.goafanti.user.service.UserService;
+import com.mysql.fabric.xmlrpc.base.Array;
 import com.goafanti.news.bo.NewsPortalList;
 import com.goafanti.news.bo.NewsPortalList;
 import com.goafanti.news.bo.PolicyResult;
 import com.goafanti.news.bo.PolicyResult;
 import com.goafanti.news.enums.NewsType;
 import com.goafanti.news.enums.NewsType;
@@ -569,7 +574,7 @@ public class WebpageController extends BaseController {
 	
 	
 		List<JtBusinessCategoryBo> patentCategory=jtBusinessService.getCategoryBoList(1);
 		List<JtBusinessCategoryBo> patentCategory=jtBusinessService.getCategoryBoList(1);
 		modelview.addObject("patentCategory",patentCategory);
 		modelview.addObject("patentCategory",patentCategory);
-		List<JtBusinessProject> jtBusinessProjects=(List<JtBusinessProject>) jtBusinessService.getProjects(null, null, null, 5, 1, 1, 2, 0, 1,0,0).getList();
+		List<JtBusinessProject> jtBusinessProjects=(List<JtBusinessProject>) jtBusinessService.getProjects(null, null, null, 5, 1, 1, 2, 0, 1,0,0,null).getList();
 		for(JtBusinessProject project:jtBusinessProjects) { 
 		for(JtBusinessProject project:jtBusinessProjects) { 
 			if(project.getMaxImgUrl()!=null && project.getMaxImgUrl().length()<=0)project.setMaxImgUrl(null);
 			if(project.getMaxImgUrl()!=null && project.getMaxImgUrl().length()<=0)project.setMaxImgUrl(null);
 			if(project.getMinImgUrl()!=null && project.getMinImgUrl().length()<=0)project.setMinImgUrl(null);
 			if(project.getMinImgUrl()!=null && project.getMinImgUrl().length()<=0)project.setMinImgUrl(null);
@@ -580,7 +585,7 @@ public class WebpageController extends BaseController {
 		List<News>newsList=(List<News>) newsService.listNews(0, null, null, null, null, null, 1, 1, 3, "2", null, "web_index").getList();
 		List<News>newsList=(List<News>) newsService.listNews(0, null, null, null, null, null, 1, 1, 3, "2", null, "web_index").getList();
 		modelview.addObject("news",newsList);
 		modelview.addObject("news",newsList);
 //		
 //		
-		List<News> subscriptions=(List<News>) newsService.listNews(98, null, null, null, null, null, null, 1, 4, "2", null, "web_index").getList();
+		List<News> subscriptions=(List<News>) newsService.listNews(99, null, null, null, null, null, null, 1, 4, "2", null, "web_index").getList();
 		modelview.addObject("subscription",subscriptions);
 		modelview.addObject("subscription",subscriptions);
 		
 		
 		if(subscriptions!=null && subscriptions.size()>0 && subscriptions.get(0).getSourceUrl()!=null && subscriptions.get(0).getSourceUrl().contains(".")) {
 		if(subscriptions!=null && subscriptions.size()>0 && subscriptions.get(0).getSourceUrl()!=null && subscriptions.get(0).getSourceUrl().contains(".")) {
@@ -797,6 +802,48 @@ public class WebpageController extends BaseController {
 		return modelAndView;
 		return modelAndView;
 	}
 	}
 	
 	
+	
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/portal/service/patent")
+	public ModelAndView patentIndex(HttpServletRequest request, ModelAndView modelAndView,String id, Integer type) {
+		List<JtBusinessCategoryBo> categoryBos=jtBusinessService.getCategoryBoList(1);
+		modelAndView.addObject("categories",categoryBos);
+		modelAndView.setViewName("/portal/service/patent");
+		
+		//最新发布
+		List<JtBusinessProjectResult>recents=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(null, null, null, 4, 1, 
+				1, 2, 1, null, 0, 1,null).getList();
+		modelAndView.addObject("recent",recents);
+		
+		//专利服务-商标服务-版权服务
+		for(JtBusinessCategoryBo c:categoryBos) {
+			if("专利服务".equals(c.getTopLevel())){
+				List<JtBusinessProjectResult>res=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(c.getTopLevelId(), null,
+						null, 3, 1, 1, 2, 1, null, 0, 1,null).getList();
+				modelAndView.addObject("patentService",res);
+				modelAndView.addObject("patentTopId",c.getTopLevelId());
+			}
+			else if("商标服务".equals(c.getTopLevel())){
+				List<JtBusinessProjectResult>res=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(c.getTopLevelId(), null,
+						null, 4, 1, 1, 2, 1, null, 0, 1,null).getList();
+				modelAndView.addObject("branchService",res);
+				modelAndView.addObject("branchTopId",c.getTopLevelId());
+			}
+			else if("版权服务".equals(c.getTopLevel())){
+				List<JtBusinessProjectResult>res=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(c.getTopLevelId(), null,
+						null, 3, 1, 1, 2, 1, null, 0, 1,null).getList();
+				modelAndView.addObject("copyrightService",res);
+				modelAndView.addObject("copyrightTopId",c.getTopLevelId());
+			}
+			
+		}
+		
+		//知产百科
+		List<News> news=(List<News>) newsService.listNews(98, null, null, null, null, null, null, 1, 4, 2+"", null, "web_tech_service_index").getList();
+		modelAndView.addObject("jtNews",news);
+		
+		return modelAndView;
+	}
 
 
 	/*
 	/*
 	 * 交易
 	 * 交易
@@ -825,6 +872,22 @@ public class WebpageController extends BaseController {
 	
 	
 		return modelAndView;
 		return modelAndView;
 	}
 	}
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/portal/companyProfile")
+	public ModelAndView companyProfile(HttpServletRequest request, ModelAndView modelAndView,String uid) {
+		modelAndView.setViewName("/portal/companyProfile");
+		OrgIdentityBo org=organizationIdentityService.selectOrgIdentityBoByUserId(uid);
+		modelAndView.addObject("org",org);
+		List<JtBusinessProjectResult>projectResults=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(null, null, null, 4, 1, 0, 2, null, null, 0, 1,uid).getList();
+		modelAndView.addObject("jtProjects",projectResults);
+		String honor=org.getHonorPicture();
+		if(honor!=null && honor.contains(".")) {
+			List<String>honorPictures=Arrays.asList(honor);
+			if(honorPictures.size()>0)modelAndView.addObject("honors",honorPictures);
+			
+		}
+		return modelAndView;
+	}
 	
 	
 	private void businessHelper(ModelAndView modelAndView,String categoryName,List<JtBusinessCategory> jtBusinessCategories,int[] sizes) {
 	private void businessHelper(ModelAndView modelAndView,String categoryName,List<JtBusinessCategory> jtBusinessCategories,int[] sizes) {
 		for(int i=0;i<jtBusinessCategories.size();i++) {
 		for(int i=0;i<jtBusinessCategories.size();i++) {

+ 412 - 355
src/main/java/com/goafanti/common/mapper/JpushEasemobAccountMapper.xml

@@ -1,356 +1,413 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.JpushEasemobAccountMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.JpushEasemobAccount">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="uuid" jdbcType="VARCHAR" property="uuid" />
-    <result column="registration_id" jdbcType="VARCHAR" property="registrationId" />
-    <result column="uid" jdbcType="VARCHAR" property="uid" />
-    <result column="tag" jdbcType="VARCHAR" property="tag" />
-    <result column="group_id" jdbcType="VARCHAR" property="groupId" />
-    <result column="last_login_time" jdbcType="TIMESTAMP" property="lastLoginTime" />
-    <result column="easemob_name" jdbcType="VARCHAR" property="easemobName" />
-    <result column="easemob_pass" jdbcType="VARCHAR" property="easemobPass" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    id, uuid, registration_id, uid, tag, group_id, last_login_time, easemob_name, easemob_pass
-  </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.JpushEasemobAccountExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from jpush_easemob_account
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from jpush_easemob_account
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    delete from jpush_easemob_account
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.JpushEasemobAccountExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    delete from jpush_easemob_account
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.JpushEasemobAccount">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    insert into jpush_easemob_account (id, uuid, registration_id, 
-      uid, tag, group_id, 
-      last_login_time, easemob_name, easemob_pass
-      )
-    values (#{id,jdbcType=INTEGER}, #{uuid,jdbcType=VARCHAR}, #{registrationId,jdbcType=VARCHAR}, 
-      #{uid,jdbcType=VARCHAR}, #{tag,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, 
-      #{lastLoginTime,jdbcType=TIMESTAMP}, #{easemobName,jdbcType=VARCHAR}, #{easemobPass,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.JpushEasemobAccount">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    insert into jpush_easemob_account
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="uuid != null">
-        uuid,
-      </if>
-      <if test="registrationId != null">
-        registration_id,
-      </if>
-      <if test="uid != null">
-        uid,
-      </if>
-      <if test="tag != null">
-        tag,
-      </if>
-      <if test="groupId != null">
-        group_id,
-      </if>
-      <if test="lastLoginTime != null">
-        last_login_time,
-      </if>
-      <if test="easemobName != null">
-        easemob_name,
-      </if>
-      <if test="easemobPass != null">
-        easemob_pass,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="uuid != null">
-        #{uuid,jdbcType=VARCHAR},
-      </if>
-      <if test="registrationId != null">
-        #{registrationId,jdbcType=VARCHAR},
-      </if>
-      <if test="uid != null">
-        #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="tag != null">
-        #{tag,jdbcType=VARCHAR},
-      </if>
-      <if test="groupId != null">
-        #{groupId,jdbcType=VARCHAR},
-      </if>
-      <if test="lastLoginTime != null">
-        #{lastLoginTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="easemobName != null">
-        #{easemobName,jdbcType=VARCHAR},
-      </if>
-      <if test="easemobPass != null">
-        #{easemobPass,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.JpushEasemobAccountExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    select count(*) from jpush_easemob_account
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    update jpush_easemob_account
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.uuid != null">
-        uuid = #{record.uuid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.registrationId != null">
-        registration_id = #{record.registrationId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.uid != null">
-        uid = #{record.uid,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tag != null">
-        tag = #{record.tag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.groupId != null">
-        group_id = #{record.groupId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.lastLoginTime != null">
-        last_login_time = #{record.lastLoginTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.easemobName != null">
-        easemob_name = #{record.easemobName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.easemobPass != null">
-        easemob_pass = #{record.easemobPass,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    update jpush_easemob_account
-    set id = #{record.id,jdbcType=INTEGER},
-      uuid = #{record.uuid,jdbcType=VARCHAR},
-      registration_id = #{record.registrationId,jdbcType=VARCHAR},
-      uid = #{record.uid,jdbcType=VARCHAR},
-      tag = #{record.tag,jdbcType=VARCHAR},
-      group_id = #{record.groupId,jdbcType=VARCHAR},
-      last_login_time = #{record.lastLoginTime,jdbcType=TIMESTAMP},
-      easemob_name = #{record.easemobName,jdbcType=VARCHAR},
-      easemob_pass = #{record.easemobPass,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.JpushEasemobAccount">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    update jpush_easemob_account
-    <set>
-      <if test="uuid != null">
-        uuid = #{uuid,jdbcType=VARCHAR},
-      </if>
-      <if test="registrationId != null">
-        registration_id = #{registrationId,jdbcType=VARCHAR},
-      </if>
-      <if test="uid != null">
-        uid = #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="tag != null">
-        tag = #{tag,jdbcType=VARCHAR},
-      </if>
-      <if test="groupId != null">
-        group_id = #{groupId,jdbcType=VARCHAR},
-      </if>
-      <if test="lastLoginTime != null">
-        last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="easemobName != null">
-        easemob_name = #{easemobName,jdbcType=VARCHAR},
-      </if>
-      <if test="easemobPass != null">
-        easemob_pass = #{easemobPass,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.JpushEasemobAccount">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 25 14:46:37 CST 2017.
-    -->
-    update jpush_easemob_account
-    set uuid = #{uuid,jdbcType=VARCHAR},
-      registration_id = #{registrationId,jdbcType=VARCHAR},
-      uid = #{uid,jdbcType=VARCHAR},
-      tag = #{tag,jdbcType=VARCHAR},
-      group_id = #{groupId,jdbcType=VARCHAR},
-      last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP},
-      easemob_name = #{easemobName,jdbcType=VARCHAR},
-      easemob_pass = #{easemobPass,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <select id="selectSynAccByUid" parameterType="java.lang.String" resultMap="BaseResultMap">
-  	select 
-    <include refid="Base_Column_List" />
-    from jpush_easemob_account
-    where uid = #{uid,jdbcType=VARCHAR}
-  </select>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.JpushEasemobAccountMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.JpushEasemobAccount">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="uuid" jdbcType="VARCHAR" property="uuid" />
+    <result column="registration_id" jdbcType="VARCHAR" property="registrationId" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="tag" jdbcType="VARCHAR" property="tag" />
+    <result column="group_id" jdbcType="VARCHAR" property="groupId" />
+    <result column="last_login_time" jdbcType="TIMESTAMP" property="lastLoginTime" />
+    <result column="easemob_name" jdbcType="VARCHAR" property="easemobName" />
+    <result column="easemob_pass" jdbcType="VARCHAR" property="easemobPass" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    id, uuid, registration_id, uid, tag, group_id, last_login_time, easemob_name, easemob_pass
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.JpushEasemobAccountExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from jpush_easemob_account
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from jpush_easemob_account
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    delete from jpush_easemob_account
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.JpushEasemobAccountExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    delete from jpush_easemob_account
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.JpushEasemobAccount">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    insert into jpush_easemob_account (id, uuid, registration_id, 
+      uid, tag, group_id, 
+      last_login_time, easemob_name, easemob_pass
+      )
+    values (#{id,jdbcType=INTEGER}, #{uuid,jdbcType=VARCHAR}, #{registrationId,jdbcType=VARCHAR}, 
+      #{uid,jdbcType=VARCHAR}, #{tag,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, 
+      #{lastLoginTime,jdbcType=TIMESTAMP}, #{easemobName,jdbcType=VARCHAR}, #{easemobPass,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.JpushEasemobAccount">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    insert into jpush_easemob_account
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="uuid != null">
+        uuid,
+      </if>
+      <if test="registrationId != null">
+        registration_id,
+      </if>
+      <if test="uid != null">
+        uid,
+      </if>
+      <if test="tag != null">
+        tag,
+      </if>
+      <if test="groupId != null">
+        group_id,
+      </if>
+      <if test="lastLoginTime != null">
+        last_login_time,
+      </if>
+      <if test="easemobName != null">
+        easemob_name,
+      </if>
+      <if test="easemobPass != null">
+        easemob_pass,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="uuid != null">
+        #{uuid,jdbcType=VARCHAR},
+      </if>
+      <if test="registrationId != null">
+        #{registrationId,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="tag != null">
+        #{tag,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null">
+        #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="lastLoginTime != null">
+        #{lastLoginTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="easemobName != null">
+        #{easemobName,jdbcType=VARCHAR},
+      </if>
+      <if test="easemobPass != null">
+        #{easemobPass,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.JpushEasemobAccountExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    select count(*) from jpush_easemob_account
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    update jpush_easemob_account
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.uuid != null">
+        uuid = #{record.uuid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.registrationId != null">
+        registration_id = #{record.registrationId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uid != null">
+        uid = #{record.uid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tag != null">
+        tag = #{record.tag,jdbcType=VARCHAR},
+      </if>
+      <if test="record.groupId != null">
+        group_id = #{record.groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lastLoginTime != null">
+        last_login_time = #{record.lastLoginTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.easemobName != null">
+        easemob_name = #{record.easemobName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.easemobPass != null">
+        easemob_pass = #{record.easemobPass,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    update jpush_easemob_account
+    set id = #{record.id,jdbcType=INTEGER},
+      uuid = #{record.uuid,jdbcType=VARCHAR},
+      registration_id = #{record.registrationId,jdbcType=VARCHAR},
+      uid = #{record.uid,jdbcType=VARCHAR},
+      tag = #{record.tag,jdbcType=VARCHAR},
+      group_id = #{record.groupId,jdbcType=VARCHAR},
+      last_login_time = #{record.lastLoginTime,jdbcType=TIMESTAMP},
+      easemob_name = #{record.easemobName,jdbcType=VARCHAR},
+      easemob_pass = #{record.easemobPass,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.JpushEasemobAccount">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    update jpush_easemob_account
+    <set>
+      <if test="uuid != null">
+        uuid = #{uuid,jdbcType=VARCHAR},
+      </if>
+      <if test="registrationId != null">
+        registration_id = #{registrationId,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null">
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="tag != null">
+        tag = #{tag,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null">
+        group_id = #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="lastLoginTime != null">
+        last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="easemobName != null">
+        easemob_name = #{easemobName,jdbcType=VARCHAR},
+      </if>
+      <if test="easemobPass != null">
+        easemob_pass = #{easemobPass,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.JpushEasemobAccount">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 25 14:46:37 CST 2017.
+    -->
+    update jpush_easemob_account
+    set uuid = #{uuid,jdbcType=VARCHAR},
+      registration_id = #{registrationId,jdbcType=VARCHAR},
+      uid = #{uid,jdbcType=VARCHAR},
+      tag = #{tag,jdbcType=VARCHAR},
+      group_id = #{groupId,jdbcType=VARCHAR},
+      last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP},
+      easemob_name = #{easemobName,jdbcType=VARCHAR},
+      easemob_pass = #{easemobPass,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectSynAccByUid" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	select 
+    <include refid="Base_Column_List" />
+    from jpush_easemob_account
+    where uid = #{uid,jdbcType=VARCHAR}
+  </select>
+  
+  
+  <select id="findJpushClientsByType" resultType="com.goafanti.user.bo.ClientListBo">
+  select jea.uid,
+  u.identify_name as name,u.society_tag as societyTag,u.create_time as createTime,c.contacts,c.contact_mobile as contactMobile,dg.name as provinceS,fg.name as industryS,
+  <if test="clientType!=null and clientType==0">
+  i.province as province,
+  </if>
+    <if test="clientType!=null and clientType==1">
+  i.licence_province as province,
+  </if>
+   <if test="clientType!=null and clientType==0">
+  i.industry as industry
+  </if>
+   <if test="clientType!=null and clientType==1">
+  i.field as field
+  </if>
+   from jpush_easemob_account jea
+   left join user u on u.id=jea.uid
+   <if test="clientType!=null and clientType==0">
+   left join user_identity i on i.uid =jea.uid
+   </if>
+   <if test="clientType!=null and clientType==1">
+   left join organization_identity i on i.uid =jea.uid
+   </if>
+   left join contract c on c.uid=u.id
+   <if test="clientType!=null and clientType==0">
+      left join district_glossory dg on dg.id=i.province
+   </if>
+    <if test="clientType!=null and clientType==1">
+      left join district_glossory dg on dg.id=i.licence_province
+   </if>
+    <if test="clientType!=null and clientType==0">
+      left join field_glossory fg on fg.id=i.industry
+   </if>
+    <if test="clientType!=null and clientType==1">
+      left join field_glossory fg on fg.id=i.field
+   </if>
+   where i.uid=jea.uid
+ 	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+    <select id="findJpushClientsCountByType" resultType="java.lang.Integer">
+   select count(0)
+   from jpush_easemob_account jea
+   left join user u on u.id=jea.uid
+   <if test="clientType!=null and clientType==0">
+   left join user_identity i on i.uid =jea.uid
+   </if>
+   <if test="clientType!=null and clientType==1">
+   left join organization_identity i on i.uid =jea.uid
+   </if>
+   left join contract c on c.uid=u.id
+   where i.uid=jea.uid
+  </select>
+  
 </mapper>
 </mapper>

+ 5 - 6
src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml

@@ -106,10 +106,9 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Wed Jul 25 08:54:01 CST 2018.
       This element was generated on Wed Jul 25 08:54:01 CST 2018.
     -->
     -->
-  jtbp.id, jtbp.name, jtbp.category_id as categoryId, jtbp.number, jtbp.price, jtbp.activity_price as activityPrice, jtbp.member_price as memberPrice, jtbp.offset, 
-        jtbp.activity_flag as activityFlag, 
-    jtbp.introduce, jtbp.province, jtbp.city, jtbp.create_time as createTime, jtbp.min_img_url as minImgUrl, jtbp.max_img_url as maxImgUrl, jtbp.value, jtbp.apply_conditions as applyConditions, 
-    jtbp.owner_id as ownerId, jtbp.is_hot as isHot, jtbp.audit_status as auditStatus, jtbp.audit_info as auditInfo, jtbp.release_date as releaseDate,jtbc.module as module,jtbp.advertisement, tag
+  id, name, category_id as categoryId, number, price, activity_price as activityPrice, member_price as memberPrice, offset, activity_flag as activityFlag, 
+     introduce, province, city, create_time as createTime, min_img_url as minImgUrl, max_img_url as maxImgUrl, value, apply_conditions as applyConditions, 
+     owner_id as ownerId, is_hot as isHot, audit_status as auditStatus, audit_info as auditInfo, release_date as releaseDate, advertisement, tag
   </sql>
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessProjectExample" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessProjectExample" resultMap="BaseResultMap">
     <!--
     <!--
@@ -638,7 +637,7 @@
 	  jtbp.release_Date as releaseDate,
 	  jtbp.release_Date as releaseDate,
 	  jtbp.advertisement,
 	  jtbp.advertisement,
 	  dct.dealCount as dealCount,
 	  dct.dealCount as dealCount,
-	  u.identify_name as companyName,
+	  u.identify_name as companyName,u.id as companyId,
 	  jtbp.tag
 	  jtbp.tag
   from jt_business_project jtbp
   from jt_business_project jtbp
   left join user u on u.id=jtbp.owner_id
   left join user u on u.id=jtbp.owner_id
@@ -717,7 +716,7 @@
   <select id="findProjectOrderByNumber" resultType="com.goafanti.common.model.JtBusinessProject">
   <select id="findProjectOrderByNumber" resultType="com.goafanti.common.model.JtBusinessProject">
   select
   select
  <include refid="Base_Column_List" />
  <include refid="Base_Column_List" />
-  from jt_business_project 
+  from jt_business_project jtbp
   where audit_status=2
   where audit_status=2
   order by create_time desc
   order by create_time desc
   </select>
   </select>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/NewsMapper.xml

@@ -295,7 +295,7 @@
 			count(0)
 			count(0)
 		from news a
 		from news a
 		where 
 		where 
-		a.type != 1 and a.type != 2
+		(a.type = 0 or a.type = 99 or a.type =98)
 		<if test="provinceId != null">
 		<if test="provinceId != null">
 			and a.province_id = #{provinceId,jdbcType=INTEGER}
 			and a.province_id = #{provinceId,jdbcType=INTEGER}
 		</if>
 		</if>

+ 11 - 2
src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml

@@ -115,11 +115,20 @@
    <select id="findNewsCount" parameterType="String" resultType="java.lang.Integer">
    <select id="findNewsCount" parameterType="String" resultType="java.lang.Integer">
   	select
   	select
   		count(1)
   		count(1)
-  	from news
-  	where 1 =1
+  	from news n
+  	 	<if test="publishPage !=null">
+  	left join news_publish np on np.news_id= n.id
+  	</if>
+  	where (n.type =0 or n.type=98 or n.type=99)
+  	<if test="publishPage !=null">
+  	and np.publish_page =#{publishPage,jdbcType=VARCHAR}
+  	</if>
   	<if test="auditStatus != null">
   	<if test="auditStatus != null">
   		and audit_status = #{auditStatus,jdbcType=INTEGER}
   		and audit_status = #{auditStatus,jdbcType=INTEGER}
   	</if>
   	</if>
+  	<if test="releaseStatus != null">
+  		and release_status = #{releaseStatus,jdbcType=INTEGER}
+  	</if>
   	<if test="type != null">
   	<if test="type != null">
   		and type = #{type,jdbcType=INTEGER}
   		and type = #{type,jdbcType=INTEGER}
   	</if>
   	</if>

+ 2 - 1
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -1243,7 +1243,8 @@
 			b.org_code_url as orgCodeUrl,
 			b.org_code_url as orgCodeUrl,
 			b.org_code as orgCode,
 			b.org_code as orgCode,
 			b.business_scope as businessScope,
 			b.business_scope as businessScope,
-			b.honor_picture as honorPicture
+			b.honor_picture as honorPicture,
+			b.qq
 		from
 		from
 			user a left join organization_identity b on
 			user a left join organization_identity b on
 			a.id = b.uid
 			a.id = b.uid

+ 1 - 0
src/main/java/com/goafanti/common/model/News.java

@@ -175,6 +175,7 @@ public class News {
 	}
 	}
 
 
 	public String getTitleImg() {
 	public String getTitleImg() {
+		if(titleImg!=null && !titleImg.contains("."))return null;
 		return titleImg;
 		return titleImg;
 	}
 	}
 
 

+ 3 - 0
src/main/java/com/goafanti/news/service/NewsService.java

@@ -183,6 +183,9 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		return newsMapper.updateByPrimaryKeySelective(news);
 		return newsMapper.updateByPrimaryKeySelective(news);
 	}
 	}
 
 
+	/*
+	 * type(0-普通  99-公众号新闻  98-技淘百科)
+	 * */
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	public Pagination<News> listNews(Integer type, String title, String author, String startCreateTime,
 	public Pagination<News> listNews(Integer type, String title, String author, String startCreateTime,
 			String endCreateTime, String source, Integer hot, Integer pNo, Integer pSize,String auditStatus,String releaseStatus,String publishPage) {
 			String endCreateTime, String source, Integer hot, Integer pNo, Integer pSize,String auditStatus,String releaseStatus,String publishPage) {

+ 80 - 0
src/main/java/com/goafanti/user/bo/ClientListBo.java

@@ -0,0 +1,80 @@
+package com.goafanti.user.bo;
+
+import java.util.Date;
+
+public class ClientListBo {
+	String name;
+	String locationProvince ;
+	String contacts;
+	String contactMobile;
+	String societyTag;
+	Date createTime;
+	String industry;
+	String uid;
+	String locationProvinceS;
+	String industryS;
+	
+	public String getLocationProvince() {
+		return locationProvince;
+	}
+	public void setLocationProvince(String locationProvince) {
+		this.locationProvince = locationProvince;
+	}
+	public String getLocationProvinceS() {
+		return locationProvinceS;
+	}
+	public void setLocationProvinceS(String locationProvinceS) {
+		this.locationProvinceS = locationProvinceS;
+	}
+	public String getIndustryS() {
+		return industryS;
+	}
+	public void setIndustryS(String industryS) {
+		this.industryS = industryS;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getContacts() {
+		return contacts;
+	}
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+	public String getContactMobile() {
+		return contactMobile;
+	}
+	public void setContactMobile(String contactMobile) {
+		this.contactMobile = contactMobile;
+	}
+	public String getSocietyTag() {
+		return societyTag;
+	}
+	public void setSocietyTag(String societyTag) {
+		this.societyTag = societyTag;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public String getIndustry() {
+		return industry;
+	}
+	public void setIndustry(String industry) {
+		this.industry = industry;
+	}
+	public String getUid() {
+		return uid;
+	}
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+	
+
+}

+ 11 - 0
src/main/java/com/goafanti/user/service/JpushEasemobAccountService.java

@@ -0,0 +1,11 @@
+package com.goafanti.user.service;
+
+import org.springframework.stereotype.Service;
+
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.user.bo.ClientListBo;
+
+
+public interface JpushEasemobAccountService { 
+	Pagination<ClientListBo> findJpushClientsByType(Integer type,Integer pageNo,Integer pageSize); 
+}

+ 27 - 0
src/main/java/com/goafanti/user/service/impl/JpushEasemobAccountServiceImpl.java

@@ -0,0 +1,27 @@
+package com.goafanti.user.service.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.JpushEasemobAccountMapper;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.user.bo.ClientListBo;
+import com.goafanti.user.service.JpushEasemobAccountService;
+@Service
+public class JpushEasemobAccountServiceImpl extends BaseMybatisDao<JpushEasemobAccountMapper> implements JpushEasemobAccountService{
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<ClientListBo> findJpushClientsByType(Integer type,Integer pageNo,Integer pageSize) {
+		// TODO Auto-generated method stub
+		if(pageNo==null||pageNo<1)pageNo=1;
+		if(pageSize==null||pageSize<1)pageSize=10;
+		Map<String, Object>params=new HashMap<>();
+		params.put("clientType", type);
+		return (Pagination<ClientListBo>) findPage("findJpushClientsByType", "findJpushClientsCountByType", params, pageNo, pageSize);
+	}
+
+}

+ 2 - 0
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 
 import com.goafanti.app.bo.UserBasicInfo;
 import com.goafanti.app.bo.UserBasicInfo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.JpushEasemobAccountMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserMapper;
@@ -19,6 +20,7 @@ import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.user.bo.ClientListBo;
 import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.bo.UserBaseBo;
 import com.goafanti.user.bo.UserBaseBo;
 import com.goafanti.user.bo.UserDownLoadBo;
 import com.goafanti.user.bo.UserDownLoadBo;

+ 11 - 11
src/main/webapp/WEB-INF/views/common.html

@@ -59,19 +59,19 @@
 						<img th:src="${portalHost+'/img/index/index_webkit1.png'}" alt="">
 						<img th:src="${portalHost+'/img/index/index_webkit1.png'}" alt="">
 					</span>
 					</span>
 					<p>
 					<p>
-						<a href="#">最新发布</a>
+						<a th:href="@{/portal/service/patent#recentPublish}">最新发布</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">专利服务</a>
+						<a th:href="@{/portal/service/patent#patentService}">专利服务</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">商标服务</a>
+						<a th:href="@{/portal/service/patent#branchService}">商标服务</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">版权服务</a>
+						<a th:href="@{/portal/service/patent#copyrightService}">版权服务</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">知产百科</a>
+						<a th:href="@{/portal/service/patent#encyclopedias}">知产百科</a>
 					</p>
 					</p>
 
 
 				</li>
 				</li>
@@ -124,19 +124,19 @@
 						<img th:src="${portalHost+'/img/index/index_webkit4.png'}" alt="">
 						<img th:src="${portalHost+'/img/index/index_webkit4.png'}" alt="">
 					</span>
 					</span>
 					<p>
 					<p>
-						<a href="#">最新发布</a>
+						<a th:href="@{/portal/service/patent#recentPublish}">最新发布</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">专利服务</a>
+						<a th:href="@{/portal/service/patent#patentService}">专利服务</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">商标服务</a>
+						<a th:href="@{/portal/service/patent#branchService}">商标服务</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">版权服务</a>
+						<a th:href="@{/portal/service/patent#copyrightService}">版权服务</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">知产百科</a>
+						<a th:href="@{/portal/service/patent#encyclopedias}">知产百科</a>
 					</p>
 					</p>
 				</li>
 				</li>
 				<!-- <li>
 				<!-- <li>
@@ -187,7 +187,7 @@
                 <ul>
                 <ul>
                     <li th:class="${subM}=='apply'?active:''" >
                     <li th:class="${subM}=='apply'?active:''" >
                     <div>
                     <div>
-                        <a th:href="@{/portal/service/serviceIndex}">知识产权申请</a>
+                        <a th:href="@{/portal/service/patent}">知识产权申请</a>
  
  
                        </div>
                        </div>
                     </li>
                     </li>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/companyProfile.html


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/service/patent.html


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html