Parcourir la source

登录界面修改,科技成果首页最新需求、热点需求

liliang4869 il y a 7 ans
Parent
commit
7c99adce88

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

@@ -11,6 +11,7 @@ import com.goafanti.common.model.Achievement;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.demand.bo.DemandAchievementListBo;
 import com.goafanti.portal.bo.AchievementDetailBo;
+import com.goafanti.portal.bo.AchievementObject;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
 import com.goafanti.portal.bo.AchievementSearchListBo;
@@ -105,4 +106,8 @@ public interface AchievementService {
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 
+public List<AchievementObject> recentAchievements(int size,String url,String showLocation);
+
+public List<AchievementObject>getHotAchievements(int size,String url,String showLocation);
+
 }

+ 17 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -61,6 +61,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.bo.DemandAchievementListBo;
 import com.goafanti.portal.bo.AchievementDetailBo;
+import com.goafanti.portal.bo.AchievementObject;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
 import com.goafanti.portal.bo.AchievementSearchListBo;
@@ -874,4 +875,20 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.insert(a);
 	}
 
+	@Override
+	public List<AchievementObject> recentAchievements(int size, String url, String showLocation) {
+		// TODO Auto-generated method stub
+		return achievementMapper.getRecentAchievements(size,url,showLocation);
+	}
+
+	@Override
+	public List<AchievementObject> getHotAchievements(int size, String url, String showLocation) {
+		// TODO Auto-generated method stub
+		return achievementMapper.getHotAchievements( size,  url,  showLocation);
+	}
+	
+	
+	
+	
+
 }

+ 32 - 13
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -12,6 +12,7 @@ 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.AchievementListBo;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
@@ -32,6 +33,7 @@ import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.news.bo.NewsPortalList;
 import com.goafanti.news.enums.NewsType;
 import com.goafanti.news.service.NewsService;
+import com.goafanti.portal.bo.AchievementObject;
 
 @Controller
 public class WebpageController extends BaseController {
@@ -222,11 +224,7 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
-	@RequestMapping(value = "/portal/technologyTrading/achievement", method = RequestMethod.GET)
-	public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/technologyTrading/achievement");
-		return modelview;
-	}
+
 
 	@RequestMapping(value = "/portal/membership", method = RequestMethod.GET)
 	public ModelAndView membership(HttpServletRequest request, ModelAndView modelview) {
@@ -234,11 +232,7 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
-	@RequestMapping(value = "/portal/technologyTrading/demand", method = RequestMethod.GET)
-	public ModelAndView portalSearchDemand(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/technologyTrading/demand");
-		return modelview;
-	}
+
 
 	@RequestMapping(value = "/portal/search/subscriberUser", method = RequestMethod.GET)
 	public ModelAndView portalSearchSubscriberUser(HttpServletRequest request, ModelAndView modelview) {
@@ -421,7 +415,8 @@ public class WebpageController extends BaseController {
 	 * @return 
 	 * 
 	 * */
-	@RequestMapping(value = "/portal/demand")
+	//需求首页
+	@RequestMapping(value = "/portal/technologyTrading/demand")
 	public ModelAndView demand(HttpServletRequest request, ModelAndView modelview) {
 		String showLocation="web_demand_main";
 		String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
@@ -503,7 +498,8 @@ public class WebpageController extends BaseController {
 		modelview.addObject("personnelDemandList",sixMaxPersonnelDemand);
 		return modelview;
 	}
-	
+	 
+	//需求详情
 	@RequestMapping(value = "/portal/technologyTrading/demandDetail")
 	public ModelAndView  DemandDetail(HttpServletRequest request, ModelAndView modelAndView,String id, Integer type) {
 		String url=StringUtils.getDomainByHttpRequest(request);
@@ -526,6 +522,29 @@ public class WebpageController extends BaseController {
 		return modelAndView;
 	}
 	
-
+	
+	//成果首页
+	@RequestMapping(value = "/portal/technologyTrading/achievement", method = RequestMethod.GET)
+	public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {
+		String showLocation="web_achievement_main";
+		String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
+		modelview.setViewName("/portal/technologyTrading/achievement");
+		//行业
+				List<fieldGlossoryBo> industryList = userIdentityService.industryList();
+				modelview.addObject("industryList", industryList);
+
+		//最新成果
+		List<AchievementObject>recentAchievements=achievementService.recentAchievements(5,url,showLocation);
+		modelview.addObject("recentAchievements",recentAchievements);
+		for(AchievementObject achievementObject:recentAchievements) {
+			if(achievementObject.getTechnicalPictureUrl()==null || !achievementObject.getTechnicalPictureUrl().contains("."))achievementObject.setTechnicalPictureUrl(null);
+			else achievementObject.setTechnicalPictureUrl(achievementObject.getTechnicalPictureUrl().split(",")[0]);
+		}
+		
+		List<AchievementObject> hotAchievements=achievementService.getHotAchievements(6,url,showLocation);
+		modelview.addObject("hotAchievements",hotAchievements);
+		//热门关注
+		return modelview;
+	}
 
 }

+ 5 - 0
src/main/java/com/goafanti/common/dao/AchievementMapper.java

@@ -13,6 +13,7 @@ import com.goafanti.achievement.bo.AchievementUserOwnerDetailBo;
 import com.goafanti.app.bo.HomeAchievemend;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.portal.bo.AchievementDetailBo;
+import com.goafanti.portal.bo.AchievementObject;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
 import com.goafanti.portal.bo.InternationalListBo;
@@ -78,4 +79,8 @@ public interface AchievementMapper {
 
 	List<AchievementRecommended> getAppHomeRecommended();
 	
+	List<AchievementObject>getRecentAchievements(int size,String url,String showLocation);
+	
+	List<AchievementObject>getHotAchievements(int size,String url,String showLocation);
+	
 }

+ 45 - 0
src/main/java/com/goafanti/common/enums/AchievementCategory.java

@@ -0,0 +1,45 @@
+package com.goafanti.common.enums;
+
+public enum AchievementCategory {
+	Patent(0,"专利"),
+SoftwareCopyright(1,"软件著作权"),
+Project(2,"项目"),
+Copyright(3,"版权"),
+IndustryDesign(4,"工业设计"),
+Formula(5,"配方"),
+Nonstandard(6,"非标"),
+Unknow(-1,"未知类型")
+;
+	int i;
+	String name;
+	
+	AchievementCategory(int i, String name) {
+		this.i = i;
+		this.name = name;
+	}
+
+	public int getI() {
+		return i;
+	}
+
+	public void setI(int i) {
+		this.i = i;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	public static AchievementCategory find(int i)
+	{
+		for(AchievementCategory achievementCategory:values())
+		{
+			if(achievementCategory.getI()==i)return achievementCategory;
+		}
+		return Unknow;
+	}
+
+}

+ 41 - 0
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -2180,4 +2180,45 @@ order by
 	ap.show_number asc limit 0,
 	6
 </select> 	
+
+<select id="getRecentAchievements" resultType="com.goafanti.portal.bo.AchievementObject">
+ select d.name,d.id ,data_category as dataCategory,release_date as releaseDate,category,d.audit_status
+ ,fg.name as industryCategory1,fgg.name as industryCategory2,d.technical_picture_url as technicalPictureUrl
+ from achievement d 
+     left join aft.field_glossory  fg  on fg.id=d.field_a
+    left join aft.field_glossory fgg  on fgg.id=d.field_b
+  left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
+left join achievement_publish dp on dp.achievement_id=d.id and dp.publish_platform=branchInfo.id
+ where audit_status=2 and dp.achievement_id=d.id and dp.publish_platform=branchInfo.id  and instr(dp.publish_page,#{2})>0
+ order by  release_date  desc limit #{0}
+</select>
+
+<select id="getHotAchievements" resultType="com.goafanti.portal.bo.AchievementObject">
+select 
+a.name as name ,
+a.id as id,
+a.technical_picture_url as technicalPictureUrl,
+b.ct as interestCount,
+a.category
+from achievement a
+left join branch_information branchInfo 
+on INSTR(branchInfo.domain_name,#{1})>0
+left join achievement_publish ap
+ on ap.achievement_id=a.id
+left join 
+(select 
+count(0) as ct,
+achievement_id as interest_aid
+from achievement_interest
+group by
+achievement_id
+) b 
+on b.interest_aid=a.id
+where a.audit_status=2
+and ap.achievement_id=a.id
+and branchInfo.id = ap.publish_platform
+and instr(ap.publish_page,#{2})>0
+and is_hot=1
+order by ct desc limit #{0}
+</select>
 </mapper>

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

@@ -1119,7 +1119,7 @@
     left join aft.field_glossory fgg  on fgg.id=d.industry_category_b
   left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
- where audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id  and instr(dp.publish_page,#{2})
+ where audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id  and instr(dp.publish_page,#{2})>0
  order by  release_date  desc limit #{0}
   </select>
   
@@ -1127,7 +1127,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
  select d.name,picture_url as pictureUrl,d.id from demand d  
    left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
- where d.data_category=1 and info_sources=1 and d.audit_status=2  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+ where d.data_category=1 and info_sources=1 and d.audit_status=2  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
   order by  release_date  desc limit #{0}
   </select>
   
@@ -1138,7 +1138,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   from demand d  
     left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
-  where d.is_urgent=1 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+  where d.is_urgent=1 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
    order by  release_date  desc limit #{0}
   </select>
   
@@ -1148,7 +1148,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   from demand d 
       left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
-   where d.is_hot=1 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+   where d.is_hot=1 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
     order by  release_date  desc limit #{0}
   </select>
   
@@ -1156,7 +1156,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
  select name,picture_url as pictureUrl ,problem_des as problemDes ,d.id from demand d 
        left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
-  where d.demand_type=4 and d.audit_status=2 and info_sources=1  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+  where d.demand_type=4 and d.audit_status=2 and info_sources=1  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
   order by  release_date  desc limit #{0}
   </select>
   
@@ -1166,14 +1166,14 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
     left join aft.field_glossory fgg  on fgg.id=d.industry_category_b
            left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
- where d.demand_type=2 and d.audit_status=2 and info_sources=1  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+ where d.demand_type=2 and d.audit_status=2 and info_sources=1  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
  order by  release_date  desc limit #{0}
   </select>
    <select id="getFundCrowdDemand" resultType="com.goafanti.demand.bo.DemandListBo">
   select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,crowd_cost as fundForCrowd,research_type as researchType from demand d  
              left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
-  where d.demand_type=3 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+  where d.demand_type=3 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
   order by  release_date 
    desc limit #{0}
   </select>
@@ -1182,7 +1182,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,budget_cost as fundForPersonnel from demand d  
  left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
-  where d.demand_type=5 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+  where d.demand_type=5 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
   order by  release_date  desc limit #{0}
   </select>
   
@@ -1199,7 +1199,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
  from demand d
  left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
-where d.boutique=1 and  dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+where d.boutique=1 and  dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
 order by release_date desc limit #{0}
   </select>  <select id="listMyDemand" resultType="com.goafanti.portal.bo.DemandSearchListBo">
 	select

+ 90 - 0
src/main/java/com/goafanti/portal/bo/AchievementObject.java

@@ -0,0 +1,90 @@
+package com.goafanti.portal.bo;
+
+import java.sql.Date;
+
+import com.goafanti.achievement.bo.InputAchievement;
+import com.goafanti.common.enums.AchievementCategory;
+
+public class AchievementObject extends InputAchievement {
+	private String		fieldAS;
+	private String		fieldBS;
+	private String		fieldCS;
+	private String		maturityS;
+			
+	private String		transferModeS;
+	private String categoryS;
+	private String	ownerTypeS;
+	private Integer isHot;
+	private Date releaseDate;
+	private int interestCount;
+	
+	public int getInterestCount() {
+		return interestCount;
+	}
+	public void setInterestCount(int interestCount) {
+		this.interestCount = interestCount;
+	}
+	public Date getReleaseDate() {
+		return releaseDate;
+	}
+	public void setReleaseDate(Date releaseDate) {
+		this.releaseDate = releaseDate;
+	}
+	public String getFieldAS() {
+		return fieldAS;
+	}
+	public void setFieldAS(String fieldAS) {
+		this.fieldAS = fieldAS;
+	}
+	public String getFieldBS() {
+		return fieldBS;
+	}
+	public void setFieldBS(String fieldBS) {
+		this.fieldBS = fieldBS;
+	}
+	public String getFieldCS() {
+		return fieldCS;
+	}
+	public void setFieldCS(String fieldCS) {
+		this.fieldCS = fieldCS;
+	}
+	public String getMaturityS() {
+		return maturityS;
+	}
+	public void setMaturityS(String maturityS) {
+		this.maturityS = maturityS;
+	}
+	public String getTransferModeS() {
+		return transferModeS;
+	}
+	public void setTransferModeS(String transferModeS) {
+		this.transferModeS = transferModeS;
+	}
+	public String getOwnerTypeS() {
+		return ownerTypeS;
+	}
+	public void setOwnerTypeS(String ownerTypeS) {
+		this.ownerTypeS = ownerTypeS;
+	}
+	public Integer getIsHot() {
+		return isHot;
+	}
+	public void setIsHot(Integer isHot) {
+		this.isHot = isHot;
+	}
+	public String getCategoryS() {
+		return categoryS;
+	}
+	public void setCategoryS(String categoryS) {
+		this.categoryS = categoryS;
+	}
+	
+	
+	//override
+	@Override
+	public void setCategory(Integer category) {
+		// TODO Auto-generated method stub
+		super.setCategory(category);
+		setCategoryS(AchievementCategory.find(category.intValue()).getName());
+	}
+}

Fichier diff supprimé car celui-ci est trop grand
+ 800 - 204
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html


+ 4 - 3
src/main/webapp/WEB-INF/views/user/signIn.html

@@ -37,12 +37,13 @@
 							<span class="star"> * </span>
 						</div>
 						<div class="zhuce_input">
-							<span class="glyphicon glyphicon-user"></span>
+				<img th:src="${portalHost+'/img/resiger_username.jpg'}" alt=""/>
+
 							<input type="text" name="customerName" value="请输入客户名称" id="customerName" autocomplete="off"/>
 							<span class="star"> * </span>
 						</div>
 						<div class="zhuce_input">
-							<span class="glyphicon glyphicon-phone"></span>
+							<img th:src="${portalHost+'/img/resiger_photo2.jpg'}" alt=""/>
 							<input type="text" name="photo" value="请输入手机号码" id="usePhoto" autocomplete="off"/>
 							<span class="star"> * </span>
 						</div>						
@@ -70,7 +71,7 @@
 					</div>
 				</div>
 				<div class="shadow">
-					<img src="${portalHost+'/img/shadow7.png'}" alt=""/>
+					<img th:src="${portalHost+'/img/shadow7.png'}" alt=""/>
 				</div>
 			</form>
 		</div>