Просмотр исходного кода

Accept Merge Request #268 角色管理更新 : (test -> prod)

Merge Request: 角色管理更新
Created By: @浅川
Accepted By: @浅川
URL: https://coding.net/t/aft/p/AFT/git/merge/268
浅川 лет назад: 8
Родитель
Сommit
70bd062c0a
70 измененных файлов с 8631 добавлено и 179 удалено
  1. 5 2
      GeneratorConfig.xml
  2. 17 0
      src/main/java/com/goafanti/achievement/bo/AchievementListBo.java
  3. 16 4
      src/main/java/com/goafanti/achievement/bo/InputAchievement.java
  4. 2 2
      src/main/java/com/goafanti/achievement/controller/AchievementApiController.java
  5. 3 3
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  6. 30 7
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  7. 5 4
      src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java
  8. 4 5
      src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java
  9. 4 0
      src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java
  10. 5 4
      src/main/java/com/goafanti/admin/controller/BusinessProjectController.java
  11. 2 0
      src/main/java/com/goafanti/admin/service/AdminVarietiesService.java
  12. 7 0
      src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java
  13. 5 5
      src/main/java/com/goafanti/admin/service/impl/BusinessProjectServiceImpl.java
  14. 36 53
      src/main/java/com/goafanti/app/controller/AppApiController.java
  15. 0 5
      src/main/java/com/goafanti/common/bo/Result.java
  16. 37 30
      src/main/java/com/goafanti/common/controller/PublicController.java
  17. 96 0
      src/main/java/com/goafanti/common/dao/MessageConsumerMapper.java
  18. 96 0
      src/main/java/com/goafanti/common/dao/MessageFromBusinessMapper.java
  19. 96 0
      src/main/java/com/goafanti/common/dao/MessageFromSystemMapper.java
  20. 96 0
      src/main/java/com/goafanti/common/dao/MessageProducerMapper.java
  21. 6 0
      src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java
  22. 2 0
      src/main/java/com/goafanti/common/dao/PermissionMapper.java
  23. 12 0
      src/main/java/com/goafanti/common/dao/RoleMapper.java
  24. 6 0
      src/main/java/com/goafanti/common/dao/UserMapper.java
  25. 10 2
      src/main/java/com/goafanti/common/error/SystemExceptionResolver.java
  26. 33 6
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  27. 33 8
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  28. 318 0
      src/main/java/com/goafanti/common/mapper/MessageConsumerMapper.xml
  29. 526 0
      src/main/java/com/goafanti/common/mapper/MessageFromBusinessMapper.xml
  30. 398 0
      src/main/java/com/goafanti/common/mapper/MessageFromSystemMapper.xml
  31. 303 0
      src/main/java/com/goafanti/common/mapper/MessageProducerMapper.xml
  32. 21 0
      src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml
  33. 8 0
      src/main/java/com/goafanti/common/mapper/PermissionMapper.xml
  34. 68 3
      src/main/java/com/goafanti/common/mapper/RoleMapper.xml
  35. 9 0
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  36. 10 0
      src/main/java/com/goafanti/common/model/Achievement.java
  37. 236 0
      src/main/java/com/goafanti/common/model/MessageConsumer.java
  38. 763 0
      src/main/java/com/goafanti/common/model/MessageConsumerExample.java
  39. 665 0
      src/main/java/com/goafanti/common/model/MessageFromBusiness.java
  40. 1593 0
      src/main/java/com/goafanti/common/model/MessageFromBusinessExample.java
  41. 401 0
      src/main/java/com/goafanti/common/model/MessageFromSystem.java
  42. 1083 0
      src/main/java/com/goafanti/common/model/MessageFromSystemExample.java
  43. 203 0
      src/main/java/com/goafanti/common/model/MessageProducer.java
  44. 703 0
      src/main/java/com/goafanti/common/model/MessageProducerExample.java
  45. 28 1
      src/main/java/com/goafanti/common/model/Role.java
  46. 25 0
      src/main/java/com/goafanti/core/message/BusinessMessageProducerManager.java
  47. 5 0
      src/main/java/com/goafanti/core/message/MessageConsumerManager.java
  48. 13 0
      src/main/java/com/goafanti/core/message/MessageHandler.java
  49. 9 0
      src/main/java/com/goafanti/core/message/MessageProducerManager.java
  50. 18 0
      src/main/java/com/goafanti/core/message/SystemMessageProducerManager.java
  51. 0 1
      src/main/java/com/goafanti/core/shiro/token/UserRealm.java
  52. 27 0
      src/main/java/com/goafanti/demand/bo/DemandListBo.java
  53. 4 0
      src/main/java/com/goafanti/demand/bo/DemandManageListBo.java
  54. 4 5
      src/main/java/com/goafanti/demand/bo/InputDemand.java
  55. 2 2
      src/main/java/com/goafanti/demand/controller/DemandApiController.java
  56. 3 3
      src/main/java/com/goafanti/demand/service/DemandService.java
  57. 31 8
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  58. 46 0
      src/main/java/com/goafanti/message/bo/Message.java
  59. 3 3
      src/main/java/com/goafanti/organization/controller/OrganizationManagementController.java
  60. 18 10
      src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java
  61. 68 0
      src/main/java/com/goafanti/permission/bo/RoleBo.java
  62. 23 0
      src/main/java/com/goafanti/permission/bo/RolePermissionBo.java
  63. 15 0
      src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java
  64. 130 0
      src/main/java/com/goafanti/permission/controller/NewRoleApiController.java
  65. 35 0
      src/main/java/com/goafanti/permission/service/NewRoleService.java
  66. 139 0
      src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java
  67. 3 3
      src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java
  68. 1 0
      src/main/java/com/goafanti/user/service/UserService.java
  69. 5 0
      src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java
  70. 4 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html

+ 5 - 2
GeneratorConfig.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
-  <classPathEntry location="C:\Users\Administrator\.dbeaver-drivers\maven\maven-central\mysql\mysql-connector-java-5.1.44.jar" />
+  <classPathEntry location="E:/mysql-connector-java-5.1.40.jar" />
   <context id="context1">	
     <jdbcConnection connectionURL="jdbc:mysql://192.168.1.213:3306/aft" 
     	driverClass="com.mysql.jdbc.Driver" password="123456" userId="dev" />
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="AFT" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="AFT" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="AFT" type="XMLMAPPER" />
-    <table schema="aft" tableName="business_project"/>
+    <table schema="aft" tableName="message_from_system"/>
+    <table schema="aft" tableName="message_producer"/>
+    <table schema="aft" tableName="message_consumer"/>
+    <table schema="aft" tableName="message_from_business"/>
   </context>
 </generatorConfiguration>

+ 17 - 0
src/main/java/com/goafanti/achievement/bo/AchievementListBo.java

@@ -121,6 +121,8 @@ public class AchievementListBo {
 	 */
 	private Integer hot;
 	
+	private Date createTime;
+	
 	public String getOrgId() {
 		return orgId;
 	}
@@ -346,4 +348,19 @@ public class AchievementListBo {
 	public void setHot(Integer hot) {
 		this.hot = hot;
 	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public String getCreateTimeFormattedDate() {
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+		}
+	}
 }

+ 16 - 4
src/main/java/com/goafanti/achievement/bo/InputAchievement.java

@@ -26,10 +26,10 @@ public class InputAchievement {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		category;
 
-	@Size(min = 0, max = 1024, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 2048, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		summary;
 
-	@Size(min = 0, max = 2048, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 4096, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		introduction;
 
 	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -105,7 +105,7 @@ public class InputAchievement {
 	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		technicalScene;
 
-	@Size(min = 0, max = 600, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 1024, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		breakthrough;
 
 	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -117,7 +117,7 @@ public class InputAchievement {
 	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		teamDes;
 
-	@Size(min = 0, max = 600, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 1024, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		parameter;
 
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -174,6 +174,18 @@ public class InputAchievement {
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer internationalFlag;
+	
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String remark;
+	
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
 	public Integer getInternationalFlag() {
 		return internationalFlag;
 	}

+ 2 - 2
src/main/java/com/goafanti/achievement/controller/AchievementApiController.java

@@ -104,7 +104,7 @@ public class AchievementApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	private Result list(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category,
-			Integer ownerType, Integer status, String releaseDateStartDate, String releaseDateEndDate,
+			Integer ownerType, Integer status, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate,
 			Integer releaseStatus, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
@@ -117,7 +117,7 @@ public class AchievementApiController extends CertifyApiController {
 			pNo = Integer.parseInt(pageNo);
 		}
 		res.setData(achievementService.listUserAchievement(auditStatus, serialNumber, name, keyword, category,
-				ownerType, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
+				ownerType, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, pNo, pSize));
 		return res;
 	}
 

+ 3 - 3
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -21,7 +21,7 @@ public interface AchievementService {
 
 	Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,Integer boutique,Integer effective);
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,Integer boutique,Integer effective);
 
 	void saveAchievement(Achievement a, String[] keywords);
 
@@ -33,7 +33,7 @@ public interface AchievementService {
 
 	Pagination<AchievementListBo> listUserAchievement(Integer auditStatus, Integer serialNumber, String name,
 			String keyword, Integer category, Integer ownerType, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize);
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize);
 
 	int updateAuditAchievement(Achievement a, String techBroderId, Integer auditStatus);
 
@@ -41,7 +41,7 @@ public interface AchievementService {
 
 	Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 
 	AchievementUserOwnerDetailBo selectUserOwnerDetail(String id);
 

+ 30 - 7
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -92,10 +92,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Override
 	public Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
 			Integer boutique, Integer hot) {
 		Map<String, Object> params = disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
-				releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
+				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
 				boutique,null, hot);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -117,10 +117,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Override
 	public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
 			Integer boutique, Integer hot) {
 		Map<String, Object> params = disposeParams(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
-				releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
+				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
 				boutique,internationalFlag, hot);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -202,7 +202,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Override
 	public Pagination<AchievementListBo> listUserAchievement(Integer auditStatus, Integer serialNumber, String name,
 			String keyword, Integer category, Integer ownerType, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -212,18 +212,20 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		}
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
 				disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
-						status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null, null,null, null),
+						status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, null, null,null, null),
 				pNo, pSize);
 	}
 
 	private Map<String, Object> disposeParams(String username, String ownerName, String ownerId, Integer auditStatus,
 			Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer type,
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer type,
 			Integer boutique,String internationalFlag, Integer hot) {
 		Map<String, Object> params = new HashMap<>();
 
 		Date rStart = null;
 		Date rEnd = null;
+		Date cStart = null;
+		Date cEnd = null;
 
 		if (!StringUtils.isBlank(releaseDateStartDate)) {
 			try {
@@ -238,6 +240,19 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			} catch (ParseException e) {
 			}
 		}
+		if (!StringUtils.isBlank(createDateStartDate)) {
+			try {
+				cStart = DateUtils.parseDate(createDateStartDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+			}
+		}
+
+		if (!StringUtils.isBlank(createDateEndDate)) {
+			try {
+				cEnd = DateUtils.addDays(DateUtils.parseDate(createDateEndDate, AFTConstants.YYYYMMDD), 1);
+			} catch (ParseException e) {
+			}
+		}
 
 		if (StringUtils.isNotBlank(ownerName)) {
 			params.put("ownerName", ownerName);
@@ -258,6 +273,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (null != rEnd) {
 			params.put("rEnd", rEnd);
 		}
+		if (null != cStart) {
+			params.put("cStart", cStart);
+		}
+
+		if (null != cEnd) {
+			params.put("cEnd", cEnd);
+		}
+		
 
 		if (null != auditStatus) {
 			params.put("auditStatus", auditStatus);

+ 5 - 4
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -63,7 +63,7 @@ public class AdminAchievementApiController extends CertifyApiController {
     @RequestMapping(value = "/userList", method = RequestMethod.GET)
     private Result userList(String username, String ownerName, String ownerId, Integer auditStatus,
             Integer serialNumber, String name, String keyword, Integer category, Integer status,
-            String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, String pageNo,
+            String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String pageNo,
             String pageSize,Integer boutique,Integer hot) {
         Result res = new Result();
         Integer pNo = 1;
@@ -74,8 +74,9 @@ public class AdminAchievementApiController extends CertifyApiController {
         if (StringUtils.isNumeric(pageNo)) {
             pNo = Integer.parseInt(pageNo);
         }
+       
         res.setData(achievementService.listUserOwnerAchievement(username, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize,boutique,hot));
+                keyword, category, status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, pNo, pSize,boutique,hot));
         return res;
     }
     /**
@@ -83,7 +84,7 @@ public class AdminAchievementApiController extends CertifyApiController {
      */
     @RequestMapping(value = "/orgList", method = RequestMethod.GET)
     private Result orgList(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
-            String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
+            String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate,
             Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot) {
         Result res = new Result();
         Integer pNo = 1;
@@ -96,7 +97,7 @@ public class AdminAchievementApiController extends CertifyApiController {
         }
         
         Object o = achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot);
+                keyword, category, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot);
         
         res.setData(o);
         

+ 4 - 5
src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java

@@ -196,7 +196,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	public Result userList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String username, Integer status, Integer releaseStatus, String releaseDateStartDate,
-			String releaseDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -209,7 +209,7 @@ public class AdminDemandApiController extends CertifyApiController {
 		}
 		res.setData(demandService.selectUserDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, username, status,
-				releaseStatus, releaseDateStartDate, releaseDateEndDate, pNo, pSize,boutique,hot));
+				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot));
 		return res;
 	}
 
@@ -220,7 +220,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	public Result orgList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String unitName, Integer status, Integer releaseStatus, String releaseDateStartDate,
-			String releaseDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -233,7 +233,7 @@ public class AdminDemandApiController extends CertifyApiController {
 		}
 		res.setData(demandService.selectOrgDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, unitName, status,
-				releaseStatus, releaseDateStartDate, releaseDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId()));
+				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId()));
 		return res;
 	}
 
@@ -288,7 +288,6 @@ public class AdminDemandApiController extends CertifyApiController {
 	@RequestMapping(value = "/userDemandDetail", method = RequestMethod.GET)
 	public Result userDemandDetail(String id) {
 		Result res = new Result();
-
 		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
 			return res;

+ 4 - 0
src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java

@@ -96,6 +96,10 @@ public class AdminVarietiesApiController extends BaseController{
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "品类名称已存在", "品类名称"));
 			return res;
 		}
+		if (adminVarietiesService.ifLayer(superId)) {
+			res.getError().add(buildError( "品类层级不能超过三级", "品类层级不能超过三级"));
+			return res;
+		}
 		res.setData(adminVarietiesService.updateVarietoes(id, cname, superId, status));
 		return res; 
 	}

+ 5 - 4
src/main/java/com/goafanti/admin/controller/BusinessProjectController.java

@@ -4,7 +4,8 @@ package com.goafanti.admin.controller;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,13 +23,13 @@ import com.goafanti.common.model.ProjectSize;
 import com.goafanti.common.utils.StringUtils;
 
 @RestController
-@RequestMapping("api/admin/ProjectSize")
+@RequestMapping("/api/admin/ProjectSize")
 public class BusinessProjectController extends CertifyApiController{
 	
 	@Resource
 	BusinessProjectService businessprojectService;
 	
-	
+	private Logger logger = LoggerFactory.getLogger(BusinessProjectController.class);
 	
 	/**
 	 * 新增项目
@@ -121,7 +122,7 @@ public class BusinessProjectController extends CertifyApiController{
 		return res;
 	}
 	/**
-	 * 获取业务品类全路径()
+	 * 获取业务品类全路径
 	 */
 	@RequestMapping(value = "/getAllCname", method = RequestMethod.GET)
 	public Result getAllCname(Integer flag){

+ 2 - 0
src/main/java/com/goafanti/admin/service/AdminVarietiesService.java

@@ -27,4 +27,6 @@ public interface AdminVarietiesService {
 	
 	int getCountSon(String id);
 	int getLayer(String superId);
+
+	boolean ifLayer(String superId);
 }

+ 7 - 0
src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java

@@ -218,6 +218,13 @@ public class AdminVarietiesServiceImpl extends BaseMybatisDao<BusinessVarietiesM
 	public int getLayer(String superId) {
 		return businessVarietiesMapper.getLayer(superId);
 	}
+	@Override
+	public boolean ifLayer(String superId) {
+		if(businessVarietiesMapper.getLayer(superId)>2){
+			return true;
+		}
+		return false;
+	}
 	
 	
 }

+ 5 - 5
src/main/java/com/goafanti/admin/service/impl/BusinessProjectServiceImpl.java

@@ -150,7 +150,6 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 	public List<Map<String, String>> getAllCnames(Integer flag) {
 		List<Map<String, String>> list=new ArrayList<Map<String, String>>();
 		List<String> listcid=businessVarietiesMapper.getListId();
-		
 		for (String s : listcid) {
 			Map<String, String> map=new HashMap<>(); 
 			String cname=getAllCname(s);
@@ -166,9 +165,6 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 					list.add(map);
 				}
 			}
-			
-			
-			
 		}
 		return list;
 	}
@@ -183,11 +179,15 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		BusinessVarieties bv=businessVarietiesMapper.selectByPrimaryKey(s);
 		String sid=bv.getSuperId();
 		if (cid.length()>4) {
+			if(bv.getSuperId().equals(bv.getId())){
+				return "";
+			}
 			String w=getAllCname(sid)+"-"+cname;
-			 return w;
+			return w;
 		}else{
 			return cid.length()>3?cname:"";
 		}
+		
 	}
 	
 	

+ 36 - 53
src/main/java/com/goafanti/app/controller/AppApiController.java

@@ -1,78 +1,61 @@
 package com.goafanti.app.controller;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.goafanti.achievement.service.AchievementService;
-import com.goafanti.activity.service.ActivityService;
-import com.goafanti.banners.enums.BannersType;
-import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
-import com.goafanti.demand.service.DemandService;
-import com.goafanti.news.enums.NewsType;
-import com.goafanti.news.service.NewsService;
+import com.goafanti.common.model.User;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.user.service.UserService;
 
 @RestController
-@RequestMapping(path = "/api/open/app", method = RequestMethod.GET)
+@RequestMapping(path = "/api/user/app", method = RequestMethod.GET)
 public class AppApiController extends BaseApiController {
-	@Resource
-	private BannersService		bannersService;
-	@Resource
-	private ActivityService		activityService;
-	@Resource
-	private NewsService			newsService;
-	@Resource
-	private AchievementService	achievementService;
-	@Resource
-	private DemandService		demandService;
-	@RequestMapping(value = "/index", method = RequestMethod.GET)
-	public Result index(HttpServletRequest request) {
-		Map<String, Object> result = new HashMap<>();
-		String domainName = request.getServerName();
-		result.put("banners", bannersService.findPortalBanners(BannersType.APP.getKey()));
-		result.put("activities", activityService.findPortalList(0, 3, null));
-		result.put("policies", newsService.findNewsList(0, NewsType.GJZC.getCode(), 3, domainName, true));
-		result.put("news", newsService.findNewsList(0, NewsType.JTDT.getCode(), 5, domainName, true));
-		return res().data(result);
-	}
-
-	/**
-	 * 科技成果详情
-	 */
-	@RequestMapping(value = "/achievementDetail", method = RequestMethod.GET)
-	public Result achievementDetail(String id) {
+	@Autowired
+	private UserService userServiceImpl;
+	
+	@RequestMapping(value = "/uploadImg",method = RequestMethod.POST)
+	public Result uploadAvatar(HttpServletRequest req){
 		Result res = new Result();
-		if (StringUtils.isBlank(id)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
-			return res;
+		String headPortraitUrl = handleFile(res, "/avatar/", false, req, "");
+		if(TokenManager.getToken() instanceof User){
+			User u = (User)TokenManager.getToken();
+			u.setHeadPortraitUrl(headPortraitUrl);
+			userServiceImpl.updateByPrimaryKeySelective(u);
 		}
-		res.setData(achievementService.selectAchievementDetail(id));
+		res.setData(headPortraitUrl);
 		return res;
 	}
 
-	/**
-	 * 科技需求详情
-	 */
-	@RequestMapping(value = "/demandDetail", method = RequestMethod.GET)
-	public Result demandDetail(String id) {
+	@RequestMapping(value = "/updateUser",method = RequestMethod.POST)
+	public Result updateUser(User u){
 		Result res = new Result();
-		if (StringUtils.isBlank(id)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
-			return res;
+		if(null != u){
+			u.setId(TokenManager.getUserId());
+			userServiceImpl.updateByPrimaryKeySelective(u);
+		}else{
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR));
 		}
-		res.setData(demandService.selectDemandDetail(id));
 		return res;
 	}
 	
-
+	@RequestMapping(value = "/logout",method = RequestMethod.GET)
+	public Result logout(HttpServletRequest request){
+		Result res = new Result();
+		TokenManager.logout();
+		return res;
+	}
+	
+	@RequestMapping(value = "/userInfo",method = RequestMethod.GET)
+	public Result userInfo(HttpServletRequest request){
+		Result res = new Result();
+		res.setData(userServiceImpl.selectBaseInfo(TokenManager.getUserId()));
+		return res;
+	}
 }

+ 0 - 5
src/main/java/com/goafanti/common/bo/Result.java

@@ -3,11 +3,6 @@ package com.goafanti.common.bo;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-
-import org.apache.shiro.SecurityUtils;
-
-import com.goafanti.core.shiro.token.TokenManager;
-
 public class Result {
 	private Object		data;
 	private List<Error>	error	= new ArrayList<Error>();

+ 37 - 30
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.goafanti.admin.service.AftFileService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.enums.MobileCodeCheckOverTimeSign;
 import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.User;
 import com.goafanti.common.service.IndustryCategoryService;
@@ -136,11 +135,11 @@ public class PublicController extends BaseController {
 
 		if (TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == null
 				|| TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == "") {
-			sendMessage(mobile, res);
+			sendMessage(mobile, res,VerifyCodeUtils.M_CODE);
 		} else if (TimeUtils.checkOverTime("getMCode")) {
 			VerifyCodeUtils.clearMobileCode();
 			VerifyCodeUtils.clearMobileCodeTime();
-			sendMessage(mobile, res);
+			sendMessage(mobile, res,VerifyCodeUtils.M_CODE);
 		} else {
 			res.getError().add(buildError(ErrorConstants.MCODE_FREQUENCY_ERROR, "", "手机验证码发送频繁!"));
 		}
@@ -154,10 +153,15 @@ public class PublicController extends BaseController {
 	 * @param res
 	 * @return
 	 */
-	private Result sendMessage(String mobile, Result res) {
+	private Result sendMessage(String mobile, Result res,String codeType) {
 		String mobileVerifyCode = VerifyCodeUtils.generateMobileVerifyCode(6); // 生成随机字串
-		TokenManager.setVal2Session(VerifyCodeUtils.M_CODE, mobileVerifyCode);// 存入Shiro会话session
-		TokenManager.setVal2Session(VerifyCodeUtils.M_CODE_TIME, System.currentTimeMillis());
+		if(VerifyCodeUtils.M_CODE.equals(codeType)){
+			TokenManager.setVal2Session(VerifyCodeUtils.M_CODE, mobileVerifyCode);// 存入Shiro会话session
+			TokenManager.setVal2Session(VerifyCodeUtils.M_CODE_TIME, System.currentTimeMillis());
+		}else if(VerifyCodeUtils.RESET_CODE.equals(codeType)){
+			TokenManager.setVal2Session(VerifyCodeUtils.RESET_CODE, mobileVerifyCode);// 存入Shiro会话session
+			TokenManager.setVal2Session(VerifyCodeUtils.RESET_CODE_TIME, System.currentTimeMillis());
+		}
 		String paramString = "{\"code\":\"" + mobileVerifyCode + "\",\"product\":\"阿凡提信息科技\"}";
 		String ret = MobileMessageUtils.sendMessage(mobileCodeTemplate, paramString, mobile, accessKey, accessSecret);
 		if (StringUtils.isNotBlank(ret)) {
@@ -378,8 +382,7 @@ public class PublicController extends BaseController {
 			res.getError().add(buildError(ErrorConstants.MCODE_EMPTY_ERROR, "", "手机验证码"));
 			return res;
 		}
-
-		if (TimeUtils.checkOverTime(MobileCodeCheckOverTimeSign.REGISTER.getCode())) {
+		if (TimeUtils.checkOverTime(VerifyCodeUtils.M_CODE)) {
 			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "", "手机验证码超时失效!"));
 			VerifyCodeUtils.clearMobileCode();
 			VerifyCodeUtils.clearMobileCodeTime();
@@ -413,7 +416,7 @@ public class PublicController extends BaseController {
 	@ResponseBody
 	public Result resetPwd(String resetCode, String mobile, Integer type, String newPwd) {
 		Result res = new Result();
-		if (TimeUtils.checkOverTime(MobileCodeCheckOverTimeSign.RESETCODE.getCode())) {
+		if (TimeUtils.checkOverTime(VerifyCodeUtils.M_CODE)) {
 			res.getError().add(buildError(ErrorConstants.RESET_CODE_OVERTIME, "", "页面超时失效,请重新获取验证码!"));
 			cleanCodeSession();
 			return res;
@@ -459,37 +462,41 @@ public class PublicController extends BaseController {
 		VerifyCodeUtils.clearMobileCodeTime();
 	}
 	
-	/**
-	 * APP手机验证码
-	 * 
-	 * @param mobile
-	 * @param sign
-	 *            是否用与找回密码
-	 * @param type
-	 * @return
-	 */
-	@RequestMapping(value = "/getAppMCode", method = RequestMethod.GET)
+	@RequestMapping(value = "/getRegisterMCode", method = RequestMethod.GET )
 	@ResponseBody
-	public Result getAppMcode(String mobile, boolean sign, Integer type) {
+	public Result getRegisterMCode(String mobile){
 		Result res = new Result();
-		// 用于找回密码
-		if (sign) {
-			if (null == userService.selectByMobieAndType(mobile.trim(), type)) {
-				res.getError().add(buildError(ErrorConstants.NON_REGISTER, "", "该用户未注册!"));
-				return res;
-			}
-		}
 		if (TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == null
 				|| TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == "") {
-			sendMessage(mobile, res);
+			sendMessage(mobile, res,VerifyCodeUtils.M_CODE);
 		} else if (TimeUtils.checkOverTime("getMCode")) {
 			VerifyCodeUtils.clearMobileCode();
 			VerifyCodeUtils.clearMobileCodeTime();
-			sendMessage(mobile, res);
+			sendMessage(mobile, res,VerifyCodeUtils.M_CODE);
+		} else {
+			res.getError().add(buildError(ErrorConstants.MCODE_FREQUENCY_ERROR, "", "手机验证码发送频繁!"));
+		}
+		return res;
+	}
+	
+	@RequestMapping(value = "/getResetMCode", method = RequestMethod.GET )
+	@ResponseBody
+	public Result getResetMCode(String mobile, Integer type) {
+		Result res = new Result();
+		if (null == userService.selectByMobieAndType(mobile.trim(), type)) {
+			res.getError().add(buildError(ErrorConstants.NON_REGISTER, "", "该用户未注册!"));
+			return res;
+		}
+		if (TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE_TIME) == null
+				|| TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE_TIME) == "") {
+			sendMessage(mobile, res,VerifyCodeUtils.RESET_CODE);
+		} else if (TimeUtils.checkOverTime("resetCode")) {
+			VerifyCodeUtils.clearMobileCode();
+			VerifyCodeUtils.clearMobileCodeTime();
+			sendMessage(mobile, res,VerifyCodeUtils.RESET_CODE);
 		} else {
 			res.getError().add(buildError(ErrorConstants.MCODE_FREQUENCY_ERROR, "", "手机验证码发送频繁!"));
 		}
-
 		return res;
 	}
 	

+ 96 - 0
src/main/java/com/goafanti/common/dao/MessageConsumerMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.MessageConsumer;
+import com.goafanti.common.model.MessageConsumerExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface MessageConsumerMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    long countByExample(MessageConsumerExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int deleteByExample(MessageConsumerExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int insert(MessageConsumer record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int insertSelective(MessageConsumer record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    List<MessageConsumer> selectByExample(MessageConsumerExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    MessageConsumer selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByExampleSelective(@Param("record") MessageConsumer record, @Param("example") MessageConsumerExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByExample(@Param("record") MessageConsumer record, @Param("example") MessageConsumerExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByPrimaryKeySelective(MessageConsumer record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByPrimaryKey(MessageConsumer record);
+}

+ 96 - 0
src/main/java/com/goafanti/common/dao/MessageFromBusinessMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.MessageFromBusiness;
+import com.goafanti.common.model.MessageFromBusinessExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface MessageFromBusinessMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_business
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    long countByExample(MessageFromBusinessExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_business
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int deleteByExample(MessageFromBusinessExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_business
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_business
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int insert(MessageFromBusiness record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_business
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int insertSelective(MessageFromBusiness record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_business
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    List<MessageFromBusiness> selectByExample(MessageFromBusinessExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_business
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    MessageFromBusiness selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_business
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByExampleSelective(@Param("record") MessageFromBusiness record, @Param("example") MessageFromBusinessExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_business
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByExample(@Param("record") MessageFromBusiness record, @Param("example") MessageFromBusinessExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_business
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByPrimaryKeySelective(MessageFromBusiness record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_business
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByPrimaryKey(MessageFromBusiness record);
+}

+ 96 - 0
src/main/java/com/goafanti/common/dao/MessageFromSystemMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.MessageFromSystem;
+import com.goafanti.common.model.MessageFromSystemExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface MessageFromSystemMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_system
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    long countByExample(MessageFromSystemExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_system
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int deleteByExample(MessageFromSystemExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_system
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_system
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int insert(MessageFromSystem record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_system
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int insertSelective(MessageFromSystem record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_system
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    List<MessageFromSystem> selectByExample(MessageFromSystemExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_system
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    MessageFromSystem selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_system
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByExampleSelective(@Param("record") MessageFromSystem record, @Param("example") MessageFromSystemExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_system
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByExample(@Param("record") MessageFromSystem record, @Param("example") MessageFromSystemExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_system
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByPrimaryKeySelective(MessageFromSystem record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_from_system
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByPrimaryKey(MessageFromSystem record);
+}

+ 96 - 0
src/main/java/com/goafanti/common/dao/MessageProducerMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.MessageProducer;
+import com.goafanti.common.model.MessageProducerExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface MessageProducerMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    long countByExample(MessageProducerExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int deleteByExample(MessageProducerExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int insert(MessageProducer record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int insertSelective(MessageProducer record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    List<MessageProducer> selectByExample(MessageProducerExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    MessageProducer selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByExampleSelective(@Param("record") MessageProducer record, @Param("example") MessageProducerExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByExample(@Param("record") MessageProducer record, @Param("example") MessageProducerExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByPrimaryKeySelective(MessageProducer record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    int updateByPrimaryKey(MessageProducer record);
+}

+ 6 - 0
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -103,4 +103,10 @@ public interface OrganizationManagementMapper {
 	int updateByNumber(OrganizationListOut olo);
 	
 	int selectCountBySuperId(String superId);
+	
+	String selectIdByName(String name);
+	
+	String selectNameById(String id);
+	
+	String selectDepNoById(String id);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/PermissionMapper.java

@@ -62,4 +62,6 @@ public interface PermissionMapper {
 	String selectAutNoByNamei(String name);
 	
 	String selectIdByName(String name);
+	
+	int selectCountByid(String id);
 }

+ 12 - 0
src/main/java/com/goafanti/common/dao/RoleMapper.java

@@ -28,4 +28,16 @@ public interface RoleMapper {
 	int deleteByPrimaryKeys(List<String> records);
 
 	List<RolePermissionBo> findRolePermissionsExceptAreaManager();
+	
+	List<Role> findRoles();
+	
+	List<RolePermissionBo> selectRolePList(String id);
+	
+	int selectCountByRoleId(List<String> records);
+	
+	String selectIdByName(String roleName);
+	
+	String selectNameById(String id);
+	
+	String selectIdByNamei(Role role);
 }

+ 6 - 0
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -178,4 +178,10 @@ public interface UserMapper {
 	 */
 	List<User> checkUser(@Param("id")String id,@Param("identifyName")String identifyName, @Param("mobile")String mobile,@Param("type")Integer type);
 
+	/**
+	 * 查询用户基本信息
+	 * @param id
+	 * @return
+	 */
+	User selectBaseInfo(@Param("id")String id);
 }

+ 10 - 2
src/main/java/com/goafanti/common/error/SystemExceptionResolver.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.support.ResourcePropertySource;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
@@ -17,16 +18,22 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.filter.ShiroFilterUtils;
 
-public class SystemExceptionResolver extends SimpleMappingExceptionResolver {
+public class SystemExceptionResolver extends SimpleMappingExceptionResolver{
 	@Resource(name = "errorResource")
 	private ResourcePropertySource	errorResource;
-
+	@Value(value = "${app.name}")
+	private String appName;
 	@Autowired
 	private ShiroFilterUtils		shiroFilterUtils;
 
 	@Override
 	protected ModelAndView doResolveException(HttpServletRequest request, HttpServletResponse response, Object handler,
 			Exception ex) {
+		/*if(request.getHeader("User-Agent") != null && request.getHeader("User-Agent").indexOf(appName) > -1){
+			setExceptionMappings(new Properties());
+			return null;
+		}
+		*/
 		// Expose ModelAndView for chosen error view.
 		String viewName = determineViewName(ex, request);
 
@@ -85,4 +92,5 @@ public class SystemExceptionResolver extends SimpleMappingExceptionResolver {
 	public void setErrorResource(ResourcePropertySource errorResource) {
 		this.errorResource = errorResource;
 	}
+	
 }

+ 33 - 6
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -98,7 +98,7 @@
       manager_id, salesman_id, status, 
       create_time, release_status, release_date, 
       deleted_sign, audit_status, tech_broker_id,
-      country_name_zh,international_flag,jmrh_flag,boutique)
+      country_name_zh,international_flag,jmrh_flag,boutique,remark)
     values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{category,jdbcType=INTEGER}, 
       #{summary,jdbcType=VARCHAR}, #{introduction,jdbcType=LONGVARCHAR}, #{technicalPictureUrl,jdbcType=VARCHAR}, 
@@ -116,7 +116,7 @@
       #{managerId,jdbcType=VARCHAR}, #{salesmanId,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{releaseStatus,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP}, 
       #{deletedSign,jdbcType=INTEGER}, #{auditStatus,jdbcType=INTEGER}, #{techBrokerId,jdbcType=VARCHAR},
-      #{countryNameZh,jdbcType=VARCHAR}, #{internationalFlag,jdbcType=INTEGER},#{jmrhFlag,jdbcType=INTEGER},#{boutique,jdbcType=INTEGER})
+      #{countryNameZh,jdbcType=VARCHAR}, #{internationalFlag,jdbcType=INTEGER},#{jmrhFlag,jdbcType=INTEGER},#{boutique,jdbcType=INTEGER},#{remark,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Achievement">
     insert into achievement
@@ -629,6 +629,9 @@
        <if test="boutique != null">
         boutique = #{boutique,jdbcType=INTEGER},
       </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -697,7 +700,7 @@
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
   		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
   		ui.username as username, a.owner_id as ownerId, a.org_id as orgId, a.contacts,
-  		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique
+  		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique,a.create_time as createTime
   	<if test="hot != null and hot == 1"><!-- 在首页 -->
 		,1 as hot
 	</if>
@@ -708,7 +711,7 @@
 		,ifnull(mm.effective,0) as hot
 	</if>
   	from achievement a
-  	LEFT JOIN admin ad on a.id = a.tech_broker_id
+  	LEFT JOIN admin ad on ad.id = a.tech_broker_id
   	LEFT JOIN user_identity ui on a.owner_id = ui.uid
 	<if test="hot != null and hot == 1"><!-- 在首页 -->
 		inner join marketing_management mm on a.id = mm.product_id
@@ -751,6 +754,12 @@
 	<if test="rEnd != null">
 	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
+	<if test="cStart != null">
+       and	a.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="releaseStatus != null">
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
@@ -817,6 +826,12 @@
 	<if test="rEnd != null">
 	   and release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
+	<if test="cStart != null">
+       and	a.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="releaseStatus != null">
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
@@ -840,7 +855,7 @@
   	select 
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
   		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
-  		oi.unit_name as username, a.owner_id as ownerId, a.org_id as orgId, a.contacts,
+  		oi.unit_name as username, a.owner_id as ownerId, a.org_id as orgId, a.contacts,a.create_time as createTime,
   		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique
   	<if test="hot != null and hot == 1"><!-- 在首页 -->
 		,1 as hot
@@ -900,6 +915,12 @@
 	<if test="rEnd != null">
 	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
+	<if test="cStart != null">
+       and	a.create_time <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="releaseStatus != null">
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
@@ -971,6 +992,12 @@
 	<if test="rEnd != null">
 	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
+	<if test="cStart != null">
+       and	a.create_time <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="releaseStatus != null">
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
@@ -1124,7 +1151,7 @@
 		    a.create_time as createTime, a.release_status as releaseStatus,
 		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
 		    oi.unit_name as iOwnerName, oi.postal_address as iOwnerPostalAddress, u.email as iOwnerEmail,
-		    oi.org_code as iOwnerIdNumber, u.mobile as iOwnerMobile,a.boutique,ifnull(mm.effective,0) hot,mm.cover_img as coverImg
+		    oi.org_code as iOwnerIdNumber, u.mobile as iOwnerMobile,a.boutique,ifnull(mm.effective,0) hot,mm.cover_img as coverImg,a.remark
     from achievement a
     left join organization_identity oi on a.owner_id = oi.uid
     left join user u on u.id = a.owner_id

+ 33 - 8
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -497,7 +497,7 @@
 	  d.name, d.keyword, d.info_sources as infoSources, 
 	  ui.username, d.demand_type as demandType, d.validity_period as validityPeriod, 
 	  d.employer_name as employerName, ui.province, d.status, 
-	  d.release_status as releaseStatus, d.release_date as releaseDate, a.name as techBrokerId,
+	  d.release_status as releaseStatus, d.release_date as releaseDate, a.name as techBrokerId,d.create_time as createTime,
 	  d.employer_id as employerId, d.audit_status as auditStatus,d.boutique
 	 <if test="hot != null and hot == 1"><!-- 在首页 -->
 		,1 as hot
@@ -573,6 +573,12 @@
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
+	<if test="cStart != null">
+       and	d.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and d.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="boutique != null">
 		and d.boutique = #{boutique,jdbcType=INTEGER}
 	</if>
@@ -656,6 +662,12 @@
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
+	<if test="cStart != null">
+       and	d.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and d.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="boutique != null">
 		and d.boutique = #{boutique,jdbcType=INTEGER}
 	</if>
@@ -673,7 +685,7 @@
 	  d.name, d.keyword, d.info_sources as infoSources, 
 	  oi.unit_name as username, d.demand_type as demandType, d.validity_period as validityPeriod, 
 	  d.employer_name as employerName, oi.licence_province as province, d.status, 
-	  d.release_status as releaseStatus, d.release_date as releaseDate, a.name as techBrokerId,
+	  d.release_status as releaseStatus, d.release_date as releaseDate, a.name as techBrokerId,d.create_time as createTime,
 	  d.employer_id as employerId, d.audit_status as auditStatus,
 	  d.tech_broker_id as techBrokerId,d.boutique
 	 <if test="hot != null and hot == 1"><!-- 在首页 -->
@@ -754,6 +766,12 @@
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
+	<if test="cStart != null">
+       and	d.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and d.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="boutique != null">
 		and d.boutique = #{boutique,jdbcType=INTEGER}
 	</if>
@@ -841,6 +859,12 @@
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
+	<if test="cStart != null">
+       and	d.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and d.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="boutique != null">
 		and d.boutique = #{boutique,jdbcType=INTEGER}
 	</if>
@@ -863,11 +887,11 @@
   		d.picture_url as pictureUrl, d.text_file_url as textFileUrl, d.video_url as videoUrl,
   		d.budget_cost as budgetCost, d.fixed_cycle as fixedCycle, d.people_number as peopleNumber,
   		d.fixed_scheme as fixedScheme, d.cost_escrow as costEscrow, d.employer_id as employerId,
-  		u.postal_address as address, u.email as mailbox,  u.mobile as mobile, d.audit_status as auditStatus,
+  		u.email as mailbox,  u.mobile as mobile, d.audit_status as auditStatus,
   		d.employer_address as employerAddress, d.employer_contacts_mobile as employerContactsMobile,
   		d.employer_contacts_mailbox as employerContactsMailbox, d.employer_name as employerName,
   		d.tech_broker_id as techBrokerId,  u.mobile as contactsName,
-  		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg
+  		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg,d.remark
   	from demand d 
   	left join user_identity ui on ui.uid = d.employer_id
   	<!-- left join user_info info on info.uid = d.employer_id -->
@@ -916,10 +940,11 @@
   <select id="findDemandListByPage" parameterType="String" resultType="com.goafanti.demand.bo.DemandListBo">
   		select 
 	  d.id, d.serial_number as serialNumber, d.data_category as dataCategory, 
-	  d.name, d.keyword, d.demand_type as demandType, 
-	  d.validity_period as validityPeriod, d.status, d.release_status as releaseStatus, 
+	  d.name, d.keyword, d.demand_type as demandType, d.remark,d.create_time as createTime,
+	  d.validity_period as validityPeriod, d.status, d.release_status as releaseStatus, ad.name  as techBrokerId,
 	  d.release_date as releaseDate, d.employer_id as employerId, d.audit_status as auditStatus
 	from  demand d 
+	LEFT JOIN admin ad on ad.id = d.tech_broker_id
 	where d.deleted_sign = 0 
 	and d.employer_id = #{employerId, jdbcType=VARCHAR}
 	<if test="serialNumber != null">
@@ -1007,7 +1032,7 @@
     	status, release_status, create_time, 
     	keyword, data_category, name,
     	demand_type, problem_des, employer_name,
-    	employer_contacts, employer_contacts_mobile, employer_contacts_mailbox, info_sources,tech_broker_id)
+    	employer_contacts, employer_contacts_mobile, employer_contacts_mailbox, info_sources,tech_broker_id,remark)
     values 
     <foreach item="item" index="index" collection="list" separator=",">
       (
@@ -1016,7 +1041,7 @@
       	#{item.keyword,jdbcType=VARCHAR}, #{item.dataCategory,jdbcType=INTEGER}, #{item.name,jdbcType=VARCHAR},
       	#{item.demandType,jdbcType=INTEGER}, #{item.problemDes,jdbcType=VARCHAR}, #{item.employerName,jdbcType=VARCHAR},
       	#{item.employerContacts,jdbcType=VARCHAR}, #{item.employerContactsMobile,jdbcType=VARCHAR}, #{item.employerContactsMailbox,jdbcType=VARCHAR},
-      	#{item.infoSources,jdbcType=INTEGER},#{item.techBrokerId,jdbcType=VARCHAR}
+      	#{item.infoSources,jdbcType=INTEGER},#{item.techBrokerId,jdbcType=VARCHAR},#{item.remark,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>

+ 318 - 0
src/main/java/com/goafanti/common/mapper/MessageConsumerMapper.xml

@@ -0,0 +1,318 @@
+<?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.MessageConsumerMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.MessageConsumer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="creater" jdbcType="VARCHAR" property="creater" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="consumer_id" jdbcType="VARCHAR" property="consumerId" />
+    <result column="message_id" jdbcType="VARCHAR" property="messageId" />
+    <result column="delete_sign" jdbcType="BIT" property="deleteSign" />
+    <result column="receive_time" jdbcType="TIMESTAMP" property="receiveTime" />
+  </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 Thu Dec 14 21:04:23 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 Thu Dec 14 21:04:23 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 Thu Dec 14 21:04:23 CST 2017.
+    -->
+    id, creater, create_time, consumer_id, message_id, delete_sign, receive_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.MessageConsumerExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from message_consumer
+    <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.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from message_consumer
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    delete from message_consumer
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.MessageConsumerExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    delete from message_consumer
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.MessageConsumer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    insert into message_consumer (id, creater, create_time, 
+      consumer_id, message_id, delete_sign, 
+      receive_time)
+    values (#{id,jdbcType=VARCHAR}, #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{consumerId,jdbcType=VARCHAR}, #{messageId,jdbcType=VARCHAR}, #{deleteSign,jdbcType=BIT}, 
+      #{receiveTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.MessageConsumer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    insert into message_consumer
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="creater != null">
+        creater,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="consumerId != null">
+        consumer_id,
+      </if>
+      <if test="messageId != null">
+        message_id,
+      </if>
+      <if test="deleteSign != null">
+        delete_sign,
+      </if>
+      <if test="receiveTime != null">
+        receive_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="creater != null">
+        #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="consumerId != null">
+        #{consumerId,jdbcType=VARCHAR},
+      </if>
+      <if test="messageId != null">
+        #{messageId,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteSign != null">
+        #{deleteSign,jdbcType=BIT},
+      </if>
+      <if test="receiveTime != null">
+        #{receiveTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.MessageConsumerExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    select count(*) from message_consumer
+    <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 Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_consumer
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.creater != null">
+        creater = #{record.creater,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.consumerId != null">
+        consumer_id = #{record.consumerId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.messageId != null">
+        message_id = #{record.messageId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deleteSign != null">
+        delete_sign = #{record.deleteSign,jdbcType=BIT},
+      </if>
+      <if test="record.receiveTime != null">
+        receive_time = #{record.receiveTime,jdbcType=TIMESTAMP},
+      </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 Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_consumer
+    set id = #{record.id,jdbcType=VARCHAR},
+      creater = #{record.creater,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      consumer_id = #{record.consumerId,jdbcType=VARCHAR},
+      message_id = #{record.messageId,jdbcType=VARCHAR},
+      delete_sign = #{record.deleteSign,jdbcType=BIT},
+      receive_time = #{record.receiveTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.MessageConsumer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_consumer
+    <set>
+      <if test="creater != null">
+        creater = #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="consumerId != null">
+        consumer_id = #{consumerId,jdbcType=VARCHAR},
+      </if>
+      <if test="messageId != null">
+        message_id = #{messageId,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteSign != null">
+        delete_sign = #{deleteSign,jdbcType=BIT},
+      </if>
+      <if test="receiveTime != null">
+        receive_time = #{receiveTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.MessageConsumer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_consumer
+    set creater = #{creater,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      consumer_id = #{consumerId,jdbcType=VARCHAR},
+      message_id = #{messageId,jdbcType=VARCHAR},
+      delete_sign = #{deleteSign,jdbcType=BIT},
+      receive_time = #{receiveTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 526 - 0
src/main/java/com/goafanti/common/mapper/MessageFromBusinessMapper.xml

@@ -0,0 +1,526 @@
+<?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.MessageFromBusinessMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.MessageFromBusiness">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="creater" jdbcType="VARCHAR" property="creater" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="sponsor_id" jdbcType="VARCHAR" property="sponsorId" />
+    <result column="sponsor_type" jdbcType="INTEGER" property="sponsorType" />
+    <result column="sponsor_read" jdbcType="BIT" property="sponsorRead" />
+    <result column="sponsor_read_time" jdbcType="TIMESTAMP" property="sponsorReadTime" />
+    <result column="resource_id" jdbcType="VARCHAR" property="resourceId" />
+    <result column="resource_type" jdbcType="INTEGER" property="resourceType" />
+    <result column="resource_owner_id" jdbcType="VARCHAR" property="resourceOwnerId" />
+    <result column="resource_owner_type" jdbcType="INTEGER" property="resourceOwnerType" />
+    <result column="resource_owner_read" jdbcType="BIT" property="resourceOwnerRead" />
+    <result column="resource_owner_read_time" jdbcType="TIMESTAMP" property="resourceOwnerReadTime" />
+    <result column="admin_id" jdbcType="VARCHAR" property="adminId" />
+    <result column="admin_read_time" jdbcType="TIMESTAMP" property="adminReadTime" />
+    <result column="operator_type" jdbcType="INTEGER" property="operatorType" />
+    <result column="operator_result" jdbcType="VARCHAR" property="operatorResult" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="body" jdbcType="VARCHAR" property="body" />
+  </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 Thu Dec 14 21:04:23 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 Thu Dec 14 21:04:23 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 Thu Dec 14 21:04:23 CST 2017.
+    -->
+    id, creater, create_time, update_time, sponsor_id, sponsor_type, sponsor_read, sponsor_read_time, 
+    resource_id, resource_type, resource_owner_id, resource_owner_type, resource_owner_read, 
+    resource_owner_read_time, admin_id, admin_read_time, operator_type, operator_result, 
+    title, body
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.MessageFromBusinessExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from message_from_business
+    <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.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from message_from_business
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    delete from message_from_business
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.MessageFromBusinessExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    delete from message_from_business
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.MessageFromBusiness">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    insert into message_from_business (id, creater, create_time, 
+      update_time, sponsor_id, sponsor_type, 
+      sponsor_read, sponsor_read_time, resource_id, 
+      resource_type, resource_owner_id, resource_owner_type, 
+      resource_owner_read, resource_owner_read_time, 
+      admin_id, admin_read_time, operator_type, 
+      operator_result, title, body
+      )
+    values (#{id,jdbcType=VARCHAR}, #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{sponsorId,jdbcType=VARCHAR}, #{sponsorType,jdbcType=INTEGER}, 
+      #{sponsorRead,jdbcType=BIT}, #{sponsorReadTime,jdbcType=TIMESTAMP}, #{resourceId,jdbcType=VARCHAR}, 
+      #{resourceType,jdbcType=INTEGER}, #{resourceOwnerId,jdbcType=VARCHAR}, #{resourceOwnerType,jdbcType=INTEGER}, 
+      #{resourceOwnerRead,jdbcType=BIT}, #{resourceOwnerReadTime,jdbcType=TIMESTAMP}, 
+      #{adminId,jdbcType=VARCHAR}, #{adminReadTime,jdbcType=TIMESTAMP}, #{operatorType,jdbcType=INTEGER}, 
+      #{operatorResult,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{body,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.MessageFromBusiness">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    insert into message_from_business
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="creater != null">
+        creater,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="sponsorId != null">
+        sponsor_id,
+      </if>
+      <if test="sponsorType != null">
+        sponsor_type,
+      </if>
+      <if test="sponsorRead != null">
+        sponsor_read,
+      </if>
+      <if test="sponsorReadTime != null">
+        sponsor_read_time,
+      </if>
+      <if test="resourceId != null">
+        resource_id,
+      </if>
+      <if test="resourceType != null">
+        resource_type,
+      </if>
+      <if test="resourceOwnerId != null">
+        resource_owner_id,
+      </if>
+      <if test="resourceOwnerType != null">
+        resource_owner_type,
+      </if>
+      <if test="resourceOwnerRead != null">
+        resource_owner_read,
+      </if>
+      <if test="resourceOwnerReadTime != null">
+        resource_owner_read_time,
+      </if>
+      <if test="adminId != null">
+        admin_id,
+      </if>
+      <if test="adminReadTime != null">
+        admin_read_time,
+      </if>
+      <if test="operatorType != null">
+        operator_type,
+      </if>
+      <if test="operatorResult != null">
+        operator_result,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="body != null">
+        body,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="creater != null">
+        #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sponsorId != null">
+        #{sponsorId,jdbcType=VARCHAR},
+      </if>
+      <if test="sponsorType != null">
+        #{sponsorType,jdbcType=INTEGER},
+      </if>
+      <if test="sponsorRead != null">
+        #{sponsorRead,jdbcType=BIT},
+      </if>
+      <if test="sponsorReadTime != null">
+        #{sponsorReadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resourceId != null">
+        #{resourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceType != null">
+        #{resourceType,jdbcType=INTEGER},
+      </if>
+      <if test="resourceOwnerId != null">
+        #{resourceOwnerId,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceOwnerType != null">
+        #{resourceOwnerType,jdbcType=INTEGER},
+      </if>
+      <if test="resourceOwnerRead != null">
+        #{resourceOwnerRead,jdbcType=BIT},
+      </if>
+      <if test="resourceOwnerReadTime != null">
+        #{resourceOwnerReadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="adminId != null">
+        #{adminId,jdbcType=VARCHAR},
+      </if>
+      <if test="adminReadTime != null">
+        #{adminReadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="operatorType != null">
+        #{operatorType,jdbcType=INTEGER},
+      </if>
+      <if test="operatorResult != null">
+        #{operatorResult,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="body != null">
+        #{body,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.MessageFromBusinessExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    select count(*) from message_from_business
+    <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 Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_from_business
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.creater != null">
+        creater = #{record.creater,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.sponsorId != null">
+        sponsor_id = #{record.sponsorId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sponsorType != null">
+        sponsor_type = #{record.sponsorType,jdbcType=INTEGER},
+      </if>
+      <if test="record.sponsorRead != null">
+        sponsor_read = #{record.sponsorRead,jdbcType=BIT},
+      </if>
+      <if test="record.sponsorReadTime != null">
+        sponsor_read_time = #{record.sponsorReadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.resourceId != null">
+        resource_id = #{record.resourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.resourceType != null">
+        resource_type = #{record.resourceType,jdbcType=INTEGER},
+      </if>
+      <if test="record.resourceOwnerId != null">
+        resource_owner_id = #{record.resourceOwnerId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.resourceOwnerType != null">
+        resource_owner_type = #{record.resourceOwnerType,jdbcType=INTEGER},
+      </if>
+      <if test="record.resourceOwnerRead != null">
+        resource_owner_read = #{record.resourceOwnerRead,jdbcType=BIT},
+      </if>
+      <if test="record.resourceOwnerReadTime != null">
+        resource_owner_read_time = #{record.resourceOwnerReadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.adminId != null">
+        admin_id = #{record.adminId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adminReadTime != null">
+        admin_read_time = #{record.adminReadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.operatorType != null">
+        operator_type = #{record.operatorType,jdbcType=INTEGER},
+      </if>
+      <if test="record.operatorResult != null">
+        operator_result = #{record.operatorResult,jdbcType=VARCHAR},
+      </if>
+      <if test="record.title != null">
+        title = #{record.title,jdbcType=VARCHAR},
+      </if>
+      <if test="record.body != null">
+        body = #{record.body,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 Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_from_business
+    set id = #{record.id,jdbcType=VARCHAR},
+      creater = #{record.creater,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      sponsor_id = #{record.sponsorId,jdbcType=VARCHAR},
+      sponsor_type = #{record.sponsorType,jdbcType=INTEGER},
+      sponsor_read = #{record.sponsorRead,jdbcType=BIT},
+      sponsor_read_time = #{record.sponsorReadTime,jdbcType=TIMESTAMP},
+      resource_id = #{record.resourceId,jdbcType=VARCHAR},
+      resource_type = #{record.resourceType,jdbcType=INTEGER},
+      resource_owner_id = #{record.resourceOwnerId,jdbcType=VARCHAR},
+      resource_owner_type = #{record.resourceOwnerType,jdbcType=INTEGER},
+      resource_owner_read = #{record.resourceOwnerRead,jdbcType=BIT},
+      resource_owner_read_time = #{record.resourceOwnerReadTime,jdbcType=TIMESTAMP},
+      admin_id = #{record.adminId,jdbcType=VARCHAR},
+      admin_read_time = #{record.adminReadTime,jdbcType=TIMESTAMP},
+      operator_type = #{record.operatorType,jdbcType=INTEGER},
+      operator_result = #{record.operatorResult,jdbcType=VARCHAR},
+      title = #{record.title,jdbcType=VARCHAR},
+      body = #{record.body,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.MessageFromBusiness">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_from_business
+    <set>
+      <if test="creater != null">
+        creater = #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sponsorId != null">
+        sponsor_id = #{sponsorId,jdbcType=VARCHAR},
+      </if>
+      <if test="sponsorType != null">
+        sponsor_type = #{sponsorType,jdbcType=INTEGER},
+      </if>
+      <if test="sponsorRead != null">
+        sponsor_read = #{sponsorRead,jdbcType=BIT},
+      </if>
+      <if test="sponsorReadTime != null">
+        sponsor_read_time = #{sponsorReadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resourceId != null">
+        resource_id = #{resourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceType != null">
+        resource_type = #{resourceType,jdbcType=INTEGER},
+      </if>
+      <if test="resourceOwnerId != null">
+        resource_owner_id = #{resourceOwnerId,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceOwnerType != null">
+        resource_owner_type = #{resourceOwnerType,jdbcType=INTEGER},
+      </if>
+      <if test="resourceOwnerRead != null">
+        resource_owner_read = #{resourceOwnerRead,jdbcType=BIT},
+      </if>
+      <if test="resourceOwnerReadTime != null">
+        resource_owner_read_time = #{resourceOwnerReadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="adminId != null">
+        admin_id = #{adminId,jdbcType=VARCHAR},
+      </if>
+      <if test="adminReadTime != null">
+        admin_read_time = #{adminReadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="operatorType != null">
+        operator_type = #{operatorType,jdbcType=INTEGER},
+      </if>
+      <if test="operatorResult != null">
+        operator_result = #{operatorResult,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="body != null">
+        body = #{body,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.MessageFromBusiness">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_from_business
+    set creater = #{creater,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      sponsor_id = #{sponsorId,jdbcType=VARCHAR},
+      sponsor_type = #{sponsorType,jdbcType=INTEGER},
+      sponsor_read = #{sponsorRead,jdbcType=BIT},
+      sponsor_read_time = #{sponsorReadTime,jdbcType=TIMESTAMP},
+      resource_id = #{resourceId,jdbcType=VARCHAR},
+      resource_type = #{resourceType,jdbcType=INTEGER},
+      resource_owner_id = #{resourceOwnerId,jdbcType=VARCHAR},
+      resource_owner_type = #{resourceOwnerType,jdbcType=INTEGER},
+      resource_owner_read = #{resourceOwnerRead,jdbcType=BIT},
+      resource_owner_read_time = #{resourceOwnerReadTime,jdbcType=TIMESTAMP},
+      admin_id = #{adminId,jdbcType=VARCHAR},
+      admin_read_time = #{adminReadTime,jdbcType=TIMESTAMP},
+      operator_type = #{operatorType,jdbcType=INTEGER},
+      operator_result = #{operatorResult,jdbcType=VARCHAR},
+      title = #{title,jdbcType=VARCHAR},
+      body = #{body,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 398 - 0
src/main/java/com/goafanti/common/mapper/MessageFromSystemMapper.xml

@@ -0,0 +1,398 @@
+<?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.MessageFromSystemMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.MessageFromSystem">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="creater" jdbcType="VARCHAR" property="creater" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="producer_id" jdbcType="VARCHAR" property="producerId" />
+    <result column="consumer_type" jdbcType="INTEGER" property="consumerType" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="body" jdbcType="VARCHAR" property="body" />
+    <result column="subject" jdbcType="INTEGER" property="subject" />
+    <result column="resource_id" jdbcType="VARCHAR" property="resourceId" />
+    <result column="resource_type" jdbcType="INTEGER" property="resourceType" />
+    <result column="delete_sign" jdbcType="BIT" property="deleteSign" />
+  </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 Thu Dec 14 21:04:23 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 Thu Dec 14 21:04:23 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 Thu Dec 14 21:04:23 CST 2017.
+    -->
+    id, creater, create_time, update_time, producer_id, consumer_type, title, body, subject, 
+    resource_id, resource_type, delete_sign
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.MessageFromSystemExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from message_from_system
+    <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.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from message_from_system
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    delete from message_from_system
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.MessageFromSystemExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    delete from message_from_system
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.MessageFromSystem">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    insert into message_from_system (id, creater, create_time, 
+      update_time, producer_id, consumer_type, 
+      title, body, subject, 
+      resource_id, resource_type, delete_sign
+      )
+    values (#{id,jdbcType=VARCHAR}, #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{producerId,jdbcType=VARCHAR}, #{consumerType,jdbcType=INTEGER}, 
+      #{title,jdbcType=VARCHAR}, #{body,jdbcType=VARCHAR}, #{subject,jdbcType=INTEGER}, 
+      #{resourceId,jdbcType=VARCHAR}, #{resourceType,jdbcType=INTEGER}, #{deleteSign,jdbcType=BIT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.MessageFromSystem">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    insert into message_from_system
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="creater != null">
+        creater,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="producerId != null">
+        producer_id,
+      </if>
+      <if test="consumerType != null">
+        consumer_type,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="body != null">
+        body,
+      </if>
+      <if test="subject != null">
+        subject,
+      </if>
+      <if test="resourceId != null">
+        resource_id,
+      </if>
+      <if test="resourceType != null">
+        resource_type,
+      </if>
+      <if test="deleteSign != null">
+        delete_sign,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="creater != null">
+        #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="producerId != null">
+        #{producerId,jdbcType=VARCHAR},
+      </if>
+      <if test="consumerType != null">
+        #{consumerType,jdbcType=INTEGER},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="body != null">
+        #{body,jdbcType=VARCHAR},
+      </if>
+      <if test="subject != null">
+        #{subject,jdbcType=INTEGER},
+      </if>
+      <if test="resourceId != null">
+        #{resourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceType != null">
+        #{resourceType,jdbcType=INTEGER},
+      </if>
+      <if test="deleteSign != null">
+        #{deleteSign,jdbcType=BIT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.MessageFromSystemExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    select count(*) from message_from_system
+    <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 Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_from_system
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.creater != null">
+        creater = #{record.creater,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.producerId != null">
+        producer_id = #{record.producerId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.consumerType != null">
+        consumer_type = #{record.consumerType,jdbcType=INTEGER},
+      </if>
+      <if test="record.title != null">
+        title = #{record.title,jdbcType=VARCHAR},
+      </if>
+      <if test="record.body != null">
+        body = #{record.body,jdbcType=VARCHAR},
+      </if>
+      <if test="record.subject != null">
+        subject = #{record.subject,jdbcType=INTEGER},
+      </if>
+      <if test="record.resourceId != null">
+        resource_id = #{record.resourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.resourceType != null">
+        resource_type = #{record.resourceType,jdbcType=INTEGER},
+      </if>
+      <if test="record.deleteSign != null">
+        delete_sign = #{record.deleteSign,jdbcType=BIT},
+      </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 Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_from_system
+    set id = #{record.id,jdbcType=VARCHAR},
+      creater = #{record.creater,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      producer_id = #{record.producerId,jdbcType=VARCHAR},
+      consumer_type = #{record.consumerType,jdbcType=INTEGER},
+      title = #{record.title,jdbcType=VARCHAR},
+      body = #{record.body,jdbcType=VARCHAR},
+      subject = #{record.subject,jdbcType=INTEGER},
+      resource_id = #{record.resourceId,jdbcType=VARCHAR},
+      resource_type = #{record.resourceType,jdbcType=INTEGER},
+      delete_sign = #{record.deleteSign,jdbcType=BIT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.MessageFromSystem">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_from_system
+    <set>
+      <if test="creater != null">
+        creater = #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="producerId != null">
+        producer_id = #{producerId,jdbcType=VARCHAR},
+      </if>
+      <if test="consumerType != null">
+        consumer_type = #{consumerType,jdbcType=INTEGER},
+      </if>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="body != null">
+        body = #{body,jdbcType=VARCHAR},
+      </if>
+      <if test="subject != null">
+        subject = #{subject,jdbcType=INTEGER},
+      </if>
+      <if test="resourceId != null">
+        resource_id = #{resourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceType != null">
+        resource_type = #{resourceType,jdbcType=INTEGER},
+      </if>
+      <if test="deleteSign != null">
+        delete_sign = #{deleteSign,jdbcType=BIT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.MessageFromSystem">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_from_system
+    set creater = #{creater,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      producer_id = #{producerId,jdbcType=VARCHAR},
+      consumer_type = #{consumerType,jdbcType=INTEGER},
+      title = #{title,jdbcType=VARCHAR},
+      body = #{body,jdbcType=VARCHAR},
+      subject = #{subject,jdbcType=INTEGER},
+      resource_id = #{resourceId,jdbcType=VARCHAR},
+      resource_type = #{resourceType,jdbcType=INTEGER},
+      delete_sign = #{deleteSign,jdbcType=BIT}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 303 - 0
src/main/java/com/goafanti/common/mapper/MessageProducerMapper.xml

@@ -0,0 +1,303 @@
+<?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.MessageProducerMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.MessageProducer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="creater" jdbcType="VARCHAR" property="creater" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="consumer_id" jdbcType="VARCHAR" property="consumerId" />
+    <result column="message_id" jdbcType="VARCHAR" property="messageId" />
+    <result column="send_time" jdbcType="TIMESTAMP" property="sendTime" />
+  </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 Thu Dec 14 21:04:23 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 Thu Dec 14 21:04:23 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 Thu Dec 14 21:04:23 CST 2017.
+    -->
+    id, creater, create_time, consumer_id, message_id, send_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.MessageProducerExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from message_producer
+    <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.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from message_producer
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    delete from message_producer
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.MessageProducerExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    delete from message_producer
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.MessageProducer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    insert into message_producer (id, creater, create_time, 
+      consumer_id, message_id, send_time
+      )
+    values (#{id,jdbcType=VARCHAR}, #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{consumerId,jdbcType=VARCHAR}, #{messageId,jdbcType=VARCHAR}, #{sendTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.MessageProducer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    insert into message_producer
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="creater != null">
+        creater,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="consumerId != null">
+        consumer_id,
+      </if>
+      <if test="messageId != null">
+        message_id,
+      </if>
+      <if test="sendTime != null">
+        send_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="creater != null">
+        #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="consumerId != null">
+        #{consumerId,jdbcType=VARCHAR},
+      </if>
+      <if test="messageId != null">
+        #{messageId,jdbcType=VARCHAR},
+      </if>
+      <if test="sendTime != null">
+        #{sendTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.MessageProducerExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    select count(*) from message_producer
+    <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 Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_producer
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.creater != null">
+        creater = #{record.creater,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.consumerId != null">
+        consumer_id = #{record.consumerId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.messageId != null">
+        message_id = #{record.messageId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sendTime != null">
+        send_time = #{record.sendTime,jdbcType=TIMESTAMP},
+      </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 Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_producer
+    set id = #{record.id,jdbcType=VARCHAR},
+      creater = #{record.creater,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      consumer_id = #{record.consumerId,jdbcType=VARCHAR},
+      message_id = #{record.messageId,jdbcType=VARCHAR},
+      send_time = #{record.sendTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.MessageProducer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_producer
+    <set>
+      <if test="creater != null">
+        creater = #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="consumerId != null">
+        consumer_id = #{consumerId,jdbcType=VARCHAR},
+      </if>
+      <if test="messageId != null">
+        message_id = #{messageId,jdbcType=VARCHAR},
+      </if>
+      <if test="sendTime != null">
+        send_time = #{sendTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.MessageProducer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Dec 14 21:04:23 CST 2017.
+    -->
+    update message_producer
+    set creater = #{creater,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      consumer_id = #{consumerId,jdbcType=VARCHAR},
+      message_id = #{messageId,jdbcType=VARCHAR},
+      send_time = #{sendTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 21 - 0
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -541,4 +541,25 @@
 		where
 		super_id=#{superId,jdbcType=VARCHAR}
   	</select>
+  	<select id="selectIdByName" parameterType="java.lang.String" resultType="java.lang.String">
+  		select
+  		id
+  		from department_management 		
+  		where
+  		name=#{name,jdbcType=VARCHAR} 		
+  	</select>
+  	<select id="selectNameById" parameterType="java.lang.String" resultType="java.lang.String">
+  		select
+  		name
+  		from department_management 		
+  		where
+  		id=#{id,jdbcType=VARCHAR} 		
+  	</select>
+  	<select id="selectDepNoById" resultType="String">
+		select
+		dep_no as depNo
+		from department_management
+		where
+		id=#{id,jdbcType=VARCHAR}
+	</select>
 </mapper>

+ 8 - 0
src/main/java/com/goafanti/common/mapper/PermissionMapper.xml

@@ -258,6 +258,7 @@
 		from permission
 		where
 		super_id=#{superId,jdbcType=VARCHAR}
+		order by aut_no
   </select>
   <select id="selectAutNoByNamei" resultType="java.lang.String">
 		select
@@ -273,4 +274,11 @@
 		where
 		name=#{name,jdbcType=VARCHAR}
   </select>
+  <select id="selectCountByid" parameterType="java.lang.String" resultType="java.lang.Integer" >
+  		select
+  		count(0)
+  		from role_permission
+  		where
+  		pid=#{id,jdbcType=VARCHAR} 
+  </select>
 </mapper>

+ 68 - 3
src/main/java/com/goafanti/common/mapper/RoleMapper.xml

@@ -7,7 +7,7 @@
     <result column="role_type" jdbcType="INTEGER" property="roleType" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, role_name, role_type
+    id, role_name, role_type ,creater,create_time as createTime
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -20,8 +20,9 @@
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.Role">
-    insert into role (id, role_name)
-    values (#{id,jdbcType=VARCHAR}, #{roleName,jdbcType=VARCHAR})
+    insert into role (id, role_name,creater,create_time)
+    values (#{id,jdbcType=VARCHAR}, #{roleName,jdbcType=VARCHAR},
+    		#{creater,jdbcType=VARCHAR},#{createTime,jdbcType=VARCHAR})
     ON DUPLICATE KEY UPDATE
 	role_name = values(role_name)
   </insert>
@@ -103,4 +104,68 @@
 	  #{item,jdbcType=VARCHAR}  
     </foreach>
   </delete>
+ <!-- ******************************************************************** --> 
+  <select id="selectRoleList" resultType="com.goafanti.permission.bo.RoleBo">
+    select id,role_name as roleName,role_type as roleType,creater,create_time as createTime
+    from role 
+    where role_type <![CDATA[ < ]]> 999999
+    <if test="roleName !=null">
+		AND role_name=#{roleName,jdbcType=VARCHAR}
+	</if>
+	<if test="page_sql != null">
+    		${page_sql}
+	</if>
+  </select>
+  <select id="selectRoleCount" resultType="java.lang.Integer">
+  	select
+		count(0)
+		from role
+		where
+		1=1
+		<if test="roleName !=null">
+		AND role_name=#{roleName,jdbcType=VARCHAR}
+		</if>
+  </select>
+  
+  <select id="selectRolePList" resultType="com.goafanti.permission.bo.RolePermissionBo">
+  	select tr.id as rid, tr.role_name as rname, tr.role_type,tp.id as pid,tp.name as pname,tp.url
+    from role tr
+    left join role_permission trp on trp.rid=tr.id
+    left join permission tp on tp.id=trp.pid
+    where
+    tr.id=#{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectCountByRoleId" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	select 
+  	count(0) 
+  	from user_role 
+   	where 
+   	rid in 
+    <foreach item="item" index="index" collection="list" open="(" separator="," close=")">  
+	  #{item,jdbcType=VARCHAR}  
+    </foreach>  
+  </select>
+  <select id="selectIdByName" parameterType="java.lang.String" resultType="java.lang.String">
+  	select
+  	id
+  	from role
+  	where
+  	role_name=#{roleName,jdbcType=VARCHAR}
+  </select>
+  <select id="selectNameById" parameterType="java.lang.String" resultType="java.lang.String">
+  	select
+  	role_name as roleName
+  	from role
+  	where
+  	id=#{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectIdByNamei" parameterType="com.goafanti.common.model.Role" resultType="java.lang.String">
+  	select
+  	id
+  	from role
+  	where
+  	role_name=#{roleName,jdbcType=VARCHAR}
+  	and
+  	id!=#{id,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 9 - 0
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1410,4 +1410,13 @@
 			and type = #{type,jdbcType=INTEGER}
 		</if>
 	</select>
+	
+	<select id="selectBaseInfo" parameterType="java.lang.String" resultMap="BaseResultMap">
+		select
+			id, mobile, nickname, email, number, type, 
+    		company_logo_url, head_portrait_url, society_tag, introduction, 
+   			identify_name, is_member
+   		from user where 
+   			id = #{id,jdbcType=VARCHAR}
+	</select>
 </mapper>

+ 10 - 0
src/main/java/com/goafanti/common/model/Achievement.java

@@ -291,6 +291,16 @@ public class Achievement {
      */
     private Integer boutique;
     
+    private String remark;
+	
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+    
 	public String getId() {
 		return id;
 	}

+ 236 - 0
src/main/java/com/goafanti/common/model/MessageConsumer.java

@@ -0,0 +1,236 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class MessageConsumer {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_consumer.id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_consumer.creater
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String creater;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_consumer.create_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_consumer.consumer_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String consumerId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_consumer.message_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String messageId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_consumer.delete_sign
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Boolean deleteSign;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_consumer.receive_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Date receiveTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_consumer.id
+     *
+     * @return the value of message_consumer.id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_consumer.id
+     *
+     * @param id the value for message_consumer.id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_consumer.creater
+     *
+     * @return the value of message_consumer.creater
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getCreater() {
+        return creater;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_consumer.creater
+     *
+     * @param creater the value for message_consumer.creater
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setCreater(String creater) {
+        this.creater = creater;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_consumer.create_time
+     *
+     * @return the value of message_consumer.create_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_consumer.create_time
+     *
+     * @param createTime the value for message_consumer.create_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_consumer.consumer_id
+     *
+     * @return the value of message_consumer.consumer_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getConsumerId() {
+        return consumerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_consumer.consumer_id
+     *
+     * @param consumerId the value for message_consumer.consumer_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setConsumerId(String consumerId) {
+        this.consumerId = consumerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_consumer.message_id
+     *
+     * @return the value of message_consumer.message_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getMessageId() {
+        return messageId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_consumer.message_id
+     *
+     * @param messageId the value for message_consumer.message_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_consumer.delete_sign
+     *
+     * @return the value of message_consumer.delete_sign
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Boolean getDeleteSign() {
+        return deleteSign;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_consumer.delete_sign
+     *
+     * @param deleteSign the value for message_consumer.delete_sign
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setDeleteSign(Boolean deleteSign) {
+        this.deleteSign = deleteSign;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_consumer.receive_time
+     *
+     * @return the value of message_consumer.receive_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Date getReceiveTime() {
+        return receiveTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_consumer.receive_time
+     *
+     * @param receiveTime the value for message_consumer.receive_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setReceiveTime(Date receiveTime) {
+        this.receiveTime = receiveTime;
+    }
+}

+ 763 - 0
src/main/java/com/goafanti/common/model/MessageConsumerExample.java

@@ -0,0 +1,763 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MessageConsumerExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public MessageConsumerExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterIsNull() {
+            addCriterion("creater is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterIsNotNull() {
+            addCriterion("creater is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterEqualTo(String value) {
+            addCriterion("creater =", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterNotEqualTo(String value) {
+            addCriterion("creater <>", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterGreaterThan(String value) {
+            addCriterion("creater >", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterGreaterThanOrEqualTo(String value) {
+            addCriterion("creater >=", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterLessThan(String value) {
+            addCriterion("creater <", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterLessThanOrEqualTo(String value) {
+            addCriterion("creater <=", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterLike(String value) {
+            addCriterion("creater like", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterNotLike(String value) {
+            addCriterion("creater not like", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterIn(List<String> values) {
+            addCriterion("creater in", values, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterNotIn(List<String> values) {
+            addCriterion("creater not in", values, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterBetween(String value1, String value2) {
+            addCriterion("creater between", value1, value2, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterNotBetween(String value1, String value2) {
+            addCriterion("creater not between", value1, value2, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdIsNull() {
+            addCriterion("consumer_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdIsNotNull() {
+            addCriterion("consumer_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdEqualTo(String value) {
+            addCriterion("consumer_id =", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdNotEqualTo(String value) {
+            addCriterion("consumer_id <>", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdGreaterThan(String value) {
+            addCriterion("consumer_id >", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdGreaterThanOrEqualTo(String value) {
+            addCriterion("consumer_id >=", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdLessThan(String value) {
+            addCriterion("consumer_id <", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdLessThanOrEqualTo(String value) {
+            addCriterion("consumer_id <=", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdLike(String value) {
+            addCriterion("consumer_id like", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdNotLike(String value) {
+            addCriterion("consumer_id not like", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdIn(List<String> values) {
+            addCriterion("consumer_id in", values, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdNotIn(List<String> values) {
+            addCriterion("consumer_id not in", values, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdBetween(String value1, String value2) {
+            addCriterion("consumer_id between", value1, value2, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdNotBetween(String value1, String value2) {
+            addCriterion("consumer_id not between", value1, value2, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdIsNull() {
+            addCriterion("message_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdIsNotNull() {
+            addCriterion("message_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdEqualTo(String value) {
+            addCriterion("message_id =", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdNotEqualTo(String value) {
+            addCriterion("message_id <>", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdGreaterThan(String value) {
+            addCriterion("message_id >", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdGreaterThanOrEqualTo(String value) {
+            addCriterion("message_id >=", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdLessThan(String value) {
+            addCriterion("message_id <", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdLessThanOrEqualTo(String value) {
+            addCriterion("message_id <=", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdLike(String value) {
+            addCriterion("message_id like", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdNotLike(String value) {
+            addCriterion("message_id not like", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdIn(List<String> values) {
+            addCriterion("message_id in", values, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdNotIn(List<String> values) {
+            addCriterion("message_id not in", values, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdBetween(String value1, String value2) {
+            addCriterion("message_id between", value1, value2, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdNotBetween(String value1, String value2) {
+            addCriterion("message_id not between", value1, value2, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignIsNull() {
+            addCriterion("delete_sign is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignIsNotNull() {
+            addCriterion("delete_sign is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignEqualTo(Boolean value) {
+            addCriterion("delete_sign =", value, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignNotEqualTo(Boolean value) {
+            addCriterion("delete_sign <>", value, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignGreaterThan(Boolean value) {
+            addCriterion("delete_sign >", value, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("delete_sign >=", value, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignLessThan(Boolean value) {
+            addCriterion("delete_sign <", value, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignLessThanOrEqualTo(Boolean value) {
+            addCriterion("delete_sign <=", value, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignIn(List<Boolean> values) {
+            addCriterion("delete_sign in", values, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignNotIn(List<Boolean> values) {
+            addCriterion("delete_sign not in", values, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignBetween(Boolean value1, Boolean value2) {
+            addCriterion("delete_sign between", value1, value2, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("delete_sign not between", value1, value2, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceiveTimeIsNull() {
+            addCriterion("receive_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceiveTimeIsNotNull() {
+            addCriterion("receive_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceiveTimeEqualTo(Date value) {
+            addCriterion("receive_time =", value, "receiveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceiveTimeNotEqualTo(Date value) {
+            addCriterion("receive_time <>", value, "receiveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceiveTimeGreaterThan(Date value) {
+            addCriterion("receive_time >", value, "receiveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceiveTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("receive_time >=", value, "receiveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceiveTimeLessThan(Date value) {
+            addCriterion("receive_time <", value, "receiveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceiveTimeLessThanOrEqualTo(Date value) {
+            addCriterion("receive_time <=", value, "receiveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceiveTimeIn(List<Date> values) {
+            addCriterion("receive_time in", values, "receiveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceiveTimeNotIn(List<Date> values) {
+            addCriterion("receive_time not in", values, "receiveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceiveTimeBetween(Date value1, Date value2) {
+            addCriterion("receive_time between", value1, value2, "receiveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReceiveTimeNotBetween(Date value1, Date value2) {
+            addCriterion("receive_time not between", value1, value2, "receiveTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table message_consumer
+     *
+     * @mbg.generated do_not_delete_during_merge Thu Dec 14 21:04:23 CST 2017
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table message_consumer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 665 - 0
src/main/java/com/goafanti/common/model/MessageFromBusiness.java

@@ -0,0 +1,665 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class MessageFromBusiness {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.creater
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String creater;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.create_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.update_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Date updateTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.sponsor_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String sponsorId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.sponsor_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Integer sponsorType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.sponsor_read
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Boolean sponsorRead;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.sponsor_read_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Date sponsorReadTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.resource_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String resourceId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.resource_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Integer resourceType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.resource_owner_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String resourceOwnerId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.resource_owner_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Integer resourceOwnerType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.resource_owner_read
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Boolean resourceOwnerRead;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.resource_owner_read_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Date resourceOwnerReadTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.admin_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String adminId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.admin_read_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Date adminReadTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.operator_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Integer operatorType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.operator_result
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String operatorResult;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.title
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String title;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_business.body
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String body;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.id
+     *
+     * @return the value of message_from_business.id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.id
+     *
+     * @param id the value for message_from_business.id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.creater
+     *
+     * @return the value of message_from_business.creater
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getCreater() {
+        return creater;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.creater
+     *
+     * @param creater the value for message_from_business.creater
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setCreater(String creater) {
+        this.creater = creater;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.create_time
+     *
+     * @return the value of message_from_business.create_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.create_time
+     *
+     * @param createTime the value for message_from_business.create_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.update_time
+     *
+     * @return the value of message_from_business.update_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.update_time
+     *
+     * @param updateTime the value for message_from_business.update_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.sponsor_id
+     *
+     * @return the value of message_from_business.sponsor_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getSponsorId() {
+        return sponsorId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.sponsor_id
+     *
+     * @param sponsorId the value for message_from_business.sponsor_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setSponsorId(String sponsorId) {
+        this.sponsorId = sponsorId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.sponsor_type
+     *
+     * @return the value of message_from_business.sponsor_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Integer getSponsorType() {
+        return sponsorType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.sponsor_type
+     *
+     * @param sponsorType the value for message_from_business.sponsor_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setSponsorType(Integer sponsorType) {
+        this.sponsorType = sponsorType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.sponsor_read
+     *
+     * @return the value of message_from_business.sponsor_read
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Boolean getSponsorRead() {
+        return sponsorRead;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.sponsor_read
+     *
+     * @param sponsorRead the value for message_from_business.sponsor_read
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setSponsorRead(Boolean sponsorRead) {
+        this.sponsorRead = sponsorRead;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.sponsor_read_time
+     *
+     * @return the value of message_from_business.sponsor_read_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Date getSponsorReadTime() {
+        return sponsorReadTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.sponsor_read_time
+     *
+     * @param sponsorReadTime the value for message_from_business.sponsor_read_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setSponsorReadTime(Date sponsorReadTime) {
+        this.sponsorReadTime = sponsorReadTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.resource_id
+     *
+     * @return the value of message_from_business.resource_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.resource_id
+     *
+     * @param resourceId the value for message_from_business.resource_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setResourceId(String resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.resource_type
+     *
+     * @return the value of message_from_business.resource_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Integer getResourceType() {
+        return resourceType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.resource_type
+     *
+     * @param resourceType the value for message_from_business.resource_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setResourceType(Integer resourceType) {
+        this.resourceType = resourceType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.resource_owner_id
+     *
+     * @return the value of message_from_business.resource_owner_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getResourceOwnerId() {
+        return resourceOwnerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.resource_owner_id
+     *
+     * @param resourceOwnerId the value for message_from_business.resource_owner_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setResourceOwnerId(String resourceOwnerId) {
+        this.resourceOwnerId = resourceOwnerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.resource_owner_type
+     *
+     * @return the value of message_from_business.resource_owner_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Integer getResourceOwnerType() {
+        return resourceOwnerType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.resource_owner_type
+     *
+     * @param resourceOwnerType the value for message_from_business.resource_owner_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setResourceOwnerType(Integer resourceOwnerType) {
+        this.resourceOwnerType = resourceOwnerType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.resource_owner_read
+     *
+     * @return the value of message_from_business.resource_owner_read
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Boolean getResourceOwnerRead() {
+        return resourceOwnerRead;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.resource_owner_read
+     *
+     * @param resourceOwnerRead the value for message_from_business.resource_owner_read
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setResourceOwnerRead(Boolean resourceOwnerRead) {
+        this.resourceOwnerRead = resourceOwnerRead;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.resource_owner_read_time
+     *
+     * @return the value of message_from_business.resource_owner_read_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Date getResourceOwnerReadTime() {
+        return resourceOwnerReadTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.resource_owner_read_time
+     *
+     * @param resourceOwnerReadTime the value for message_from_business.resource_owner_read_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setResourceOwnerReadTime(Date resourceOwnerReadTime) {
+        this.resourceOwnerReadTime = resourceOwnerReadTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.admin_id
+     *
+     * @return the value of message_from_business.admin_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getAdminId() {
+        return adminId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.admin_id
+     *
+     * @param adminId the value for message_from_business.admin_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setAdminId(String adminId) {
+        this.adminId = adminId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.admin_read_time
+     *
+     * @return the value of message_from_business.admin_read_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Date getAdminReadTime() {
+        return adminReadTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.admin_read_time
+     *
+     * @param adminReadTime the value for message_from_business.admin_read_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setAdminReadTime(Date adminReadTime) {
+        this.adminReadTime = adminReadTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.operator_type
+     *
+     * @return the value of message_from_business.operator_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Integer getOperatorType() {
+        return operatorType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.operator_type
+     *
+     * @param operatorType the value for message_from_business.operator_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setOperatorType(Integer operatorType) {
+        this.operatorType = operatorType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.operator_result
+     *
+     * @return the value of message_from_business.operator_result
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getOperatorResult() {
+        return operatorResult;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.operator_result
+     *
+     * @param operatorResult the value for message_from_business.operator_result
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setOperatorResult(String operatorResult) {
+        this.operatorResult = operatorResult;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.title
+     *
+     * @return the value of message_from_business.title
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.title
+     *
+     * @param title the value for message_from_business.title
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_business.body
+     *
+     * @return the value of message_from_business.body
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getBody() {
+        return body;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_business.body
+     *
+     * @param body the value for message_from_business.body
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setBody(String body) {
+        this.body = body;
+    }
+}

Разница между файлами не показана из-за своего большого размера
+ 1593 - 0
src/main/java/com/goafanti/common/model/MessageFromBusinessExample.java


+ 401 - 0
src/main/java/com/goafanti/common/model/MessageFromSystem.java

@@ -0,0 +1,401 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class MessageFromSystem {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_system.id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_system.creater
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String creater;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_system.create_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_system.update_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Date updateTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_system.producer_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String producerId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_system.consumer_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Integer consumerType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_system.title
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String title;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_system.body
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String body;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_system.subject
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Integer subject;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_system.resource_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String resourceId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_system.resource_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Integer resourceType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_from_system.delete_sign
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Boolean deleteSign;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_system.id
+     *
+     * @return the value of message_from_system.id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_system.id
+     *
+     * @param id the value for message_from_system.id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_system.creater
+     *
+     * @return the value of message_from_system.creater
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getCreater() {
+        return creater;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_system.creater
+     *
+     * @param creater the value for message_from_system.creater
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setCreater(String creater) {
+        this.creater = creater;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_system.create_time
+     *
+     * @return the value of message_from_system.create_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_system.create_time
+     *
+     * @param createTime the value for message_from_system.create_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_system.update_time
+     *
+     * @return the value of message_from_system.update_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_system.update_time
+     *
+     * @param updateTime the value for message_from_system.update_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_system.producer_id
+     *
+     * @return the value of message_from_system.producer_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getProducerId() {
+        return producerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_system.producer_id
+     *
+     * @param producerId the value for message_from_system.producer_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setProducerId(String producerId) {
+        this.producerId = producerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_system.consumer_type
+     *
+     * @return the value of message_from_system.consumer_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Integer getConsumerType() {
+        return consumerType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_system.consumer_type
+     *
+     * @param consumerType the value for message_from_system.consumer_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setConsumerType(Integer consumerType) {
+        this.consumerType = consumerType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_system.title
+     *
+     * @return the value of message_from_system.title
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_system.title
+     *
+     * @param title the value for message_from_system.title
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_system.body
+     *
+     * @return the value of message_from_system.body
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getBody() {
+        return body;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_system.body
+     *
+     * @param body the value for message_from_system.body
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setBody(String body) {
+        this.body = body;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_system.subject
+     *
+     * @return the value of message_from_system.subject
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Integer getSubject() {
+        return subject;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_system.subject
+     *
+     * @param subject the value for message_from_system.subject
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setSubject(Integer subject) {
+        this.subject = subject;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_system.resource_id
+     *
+     * @return the value of message_from_system.resource_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_system.resource_id
+     *
+     * @param resourceId the value for message_from_system.resource_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setResourceId(String resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_system.resource_type
+     *
+     * @return the value of message_from_system.resource_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Integer getResourceType() {
+        return resourceType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_system.resource_type
+     *
+     * @param resourceType the value for message_from_system.resource_type
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setResourceType(Integer resourceType) {
+        this.resourceType = resourceType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_from_system.delete_sign
+     *
+     * @return the value of message_from_system.delete_sign
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Boolean getDeleteSign() {
+        return deleteSign;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_from_system.delete_sign
+     *
+     * @param deleteSign the value for message_from_system.delete_sign
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setDeleteSign(Boolean deleteSign) {
+        this.deleteSign = deleteSign;
+    }
+}

Разница между файлами не показана из-за своего большого размера
+ 1083 - 0
src/main/java/com/goafanti/common/model/MessageFromSystemExample.java


+ 203 - 0
src/main/java/com/goafanti/common/model/MessageProducer.java

@@ -0,0 +1,203 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class MessageProducer {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_producer.id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_producer.creater
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String creater;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_producer.create_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_producer.consumer_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String consumerId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_producer.message_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private String messageId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column message_producer.send_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    private Date sendTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_producer.id
+     *
+     * @return the value of message_producer.id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_producer.id
+     *
+     * @param id the value for message_producer.id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_producer.creater
+     *
+     * @return the value of message_producer.creater
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getCreater() {
+        return creater;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_producer.creater
+     *
+     * @param creater the value for message_producer.creater
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setCreater(String creater) {
+        this.creater = creater;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_producer.create_time
+     *
+     * @return the value of message_producer.create_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_producer.create_time
+     *
+     * @param createTime the value for message_producer.create_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_producer.consumer_id
+     *
+     * @return the value of message_producer.consumer_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getConsumerId() {
+        return consumerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_producer.consumer_id
+     *
+     * @param consumerId the value for message_producer.consumer_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setConsumerId(String consumerId) {
+        this.consumerId = consumerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_producer.message_id
+     *
+     * @return the value of message_producer.message_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getMessageId() {
+        return messageId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_producer.message_id
+     *
+     * @param messageId the value for message_producer.message_id
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column message_producer.send_time
+     *
+     * @return the value of message_producer.send_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Date getSendTime() {
+        return sendTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column message_producer.send_time
+     *
+     * @param sendTime the value for message_producer.send_time
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setSendTime(Date sendTime) {
+        this.sendTime = sendTime;
+    }
+}

+ 703 - 0
src/main/java/com/goafanti/common/model/MessageProducerExample.java

@@ -0,0 +1,703 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MessageProducerExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public MessageProducerExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterIsNull() {
+            addCriterion("creater is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterIsNotNull() {
+            addCriterion("creater is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterEqualTo(String value) {
+            addCriterion("creater =", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterNotEqualTo(String value) {
+            addCriterion("creater <>", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterGreaterThan(String value) {
+            addCriterion("creater >", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterGreaterThanOrEqualTo(String value) {
+            addCriterion("creater >=", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterLessThan(String value) {
+            addCriterion("creater <", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterLessThanOrEqualTo(String value) {
+            addCriterion("creater <=", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterLike(String value) {
+            addCriterion("creater like", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterNotLike(String value) {
+            addCriterion("creater not like", value, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterIn(List<String> values) {
+            addCriterion("creater in", values, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterNotIn(List<String> values) {
+            addCriterion("creater not in", values, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterBetween(String value1, String value2) {
+            addCriterion("creater between", value1, value2, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreaterNotBetween(String value1, String value2) {
+            addCriterion("creater not between", value1, value2, "creater");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdIsNull() {
+            addCriterion("consumer_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdIsNotNull() {
+            addCriterion("consumer_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdEqualTo(String value) {
+            addCriterion("consumer_id =", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdNotEqualTo(String value) {
+            addCriterion("consumer_id <>", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdGreaterThan(String value) {
+            addCriterion("consumer_id >", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdGreaterThanOrEqualTo(String value) {
+            addCriterion("consumer_id >=", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdLessThan(String value) {
+            addCriterion("consumer_id <", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdLessThanOrEqualTo(String value) {
+            addCriterion("consumer_id <=", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdLike(String value) {
+            addCriterion("consumer_id like", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdNotLike(String value) {
+            addCriterion("consumer_id not like", value, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdIn(List<String> values) {
+            addCriterion("consumer_id in", values, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdNotIn(List<String> values) {
+            addCriterion("consumer_id not in", values, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdBetween(String value1, String value2) {
+            addCriterion("consumer_id between", value1, value2, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConsumerIdNotBetween(String value1, String value2) {
+            addCriterion("consumer_id not between", value1, value2, "consumerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdIsNull() {
+            addCriterion("message_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdIsNotNull() {
+            addCriterion("message_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdEqualTo(String value) {
+            addCriterion("message_id =", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdNotEqualTo(String value) {
+            addCriterion("message_id <>", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdGreaterThan(String value) {
+            addCriterion("message_id >", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdGreaterThanOrEqualTo(String value) {
+            addCriterion("message_id >=", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdLessThan(String value) {
+            addCriterion("message_id <", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdLessThanOrEqualTo(String value) {
+            addCriterion("message_id <=", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdLike(String value) {
+            addCriterion("message_id like", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdNotLike(String value) {
+            addCriterion("message_id not like", value, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdIn(List<String> values) {
+            addCriterion("message_id in", values, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdNotIn(List<String> values) {
+            addCriterion("message_id not in", values, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdBetween(String value1, String value2) {
+            addCriterion("message_id between", value1, value2, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMessageIdNotBetween(String value1, String value2) {
+            addCriterion("message_id not between", value1, value2, "messageId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeIsNull() {
+            addCriterion("send_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeIsNotNull() {
+            addCriterion("send_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeEqualTo(Date value) {
+            addCriterion("send_time =", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeNotEqualTo(Date value) {
+            addCriterion("send_time <>", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeGreaterThan(Date value) {
+            addCriterion("send_time >", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("send_time >=", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeLessThan(Date value) {
+            addCriterion("send_time <", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeLessThanOrEqualTo(Date value) {
+            addCriterion("send_time <=", value, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeIn(List<Date> values) {
+            addCriterion("send_time in", values, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeNotIn(List<Date> values) {
+            addCriterion("send_time not in", values, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeBetween(Date value1, Date value2) {
+            addCriterion("send_time between", value1, value2, "sendTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTimeNotBetween(Date value1, Date value2) {
+            addCriterion("send_time not between", value1, value2, "sendTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table message_producer
+     *
+     * @mbg.generated do_not_delete_during_merge Thu Dec 14 21:04:23 CST 2017
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table message_producer
+     *
+     * @mbg.generated Thu Dec 14 21:04:23 CST 2017
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 28 - 1
src/main/java/com/goafanti/common/model/Role.java

@@ -1,6 +1,7 @@
 package com.goafanti.common.model;
 
 import java.io.Serializable;
+import java.util.Date;
 
 public class Role extends BaseModel implements Serializable{
     /**
@@ -13,8 +14,34 @@ public class Role extends BaseModel implements Serializable{
 
     private Integer roleType;
 
+    /**
+     * 创建人
+     */
+    private String creater;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+	public String getCreater() {
+		return creater;
+	}
+
+	public void setCreater(String creater) {
+		this.creater = creater;
+	}
+
+
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
 
-    public String getRoleName() {
+	public String getRoleName() {
         return roleName;
     }
 

+ 25 - 0
src/main/java/com/goafanti/core/message/BusinessMessageProducerManager.java

@@ -0,0 +1,25 @@
+package com.goafanti.core.message;
+
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+
+import com.goafanti.message.bo.Message;
+
+public class BusinessMessageProducerManager implements MessageProducerManager,Runnable{
+	BlockingQueue<Message> messageQueue;
+	BusinessMessageProducerManager(BlockingQueue<Message> messageQueue){
+		this.messageQueue = messageQueue;
+	}
+	@Override
+	public List<Message> createMessage() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		
+	}
+	
+}

+ 5 - 0
src/main/java/com/goafanti/core/message/MessageConsumerManager.java

@@ -0,0 +1,5 @@
+package com.goafanti.core.message;
+
+public abstract interface MessageConsumerManager {
+	void consumeMessage();
+}

+ 13 - 0
src/main/java/com/goafanti/core/message/MessageHandler.java

@@ -0,0 +1,13 @@
+package com.goafanti.core.message;
+
+import java.util.concurrent.BlockingQueue;
+import com.goafanti.message.bo.Message;
+
+public class MessageHandler {
+	BlockingQueue<Message> messageQuenue;
+	
+ 	void sendMessage(MessageConsumerManager consumerManager){
+		
+	}
+ 
+}

+ 9 - 0
src/main/java/com/goafanti/core/message/MessageProducerManager.java

@@ -0,0 +1,9 @@
+package com.goafanti.core.message;
+
+import java.util.List;
+
+import com.goafanti.message.bo.Message;
+
+public  abstract interface MessageProducerManager {
+	List<Message> createMessage();
+}

+ 18 - 0
src/main/java/com/goafanti/core/message/SystemMessageProducerManager.java

@@ -0,0 +1,18 @@
+package com.goafanti.core.message;
+
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+
+import com.goafanti.message.bo.Message;
+
+public class SystemMessageProducerManager implements MessageProducerManager{
+	private BlockingQueue<Message> messageQueue;
+	public SystemMessageProducerManager(BlockingQueue<Message> messageQueue){
+		this.messageQueue = messageQueue;
+	}
+	@Override
+	public List<Message> createMessage() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}

+ 0 - 1
src/main/java/com/goafanti/core/shiro/token/UserRealm.java

@@ -62,7 +62,6 @@ public class UserRealm extends AuthorizingRealm {
 		} else {
 			User user = userService.selectByMobieAndType(token.getUsername(), token.getType());
 			if (null == user) {
-
 				throw new UnknownAccountException();
 			}
 			token.setId(user.getId());

+ 27 - 0
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -66,6 +66,10 @@ public class DemandListBo {
 	 * 审核状态
 	 */
 	private Integer	auditStatus;
+	
+	private Date createTime;
+	
+	private String remark;
 
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getAuditStatus() {
@@ -231,6 +235,29 @@ public class DemandListBo {
 		this.demandTypeS = demandTypeS;
 	}
 
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public String getCreateTimeFormattedDate() {
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
 	
 	
 	

+ 4 - 0
src/main/java/com/goafanti/demand/bo/DemandManageListBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.demand.bo;
 
+import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
@@ -32,6 +34,8 @@ public class DemandManageListBo extends DemandListBo {
 	 * 技术经纪人
 	 */
 	private String	techBrokerId;
+	
+	
 
 	public String getTechBrokerId() {
 		return techBrokerId;

+ 4 - 5
src/main/java/com/goafanti/demand/bo/InputDemand.java

@@ -133,15 +133,14 @@ public class InputDemand {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer boutique;
 	
-	@Max(value = 500, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer remark;
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String remark;
 	
-	public Integer getRemark() {
+	public String getRemark() {
 		return remark;
 	}
 
-	public void setRemark(Integer remark) {
+	public void setRemark(String remark) {
 		this.remark = remark;
 	}
 

+ 2 - 2
src/main/java/com/goafanti/demand/controller/DemandApiController.java

@@ -84,7 +84,7 @@ public class DemandApiController extends CertifyApiController {
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Result list(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer demandType,
 			String validityPeriodStartDate, String validityPeriodEndDate, Integer status, Integer releaseStatus,
-			String releaseDateStartDate, String releaseDateEndDate, String pageNo, String pageSize) {
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -97,7 +97,7 @@ public class DemandApiController extends CertifyApiController {
 		}
 		res.setData(demandService.listDemand(auditStatus, serialNumber, name, keyword, demandType,
 				validityPeriodStartDate, validityPeriodEndDate, status, releaseStatus, releaseDateStartDate,
-				releaseDateEndDate, pNo, pSize));
+				releaseDateEndDate,createDateStartDate,  createDateEndDate, pNo, pSize));
 		return res;
 	}
 

+ 3 - 3
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -23,12 +23,12 @@ public interface DemandService {
 	Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus, Integer province,
 			Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
 			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
-			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot);
+			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 
 	Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
-			String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId);
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId);
 
 	void saveUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords);
 
@@ -44,7 +44,7 @@ public interface DemandService {
 
 	Pagination<DemandListBo> listDemand(Integer auditStatus, Integer serialNumber, String name, String keyword,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, Integer status,
-			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize);
+			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize);
 
 	int updateReleaseStatus(Demand d);
 

+ 31 - 8
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -89,12 +89,12 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	public Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus,
 			Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
-			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo,
+			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo,
 			Integer pSize, Integer boutique, Integer hot) {
 
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
-				releaseDateStartDate, releaseDateEndDate, boutique, hot);
+				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, boutique, hot);
 
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -138,11 +138,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	public Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus,
 			Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
-			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo,
+			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo,
 			Integer pSize, Integer boutique, Integer hot, String techBrokerId) {
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
-				releaseDateStartDate, releaseDateEndDate, boutique, hot);
+				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, boutique, hot);
 
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -277,13 +277,13 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	@Override
 	public Pagination<DemandListBo> listDemand(Integer auditStatus, Integer serialNumber, String name, String keyword,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, Integer status,
-			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize) {
+			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize) {
 		Map<String, Object> params = disposeParams(auditStatus, null, serialNumber, name, keyword, null, demandType,
 				validityPeriodStartDate, validityPeriodEndDate, null, status, releaseStatus, releaseDateStartDate,
-				releaseDateEndDate, null, null);
+				releaseDateEndDate, createDateStartDate, createDateEndDate, null, null);
 
 		params.put("employerId", TokenManager.getUserId());
-
+		
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -497,15 +497,18 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return demandMapper.selectDemandSearchDetail(uid, id);
 	}
 
+	@SuppressWarnings("unused")
 	private Map<String, Object> disposeParams(Integer auditStatus, Integer province, Integer serialNumber, String name,
 			String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
-			String releaseDateStartDate, String releaseDateEndDate, Integer boutique, Integer hot) {
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer boutique, Integer hot) {
 		Map<String, Object> params = new HashMap<>();
 		Date vStart = null;
 		Date vEnd = null;
 		Date rStart = null;
 		Date rEnd = null;
+		Date cStart = null;
+		Date cEnd = null;
 
 		if (!StringUtils.isBlank(validityPeriodStartDate)) {
 			try {
@@ -534,6 +537,19 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			} catch (ParseException e) {
 			}
 		}
+		if (!StringUtils.isBlank(createDateStartDate)) {
+			try {
+				cStart = DateUtils.parseDate(createDateStartDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+			}
+		}
+
+		if (!StringUtils.isBlank(createDateEndDate)) {
+			try {
+				cEnd = DateUtils.addDays(DateUtils.parseDate(createDateEndDate, AFTConstants.YYYYMMDD), 1);
+			} catch (ParseException e) {
+			}
+		}
 
 		if (null != vStart) {
 			params.put("vStart", vStart);
@@ -550,6 +566,13 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (null != rEnd) {
 			params.put("rEnd", rEnd);
 		}
+		if (null != cStart) {
+			params.put("cStart", cStart);
+		}
+
+		if (null != cEnd) {
+			params.put("cEnd", cEnd);
+		}
 
 		if (null != auditStatus) {
 			params.put("auditStatus", auditStatus);

+ 46 - 0
src/main/java/com/goafanti/message/bo/Message.java

@@ -0,0 +1,46 @@
+package com.goafanti.message.bo;
+
+public class Message {
+	private String id;
+	private String title;
+	private String body;
+	private String creater;
+	private String createTime;
+	private String url;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	public String getBody() {
+		return body;
+	}
+	public void setBody(String body) {
+		this.body = body;
+	}
+	public String getCreater() {
+		return creater;
+	}
+	public void setCreater(String creater) {
+		this.creater = creater;
+	}
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+}

+ 3 - 3
src/main/java/com/goafanti/organization/controller/OrganizationManagementController.java

@@ -91,9 +91,9 @@ public class OrganizationManagementController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "id"));
 			return res;
 		}
-		OrganizationListOut olo=organizationManagementMapper.selectAllById(id);
-		String superId=olo.getName();
-		int subordinate=organizationManagementMapper.selectCountBySuperId(superId);
+		/*OrganizationListOut olo=organizationManagementMapper.selectAllById(id);
+		String superId=olo.getName();*/
+		int subordinate=organizationManagementMapper.selectCountBySuperId(id);
 		if(subordinate>0){
 			res.getError().add(buildError("","存在下级组织不能删除"));
 			return res;

+ 18 - 10
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -28,8 +28,13 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		/*olo.setCreateId(TokenManager.getAdminId());*/
 		Map<String,Object> params =disposeParams(olo);
 		@SuppressWarnings("unchecked")
-		Pagination<OrganizationListOut> list=(Pagination<OrganizationListOut>)findPage("selectOrganizationList","selectOrganizationCount",params,pageNo,pageSize);
-		return list;
+		Pagination<OrganizationListOut> p=(Pagination<OrganizationListOut>)findPage("selectOrganizationList","selectOrganizationCount",params,pageNo,pageSize);
+		@SuppressWarnings("unchecked")
+		List<OrganizationListOut> list=(List<OrganizationListOut>) p.getList();
+		for(OrganizationListOut i:list){
+			i.setSuperId(organizationManagementMapper.selectNameById(i.getSuperId()));
+		}
+		return p;
 	}
 	private Map<String,Object> disposeParams(OrganizationListOut olo){
 		Map<String,Object> params = new HashMap<String, Object>();		
@@ -42,7 +47,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		if(StringUtils.isNotBlank(olo.getType())) params.put("type", olo.getType());
 		if(StringUtils.isNotBlank(olo.getManagerId())) params.put("managerId", olo.getManagerId());
 		if(StringUtils.isNotBlank(olo.getDepNo())) params.put("depNo", olo.getDepNo());
-		if(StringUtils.isNotBlank(olo.getSuperId())) params.put("superId", olo.getSuperId());
+		if(StringUtils.isNotBlank(olo.getSuperId())) params.put("superId", organizationManagementMapper.selectIdByName(olo.getSuperId()));
 		if(StringUtils.isNotBlank(olo.getRemarks())) params.put("remarks", olo.getRemarks());
 		if(StringUtils.isNotBlank(olo.getStatus())) params.put("status", olo.getStatus());
 		return params;
@@ -97,6 +102,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 			}
 			om.setDepNo(dep);
 		}
+		superId=organizationManagementMapper.selectIdByName(superId);
 		om.setSuperId(superId);
 		om.setRemarks(remarks);
 		om.setStatus("0");
@@ -111,6 +117,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 	@Override
 	public OrganizationListOut selectAllById(String id) {
 		OrganizationListOut olo=organizationManagementMapper.selectAllById(id);
+		olo.setSuperId(organizationManagementMapper.selectNameById(olo.getSuperId()));
 		return olo;
 	}
 	@Override
@@ -127,8 +134,8 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		om.setType(type);
 		om.setUpdateTime(now);
 		om.setManagerId(managerId);
-		om.setSuperId(superId);
 		String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
+		superId=organizationManagementMapper.selectIdByName(superId);
 		int Count=organizationManagementMapper.selectDepNoCount(superId);
 		if(Count<10){
 			String dep=sdepNo+"0"+Count;
@@ -154,15 +161,16 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 			}
 			om.setDepNo(dep);
 		}
+		om.setSuperId(superId);
 		om.setStatus(status);
 		om.setRemarks(remarks);
 		om.setId(id);
 		organizationManagementMapper.updateByPrimaryKeySelective(om);
 		//*******下级编号修改
 		int n=0;
-		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(name);
+		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(id);
 		for(OrganizationListOut i:Nos){			
-			sdepNo=organizationManagementMapper.selectDepNoByName(i.getSuperId());
+			sdepNo=organizationManagementMapper.selectDepNoById(i.getSuperId());
 			if(n<10){
 				String dep=sdepNo+"0"+n;			
 				if(n>=10){
@@ -182,10 +190,10 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 			
 			//*******下下级编号修改
 			int m=0;
-			List<OrganizationListOut> Noss =organizationManagementMapper.selectIDNBySuperId(i.getName());
+			List<OrganizationListOut> Noss =organizationManagementMapper.selectIDNBySuperId(i.getId());
 			System.out.println("noss="+Noss);
 			for(OrganizationListOut o:Noss){			
-				sdepNo=organizationManagementMapper.selectDepNoByName(o.getSuperId());
+				sdepNo=organizationManagementMapper.selectDepNoById(o.getSuperId());
 				if(m<10){
 					String dep=sdepNo+"0"+m;			
 					if(m>=10){
@@ -205,9 +213,9 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 				
 				//*******下下级编号修改
 				int z=0;
-				List<OrganizationListOut> Nosss =organizationManagementMapper.selectIDNBySuperId(o.getName());
+				List<OrganizationListOut> Nosss =organizationManagementMapper.selectIDNBySuperId(o.getId());
 				for(OrganizationListOut p:Nosss){			
-					sdepNo=organizationManagementMapper.selectDepNoByName(p.getSuperId());
+					sdepNo=organizationManagementMapper.selectDepNoById(p.getSuperId());
 					if(z<10){
 						String dep=sdepNo+"0"+z;			
 						if(z>=10){

+ 68 - 0
src/main/java/com/goafanti/permission/bo/RoleBo.java

@@ -1,6 +1,7 @@
 package com.goafanti.permission.bo;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import com.goafanti.common.model.Permission;
@@ -10,6 +11,73 @@ public class RoleBo extends Role {
 	private static final long	serialVersionUID	= 1L;
 
 	List<Permission>			permissions			= new ArrayList<>();
+	
+	/**
+     * 创建人
+     */
+    private String creater;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    
+    private String roleName;
+
+    private Integer roleType;
+    
+    private String id;
+    
+    private String createTimez;
+
+	public String getCreateTimez() {
+		return createTimez;
+	}
+
+	public void setCreateTimez(String createTimez) {
+		this.createTimez = createTimez;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public Integer getRoleType() {
+		return roleType;
+	}
+
+	public void setRoleType(Integer roleType) {
+		this.roleType = roleType;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getCreater() {
+		return creater;
+	}
+
+	public void setCreater(String creater) {
+		this.creater = creater;
+	}
+
+	
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
 
 	public List<Permission> getPermissions() {
 		return permissions;

+ 23 - 0
src/main/java/com/goafanti/permission/bo/RolePermissionBo.java

@@ -32,7 +32,30 @@ public class RolePermissionBo {
      * 权限接口地址
      */
     private String url;
+    /**
+     * 创建人
+     */
+    private String creater;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+	public String getCreater() {
+		return creater;
+	}
 
+	public void setCreater(String creater) {
+		this.creater = creater;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
 	public String getRname() {
 		return rname;
 	}

+ 15 - 0
src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java

@@ -90,6 +90,11 @@ public class NewPermissionApiController extends BaseApiController {
 			res.getError().add(buildError("","存在下级权限不能删除"));
 			return res;
 		}
+		int role_permission=permissionMapper.selectCountByid(id);
+		if(role_permission>0){
+			res.getError().add(buildError("","权限被分配不能删除"));
+			return res;
+		}
 		res.setData(permissionService.deleteById(id));
 		return res;
 	}
@@ -129,6 +134,16 @@ public class NewPermissionApiController extends BaseApiController {
 			res.getError().add(buildError("","权限层级超限"));
 			return res;
 		}
+		int subordinate=permissionMapper.selectCountBySuperId(record.getId());
+		if(subordinate>0){
+			String autNo=permissionMapper.selectAutNoByNamei(record.getSuperId());
+			if(autNo.length()>=5){
+				res.getError().add(buildError("","权限层级超限"));
+				return res;
+			}
+			
+		}
+		
 		res.setData(permissionService.updateById(record));
 		return res;
 	}

+ 130 - 0
src/main/java/com/goafanti/permission/controller/NewRoleApiController.java

@@ -0,0 +1,130 @@
+package com.goafanti.permission.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.dao.RoleMapper;
+import com.goafanti.common.model.Role;
+import com.goafanti.permission.bo.RoleBo;
+import com.goafanti.permission.service.NewRoleService;
+
+@RestController
+@RequestMapping("api/admin")
+public class NewRoleApiController extends BaseApiController{
+	@Resource
+	private NewRoleService newRoleService;
+	@Autowired
+	RoleMapper				roleMapper;
+	
+	@RequestMapping(value = "/roles", method = RequestMethod.POST)
+	public Result roles(RoleBo role, Integer pageNo,
+			Integer pageSize) {
+		Result res = new Result();
+		res.setData(newRoleService.findRoles(role,pageNo,pageSize));
+		return res;
+	}
+	
+	@RequestMapping(value = "/role/rolePermission", method = RequestMethod.POST)
+	public Result rolePermission(String id){
+		Result res = new Result();
+		res.setData(newRoleService.selectRolePList(id));
+		return res;
+	}
+	@RequestMapping(value = "/role", method = RequestMethod.POST)
+	public Result insertRole(String data) {
+		Result res = new Result();
+		JSONObject jo = (JSONObject) JSON.parse(data);
+		if (jo != null) {
+			JSONArray permissions = jo.getJSONArray("permissions");
+			List<String> permisionIds = new ArrayList<>();
+			for (int idx = 0; idx < permissions.size(); idx++) {
+				String pid = permissions.getString(idx);
+					permisionIds.add(pid);
+			}
+			Role records = jo.toJavaObject(Role.class);
+			String newName=roleMapper.selectNameById(records.getId());
+			if(newName==null){
+				String newid=roleMapper.selectIdByName(records.getRoleName());
+				if(newid!=null){
+					res.getError().add(buildError("","角色已存在"));
+					return res;
+				}
+			}else{
+				String newid=roleMapper.selectIdByNamei(records);
+				if(newid!=null){
+					res.getError().add(buildError("","角色已存在,请更换名称"));
+					return res;
+				}
+			}
+			res.setData(newRoleService.insert(records, permisionIds));
+		} else {
+			res.getError().add(buildError("", "参数格式不正确"));
+		}
+		return res;
+	}
+
+	@RequestMapping(value = "/role/delete", method = RequestMethod.POST)
+	public Result deleteRole(String data) {
+		Result res = new Result();
+		JSONArray ja = (JSONArray) JSON.parse(data);
+		
+		if (ja != null && !ja.isEmpty()) {
+			List<String> records = new ArrayList<>();
+			for (int idx = 0; idx < ja.size(); idx++) {
+				String rid = ja.getString(idx);
+				if (rid != "1") {
+					records.add(rid);
+				}
+			}
+			int zz=roleMapper.selectCountByRoleId(records);
+			if(zz>0){
+				res.getError().add(buildError("","角色被分配不能删除"));
+				return res;
+			}
+			res.setData(newRoleService.deleteByPrimaryKeys(records));
+		} else {
+			res.getError().add(buildError("", "参数格式不正确"));
+		}
+		return res;
+	}
+
+	@RequestMapping(value = "/role/bindpermission", method = RequestMethod.POST)
+	public Result bindPermission(String rid, String pid) {
+		Result res = new Result();
+		res.setData(newRoleService.bindPermission(rid, pid));
+		return res;
+	}
+
+	@RequestMapping(value = "/role/binduser", method = RequestMethod.POST)
+	public Result bindUser(String rid, String uid) {
+		Result res = new Result();
+		res.setData(newRoleService.bindUser(rid, uid));
+		return res;
+	}
+
+	@RequestMapping(value = "/role/unbindpermission", method = RequestMethod.POST)
+	public Result unbindPermission(String rid, String pid) {
+		Result res = new Result();
+		res.setData(newRoleService.bindPermission(rid, pid));
+		return res;
+	}
+
+	@RequestMapping(value = "/role/unbinduser", method = RequestMethod.POST)
+	public Result unbindUser(String rid, String uid) {
+		Result res = new Result();
+		res.setData(newRoleService.bindUser(rid, uid));
+		return res;
+	}
+}

+ 35 - 0
src/main/java/com/goafanti/permission/service/NewRoleService.java

@@ -0,0 +1,35 @@
+package com.goafanti.permission.service;
+
+
+
+import java.util.List;
+import java.util.Set;
+
+import com.goafanti.common.model.Role;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.permission.bo.RoleBo;
+import com.goafanti.permission.bo.RolePermissionBo;
+
+public interface NewRoleService {
+	Pagination<RoleBo>findRoles(RoleBo role, Integer pageNo,
+			Integer pageSize);
+	
+	int insert(List<Role> records);
+
+	// 根据用户ID查询角色(role),放入到Authorization里。
+	Set<String> findRoleByUserId(String userId);
+
+	int deleteByPrimaryKeys(List<String> records);
+
+	int bindPermission(String roleId, String permissionId);
+
+	int unbindPermission(String roleId, String permissionId);
+
+	int bindUser(String roleId, String userId);
+
+	int unbindUser(String roleId, String userId);
+
+	int insert(Role record, List<String> permissions);
+	
+	List<RolePermissionBo> selectRolePList(String id);
+}

+ 139 - 0
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -0,0 +1,139 @@
+package com.goafanti.permission.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.RoleMapper;
+import com.goafanti.common.dao.RolePermissionMapper;
+import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.dao.UserRoleMapper;
+import com.goafanti.common.model.Role;
+import com.goafanti.common.model.RolePermission;
+import com.goafanti.common.model.UserRole;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.permission.bo.RoleBo;
+import com.goafanti.permission.bo.RolePermissionBo;
+import com.goafanti.permission.service.NewRoleService;
+@Service
+public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements NewRoleService {
+	@Autowired
+	RoleMapper				roleMapper;
+	@Autowired
+	UserMapper				userMapper;
+	@Autowired
+	UserRoleMapper			userRoleMapper;
+	@Autowired
+	RolePermissionMapper	rolePermissionMapper;
+	@Override
+	public Pagination<RoleBo> findRoles(RoleBo role, Integer pageNo, Integer pageSize) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Map<String,Object> params =disposeParams(role);
+		@SuppressWarnings("unchecked")
+		Pagination<RoleBo> p=(Pagination<RoleBo>)findPage("selectRoleList","selectRoleCount",params,pageNo,pageSize);		
+		@SuppressWarnings("unchecked")
+		List<RoleBo> list=(List<RoleBo>) p.getList();
+		for(RoleBo i:list){
+			if(i.getCreateTime()!=null){
+				i.setCreateTimez(sdf.format(i.getCreateTime()));
+			}
+			
+		}
+		return p;
+	}
+	private Map<String,Object> disposeParams(RoleBo role){
+		Map<String,Object> params = new HashMap<String, Object>();			
+		if(StringUtils.isNotBlank(role.getRoleName())) params.put("roleName", role.getRoleName());		
+		return params;
+		
+	}
+	
+	@Override
+	public Set<String> findRoleByUserId(String userId) {
+		return roleMapper.findRoleByUserId(userId);
+	}
+
+	
+
+	@Override
+	public int insert(List<Role> records) {
+		return roleMapper.insertBatch(records);
+	}
+
+	@Override
+	public int deleteByPrimaryKeys(List<String> records) {
+		rolePermissionMapper.deleteByRoleId(records);
+		userRoleMapper.deleteByRoleId(records);
+		List<String> data= userRoleMapper.findUserIdByRoleIds(records);
+		TokenManager.clearUserAuthByUserId(data.toArray(new String[]{}));
+		return roleMapper.deleteByPrimaryKeys(records);
+	}
+
+
+	@Override
+	public int bindPermission(String rid, String pid) {
+		TokenManager.clearUserAuthByUserId((String[]) userRoleMapper.findUserIdByRoleId(rid).toArray());
+		return rolePermissionMapper.insert(new RolePermission(rid, pid));
+	}
+
+	@Override
+	public int bindUser(String rid, String uid) {
+		TokenManager.clearUserAuthByUserId(new String[] { uid });
+		return userRoleMapper.insert(new UserRole(uid, rid));
+	}
+
+	@Override
+	public int unbindPermission(String roleId, String permissionId) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("rid", roleId);
+		params.put("pid", permissionId);
+		TokenManager.clearUserAuthByUserId((String[]) userRoleMapper.findUserIdByRoleId(roleId).toArray());
+		return rolePermissionMapper.deleteByPrimaryKey(params);
+	}
+
+	@Override
+	public int unbindUser(String roleId, String userId) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("rid", roleId);
+		params.put("uid", userId);
+		TokenManager.clearUserAuthByUserId(new String[] { userId });
+		return userRoleMapper.deleteByUserRole(params);
+	}
+
+	@Override
+	public int insert(Role record, List<String> permissions) {
+		Date now = new Date();
+		if (record.getId() != null) {
+			List<RolePermission> rps = new ArrayList<>();
+			rolePermissionMapper.deleteByRid(record.getId());
+			for (String pid : permissions) {
+				rps.add(new RolePermission(record.getId(), pid));
+			}
+			if (!rps.isEmpty()) {
+				rolePermissionMapper.insertBatch(rps);
+			}
+			List<String> ids = userRoleMapper.findUserIdByRoleId(record.getId());
+			TokenManager.clearUserAuthByUserId(ids.toArray(new String[ids.size()]));
+		}
+		record.getId();
+		record.setCreater("管理员");		
+		record.setCreateTime(now);
+		return roleMapper.insert(record);
+	}
+	@Override
+	public List<RolePermissionBo> selectRolePList(String id) {
+		List<RolePermissionBo> list=roleMapper.selectRolePList(id);
+		return list;
+	}
+	
+}

+ 3 - 3
src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java

@@ -206,7 +206,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 		permissionMapper.updateById(record);
 		//*******下级编号修改
 		int n=0;
-		List<Permission> Nos =permissionMapper.selectIDNBySuperId(record.getName());
+		List<Permission> Nos =permissionMapper.selectIDNBySuperId(record.getId());
 		for(Permission i:Nos){			
 			autNo=permissionMapper.selectAutNoByName(i.getSuperId());
 			if(n<10){
@@ -228,7 +228,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 			
 			//*******下下级编号修改
 			int m=0;
-			List<Permission> Noss =permissionMapper.selectIDNBySuperId(i.getName());
+			List<Permission> Noss =permissionMapper.selectIDNBySuperId(i.getId());
 			for(Permission o:Noss){			
 				autNo=permissionMapper.selectAutNoByName(o.getSuperId());
 				if(m<10){
@@ -249,7 +249,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 				m++;
 				//*******下下级编号修改
 				int z=0;
-				List<Permission> Nosss =permissionMapper.selectIDNBySuperId(o.getName());
+				List<Permission> Nosss =permissionMapper.selectIDNBySuperId(o.getId());
 				for(Permission p:Nosss){			
 					autNo=permissionMapper.selectAutNoByName(p.getSuperId());
 					if(z<10){

+ 1 - 0
src/main/java/com/goafanti/user/service/UserService.java

@@ -60,4 +60,5 @@ public interface UserService {
 
 	List<UserPartnerDetailBo> findUserPartner();
 
+	User selectBaseInfo(String id);
 }

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

@@ -354,4 +354,9 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		return userMapper.findUserPartner();
 	}
 
+	@Override
+	public User selectBaseInfo(String id) {
+		return userMapper.selectBaseInfo(id);
+	}
+
 }

+ 4 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html

@@ -138,7 +138,11 @@
   		</div>
   		<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
   		<div class="process_btn">
+<<<<<<< HEAD
+  			<a href="/user/account/index.html#normal" >立即评估</a>
+=======
   			<a>立即评估</a>
+>>>>>>> branch 'patch' of https://git.coding.net/aft/AFT.git
   			<a href="javascript:;" onclick="_MEIQIA('showPanel')">在线咨询</a>
   		</div>
   	</div>