Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Michael 8 years ago
parent
commit
ae276da7e5
33 changed files with 258 additions and 158 deletions
  1. 5 1
      src/main/java/com/goafanti/achievement/bo/AchievementListBo.java
  2. 20 3
      src/main/java/com/goafanti/achievement/bo/AchievementPartnerListBo.java
  3. 1 1
      src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java
  4. 6 1
      src/main/java/com/goafanti/app/bo/ProjectBo.java
  5. 5 0
      src/main/java/com/goafanti/app/controller/AppServiceController.java
  6. 0 2
      src/main/java/com/goafanti/business/controller/AdminVarietiesApiController.java
  7. 4 2
      src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java
  8. 2 0
      src/main/java/com/goafanti/business/service/impl/BusinessVarietiesServiceImpl.java
  9. 86 1
      src/main/java/com/goafanti/common/controller/PortalController.java
  10. 7 92
      src/main/java/com/goafanti/common/controller/WebpageController.java
  11. 4 2
      src/main/java/com/goafanti/common/dao/PermissionMapper.java
  12. 1 1
      src/main/java/com/goafanti/common/dao/TOrderMapper.java
  13. 2 1
      src/main/java/com/goafanti/common/mapper/BusinessVarietiesMapper.xml
  14. 1 4
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  15. 29 9
      src/main/java/com/goafanti/common/mapper/PermissionMapper.xml
  16. 2 2
      src/main/java/com/goafanti/common/mapper/TOrderMapper.xml
  17. 4 0
      src/main/java/com/goafanti/common/model/Achievement.java
  18. 5 1
      src/main/java/com/goafanti/demand/bo/DemandListBo.java
  19. 1 1
      src/main/java/com/goafanti/demand/bo/ObjectInterestListBo.java
  20. 2 1
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  21. 3 5
      src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java
  22. 3 1
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  23. 2 7
      src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java
  24. 1 1
      src/main/java/com/goafanti/permission/service/PermissionService.java
  25. 6 3
      src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java
  26. 26 0
      src/main/java/com/goafanti/portal/bo/DemandSearchListBo.java
  27. 1 1
      src/main/java/com/goafanti/user/bo/UserIdentityBo.java
  28. 3 2
      src/main/java/com/goafanti/user/controller/UserRegisterController.java
  29. 2 2
      src/main/resources/props/config_local.properties
  30. 2 2
      src/main/resources/props/config_test.properties
  31. 4 7
      src/main/resources/shiro_base_auth.ini
  32. 16 0
      src/main/webapp/WEB-INF/views/admin/servicesManage/projectOrder.html
  33. 2 2
      src/main/webapp/WEB-INF/views/common.html

+ 5 - 1
src/main/java/com/goafanti/achievement/bo/AchievementListBo.java

@@ -7,6 +7,7 @@ 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.utils.StringUtils;
 
 public class AchievementListBo {
 
@@ -381,7 +382,7 @@ public class AchievementListBo {
 
 
 	public String getCountInterest() {
-		return countInterest;
+		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 
 	public void setCountInterest(String countInterest) {
@@ -397,6 +398,9 @@ public class AchievementListBo {
 	}
 
 	public String getOwnerPostalAddress() {
+		if (StringUtils.isEmpty(ownerPostalAddress)) {
+			return "湖南长沙";
+		}
 		return ownerPostalAddress;
 	}
 

+ 20 - 3
src/main/java/com/goafanti/achievement/bo/AchievementPartnerListBo.java

@@ -8,6 +8,7 @@ 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.utils.StringUtils;
 
 public class AchievementPartnerListBo {
 	private String		id;
@@ -97,6 +98,11 @@ public class AchievementPartnerListBo {
 	
 	private String buyIntention;
 	
+	/**
+	 * 所有人地址
+	 */
+	private String 	ownerPostalAddress;
+	
 	public Integer getFieldA() {
 		return fieldA;
 	}
@@ -245,12 +251,12 @@ public class AchievementPartnerListBo {
 	
 
 	public String getCountInterest() {
-	    
-		return String.valueOf(Integer.valueOf(countInterest)+128);
+		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 
 	public void setCountInterest(String countInterest) {
-		this.countInterest = countInterest;
+		
+		this.countInterest =countInterest;
 	}
 
 	public Integer getBoutique() {
@@ -268,6 +274,17 @@ public class AchievementPartnerListBo {
 	public void setBuyIntention(String buyIntention) {
 		this.buyIntention = buyIntention;
 	}
+
+	public String getOwnerPostalAddress() {
+		if (StringUtils.isEmpty(ownerPostalAddress)) {
+			return "湖南长沙";
+		}
+		return ownerPostalAddress;
+	}
+
+	public void setOwnerPostalAddress(String ownerPostalAddress) {
+		this.ownerPostalAddress = ownerPostalAddress;
+	}
 	
 	
 	

+ 1 - 1
src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java

@@ -105,7 +105,7 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 	}
 
 	public String getCountInterest() {
-		return CountInterest;
+		return String.valueOf(Integer.valueOf(CountInterest)+20);
 	}
 
 	public void setCountInterest(String countInterest) {

+ 6 - 1
src/main/java/com/goafanti/app/bo/ProjectBo.java

@@ -50,7 +50,12 @@ public class ProjectBo {
 	}
 
 	public String getInterestCount() {
-		return interestCount;
+		if (StringUtils.isBlank(interestCount)) {
+			return "20"; 
+		}
+		return String.valueOf(Integer.valueOf(interestCount)+20);
+
+
 	}
 
 	public void setInterestCount(String interestCount) {

+ 5 - 0
src/main/java/com/goafanti/app/controller/AppServiceController.java

@@ -4,7 +4,10 @@ import javax.annotation.Resource;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+
+
 import com.goafanti.admin.service.AdminService;
+
 import com.goafanti.app.bo.ServiceImages;
 import com.goafanti.business.service.BusinessVarietiesService;
 import com.goafanti.business.service.BusinessProjectService;
@@ -12,6 +15,7 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.utils.StringUtils;
+
 import com.goafanti.user.service.UserIdentityService;
 
 
@@ -57,6 +61,7 @@ public class AppServiceController extends BaseApiController {
 			return res;
 		}
 		res.setData(businessProjectService.getBusinessProject(id,pNo, pSize));
+		//res.setData(new Pagination<ProjectBo>());
 		return res;
 	}
 	/**

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

@@ -172,8 +172,6 @@ public class AdminVarietiesApiController extends CertifyApiController{
 			res.getError().add(buildError("上移失败", "上移失败"));
 			return res;
 		}
-		
-		
 		if (sort>=Integer.valueOf(businessVarietiesMapper.getSortMax())&&flag==0) {
 			res.getError().add(buildError("下移失败", "下移失败"));
 			return res;

+ 4 - 2
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -381,9 +381,11 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		if (StringUtils.isNotBlank(id)) {
 			params.put("id", id);
 		}
-		Pagination<ProjectBo> p=(Pagination<ProjectBo>)findPage("getBusinessProject", "getBusinessProjectCount",
+		
+		Pagination<ProjectBo> data =  (Pagination<ProjectBo>)findPage("getBusinessProject", "getBusinessProjectCount",
 				params,pNo,pSize);
-		return p;
+		return data;
+		
 	}
 	@SuppressWarnings("unchecked")
 	@Override

+ 2 - 0
src/main/java/com/goafanti/business/service/impl/BusinessVarietiesServiceImpl.java

@@ -37,6 +37,8 @@ public class BusinessVarietiesServiceImpl extends BaseMybatisDao<BusinessVarieti
 			Integer x=Integer.valueOf(businessVarietiesMapper.getSortMax());
 			x+=1;
 			buv.setSort(x);
+		}else {
+			buv.setSort(1);
 		}
 		String str=businessVarietiesMapper.getCidMax(superId);
 		String scid=businessVarietiesMapper.getCid(superId);

+ 86 - 1
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -14,12 +14,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 import com.goafanti.achievement.bo.AchievementListBo;
+import com.goafanti.achievement.bo.AchievementPartnerListBo;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.enums.AchievementBargainingMode;
 import com.goafanti.common.enums.AchievementMaturity;
 import com.goafanti.common.enums.AchievementTransferMode;
 import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.enums.UserType;
+import com.goafanti.common.service.DistrictGlossoryService;
 import com.goafanti.common.service.FieldGlossoryService;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.bo.DemandListBo;
@@ -29,6 +31,8 @@ import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
 import com.goafanti.portal.bo.DemandPortalDetailBo;
 import com.goafanti.portal.bo.DemandPortalSimilarListBo;
+import com.goafanti.user.bo.UserPartnerDetailBo;
+import com.goafanti.user.service.UserService;
 
 @Controller
 public class PortalController extends BaseController {
@@ -42,7 +46,10 @@ public class PortalController extends BaseController {
 	private FieldGlossoryService fieldGlossoryService;
 	@Resource
 	private DemandInterestService  demandInterestService;
-
+	@Resource
+	private UserService userService;
+	@Resource
+	private DistrictGlossoryService districtglossoryservice;
 	private static final String UNIT = "万元";
 
 	private static final int MULTIPLE = 20;
@@ -866,4 +873,82 @@ public class PortalController extends BaseController {
 		mv.addObject("redemandlist", redemandlist);
 		return mv;
 	}
+	
+	@RequestMapping(value = "/portal/subscriberDetail", method = RequestMethod.GET)
+	public ModelAndView subscriberDetail(HttpServletRequest request, ModelAndView modelview, String uid, Integer type) {
+		ModelAndView mv = new ModelAndView();
+		UserPartnerDetailBo rePartnerDetail = new UserPartnerDetailBo();
+		/* 查询智者详细信息 */
+
+		if (UserType.PERSONAL.getCode().equals(type)) {
+			rePartnerDetail = userService.findUserPartnerDetail(uid);
+			if (null != rePartnerDetail) {
+				Integer province = rePartnerDetail.getProvince();
+				if (null != province) {
+					rePartnerDetail.setProvinceS(districtglossoryservice.selectNameById(province));
+				}
+			}
+		} else {
+			rePartnerDetail = (UserPartnerDetailBo) userService.findOrgPartnerDetail(uid);
+			if (null != rePartnerDetail) {
+				Integer province = rePartnerDetail.getProvince();
+				if (null != province) {
+					rePartnerDetail.setProvinceS(districtglossoryservice.selectNameById(province));
+				}
+			}
+		}
+
+		/* 查询该智者的相关成果信息 */
+		List<AchievementPartnerListBo> partnerAchievementList = achievementService.findPartnerAchievementList(uid);
+		for (int i = 0; i < partnerAchievementList.size(); i++) {
+			Integer maturity = partnerAchievementList.get(i).getMaturity();
+			if (null != maturity) {
+				if (AchievementMaturity.RESEARCH.getCode().equals(maturity)) {
+					partnerAchievementList.get(i).setMaturityS(AchievementMaturity.RESEARCH.getDesc());
+				} else if (AchievementMaturity.SAMPLE.getCode().equals(maturity)) {
+					partnerAchievementList.get(i).setMaturityS(AchievementMaturity.SAMPLE.getDesc());
+				} else if (AchievementMaturity.PRIMARYTEST.getCode().equals(maturity)) {
+					partnerAchievementList.get(i).setMaturityS(AchievementMaturity.PRIMARYTEST.getDesc());
+				} else if (AchievementMaturity.INTERMEDIATETEST.getCode().equals(maturity)) {
+					partnerAchievementList.get(i).setMaturityS(AchievementMaturity.INTERMEDIATETEST.getDesc());
+				} else if (AchievementMaturity.MASSPRODUCTION.getCode().equals(maturity)) {
+					partnerAchievementList.get(i).setMaturityS(AchievementMaturity.MASSPRODUCTION.getDesc());
+				}
+			}
+		}
+
+		/* 查询相关智者信息 */
+		List<UserPartnerDetailBo> userPartner = userService.findUserPartner();
+		List<UserPartnerDetailBo> reuserPartner = new ArrayList<UserPartnerDetailBo>();
+		if (userPartner != null && userPartner.size() >= 6) {
+			int index = new Random().nextInt(userPartner.size() - 5);
+			reuserPartner.add(userPartner.get(index));
+			reuserPartner.add(userPartner.get(index + 1));
+			reuserPartner.add(userPartner.get(index + 2));
+			reuserPartner.add(userPartner.get(index + 3));
+			reuserPartner.add(userPartner.get(index + 4));
+		} else {
+			reuserPartner.addAll(userPartner);
+		}
+		for (int i = 0; i < reuserPartner.size(); i++) {
+			String personalProfile = reuserPartner.get(i).getPersonalProfile();
+			if (null != personalProfile && "" != personalProfile && personalProfile.length() > 40) {
+				personalProfile = personalProfile.substring(0, 40) + "... ...";
+				reuserPartner.get(i).setPersonalProfile(personalProfile);
+			}
+		}
+		rePartnerDetail.setUid(uid);
+		mv.setViewName("/user/subscriberDetail");
+		mv.addObject("rePartnerDetail", rePartnerDetail);
+		mv.addObject("reuserPartner", reuserPartner);
+		partnerAchievementList.size();
+		if (partnerAchievementList.size()<=0) {
+			mv.addObject("showflg", 0);
+		}else{
+			mv.addObject("showflg", 1);
+		};
+		mv.addObject("uid", uid);
+		return mv;
+
+	};
 }

+ 7 - 92
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1,8 +1,6 @@
 package com.goafanti.common.controller;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -12,34 +10,23 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.goafanti.achievement.bo.AchievementPartnerListBo;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
-import com.goafanti.common.enums.AchievementMaturity;
 import com.goafanti.common.enums.MarketingPage;
-import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.Banners;
-import com.goafanti.common.service.DistrictGlossoryService;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.service.DemandService;
 import com.goafanti.marketing.bo.MarketingManagementBo;
 import com.goafanti.marketing.service.MarketingManagementService;
-import com.goafanti.user.bo.UserPartnerDetailBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserIdentityService;
-import com.goafanti.user.service.UserService;
 import com.goafanti.news.bo.NewsPortalList;
 import com.goafanti.news.enums.NewsType;
 import com.goafanti.news.service.NewsService;
 
 @Controller
 public class WebpageController extends BaseController {
-	@Resource
-	private UserService userService;
-
-	@Resource
-	private DistrictGlossoryService districtglossoryservice;
 
 	@Resource
 	private DemandService demandService;
@@ -126,84 +113,6 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
-	@RequestMapping(value = "/user/subscriberDetail", method = RequestMethod.GET)
-	public ModelAndView subscriberDetail(HttpServletRequest request, ModelAndView modelview, String uid, Integer type) {
-		ModelAndView mv = new ModelAndView();
-		UserPartnerDetailBo rePartnerDetail = new UserPartnerDetailBo();
-		/* 查询智者详细信息 */
-
-		if (UserType.PERSONAL.getCode().equals(type)) {
-			rePartnerDetail = userService.findUserPartnerDetail(uid);
-			if (null != rePartnerDetail) {
-				Integer province = rePartnerDetail.getProvince();
-				if (null != province) {
-					rePartnerDetail.setProvinceS(districtglossoryservice.selectNameById(province));
-				}
-			}
-		} else {
-			rePartnerDetail = (UserPartnerDetailBo) userService.findOrgPartnerDetail(uid);
-			if (null != rePartnerDetail) {
-				Integer province = rePartnerDetail.getProvince();
-				if (null != province) {
-					rePartnerDetail.setProvinceS(districtglossoryservice.selectNameById(province));
-				}
-			}
-		}
-
-		/* 查询该智者的相关成果信息 */
-		List<AchievementPartnerListBo> partnerAchievementList = achievementService.findPartnerAchievementList(uid);
-		for (int i = 0; i < partnerAchievementList.size(); i++) {
-			Integer maturity = partnerAchievementList.get(i).getMaturity();
-			if (null != maturity) {
-				if (AchievementMaturity.RESEARCH.getCode().equals(maturity)) {
-					partnerAchievementList.get(i).setMaturityS(AchievementMaturity.RESEARCH.getDesc());
-				} else if (AchievementMaturity.SAMPLE.getCode().equals(maturity)) {
-					partnerAchievementList.get(i).setMaturityS(AchievementMaturity.SAMPLE.getDesc());
-				} else if (AchievementMaturity.PRIMARYTEST.getCode().equals(maturity)) {
-					partnerAchievementList.get(i).setMaturityS(AchievementMaturity.PRIMARYTEST.getDesc());
-				} else if (AchievementMaturity.INTERMEDIATETEST.getCode().equals(maturity)) {
-					partnerAchievementList.get(i).setMaturityS(AchievementMaturity.INTERMEDIATETEST.getDesc());
-				} else if (AchievementMaturity.MASSPRODUCTION.getCode().equals(maturity)) {
-					partnerAchievementList.get(i).setMaturityS(AchievementMaturity.MASSPRODUCTION.getDesc());
-				}
-			}
-		}
-
-		/* 查询相关智者信息 */
-		List<UserPartnerDetailBo> userPartner = userService.findUserPartner();
-		List<UserPartnerDetailBo> reuserPartner = new ArrayList<UserPartnerDetailBo>();
-		if (userPartner != null && userPartner.size() >= 6) {
-			int index = new Random().nextInt(userPartner.size() - 5);
-			reuserPartner.add(userPartner.get(index));
-			reuserPartner.add(userPartner.get(index + 1));
-			reuserPartner.add(userPartner.get(index + 2));
-			reuserPartner.add(userPartner.get(index + 3));
-			reuserPartner.add(userPartner.get(index + 4));
-		} else {
-			reuserPartner.addAll(userPartner);
-		}
-		for (int i = 0; i < reuserPartner.size(); i++) {
-			String personalProfile = reuserPartner.get(i).getPersonalProfile();
-			if (null != personalProfile && "" != personalProfile && personalProfile.length() > 40) {
-				personalProfile = personalProfile.substring(0, 40) + "... ...";
-				reuserPartner.get(i).setPersonalProfile(personalProfile);
-			}
-		}
-		rePartnerDetail.setUid(uid);
-		mv.setViewName("/user/subscriberDetail");
-		mv.addObject("rePartnerDetail", rePartnerDetail);
-		mv.addObject("reuserPartner", reuserPartner);
-		partnerAchievementList.size();
-		if (partnerAchievementList.size()<=0) {
-			mv.addObject("showflg", 0);
-		}else{
-			mv.addObject("showflg", 1);
-		};
-		mv.addObject("uid", uid);
-		return mv;
-
-	};
-
 	@RequestMapping(value = "/user/account/services", method = RequestMethod.GET)
 	public ModelAndView userServices(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/user/account/services");
@@ -278,7 +187,13 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/admin/servicesManage/copyright");
 		return modelview;
 	}
-
+	
+	@RequestMapping(value = "/admin/servicesManage/projectOrder", method = RequestMethod.GET)
+	public ModelAndView adminServiceManageProjectOrder(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/admin/servicesManage/projectOrder");
+		return modelview;
+	}
+	
 	@RequestMapping(value = "/admin/index", method = RequestMethod.GET)
 	public ModelAndView adminHome(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/admin/index");

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

@@ -3,6 +3,8 @@ package com.goafanti.common.dao;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.common.model.Permission;
 import com.goafanti.permission.bo.Navigation;
 import com.goafanti.permission.bo.PermissionBo;
@@ -67,7 +69,7 @@ public interface PermissionMapper {
 	
 	int selectCountByid(String id);
 	
-	List<Navigation> selectNavList(String aid);
+	List<Navigation> selectNavList(@Param("aid")String aid);
 
-	List<SubMenu> selectMenuList(String superId);
+	List<SubMenu> selectMenuList(@Param("superId")String superId,@Param("aid")String aid);
 }

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

@@ -89,5 +89,5 @@ public interface TOrderMapper {
 	 * @param orderId
 	 * @return
 	 */
-	List<TOrderDetail> selectOrderCommodity(@Param("orderId")String orderId);
+	List<TOrderDetail> selectOrderCommodity(@Param("orderNo")String orderNo);
 }

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

@@ -517,11 +517,12 @@
   		and b.id= #{superId,jdbcType=VARCHAR}
   	</select>
   	<select id="getVarieties" resultType="com.goafanti.business.bo.VarietiesBo">
-  		select id, cname AS name, varieties_logo as varietiesLogo 
+  		    select id, cname AS name, varieties_logo as varietiesLogo ,sort
 	from business_varieties b
 	where b.delete_sign=0
 	and b.status=0
 	and b.layer=1
+	ORDER BY if(isnull(b.sort),1,0),b.sort
   	</select>
   	
   	<select id="getCidMax" resultType="String">

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

@@ -1689,11 +1689,8 @@
 	</select>
 	
 	<select id="findAppProjectInterestByPage" parameterType="String" resultType="com.goafanti.demand.bo.ObjectInterestListBo">
-  	 select b.id ,b.bname as name,t.uid,t.create_time as createTime,ifnull(x.countInterest,0) as countInterest
+  	 select b.id ,b.bname as name,t.uid,t.create_time as createTime
 	from project_interest t
-	left join (select id,count(0)  as countInterest ,project_id from project_interest
-				group by project_id
-				) x on t.id=x.id  
 	left join business_project  b on t.project_id=b.id
 	where  t.uid=#{uid,jdbcType=VARCHAR}
   	<if test="page_sql!=null">

+ 29 - 9
src/main/java/com/goafanti/common/mapper/PermissionMapper.xml

@@ -311,14 +311,34 @@
 		</choose>
   </select>
   <select id="selectMenuList" parameterType="java.lang.String" resultType="com.goafanti.permission.bo.SubMenu">
-		select
-			id,
-			name,
-			url
-		from
-			permission
-		where
-			super_id = #{superId,jdbcType=VARCHAR}
-			and (type = 1 or type = 2)
+  		<choose>
+  			<when test="aid == null">
+		  		select
+					id,
+					name,
+					url
+				from
+					permission
+				where
+					super_id = #{superId,jdbcType=VARCHAR}
+					and (type = 1 or type = 2)
+  			</when>
+  			<otherwise>				
+				select
+					d.id,
+					d.name,
+					d.url
+				from
+					user_role a left join role b on
+					a.rid = b.id left join role_permission c on
+					b.id = c.rid left join permission d on
+					c.pid = d.id
+				where
+					(d.type = 1 or d.type = 2)
+					and d.super_id = #{superId,jdbcType=VARCHAR}
+					and a.uid = #{aid,jdbcType=VARCHAR}
+  			</otherwise>
+  		</choose>
+		
   </select>
 </mapper>

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

@@ -686,7 +686,7 @@
   <select id="selectOrderCommodity" parameterType="java.lang.String" resultType="com.goafanti.common.model.TOrderDetail">
 		select
 			id,
-			order_id as orderId,
+			order_no as orderNo,
 			commodity_id as commodityId,
 			commodity_name as commodityName,
 			commodity_quantity as commodityQuantity,
@@ -697,6 +697,6 @@
 		from
 			t_order_detail
 		where
-			order_id = #{orderId,jdbcType=VARCHAR}
+			order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
 </mapper>

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

@@ -492,10 +492,14 @@ public class Achievement {
 	}
 
 	public String getOwnerPostalAddress() {
+		if (StringUtils.isEmpty(ownerPostalAddress)) {
+			return "湖南长沙";
+		}
 		return ownerPostalAddress;
 	}
 
 	public void setOwnerPostalAddress(String ownerPostalAddress) {
+		
 		this.ownerPostalAddress = ownerPostalAddress;
 	}
 

+ 5 - 1
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -11,6 +11,7 @@ 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.utils.StringUtils;
 
 public class DemandListBo {
 
@@ -317,7 +318,7 @@ public class DemandListBo {
 
 
 	public String getCountInterest() {
-		return countInterest;
+		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 
 	public void setCountInterest(String countInterest) {
@@ -341,6 +342,9 @@ public class DemandListBo {
 	}
 
 	public String getEmployerAddress() {
+		if (StringUtils.isEmpty(employerAddress)) {
+			return "湖南长沙";
+		}
 		return employerAddress;
 	}
 

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

@@ -55,7 +55,7 @@ public class ObjectInterestListBo {
 		}
 	}
 	public String getCountInterest() {
-		return countInterest;
+		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 	public void setCountInterest(String countInterest) {
 		this.countInterest = countInterest;

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

@@ -874,6 +874,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (StringUtils.isNotBlank(TokenManager.getUserId())) {
 			params.put("uid", TokenManager.getUserId());
 		}
+		//params.put("uid", "6d71349c-7bb8-4e8a-8c03-0c3f36fc66ae");
 		if (type==InterestType.POLICY.getCode()) {
 			Pagination<ObjectInterestListBo> p=(Pagination<ObjectInterestListBo>) findPage("findAppNewsInterestByPage", "findAppNewsInterestCount", params, pNo, pSize);
 			List<ObjectInterestListBo> l=(List<ObjectInterestListBo>) p.getList();
@@ -919,7 +920,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			List<ObjectInterestListBo> l=(List<ObjectInterestListBo>) p.getList();
 			for (ObjectInterestListBo o : l) {
 				int i=projectInterestMapper.countInterest(o.getId());
-				o.setCountInterest(String.valueOf(i));
+				o.setCountInterest(String.valueOf(i));	
 				o.setType(type);
 			}
 			return p;

+ 3 - 5
src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java

@@ -183,8 +183,6 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 					}
 				}
 			}
-			if(producerTarget.size()>0) insertBatchProducer(producerTarget);	
-			//推送消息
 		}else if(subject == SubjectType.YUN_YING.getTypeCode()){
 			String tmp = selectSendUser(targetMap,targetType);
 			if(tmp !=null){
@@ -211,10 +209,10 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 					}
 				}
 			}			
-			if(producerTarget.size()>0) insertBatchProducer(producerTarget);
-			//推送消息
-			if(sendTarget.size()>0) jgMessageHelper.sendSystemMessage(sendTarget);
 		}
+		if(producerTarget.size()>0) insertBatchProducer(producerTarget);
+		//推送消息
+		if(sendTarget.size()>0) jgMessageHelper.sendSystemMessage(sendTarget);
 		return 1;
 	}
 	

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

@@ -128,6 +128,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
 		
 		TOrderDetail tOrderDetail = new TOrderDetail();
+		tOrderDetail.setId(UUID.randomUUID().toString());
 		tOrderDetail.setOrderNo(orderNo);
 		tOrderDetail.setCommodityId(commodityId);
 		tOrderDetail.setCommodityName(bo.getCommodityName());
@@ -542,11 +543,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		List<TOrder> list = (List<TOrder>)data.getList();
 		C2BOrderDetailBo bo = null;
 		List<C2BOrderDetailBo> boList = new ArrayList<C2BOrderDetailBo>(); 
-		List<CommodityDetailBo> commoditys = new ArrayList<CommodityDetailBo>();
+		List<CommodityDetailBo> commoditys = null;
 		CommodityDetailBo cdb = null;
 		if(list.size()>0){
 			for(TOrder t:list){
 				bo = new C2BOrderDetailBo();
+				commoditys = new ArrayList<CommodityDetailBo>();
 				bo.setOrderNo(String.valueOf(t.getOrderNo()));
 				bo.setOrderRemarks(t.getOrderRemarks());
 				bo.setOrderStatus(OrderState.getStatus(t.getOrderStatus()).getDesc());

+ 2 - 7
src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java

@@ -8,13 +8,11 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.dao.PermissionMapper;
 import com.goafanti.common.model.Permission;
 import com.goafanti.common.utils.StringUtils;
-import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.permission.service.PermissionService;
 
 @RestController
@@ -213,16 +211,13 @@ public class NewPermissionApiController extends BaseApiController {
 	
 	/**
 	 * 查询导航
-	 * @param navId 导航
+	 * @param navId 导航	
 	 * @return
 	 */
 	@RequestMapping(value = "/selectNavList",method=RequestMethod.GET)
 	public Result selectNavList(){
 		Result res = new Result();
-		if(TokenManager.hasRole(AFTConstants.SUPERADMIN))
-			res.setData(permissionService.selectNavList(null));
-		else
-			res.setData(permissionService.selectNavList(TokenManager.getAdminId()));
+		res.setData(permissionService.selectNavList());
 		return res;
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/permission/service/PermissionService.java

@@ -35,7 +35,7 @@ public interface PermissionService {
 	
 	Map<String,Object> findPermissionsAll();
 	
-	List<Navigation> selectNavList(String aid);
+	List<Navigation> selectNavList();
 
 	List<Menu> selectMenuList(String superId);
 }

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

@@ -13,6 +13,7 @@ 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;
@@ -252,13 +253,15 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 	}
 	
 	@Override
-	public List<Navigation> selectNavList(String aid){
+	public List<Navigation> selectNavList(){
+		String aid = TokenManager.hasRole(AFTConstants.SUPERADMIN) ? null : TokenManager.getAdminId();
 		return permissionMapper.selectNavList(aid);
 	}
 
 	@Override
 	public List<Menu> selectMenuList(String superId) {
-		List<SubMenu> subMenus = permissionMapper.selectMenuList(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;
@@ -269,7 +272,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 			}
 			if(menus != null && menus.size()>0){
 				for(Menu menu: menus){
-					subMenus = permissionMapper.selectMenuList(menu.getId());
+					subMenus = permissionMapper.selectMenuList(menu.getId(),aid);
 					menu.setSubMenus(subMenus);
 				}
 			}

+ 26 - 0
src/main/java/com/goafanti/portal/bo/DemandSearchListBo.java

@@ -8,6 +8,7 @@ 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.utils.StringUtils;
 
 public class DemandSearchListBo {
 	private String		id;
@@ -90,6 +91,12 @@ public class DemandSearchListBo {
 	 * 接单数
 	 */
 	private String orderCount;
+	/**
+	 * 关注数量
+	 */
+	private String countInterest;
+	
+	private String  employerAddress;
 	
 	public String getEmployerName() {
 		return employerName;
@@ -259,5 +266,24 @@ public class DemandSearchListBo {
 		this.orderCount = orderCount;
 	}
 
+	public String getCountInterest() {
+		return String.valueOf(Integer.valueOf(countInterest)+20);
+	}
+
+	public void setCountInterest(String countInterest) {
+		this.countInterest = countInterest;
+	}
+
+	public String getEmployerAddress() {
+		if (StringUtils.isEmpty(employerAddress)) {
+			return "湖南长沙";
+		}
+		return employerAddress;
+	}
+
+	public void setEmployerAddress(String employerAddress) {
+		this.employerAddress = employerAddress;
+	}
+
 	
 }

+ 1 - 1
src/main/java/com/goafanti/user/bo/UserIdentityBo.java

@@ -101,7 +101,7 @@ public class UserIdentityBo extends UserIdentity {
 	}
 
 	public String getCountInterest() {
-		return countInterest;
+		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 
 	public void setCountInterest(String countInterest) {

+ 3 - 2
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -113,13 +113,14 @@ public class UserRegisterController extends BaseController {
 			us.setIdentifyName(StringUtils.isBlank(user.getUnitName())?"":user.getUnitName());
 			us.setLvl(UserLevel.GENERAL.getCode());
 			us.setAid("0");
+			userService.insertRegister(us,user.getUnitName(),user.getUsername());
 		}
 		return res;
 	}
 	
 	
 	/**
-	 * 网站用户注册
+	 * APP用户注册
 	 * 
 	 * @param user
 	 * @return
@@ -195,7 +196,7 @@ public class UserRegisterController extends BaseController {
 			resultObj.put("password", easemobPass);
 			resultObj.put("username", easemobName);
 			resultObj.put("nickname", StringUtils.isBlank(u.getNickname()) ? "技淘用户" + u.getNumber() : u.getNickname());
-			easemobUtils.sendLater(
+			easemobUtils.send(
 					new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
 			//绑定账号
 			messageService.addJpushEasemobAccount(uuid,u.getId(),easemobName,easemobPass);		

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -73,6 +73,6 @@ easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
 easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
 easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE
 
-jiguang.appKey=36944c5628d34ff997f56dcd
-jiguang.masterSecret=cceff6a22d91c06786bfdcd3
+jiguang.appKey=dbcea43366e038073452a04e
+jiguang.masterSecret=59792298288e4f635c737def
 jiguang.pushUrl=https://api.jpush.cn/v3/push

+ 2 - 2
src/main/resources/props/config_test.properties

@@ -73,6 +73,6 @@ easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
 easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
 easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE
 
-jiguang.appKey=36944c5628d34ff997f56dcd
-jiguang.masterSecret=cceff6a22d91c06786bfdcd3
+jiguang.appKey=dbcea43366e038073452a04e
+jiguang.masterSecret=59792298288e4f635c737def
 jiguang.pushUrl=https://api.jpush.cn/v3/push

+ 4 - 7
src/main/resources/shiro_base_auth.ini

@@ -2,19 +2,17 @@
 /=anon
 /index=anon
 /login=anon
-/user/subscriberDetail=anon
-/user/subscriberDetail.html=anon
 /user/login.html=anon
 /user/login=anon
+/user/signIn.html=anon
+/user/signIn=anon
 /admin/login=anon
 /admin/login.html=anon
-/admin/set.html=admin
-/admin/index.html=admin
 /mlogin=anon
-/mregister=anon
 /signin=anon
 /managesignin=anon
 /register=anon
+/mregister=anon
 /open/**=anon
 /favicon.ico=anon
 /static/**=anon
@@ -23,8 +21,7 @@
 /api/admin/**=admin
 /api/user/partner/**=anon
 /api/user/**=login
-/admin/servicesManage/**=admin
-/admin/**=admin,permission
+/admin/**=admin
 /role/**=admin,permission
 /permission/**=admin,permission
 /**=login

+ 16 - 0
src/main/webapp/WEB-INF/views/admin/servicesManage/projectOrder.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>项目单管理</title>
+	<link th:href="${staticHost+'/admin/servicesManage/projectOrder.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/servicesManage/projectOrder.js'}"></script>
+	</div>
+</body>
+</html>

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

@@ -59,12 +59,12 @@
 								th:href="${basePath + '/portal/thinkTank/policyList.html'}">智政</a>
 							</li>
 						</ol></li>
-					<li><a th:href="${basePath + '/portal/financial/index.html'}">科技金融</a>
+					<!-- <li><a th:href="${basePath + '/portal/financial/index.html'}">科技金融</a>
 						<ol class="subnavigation">
 							<li><a
 								th:href="${basePath + '/portal/financial/investmentInstitution.html'}">投资机构</a>
 							</li>
-						</ol></li>
+						</ol></li> -->
 					<li><a th:href="${basePath + '/portal/aboutUs.html'}">关于公司</a>
 						<ol class="subnavigation">
 							<li><a