add medal&integral modal dao service

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/dao/MedalDao.java

@@ -0,0 +1,15 @@
+package cn.iselab.mooctest.user.dao;
+
+import cn.iselab.mooctest.user.model.Medal;
+import org.springframework.data.repository.CrudRepository;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午9:22 2018/2/12
+ * @Modified By:
+ */
+public interface MedalDao extends CrudRepository<Medal, Long>{
+
+    Medal findById(long id);
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/dao/User2IntegralDao.java

@@ -0,0 +1,20 @@
+package cn.iselab.mooctest.user.dao;
+
+import cn.iselab.mooctest.user.model.User2Integral;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.CrudRepository;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午7:25 2018/2/12
+ * @Modified By:
+ */
+@Transactional
+public interface User2IntegralDao extends CrudRepository<User2Integral, Long> ,JpaSpecificationExecutor<User2Integral> {
+
+    List<User2Integral> findByUserId(long userId);
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/dao/User2MedalDao.java

@@ -0,0 +1,20 @@
+package cn.iselab.mooctest.user.dao;
+
+import cn.iselab.mooctest.user.model.User2Medal;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.CrudRepository;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 上午11:34 2018/2/13
+ * @Modified By:
+ */
+@Transactional
+public interface User2MedalDao extends CrudRepository<User2Medal, Long> ,JpaSpecificationExecutor<User2Medal>{
+
+    List<User2Medal> findByUserId(long userId);
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/dao/UserIntegralDao.java

@@ -0,0 +1,21 @@
+package cn.iselab.mooctest.user.dao;
+
+import cn.iselab.mooctest.user.model.UserIntegral;
+import org.springframework.data.jpa.domain.Specifications;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.CrudRepository;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 上午11:40 2018/2/13
+ * @Modified By:
+ */
+@Transactional
+public interface UserIntegralDao extends CrudRepository<UserIntegral, Long> ,JpaSpecificationExecutor<UserIntegral>{
+
+    List<UserIntegral> findByUserId(long userId);
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/model/Medal.java

@@ -0,0 +1,40 @@
+package cn.iselab.mooctest.user.model;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+/**
+ * @Author ROKG
+ * @Description 勋章表
+ * @Date: Created in 下午7:34 2018/2/12
+ * @Modified By:
+ */
+@Data
+@Entity
+@Table(name = "medal")
+public class Medal {
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "description")
+    private String description;
+
+    @Column(name = "img_url")
+    private String imgUrl;
+
+    @Column(name = "type")
+    private long type;
+
+    @Column(name = "create_time")
+    private Timestamp createTime;
+
+    @Column(name = "is_deleted")
+    private boolean isDeleted;
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/model/User2Integral.java

@@ -0,0 +1,37 @@
+package cn.iselab.mooctest.user.model;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+/**
+ * @Author ROKG
+ * @Description 用户获取积分记录表
+ * @Date: Created in 下午7:24 2018/2/12
+ * @Modified By:
+ */
+@Data
+@Entity
+@Table(name = "user_2_integral")
+public class User2Integral {
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    @Column(name = "user_id")
+    private long userId;
+
+    @Column(name = "points")
+    private long points;
+
+    @Column(name = "type")
+    private long type;
+
+    @Column(name = "source")
+    private String source;
+
+    @Column(name = "create_time")
+    private Timestamp createTime;
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/model/User2Medal.java

@@ -0,0 +1,33 @@
+package cn.iselab.mooctest.user.model;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+/**
+ * @Author ROKG
+ * @Description 用户获取勋章记录表
+ * @Date: Created in 上午11:30 2018/2/13
+ * @Modified By:
+ */
+@Data
+@Entity
+@Table(name = "user_2_medal")
+public class User2Medal {
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    @Column(name = "user_id")
+    private long userId;
+
+    @Column(name = "medal_id")
+    private long medalId;
+
+    @Column(name = "create_time")
+    private Timestamp createTime;
+
+
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/model/UserIntegral.java

@@ -0,0 +1,34 @@
+package cn.iselab.mooctest.user.model;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+/**
+ * @Author ROKG
+ * @Description 用户积分总和表
+ * @Date: Created in 上午11:36 2018/2/13
+ * @Modified By:
+ */
+@Data
+@Entity
+@Table(name = "user_integral")
+public class UserIntegral {
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    @Column(name = "user_id")
+    private long userId;
+
+    @Column(name = "total")
+    private long total;
+
+    @Column(name = "enabled")
+    private boolean enabled;
+
+    @Column(name = "create_time")
+    private Timestamp createTime;
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/IntegralService.java

@@ -0,0 +1,27 @@
+package cn.iselab.mooctest.user.service;
+
+import cn.iselab.mooctest.user.model.User2Integral;
+import cn.iselab.mooctest.user.model.UserIntegral;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 上午11:42 2018/2/13
+ * @Modified By:
+ */
+public interface IntegralService {
+
+    UserIntegral findByUserId(long userId);
+
+    UserIntegral saveIntegral(UserIntegral userIntegral);
+
+    Page<UserIntegral> findPage(String keyword, Pageable pageable);
+
+    List<User2Integral> findByTime(long userId, long startTime, long endTime);
+
+    User2Integral saveUser2Integral(User2Integral user2Integral);
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/MedalService.java

@@ -0,0 +1,23 @@
+package cn.iselab.mooctest.user.service;
+
+import cn.iselab.mooctest.user.model.Medal;
+import cn.iselab.mooctest.user.model.User2Medal;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 上午11:42 2018/2/13
+ * @Modified By:
+ */
+public interface MedalService {
+
+    Medal saveMedal(Medal medal);
+
+    Medal findById(long id);
+
+    User2Medal saveUser2Medal(User2Medal medal);
+
+    Page<User2Medal> findByPage(long userId, Pageable pageable);
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/IntegralServiceImpl.java

@@ -0,0 +1,96 @@
+package cn.iselab.mooctest.user.service.impl;
+
+import cn.iselab.mooctest.user.dao.User2IntegralDao;
+import cn.iselab.mooctest.user.dao.UserIntegralDao;
+import cn.iselab.mooctest.user.model.User2Integral;
+import cn.iselab.mooctest.user.model.UserIntegral;
+import cn.iselab.mooctest.user.service.IntegralService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.domain.Specifications;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.sql.Timestamp;
+import java.util.List;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午6:36 2018/2/13
+ * @Modified By:
+ */
+@Service
+public class IntegralServiceImpl implements IntegralService {
+
+    @Autowired
+    UserIntegralDao userIntegralDao;
+
+    @Autowired
+    User2IntegralDao user2IntegralDao;
+
+    @Override
+    public UserIntegral findByUserId(long userId){
+        List<UserIntegral> userIntegrals=userIntegralDao.findByUserId(userId);
+        if(userIntegrals!=null && userIntegrals.size()>0){
+            return userIntegrals.get(0);
+        }else {
+            return null;
+        }
+    }
+
+    @Override
+    public UserIntegral saveIntegral(UserIntegral userIntegral){
+        return userIntegralDao.save(userIntegral);
+    }
+
+    @Override
+    public Page<UserIntegral> findPage(String keyword, Pageable pageable){
+        Specifications<UserIntegral> where=Specifications.where(getUserIntegral(keyword));
+        return userIntegralDao.findAll(where,pageable);
+    }
+
+    @Override
+    public List<User2Integral> findByTime(long userId, long startTime, long endTime){
+        Specifications<User2Integral> where=Specifications.where(getUser2Integral(new Timestamp(startTime),new Timestamp(endTime)));
+        return user2IntegralDao.findAll(where);
+    }
+
+    @Override
+    public User2Integral saveUser2Integral(User2Integral user2Integral){
+        return user2IntegralDao.save(user2Integral);
+    }
+
+    private Specification<User2Integral> getUser2Integral(Timestamp startTime, Timestamp endTime){
+        return new Specification<User2Integral>() {
+            @Override
+            public Predicate toPredicate(Root<User2Integral> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                Predicate p=criteriaBuilder.conjunction();
+                p.getExpressions()
+                        .add(criteriaBuilder.lessThan(root.get("createTime"),endTime));
+                p.getExpressions()
+                        .add(criteriaBuilder.greaterThan(root.get("createTime"),startTime));
+                return p;
+            }
+        };
+    }
+
+    private Specification<UserIntegral> getUserIntegral(String keyword){
+        return new Specification<UserIntegral>() {
+            @Override
+            public Predicate toPredicate(Root<UserIntegral> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                Predicate p=criteriaBuilder.conjunction();
+                if(keyword!=null){
+                    p.getExpressions().add(criteriaBuilder.like(root.get("source"), "%"+ StringUtils.trim(keyword) +"%"));
+                }
+                return p;
+            }
+        };
+    }
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/MedalServiceImpl.java

@@ -0,0 +1,68 @@
+package cn.iselab.mooctest.user.service.impl;
+
+import cn.iselab.mooctest.user.dao.MedalDao;
+import cn.iselab.mooctest.user.dao.User2MedalDao;
+import cn.iselab.mooctest.user.model.Medal;
+import cn.iselab.mooctest.user.model.User2Medal;
+import cn.iselab.mooctest.user.service.MedalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.domain.Specifications;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午6:52 2018/2/13
+ * @Modified By:
+ */
+@Service
+public class MedalServiceImpl implements MedalService {
+
+    @Autowired
+    MedalDao medalDao;
+
+    @Autowired
+    User2MedalDao user2MedalDao;
+
+    @Override
+    public Medal saveMedal(Medal medal){
+        return medalDao.save(medal);
+    }
+
+    @Override
+    public Medal findById(long id){
+        return medalDao.findById(id);
+    }
+
+    @Override
+    public User2Medal saveUser2Medal(User2Medal medal){
+        return user2MedalDao.save(medal);
+    }
+
+    @Override
+    public Page<User2Medal> findByPage(long userId, Pageable pageable){
+        Specifications<User2Medal> where=Specifications.where(getUser2Medal(userId));
+        return user2MedalDao.findAll(where, pageable);
+    }
+
+    private Specification<User2Medal> getUser2Medal(long userId){
+        return new Specification<User2Medal>() {
+            @Override
+            public Predicate toPredicate(Root<User2Medal> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                Predicate p=criteriaBuilder.conjunction();
+                p.getExpressions()
+                        .add(criteriaBuilder.equal(root.get("userId"),userId));
+                return p;
+            }
+        };
+    }
+
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/BaseController.java

@@ -0,0 +1,16 @@
+package cn.iselab.mooctest.user.web.ctrl;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 上午11:42 2018/2/13
+ * @Modified By:
+ */
+public class BaseController {
+
+    protected final Logger LOG = LoggerFactory.getLogger(getClass());
+
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/IntegralController.java

@@ -0,0 +1,13 @@
+package cn.iselab.mooctest.user.web.ctrl;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午7:28 2018/2/12
+ * @Modified By:
+ */
+@RestController
+public class IntegralController extends BaseController{
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/data/IntegralVO.java

@@ -0,0 +1,13 @@
+package cn.iselab.mooctest.user.web.data;
+
+import lombok.Data;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午7:29 2018/2/12
+ * @Modified By:
+ */
+@Data
+public class IntegralVO {
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/exception/HttpBadRequestException.java

@@ -0,0 +1,16 @@
+package cn.iselab.mooctest.user.web.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+/**
+ * @author sean
+ * @date 2017-03-19.
+ */
+@ResponseStatus(code = HttpStatus.BAD_REQUEST)
+public class HttpBadRequestException extends RuntimeException {
+
+    public HttpBadRequestException(String message) {
+        super(message);
+    }
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/IntegralLogic.java

@@ -0,0 +1,10 @@
+package cn.iselab.mooctest.user.web.logic;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午11:05 2018/2/13
+ * @Modified By:
+ */
+public interface IntegralLogic {
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/MedalLogic.java

@@ -0,0 +1,10 @@
+package cn.iselab.mooctest.user.web.logic;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午11:05 2018/2/13
+ * @Modified By:
+ */
+public interface MedalLogic {
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/impl/IntegralLogicImpl.java

@@ -0,0 +1,19 @@
+package cn.iselab.mooctest.user.web.logic.impl;
+
+import cn.iselab.mooctest.user.service.IntegralService;
+import cn.iselab.mooctest.user.web.logic.IntegralLogic;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午11:05 2018/2/13
+ * @Modified By:
+ */
+@Service
+public class IntegralLogicImpl implements IntegralLogic {
+
+    @Autowired
+    IntegralService integralService;
+}

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/impl/MedalLogicImpl.java

@@ -0,0 +1,19 @@
+package cn.iselab.mooctest.user.web.logic.impl;
+
+import cn.iselab.mooctest.user.service.MedalService;
+import cn.iselab.mooctest.user.web.logic.MedalLogic;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午11:05 2018/2/13
+ * @Modified By:
+ */
+@Service
+public class MedalLogicImpl implements MedalLogic {
+
+    @Autowired
+    MedalService medalService;
+}

mooctest-user-server/src/test/java/cn/iselab/mooctest/user/service/impl/IntegralServiceImplTest.java

@@ -0,0 +1,39 @@
+package cn.iselab.mooctest.user.service.impl;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午11:03 2018/2/13
+ * @Modified By:
+ */
+public class IntegralServiceImplTest {
+    @Before
+    public void setUp() throws Exception {
+    }
+
+    @Test
+    public void findByUserId() throws Exception {
+    }
+
+    @Test
+    public void saveIntegral() throws Exception {
+    }
+
+    @Test
+    public void findPage() throws Exception {
+    }
+
+    @Test
+    public void findByTime() throws Exception {
+    }
+
+    @Test
+    public void saveUser2Integral() throws Exception {
+    }
+
+}

mooctest-user-server/src/test/java/cn/iselab/mooctest/user/service/impl/MedalServiceImplTest.java

@@ -0,0 +1,35 @@
+package cn.iselab.mooctest.user.service.impl;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午11:04 2018/2/13
+ * @Modified By:
+ */
+public class MedalServiceImplTest {
+    @Before
+    public void setUp() throws Exception {
+    }
+
+    @Test
+    public void saveMedal() throws Exception {
+    }
+
+    @Test
+    public void findById() throws Exception {
+    }
+
+    @Test
+    public void saveUser2Medal() throws Exception {
+    }
+
+    @Test
+    public void findByPage() throws Exception {
+    }
+
+}

mooctest-user-server/src/test/java/cn/iselab/mooctest/user/web/ctrl/IntegralControllerTest.java

@@ -0,0 +1,18 @@
+package cn.iselab.mooctest.user.web.ctrl;
+
+import org.junit.Before;
+
+import static org.junit.Assert.*;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午11:04 2018/2/13
+ * @Modified By:
+ */
+public class IntegralControllerTest {
+    @Before
+    public void setUp() throws Exception {
+    }
+
+}

mooctest-user-server/src/test/java/cn/iselab/mooctest/user/web/logic/impl/IntegralLogicImplTest.java

@@ -0,0 +1,18 @@
+package cn.iselab.mooctest.user.web.logic.impl;
+
+import org.junit.Before;
+
+import static org.junit.Assert.*;
+
+/**
+ * @Author ROKG
+ * @Description
+ * @Date: Created in 下午11:07 2018/2/13
+ * @Modified By:
+ */
+public class IntegralLogicImplTest {
+    @Before
+    public void setUp() throws Exception {
+    }
+
+}