Antiloveg 8 lat temu
rodzic
commit
b3d753edf2

+ 105 - 0
src/main/java/com/goafanti/LectureUser/bo/LectureUserListBo.java

@@ -0,0 +1,105 @@
+package com.goafanti.LectureUser.bo;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.model.LectureUser;
+
+public class LectureUserListBo extends LectureUser {
+	private String	lectureName;
+
+	private Integer	number;
+
+	private String	mobile;
+
+	private String	username;
+
+	private String	unitName;
+
+	private Date	lectureTime;
+
+	private Date	endTime;
+
+	public String getLectureName() {
+		return lectureName;
+	}
+
+	public void setLectureName(String lectureName) {
+		this.lectureName = lectureName;
+	}
+
+	public Integer getNumber() {
+		return number;
+	}
+
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public Date getLectureTime() {
+		return lectureTime;
+	}
+
+	public void setLectureTime(Date lectureTime) {
+		this.lectureTime = lectureTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public String getLectureTimeFormattedDate() {
+		if (this.lectureTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.lectureTime, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+
+	public void setLectureTimeFormattedDate(String lectureTimeFormattedDate) {
+
+	}
+
+	public String getEndTimeFormattedDate() {
+		if (this.endTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.endTime, AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+
+	public void setEndTimeFormattedDate(String endTimeFormattedDate) {
+
+	}
+
+}

+ 8 - 2
src/main/java/com/goafanti/LectureUser/service/LectureUserService.java

@@ -2,12 +2,12 @@ package com.goafanti.LectureUser.service;
 
 import java.util.List;
 
+import com.goafanti.LectureUser.bo.LectureUserListBo;
 import com.goafanti.common.model.LectureUser;
 import com.goafanti.common.model.LectureUserKey;
+import com.goafanti.core.mybatis.page.Pagination;
 
 public interface LectureUserService {
-
-
 	void save(Long lid);
 
 	int update(LectureUser au);
@@ -16,4 +16,10 @@ public interface LectureUserService {
 
 	LectureUser selectByPrimaryKey(LectureUserKey lectureUserKey);
 
+	Pagination<LectureUserListBo> listLectureUser(String lectureName, String mobile, String username, Integer number,
+			Integer pSize, Integer pNo);
+
+	Pagination<LectureUserListBo> listLectureOrg(String lectureName, String mobile, String unitName, Integer number,
+			Integer pSize, Integer pNo);
+
 }

+ 63 - 1
src/main/java/com/goafanti/LectureUser/service/impl/LectureUserServiceImpl.java

@@ -1,19 +1,25 @@
 package com.goafanti.LectureUser.service.impl;
 
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.LectureUser.bo.LectureUserListBo;
 import com.goafanti.LectureUser.service.LectureUserService;
 import com.goafanti.common.dao.LectureUserMapper;
 import com.goafanti.common.model.LectureUser;
 import com.goafanti.common.model.LectureUserKey;
+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;
 
 @Service
-public class LectureUserServiceImpl implements LectureUserService {
+public class LectureUserServiceImpl extends BaseMybatisDao<LectureUserMapper> implements LectureUserService {
 	@Autowired
 	private LectureUserMapper lectureUserMapper;
 
@@ -46,4 +52,60 @@ public class LectureUserServiceImpl implements LectureUserService {
 	public LectureUser selectByPrimaryKey(LectureUserKey key) {
 		return lectureUserMapper.selectByPrimaryKey(key);
 	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<LectureUserListBo> listLectureUser(String lectureName, String mobile, String username,
+			Integer number, Integer pSize, Integer pNo) {
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		return (Pagination<LectureUserListBo>) findPage("findActivityUserListByPage", "findActivityUserCount",
+				disposeLectureList(lectureName, mobile, number, username, null), pNo, pSize);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<LectureUserListBo> listLectureOrg(String lectureName, String mobile, String unitName,
+			Integer number, Integer pSize, Integer pNo) {
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		return (Pagination<LectureUserListBo>) findPage("findActivityOrgListByPage", "findActivityOrgCount",
+				disposeLectureList(lectureName, mobile, number, null, unitName), pNo, pSize);
+	}
+
+	private Map<String, Object> disposeLectureList(String lectureName, String mobile, Integer number, String username,
+			String unitName) {
+		Map<String, Object> params = new HashMap<>();
+
+		if (StringUtils.isNotBlank(mobile)) {
+			params.put("mobile", mobile);
+		}
+
+		if (null != number) {
+			params.put("number", number);
+		}
+
+		if (StringUtils.isNotBlank(lectureName)) {
+			params.put("lectureName", lectureName);
+		}
+
+		if (StringUtils.isNotBlank(username)) {
+			params.put("username", username);
+		}
+
+		if (StringUtils.isNotBlank(unitName)) {
+			params.put("unitName", unitName);
+		}
+		return params;
+	}
 }

+ 1 - 2
src/main/java/com/goafanti/activityUser/controller/UserActivityUserApiController.java

@@ -11,7 +11,6 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.ActivityUser;
-import com.goafanti.common.model.ActivityUserKey;
 import com.goafanti.core.shiro.token.TokenManager;
 
 @RestController
@@ -30,7 +29,7 @@ public class UserActivityUserApiController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "活动ID"));
 			return res;
 		}
-		ActivityUser au = activityUserService.selectByPrimaryKey(new ActivityUserKey(aid, TokenManager.getUserId()));
+		ActivityUser au = activityUserService.selectByAidAndUid(aid, TokenManager.getUserId());
 		if (null == au){
 			activityUserService.save(aid);
 		} else {

+ 2 - 0
src/main/java/com/goafanti/activityUser/service/ActivityUserService.java

@@ -25,4 +25,6 @@ public interface ActivityUserService {
 
 	ActivityUser selectByPrimaryKey(ActivityUserKey key);
 
+	ActivityUser selectByAidAndUid(Long aid, String userId);
+
 }

+ 5 - 0
src/main/java/com/goafanti/activityUser/service/impl/ActivityUserServiceImpl.java

@@ -117,4 +117,9 @@ public class ActivityUserServiceImpl extends BaseMybatisDao<ActivityUserMapper>
 		return activityUserMapper.selectByPrimaryKey(key);
 	}
 
+	@Override
+	public ActivityUser selectByAidAndUid(Long aid, String uid) {
+		return activityUserMapper.selectByAidAndUid(aid, uid);
+	}
+
 }

+ 4 - 0
src/main/java/com/goafanti/common/dao/ActivityUserMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.common.model.ActivityUser;
 import com.goafanti.common.model.ActivityUserKey;
 
@@ -21,4 +23,6 @@ public interface ActivityUserMapper {
 	ActivityUser selectByUid(String uid);
 
 	int batchDeleteByPrimaryKey(List<String> id);
+
+	ActivityUser selectByAidAndUid(@Param("aid")Long aid, @Param("uid")String uid);
 }

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

@@ -212,4 +212,12 @@
 			#{item}
 	</foreach>
   </delete>
+  
+    <select id="selectByAidAndUid" resultMap="BaseResultMap" >
+    select 
+    <include refid="Base_Column_List" />
+    from activity_user
+    where aid = #{aid,jdbcType=BIGINT}
+      and uid = #{uid,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 0 - 1
src/main/webapp/WEB-INF/views/portal/activity/details.html

@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-
 <head th:replace="common::header(~{::title},~{::link})">
 	<title>活动详情</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">

+ 4 - 2
src/main/webapp/WEB-INF/views/portal/detail/achievementDetail.html

@@ -14,8 +14,10 @@
 			<div class="container">
 				<div class="lt">欢迎进入科技认知计算交易平台!</div>
 				<div class="rt">
-					<a href="/user/login.html" class="login">登录</a> <a
-						href="/user/signIn.html">注册</a> <a href="#">导航</a> <a href="#">关于我们</a>
+					<a href="/user/login.html" class="login">登录</a> 
+					<a href="/user/signIn.html">注册</a> 
+					<a href="#">导航</a> 
+					<a href="#">关于我们</a>
 					<a href="#">联系我们</a>
 				</div>
 			</div>