From abd77f6bbeca634a56480a299c37a0b933ecc71c Mon Sep 17 00:00:00 2001 From: shuzheng <469741414@qq.com> Date: Wed, 5 Apr 2017 23:20:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jms/DefaultMessageQueueListener.java | 4 - .../resources/applicationContext-activemq.xml | 84 ++-- .../applicationContext-dubbo-consumer.xml | 2 - .../zheng/cms/dao/mapper/CmsBookMapper.java | 30 -- .../zheng/cms/dao/mapper/CmsSystemMapper.java | 30 ++ .../zheng/cms/dao/mapper/CmsUserMapper.java | 36 -- .../com/zheng/cms/dao/model/CmsArticle.java | 36 ++ .../cms/dao/model/CmsArticleExample.java | 120 +++++ .../java/com/zheng/cms/dao/model/CmsBook.java | 92 ---- .../zheng/cms/dao/model/CmsBookExample.java | 413 ------------------ .../com/zheng/cms/dao/model/CmsCategory.java | 18 + .../cms/dao/model/CmsCategoryExample.java | 60 +++ .../com/zheng/cms/dao/model/CmsComment.java | 18 + .../cms/dao/model/CmsCommentExample.java | 60 +++ .../com/zheng/cms/dao/model/CmsSystem.java | 146 +++++++ ...UserExample.java => CmsSystemExample.java} | 340 +++++++------- .../java/com/zheng/cms/dao/model/CmsTag.java | 18 + .../zheng/cms/dao/model/CmsTagExample.java | 60 +++ .../java/com/zheng/cms/dao/model/CmsUser.java | 164 ------- .../job/jms/DefaultMessageQueueListener.java | 18 +- .../java/com/zheng/cms/dao/model/UserVO.java | 23 - .../rpc/api/CmsArticleCategoryService.java | 2 +- .../api/CmsArticleCategoryServiceMock.java | 2 +- .../zheng/cms/rpc/api/CmsArticleService.java | 2 +- .../cms/rpc/api/CmsArticleServiceMock.java | 2 +- .../cms/rpc/api/CmsArticleTagService.java | 2 +- .../cms/rpc/api/CmsArticleTagServiceMock.java | 2 +- .../com/zheng/cms/rpc/api/CmsBookService.java | 13 - .../zheng/cms/rpc/api/CmsBookServiceMock.java | 14 - .../zheng/cms/rpc/api/CmsCategoryService.java | 2 +- .../cms/rpc/api/CmsCategoryServiceMock.java | 2 +- .../cms/rpc/api/CmsCategoryTagService.java | 2 +- .../rpc/api/CmsCategoryTagServiceMock.java | 2 +- .../zheng/cms/rpc/api/CmsCommentService.java | 2 +- .../cms/rpc/api/CmsCommentServiceMock.java | 2 +- .../com/zheng/cms/rpc/api/CmsMenuService.java | 2 +- .../zheng/cms/rpc/api/CmsMenuServiceMock.java | 2 +- .../com/zheng/cms/rpc/api/CmsPageService.java | 2 +- .../zheng/cms/rpc/api/CmsPageServiceMock.java | 2 +- .../zheng/cms/rpc/api/CmsSettingService.java | 2 +- .../cms/rpc/api/CmsSettingServiceMock.java | 2 +- .../zheng/cms/rpc/api/CmsSystemService.java | 13 + .../cms/rpc/api/CmsSystemServiceMock.java | 14 + .../com/zheng/cms/rpc/api/CmsTagService.java | 2 +- .../zheng/cms/rpc/api/CmsTagServiceMock.java | 2 +- .../zheng/cms/rpc/api/CmsTopicService.java | 2 +- .../cms/rpc/api/CmsTopicServiceMock.java | 2 +- .../com/zheng/cms/rpc/api/CmsUserService.java | 13 - .../zheng/cms/rpc/api/CmsUserServiceMock.java | 14 - .../com/zheng/cms/rpc/api/UserService.java | 21 - .../zheng/cms/rpc/api/UserServiceMock.java | 20 - .../zheng/cms/dao/mapper/CmsArticleMapper.xml | 46 +- .../cms/dao/mapper/CmsCategoryMapper.xml | 26 +- .../zheng/cms/dao/mapper/CmsCommentMapper.xml | 27 +- ...{CmsBookMapper.xml => CmsSystemMapper.xml} | 149 ++++--- .../com/zheng/cms/dao/mapper/CmsTagMapper.xml | 23 +- .../zheng/cms/dao/mapper/CmsUserMapper.xml | 296 ------------- .../zheng/cms/rpc/mapper/UserVOMapper.java | 13 - .../com/zheng/cms/rpc/mapper/UserVOMapper.xml | 39 -- .../impl/CmsArticleCategoryServiceImpl.java | 2 +- .../service/impl/CmsArticleServiceImpl.java | 2 +- .../impl/CmsArticleTagServiceImpl.java | 2 +- .../rpc/service/impl/CmsBookServiceImpl.java | 29 -- .../service/impl/CmsCategoryServiceImpl.java | 2 +- .../impl/CmsCategoryTagServiceImpl.java | 2 +- .../service/impl/CmsCommentServiceImpl.java | 2 +- .../rpc/service/impl/CmsMenuServiceImpl.java | 2 +- .../rpc/service/impl/CmsPageServiceImpl.java | 2 +- .../service/impl/CmsSettingServiceImpl.java | 2 +- .../service/impl/CmsSystemServiceImpl.java | 29 ++ .../rpc/service/impl/CmsTagServiceImpl.java | 2 +- .../rpc/service/impl/CmsTopicServiceImpl.java | 2 +- .../rpc/service/impl/CmsUserServiceImpl.java | 29 -- .../cms/rpc/service/impl/UserServiceImpl.java | 44 -- .../applicationContext-dubbo-provider.xml | 4 - .../controller/test/ActiveMQController.java | 64 --- .../controller/test/EhCacheController.java | 103 ----- .../web/controller/test/HelloController.java | 142 ------ .../web/controller/test/RedisController.java | 83 ---- .../web/controller/test/UserController.java | 213 --------- .../web/jms/DefaultMessageQueueListener.java | 48 +- .../applicationContext-dubbo-consumer.xml | 2 - 82 files changed, 1083 insertions(+), 2286 deletions(-) delete mode 100644 zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsBookMapper.java create mode 100644 zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsSystemMapper.java delete mode 100644 zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsUserMapper.java delete mode 100644 zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsBook.java delete mode 100644 zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsBookExample.java create mode 100644 zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsSystem.java rename zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/{CmsUserExample.java => CmsSystemExample.java} (56%) delete mode 100644 zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsUser.java delete mode 100644 zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/dao/model/UserVO.java delete mode 100644 zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsBookService.java delete mode 100644 zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsBookServiceMock.java create mode 100644 zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSystemService.java create mode 100644 zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSystemServiceMock.java delete mode 100644 zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsUserService.java delete mode 100644 zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsUserServiceMock.java delete mode 100644 zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/UserService.java delete mode 100644 zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/UserServiceMock.java rename zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/{CmsBookMapper.xml => CmsSystemMapper.xml} (59%) delete mode 100644 zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsUserMapper.xml delete mode 100644 zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/UserVOMapper.java delete mode 100644 zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/UserVOMapper.xml delete mode 100644 zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsBookServiceImpl.java create mode 100644 zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsSystemServiceImpl.java delete mode 100644 zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsUserServiceImpl.java delete mode 100644 zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/UserServiceImpl.java delete mode 100644 zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/ActiveMQController.java delete mode 100644 zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/EhCacheController.java delete mode 100644 zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/HelloController.java delete mode 100644 zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/RedisController.java delete mode 100644 zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/UserController.java diff --git a/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/jms/DefaultMessageQueueListener.java b/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/jms/DefaultMessageQueueListener.java index 914b725c..eaa9b2fc 100644 --- a/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/jms/DefaultMessageQueueListener.java +++ b/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/jms/DefaultMessageQueueListener.java @@ -1,6 +1,5 @@ package com.zheng.cms.admin.jms; -import com.zheng.cms.rpc.api.UserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -21,9 +20,6 @@ public class DefaultMessageQueueListener implements MessageListener { @Autowired ThreadPoolTaskExecutor threadPoolTaskExecutor; - @Autowired - UserService userService; - public void onMessage(final Message message) { // 使用线程池多线程处理 threadPoolTaskExecutor.execute(new Runnable() { diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-activemq.xml b/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-activemq.xml index 8d80f3de..fe06fa0e 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-activemq.xml +++ b/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-activemq.xml @@ -1,53 +1,47 @@ - + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml index 61e34aba..84486560 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml @@ -31,8 +31,6 @@ - - diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsBookMapper.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsBookMapper.java deleted file mode 100644 index c1d16442..00000000 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsBookMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zheng.cms.dao.mapper; - -import com.zheng.cms.dao.model.CmsBook; -import com.zheng.cms.dao.model.CmsBookExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface CmsBookMapper { - long countByExample(CmsBookExample example); - - int deleteByExample(CmsBookExample example); - - int deleteByPrimaryKey(Integer bookId); - - int insert(CmsBook record); - - int insertSelective(CmsBook record); - - List selectByExample(CmsBookExample example); - - CmsBook selectByPrimaryKey(Integer bookId); - - int updateByExampleSelective(@Param("record") CmsBook record, @Param("example") CmsBookExample example); - - int updateByExample(@Param("record") CmsBook record, @Param("example") CmsBookExample example); - - int updateByPrimaryKeySelective(CmsBook record); - - int updateByPrimaryKey(CmsBook record); -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsSystemMapper.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsSystemMapper.java new file mode 100644 index 00000000..0ee6d65c --- /dev/null +++ b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsSystemMapper.java @@ -0,0 +1,30 @@ +package com.zheng.cms.dao.mapper; + +import com.zheng.cms.dao.model.CmsSystem; +import com.zheng.cms.dao.model.CmsSystemExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface CmsSystemMapper { + long countByExample(CmsSystemExample example); + + int deleteByExample(CmsSystemExample example); + + int deleteByPrimaryKey(Integer systemId); + + int insert(CmsSystem record); + + int insertSelective(CmsSystem record); + + List selectByExample(CmsSystemExample example); + + CmsSystem selectByPrimaryKey(Integer systemId); + + int updateByExampleSelective(@Param("record") CmsSystem record, @Param("example") CmsSystemExample example); + + int updateByExample(@Param("record") CmsSystem record, @Param("example") CmsSystemExample example); + + int updateByPrimaryKeySelective(CmsSystem record); + + int updateByPrimaryKey(CmsSystem record); +} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsUserMapper.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsUserMapper.java deleted file mode 100644 index 8dadfdca..00000000 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsUserMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zheng.cms.dao.mapper; - -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.cms.dao.model.CmsUserExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface CmsUserMapper { - long countByExample(CmsUserExample example); - - int deleteByExample(CmsUserExample example); - - int deleteByPrimaryKey(Integer userId); - - int insert(CmsUser record); - - int insertSelective(CmsUser record); - - List selectByExampleWithBLOBs(CmsUserExample example); - - List selectByExample(CmsUserExample example); - - CmsUser selectByPrimaryKey(Integer userId); - - int updateByExampleSelective(@Param("record") CmsUser record, @Param("example") CmsUserExample example); - - int updateByExampleWithBLOBs(@Param("record") CmsUser record, @Param("example") CmsUserExample example); - - int updateByExample(@Param("record") CmsUser record, @Param("example") CmsUserExample example); - - int updateByPrimaryKeySelective(CmsUser record); - - int updateByPrimaryKeyWithBLOBs(CmsUser record); - - int updateByPrimaryKey(CmsUser record); -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticle.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticle.java index dcb19c09..58b11aa0 100644 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticle.java +++ b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticle.java @@ -94,6 +94,20 @@ public class CmsArticle implements Serializable { */ private Integer readnumber; + /** + * 置顶等级 + * + * @mbg.generated + */ + private Integer top; + + /** + * 所属系统 + * + * @mbg.generated + */ + private Integer systemId; + /** * 创建时间 * @@ -221,6 +235,22 @@ public class CmsArticle implements Serializable { this.readnumber = readnumber; } + public Integer getTop() { + return top; + } + + public void setTop(Integer top) { + this.top = top; + } + + public Integer getSystemId() { + return systemId; + } + + public void setSystemId(Integer systemId) { + this.systemId = systemId; + } + public Long getCtime() { return ctime; } @@ -264,6 +294,8 @@ public class CmsArticle implements Serializable { sb.append(", status=").append(status); sb.append(", userId=").append(userId); sb.append(", readnumber=").append(readnumber); + sb.append(", top=").append(top); + sb.append(", systemId=").append(systemId); sb.append(", ctime=").append(ctime); sb.append(", orders=").append(orders); sb.append(", content=").append(content); @@ -296,6 +328,8 @@ public class CmsArticle implements Serializable { && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getReadnumber() == null ? other.getReadnumber() == null : this.getReadnumber().equals(other.getReadnumber())) + && (this.getTop() == null ? other.getTop() == null : this.getTop().equals(other.getTop())) + && (this.getSystemId() == null ? other.getSystemId() == null : this.getSystemId().equals(other.getSystemId())) && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime())) && (this.getOrders() == null ? other.getOrders() == null : this.getOrders().equals(other.getOrders())) && (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent())); @@ -318,6 +352,8 @@ public class CmsArticle implements Serializable { result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getReadnumber() == null) ? 0 : getReadnumber().hashCode()); + result = prime * result + ((getTop() == null) ? 0 : getTop().hashCode()); + result = prime * result + ((getSystemId() == null) ? 0 : getSystemId().hashCode()); result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode()); result = prime * result + ((getOrders() == null) ? 0 : getOrders().hashCode()); result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode()); diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleExample.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleExample.java index 15968cbd..10f6f6b1 100644 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleExample.java +++ b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleExample.java @@ -967,6 +967,126 @@ public class CmsArticleExample implements Serializable { return (Criteria) this; } + public Criteria andTopIsNull() { + addCriterion("top is null"); + return (Criteria) this; + } + + public Criteria andTopIsNotNull() { + addCriterion("top is not null"); + return (Criteria) this; + } + + public Criteria andTopEqualTo(Integer value) { + addCriterion("top =", value, "top"); + return (Criteria) this; + } + + public Criteria andTopNotEqualTo(Integer value) { + addCriterion("top <>", value, "top"); + return (Criteria) this; + } + + public Criteria andTopGreaterThan(Integer value) { + addCriterion("top >", value, "top"); + return (Criteria) this; + } + + public Criteria andTopGreaterThanOrEqualTo(Integer value) { + addCriterion("top >=", value, "top"); + return (Criteria) this; + } + + public Criteria andTopLessThan(Integer value) { + addCriterion("top <", value, "top"); + return (Criteria) this; + } + + public Criteria andTopLessThanOrEqualTo(Integer value) { + addCriterion("top <=", value, "top"); + return (Criteria) this; + } + + public Criteria andTopIn(List values) { + addCriterion("top in", values, "top"); + return (Criteria) this; + } + + public Criteria andTopNotIn(List values) { + addCriterion("top not in", values, "top"); + return (Criteria) this; + } + + public Criteria andTopBetween(Integer value1, Integer value2) { + addCriterion("top between", value1, value2, "top"); + return (Criteria) this; + } + + public Criteria andTopNotBetween(Integer value1, Integer value2) { + addCriterion("top not between", value1, value2, "top"); + return (Criteria) this; + } + + public Criteria andSystemIdIsNull() { + addCriterion("system_id is null"); + return (Criteria) this; + } + + public Criteria andSystemIdIsNotNull() { + addCriterion("system_id is not null"); + return (Criteria) this; + } + + public Criteria andSystemIdEqualTo(Integer value) { + addCriterion("system_id =", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdNotEqualTo(Integer value) { + addCriterion("system_id <>", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdGreaterThan(Integer value) { + addCriterion("system_id >", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdGreaterThanOrEqualTo(Integer value) { + addCriterion("system_id >=", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdLessThan(Integer value) { + addCriterion("system_id <", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdLessThanOrEqualTo(Integer value) { + addCriterion("system_id <=", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdIn(List values) { + addCriterion("system_id in", values, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdNotIn(List values) { + addCriterion("system_id not in", values, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdBetween(Integer value1, Integer value2) { + addCriterion("system_id between", value1, value2, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdNotBetween(Integer value1, Integer value2) { + addCriterion("system_id not between", value1, value2, "systemId"); + return (Criteria) this; + } + public Criteria andCtimeIsNull() { addCriterion("ctime is null"); return (Criteria) this; diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsBook.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsBook.java deleted file mode 100644 index c637155c..00000000 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsBook.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.zheng.cms.dao.model; - -import java.io.Serializable; - -public class CmsBook implements Serializable { - /** - * 编号 - * - * @mbg.generated - */ - private Integer bookId; - - /** - * 用户编号 - * - * @mbg.generated - */ - private Integer userId; - - /** - * 书名 - * - * @mbg.generated - */ - private String name; - - private static final long serialVersionUID = 1L; - - public Integer getBookId() { - return bookId; - } - - public void setBookId(Integer bookId) { - this.bookId = bookId; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", bookId=").append(bookId); - sb.append(", userId=").append(userId); - sb.append(", name=").append(name); - sb.append("]"); - return sb.toString(); - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - CmsBook other = (CmsBook) that; - return (this.getBookId() == null ? other.getBookId() == null : this.getBookId().equals(other.getBookId())) - && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) - && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getBookId() == null) ? 0 : getBookId().hashCode()); - result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); - result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); - return result; - } -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsBookExample.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsBookExample.java deleted file mode 100644 index 0f3bea9a..00000000 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsBookExample.java +++ /dev/null @@ -1,413 +0,0 @@ -package com.zheng.cms.dao.model; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -public class CmsBookExample implements Serializable { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private static final long serialVersionUID = 1L; - - private Integer limit; - - private Integer offset; - - public CmsBookExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria implements Serializable { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andBookIdIsNull() { - addCriterion("book_id is null"); - return (Criteria) this; - } - - public Criteria andBookIdIsNotNull() { - addCriterion("book_id is not null"); - return (Criteria) this; - } - - public Criteria andBookIdEqualTo(Integer value) { - addCriterion("book_id =", value, "bookId"); - return (Criteria) this; - } - - public Criteria andBookIdNotEqualTo(Integer value) { - addCriterion("book_id <>", value, "bookId"); - return (Criteria) this; - } - - public Criteria andBookIdGreaterThan(Integer value) { - addCriterion("book_id >", value, "bookId"); - return (Criteria) this; - } - - public Criteria andBookIdGreaterThanOrEqualTo(Integer value) { - addCriterion("book_id >=", value, "bookId"); - return (Criteria) this; - } - - public Criteria andBookIdLessThan(Integer value) { - addCriterion("book_id <", value, "bookId"); - return (Criteria) this; - } - - public Criteria andBookIdLessThanOrEqualTo(Integer value) { - addCriterion("book_id <=", value, "bookId"); - return (Criteria) this; - } - - public Criteria andBookIdIn(List values) { - addCriterion("book_id in", values, "bookId"); - return (Criteria) this; - } - - public Criteria andBookIdNotIn(List values) { - addCriterion("book_id not in", values, "bookId"); - return (Criteria) this; - } - - public Criteria andBookIdBetween(Integer value1, Integer value2) { - addCriterion("book_id between", value1, value2, "bookId"); - return (Criteria) this; - } - - public Criteria andBookIdNotBetween(Integer value1, Integer value2) { - addCriterion("book_id not between", value1, value2, "bookId"); - return (Criteria) this; - } - - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); - return (Criteria) this; - } - - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); - return (Criteria) this; - } - - public Criteria andUserIdEqualTo(Integer value) { - addCriterion("user_id =", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotEqualTo(Integer value) { - addCriterion("user_id <>", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThan(Integer value) { - addCriterion("user_id >", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThanOrEqualTo(Integer value) { - addCriterion("user_id >=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThan(Integer value) { - addCriterion("user_id <", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThanOrEqualTo(Integer value) { - addCriterion("user_id <=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdBetween(Integer value1, Integer value2) { - addCriterion("user_id between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotBetween(Integer value1, Integer value2) { - addCriterion("user_id not between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria implements Serializable { - - protected Criteria() { - super(); - } - } - - public static class Criterion implements Serializable { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategory.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategory.java index c254b556..e95685e3 100644 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategory.java +++ b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategory.java @@ -59,6 +59,13 @@ public class CmsCategory implements Serializable { */ private String alias; + /** + * 所属系统 + * + * @mbg.generated + */ + private Integer systemId; + /** * 创建时间 * @@ -139,6 +146,14 @@ public class CmsCategory implements Serializable { this.alias = alias; } + public Integer getSystemId() { + return systemId; + } + + public void setSystemId(Integer systemId) { + this.systemId = systemId; + } + public Long getCtime() { return ctime; } @@ -169,6 +184,7 @@ public class CmsCategory implements Serializable { sb.append(", icon=").append(icon); sb.append(", type=").append(type); sb.append(", alias=").append(alias); + sb.append(", systemId=").append(systemId); sb.append(", ctime=").append(ctime); sb.append(", orders=").append(orders); sb.append("]"); @@ -195,6 +211,7 @@ public class CmsCategory implements Serializable { && (this.getIcon() == null ? other.getIcon() == null : this.getIcon().equals(other.getIcon())) && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) && (this.getAlias() == null ? other.getAlias() == null : this.getAlias().equals(other.getAlias())) + && (this.getSystemId() == null ? other.getSystemId() == null : this.getSystemId().equals(other.getSystemId())) && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime())) && (this.getOrders() == null ? other.getOrders() == null : this.getOrders().equals(other.getOrders())); } @@ -211,6 +228,7 @@ public class CmsCategory implements Serializable { result = prime * result + ((getIcon() == null) ? 0 : getIcon().hashCode()); result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getAlias() == null) ? 0 : getAlias().hashCode()); + result = prime * result + ((getSystemId() == null) ? 0 : getSystemId().hashCode()); result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode()); result = prime * result + ((getOrders() == null) ? 0 : getOrders().hashCode()); return result; diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategoryExample.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategoryExample.java index 87ef3a1c..b3df9397 100644 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategoryExample.java +++ b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategoryExample.java @@ -647,6 +647,66 @@ public class CmsCategoryExample implements Serializable { return (Criteria) this; } + public Criteria andSystemIdIsNull() { + addCriterion("system_id is null"); + return (Criteria) this; + } + + public Criteria andSystemIdIsNotNull() { + addCriterion("system_id is not null"); + return (Criteria) this; + } + + public Criteria andSystemIdEqualTo(Integer value) { + addCriterion("system_id =", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdNotEqualTo(Integer value) { + addCriterion("system_id <>", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdGreaterThan(Integer value) { + addCriterion("system_id >", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdGreaterThanOrEqualTo(Integer value) { + addCriterion("system_id >=", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdLessThan(Integer value) { + addCriterion("system_id <", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdLessThanOrEqualTo(Integer value) { + addCriterion("system_id <=", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdIn(List values) { + addCriterion("system_id in", values, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdNotIn(List values) { + addCriterion("system_id not in", values, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdBetween(Integer value1, Integer value2) { + addCriterion("system_id between", value1, value2, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdNotBetween(Integer value1, Integer value2) { + addCriterion("system_id not between", value1, value2, "systemId"); + return (Criteria) this; + } + public Criteria andCtimeIsNull() { addCriterion("ctime is null"); return (Criteria) this; diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsComment.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsComment.java index ee179e67..55bb4430 100644 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsComment.java +++ b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsComment.java @@ -52,6 +52,13 @@ public class CmsComment implements Serializable { */ private String agent; + /** + * 所属系统 + * + * @mbg.generated + */ + private Integer systemId; + /** * 创建时间 * @@ -124,6 +131,14 @@ public class CmsComment implements Serializable { this.agent = agent; } + public Integer getSystemId() { + return systemId; + } + + public void setSystemId(Integer systemId) { + this.systemId = systemId; + } + public Long getCtime() { return ctime; } @@ -153,6 +168,7 @@ public class CmsComment implements Serializable { sb.append(", status=").append(status); sb.append(", ip=").append(ip); sb.append(", agent=").append(agent); + sb.append(", systemId=").append(systemId); sb.append(", ctime=").append(ctime); sb.append(", content=").append(content); sb.append("]"); @@ -178,6 +194,7 @@ public class CmsComment implements Serializable { && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getIp() == null ? other.getIp() == null : this.getIp().equals(other.getIp())) && (this.getAgent() == null ? other.getAgent() == null : this.getAgent().equals(other.getAgent())) + && (this.getSystemId() == null ? other.getSystemId() == null : this.getSystemId().equals(other.getSystemId())) && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime())) && (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent())); } @@ -193,6 +210,7 @@ public class CmsComment implements Serializable { result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getIp() == null) ? 0 : getIp().hashCode()); result = prime * result + ((getAgent() == null) ? 0 : getAgent().hashCode()); + result = prime * result + ((getSystemId() == null) ? 0 : getSystemId().hashCode()); result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode()); result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode()); return result; diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCommentExample.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCommentExample.java index 52611f06..964dfd0d 100644 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCommentExample.java +++ b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCommentExample.java @@ -567,6 +567,66 @@ public class CmsCommentExample implements Serializable { return (Criteria) this; } + public Criteria andSystemIdIsNull() { + addCriterion("system_id is null"); + return (Criteria) this; + } + + public Criteria andSystemIdIsNotNull() { + addCriterion("system_id is not null"); + return (Criteria) this; + } + + public Criteria andSystemIdEqualTo(Integer value) { + addCriterion("system_id =", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdNotEqualTo(Integer value) { + addCriterion("system_id <>", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdGreaterThan(Integer value) { + addCriterion("system_id >", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdGreaterThanOrEqualTo(Integer value) { + addCriterion("system_id >=", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdLessThan(Integer value) { + addCriterion("system_id <", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdLessThanOrEqualTo(Integer value) { + addCriterion("system_id <=", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdIn(List values) { + addCriterion("system_id in", values, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdNotIn(List values) { + addCriterion("system_id not in", values, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdBetween(Integer value1, Integer value2) { + addCriterion("system_id between", value1, value2, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdNotBetween(Integer value1, Integer value2) { + addCriterion("system_id not between", value1, value2, "systemId"); + return (Criteria) this; + } + public Criteria andCtimeIsNull() { addCriterion("ctime is null"); return (Criteria) this; diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsSystem.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsSystem.java new file mode 100644 index 00000000..c2a7bfb7 --- /dev/null +++ b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsSystem.java @@ -0,0 +1,146 @@ +package com.zheng.cms.dao.model; + +import java.io.Serializable; + +public class CmsSystem implements Serializable { + /** + * 编号 + * + * @mbg.generated + */ + private Integer systemId; + + /** + * 系统名称 + * + * @mbg.generated + */ + private String name; + + /** + * 别名 + * + * @mbg.generated + */ + private String code; + + /** + * 描述 + * + * @mbg.generated + */ + private String description; + + /** + * 创建时间 + * + * @mbg.generated + */ + private Long ctime; + + /** + * 排序 + * + * @mbg.generated + */ + private Long orders; + + private static final long serialVersionUID = 1L; + + public Integer getSystemId() { + return systemId; + } + + public void setSystemId(Integer systemId) { + this.systemId = systemId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Long getCtime() { + return ctime; + } + + public void setCtime(Long ctime) { + this.ctime = ctime; + } + + public Long getOrders() { + return orders; + } + + public void setOrders(Long orders) { + this.orders = orders; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", systemId=").append(systemId); + sb.append(", name=").append(name); + sb.append(", code=").append(code); + sb.append(", description=").append(description); + sb.append(", ctime=").append(ctime); + sb.append(", orders=").append(orders); + sb.append("]"); + return sb.toString(); + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + CmsSystem other = (CmsSystem) that; + return (this.getSystemId() == null ? other.getSystemId() == null : this.getSystemId().equals(other.getSystemId())) + && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) + && (this.getCode() == null ? other.getCode() == null : this.getCode().equals(other.getCode())) + && (this.getDescription() == null ? other.getDescription() == null : this.getDescription().equals(other.getDescription())) + && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime())) + && (this.getOrders() == null ? other.getOrders() == null : this.getOrders().equals(other.getOrders())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getSystemId() == null) ? 0 : getSystemId().hashCode()); + result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); + result = prime * result + ((getCode() == null) ? 0 : getCode().hashCode()); + result = prime * result + ((getDescription() == null) ? 0 : getDescription().hashCode()); + result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode()); + result = prime * result + ((getOrders() == null) ? 0 : getOrders().hashCode()); + return result; + } +} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsUserExample.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsSystemExample.java similarity index 56% rename from zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsUserExample.java rename to zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsSystemExample.java index 55126d19..a981d891 100644 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsUserExample.java +++ b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsSystemExample.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class CmsUserExample implements Serializable { +public class CmsSystemExample implements Serializable { protected String orderByClause; protected boolean distinct; @@ -17,7 +17,7 @@ public class CmsUserExample implements Serializable { private Integer offset; - public CmsUserExample() { + public CmsSystemExample() { oredCriteria = new ArrayList(); } @@ -127,333 +127,273 @@ public class CmsUserExample implements Serializable { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); + public Criteria andSystemIdIsNull() { + addCriterion("system_id is null"); return (Criteria) this; } - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); + public Criteria andSystemIdIsNotNull() { + addCriterion("system_id is not null"); return (Criteria) this; } - public Criteria andUserIdEqualTo(Integer value) { - addCriterion("user_id =", value, "userId"); + public Criteria andSystemIdEqualTo(Integer value) { + addCriterion("system_id =", value, "systemId"); return (Criteria) this; } - public Criteria andUserIdNotEqualTo(Integer value) { - addCriterion("user_id <>", value, "userId"); + public Criteria andSystemIdNotEqualTo(Integer value) { + addCriterion("system_id <>", value, "systemId"); return (Criteria) this; } - public Criteria andUserIdGreaterThan(Integer value) { - addCriterion("user_id >", value, "userId"); + public Criteria andSystemIdGreaterThan(Integer value) { + addCriterion("system_id >", value, "systemId"); return (Criteria) this; } - public Criteria andUserIdGreaterThanOrEqualTo(Integer value) { - addCriterion("user_id >=", value, "userId"); + public Criteria andSystemIdGreaterThanOrEqualTo(Integer value) { + addCriterion("system_id >=", value, "systemId"); return (Criteria) this; } - public Criteria andUserIdLessThan(Integer value) { - addCriterion("user_id <", value, "userId"); + public Criteria andSystemIdLessThan(Integer value) { + addCriterion("system_id <", value, "systemId"); return (Criteria) this; } - public Criteria andUserIdLessThanOrEqualTo(Integer value) { - addCriterion("user_id <=", value, "userId"); + public Criteria andSystemIdLessThanOrEqualTo(Integer value) { + addCriterion("system_id <=", value, "systemId"); return (Criteria) this; } - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); + public Criteria andSystemIdIn(List values) { + addCriterion("system_id in", values, "systemId"); return (Criteria) this; } - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); + public Criteria andSystemIdNotIn(List values) { + addCriterion("system_id not in", values, "systemId"); return (Criteria) this; } - public Criteria andUserIdBetween(Integer value1, Integer value2) { - addCriterion("user_id between", value1, value2, "userId"); + public Criteria andSystemIdBetween(Integer value1, Integer value2) { + addCriterion("system_id between", value1, value2, "systemId"); return (Criteria) this; } - public Criteria andUserIdNotBetween(Integer value1, Integer value2) { - addCriterion("user_id not between", value1, value2, "userId"); + public Criteria andSystemIdNotBetween(Integer value1, Integer value2) { + addCriterion("system_id not between", value1, value2, "systemId"); return (Criteria) this; } - public Criteria andUsernameIsNull() { - addCriterion("username is null"); + public Criteria andNameIsNull() { + addCriterion("name is null"); return (Criteria) this; } - public Criteria andUsernameIsNotNull() { - addCriterion("username is not null"); + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); return (Criteria) this; } - public Criteria andUsernameEqualTo(String value) { - addCriterion("username =", value, "username"); + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); return (Criteria) this; } - public Criteria andUsernameNotEqualTo(String value) { - addCriterion("username <>", value, "username"); + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); return (Criteria) this; } - public Criteria andUsernameGreaterThan(String value) { - addCriterion("username >", value, "username"); + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); return (Criteria) this; } - public Criteria andUsernameGreaterThanOrEqualTo(String value) { - addCriterion("username >=", value, "username"); + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); return (Criteria) this; } - public Criteria andUsernameLessThan(String value) { - addCriterion("username <", value, "username"); + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); return (Criteria) this; } - public Criteria andUsernameLessThanOrEqualTo(String value) { - addCriterion("username <=", value, "username"); + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); return (Criteria) this; } - public Criteria andUsernameLike(String value) { - addCriterion("username like", value, "username"); + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); return (Criteria) this; } - public Criteria andUsernameNotLike(String value) { - addCriterion("username not like", value, "username"); + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); return (Criteria) this; } - public Criteria andUsernameIn(List values) { - addCriterion("username in", values, "username"); + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); return (Criteria) this; } - public Criteria andUsernameNotIn(List values) { - addCriterion("username not in", values, "username"); + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); return (Criteria) this; } - public Criteria andUsernameBetween(String value1, String value2) { - addCriterion("username between", value1, value2, "username"); + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); return (Criteria) this; } - public Criteria andUsernameNotBetween(String value1, String value2) { - addCriterion("username not between", value1, value2, "username"); + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); return (Criteria) this; } - public Criteria andPasswordIsNull() { - addCriterion("password is null"); + public Criteria andCodeIsNull() { + addCriterion("code is null"); return (Criteria) this; } - public Criteria andPasswordIsNotNull() { - addCriterion("password is not null"); + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); return (Criteria) this; } - public Criteria andPasswordEqualTo(String value) { - addCriterion("password =", value, "password"); + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); return (Criteria) this; } - public Criteria andPasswordNotEqualTo(String value) { - addCriterion("password <>", value, "password"); + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); return (Criteria) this; } - public Criteria andPasswordGreaterThan(String value) { - addCriterion("password >", value, "password"); + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); return (Criteria) this; } - public Criteria andPasswordGreaterThanOrEqualTo(String value) { - addCriterion("password >=", value, "password"); + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); return (Criteria) this; } - public Criteria andPasswordLessThan(String value) { - addCriterion("password <", value, "password"); + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); return (Criteria) this; } - public Criteria andPasswordLessThanOrEqualTo(String value) { - addCriterion("password <=", value, "password"); + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); return (Criteria) this; } - public Criteria andPasswordLike(String value) { - addCriterion("password like", value, "password"); + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); return (Criteria) this; } - public Criteria andPasswordNotLike(String value) { - addCriterion("password not like", value, "password"); + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); return (Criteria) this; } - public Criteria andPasswordIn(List values) { - addCriterion("password in", values, "password"); + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); return (Criteria) this; } - public Criteria andPasswordNotIn(List values) { - addCriterion("password not in", values, "password"); + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); return (Criteria) this; } - public Criteria andPasswordBetween(String value1, String value2) { - addCriterion("password between", value1, value2, "password"); + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); return (Criteria) this; } - public Criteria andPasswordNotBetween(String value1, String value2) { - addCriterion("password not between", value1, value2, "password"); + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); return (Criteria) this; } - public Criteria andNicknameIsNull() { - addCriterion("nickname is null"); + public Criteria andDescriptionIsNull() { + addCriterion("description is null"); return (Criteria) this; } - public Criteria andNicknameIsNotNull() { - addCriterion("nickname is not null"); + public Criteria andDescriptionIsNotNull() { + addCriterion("description is not null"); return (Criteria) this; } - public Criteria andNicknameEqualTo(String value) { - addCriterion("nickname =", value, "nickname"); + public Criteria andDescriptionEqualTo(String value) { + addCriterion("description =", value, "description"); return (Criteria) this; } - public Criteria andNicknameNotEqualTo(String value) { - addCriterion("nickname <>", value, "nickname"); + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("description <>", value, "description"); return (Criteria) this; } - public Criteria andNicknameGreaterThan(String value) { - addCriterion("nickname >", value, "nickname"); + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("description >", value, "description"); return (Criteria) this; } - public Criteria andNicknameGreaterThanOrEqualTo(String value) { - addCriterion("nickname >=", value, "nickname"); + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("description >=", value, "description"); return (Criteria) this; } - public Criteria andNicknameLessThan(String value) { - addCriterion("nickname <", value, "nickname"); + public Criteria andDescriptionLessThan(String value) { + addCriterion("description <", value, "description"); return (Criteria) this; } - public Criteria andNicknameLessThanOrEqualTo(String value) { - addCriterion("nickname <=", value, "nickname"); + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("description <=", value, "description"); return (Criteria) this; } - public Criteria andNicknameLike(String value) { - addCriterion("nickname like", value, "nickname"); + public Criteria andDescriptionLike(String value) { + addCriterion("description like", value, "description"); return (Criteria) this; } - public Criteria andNicknameNotLike(String value) { - addCriterion("nickname not like", value, "nickname"); + public Criteria andDescriptionNotLike(String value) { + addCriterion("description not like", value, "description"); return (Criteria) this; } - public Criteria andNicknameIn(List values) { - addCriterion("nickname in", values, "nickname"); + public Criteria andDescriptionIn(List values) { + addCriterion("description in", values, "description"); return (Criteria) this; } - public Criteria andNicknameNotIn(List values) { - addCriterion("nickname not in", values, "nickname"); + public Criteria andDescriptionNotIn(List values) { + addCriterion("description not in", values, "description"); return (Criteria) this; } - public Criteria andNicknameBetween(String value1, String value2) { - addCriterion("nickname between", value1, value2, "nickname"); + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("description between", value1, value2, "description"); return (Criteria) this; } - public Criteria andNicknameNotBetween(String value1, String value2) { - addCriterion("nickname not between", value1, value2, "nickname"); - return (Criteria) this; - } - - public Criteria andSexIsNull() { - addCriterion("sex is null"); - return (Criteria) this; - } - - public Criteria andSexIsNotNull() { - addCriterion("sex is not null"); - return (Criteria) this; - } - - public Criteria andSexEqualTo(Integer value) { - addCriterion("sex =", value, "sex"); - return (Criteria) this; - } - - public Criteria andSexNotEqualTo(Integer value) { - addCriterion("sex <>", value, "sex"); - return (Criteria) this; - } - - public Criteria andSexGreaterThan(Integer value) { - addCriterion("sex >", value, "sex"); - return (Criteria) this; - } - - public Criteria andSexGreaterThanOrEqualTo(Integer value) { - addCriterion("sex >=", value, "sex"); - return (Criteria) this; - } - - public Criteria andSexLessThan(Integer value) { - addCriterion("sex <", value, "sex"); - return (Criteria) this; - } - - public Criteria andSexLessThanOrEqualTo(Integer value) { - addCriterion("sex <=", value, "sex"); - return (Criteria) this; - } - - public Criteria andSexIn(List values) { - addCriterion("sex in", values, "sex"); - return (Criteria) this; - } - - public Criteria andSexNotIn(List values) { - addCriterion("sex not in", values, "sex"); - return (Criteria) this; - } - - public Criteria andSexBetween(Integer value1, Integer value2) { - addCriterion("sex between", value1, value2, "sex"); - return (Criteria) this; - } - - public Criteria andSexNotBetween(Integer value1, Integer value2) { - addCriterion("sex not between", value1, value2, "sex"); + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("description not between", value1, value2, "description"); return (Criteria) this; } @@ -516,6 +456,66 @@ public class CmsUserExample implements Serializable { addCriterion("ctime not between", value1, value2, "ctime"); return (Criteria) this; } + + public Criteria andOrdersIsNull() { + addCriterion("orders is null"); + return (Criteria) this; + } + + public Criteria andOrdersIsNotNull() { + addCriterion("orders is not null"); + return (Criteria) this; + } + + public Criteria andOrdersEqualTo(Long value) { + addCriterion("orders =", value, "orders"); + return (Criteria) this; + } + + public Criteria andOrdersNotEqualTo(Long value) { + addCriterion("orders <>", value, "orders"); + return (Criteria) this; + } + + public Criteria andOrdersGreaterThan(Long value) { + addCriterion("orders >", value, "orders"); + return (Criteria) this; + } + + public Criteria andOrdersGreaterThanOrEqualTo(Long value) { + addCriterion("orders >=", value, "orders"); + return (Criteria) this; + } + + public Criteria andOrdersLessThan(Long value) { + addCriterion("orders <", value, "orders"); + return (Criteria) this; + } + + public Criteria andOrdersLessThanOrEqualTo(Long value) { + addCriterion("orders <=", value, "orders"); + return (Criteria) this; + } + + public Criteria andOrdersIn(List values) { + addCriterion("orders in", values, "orders"); + return (Criteria) this; + } + + public Criteria andOrdersNotIn(List values) { + addCriterion("orders not in", values, "orders"); + return (Criteria) this; + } + + public Criteria andOrdersBetween(Long value1, Long value2) { + addCriterion("orders between", value1, value2, "orders"); + return (Criteria) this; + } + + public Criteria andOrdersNotBetween(Long value1, Long value2) { + addCriterion("orders not between", value1, value2, "orders"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria implements Serializable { diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsTag.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsTag.java index 4b38170b..f20ede9e 100644 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsTag.java +++ b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsTag.java @@ -45,6 +45,13 @@ public class CmsTag implements Serializable { */ private String alias; + /** + * 所属系统 + * + * @mbg.generated + */ + private Integer systemId; + /** * 创建时间 * @@ -109,6 +116,14 @@ public class CmsTag implements Serializable { this.alias = alias; } + public Integer getSystemId() { + return systemId; + } + + public void setSystemId(Integer systemId) { + this.systemId = systemId; + } + public Long getCtime() { return ctime; } @@ -137,6 +152,7 @@ public class CmsTag implements Serializable { sb.append(", icon=").append(icon); sb.append(", type=").append(type); sb.append(", alias=").append(alias); + sb.append(", systemId=").append(systemId); sb.append(", ctime=").append(ctime); sb.append(", orders=").append(orders); sb.append("]"); @@ -161,6 +177,7 @@ public class CmsTag implements Serializable { && (this.getIcon() == null ? other.getIcon() == null : this.getIcon().equals(other.getIcon())) && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) && (this.getAlias() == null ? other.getAlias() == null : this.getAlias().equals(other.getAlias())) + && (this.getSystemId() == null ? other.getSystemId() == null : this.getSystemId().equals(other.getSystemId())) && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime())) && (this.getOrders() == null ? other.getOrders() == null : this.getOrders().equals(other.getOrders())); } @@ -175,6 +192,7 @@ public class CmsTag implements Serializable { result = prime * result + ((getIcon() == null) ? 0 : getIcon().hashCode()); result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getAlias() == null) ? 0 : getAlias().hashCode()); + result = prime * result + ((getSystemId() == null) ? 0 : getSystemId().hashCode()); result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode()); result = prime * result + ((getOrders() == null) ? 0 : getOrders().hashCode()); return result; diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsTagExample.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsTagExample.java index 4986c169..f2bb0ba9 100644 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsTagExample.java +++ b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsTagExample.java @@ -527,6 +527,66 @@ public class CmsTagExample implements Serializable { return (Criteria) this; } + public Criteria andSystemIdIsNull() { + addCriterion("system_id is null"); + return (Criteria) this; + } + + public Criteria andSystemIdIsNotNull() { + addCriterion("system_id is not null"); + return (Criteria) this; + } + + public Criteria andSystemIdEqualTo(Integer value) { + addCriterion("system_id =", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdNotEqualTo(Integer value) { + addCriterion("system_id <>", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdGreaterThan(Integer value) { + addCriterion("system_id >", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdGreaterThanOrEqualTo(Integer value) { + addCriterion("system_id >=", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdLessThan(Integer value) { + addCriterion("system_id <", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdLessThanOrEqualTo(Integer value) { + addCriterion("system_id <=", value, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdIn(List values) { + addCriterion("system_id in", values, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdNotIn(List values) { + addCriterion("system_id not in", values, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdBetween(Integer value1, Integer value2) { + addCriterion("system_id between", value1, value2, "systemId"); + return (Criteria) this; + } + + public Criteria andSystemIdNotBetween(Integer value1, Integer value2) { + addCriterion("system_id not between", value1, value2, "systemId"); + return (Criteria) this; + } + public Criteria andCtimeIsNull() { addCriterion("ctime is null"); return (Criteria) this; diff --git a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsUser.java b/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsUser.java deleted file mode 100644 index 5ee9a11d..00000000 --- a/zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsUser.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.zheng.cms.dao.model; - -import java.io.Serializable; - -public class CmsUser implements Serializable { - /** - * 编号 - * - * @mbg.generated - */ - private Integer userId; - - /** - * 账号 - * - * @mbg.generated - */ - private String username; - - /** - * 密码 - * - * @mbg.generated - */ - private String password; - - /** - * 昵称 - * - * @mbg.generated - */ - private String nickname; - - /** - * 0未知,1男,2女 - * - * @mbg.generated - */ - private Integer sex; - - /** - * 创建时间 - * - * @mbg.generated - */ - private Long ctime; - - /** - * 备注 - * - * @mbg.generated - */ - private String content; - - private static final long serialVersionUID = 1L; - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getNickname() { - return nickname; - } - - public void setNickname(String nickname) { - this.nickname = nickname; - } - - public Integer getSex() { - return sex; - } - - public void setSex(Integer sex) { - this.sex = sex; - } - - public Long getCtime() { - return ctime; - } - - public void setCtime(Long ctime) { - this.ctime = ctime; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", userId=").append(userId); - sb.append(", username=").append(username); - sb.append(", password=").append(password); - sb.append(", nickname=").append(nickname); - sb.append(", sex=").append(sex); - sb.append(", ctime=").append(ctime); - sb.append(", content=").append(content); - sb.append("]"); - return sb.toString(); - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - CmsUser other = (CmsUser) that; - return (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) - && (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername())) - && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword())) - && (this.getNickname() == null ? other.getNickname() == null : this.getNickname().equals(other.getNickname())) - && (this.getSex() == null ? other.getSex() == null : this.getSex().equals(other.getSex())) - && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime())) - && (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); - result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode()); - result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode()); - result = prime * result + ((getNickname() == null) ? 0 : getNickname().hashCode()); - result = prime * result + ((getSex() == null) ? 0 : getSex().hashCode()); - result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode()); - result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode()); - return result; - } -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-job/src/main/java/com/zheng/cms/job/jms/DefaultMessageQueueListener.java b/zheng-cms/zheng-cms-job/src/main/java/com/zheng/cms/job/jms/DefaultMessageQueueListener.java index 6141a957..58b7b121 100644 --- a/zheng-cms/zheng-cms-job/src/main/java/com/zheng/cms/job/jms/DefaultMessageQueueListener.java +++ b/zheng-cms/zheng-cms-job/src/main/java/com/zheng/cms/job/jms/DefaultMessageQueueListener.java @@ -1,8 +1,5 @@ package com.zheng.cms.job.jms; -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.cms.rpc.api.UserService; -import net.sf.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -11,8 +8,6 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import javax.jms.Message; import javax.jms.MessageListener; import javax.jms.TextMessage; -import java.text.SimpleDateFormat; -import java.util.Date; /** * MQ消费者 @@ -25,9 +20,6 @@ public class DefaultMessageQueueListener implements MessageListener { @Autowired ThreadPoolTaskExecutor threadPoolTaskExecutor; - @Autowired - UserService userService; - public void onMessage(final Message message) { // 使用线程池多线程处理 threadPoolTaskExecutor.execute(new Runnable() { @@ -35,15 +27,7 @@ public class DefaultMessageQueueListener implements MessageListener { TextMessage textMessage = (TextMessage) message; try { String text = textMessage.getText(); - JSONObject json = JSONObject.fromObject(text); - CmsUser user = (CmsUser) JSONObject.toBean(json, CmsUser.class); - if (user.getUsername().equals("1")) { - _log.info("消费开始时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(System.currentTimeMillis()))); - } - if (user.getUsername().equals("1000")) { - _log.info("消费结束时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(System.currentTimeMillis()))); - } - userService.insertSelective(user); + _log.info("消费：{}", text); } catch (Exception e) { e.printStackTrace(); } diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/dao/model/UserVO.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/dao/model/UserVO.java deleted file mode 100644 index 501c5060..00000000 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/dao/model/UserVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.zheng.cms.dao.model; - -import java.io.Serializable; -import java.util.List; - -/** - * 用户VO - * Created by shuzheng on 2016/11/14. - */ -public class UserVO extends CmsUser implements Serializable { - - private static final long serialVersionUID = 1L; - - private List books; - - public List getBooks() { - return books; - } - - public void setBooks(List books) { - this.books = books; - } -} diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleCategoryService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleCategoryService.java index 41e1cb6f..fde09c1b 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleCategoryService.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleCategoryService.java @@ -6,7 +6,7 @@ import com.zheng.cms.dao.model.CmsArticleCategoryExample; /** * CmsArticleCategoryService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public interface CmsArticleCategoryService extends BaseService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleCategoryServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleCategoryServiceMock.java index b5947af1..1829f20c 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleCategoryServiceMock.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleCategoryServiceMock.java @@ -7,7 +7,7 @@ import com.zheng.cms.dao.model.CmsArticleCategoryExample; /** * 降级实现CmsArticleCategoryService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public class CmsArticleCategoryServiceMock extends BaseServiceMock implements CmsArticleCategoryService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleService.java index c9b84557..c958dc89 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleService.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleService.java @@ -6,7 +6,7 @@ import com.zheng.cms.dao.model.CmsArticleExample; /** * CmsArticleService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public interface CmsArticleService extends BaseService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleServiceMock.java index 8781a2fe..26f79e3b 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleServiceMock.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleServiceMock.java @@ -7,7 +7,7 @@ import com.zheng.cms.dao.model.CmsArticleExample; /** * 降级实现CmsArticleService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public class CmsArticleServiceMock extends BaseServiceMock implements CmsArticleService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleTagService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleTagService.java index 2358c933..2f9f73f7 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleTagService.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleTagService.java @@ -6,7 +6,7 @@ import com.zheng.cms.dao.model.CmsArticleTagExample; /** * CmsArticleTagService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public interface CmsArticleTagService extends BaseService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleTagServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleTagServiceMock.java index 767eadf6..4bd0897d 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleTagServiceMock.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsArticleTagServiceMock.java @@ -7,7 +7,7 @@ import com.zheng.cms.dao.model.CmsArticleTagExample; /** * 降级实现CmsArticleTagService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public class CmsArticleTagServiceMock extends BaseServiceMock implements CmsArticleTagService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsBookService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsBookService.java deleted file mode 100644 index 0e8d3e0a..00000000 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsBookService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.zheng.cms.rpc.api; - -import com.zheng.common.base.BaseService; -import com.zheng.cms.dao.model.CmsBook; -import com.zheng.cms.dao.model.CmsBookExample; - -/** -* CmsBookService接口 -* Created by shuzheng on 2017/3/20. -*/ -public interface CmsBookService extends BaseService { - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsBookServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsBookServiceMock.java deleted file mode 100644 index b19914c7..00000000 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsBookServiceMock.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.zheng.cms.rpc.api; - -import com.zheng.common.base.BaseServiceMock; -import com.zheng.cms.dao.mapper.CmsBookMapper; -import com.zheng.cms.dao.model.CmsBook; -import com.zheng.cms.dao.model.CmsBookExample; - -/** -* 降级实现CmsBookService接口 -* Created by shuzheng on 2017/3/20. -*/ -public class CmsBookServiceMock extends BaseServiceMock implements CmsBookService { - -} diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryService.java index ba4e157d..c3331f94 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryService.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryService.java @@ -6,7 +6,7 @@ import com.zheng.cms.dao.model.CmsCategoryExample; /** * CmsCategoryService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public interface CmsCategoryService extends BaseService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryServiceMock.java index 20b85c8a..0af669bf 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryServiceMock.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryServiceMock.java @@ -7,7 +7,7 @@ import com.zheng.cms.dao.model.CmsCategoryExample; /** * 降级实现CmsCategoryService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public class CmsCategoryServiceMock extends BaseServiceMock implements CmsCategoryService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryTagService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryTagService.java index b2318820..c35d0863 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryTagService.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryTagService.java @@ -6,7 +6,7 @@ import com.zheng.cms.dao.model.CmsCategoryTagExample; /** * CmsCategoryTagService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public interface CmsCategoryTagService extends BaseService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryTagServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryTagServiceMock.java index a5888c56..de77f48e 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryTagServiceMock.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCategoryTagServiceMock.java @@ -7,7 +7,7 @@ import com.zheng.cms.dao.model.CmsCategoryTagExample; /** * 降级实现CmsCategoryTagService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public class CmsCategoryTagServiceMock extends BaseServiceMock implements CmsCategoryTagService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCommentService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCommentService.java index de153f47..ac73ec0d 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCommentService.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCommentService.java @@ -6,7 +6,7 @@ import com.zheng.cms.dao.model.CmsCommentExample; /** * CmsCommentService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public interface CmsCommentService extends BaseService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCommentServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCommentServiceMock.java index bd44bd3c..8c84302a 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCommentServiceMock.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsCommentServiceMock.java @@ -7,7 +7,7 @@ import com.zheng.cms.dao.model.CmsCommentExample; /** * 降级实现CmsCommentService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public class CmsCommentServiceMock extends BaseServiceMock implements CmsCommentService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsMenuService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsMenuService.java index 11f05a62..62419756 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsMenuService.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsMenuService.java @@ -6,7 +6,7 @@ import com.zheng.cms.dao.model.CmsMenuExample; /** * CmsMenuService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public interface CmsMenuService extends BaseService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsMenuServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsMenuServiceMock.java index 83b9b2c1..dbc6c97d 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsMenuServiceMock.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsMenuServiceMock.java @@ -7,7 +7,7 @@ import com.zheng.cms.dao.model.CmsMenuExample; /** * 降级实现CmsMenuService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public class CmsMenuServiceMock extends BaseServiceMock implements CmsMenuService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsPageService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsPageService.java index b67433b1..53c63de0 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsPageService.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsPageService.java @@ -6,7 +6,7 @@ import com.zheng.cms.dao.model.CmsPageExample; /** * CmsPageService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public interface CmsPageService extends BaseService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsPageServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsPageServiceMock.java index 0a75d81c..80691173 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsPageServiceMock.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsPageServiceMock.java @@ -7,7 +7,7 @@ import com.zheng.cms.dao.model.CmsPageExample; /** * 降级实现CmsPageService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public class CmsPageServiceMock extends BaseServiceMock implements CmsPageService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSettingService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSettingService.java index f17ef2a0..fda8ae80 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSettingService.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSettingService.java @@ -6,7 +6,7 @@ import com.zheng.cms.dao.model.CmsSettingExample; /** * CmsSettingService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public interface CmsSettingService extends BaseService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSettingServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSettingServiceMock.java index 700f6904..3627a66b 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSettingServiceMock.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSettingServiceMock.java @@ -7,7 +7,7 @@ import com.zheng.cms.dao.model.CmsSettingExample; /** * 降级实现CmsSettingService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public class CmsSettingServiceMock extends BaseServiceMock implements CmsSettingService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSystemService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSystemService.java new file mode 100644 index 00000000..495b130a --- /dev/null +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSystemService.java @@ -0,0 +1,13 @@ +package com.zheng.cms.rpc.api; + +import com.zheng.common.base.BaseService; +import com.zheng.cms.dao.model.CmsSystem; +import com.zheng.cms.dao.model.CmsSystemExample; + +/** +* CmsSystemService接口 +* Created by shuzheng on 2017/4/5. +*/ +public interface CmsSystemService extends BaseService { + +} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSystemServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSystemServiceMock.java new file mode 100644 index 00000000..980148bb --- /dev/null +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsSystemServiceMock.java @@ -0,0 +1,14 @@ +package com.zheng.cms.rpc.api; + +import com.zheng.common.base.BaseServiceMock; +import com.zheng.cms.dao.mapper.CmsSystemMapper; +import com.zheng.cms.dao.model.CmsSystem; +import com.zheng.cms.dao.model.CmsSystemExample; + +/** +* 降级实现CmsSystemService接口 +* Created by shuzheng on 2017/4/5. +*/ +public class CmsSystemServiceMock extends BaseServiceMock implements CmsSystemService { + +} diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTagService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTagService.java index b23355c9..1cec8cc6 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTagService.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTagService.java @@ -6,7 +6,7 @@ import com.zheng.cms.dao.model.CmsTagExample; /** * CmsTagService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public interface CmsTagService extends BaseService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTagServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTagServiceMock.java index 1c4398d6..ff3b30d5 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTagServiceMock.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTagServiceMock.java @@ -7,7 +7,7 @@ import com.zheng.cms.dao.model.CmsTagExample; /** * 降级实现CmsTagService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public class CmsTagServiceMock extends BaseServiceMock implements CmsTagService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTopicService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTopicService.java index ccaaab16..2a86814d 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTopicService.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTopicService.java @@ -6,7 +6,7 @@ import com.zheng.cms.dao.model.CmsTopicExample; /** * CmsTopicService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public interface CmsTopicService extends BaseService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTopicServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTopicServiceMock.java index db825572..151621eb 100644 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTopicServiceMock.java +++ b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsTopicServiceMock.java @@ -7,7 +7,7 @@ import com.zheng.cms.dao.model.CmsTopicExample; /** * 降级实现CmsTopicService接口 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ public class CmsTopicServiceMock extends BaseServiceMock implements CmsTopicService { diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsUserService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsUserService.java deleted file mode 100644 index b8fe9353..00000000 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsUserService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.zheng.cms.rpc.api; - -import com.zheng.common.base.BaseService; -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.cms.dao.model.CmsUserExample; - -/** -* CmsUserService接口 -* Created by shuzheng on 2017/3/20. -*/ -public interface CmsUserService extends BaseService { - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsUserServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsUserServiceMock.java deleted file mode 100644 index b26d66d4..00000000 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/CmsUserServiceMock.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.zheng.cms.rpc.api; - -import com.zheng.common.base.BaseServiceMock; -import com.zheng.cms.dao.mapper.CmsUserMapper; -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.cms.dao.model.CmsUserExample; - -/** -* 降级实现CmsUserService接口 -* Created by shuzheng on 2017/3/20. -*/ -public class CmsUserServiceMock extends BaseServiceMock implements CmsUserService { - -} diff --git a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/UserService.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/UserService.java deleted file mode 100644 index 85f4573a..00000000 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/UserService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.zheng.cms.rpc.api; - -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.cms.dao.model.CmsUserExample; -import com.zheng.cms.dao.model.UserVO; -import com.zheng.common.base.BaseService; - -/** - * 用户service接口 - * Created by shuzheng on 2016/11/14. - */ -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-rpc-api/src/main/java/com/zheng/cms/rpc/api/UserServiceMock.java b/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/UserServiceMock.java deleted file mode 100644 index 132bd7c4..00000000 --- a/zheng-cms/zheng-cms-rpc-api/src/main/java/com/zheng/cms/rpc/api/UserServiceMock.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zheng.cms.rpc.api; - -import com.zheng.cms.dao.mapper.CmsUserMapper; -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.cms.dao.model.CmsUserExample; -import com.zheng.cms.dao.model.UserVO; -import com.zheng.common.base.BaseServiceMock; - -/** - * 降级实现UserService接口 - * Created by shuzheng on 2017/2/14. - */ -public class UserServiceMock extends BaseServiceMock implements UserService { - - @Override - public UserVO selectUserWithBook(int id) { - return null; - } - -} diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsArticleMapper.xml b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsArticleMapper.xml index ca8b9006..95a1c41e 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsArticleMapper.xml +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsArticleMapper.xml @@ -15,6 +15,8 @@ + + @@ -81,7 +83,7 @@ article_id, topic_id, title, author, fromurl, image, keywords, description, type, - allowcomments, status, user_id, readnumber, ctime, orders + allowcomments, status, user_id, readnumber, top, system_id, ctime, orders content @@ -147,14 +149,16 @@ author, fromurl, image, keywords, description, type, allowcomments, status, user_id, - readnumber, ctime, orders, - content) + readnumber, top, system_id, + ctime, orders, content + ) values (#{articleId,jdbcType=INTEGER}, #{topicId,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{author,jdbcType=VARCHAR}, #{fromurl,jdbcType=VARCHAR}, #{image,jdbcType=VARCHAR}, #{keywords,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{type,jdbcType=TINYINT}, #{allowcomments,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{userId,jdbcType=INTEGER}, - #{readnumber,jdbcType=INTEGER}, #{ctime,jdbcType=BIGINT}, #{orders,jdbcType=BIGINT}, - #{content,jdbcType=LONGVARCHAR}) + #{readnumber,jdbcType=INTEGER}, #{top,jdbcType=INTEGER}, #{systemId,jdbcType=INTEGER}, + #{ctime,jdbcType=BIGINT}, #{orders,jdbcType=BIGINT}, #{content,jdbcType=LONGVARCHAR} + ) insert into cms_article @@ -198,6 +202,12 @@ readnumber, + + top, + + + system_id, + ctime, @@ -248,6 +258,12 @@ #{readnumber,jdbcType=INTEGER}, + + #{top,jdbcType=INTEGER}, + + + #{systemId,jdbcType=INTEGER}, + #{ctime,jdbcType=BIGINT}, @@ -307,6 +323,12 @@ readnumber = #{record.readnumber,jdbcType=INTEGER}, + + top = #{record.top,jdbcType=INTEGER}, + + + system_id = #{record.systemId,jdbcType=INTEGER}, + ctime = #{record.ctime,jdbcType=BIGINT}, @@ -336,6 +358,8 @@ status = #{record.status,jdbcType=TINYINT}, user_id = #{record.userId,jdbcType=INTEGER}, readnumber = #{record.readnumber,jdbcType=INTEGER}, + top = #{record.top,jdbcType=INTEGER}, + system_id = #{record.systemId,jdbcType=INTEGER}, ctime = #{record.ctime,jdbcType=BIGINT}, orders = #{record.orders,jdbcType=BIGINT}, content = #{record.content,jdbcType=LONGVARCHAR} @@ -358,6 +382,8 @@ status = #{record.status,jdbcType=TINYINT}, user_id = #{record.userId,jdbcType=INTEGER}, readnumber = #{record.readnumber,jdbcType=INTEGER}, + top = #{record.top,jdbcType=INTEGER}, + system_id = #{record.systemId,jdbcType=INTEGER}, ctime = #{record.ctime,jdbcType=BIGINT}, orders = #{record.orders,jdbcType=BIGINT} @@ -403,6 +429,12 @@ readnumber = #{readnumber,jdbcType=INTEGER}, + + top = #{top,jdbcType=INTEGER}, + + + system_id = #{systemId,jdbcType=INTEGER}, + ctime = #{ctime,jdbcType=BIGINT}, @@ -429,6 +461,8 @@ status = #{status,jdbcType=TINYINT}, user_id = #{userId,jdbcType=INTEGER}, readnumber = #{readnumber,jdbcType=INTEGER}, + top = #{top,jdbcType=INTEGER}, + system_id = #{systemId,jdbcType=INTEGER}, ctime = #{ctime,jdbcType=BIGINT}, orders = #{orders,jdbcType=BIGINT}, content = #{content,jdbcType=LONGVARCHAR} @@ -448,6 +482,8 @@ status = #{status,jdbcType=TINYINT}, user_id = #{userId,jdbcType=INTEGER}, readnumber = #{readnumber,jdbcType=INTEGER}, + top = #{top,jdbcType=INTEGER}, + system_id = #{systemId,jdbcType=INTEGER}, ctime = #{ctime,jdbcType=BIGINT}, orders = #{orders,jdbcType=BIGINT} where article_id = #{articleId,jdbcType=INTEGER} diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsCategoryMapper.xml b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsCategoryMapper.xml index eaa8d320..67d6f891 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsCategoryMapper.xml +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsCategoryMapper.xml @@ -10,6 +10,7 @@ + @@ -72,7 +73,8 @@ - category_id, pid, level, name, description, icon, type, alias, ctime, orders + category_id, pid, level, name, description, icon, type, alias, system_id, ctime, + orders + select - from cms_book - where book_id = #{bookId,jdbcType=INTEGER} + from cms_system + where system_id = #{systemId,jdbcType=INTEGER} - delete from cms_book - where book_id = #{bookId,jdbcType=INTEGER} + delete from cms_system + where system_id = #{systemId,jdbcType=INTEGER} - - delete from cms_book + + delete from cms_system - - insert into cms_book (book_id, user_id, name + + insert into cms_system (system_id, name, code, + description, ctime, orders ) - values (#{bookId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR} + values (#{systemId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, + #{description,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, #{orders,jdbcType=BIGINT} ) - - insert into cms_book + + insert into cms_system - - book_id, - - - user_id, + + system_id, name, + + code, + + + description, + + + ctime, + + + orders, + - - #{bookId,jdbcType=INTEGER}, - - - #{userId,jdbcType=INTEGER}, + + #{systemId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, + + #{code,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{ctime,jdbcType=BIGINT}, + + + #{orders,jdbcType=BIGINT}, + - + select count(*) from cms_system - update cms_book + update cms_system - - book_id = #{record.bookId,jdbcType=INTEGER}, - - - user_id = #{record.userId,jdbcType=INTEGER}, + + system_id = #{record.systemId,jdbcType=INTEGER}, name = #{record.name,jdbcType=VARCHAR}, + + code = #{record.code,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + ctime = #{record.ctime,jdbcType=BIGINT}, + + + orders = #{record.orders,jdbcType=BIGINT}, + - update cms_book - set book_id = #{record.bookId,jdbcType=INTEGER}, - user_id = #{record.userId,jdbcType=INTEGER}, - name = #{record.name,jdbcType=VARCHAR} + update cms_system + set system_id = #{record.systemId,jdbcType=INTEGER}, + name = #{record.name,jdbcType=VARCHAR}, + code = #{record.code,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + ctime = #{record.ctime,jdbcType=BIGINT}, + orders = #{record.orders,jdbcType=BIGINT} - - update cms_book + + update cms_system - - user_id = #{userId,jdbcType=INTEGER}, - name = #{name,jdbcType=VARCHAR}, + + code = #{code,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + ctime = #{ctime,jdbcType=BIGINT}, + + + orders = #{orders,jdbcType=BIGINT}, + - where book_id = #{bookId,jdbcType=INTEGER} + where system_id = #{systemId,jdbcType=INTEGER} - - update cms_book - set user_id = #{userId,jdbcType=INTEGER}, - name = #{name,jdbcType=VARCHAR} - where book_id = #{bookId,jdbcType=INTEGER} + + update cms_system + set name = #{name,jdbcType=VARCHAR}, + code = #{code,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + ctime = #{ctime,jdbcType=BIGINT}, + orders = #{orders,jdbcType=BIGINT} + where system_id = #{systemId,jdbcType=INTEGER} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsTagMapper.xml b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsTagMapper.xml index d64ad77c..49c4be90 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsTagMapper.xml +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsTagMapper.xml @@ -8,6 +8,7 @@ + @@ -70,7 +71,7 @@ - tag_id, name, description, icon, type, alias, ctime, orders + tag_id, name, description, icon, type, alias, system_id, ctime, orders - select - - distinct - - - , - - from cms_user - - - - - order by ${orderByClause} - - - - - - delete from cms_user - where user_id = #{userId,jdbcType=INTEGER} - - - delete from cms_user - - - - - - insert into cms_user (user_id, username, password, - nickname, sex, ctime, - content) - values (#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, - #{nickname,jdbcType=VARCHAR}, #{sex,jdbcType=INTEGER}, #{ctime,jdbcType=BIGINT}, - #{content,jdbcType=LONGVARCHAR}) - - - insert into cms_user - - - user_id, - - - username, - - - password, - - - nickname, - - - sex, - - - ctime, - - - content, - - - - - #{userId,jdbcType=INTEGER}, - - - #{username,jdbcType=VARCHAR}, - - - #{password,jdbcType=VARCHAR}, - - - #{nickname,jdbcType=VARCHAR}, - - - #{sex,jdbcType=INTEGER}, - - - #{ctime,jdbcType=BIGINT}, - - - #{content,jdbcType=LONGVARCHAR}, - - - - - - update cms_user - - - user_id = #{record.userId,jdbcType=INTEGER}, - - - username = #{record.username,jdbcType=VARCHAR}, - - - password = #{record.password,jdbcType=VARCHAR}, - - - nickname = #{record.nickname,jdbcType=VARCHAR}, - - - sex = #{record.sex,jdbcType=INTEGER}, - - - ctime = #{record.ctime,jdbcType=BIGINT}, - - - content = #{record.content,jdbcType=LONGVARCHAR}, - - - - - - - - update cms_user - set user_id = #{record.userId,jdbcType=INTEGER}, - username = #{record.username,jdbcType=VARCHAR}, - password = #{record.password,jdbcType=VARCHAR}, - nickname = #{record.nickname,jdbcType=VARCHAR}, - sex = #{record.sex,jdbcType=INTEGER}, - ctime = #{record.ctime,jdbcType=BIGINT}, - content = #{record.content,jdbcType=LONGVARCHAR} - - - - - - update cms_user - set user_id = #{record.userId,jdbcType=INTEGER}, - username = #{record.username,jdbcType=VARCHAR}, - password = #{record.password,jdbcType=VARCHAR}, - nickname = #{record.nickname,jdbcType=VARCHAR}, - sex = #{record.sex,jdbcType=INTEGER}, - ctime = #{record.ctime,jdbcType=BIGINT} - - - - - - update cms_user - - - username = #{username,jdbcType=VARCHAR}, - - - password = #{password,jdbcType=VARCHAR}, - - - nickname = #{nickname,jdbcType=VARCHAR}, - - - sex = #{sex,jdbcType=INTEGER}, - - - ctime = #{ctime,jdbcType=BIGINT}, - - - content = #{content,jdbcType=LONGVARCHAR}, - - - where user_id = #{userId,jdbcType=INTEGER} - - - update cms_user - set username = #{username,jdbcType=VARCHAR}, - password = #{password,jdbcType=VARCHAR}, - nickname = #{nickname,jdbcType=VARCHAR}, - sex = #{sex,jdbcType=INTEGER}, - ctime = #{ctime,jdbcType=BIGINT}, - content = #{content,jdbcType=LONGVARCHAR} - where user_id = #{userId,jdbcType=INTEGER} - - - update cms_user - set username = #{username,jdbcType=VARCHAR}, - password = #{password,jdbcType=VARCHAR}, - nickname = #{nickname,jdbcType=VARCHAR}, - sex = #{sex,jdbcType=INTEGER}, - ctime = #{ctime,jdbcType=BIGINT} - where user_id = #{userId,jdbcType=INTEGER} - - - \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/UserVOMapper.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/UserVOMapper.java deleted file mode 100644 index 4f6b5a28..00000000 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/UserVOMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.zheng.cms.rpc.mapper; - -import com.zheng.cms.dao.model.UserVO; - -/** - * 用户VOMapper - * Created by shuzheng on 2017/01/07. - */ -public interface UserVOMapper { - - UserVO selectUserWithBook(int id); - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/UserVOMapper.xml b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/UserVOMapper.xml deleted file mode 100644 index c6fff624..00000000 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/UserVOMapper.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleCategoryServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleCategoryServiceImpl.java index 96b5fd63..4a61ca6b 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleCategoryServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleCategoryServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; /** * CmsArticleCategoryService实现 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ @Service @Transactional diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleServiceImpl.java index 4bbb6459..88f25889 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; /** * CmsArticleService实现 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ @Service @Transactional diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleTagServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleTagServiceImpl.java index 2c5a8abf..bbeb4c79 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleTagServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsArticleTagServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; /** * CmsArticleTagService实现 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ @Service @Transactional diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsBookServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsBookServiceImpl.java deleted file mode 100644 index e2b59065..00000000 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsBookServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zheng.cms.rpc.service.impl; - -import com.zheng.common.annotation.BaseService; -import com.zheng.common.base.BaseServiceImpl; -import com.zheng.cms.dao.mapper.CmsBookMapper; -import com.zheng.cms.dao.model.CmsBook; -import com.zheng.cms.dao.model.CmsBookExample; -import com.zheng.cms.rpc.api.CmsBookService; -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; - -/** -* CmsBookService实现 -* Created by shuzheng on 2017/3/20. -*/ -@Service -@Transactional -@BaseService -public class CmsBookServiceImpl extends BaseServiceImpl implements CmsBookService { - - private static Logger _log = LoggerFactory.getLogger(CmsBookServiceImpl.class); - - @Autowired - CmsBookMapper cmsBookMapper; - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCategoryServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCategoryServiceImpl.java index 276ad87f..d39ba68f 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCategoryServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCategoryServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; /** * CmsCategoryService实现 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ @Service @Transactional diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCategoryTagServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCategoryTagServiceImpl.java index c2b1b789..78a1cbc0 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCategoryTagServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCategoryTagServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; /** * CmsCategoryTagService实现 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ @Service @Transactional diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCommentServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCommentServiceImpl.java index fd10d01b..90086cf8 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCommentServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsCommentServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; /** * CmsCommentService实现 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ @Service @Transactional diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsMenuServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsMenuServiceImpl.java index 52e6d36d..b7acce54 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsMenuServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsMenuServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; /** * CmsMenuService实现 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ @Service @Transactional diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsPageServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsPageServiceImpl.java index 81fab3c8..f8e4e33e 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsPageServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsPageServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; /** * CmsPageService实现 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ @Service @Transactional diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsSettingServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsSettingServiceImpl.java index ae9082ce..087b3e5d 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsSettingServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsSettingServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; /** * CmsSettingService实现 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ @Service @Transactional diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsSystemServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsSystemServiceImpl.java new file mode 100644 index 00000000..97fa7980 --- /dev/null +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsSystemServiceImpl.java @@ -0,0 +1,29 @@ +package com.zheng.cms.rpc.service.impl; + +import com.zheng.common.annotation.BaseService; +import com.zheng.common.base.BaseServiceImpl; +import com.zheng.cms.dao.mapper.CmsSystemMapper; +import com.zheng.cms.dao.model.CmsSystem; +import com.zheng.cms.dao.model.CmsSystemExample; +import com.zheng.cms.rpc.api.CmsSystemService; +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; + +/** +* CmsSystemService实现 +* Created by shuzheng on 2017/4/5. +*/ +@Service +@Transactional +@BaseService +public class CmsSystemServiceImpl extends BaseServiceImpl implements CmsSystemService { + + private static Logger _log = LoggerFactory.getLogger(CmsSystemServiceImpl.class); + + @Autowired + CmsSystemMapper cmsSystemMapper; + +} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsTagServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsTagServiceImpl.java index 2614cefd..5f154cbb 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsTagServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsTagServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; /** * CmsTagService实现 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ @Service @Transactional diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsTopicServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsTopicServiceImpl.java index 1a500288..1655f603 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsTopicServiceImpl.java +++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsTopicServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; /** * CmsTopicService实现 -* Created by shuzheng on 2017/3/20. +* Created by shuzheng on 2017/4/5. */ @Service @Transactional diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsUserServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsUserServiceImpl.java deleted file mode 100644 index 40f28980..00000000 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/CmsUserServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zheng.cms.rpc.service.impl; - -import com.zheng.common.annotation.BaseService; -import com.zheng.common.base.BaseServiceImpl; -import com.zheng.cms.dao.mapper.CmsUserMapper; -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.cms.dao.model.CmsUserExample; -import com.zheng.cms.rpc.api.CmsUserService; -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; - -/** -* CmsUserService实现 -* Created by shuzheng on 2017/3/20. -*/ -@Service -@Transactional -@BaseService -public class CmsUserServiceImpl extends BaseServiceImpl implements CmsUserService { - - private static Logger _log = LoggerFactory.getLogger(CmsUserServiceImpl.class); - - @Autowired - CmsUserMapper cmsUserMapper; - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/UserServiceImpl.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/UserServiceImpl.java deleted file mode 100644 index c8821808..00000000 --- a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.zheng.cms.rpc.service.impl; - -import com.zheng.cms.dao.mapper.CmsUserMapper; -import com.zheng.cms.rpc.mapper.UserVOMapper; -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.cms.dao.model.CmsUserExample; -import com.zheng.cms.dao.model.UserVO; -import com.zheng.cms.rpc.api.UserService; -import com.zheng.common.annotation.BaseService; -import com.zheng.common.base.BaseServiceImpl; -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 -@BaseService -public class UserServiceImpl extends BaseServiceImpl implements UserService { - - private static Logger _log = LoggerFactory.getLogger(UserServiceImpl.class); - - @Autowired - private UserVOMapper userVOMapper; - - /** - * 获取带book数据的用户 - * @param id - * @return - */ - @Override - @Cacheable(value="zheng-cms-ehcache") - public UserVO selectUserWithBook(int id) { - return userVOMapper.selectUserWithBook(id); - } - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml b/zheng-cms/zheng-cms-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml index 4f002c00..87e8b32e 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml +++ b/zheng-cms/zheng-cms-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml @@ -45,8 +45,4 @@ - - - - \ No newline at end of file diff --git a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/ActiveMQController.java b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/ActiveMQController.java deleted file mode 100644 index b30dfc17..00000000 --- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/ActiveMQController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zheng.cms.web.controller.test; - -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.common.base.BaseController; -import com.zheng.common.util.JmsUtil; -import net.sf.json.JSONObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jms.core.JmsTemplate; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.jms.Destination; - -/** - * 消息队列controller - * @author shuzheng - * @date 2016年11月24日 - */ -@Controller -@RequestMapping("/activemq") -public class ActiveMQController extends BaseController { - - private static Logger _log = LoggerFactory.getLogger(ActiveMQController.class); - - @Autowired - JmsTemplate jmsQueueTemplate; - - @Autowired - Destination defaultQueueDestination; - - @RequestMapping("/send") - @ResponseBody - public Object send() { - long start = System.currentTimeMillis(); - CmsUser user = null; - for (int i = 1; i <= 1000; i ++) { - user = new CmsUser(); - user.setUsername(i + ""); - user.setPassword("123456"); - user.setNickname("昵称"); - user.setSex(1); - user.setCtime(System.currentTimeMillis()); - user.setContent("用户描述"); -// jmsQueueTemplate.convertAndSend(defaultQueueDestination, user); - JmsUtil.sendMessage(jmsQueueTemplate, defaultQueueDestination, JSONObject.fromObject(user).toString()); - } - _log.info("发送消息消耗时间" + (System.currentTimeMillis() - start)); - return "success"; - } - - public static void main(String[] args) { - CmsUser user = new CmsUser(); - user.setUsername("用户"); - user.setPassword("123456"); - user.setNickname("昵称"); - user.setSex(1); - user.setCtime(System.currentTimeMillis()); - user.setContent("用户描述"); - System.out.println(JSONObject.fromObject(user).toString()); - } -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/EhCacheController.java b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/EhCacheController.java deleted file mode 100644 index 346c7f5e..00000000 --- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/EhCacheController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.zheng.cms.web.controller.test; - -import com.zheng.cms.rpc.api.UserService; -import com.zheng.common.base.BaseController; -import com.zheng.common.util.EhCacheUtil; -import com.zheng.common.util.PropertiesFileUtil; -import net.sf.ehcache.Cache; -import net.sf.ehcache.CacheManager; -import net.sf.ehcache.Element; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.servlet.http.HttpServletRequest; - -/** - * 缓存controller - * @author shuzheng - * @date 2016年10月15日 - */ -@Controller -@RequestMapping("/ehcache") -public class EhCacheController extends BaseController { - - private static Logger _log = LoggerFactory.getLogger(EhCacheController.class); - - private final static String EHCACHE_NAME = PropertiesFileUtil.getInstance().get("ehcache"); - - @Autowired - private UserService userService; - - @RequestMapping("/test") - @ResponseBody - public Object test(HttpServletRequest request) { - return System.getProperty("java.io.tmpdir"); - } - - /** - * 新增缓存记录 - * @param request - * @return - */ - @RequestMapping("/add") - @ResponseBody - public Object add(HttpServletRequest request) { - String key = request.getParameter("key"); - String value = request.getParameter("value"); - EhCacheUtil.put(EHCACHE_NAME, key, value); - return "success"; - } - - /** - * 删除缓存记录 - * @param request - * @return - */ - @RequestMapping("/remove") - @ResponseBody - public Object remove(HttpServletRequest request) { - String key = request.getParameter("key"); - EhCacheUtil.remove(EHCACHE_NAME, key); - return "success"; - } - - /** - * 获取缓存记录 - * @param request - * @return - */ - @RequestMapping("/get") - @ResponseBody - public Object get(HttpServletRequest request) { - String key = request.getParameter("key"); - Object object = EhCacheUtil.get(EHCACHE_NAME, key); - if (null == object) { - _log.debug("【Ehcache】没有找到key={}的记录！", key); - return ""; - } - return object; - } - - public static void main(String[] args) { - // EhCache调用 - // Create a cache manager - final CacheManager cacheManager = CacheManager.getInstance(); - // create the cache called "hello-world" - final Cache cache = cacheManager.getCache("ehcache_common"); - // create a key to map the data to - final String key = "key"; - // Create a data element - final Element element = new Element(key, "value"); - // Put the element into the data store - cache.put(element); - // Retrieve the data element - final Element cacheElement = cache.get(key); - // Print the value - System.out.println(cacheElement.getObjectValue()); - } - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/HelloController.java b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/HelloController.java deleted file mode 100644 index 01b9f0fb..00000000 --- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/HelloController.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.zheng.cms.web.controller.test; - -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.cms.rpc.api.UserService; -import com.zheng.common.base.BaseController; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; - -import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.io.IOException; -import java.util.Iterator; -import java.util.Map; - -/** - * 示例controller - * @author shuzheng - * @date 2016年7月6日 下午6:16:00 - */ -@Controller -@RequestMapping("/hello") -public class HelloController extends BaseController { - - private static Logger _log = LoggerFactory.getLogger(HelloController.class); - - @Autowired - private UserService userService; - - @RequestMapping("/index") - public String index() { - // 视图渲染，/WEB-INF/jsp/hello/world.jsp - return "/hello/world"; - } - - // 方法级别的RequestMapping， 限制并缩小了URL路径匹配，同类级别的标签协同工作，最终确定拦截到的URL由那个方法处理 - @RequestMapping("/world") - public String world() { - // 视图渲染，/WEB-INF/jsp/hello/world.jsp - return "/hello/world"; - } - - // 本方法将处理 /hello/view?courseId=123 形式的URL - @RequestMapping(value = "/view", method = RequestMethod.GET) - public String viewCourse(@RequestParam("courseId") Integer courseId, ModelMap modelMap) { - - CmsUser user = userService.selectByPrimaryKey(courseId); - modelMap.put("user", user); - return "course_overview"; - } - - // 本方法将处理 /hello/view2/123 形式的URL - @RequestMapping("/view2/{courseId}") - public String viewCourse2(@PathVariable("courseId") Integer courseId, Map map) { - - CmsUser user = userService.selectByPrimaryKey(courseId); - map.put("user", user); - return "course_overview"; - } - - // 本方法将处理 /hello/view3?courseId=123 形式的URL - @RequestMapping("/view3") - public String viewCourse3(HttpServletRequest request) { - - Integer courseId = Integer.valueOf(request.getParameter("courseId")); - CmsUser user = userService.selectByPrimaryKey(courseId); - request.setAttribute("user", user); - - return "course_overview"; - } - - @RequestMapping(value = "/admin", method = RequestMethod.GET, params = "add") - public String createCourse() { - return "course_admin/edit"; - } - - @RequestMapping(value = "/save", method = RequestMethod.POST) - public String doSave(@ModelAttribute CmsUser user) { - - _log.debug("Info of Course:"); - _log.debug(ReflectionToStringBuilder.toString(user)); - - // 在此进行业务操作，比如数据库持久化 - user.setUserId(123); - return "redirect:view2/" + user.getUserId(); - } - - @RequestMapping(value = "/upload", method = RequestMethod.GET) - public String showUploadPage(@RequestParam(value = "multi", required = false) Boolean multi) { - if (multi != null && multi) { - return "course_admin/multifile"; - } - return "course_admin/file"; - } - - @RequestMapping(value = "/doUpload", method = RequestMethod.POST) - public String doUploadFile(@RequestParam("file") MultipartFile file) throws IOException { - - if (!file.isEmpty()) { - FileUtils.copyInputStreamToFile(file.getInputStream(), new File("c:\\temp\\imooc\\", System.currentTimeMillis() + file.getOriginalFilename())); - } - - return "success"; - } - - @RequestMapping(value = "/doUpload2", method = RequestMethod.POST) - public String doUploadFile2(MultipartHttpServletRequest multiRequest) throws IOException { - - Iterator filesNames = multiRequest.getFileNames(); - while (filesNames.hasNext()) { - String fileName = filesNames.next(); - MultipartFile file = multiRequest.getFile(fileName); - if (!file.isEmpty()) { - FileUtils.copyInputStreamToFile(file.getInputStream(), new File("c:\\temp\\imooc\\", System.currentTimeMillis() + file.getOriginalFilename())); - } - - } - - return "success"; - } - - @RequestMapping(value = "/{courseId}", method = RequestMethod.GET) - public @ResponseBody - CmsUser getCourseInJson(@PathVariable Integer courseId) { - return userService.selectByPrimaryKey(courseId); - } - - @RequestMapping(value = "/jsontype/{courseId}", method = RequestMethod.GET) - public ResponseEntity getCourseInJson2(@PathVariable Integer courseId) { - CmsUser user = userService.selectByPrimaryKey(courseId); - return new ResponseEntity(user, HttpStatus.OK); - } -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/RedisController.java b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/RedisController.java deleted file mode 100644 index db564583..00000000 --- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/RedisController.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.zheng.cms.web.controller.test; - -import com.zheng.common.base.BaseController; -import com.zheng.common.util.RedisUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.servlet.http.HttpServletRequest; - -/** - * 缓存controller - * - * @author shuzheng - * @date 2016年11月26日 - */ -@Controller -@RequestMapping("/redis") -public class RedisController extends BaseController { - - private static Logger _log = LoggerFactory.getLogger(RedisController.class); - - @RequestMapping("/test") - @ResponseBody - public Object test(HttpServletRequest request) { - long time = System.currentTimeMillis(); - for (int i = 1; i <= 10000; i ++) { - RedisUtil.set("key" + i, "value" + i, i * 5); - } - return System.currentTimeMillis() - time; - } - - /** - * 新增缓存记录 - * - * @param request - * @return - */ - @RequestMapping("/add") - @ResponseBody - public Object add(HttpServletRequest request) { - String key = request.getParameter("key"); - String value = request.getParameter("value"); - String time = request.getParameter("time"); - RedisUtil.set(key, value, Integer.parseInt(time)); - return "success"; - } - - /** - * 删除缓存记录 - * - * @param request - * @return - */ - @RequestMapping("/remove") - @ResponseBody - public Object remove(HttpServletRequest request) { - String key = request.getParameter("key"); - RedisUtil.remove(key); - return "success"; - } - - /** - * 获取缓存记录 - * - * @param request - * @return - */ - @RequestMapping("/get") - @ResponseBody - public Object get(HttpServletRequest request) { - String key = request.getParameter("key"); - String value = RedisUtil.get(key); - if (null == value) { - _log.debug("【redis】没有找到key={}的记录！", key); - return ""; - } - return value; - } - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/UserController.java b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/UserController.java deleted file mode 100644 index 0fcbfb0d..00000000 --- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/test/UserController.java +++ /dev/null @@ -1,213 +0,0 @@ -package com.zheng.cms.web.controller.test; - -import com.zheng.cms.common.constant.CmsResult; -import com.zheng.cms.common.constant.CmsResultConstant; -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.cms.dao.model.CmsUserExample; -import com.zheng.cms.rpc.api.UserService; -import com.zheng.common.base.BaseController; -import com.zheng.common.util.Paginator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.validation.BindingResult; -import org.springframework.validation.ObjectError; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 用户控制器 - * @author shuzheng - * @date 2016年7月6日 下午6:16:25 - */ -@Controller -@RequestMapping("/user") -public class UserController extends BaseController { - - private static Logger _log = LoggerFactory.getLogger(UserController.class); - - @Autowired - private UserService userService; - - @ExceptionHandler(Exception.class) - public void exceptionHandler(Exception e) { - e.printStackTrace(); - } - - /** - * 首页 - * @return - */ - @RequestMapping(value = {"", "index"}) - public String index() { - return "redirect:/user/list"; - } - - /** - * 列表 - * @param page - * @param rows - * @param request - * @return - */ - @RequestMapping("/list") - public String list( - @RequestParam(required = false, defaultValue = "1", value = "page") int page, - @RequestParam(required = false, defaultValue = "20", value = "rows") int rows, - HttpServletRequest request, ModelMap modelMap) { - - CmsUserExample userExample = new CmsUserExample(); - userExample.createCriteria() - .andUserIdGreaterThan(0); - userExample.setOffset((page -1) * rows); - userExample.setLimit(rows); - userExample.setDistinct(false); - userExample.setOrderByClause(" user_id asc "); - List users = userService.selectByExample(userExample); - modelMap.put("users", users); - - // 创建分页对象 - long total = userService.countByExample(userExample); - Paginator paginator = new Paginator(); - paginator.setTotal(total); - paginator.setPage(page); - paginator.setRows(rows); - paginator.setParam("page"); - paginator.setUrl(request.getRequestURI()); - paginator.setQuery(request.getQueryString()); - modelMap.put("paginator", paginator); - - return "/user/list"; - } - - /** - * 新增get - * @return - */ - @RequestMapping(value = "/create", method = RequestMethod.GET) - public String add() { - return "/user/create"; - } - - /** - * 新增post - * @param user - * @param binding - * @return - */ - @RequestMapping(value = "/create", method = RequestMethod.POST) - public String add(@Valid CmsUser user, BindingResult binding) { - if (binding.hasErrors()) { - for (ObjectError error : binding.getAllErrors()) { - _log.error(error.getDefaultMessage()); - } - return "/user/create"; - } - user.setCtime(System.currentTimeMillis()); - - userService.insertSelective(user); - - _log.info("新增记录id为：{}", user.getUserId()); - - return "redirect:/user/list"; - } - - /** - * 删除 - * @param id - * @return - */ - @RequestMapping(value = "/delete/{id}",method = RequestMethod.GET) - public String delete(@PathVariable("id") int id) { - userService.deleteByPrimaryKey(id); - return "redirect:/user/list"; - } - - /** - * 修改get - * @param id - * @param modelMap - * @return - */ - @RequestMapping(value = "/update/{id}", method = RequestMethod.GET) - public String update(@PathVariable("id") int id, ModelMap modelMap) { - modelMap.put("user", userService.selectByPrimaryKey(id)); - return "/user/update"; - } - - /** - * 修改post - * @param id - * @param user - * @param binding - * @param modelMap - * @return - */ - @RequestMapping(value = "/update/{id}", method = RequestMethod.POST) - public String update(@PathVariable("id") int id, @Valid CmsUser user, BindingResult binding, ModelMap modelMap) { - if (binding.hasErrors()) { - modelMap.put("errors", binding.getAllErrors()); - return "user/update/" + id; - } - userService.updateByPrimaryKeySelective(user); - return "redirect:/user/list"; - } - - /** - * 上传文件 - * @param file - * @param request - * @return - * @throws IOException - */ - @ResponseBody - @RequestMapping(value = "/upload", method = RequestMethod.POST) - public Object upload(@RequestParam(value = "file", required = false) MultipartFile file, HttpServletRequest request) throws IOException { - // 返回结果 - Map map = new HashMap(); - // 判断上传文件类型 - String contentType = file.getContentType().toLowerCase(); - if ((!contentType.equals("image/jpeg")) && - (!contentType.equals("image/pjpeg")) && - (!contentType.equals("image/png")) && - (!contentType.equals("image/x-png")) && - (!contentType.equals("image/bmp")) && - (!contentType.equals("image/gif"))) { - return new CmsResult(CmsResultConstant.FILE_TYPE_ERROR, "不支持该类型的文件！"); - - } - // 创建图片目录 - String basePath = request.getSession().getServletContext().getRealPath("/attached"); - String fileName = file.getOriginalFilename(); - String savePath = basePath + "/images/"; - File targetFile = new File(savePath, fileName); - if (!targetFile.exists()) { - targetFile.mkdirs(); - } - // 保存图片 - file.transferTo(targetFile); - return new CmsResult(CmsResultConstant.SUCCESS, targetFile.getAbsoluteFile()); - } - - /** - * ajax - * @param id - * @return - */ - @ResponseBody - @RequestMapping(value = "/ajax/{id}", method = RequestMethod.GET) - public Object ajax(@PathVariable int id) { - return userService.selectByPrimaryKey(id); - } - -} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/jms/DefaultMessageQueueListener.java b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/jms/DefaultMessageQueueListener.java index a5cd42a0..3cf241b7 100644 --- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/jms/DefaultMessageQueueListener.java +++ b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/jms/DefaultMessageQueueListener.java @@ -1,8 +1,5 @@ package com.zheng.cms.web.jms; -import com.zheng.cms.dao.model.CmsUser; -import com.zheng.cms.rpc.api.UserService; -import net.sf.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -11,8 +8,6 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import javax.jms.Message; import javax.jms.MessageListener; import javax.jms.TextMessage; -import java.text.SimpleDateFormat; -import java.util.Date; /** * MQ消费者 @@ -20,35 +15,24 @@ import java.util.Date; */ public class DefaultMessageQueueListener implements MessageListener { - private static Logger _log = LoggerFactory.getLogger(DefaultMessageQueueListener.class); - - @Autowired - ThreadPoolTaskExecutor threadPoolTaskExecutor; + private static Logger _log = LoggerFactory.getLogger(DefaultMessageQueueListener.class); @Autowired - UserService userService; + ThreadPoolTaskExecutor threadPoolTaskExecutor; - public void onMessage(final Message message) { - // 使用线程池多线程处理 - threadPoolTaskExecutor.execute(new Runnable() { - public void run() { - TextMessage textMessage = (TextMessage) message; - try { - String text = textMessage.getText(); - JSONObject json = JSONObject.fromObject(text); - CmsUser user = (CmsUser) JSONObject.toBean(json, CmsUser.class); - if (user.getUsername().equals("1")) { - _log.info("消费开始时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(System.currentTimeMillis()))); - } - if (user.getUsername().equals("1000")) { - _log.info("消费结束时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(System.currentTimeMillis()))); - } - userService.insertSelective(user); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } + public void onMessage(final Message message) { + // 使用线程池多线程处理 + threadPoolTaskExecutor.execute(new Runnable() { + public void run() { + TextMessage textMessage = (TextMessage) message; + try { + String text = textMessage.getText(); + _log.info("消费：{}", text); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } } diff --git a/zheng-cms/zheng-cms-web/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-cms/zheng-cms-web/src/main/resources/applicationContext-dubbo-consumer.xml index de9a5ac9..979a9c1e 100644 --- a/zheng-cms/zheng-cms-web/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/zheng-cms/zheng-cms-web/src/main/resources/applicationContext-dubbo-consumer.xml @@ -30,7 +30,5 @@ - - \ No newline at end of file