diff --git a/zheng-cms/pom.xml b/zheng-cms/pom.xml index dd8658ce..036f4cbc 100644 --- a/zheng-cms/pom.xml +++ b/zheng-cms/pom.xml @@ -22,7 +22,6 @@ zheng-cms-dao zheng-cms-rpc-api zheng-cms-rpc-service - zheng-cms-service zheng-cms-web zheng-cms-job zheng-cms-search @@ -43,12 +42,6 @@ ${project.version} jar - - com.zheng - zheng-cms-service - ${project.version} - jar - junit junit diff --git a/zheng-cms/zheng-cms-job/pom.xml b/zheng-cms/zheng-cms-job/pom.xml index 59673895..1dbebbeb 100644 --- a/zheng-cms/zheng-cms-job/pom.xml +++ b/zheng-cms/zheng-cms-job/pom.xml @@ -17,7 +17,8 @@ com.zheng - zheng-cms-service + zheng-cms-rpc-api + 1.0.0 junit diff --git a/zheng-cms/zheng-cms-search/pom.xml b/zheng-cms/zheng-cms-search/pom.xml index 610de05e..5298d5ef 100644 --- a/zheng-cms/zheng-cms-search/pom.xml +++ b/zheng-cms/zheng-cms-search/pom.xml @@ -17,7 +17,8 @@ com.zheng - zheng-cms-service + zheng-cms-rpc-api + 1.0.0 junit diff --git a/zheng-cms/zheng-cms-service/pom.xml b/zheng-cms/zheng-cms-service/pom.xml deleted file mode 100644 index d35a99a5..00000000 --- a/zheng-cms/zheng-cms-service/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - 4.0.0 - - - com.zheng - zheng-cms - 1.0.0 - - - zheng-cms-service - jar - - zheng-cms-service - http://www.zhangshuzheng.cn - - - UTF-8 - - - - - com.zheng - zheng-cms-dao - - - junit - junit - - - javax.servlet - servlet-api - - - - - zheng-cms-service - - - src/main/java - - **/*.xml - - true - - - src/main/resources - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.18.1 - - true - true - - - - - diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/CmsArticleVOMapper.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/CmsArticleVOMapper.java deleted file mode 100644 index 2af3d93a..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/CmsArticleVOMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zheng.cms.dao.mapper; - -public interface CmsArticleVOMapper { - - int up(Integer articleId); - - int down(Integer articleId); - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/CmsArticleVOMapper.xml b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/CmsArticleVOMapper.xml deleted file mode 100644 index 605d2eff..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/CmsArticleVOMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/CmsCategoryVOMapper.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/CmsCategoryVOMapper.java deleted file mode 100644 index 52d30d90..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/CmsCategoryVOMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zheng.cms.dao.mapper; - -public interface CmsCategoryVOMapper { - - int up(Integer articleId); - - int down(Integer articleId); - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/CmsTagVOMapper.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/CmsTagVOMapper.java deleted file mode 100644 index 2045516d..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/CmsTagVOMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.zheng.cms.dao.mapper; - -public interface CmsTagVOMapper { - - int up(Integer articleId); - - int down(Integer articleId); - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/UserVOMapper.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/UserVOMapper.java deleted file mode 100644 index db1d936e..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/UserVOMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.zheng.cms.dao.mapper; - -import org.springframework.stereotype.Repository; - -import com.zheng.cms.dao.model.UserVO; - -/** - * 用户mapper - * @author shuzheng - * @date 2016年7月6日 下午6:05:54 - */ -@Repository -public interface UserVOMapper extends CmsUserMapper { - - UserVO selectUserWithBook(int id); - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/UserVOMapper.xml b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/UserVOMapper.xml deleted file mode 100644 index 17e51cfc..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/mapper/UserVOMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/model/UserVO.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/model/UserVO.java deleted file mode 100644 index 0a4d910a..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/dao/model/UserVO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.zheng.cms.dao.model; - -import java.util.List; - -/** - * 用户VO - * @author shuzheng - * @date 2016年7月6日 下午6:06:36 - */ -public class UserVO extends CmsUser { - - private List books; - - public List getBooks() { - return books; - } - - public void setBooks(List books) { - this.books = books; - } -} diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/BaseService.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/BaseService.java deleted file mode 100644 index cccbbf19..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/BaseService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zheng.cms.service; - -/** - * baseService接口 - * @author shuzheng - * @date 2016年7月7日 上午9:58:23 - */ -public interface BaseService { - - /** - * 获取基本操作mapper - * @return - */ - Mapper getMapper(); - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/CmsArticleService.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/CmsArticleService.java deleted file mode 100644 index dee03758..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/CmsArticleService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.zheng.cms.service; - -import com.zheng.cms.dao.mapper.CmsArticleMapper; - -/** - * 文章service接口 - * Created by shuzheng on 2016/11/14. - */ -public interface CmsArticleService extends BaseService { - - // 批量删除 - int deleteByPrimaryKeys(String ids); - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/CmsCategoryService.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/CmsCategoryService.java deleted file mode 100644 index 073b8752..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/CmsCategoryService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.zheng.cms.service; - -import com.zheng.cms.dao.mapper.CmsCategoryMapper; - -/** - * 类目service接口 - * Created by shuzheng on 2016/11/14. - */ -public interface CmsCategoryService extends BaseService { - - // 批量删除 - int deleteByPrimaryKeys(String ids); - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/CmsCommentService.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/CmsCommentService.java deleted file mode 100644 index 2fb1d129..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/CmsCommentService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.zheng.cms.service; - -import com.zheng.cms.dao.mapper.CmsCommentMapper; - -/** - * 评论service接口 - * Created by shuzheng on 2016/11/14. - */ -public interface CmsCommentService extends BaseService { - - // 批量删除 - int deleteByPrimaryKeys(String ids); - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/CmsTagService.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/CmsTagService.java deleted file mode 100644 index c7a314da..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/CmsTagService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.zheng.cms.service; - -import com.zheng.cms.dao.mapper.CmsTagMapper; - -/** - * 标签service接口 - * Created by shuzheng on 2016/11/14. - */ -public interface CmsTagService extends BaseService { - - // 批量删除 - int deleteByPrimaryKeys(String ids); - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/UserService.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/UserService.java deleted file mode 100644 index 01835e1d..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/UserService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zheng.cms.service; - -import com.zheng.cms.dao.mapper.CmsUserMapper; -import com.zheng.cms.dao.model.UserVO; - -/** - * 用户service接口 - * @author shuzheng - * @date 2016年7月6日 下午6:03:45 - */ -public interface UserService extends BaseService { - - /** - * 获取带book数据的用户 - * @param id - * @return - */ - UserVO selectUserWithBook(int id); - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/CmsArticleServiceImpl.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/CmsArticleServiceImpl.java deleted file mode 100644 index 682d1cec..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/CmsArticleServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.zheng.cms.service.impl; - -import com.zheng.cms.dao.mapper.CmsArticleMapper; -import com.zheng.cms.service.CmsArticleService; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.NumberUtils; - -/** - * 文章service实现 - * Created by shuzheng on 2016/11/14. - */ -@Service -@Transactional -public class CmsArticleServiceImpl implements CmsArticleService { - - private static Logger _log = LoggerFactory.getLogger(CmsArticleServiceImpl.class); - - @Autowired - private CmsArticleMapper cmsArticleMapper; - - @Override - public CmsArticleMapper getMapper() { - return cmsArticleMapper; - } - - // 批量删除 - @Override - public int deleteByPrimaryKeys(String ids) { - if (StringUtils.isBlank(ids)) { - return 0; - } - String[] idArray = ids.split("-"); - int count = 0; - for (String id : idArray) { - if (StringUtils.isBlank(id)) { - continue; - } - try { - count += cmsArticleMapper.deleteByPrimaryKey(Integer.parseInt(id)); - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } - return count; - } -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/CmsCategoryServiceImpl.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/CmsCategoryServiceImpl.java deleted file mode 100644 index cdb827c9..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/CmsCategoryServiceImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zheng.cms.service.impl; - -import com.zheng.cms.dao.mapper.CmsCategoryMapper; -import com.zheng.cms.service.CmsCategoryService; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 类目service实现 - * Created by shuzheng on 2016/11/14. - */ -@Service -@Transactional -public class CmsCategoryServiceImpl implements CmsCategoryService { - - private static Logger _log = LoggerFactory.getLogger(CmsCategoryServiceImpl.class); - - @Autowired - private CmsCategoryMapper cmsCategoryMapper; - - @Override - public CmsCategoryMapper getMapper() { - return cmsCategoryMapper; - } - - // 批量删除 - @Override - public int deleteByPrimaryKeys(String ids) { - if (StringUtils.isBlank(ids)) { - return 0; - } - String[] idArray = ids.split("-"); - int count = 0; - for (String id : idArray) { - if (StringUtils.isBlank(id)) { - continue; - } - try { - count += cmsCategoryMapper.deleteByPrimaryKey(Integer.parseInt(id)); - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } - return count; - } -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/CmsCommentServiceImpl.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/CmsCommentServiceImpl.java deleted file mode 100644 index 4182be10..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/CmsCommentServiceImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zheng.cms.service.impl; - -import com.zheng.cms.dao.mapper.CmsCommentMapper; -import com.zheng.cms.service.CmsCommentService; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 评论service实现 - * Created by shuzheng on 2016/11/14. - */ -@Service -@Transactional -public class CmsCommentServiceImpl implements CmsCommentService { - - private static Logger _log = LoggerFactory.getLogger(CmsCommentServiceImpl.class); - - @Autowired - private CmsCommentMapper cmsCommentMapper; - - @Override - public CmsCommentMapper getMapper() { - return cmsCommentMapper; - } - - // 批量删除 - @Override - public int deleteByPrimaryKeys(String ids) { - if (StringUtils.isBlank(ids)) { - return 0; - } - String[] idArray = ids.split("-"); - int count = 0; - for (String id : idArray) { - if (StringUtils.isBlank(id)) { - continue; - } - try { - count += cmsCommentMapper.deleteByPrimaryKey(Integer.parseInt(id)); - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } - return count; - } -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/CmsTagServiceImpl.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/CmsTagServiceImpl.java deleted file mode 100644 index d490e472..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/CmsTagServiceImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zheng.cms.service.impl; - -import com.zheng.cms.dao.mapper.CmsTagMapper; -import com.zheng.cms.service.CmsTagService; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 标签service实现 - * Created by shuzheng on 2016/11/14. - */ -@Service -@Transactional -public class CmsTagServiceImpl implements CmsTagService { - - private static Logger _log = LoggerFactory.getLogger(CmsTagServiceImpl.class); - - @Autowired - private CmsTagMapper cmsTagMapper; - - @Override - public CmsTagMapper getMapper() { - return cmsTagMapper; - } - - // 批量删除 - @Override - public int deleteByPrimaryKeys(String ids) { - if (StringUtils.isBlank(ids)) { - return 0; - } - String[] idArray = ids.split("-"); - int count = 0; - for (String id : idArray) { - if (StringUtils.isBlank(id)) { - continue; - } - try { - count += cmsTagMapper.deleteByPrimaryKey(Integer.parseInt(id)); - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } - return count; - } -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/UserServiceImpl.java b/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/UserServiceImpl.java deleted file mode 100644 index 3ccbb7b1..00000000 --- a/zheng-cms/zheng-cms-service/src/main/java/com/zheng/cms/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zheng.cms.service.impl; - -import com.zheng.cms.dao.mapper.CmsUserMapper; -import com.zheng.cms.dao.mapper.UserVOMapper; -import com.zheng.cms.dao.model.UserVO; -import com.zheng.cms.service.UserService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * 用户service实现 - * @author shuzheng - * @date 2016年7月6日 下午6:07:58 - */ -@Service -@Transactional -public class UserServiceImpl implements UserService { - - private static Logger _log = LoggerFactory.getLogger(UserServiceImpl.class); - - @Autowired - private CmsUserMapper userMapper; - - @Autowired - private UserVOMapper userVOMapper; - - /** - * 获取基本操作mapper - * @return - */ - @Override - public CmsUserMapper getMapper() { - return userMapper; - } - - /** - * 获取带book数据的用户 - * @param id - * @return - */ - @Override - @Cacheable(value="ehcache") - public UserVO selectUserWithBook(int id) { - return userVOMapper.selectUserWithBook(id); - } - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-service/src/test/java/com/zheng/cms/service/UserServiceTest.java b/zheng-cms/zheng-cms-service/src/test/java/com/zheng/cms/service/UserServiceTest.java deleted file mode 100644 index 65fa9219..00000000 --- a/zheng-cms/zheng-cms-service/src/test/java/com/zheng/cms/service/UserServiceTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.zheng.cms.service; - -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.cms.dao.model.UserVO; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.transaction.TransactionConfiguration; - -/** - * 测试service - * @author shuzheng - * @date 2016年7月6日 下午6:07:43 - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration({ - "classpath:applicationContext.xml", - "classpath:applicationContext-jdbc.xml" -}) -@TransactionConfiguration(transactionManager = "transactionManager", defaultRollback = true) -public class UserServiceTest { - - @Autowired - private UserService userService; - - @Test - public void index() { - // 自定义接口调用 - UserVO userVO = userService.selectUserWithBook(1); - System.out.println(null == userVO ? "null" : userVO.getBooks().size()); - // 自动生成接口调用 - CmsUser user = userService.getMapper().selectByPrimaryKey(1); - System.out.println(null == user ? "null" :user.getNickname()); - } - -}