anderx hace 7 años
padre
commit
8f11ba46a6
Se han modificado 61 ficheros con 1319 adiciones y 1478 borrados
  1. 0 1
      src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java
  2. 0 3
      src/main/java/com/goafanti/achievement/service/AchievementPublishPageService.java
  3. 0 2
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  4. 0 3
      src/main/java/com/goafanti/achievement/service/impl/AchievementPublishServiceImpl.java
  5. 0 2
      src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java
  6. 0 1
      src/main/java/com/goafanti/admin/service/NewAdminService.java
  7. 0 1
      src/main/java/com/goafanti/app/controller/AppUserController.java
  8. 0 7
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  9. 0 2
      src/main/java/com/goafanti/common/dao/BranchInformationMapper.java
  10. 0 1
      src/main/java/com/goafanti/common/dao/ContractMapper.java
  11. 0 1
      src/main/java/com/goafanti/common/dao/DemandPublishMapper.java
  12. 0 1
      src/main/java/com/goafanti/common/dao/ScDemandMapper.java
  13. 0 1
      src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java
  14. 0 1
      src/main/java/com/goafanti/common/dao/UserMapper.java
  15. 0 2
      src/main/java/com/goafanti/common/model/Achievement.java
  16. 0 1
      src/main/java/com/goafanti/common/model/ScPublisher.java
  17. 0 1
      src/main/java/com/goafanti/common/model/ScPublisherExample.java
  18. 0 1
      src/main/java/com/goafanti/common/service/FieldGlossoryService.java
  19. 0 3
      src/main/java/com/goafanti/common/task/ReleaseUserTask.java
  20. 2 2
      src/main/java/com/goafanti/common/utils/ExcelUtils.java
  21. 0 1
      src/main/java/com/goafanti/contract/controller/AdminContractApiController.java
  22. 1 14
      src/main/java/com/goafanti/contract/service/impl/ContractLogServiceImpl.java
  23. 0 9
      src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java
  24. 246 247
      src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java
  25. 0 2
      src/main/java/com/goafanti/demand/bo/DemandManageDetailBo.java
  26. 0 1
      src/main/java/com/goafanti/demand/bo/DemandManageListBo.java
  27. 0 1
      src/main/java/com/goafanti/demand/controller/AdminDemandApiController.java
  28. 0 1
      src/main/java/com/goafanti/demand/controller/UserDemandApiController.java
  29. 0 1
      src/main/java/com/goafanti/demand/service/DemandFollowService.java
  30. 0 3
      src/main/java/com/goafanti/demand/service/DemandPublishPageService.java
  31. 0 12
      src/main/java/com/goafanti/demand/service/impl/DemandFollowServiceImpl.java
  32. 0 3
      src/main/java/com/goafanti/demand/service/impl/DemandPublishServiceImpl.java
  33. 0 1
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  34. 154 151
      src/main/java/com/goafanti/easemob/queue/EasemobRedisQueue.java
  35. 3 0
      src/main/java/com/goafanti/message/queue/MessageRedisQueue.java
  36. 0 3
      src/main/java/com/goafanti/message/schedule/ScheduleClient.java
  37. 0 1
      src/main/java/com/goafanti/order/controller/AdminOrderApiController.java
  38. 1 10
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  39. 0 10
      src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java
  40. 0 1
      src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java
  41. 290 291
      src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java
  42. 0 1
      src/main/java/com/goafanti/portal/controller/PortalFinancialController.java
  43. 0 1
      src/main/java/com/goafanti/portal/controller/PortalStarController.java
  44. 0 2
      src/main/java/com/goafanti/sc/controller/ScDemandApiController.java
  45. 0 2
      src/main/java/com/goafanti/sc/service/ScDemandService.java
  46. 0 1
      src/main/java/com/goafanti/sc/service/impl/CommonServiceImpl.java
  47. 0 3
      src/main/java/com/goafanti/sc/service/impl/ScAchievementServiceImpl.java
  48. 0 6
      src/main/java/com/goafanti/sc/service/impl/ScDmandServiceImpl.java
  49. 1 8
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java
  50. 1 11
      src/main/java/com/goafanti/user/controller/UserApiController.java
  51. 4 7
      src/main/java/com/goafanti/user/controller/UserRegisterController.java
  52. 0 3
      src/main/java/com/goafanti/user/service/ExpertPublishPageService.java
  53. 0 1
      src/main/java/com/goafanti/user/service/UserCareerService.java
  54. 0 1
      src/main/java/com/goafanti/user/service/UserService.java
  55. 0 3
      src/main/java/com/goafanti/user/service/impl/ExpertPublishServiceImpl.java
  56. 1 4
      src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java
  57. 0 7
      src/main/java/com/goafanti/user/service/impl/UserCareerServiceImpl.java
  58. 0 1
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java
  59. 0 1
      src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java
  60. 519 519
      src/main/resources/spring-context-4.0.xsd
  61. 96 96
      src/main/resources/spring/spring-mybatis.xml

+ 0 - 1
src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java

@@ -2,7 +2,6 @@ package com.goafanti.achievement.controller;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 import javax.annotation.Resource;

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

@@ -4,12 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.bo.PublishPageBo;
-import com.goafanti.common.dao.BranchInformationMapper;
-import com.goafanti.common.model.BranchInformation;
 
 
 @Service

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

@@ -6,10 +6,8 @@ import com.goafanti.achievement.bo.AchievementImportBo;
 import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo;
 import com.goafanti.achievement.bo.AchievementPartnerListBo;
-import com.goafanti.achievement.bo.AchievementPublishBo;
 import com.goafanti.achievement.bo.AchievementUserOwnerDetailBo;
 import com.goafanti.common.model.Achievement;
-import com.goafanti.common.model.AchievementPublish;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.demand.bo.DemandAchievementListBo;
 import com.goafanti.portal.bo.AchievementDetailBo;

+ 0 - 3
src/main/java/com/goafanti/achievement/service/impl/AchievementPublishServiceImpl.java

@@ -5,8 +5,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goafanti.achievement.bo.AchievementPublishBo;
@@ -26,7 +24,6 @@ public class AchievementPublishServiceImpl extends BaseMybatisDao<AchievementPub
 	@Autowired
 	private AchievementPublishMapper	achievementPublishMapper;
 
-	private static final Logger				logger	= LoggerFactory.getLogger(AchievementPublishServiceImpl.class);
 
 	@Override
 	public int insertachievementPublish(AchievementPublish a) {

+ 0 - 2
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -24,10 +24,8 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AdminLocation;
-import com.goafanti.common.model.UserRole;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;

+ 0 - 1
src/main/java/com/goafanti/admin/service/NewAdminService.java

@@ -6,7 +6,6 @@ import java.util.Map;
 import com.goafanti.admin.bo.AdminDetail;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.UserRole;
 import com.goafanti.core.mybatis.page.Pagination;
 
 public interface NewAdminService {

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

@@ -31,7 +31,6 @@ import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.enums.DemandFields;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.common.model.Demand;
-import com.goafanti.common.model.JpushEasemobAccount;
 import com.goafanti.common.model.MessageConsumer;
 import com.goafanti.common.model.MessageFromSystem;
 import com.goafanti.common.model.MessageProducer;

+ 0 - 7
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -23,9 +23,7 @@ import com.goafanti.cognizance.bo.CognizanceResearchCostBo;
 import com.goafanti.cognizance.bo.CultivationListBo;
 import com.goafanti.cognizance.service.OrgCognizanceService;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.ContractMapper;
 import com.goafanti.common.dao.CopyrightInfoMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrgCognizanceLogMapper;
 import com.goafanti.common.dao.OrgCognizanceMapper;
 import com.goafanti.common.dao.OrgCognizanceProportionMapper;
@@ -33,7 +31,6 @@ import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.PatentInfoMapper;
 import com.goafanti.common.dao.TechProjectMapper;
 import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.enums.ContractBusinessStatus;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
@@ -61,8 +58,6 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	@Autowired
 	private OrganizationIdentityMapper		organizationIdentityMapper;
 	@Autowired
-	private NoticeMapper					noticeMapper;
-	@Autowired
 	private OrgCognizanceProportionMapper	orgCognizanceProportionMapper;
 	@Autowired
 	private UserMapper						userMapper;
@@ -72,8 +67,6 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	private PatentInfoMapper				patentInfoMapper;
 	@Autowired
 	private TechProjectMapper				techProjectMapper;
-	@Autowired
-	private ContractMapper					contractMapper;
 
 	@Override
 	public OrgCognizance insert(OrgCognizance c) {

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

@@ -2,10 +2,8 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.BranchInformation;
 import com.goafanti.common.model.BranchInformationExample;
-import com.goafanti.common.model.FieldGlossory;
 
 import java.util.List;
-import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 

+ 0 - 1
src/main/java/com/goafanti/common/dao/ContractMapper.java

@@ -8,7 +8,6 @@ import com.goafanti.common.model.Contract;
 import com.goafanti.contract.bo.ContractSerialNumber;
 import com.goafanti.common.model.ContractExample;
 import com.goafanti.common.model.ContractTask;
-import com.goafanti.common.model.TmpTable;
 
 public interface ContractMapper {
     /**

+ 0 - 1
src/main/java/com/goafanti/common/dao/DemandPublishMapper.java

@@ -1,6 +1,5 @@
 package com.goafanti.common.dao;
 
-import com.goafanti.common.model.AchievementPublish;
 import com.goafanti.common.model.DemandPublish;
 import com.goafanti.common.model.DemandPublishExample;
 import java.util.List;

+ 0 - 1
src/main/java/com/goafanti/common/dao/ScDemandMapper.java

@@ -2,7 +2,6 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.ScDemand;
 import com.goafanti.common.model.ScDemandExample;
-import com.goafanti.sc.bo.inputAchievement;
 import com.goafanti.sc.bo.inputDemands;
 
 import java.util.List;

+ 0 - 1
src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java

@@ -4,7 +4,6 @@ import com.goafanti.common.model.UserLockRelease;
 import com.goafanti.common.model.UserLockReleaseExample;
 import com.goafanti.customer.bo.LockingReleaseBo;
 
-import java.util.Date;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -1,6 +1,5 @@
 package com.goafanti.common.dao;
 
-import java.util.Date;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;

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

@@ -3,7 +3,6 @@ package com.goafanti.common.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import javax.validation.constraints.Size;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -11,7 +10,6 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.utils.FileUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

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

@@ -1,6 +1,5 @@
 package com.goafanti.common.model;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 public class ScPublisher {

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

@@ -1,6 +1,5 @@
 package com.goafanti.common.model;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

+ 0 - 1
src/main/java/com/goafanti/common/service/FieldGlossoryService.java

@@ -9,7 +9,6 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
-import com.goafanti.common.bo.Result;
 import com.goafanti.common.dao.FieldGlossoryMapper;
 import com.goafanti.common.model.FieldGlossory;
 import com.goafanti.common.utils.LoggerUtils;

+ 0 - 3
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -6,9 +6,6 @@ import java.util.List;
 import javax.annotation.Resource;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.customer.bo.LockingReleaseBo;

+ 2 - 2
src/main/java/com/goafanti/common/utils/ExcelUtils.java

@@ -111,7 +111,7 @@ public class ExcelUtils {
 
 		return flag;
 	}
-	private String checkCustomerIntention(String companyIntention,int rowNumber){
+	/*private String checkCustomerIntention(String companyIntention,int rowNumber){
 		if(StringUtils.isEmpty(companyIntention)){
 			vacantRows.add(rowNumber);
 			return "";
@@ -130,7 +130,7 @@ public class ExcelUtils {
 		if(companyIntention.equals("系统集成")) return "11";
 		vacantRows.add(rowNumber);
 		return "";
-	}
+	}*/
 	
 	private String checkOther(String cellValue,int rowNumber,int maxLength){
 		if(StringUtils.isBlank(cellValue) || cellValue.length() > maxLength){

+ 0 - 1
src/main/java/com/goafanti/contract/controller/AdminContractApiController.java

@@ -20,7 +20,6 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
-import com.goafanti.common.enums.ContractBusinessStatus;
 import com.goafanti.common.enums.ContractFields;
 import com.goafanti.common.enums.ContractLogFields;
 import com.goafanti.common.enums.ContractStatus;

+ 1 - 14
src/main/java/com/goafanti/contract/service/impl/ContractLogServiceImpl.java

@@ -1,21 +1,11 @@
 package com.goafanti.contract.service.impl;
-
-import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-
-import org.apache.commons.lang3.time.DateUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.ContractLogMapper;
 import com.goafanti.common.dao.ContractMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.enums.ContractStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
@@ -24,10 +14,8 @@ import com.goafanti.common.model.Contract;
 import com.goafanti.common.model.ContractLog;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.User;
-import com.goafanti.common.utils.StringUtils;
 import com.goafanti.contract.bo.InputContactLog;
 import com.goafanti.contract.service.ContractLogService;
-import com.goafanti.core.shiro.token.TokenManager;
 
 @Service
 public class ContractLogServiceImpl implements ContractLogService {
@@ -36,8 +24,6 @@ public class ContractLogServiceImpl implements ContractLogService {
 	@Autowired
 	private ContractMapper		contractMapper;
 	@Autowired
-	private NoticeMapper		noticeMapper;
-	@Autowired
 	private UserMapper			userMapper;
 
 	@Override
@@ -79,6 +65,7 @@ public class ContractLogServiceImpl implements ContractLogService {
 	}
 
 	//to update 18
+	@SuppressWarnings("unused")
 	private Notice createNotice(ContractLog l) {
 		Contract info = contractMapper.selectByPrimaryKey(l.getCid());
 		Notice n = new Notice();

+ 0 - 9
src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java

@@ -17,15 +17,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.ContractMapper;
 import com.goafanti.common.dao.CopyrightInfoMapper;
 import com.goafanti.common.dao.CopyrightLogMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrgIntellectualPropertyMapper;
 import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.enums.ContractBusinessStatus;
 import com.goafanti.common.enums.CopyrightStatus;
-import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.IntellectualPropertyType;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
@@ -53,12 +49,7 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 	@Autowired
 	private OrgIntellectualPropertyMapper	orgIntellectualPropertyMapper;
 	@Autowired
-	private NoticeMapper					noticeMapper;
-	@Autowired
 	private UserMapper						userMapper;
-	@Autowired
-	private ContractMapper					contractMapper;
-
 	@Override
 	public CopyrightInfo insert(CopyrightInfo copyrightInfo, String aid) {
 		Calendar now = Calendar.getInstance();

+ 246 - 247
src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java

@@ -1,247 +1,246 @@
-package com.goafanti.core.mybatis;
-
-import java.lang.reflect.ParameterizedType;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ibatis.mapping.BoundSql;
-import org.apache.ibatis.mapping.ParameterMapping;
-import org.apache.ibatis.session.Configuration;
-import org.mybatis.spring.SqlSessionTemplate;
-import org.mybatis.spring.support.SqlSessionDaoSupport;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.goafanti.common.model.ExpertPublish;
-import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.core.mybatis.page.MysqlDialect;
-import com.goafanti.core.mybatis.page.Pagination;
-
-@SuppressWarnings({ "unchecked" })
-public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
-
-	private String NAMESPACE;
-	final static Class<? extends Object> SELF = BaseMybatisDao.class;
-	protected final Log logger = LogFactory.getLog(BaseMybatisDao.class);
-	/** 默认的查询Sql id */
-	final static String DEFAULT_SQL_ID = "findAll";
-	/** 默认的查询Count sql id **/
-	final static String DEFAULT_COUNT_SQL_ID = "findCount";
-
-	public BaseMybatisDao() {
-		try {
-			Object genericClz = getClass().getGenericSuperclass();
-			if (genericClz instanceof ParameterizedType) {
-				Class<T> entityClass = (Class<T>) ((ParameterizedType) genericClz).getActualTypeArguments()[0];
-				NAMESPACE = entityClass.getPackage().getName() + "." + entityClass.getSimpleName();
-			}
-		} catch (RuntimeException e) {
-			LoggerUtils.error(SELF, "初始化失败,继承BaseMybatisDao,没有泛型!");
-		}
-	}
-
-	@Autowired
-	public void setSqlSessionTemplate(SqlSessionTemplate sqlSessionTemplate) {
-		super.setSqlSessionTemplate(sqlSessionTemplate);
-	}
-
-	/**
-	 * 根据Sql id 去查询 分页对象
-	 * 
-	 * @param sqlId
-	 *            对应mapper.xml 里的Sql Id
-	 * @param params
-	 *            参数<String,Object>
-	 * @param pageNo
-	 *            number
-	 * @param pageSize
-	 *            size
-	 * @return
-	 */
-	public Pagination<?> findByPageBySqlId(String sqlId, Map<String, Object> params, Integer pageNo, Integer pageSize) {
-
-		pageNo = null == pageNo ? 1 : pageNo;
-		pageSize = null == pageSize ? 10 : pageSize;
-
-		sqlId = String.format("%s.%s", NAMESPACE, sqlId);
-
-		Pagination<?> page = new Pagination<Object>();
-		page.setPageNo(pageNo);
-		page.setPageSize(pageSize);
-		Configuration c = this.getSqlSession().getConfiguration();
-		int offset = (page.getPageNo() - 1) * page.getPageSize();
-		String page_sql = String.format(" limit %s , %s", offset, pageSize);
-		params.put("page_sql", page_sql);
-
-		BoundSql boundSql = c.getMappedStatement(sqlId).getBoundSql(params);
-		String sqlcode = boundSql.getSql();
-
-		LoggerUtils.debug(SELF, "findByPageBySqlId sql : %s", sqlcode);
-		String countCode = "", countId = "";
-		BoundSql countSql = null;
-		/**
-		 * sql id 和 count id 用同一个
-		 */
-		if (StringUtils.isBlank(sqlId)) {
-			countCode = sqlcode;
-			countSql = boundSql;
-		} else {
-			countId = sqlId;
-
-			Map<String, Object> countMap = new HashMap<String, Object>();
-			countMap.putAll(params);
-			countMap.remove("page_sql");// 去掉,分页的参数。
-			countSql = c.getMappedStatement(countId).getBoundSql(countMap);
-			countCode = countSql.getSql();
-		}
-		try {
-			Connection conn = this.getSqlSession().getConnection();
-
-			List<?> resultList = this.getSqlSession().selectList(sqlId, params);
-			page.setList(resultList);
-			PreparedStatement ps = getPreparedStatement(countCode, countSql.getParameterMappings(), params, conn);
-			ps.execute();
-			ResultSet set = ps.getResultSet();
-
-			while (set.next()) {
-				page.setTotalCount(set.getInt(1));
-			}
-		} catch (Exception e) {
-			LoggerUtils.error(SELF, "jdbc.error.code.findByPageBySqlId", e);
-		}
-		return page;
-	}
-
-	/**
-	 * 根据Sql ID 查询List,而不要查询分页的页码
-	 * 
-	 * @param sqlId
-	 *            对应mapper.xml 里的Sql Id[主语句]
-	 * @param params
-	 *            参数<String,Object>
-	 * @param pageNo
-	 *            number
-	 * @param pageSize
-	 *            size
-	 * @return
-	 */
-	public List<?> findList(String sqlId, Map<String, Object> params, Integer pageNo, Integer pageSize) {
-		pageNo = null == pageNo ? 1 : pageNo;
-		pageSize = null == pageSize ? 10 : pageSize;
-
-		int offset = (pageNo - 1) * pageSize;
-		String page_sql = String.format(" limit %s , %s", offset, pageSize);
-		params.put("page_sql", page_sql);
-		sqlId = String.format("%s.%s", NAMESPACE, sqlId);
-
-		List<?> resultList = this.getSqlSession().selectList(sqlId, params);
-		return resultList;
-	}
-
-	/**
-	 * 当Sql ID 是 default findAll的情况下。
-	 * 
-	 * @param params
-	 * @param pageNo
-	 * @param pageSize
-	 * @param requiredType
-	 *            返回的类型[可以不传参]
-	 * @return
-	 */
-	public List<?> findList(Map<String, Object> params, Integer pageNo, Integer pageSize) {
-		return findList(DEFAULT_SQL_ID, params, pageNo, pageSize);
-	}
-
-	/**
-	 * 分页
-	 * 
-	 * @param sqlId
-	 *            主语句
-	 * @param countId
-	 *            Count 语句
-	 * @param params
-	 *            参数
-	 * @param pageNo
-	 *            第几页
-	 * @param pageSize每页显示多少条
-	 * @param requiredType
-	 *            返回的类型[可以不传参]
-	 * @return
-	 */
-	public Pagination<?> findPage(String sqlId, String countId, Map<String, Object> params, Integer pageNo,
-			Integer pageSize) {
-		pageNo = null == pageNo ? 1 : pageNo;
-		pageSize = null == pageSize ? 10 : pageSize;
-		Pagination<?> page = new Pagination<Object>();
-		page.setPageNo(pageNo);
-		page.setPageSize(pageSize);
-		int offset = (page.getPageNo() - 1) * page.getPageSize();
-		String page_sql = String.format(" limit  %s , %s ", offset, pageSize);
-		params.put("page_sql", page_sql);
-
-		sqlId = String.format("%s.%s", NAMESPACE, sqlId);
-
-		countId = String.format("%s.%s", NAMESPACE, countId);
-		
-		try {
-			List<?> resultList = this.getSqlSession().selectList(sqlId, params);
-
-			page.setList(resultList);
-
-			page.setTotalCount(this.getSqlSession().selectOne(countId, params));
-
-		} catch (Exception e) {
-			LoggerUtils.error(SELF, "jdbc.error.code.findByPageBySqlId", e);
-		}
-		return page;
-
-	}
-
-	/**
-	 * 重载减少参数DEFAULT_SQL_ID, "findCount"
-	 * 
-	 * @param params
-	 * @param pageNo
-	 * @param pageSize
-	 * @return
-	 */
-	public Pagination<?> findPage(Map<String, Object> params, Integer pageNo, Integer pageSize) {
-
-		return findPage(DEFAULT_SQL_ID, DEFAULT_COUNT_SQL_ID, params, pageNo, pageSize);
-	}
-
-	/**
-	 * 组装
-	 * 
-	 * @param sql
-	 * @param parameterMappingList
-	 * @param params
-	 * @param conn
-	 * @return
-	 * @throws SQLException
-	 */
-	private PreparedStatement getPreparedStatement(String sql, List<ParameterMapping> parameterMappingList,
-			Map<String, Object> params, Connection conn) throws SQLException {
-		/**
-		 * 分页根据数据库分页
-		 */
-		MysqlDialect o = new MysqlDialect();
-
-		PreparedStatement ps = conn.prepareStatement(o.getCountSqlString(sql));
-		int index = 1;
-		for (int i = 0; i < parameterMappingList.size(); i++) {
-			ps.setObject(index++, params.get(parameterMappingList.get(i).getProperty()));
-		}
-		return ps;
-	}
-
-	
-
-}
+package com.goafanti.core.mybatis;
+
+import java.lang.reflect.ParameterizedType;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.session.Configuration;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.support.SqlSessionDaoSupport;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.core.mybatis.page.MysqlDialect;
+import com.goafanti.core.mybatis.page.Pagination;
+
+@SuppressWarnings({ "unchecked" })
+public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
+
+	private String NAMESPACE;
+	final static Class<? extends Object> SELF = BaseMybatisDao.class;
+	protected final Log logger = LogFactory.getLog(BaseMybatisDao.class);
+	/** 默认的查询Sql id */
+	final static String DEFAULT_SQL_ID = "findAll";
+	/** 默认的查询Count sql id **/
+	final static String DEFAULT_COUNT_SQL_ID = "findCount";
+
+	public BaseMybatisDao() {
+		try {
+			Object genericClz = getClass().getGenericSuperclass();
+			if (genericClz instanceof ParameterizedType) {
+				Class<T> entityClass = (Class<T>) ((ParameterizedType) genericClz).getActualTypeArguments()[0];
+				NAMESPACE = entityClass.getPackage().getName() + "." + entityClass.getSimpleName();
+			}
+		} catch (RuntimeException e) {
+			LoggerUtils.error(SELF, "初始化失败,继承BaseMybatisDao,没有泛型!");
+		}
+	}
+
+	@Autowired
+	public void setSqlSessionTemplate(SqlSessionTemplate sqlSessionTemplate) {
+		super.setSqlSessionTemplate(sqlSessionTemplate);
+	}
+
+	/**
+	 * 根据Sql id 去查询 分页对象
+	 * 
+	 * @param sqlId
+	 *            对应mapper.xml 里的Sql Id
+	 * @param params
+	 *            参数<String,Object>
+	 * @param pageNo
+	 *            number
+	 * @param pageSize
+	 *            size
+	 * @return
+	 */
+	public Pagination<?> findByPageBySqlId(String sqlId, Map<String, Object> params, Integer pageNo, Integer pageSize) {
+
+		pageNo = null == pageNo ? 1 : pageNo;
+		pageSize = null == pageSize ? 10 : pageSize;
+
+		sqlId = String.format("%s.%s", NAMESPACE, sqlId);
+
+		Pagination<?> page = new Pagination<Object>();
+		page.setPageNo(pageNo);
+		page.setPageSize(pageSize);
+		Configuration c = this.getSqlSession().getConfiguration();
+		int offset = (page.getPageNo() - 1) * page.getPageSize();
+		String page_sql = String.format(" limit %s , %s", offset, pageSize);
+		params.put("page_sql", page_sql);
+
+		BoundSql boundSql = c.getMappedStatement(sqlId).getBoundSql(params);
+		String sqlcode = boundSql.getSql();
+
+		LoggerUtils.debug(SELF, "findByPageBySqlId sql : %s", sqlcode);
+		String countCode = "", countId = "";
+		BoundSql countSql = null;
+		/**
+		 * sql id 和 count id 用同一个
+		 */
+		if (StringUtils.isBlank(sqlId)) {
+			countCode = sqlcode;
+			countSql = boundSql;
+		} else {
+			countId = sqlId;
+
+			Map<String, Object> countMap = new HashMap<String, Object>();
+			countMap.putAll(params);
+			countMap.remove("page_sql");// 去掉,分页的参数。
+			countSql = c.getMappedStatement(countId).getBoundSql(countMap);
+			countCode = countSql.getSql();
+		}
+		try {
+			Connection conn = this.getSqlSession().getConnection();
+
+			List<?> resultList = this.getSqlSession().selectList(sqlId, params);
+			page.setList(resultList);
+			PreparedStatement ps = getPreparedStatement(countCode, countSql.getParameterMappings(), params, conn);
+			ps.execute();
+			ResultSet set = ps.getResultSet();
+
+			while (set.next()) {
+				page.setTotalCount(set.getInt(1));
+			}
+		} catch (Exception e) {
+			LoggerUtils.error(SELF, "jdbc.error.code.findByPageBySqlId", e);
+		}
+		return page;
+	}
+
+	/**
+	 * 根据Sql ID 查询List,而不要查询分页的页码
+	 * 
+	 * @param sqlId
+	 *            对应mapper.xml 里的Sql Id[主语句]
+	 * @param params
+	 *            参数<String,Object>
+	 * @param pageNo
+	 *            number
+	 * @param pageSize
+	 *            size
+	 * @return
+	 */
+	public List<?> findList(String sqlId, Map<String, Object> params, Integer pageNo, Integer pageSize) {
+		pageNo = null == pageNo ? 1 : pageNo;
+		pageSize = null == pageSize ? 10 : pageSize;
+
+		int offset = (pageNo - 1) * pageSize;
+		String page_sql = String.format(" limit %s , %s", offset, pageSize);
+		params.put("page_sql", page_sql);
+		sqlId = String.format("%s.%s", NAMESPACE, sqlId);
+
+		List<?> resultList = this.getSqlSession().selectList(sqlId, params);
+		return resultList;
+	}
+
+	/**
+	 * 当Sql ID 是 default findAll的情况下。
+	 * 
+	 * @param params
+	 * @param pageNo
+	 * @param pageSize
+	 * @param requiredType
+	 *            返回的类型[可以不传参]
+	 * @return
+	 */
+	public List<?> findList(Map<String, Object> params, Integer pageNo, Integer pageSize) {
+		return findList(DEFAULT_SQL_ID, params, pageNo, pageSize);
+	}
+
+	/**
+	 * 分页
+	 * 
+	 * @param sqlId
+	 *            主语句
+	 * @param countId
+	 *            Count 语句
+	 * @param params
+	 *            参数
+	 * @param pageNo
+	 *            第几页
+	 * @param pageSize每页显示多少条
+	 * @param requiredType
+	 *            返回的类型[可以不传参]
+	 * @return
+	 */
+	public Pagination<?> findPage(String sqlId, String countId, Map<String, Object> params, Integer pageNo,
+			Integer pageSize) {
+		pageNo = null == pageNo ? 1 : pageNo;
+		pageSize = null == pageSize ? 10 : pageSize;
+		Pagination<?> page = new Pagination<Object>();
+		page.setPageNo(pageNo);
+		page.setPageSize(pageSize);
+		int offset = (page.getPageNo() - 1) * page.getPageSize();
+		String page_sql = String.format(" limit  %s , %s ", offset, pageSize);
+		params.put("page_sql", page_sql);
+
+		sqlId = String.format("%s.%s", NAMESPACE, sqlId);
+
+		countId = String.format("%s.%s", NAMESPACE, countId);
+		
+		try {
+			List<?> resultList = this.getSqlSession().selectList(sqlId, params);
+
+			page.setList(resultList);
+
+			page.setTotalCount(this.getSqlSession().selectOne(countId, params));
+
+		} catch (Exception e) {
+			LoggerUtils.error(SELF, "jdbc.error.code.findByPageBySqlId", e);
+		}
+		return page;
+
+	}
+
+	/**
+	 * 重载减少参数DEFAULT_SQL_ID, "findCount"
+	 * 
+	 * @param params
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	public Pagination<?> findPage(Map<String, Object> params, Integer pageNo, Integer pageSize) {
+
+		return findPage(DEFAULT_SQL_ID, DEFAULT_COUNT_SQL_ID, params, pageNo, pageSize);
+	}
+
+	/**
+	 * 组装
+	 * 
+	 * @param sql
+	 * @param parameterMappingList
+	 * @param params
+	 * @param conn
+	 * @return
+	 * @throws SQLException
+	 */
+	private PreparedStatement getPreparedStatement(String sql, List<ParameterMapping> parameterMappingList,
+			Map<String, Object> params, Connection conn) throws SQLException {
+		/**
+		 * 分页根据数据库分页
+		 */
+		MysqlDialect o = new MysqlDialect();
+
+		PreparedStatement ps = conn.prepareStatement(o.getCountSqlString(sql));
+		int index = 1;
+		for (int i = 0; i < parameterMappingList.size(); i++) {
+			ps.setObject(index++, params.get(parameterMappingList.get(i).getProperty()));
+		}
+		return ps;
+	}
+
+	
+
+}

+ 0 - 2
src/main/java/com/goafanti/demand/bo/DemandManageDetailBo.java

@@ -1,11 +1,9 @@
 package com.goafanti.demand.bo;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-import com.goafanti.common.model.DemandFollowDetail;
 
 public class DemandManageDetailBo extends DemandManageListBo {
 

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

@@ -1,6 +1,5 @@
 package com.goafanti.demand.bo;
 
-import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;

+ 0 - 1
src/main/java/com/goafanti/demand/controller/AdminDemandApiController.java

@@ -31,7 +31,6 @@ import com.goafanti.common.enums.DemandFields;
 import com.goafanti.common.enums.DemandImportFields;
 
 import com.goafanti.common.enums.DemandSwitchSign;
-import com.goafanti.common.enums.MarketingPage;
 import com.goafanti.common.model.Attachment;
 import com.goafanti.common.model.Demand;
 import com.goafanti.common.model.DemandFollow;

+ 0 - 1
src/main/java/com/goafanti/demand/controller/UserDemandApiController.java

@@ -1,7 +1,6 @@
 package com.goafanti.demand.controller;
 
 import java.util.Arrays;
-import java.util.List;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

+ 0 - 1
src/main/java/com/goafanti/demand/service/DemandFollowService.java

@@ -2,7 +2,6 @@ package com.goafanti.demand.service;
 
 
 
-import java.util.List;
 
 import com.goafanti.common.model.DemandFollow;
 import com.goafanti.common.model.DemandFollowDetail;

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

@@ -4,12 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.bo.PublishPageBo;
-import com.goafanti.common.dao.BranchInformationMapper;
-import com.goafanti.common.model.BranchInformation;
 
 
 @Service

+ 0 - 12
src/main/java/com/goafanti/demand/service/impl/DemandFollowServiceImpl.java

@@ -1,35 +1,24 @@
 package com.goafanti.demand.service.impl;
 
 import java.text.ParseException;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.goafanti.common.bo.PublishPageBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.DemandFollowDetailMapper;
 import com.goafanti.common.dao.DemandFollowMapper;
-import com.goafanti.common.dao.DemandPublishMapper;
 import com.goafanti.common.enums.DemandFollowResult;
 import com.goafanti.common.model.DemandFollow;
 import com.goafanti.common.model.DemandFollowDetail;
-import com.goafanti.common.model.DemandPublish;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.bo.DemandFollowDetailListBo;
 import com.goafanti.demand.bo.DemandFollowListBo;
-import com.goafanti.demand.bo.DemandListBo;
-import com.goafanti.demand.bo.DemandPublishBo;
 import com.goafanti.demand.service.DemandFollowService;
-import com.goafanti.demand.service.DemandPublishPageService;
-import com.goafanti.demand.service.DemandPublishService;
 
 
 @Service
@@ -41,7 +30,6 @@ public class DemandFollowServiceImpl extends BaseMybatisDao<DemandFollowMapper>
 	@Autowired
 	private DemandFollowDetailMapper	demandFollowDetailMapper;
 
-	private static final Logger				logger	= LoggerFactory.getLogger(DemandFollowServiceImpl.class);
 
 	@Override
 	public int insertDemandFollow(DemandFollow d) {

+ 0 - 3
src/main/java/com/goafanti/demand/service/impl/DemandPublishServiceImpl.java

@@ -5,8 +5,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goafanti.common.bo.PublishPageBo;
@@ -26,7 +24,6 @@ public class DemandPublishServiceImpl extends BaseMybatisDao<DemandPublishMapper
 	@Autowired
 	private DemandPublishMapper	demandPublishMapper;
 
-	private static final Logger				logger	= LoggerFactory.getLogger(DemandPublishServiceImpl.class);
 
 	@Override
 	public int insertDemandPublish(DemandPublish d) {

+ 0 - 1
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -53,7 +53,6 @@ import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.AchievementDemand;
 import com.goafanti.common.model.AchievementDemandCount;
 import com.goafanti.common.model.Demand;
-import com.goafanti.common.model.DemandFollowDetail;
 import com.goafanti.common.model.DemandKeyword;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrganizationIdentity;

+ 154 - 151
src/main/java/com/goafanti/easemob/queue/EasemobRedisQueue.java

@@ -1,152 +1,155 @@
-package com.goafanti.easemob.queue;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.BoundListOperations;
-import org.springframework.data.redis.core.RedisConnectionUtils;
-import org.springframework.data.redis.core.RedisTemplate;
-
-import com.goafanti.easemob.bo.EasemobInfo;
-
-public class EasemobRedisQueue implements InitializingBean, DisposableBean {
-	private RedisTemplate<String, Object>		redisTemplate;
-	private String								key;
-	private RedisConnectionFactory				factory;
-	private RedisConnection						connection;
-	private BoundListOperations<String, Object>	listOperations;
-
-	private Lock								lock	= new ReentrantLock();
-
-	private RedisQueueListener<EasemobInfo>	listener;
-	private Thread								listenerThread;
-
-	private boolean								isClosed;
-
-	public void setRedisTemplate(RedisTemplate<String, Object> redisTemplate) {
-		this.redisTemplate = redisTemplate;
-	}
-
-	public void setListener(RedisQueueListener<EasemobInfo> listener) {
-		this.listener = listener;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		// do nothing
-		/*factory = redisTemplate.getConnectionFactory();
-		connection = RedisConnectionUtils.getConnection(factory);
-
-		listOperations = redisTemplate.boundListOps(key);
-		if (listener != null) {
-			listenerThread = new ListenerThread();
-			listenerThread.setDaemon(true);
-			listenerThread.start();
-		}*/
-	}
-
-	/**
-	 * blocking remove and get last item from queue:BRPOP
-	 * 
-	 * @return
-	 */
-	public Object takeFromTail(int timeout) throws InterruptedException {
-		lock.lockInterruptibly();
-		try {
-			return listOperations.rightPop(timeout, TimeUnit.SECONDS);
-		} finally {
-			lock.unlock();
-		}
-	}
-
-	public Object takeFromTail() throws InterruptedException {
-		return takeFromTail(0);
-	}
-
-	/**
-	 * 从队列的头,插入
-	 */
-	public void pushFromHead(Object value) {
-		listOperations.leftPush(value);
-	}
-
-	public void pushFromTail(Object value) {
-		listOperations.rightPush(value);
-	}
-
-	/**
-	 * noblocking
-	 * 
-	 * @return null if no item in queue
-	 */
-	public Object removeFromHead() {
-		return listOperations.leftPop();
-	}
-
-	public Object removeFromTail() {
-		return listOperations.rightPop();
-	}
-
-	/**
-	 * blocking remove and get first item from queue:BLPOP
-	 * 
-	 * @return
-	 */
-	public Object takeFromHead(int timeout) throws InterruptedException {
-		lock.lockInterruptibly();
-		try {
-			return listOperations.leftPop(timeout, TimeUnit.SECONDS);
-		} finally {
-			lock.unlock();
-		}
-	}
-
-	public Object takeFromHead() throws InterruptedException {
-		return takeFromHead(0);
-	}
-
-	@Override
-	public void destroy() throws Exception {
-		if (isClosed) {
-			return;
-		}
-		shutdown();
-		RedisConnectionUtils.releaseConnection(connection, factory);
-	}
-
-	private void shutdown() {
-		try {
-			listenerThread.interrupt();
-		} catch (Exception e) {
-		}
-	}
-
-	private class ListenerThread extends Thread {
-		@Override
-		public void run() {
-			try {
-				while (true) {
-					Object value = takeFromHead();
-					// 逐个执行
-					if (value != null) {
-						try {
-							listener.onMessage((EasemobInfo) value);
-						} catch (Exception e) {
-						}
-					}
-				}
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-
+package com.goafanti.easemob.queue;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.BoundListOperations;
+import org.springframework.data.redis.core.RedisConnectionUtils;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import com.goafanti.easemob.bo.EasemobInfo;
+
+public class EasemobRedisQueue implements InitializingBean, DisposableBean {
+	@SuppressWarnings("unused")
+	private RedisTemplate<String, Object>		redisTemplate;
+	@SuppressWarnings("unused")
+	private String								key;
+	private RedisConnectionFactory				factory;
+	private RedisConnection						connection;
+	private BoundListOperations<String, Object>	listOperations;
+
+	private Lock								lock	= new ReentrantLock();
+
+	private RedisQueueListener<EasemobInfo>	listener;
+	private Thread								listenerThread;
+
+	private boolean								isClosed;
+
+	public void setRedisTemplate(RedisTemplate<String, Object> redisTemplate) {
+		this.redisTemplate = redisTemplate;
+	}
+
+	public void setListener(RedisQueueListener<EasemobInfo> listener) {
+		this.listener = listener;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		// do nothing
+		/*factory = redisTemplate.getConnectionFactory();
+		connection = RedisConnectionUtils.getConnection(factory);
+
+		listOperations = redisTemplate.boundListOps(key);
+		if (listener != null) {
+			listenerThread = new ListenerThread();
+			listenerThread.setDaemon(true);
+			listenerThread.start();
+		}*/
+	}
+
+	/**
+	 * blocking remove and get last item from queue:BRPOP
+	 * 
+	 * @return
+	 */
+	public Object takeFromTail(int timeout) throws InterruptedException {
+		lock.lockInterruptibly();
+		try {
+			return listOperations.rightPop(timeout, TimeUnit.SECONDS);
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	public Object takeFromTail() throws InterruptedException {
+		return takeFromTail(0);
+	}
+
+	/**
+	 * 从队列的头,插入
+	 */
+	public void pushFromHead(Object value) {
+		listOperations.leftPush(value);
+	}
+
+	public void pushFromTail(Object value) {
+		listOperations.rightPush(value);
+	}
+
+	/**
+	 * noblocking
+	 * 
+	 * @return null if no item in queue
+	 */
+	public Object removeFromHead() {
+		return listOperations.leftPop();
+	}
+
+	public Object removeFromTail() {
+		return listOperations.rightPop();
+	}
+
+	/**
+	 * blocking remove and get first item from queue:BLPOP
+	 * 
+	 * @return
+	 */
+	public Object takeFromHead(int timeout) throws InterruptedException {
+		lock.lockInterruptibly();
+		try {
+			return listOperations.leftPop(timeout, TimeUnit.SECONDS);
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	public Object takeFromHead() throws InterruptedException {
+		return takeFromHead(0);
+	}
+
+	@Override
+	public void destroy() throws Exception {
+		if (isClosed) {
+			return;
+		}
+		shutdown();
+		RedisConnectionUtils.releaseConnection(connection, factory);
+	}
+
+	private void shutdown() {
+		try {
+			listenerThread.interrupt();
+		} catch (Exception e) {
+		}
+	}
+
+	@SuppressWarnings("unused")
+	private class ListenerThread extends Thread {
+		@Override
+		public void run() {
+			try {
+				while (true) {
+					Object value = takeFromHead();
+					// 逐个执行
+					if (value != null) {
+						try {
+							listener.onMessage((EasemobInfo) value);
+						} catch (Exception e) {
+						}
+					}
+				}
+			} catch (InterruptedException e) {
+			}
+		}
+	}
+
 }

+ 3 - 0
src/main/java/com/goafanti/message/queue/MessageRedisQueue.java

@@ -15,7 +15,9 @@ import org.springframework.data.redis.core.RedisTemplate;
 import com.goafanti.message.bo.MessageAdapter;
 
 public class MessageRedisQueue implements InitializingBean, DisposableBean {
+	@SuppressWarnings("unused")
 	private RedisTemplate<String, Object>		redisTemplate;
+	@SuppressWarnings("unused")
 	private String								key;
 	private RedisConnectionFactory				factory;
 	private RedisConnection						connection;
@@ -131,6 +133,7 @@ public class MessageRedisQueue implements InitializingBean, DisposableBean {
 		}
 	}
 
+	@SuppressWarnings("unused")
 	private class ListenerThread extends Thread {
 
 		@Override

+ 0 - 3
src/main/java/com/goafanti/message/schedule/ScheduleClient.java

@@ -1,7 +1,5 @@
 package com.goafanti.message.schedule;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.goafanti.message.schedule.model.SchedulePayload;
 
@@ -16,7 +14,6 @@ import cn.jiguang.common.resp.APIRequestException;
 import cn.jiguang.common.resp.ResponseWrapper;
 
 public class ScheduleClient {
-    private static final Logger LOG = LoggerFactory.getLogger(ScheduleClient.class);
     private final NativeHttpClient _httpClient;
 
     private String hostName;

+ 0 - 1
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -1,7 +1,6 @@
 package com.goafanti.order.controller;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import javax.annotation.Resource;

+ 1 - 10
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -13,20 +13,13 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
-import javax.annotation.Resource;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.goafanti.common.bo.Error;
-import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.AdminMapper;
@@ -73,7 +66,6 @@ import com.goafanti.common.model.UserRole;
 import com.goafanti.common.utils.BeanUtilsExt;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.MobileMessageUtils;
-import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -81,7 +73,6 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.BusinessListBo;
 import com.goafanti.customer.bo.FollowBusinessBo;
 import com.goafanti.customer.bo.LockingReleaseBo;
-import com.goafanti.customer.service.CustomerService;
 import com.goafanti.order.bo.BillDetailBo;
 import com.goafanti.order.bo.BillListBo;
 import com.goafanti.order.bo.CommodityDetailBo;
@@ -994,7 +985,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			String approval,String orderRemarks,String signTime) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		checkOrder(tOrder); //检查订单状态
-		List<LockingReleaseBo> releaseList = checkProject(tOrder); //检查是否可签单
+		 checkProject(tOrder); //检查是否可签单
 		if (tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()) {
 			throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, orderNo, ""));
 		} else {

+ 0 - 10
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -15,8 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.ContractMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrgIntellectualPropertyMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.PatentCostMapper;
@@ -24,14 +22,11 @@ import com.goafanti.common.dao.PatentInfoMapper;
 import com.goafanti.common.dao.PatentLogMapper;
 import com.goafanti.common.dao.PatentRegistrationMapper;
 import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.enums.ContractBusinessStatus;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.IntellectualPropertyType;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.enums.PatentAnnualFeeStatus;
 import com.goafanti.common.enums.PatentInfoStatus;
-import com.goafanti.common.enums.PatentPaymentStatus;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Contract;
 import com.goafanti.common.model.Notice;
@@ -71,12 +66,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 	@Autowired
 	private OrgIntellectualPropertyMapper	orgIntellectualPropertyMapper;
 	@Autowired
-	private NoticeMapper					noticeMapper;
-	@Autowired
 	private OrganizationIdentityMapper		organizationIdentityMapper;
-	@Autowired
-	private ContractMapper					contractMapper;
-
 	@Override
 	public PatentInfo insert(PatentInfo patentInfo) {
 		patentInfoMapper.insert(patentInfo);

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

@@ -24,7 +24,6 @@ import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.enums.roleResources;
 import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.model.ContractTaskLog;
 import com.goafanti.common.model.Role;
 import com.goafanti.common.model.RolePermission;
 import com.goafanti.common.model.RoleResources;

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

@@ -1,291 +1,290 @@
-package com.goafanti.permission.service.impl;
-
-import java.lang.reflect.InvocationTargetException;
-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 java.util.UUID;
-
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.PermissionMapper;
-import com.goafanti.common.dao.RolePermissionMapper;
-import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.dao.UserRoleMapper;
-import com.goafanti.common.model.Permission;
-import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.permission.service.PermissionService;
-import com.goafanti.permission.bo.Menu;
-import com.goafanti.permission.bo.Navigation;
-import com.goafanti.permission.bo.PermissionBo;
-import com.goafanti.permission.bo.SubMenu;
-
-@Service
-public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> implements PermissionService {
-
-	@Autowired
-	PermissionMapper		permissionMapper;
-	@Autowired
-	UserMapper				userMapper;
-	@Autowired
-	RolePermissionMapper	rolePermissionMapper;
-	@Autowired
-	UserRoleMapper			userRoleMapper;
-
-	@Override
-	public int insert(List<Permission> records) {
-		return permissionMapper.insertBatch(records);
-	}
-
-	@Override
-	public Set<String> findPermissionByUserId(String userId) {
-		return permissionMapper.findPermissionByUserId(userId);
-	}
-
-	@Override
-	public List<Permission> findPermissions() {
-		return permissionMapper.findAll();
-	}
-
-	@Override
-	public int deleteByPrimaryKeys(List<String> ids) {
-		rolePermissionMapper.deleteByPermissionId(ids);
-		return permissionMapper.deleteByPrimaryKeys(ids);
-	}
-
-	@Override
-	public int insertn(Permission record) {
-		String id = UUID.randomUUID().toString();
-		Date now = new Date();
-		record.setId(id);
-		record.setUrl(record.getUrl());
-		record.setName(record.getName());
-		String createId=permissionMapper.selectAdminNameById(TokenManager.getAdminId());
-		record.setCreateId(createId);
-		record.setCreateTime(now);
-		record.setUpdateTime(now);
-		record.setDeletedSign("0");
-		int Count=permissionMapper.selectAutNoCount("PM");
-		if(Count<10){
-			String aut="PM0"+Count;
-			String sid=permissionMapper.selectIdByAutNo(aut);
-			while(sid!=null){
-				Count=Count+1;				
-				if(Count>=10){
-					aut="PM"+Count;	
-				}else{
-					aut="PM0"+Count;
-				}
-				sid=permissionMapper.selectIdByAutNo(aut);			
-			}
-			record.setAutNo(aut);
-		}
-		if(Count>=10){
-			String aut="PM"+Count;
-			String sid=permissionMapper.selectIdByAutNo(aut);
-			while(sid!=null){
-				Count=Count+1;				
-				aut="PM"+Count;
-				sid=permissionMapper.selectIdByAutNo(aut);				
-			}
-			record.setAutNo(aut);
-		}
-		record.setHierarchies("1");//1第一层
-		record.setStatus("0");//0正常 1解除
-		record.setShowOrder("0");//0
-		record.setSuperId(permissionMapper.selectIdByName("平台超级模块"));//顶级为PM	
-		permissionMapper.insertn(record);
-		return 1;
-	}
-
-	@Override
-	public Permission selectSuperIdById(String id) {
-		return permissionMapper.selectSuperIdById(id);
-	}
-
-	@Override
-	public int insertSubordinate(Permission record) {
-		String id = UUID.randomUUID().toString();
-		Date now = new Date();
-		record.setId(id);
-		record.setUrl(record.getUrl());
-		record.setName(record.getName());
-		String createId=permissionMapper.selectAdminNameById(TokenManager.getAdminId());
-		record.setCreateId(createId);
-		record.setCreateTime(now);
-		record.setUpdateTime(now);
-		record.setDeletedSign("0");
-		record.setHierarchies("0");//0下层
-		record.setStatus("0");//0正常 1解除
-		record.setShowOrder("0");//正常
-		permissionMapper.insertn(record);
-		return 1;
-	}
-
-	@Override
-	public int deleteById(String id) {
-		permissionMapper.deleteById(id);
-		return 1;
-	}
-
-	@Override
-	public Permission selectAllById(String id) {
-		Permission permission=permissionMapper.selectAllById(id);
-		permission.setSuperId(permissionMapper.selectNameById(permission.getSuperId()));
-		return permissionMapper.selectAllById(id);
-	}
-
-	@Override
-	public List<Permission> selectName(String name) {
-		return permissionMapper.selectName(name);
-	}
-
-	@Override
-	public int updateById(Permission record) {
-		Date now=new Date();
-		record.setUpdateTime(now);
-		if(record.getSuperId().equals("平台超级模块")){
-			record.setHierarchies("1");
-		}else{
-			record.setHierarchies("0");
-		}
-		String autNo;
-		permissionMapper.updateById(record);
-		//*******下级编号修改
-		int n=0;
-		List<Permission> Nos =permissionMapper.selectIDNBySuperId(record.getId());
-		for(Permission i:Nos){			
-			autNo=permissionMapper.selectAutNoByName(i.getSuperId());
-			if(n<10){
-				String aut=autNo+"0"+n;			
-				if(n>=10){
-					aut=autNo+n;	
-				}else{
-					aut=autNo+"0"+n;
-				}	
-				i.setAutNo(aut);
-			}
-			if(n>=10){
-				String aut=autNo+n;			
-				aut=autNo+n;	
-				i.setAutNo(aut);
-			}
-			permissionMapper.updateByNumber(i);
-			n++;
-			
-			//*******下下级编号修改
-			int m=0;
-			List<Permission> Noss =permissionMapper.selectIDNBySuperId(i.getId());
-			for(Permission o:Noss){			
-				autNo=permissionMapper.selectAutNoByName(o.getSuperId());
-				if(m<10){
-					String aut=autNo+"0"+m;			
-					if(m>=10){
-						aut=autNo+m;	
-					}else{
-						aut=autNo+"0"+m;
-					}	
-					o.setAutNo(aut);
-				}
-				if(m>=10){
-					String aut=autNo+m;			
-					aut=autNo+m;	
-					o.setAutNo(aut);
-				}
-				permissionMapper.updateByNumber(o);
-				m++;
-				//*******下下级编号修改
-				int z=0;
-				List<Permission> Nosss =permissionMapper.selectIDNBySuperId(o.getId());
-				for(Permission p:Nosss){			
-					autNo=permissionMapper.selectAutNoByName(p.getSuperId());
-					if(z<10){
-						String aut=autNo+"0"+z;			
-						if(z>=10){
-							aut=autNo+z;	
-						}else{
-							aut=autNo+"0"+z;
-						}	
-						p.setAutNo(aut);
-					}
-					if(z>=10){
-						String aut=autNo+z;			
-						aut=autNo+z;	
-						p.setAutNo(aut);
-					}
-					permissionMapper.updateByNumber(p);
-					z++;
-				}
-			}
-			
-		}
-		return permissionMapper.updateById(record);
-	}
-
-	@Override
-	public Map<String,Object> findPermissionsAll() {
-		Map<String,Object> params = new HashMap<String, Object>();
-		List<PermissionBo> one=permissionMapper.selectOneAll();	
-		for (PermissionBo i:one){
-			i.setKey(i.getId());
-			List<PermissionBo> two=permissionMapper.selectAllBySuperId(i.getId());
-			for(PermissionBo o:two){
-				o.setChildren(permissionMapper.selectAllBySuperId(o.getId()));
-				o.setKey(o.getId());
-				List<PermissionBo> three=permissionMapper.selectAllBySuperId(o.getId());
-				for(PermissionBo p:three){
-					p.setChildren(permissionMapper.selectAllBySuperId(p.getId()));
-					p.setKey(p.getId());					
-				}
-				o.setChildren(three);
-			}
-			i.setChildren(two);
-		}
-		params.put("one", one);
-		return params;
-	}
-	
-	@Override
-	public List<Navigation> selectNavList(){
-		String aid = TokenManager.hasRole(AFTConstants.SUPERADMIN) ? null : TokenManager.getAdminId();
-		return permissionMapper.selectNavList(aid);
-	}
-
-	@Override
-	public List<Menu> selectMenuList(String superId) {
-		String aid = TokenManager.hasRole(AFTConstants.SUPERADMIN) ? null : TokenManager.getAdminId();
-		List<SubMenu> subMenus = permissionMapper.selectMenuList(superId,aid);
-		List<Menu> menus = new ArrayList<Menu>();
-		try {
-			Menu m = null;
-			for(SubMenu sm: subMenus){
-				m = new Menu();
-				BeanUtils.copyProperties(m, sm);
-				menus.add(m);
-			}
-			if(menus != null && menus.size()>0){
-				for(Menu menu: menus){
-					subMenus = permissionMapper.selectMenuList(menu.getId(),aid);
-					menu.setSubMenus(subMenus);
-				}
-			}
-		} catch (IllegalAccessException | InvocationTargetException e) {
-			e.printStackTrace();
-		}
-		return menus;
-	}
-
-	@Override
-	public String selectTopNavBySubUrl(String subUrl) {
-		// TODO Auto-generated method stub
-		return permissionMapper.selectTopNavBySubUrl(subUrl);
-	}
-
-}
+package com.goafanti.permission.service.impl;
+
+import java.lang.reflect.InvocationTargetException;
+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 java.util.UUID;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.PermissionMapper;
+import com.goafanti.common.dao.RolePermissionMapper;
+import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.dao.UserRoleMapper;
+import com.goafanti.common.model.Permission;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.permission.service.PermissionService;
+import com.goafanti.permission.bo.Menu;
+import com.goafanti.permission.bo.Navigation;
+import com.goafanti.permission.bo.PermissionBo;
+import com.goafanti.permission.bo.SubMenu;
+
+@Service
+public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> implements PermissionService {
+
+	@Autowired
+	PermissionMapper		permissionMapper;
+	@Autowired
+	UserMapper				userMapper;
+	@Autowired
+	RolePermissionMapper	rolePermissionMapper;
+	@Autowired
+	UserRoleMapper			userRoleMapper;
+
+	@Override
+	public int insert(List<Permission> records) {
+		return permissionMapper.insertBatch(records);
+	}
+
+	@Override
+	public Set<String> findPermissionByUserId(String userId) {
+		return permissionMapper.findPermissionByUserId(userId);
+	}
+
+	@Override
+	public List<Permission> findPermissions() {
+		return permissionMapper.findAll();
+	}
+
+	@Override
+	public int deleteByPrimaryKeys(List<String> ids) {
+		rolePermissionMapper.deleteByPermissionId(ids);
+		return permissionMapper.deleteByPrimaryKeys(ids);
+	}
+
+	@Override
+	public int insertn(Permission record) {
+		String id = UUID.randomUUID().toString();
+		Date now = new Date();
+		record.setId(id);
+		record.setUrl(record.getUrl());
+		record.setName(record.getName());
+		String createId=permissionMapper.selectAdminNameById(TokenManager.getAdminId());
+		record.setCreateId(createId);
+		record.setCreateTime(now);
+		record.setUpdateTime(now);
+		record.setDeletedSign("0");
+		int Count=permissionMapper.selectAutNoCount("PM");
+		if(Count<10){
+			String aut="PM0"+Count;
+			String sid=permissionMapper.selectIdByAutNo(aut);
+			while(sid!=null){
+				Count=Count+1;				
+				if(Count>=10){
+					aut="PM"+Count;	
+				}else{
+					aut="PM0"+Count;
+				}
+				sid=permissionMapper.selectIdByAutNo(aut);			
+			}
+			record.setAutNo(aut);
+		}
+		if(Count>=10){
+			String aut="PM"+Count;
+			String sid=permissionMapper.selectIdByAutNo(aut);
+			while(sid!=null){
+				Count=Count+1;				
+				aut="PM"+Count;
+				sid=permissionMapper.selectIdByAutNo(aut);				
+			}
+			record.setAutNo(aut);
+		}
+		record.setHierarchies("1");//1第一层
+		record.setStatus("0");//0正常 1解除
+		record.setShowOrder("0");//0
+		record.setSuperId(permissionMapper.selectIdByName("平台超级模块"));//顶级为PM	
+		permissionMapper.insertn(record);
+		return 1;
+	}
+
+	@Override
+	public Permission selectSuperIdById(String id) {
+		return permissionMapper.selectSuperIdById(id);
+	}
+
+	@Override
+	public int insertSubordinate(Permission record) {
+		String id = UUID.randomUUID().toString();
+		Date now = new Date();
+		record.setId(id);
+		record.setUrl(record.getUrl());
+		record.setName(record.getName());
+		String createId=permissionMapper.selectAdminNameById(TokenManager.getAdminId());
+		record.setCreateId(createId);
+		record.setCreateTime(now);
+		record.setUpdateTime(now);
+		record.setDeletedSign("0");
+		record.setHierarchies("0");//0下层
+		record.setStatus("0");//0正常 1解除
+		record.setShowOrder("0");//正常
+		permissionMapper.insertn(record);
+		return 1;
+	}
+
+	@Override
+	public int deleteById(String id) {
+		permissionMapper.deleteById(id);
+		return 1;
+	}
+
+	@Override
+	public Permission selectAllById(String id) {
+		Permission permission=permissionMapper.selectAllById(id);
+		permission.setSuperId(permissionMapper.selectNameById(permission.getSuperId()));
+		return permissionMapper.selectAllById(id);
+	}
+
+	@Override
+	public List<Permission> selectName(String name) {
+		return permissionMapper.selectName(name);
+	}
+
+	@Override
+	public int updateById(Permission record) {
+		Date now=new Date();
+		record.setUpdateTime(now);
+		if(record.getSuperId().equals("平台超级模块")){
+			record.setHierarchies("1");
+		}else{
+			record.setHierarchies("0");
+		}
+		String autNo;
+		permissionMapper.updateById(record);
+		//*******下级编号修改
+		int n=0;
+		List<Permission> Nos =permissionMapper.selectIDNBySuperId(record.getId());
+		for(Permission i:Nos){			
+			autNo=permissionMapper.selectAutNoByName(i.getSuperId());
+			if(n<10){
+				String aut=autNo+"0"+n;			
+				if(n>=10){
+					aut=autNo+n;	
+				}else{
+					aut=autNo+"0"+n;
+				}	
+				i.setAutNo(aut);
+			}
+			if(n>=10){
+				String aut=autNo+n;			
+				aut=autNo+n;	
+				i.setAutNo(aut);
+			}
+			permissionMapper.updateByNumber(i);
+			n++;
+			
+			//*******下下级编号修改
+			int m=0;
+			List<Permission> Noss =permissionMapper.selectIDNBySuperId(i.getId());
+			for(Permission o:Noss){			
+				autNo=permissionMapper.selectAutNoByName(o.getSuperId());
+				if(m<10){
+					String aut=autNo+"0"+m;			
+					if(m>=10){
+						aut=autNo+m;	
+					}else{
+						aut=autNo+"0"+m;
+					}	
+					o.setAutNo(aut);
+				}
+				if(m>=10){
+					String aut=autNo+m;			
+					aut=autNo+m;	
+					o.setAutNo(aut);
+				}
+				permissionMapper.updateByNumber(o);
+				m++;
+				//*******下下级编号修改
+				int z=0;
+				List<Permission> Nosss =permissionMapper.selectIDNBySuperId(o.getId());
+				for(Permission p:Nosss){			
+					autNo=permissionMapper.selectAutNoByName(p.getSuperId());
+					if(z<10){
+						String aut=autNo+"0"+z;			
+						if(z>=10){
+							aut=autNo+z;	
+						}else{
+							aut=autNo+"0"+z;
+						}	
+						p.setAutNo(aut);
+					}
+					if(z>=10){
+						String aut=autNo+z;			
+						aut=autNo+z;	
+						p.setAutNo(aut);
+					}
+					permissionMapper.updateByNumber(p);
+					z++;
+				}
+			}
+			
+		}
+		return permissionMapper.updateById(record);
+	}
+
+	@Override
+	public Map<String,Object> findPermissionsAll() {
+		Map<String,Object> params = new HashMap<String, Object>();
+		List<PermissionBo> one=permissionMapper.selectOneAll();	
+		for (PermissionBo i:one){
+			i.setKey(i.getId());
+			List<PermissionBo> two=permissionMapper.selectAllBySuperId(i.getId());
+			for(PermissionBo o:two){
+				o.setChildren(permissionMapper.selectAllBySuperId(o.getId()));
+				o.setKey(o.getId());
+				List<PermissionBo> three=permissionMapper.selectAllBySuperId(o.getId());
+				for(PermissionBo p:three){
+					p.setChildren(permissionMapper.selectAllBySuperId(p.getId()));
+					p.setKey(p.getId());					
+				}
+				o.setChildren(three);
+			}
+			i.setChildren(two);
+		}
+		params.put("one", one);
+		return params;
+	}
+	
+	@Override
+	public List<Navigation> selectNavList(){
+		String aid = TokenManager.hasRole(AFTConstants.SUPERADMIN) ? null : TokenManager.getAdminId();
+		return permissionMapper.selectNavList(aid);
+	}
+
+	@Override
+	public List<Menu> selectMenuList(String superId) {
+		String aid = TokenManager.hasRole(AFTConstants.SUPERADMIN) ? null : TokenManager.getAdminId();
+		List<SubMenu> subMenus = permissionMapper.selectMenuList(superId,aid);
+		List<Menu> menus = new ArrayList<Menu>();
+		try {
+			Menu m = null;
+			for(SubMenu sm: subMenus){
+				m = new Menu();
+				BeanUtils.copyProperties(m, sm);
+				menus.add(m);
+			}
+			if(menus != null && menus.size()>0){
+				for(Menu menu: menus){
+					subMenus = permissionMapper.selectMenuList(menu.getId(),aid);
+					menu.setSubMenus(subMenus);
+				}
+			}
+		} catch (IllegalAccessException | InvocationTargetException e) {
+			e.printStackTrace();
+		}
+		return menus;
+	}
+
+	@Override
+	public String selectTopNavBySubUrl(String subUrl) {
+		return permissionMapper.selectTopNavBySubUrl(subUrl);
+	}
+
+}

+ 0 - 1
src/main/java/com/goafanti/portal/controller/PortalFinancialController.java

@@ -12,7 +12,6 @@ import org.springframework.web.servlet.ModelAndView;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.user.bo.OrgPartnerDetailBo;
-import com.mysql.fabric.xmlrpc.base.Array;
 
 /**
  * 

+ 0 - 1
src/main/java/com/goafanti/portal/controller/PortalStarController.java

@@ -14,7 +14,6 @@ import org.springframework.web.servlet.ModelAndView;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.model.Banners;
 import com.goafanti.common.model.User;

+ 0 - 2
src/main/java/com/goafanti/sc/controller/ScDemandApiController.java

@@ -8,9 +8,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
-import com.goafanti.common.model.ScMessage;
 import com.goafanti.common.utils.StringUtils;
-import com.goafanti.sc.bo.inputAchievement;
 import com.goafanti.sc.bo.inputDemands;
 import com.goafanti.sc.service.ScAchievementService;
 import com.goafanti.sc.service.ScDemandService;

+ 0 - 2
src/main/java/com/goafanti/sc/service/ScDemandService.java

@@ -3,9 +3,7 @@ package com.goafanti.sc.service;
 
 
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.sc.bo.ScAchievementListBo;
 import com.goafanti.sc.bo.ScDemandListBo;
-import com.goafanti.sc.bo.inputAchievement;
 import com.goafanti.sc.bo.inputDemands;
 
 public interface ScDemandService {

+ 0 - 1
src/main/java/com/goafanti/sc/service/impl/CommonServiceImpl.java

@@ -10,7 +10,6 @@ import com.goafanti.common.model.ScMessage;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.sc.bo.ScAchievementListBo;
 import com.goafanti.sc.bo.ScMessageListBo;
 import com.goafanti.sc.service.CommonService;
 

+ 0 - 3
src/main/java/com/goafanti/sc/service/impl/ScAchievementServiceImpl.java

@@ -6,7 +6,6 @@ import java.util.UUID;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goafanti.common.dao.ScAchievementMapper;
-import com.goafanti.common.dao.ScOrganizationMapper;
 import com.goafanti.common.dao.ScPublisherMapper;
 import com.goafanti.common.model.ScAchievement;
 import com.goafanti.common.model.ScPublisher;
@@ -24,8 +23,6 @@ public class ScAchievementServiceImpl extends BaseMybatisDao<ScAchievementMapper
 	private ScAchievementMapper	 scAchievementMapper;
 	@Autowired
 	private ScPublisherMapper	scPublisherMapper;
-	@Autowired
-	private ScOrganizationMapper	scOrganizationMapper;
 
 	@Override
 	public int addAchievements(inputAchievement a) {

+ 0 - 6
src/main/java/com/goafanti/sc/service/impl/ScDmandServiceImpl.java

@@ -6,23 +6,17 @@ import java.util.Map;
 import java.util.UUID;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.goafanti.common.dao.ScAchievementMapper;
 import com.goafanti.common.dao.ScDemandMapper;
 import com.goafanti.common.dao.ScOrganizationMapper;
 import com.goafanti.common.dao.ScPublisherMapper;
-import com.goafanti.common.model.ScAchievement;
 import com.goafanti.common.model.ScDemand;
 import com.goafanti.common.model.ScOrganization;
 import com.goafanti.common.model.ScPublisher;
 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.sc.bo.ScAchievementListBo;
 import com.goafanti.sc.bo.ScDemandListBo;
-import com.goafanti.sc.bo.inputAchievement;
 import com.goafanti.sc.bo.inputDemands;
-import com.goafanti.sc.service.ScAchievementService;
 import com.goafanti.sc.service.ScDemandService;
 
 @Service

+ 1 - 8
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -20,11 +20,9 @@ import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.ContractLogMapper;
 import com.goafanti.common.dao.ContractMapper;
 import com.goafanti.common.dao.ContractTaskLogMapper;
 import com.goafanti.common.dao.ContractTaskMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.TOrderMapper;
 import com.goafanti.common.dao.TechProjectLogMapper;
 import com.goafanti.common.dao.TechProjectMapper;
@@ -43,14 +41,12 @@ import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.TOrder;
 import com.goafanti.common.model.TechProject;
 import com.goafanti.common.model.TechProjectLog;
-import com.goafanti.common.model.TmpTable;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.MobileMessageUtils;
 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.order.bo.BillListBo;
 import com.goafanti.order.bo.ServiceOrderDetailBo;
 import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.enums.ProjectStage;
@@ -68,7 +64,7 @@ import com.goafanti.techproject.enums.TaskState;
 import com.goafanti.techproject.service.TechProjectService;
 import com.goafanti.user.bo.OrgUnitNames;
 
-import jdk.nashorn.internal.parser.TokenKind;
+
 
 @Service
 public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> implements TechProjectService {
@@ -77,8 +73,6 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	@Autowired
 	private TechProjectLogMapper	techProjectLogMapper;
 	@Autowired
-	private NoticeMapper			noticeMapper;
-	@Autowired
 	private UserMapper				userMapper;
 	@Autowired
 	private ContractMapper 			contractMapper;
@@ -501,7 +495,6 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 
 	@Override
 	public ContractTask selectTaskById(String taskId) {
-		// TODO Auto-generated method stub
 		return contractTaskMapper.selectByPrimaryKey(taskId);
 	}
 

+ 1 - 11
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -4,16 +4,11 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.Arrays;
 import java.util.UUID;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-
 import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.crypto.hash.SimpleHash;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.util.Assert;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
-
-import com.alibaba.fastjson.JSONObject;
 import com.goafanti.cognizance.bo.InputOrgHumanResource;
 import com.goafanti.cognizance.service.OrgRatepayService;
 import com.goafanti.common.bo.Result;
@@ -54,8 +47,6 @@ import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.easemob.EasemobUtils;
-import com.goafanti.easemob.bo.EasemobInfo;
 import com.goafanti.techproject.service.TechWebsiteService;
 import com.goafanti.user.bo.InputOrgPro;
 import com.goafanti.user.bo.InputOrganizationTech;
@@ -104,8 +95,7 @@ public class UserApiController extends BaseApiController {
 	@Resource
 	private OrgRatepayService				orgRatepayService;
 
-	@Autowired
-	private EasemobUtils					easemobUtils;
+	
 
 	private static final Integer			STEP_ONE			= 1;
 

+ 4 - 7
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -8,15 +8,12 @@ import javax.validation.Valid;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.shiro.crypto.hash.SimpleHash;
-import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.fastjson.JSONObject;
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
@@ -30,7 +27,6 @@ import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.easemob.EasemobUtils;
-import com.goafanti.easemob.bo.EasemobInfo;
 import com.goafanti.message.service.MessageService;
 import com.goafanti.user.bo.InputUser;
 import com.goafanti.user.service.UserService;
@@ -179,13 +175,14 @@ public class UserRegisterController extends BaseController {
 			us.setIdentifyName(StringUtils.isBlank(user.getUnitName())?"":user.getUnitName());
 			us.setLvl(UserLevel.GENERAL.getCode());
 			userService.insertRegister(us,user.getUnitName(),user.getUsername());
-			User currentUser = userService.selectByPrimaryKey(us.getId()); 			
+			/*User currentUser =*/
+					userService.selectByPrimaryKey(us.getId()); 			
 			//registerEasemobAfterRegister(uuid,currentUser);//开通环信账号
 		}
 		return res;
 	}
 	
-	private void registerEasemobAfterRegister(String uuid,User u){
+	/*private void registerEasemobAfterRegister(String uuid,User u){
 			JSONObject resultObj = new JSONObject();
 			String easemobName =  String.valueOf(u.getNumber());
 			String easemobPass = new SimpleHash("md5", u.getId(), null, 1).toHex();
@@ -196,5 +193,5 @@ public class UserRegisterController extends BaseController {
 					new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
 			//绑定账号
 			messageService.addJpushEasemobAccount(uuid,u.getId(),easemobName,easemobPass);		
-	}
+	}*/
 }

+ 0 - 3
src/main/java/com/goafanti/user/service/ExpertPublishPageService.java

@@ -4,12 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.bo.PublishPageBo;
-import com.goafanti.common.dao.BranchInformationMapper;
-import com.goafanti.common.model.BranchInformation;
 
 
 @Service

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

@@ -1,7 +1,6 @@
 package com.goafanti.user.service;
 
 import com.goafanti.common.model.UserCareer;
-import com.goafanti.core.mybatis.page.Pagination;
 
 
 public interface UserCareerService {

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

@@ -6,7 +6,6 @@ import java.util.Map;
 import com.goafanti.app.bo.UserBasicInfo;
 import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.bo.StarAndExpertListBo;

+ 0 - 3
src/main/java/com/goafanti/user/service/impl/ExpertPublishServiceImpl.java

@@ -5,8 +5,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goafanti.common.bo.PublishPageBo;
@@ -26,7 +24,6 @@ public class ExpertPublishServiceImpl extends BaseMybatisDao<ExpertPublishMapper
 	@Autowired
 	private ExpertPublishMapper	expertPublishMapper;
 
-	private static final Logger				logger	= LoggerFactory.getLogger(ExpertPublishServiceImpl.class);
 
 	@Override
 	public int insertExpertPublish(ExpertPublish e) {

+ 1 - 4
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -14,11 +14,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrgHumanResourceMapper;
 import com.goafanti.common.dao.OrgRatepayMapper;
@@ -40,7 +38,6 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.portal.bo.InternationalListBo;
 import com.goafanti.portal.bo.OrgSubscriberListBo;
 import com.goafanti.user.bo.AuditorOrgIdentityDetailBo;
 import com.goafanti.user.bo.OrgBasicInfoBo;
@@ -117,7 +114,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 
 	@Override
 	public Map<String, String> selectContactsByUserId(String uid) {
-		OrganizationIdentity i = organizationIdentityMapper.selectOrgIdentityByUserId(uid);
+		organizationIdentityMapper.selectOrgIdentityByUserId(uid);
 		Map<String, String> map = new TreeMap<String, String>();
 		return map;
 	}

+ 0 - 7
src/main/java/com/goafanti/user/service/impl/UserCareerServiceImpl.java

@@ -1,17 +1,10 @@
 package com.goafanti.user.service.impl;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goafanti.common.dao.UserCareerMapper;
 import com.goafanti.common.model.UserCareer;
 import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.demand.bo.DemandListBo;
 
 import com.goafanti.user.service.UserCareerService;
 @Service

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

@@ -39,7 +39,6 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.demand.bo.ObjectInterestListBo;
 import com.goafanti.portal.bo.UserSubscriberListBo;
 import com.goafanti.user.bo.Advertisings;
 import com.goafanti.user.bo.AuditorUserIdentityDetailBo;

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

@@ -29,7 +29,6 @@ import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.OrgPartnerDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 519 - 519
src/main/resources/spring-context-4.0.xsd


+ 96 - 96
src/main/resources/spring/spring-mybatis.xml

@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="utf-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:cache="http://www.springframework.org/schema/cache"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="
-    		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-			http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
-			http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
-			http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd
-			http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
-			http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-4.0.xsd">
-	
-	<context:component-scan base-package="com.goafanti.*.service;com.goafanti.*.*.service" />
-	
-	<bean id="log-filter" class="com.alibaba.druid.filter.logging.Log4jFilter">
-    	<property name="resultSetLogEnabled" value="true" />
-	</bean>
-	
-	<bean id="idGenerator" class="com.goafanti.core.mybatis.JDBCIdGenerator"></bean>
-	
-	<bean name="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
-		<property name="url" value="${jdbc.url}" /> 
-		<property name="username" value="${jdbc.username}" /> 
-		<property name="password" value="${jdbc.password}" /> 
-		<property name="initialSize" value="${jdbc.initialSize}" /> 
-	    <property name="minIdle" value="${jdbc.minIdle}" /> 
-	    <property name="maxActive" value="${jdbc.maxActive}" /> 
-	    <property name="maxWait" value="${jdbc.maxWait}" /> 
-	    <property name="timeBetweenEvictionRunsMillis" value="${jdbc.timeBetweenEvictionRunsMillis}" /> 
-	    <property name="minEvictableIdleTimeMillis" value="${jdbc.minEvictableIdleTimeMillis}" /> 
-	    <property name="validationQuery" value="${jdbc.validationQuery}" /> 
-	    <property name="testWhileIdle" value="${jdbc.testWhileIdle}" /> 
-	    <property name="testOnBorrow" value="${jdbc.testOnBorrow}" /> 
-	    <property name="testOnReturn" value="${jdbc.testOnReturn}" /> 
-	    <property name="removeAbandoned" value="${jdbc.removeAbandoned}" /> 
-	    <property name="removeAbandonedTimeout" value="${jdbc.removeAbandonedTimeout}" /> 
-		<property name="logAbandoned" value="${jdbc.logAbandoned}" />
-	    <property name="filters" value="${jdbc.filters}" />
-		<property name="proxyFilters">
-	        <list>
-	            <ref bean="log-filter"/>
-	        </list>
-	    </property>
-	</bean>
-
-	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-		<property name="dataSource" ref="dataSource" />
-		<property name="configLocation" value="classpath:mybatis-config.xml"/>
-		<property name="mapperLocations"  >
-			<list>
-				<value>classpath:com/goafanti/common/mapper/*.xml</value>
-			</list>
-		</property>
-	</bean>
-	
-	<bean id="sqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
-		<constructor-arg index="0" ref="sqlSessionFactory" />
-	</bean>
-	<bean id="baseMybatisDao" class="com.goafanti.core.mybatis.BaseMybatisDao" >
-		<property name="sqlSessionFactory" ref="sqlSessionFactory" />
-	</bean>	
-	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="com.goafanti.common.dao" />
-		<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
-	</bean>
-	 <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-	     <property name="dataSource" ref="dataSource" />
-	 </bean>
-	 
-	<tx:advice id="txAdvice" transaction-manager="transactionManager">
-		<tx:attributes>
-			<tx:method name="publish*"  rollback-for="Exception" />
-			<tx:method name="save*" rollback-for="Exception" />
-			<tx:method name="push*" rollback-for="Exception" />
-			<tx:method name="add*" rollback-for="Exception" />
-			<tx:method name="update*" rollback-for="Exception" />
-			<tx:method name="insert*" rollback-for="Exception" />
-			<tx:method name="create*" rollback-for="Exception" />
-			<tx:method name="batch*" rollback-for="Exception" />
-			<tx:method name="del*" rollback-for="Exception" />
-			<tx:method name="init*" rollback-for="Exception" />
-			<tx:method name="bind*" rollback-for="Exception" />
-			<tx:method name="*"  read-only="true" />
-		</tx:attributes>
-	</tx:advice>
-		
-	<aop:config proxy-target-class="true">
-		<aop:pointcut id="myPointcut" expression="execution(* com.goafanti.*.service..*.*(..))" />
-		<aop:advisor advice-ref="txAdvice" pointcut-ref="myPointcut" />
-	</aop:config>
-	
- 	<cache:annotation-driven />
-	
+<?xml version="1.0" encoding="utf-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:cache="http://www.springframework.org/schema/cache"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="
+    		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+			http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
+			http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
+			http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd
+			http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
+			http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-4.0.xsd">
+	
+	<context:component-scan base-package="com.goafanti.*.service;com.goafanti.*.*.service" />
+	
+	<bean id="log-filter" class="com.alibaba.druid.filter.logging.Log4jFilter">
+    	<property name="resultSetLogEnabled" value="true" />
+	</bean>
+	
+	<bean id="idGenerator" class="com.goafanti.core.mybatis.JDBCIdGenerator"></bean>
+	
+	<bean name="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
+		<property name="url" value="${jdbc.url}" /> 
+		<property name="username" value="${jdbc.username}" /> 
+		<property name="password" value="${jdbc.password}" /> 
+		<property name="initialSize" value="${jdbc.initialSize}" /> 
+	    <property name="minIdle" value="${jdbc.minIdle}" /> 
+	    <property name="maxActive" value="${jdbc.maxActive}" /> 
+	    <property name="maxWait" value="${jdbc.maxWait}" /> 
+	    <property name="timeBetweenEvictionRunsMillis" value="${jdbc.timeBetweenEvictionRunsMillis}" /> 
+	    <property name="minEvictableIdleTimeMillis" value="${jdbc.minEvictableIdleTimeMillis}" /> 
+	    <property name="validationQuery" value="${jdbc.validationQuery}" /> 
+	    <property name="testWhileIdle" value="${jdbc.testWhileIdle}" /> 
+	    <property name="testOnBorrow" value="${jdbc.testOnBorrow}" /> 
+	    <property name="testOnReturn" value="${jdbc.testOnReturn}" /> 
+	    <property name="removeAbandoned" value="${jdbc.removeAbandoned}" /> 
+	    <property name="removeAbandonedTimeout" value="${jdbc.removeAbandonedTimeout}" /> 
+		<property name="logAbandoned" value="${jdbc.logAbandoned}" />
+	    <property name="filters" value="${jdbc.filters}" />
+		<property name="proxyFilters">
+	        <list>
+	            <ref bean="log-filter"/>
+	        </list>
+	    </property>
+	</bean>
+
+	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+		<property name="dataSource" ref="dataSource" />
+		<property name="configLocation" value="classpath:mybatis-config.xml"/>
+		<property name="mapperLocations"  >
+			<list>
+				<value>classpath:com/goafanti/common/mapper/*.xml</value>
+			</list>
+		</property>
+	</bean>
+	
+	<bean id="sqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
+		<constructor-arg index="0" ref="sqlSessionFactory" />
+	</bean>
+	<bean id="baseMybatisDao" class="com.goafanti.core.mybatis.BaseMybatisDao" >
+		<property name="sqlSessionFactory" ref="sqlSessionFactory" />
+	</bean>	
+	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+		<property name="basePackage" value="com.goafanti.common.dao" />
+		<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
+	</bean>
+	 <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+	     <property name="dataSource" ref="dataSource" />
+	 </bean>
+	 
+	<tx:advice id="txAdvice" transaction-manager="transactionManager">
+		<tx:attributes>
+			<tx:method name="publish*"  rollback-for="Exception" />
+			<tx:method name="save*" rollback-for="Exception" />
+			<tx:method name="push*" rollback-for="Exception" />
+			<tx:method name="add*" rollback-for="Exception" />
+			<tx:method name="update*" rollback-for="Exception" />
+			<tx:method name="insert*" rollback-for="Exception" />
+			<tx:method name="create*" rollback-for="Exception" />
+			<tx:method name="batch*" rollback-for="Exception" />
+			<tx:method name="del*" rollback-for="Exception" />
+			<tx:method name="init*" rollback-for="Exception" />
+			<tx:method name="bind*" rollback-for="Exception" />
+			<tx:method name="*"  read-only="true" />
+		</tx:attributes>
+	</tx:advice>
+		
+	<aop:config proxy-target-class="true">
+		<aop:pointcut id="myPointcut" expression="execution(* com.goafanti.*.service..*.*(..))" />
+		<aop:advisor advice-ref="txAdvice" pointcut-ref="myPointcut" />
+	</aop:config>
+	
+ 	<cache:annotation-driven />
+	
 </beans>