jiangjiazhi / center

Commit 72aa953fa0e9ed1a64acf95bebb5304d49a3b330

Authored by yangfei over 9 years ago

Exists in master

解决冲突

Showing 8 changed files with 298 additions and 584 deletions

parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.java
parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentArticlesService.java
parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java
parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentTemplateMessageTagsService.java
parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java
parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTemplateMessageTagsServiceImpl.java
parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentCategoriesController.java
parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java

1		-<<<<<<< HEAD
2	1	package com.lyms.base.common.dao.content;
3	2
4		-import com.baomidou.mybatisplus.mapper.BaseMapper;
5		-import com.baomidou.mybatisplus.plugins.Page;
6		-import com.lyms.base.common.entity.content.ContentMessageTemplate;
7		-import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
8		-import com.lyms.base.common.vo.content.MsgTempSerachDTO;
9		-import org.springframework.stereotype.Repository;
10		-
11	3	import java.io.Serializable;
12	4	import java.util.List;
13		-/**
14		- * <p>
15		- * Mapper接口
16		- * </p>
17		- *
18		- * @author yangfei
19		- * @since 2017-04-14
20		- */
21		-@Repository
22		-public interface ContentMessageTemplateMapper extends BaseMapper<ContentMessageTemplate> {
23	5
24		- public Integer deleteLogicById(Serializable id);
	6	+import org.springframework.stereotype.Repository;
25	7
26		- public List<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page , MsgTempSerachDTO msgTemp);
27		-
28		-=======
29		-package com.lyms.base.common.dao.content;
30		-
31	8	import com.baomidou.mybatisplus.mapper.BaseMapper;
32	9	import com.baomidou.mybatisplus.plugins.Page;
33	10	import com.lyms.base.common.entity.content.ContentMessageTemplate;
34	11	import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
35		-import org.springframework.stereotype.Repository;
36		-
37		-import java.io.Serializable;
38		-import java.util.List;
	12	+import com.lyms.base.common.vo.content.MsgTempSerachDTO;
39	13	/**
40	14	* <p>
41	15	* Mapper接口
42	16
...	...	@@ -49,8 +23,7 @@
49	23
50	24	public Integer deleteLogicById(Serializable id);
51	25
52		- public List<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page , String verId);
	26	+ public List<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page , MsgTempSerachDTO msgTemp);
53	27
54		->>>>>>> 181fc2da2ec63e24914c7529c6e7705f02985d0e
55	28	}

1	1	package com.lyms.base.common.service.content;
2	2
	3	+import java.io.Serializable;
	4	+import java.util.List;
	5	+
3	6	import com.baomidou.mybatisplus.plugins.Page;
4	7	import com.lyms.base.common.entity.content.ContentArticles;
5	8	import com.lyms.base.common.entity.content.ContentArticlesTags;
6	9	import com.lyms.base.common.vo.content.AricleSearchDTO;
7	10	import com.lyms.web.service.BaseService;
8		-
9		-import java.io.Serializable;
10		-import java.util.List;
11	11
12	12	/**
13	13	* <p>

1		-<<<<<<< HEAD
2	1	package com.lyms.base.common.service.content;
3	2
	3	+import java.io.Serializable;
	4	+
4	5	import com.baomidou.mybatisplus.plugins.Page;
5	6	import com.lyms.base.common.entity.content.ContentMessageTemplate;
6	7	import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
7	8	import com.lyms.base.common.vo.content.MsgTempSerachDTO;
8	9	import com.lyms.web.service.BaseService;
9	10
10		-import java.io.Serializable;
11	11
12	12	/**
13	13	* <p>
...	...	@@ -29,35 +29,4 @@
29	29	public Page<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page, MsgTempSerachDTO msgTemp);
30	30
31	31	}
32		-=======
33		-package com.lyms.base.common.service.content;
34		-
35		-import com.baomidou.mybatisplus.plugins.Page;
36		-import com.lyms.base.common.entity.content.ContentMessageTemplate;
37		-import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
38		-import com.lyms.web.service.BaseService;
39		-
40		-import java.io.Serializable;
41		-
42		-/**
43		- * <p>
44		- * 服务类
45		- * </p>
46		- *
47		- * @author yangfei
48		- * @since 2017-04-14
49		- */
50		-public interface ContentMessageTemplateService extends BaseService<ContentMessageTemplate> {
51		-
52		- /**
53		- * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
54		- * <li>@param id 删除主键id
55		- * <li>@return 大于0修改成功，否则为失败
56		- */
57		- public Integer deleteLogicById(Serializable id);
58		-
59		- public Page<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page, String verId);
60		-
61		-}
62		->>>>>>> 181fc2da2ec63e24914c7529c6e7705f02985d0e

...	...	@@ -4,7 +4,6 @@
4	4	import java.util.List;
5	5
6	6	import com.lyms.base.common.entity.content.ContentTemplateMessageTags;
7		-import com.lyms.base.common.vo.content.ContentMessageTemplateVo;
8	7	import com.lyms.web.service.BaseService;
9	8
10	9	/**

1		-<<<<<<< HEAD
2	1	package com.lyms.base.common.service.content.impl;
3	2
4		-import com.baomidou.mybatisplus.plugins.Page;
5		-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
6		-import com.lyms.base.common.dao.content.ContentMessageTemplateMapper;
7		-import com.lyms.base.common.entity.content.ContentMessageTemplate;
8		-import com.lyms.base.common.service.content.ContentMessageTemplateService;
9		-import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
10		-import com.lyms.base.common.vo.content.MsgTempSerachDTO;
11		-import org.springframework.stereotype.Service;
12		-
13	3	import java.io.Serializable;
14	4	import java.util.List;
15	5
16		-/**
17		- * <p>
18		- * 消息模板内容服务实现类
19		- * </p>
20		- *
21		- * @author yangfei
22		- * @since 2017-04-14
23		- */
24		-@Service
25		-public class ContentMessageTemplateServiceImpl extends ServiceImpl<ContentMessageTemplateMapper, ContentMessageTemplate> implements ContentMessageTemplateService {
26		-
27		- public Integer deleteLogicById(Serializable id){
28		- return baseMapper.deleteLogicById(id);
29		- }
	6	+import org.springframework.stereotype.Service;
30	7
31		- @Override
32		- public Page<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page, MsgTempSerachDTO msgTemp) {
33		- List<ContentMessageTemplateDTO> lists = baseMapper.getContentMessageTemplate(page, msgTemp);
34		- page.setRecords(lists);
35		- return page;
36		- }
37		-}
38		-=======
39		-package com.lyms.base.common.service.content.impl;
40		-
41	8	import com.baomidou.mybatisplus.plugins.Page;
42	9	import com.baomidou.mybatisplus.service.impl.ServiceImpl;
43	10	import com.lyms.base.common.dao.content.ContentMessageTemplateMapper;
44	11	import com.lyms.base.common.entity.content.ContentMessageTemplate;
45	12	import com.lyms.base.common.service.content.ContentMessageTemplateService;
46	13	import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
47		-import org.springframework.stereotype.Service;
	14	+import com.lyms.base.common.vo.content.MsgTempSerachDTO;
48	15
49		-import java.io.Serializable;
50		-import java.util.List;
51		-
52	16	/**
53	17	* <p>
54	18	* 消息模板内容服务实现类
55	19
...	...	@@ -65,11 +29,10 @@
65	29	}
66	30
67	31	@Override
68		- public Page<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page, String verId) {
69		- List<ContentMessageTemplateDTO> lists = baseMapper.getContentMessageTemplate(page, verId);
	32	+ public Page<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page, MsgTempSerachDTO msgTemp) {
	33	+ List<ContentMessageTemplateDTO> lists = baseMapper.getContentMessageTemplate(page, msgTemp);
70	34	page.setRecords(lists);
71	35	return page;
72	36	}
73	37	}
74		->>>>>>> 181fc2da2ec63e24914c7529c6e7705f02985d0e

1	1	package com.lyms.base.common.service.content.impl;
2	2
	3	+import java.io.Serializable;
	4	+
	5	+import org.springframework.stereotype.Service;
	6	+
3	7	import com.baomidou.mybatisplus.service.impl.ServiceImpl;
4	8	import com.lyms.base.common.dao.content.ContentTemplateMessageTagsMapper;
5	9	import com.lyms.base.common.entity.content.ContentTemplateMessageTags;
6	10	import com.lyms.base.common.service.content.ContentTemplateMessageTagsService;
7		-import com.lyms.base.common.vo.content.ContentMessageTemplateVo;
8		-
9		-import org.springframework.stereotype.Service;
10		-
11		-import java.io.Serializable;
12		-import java.util.List;
13	11
14	12	/**
15	13	* <p>

1		-<<<<<<< HEAD
2	1	package com.lyms.cm.controller.content;
3	2
4	3	import com.baomidou.mybatisplus.plugins.Page;
...	...	@@ -98,92 +97,4 @@
98	97	return handleAjaxResult(ajaxResult, tag, OperationName.CREATE);
99	98	}
100	99	}
101		-=======
102		-package com.lyms.cm.controller.content;
103		-
104		-import com.baomidou.mybatisplus.plugins.Page;
105		-import com.lyms.base.common.entity.content.ContentCategories;
106		-import com.lyms.base.common.service.content.ContentCategoriesService;
107		-import com.lyms.util.StrUtils;
108		-import com.lyms.web.bean.AjaxResult;
109		-import com.lyms.web.controller.BaseController;
110		-import org.springframework.beans.factory.annotation.Autowired;
111		-import org.springframework.stereotype.Controller;
112		-import org.springframework.web.bind.annotation.RequestMapping;
113		-import org.springframework.web.bind.annotation.RequestMethod;
114		-import org.springframework.web.bind.annotation.RequestParam;
115		-import org.springframework.web.bind.annotation.ResponseBody;
116		-
117		-import java.util.List;
118		-import java.util.Map;
119		-
120		-/**
121		- * <p>
122		- * 栏目前端控制器
123		- * </p>
124		- *
125		- * @author yangfei
126		- * @since 2017-04-14
127		- */
128		-@Controller
129		-@RequestMapping("/contentCategories")
130		-public class ContentCategoriesController extends BaseController {
131		- @Autowired
132		- public ContentCategoriesService categorService;
133		- /**
134		- * 图文获取栏目列表
135		- * @return
136		- */
137		- @ResponseBody
138		- @RequestMapping(value = "/selelist", method = { RequestMethod.GET, RequestMethod.POST })
139		- public AjaxResult selelist() {
140		- List<ContentCategories> lists = categorService.selectList(null);
141		- return AjaxResult.returnSuccess(lists);
142		- }
143		-
144		- /**
145		- * 获取栏目列表
146		- * @param name 栏目名称
147		- * @return
148		- */
149		- @ResponseBody
150		- @RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST })
151		- public Map<String, Object> list(@RequestParam(defaultValue= "",value="name",required = false) String name) {
152		- Page<ContentCategories> page = getPage();
153		- if(StrUtils.isNotEmpty(name)){
154		- page = categorService.getCategories(page,name);
155		- }else{
156		- page = categorService.getCategories(page,null);
157		- }
158		- return toGridData(page);
159		- }
160		-
161		- /**
162		- * 跳转到新增页面
163		- *
164		- * @return
165		- */
166		- @RequestMapping(value = "/toEdit", method = { RequestMethod.GET })
167		- public String toEdit() {
168		- return "/categories/categonies_edit";
169		- }
170		-
171		- /**
172		- * 跳转到列表页面
173		- *
174		- * @return
175		- */
176		- @RequestMapping(value = "/toList", method = { RequestMethod.GET })
177		- public String toList() {
178		- return "/categories/categonies_list";
179		- }
180		-
181		-
182		- @ResponseBody
183		- @RequestMapping(value = "/create", method = { RequestMethod.POST })
184		- public AjaxResult create(ContentCategories cca, AjaxResult ajaxResult) {
185		- return null;
186		- }
187		-}
188		->>>>>>> 181fc2da2ec63e24914c7529c6e7705f02985d0e

1		-<<<<<<< HEAD
2	1	package com.lyms.cm.controller.content;
3	2
4	3	import com.baomidou.mybatisplus.plugins.Page;
5	4
...	...	@@ -94,103 +93,5 @@
94	93	}
95	94
96	95	}
97		-=======
98		-package com.lyms.cm.controller.content;
99	96
100		-import com.baomidou.mybatisplus.plugins.Page;
101		-import com.lyms.base.common.entity.content.ContentMessageTemplate;
102		-import com.lyms.base.common.service.content.ContentMessageTemplateService;
103		-import com.lyms.base.common.service.content.ContentTemplateMessageTagsService;
104		-import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
105		-import com.lyms.base.common.vo.content.InContentMessageTemplateDTO;
106		-import com.lyms.constants.OperationName;
107		-import com.lyms.util.StrUtils;
108		-import com.lyms.web.bean.AjaxResult;
109		-import com.lyms.web.controller.BaseController;
110		-import org.springframework.beans.factory.annotation.Autowired;
111		-import org.springframework.stereotype.Controller;
112		-import org.springframework.ui.Model;
113		-import org.springframework.web.bind.annotation.*;
114		-
115		-import java.util.Date;
116		-import java.util.Map;
117		-
118		-/**
119		- * <p>
120		- * 消息模板内容前端控制器
121		- * </p>
122		- *
123		- * @author yangfei
124		- * @since 2017-04-14
125		- */
126		-@Controller
127		-@RequestMapping("/contentMessageTemplate")
128		-public class ContentMessageTemplateController extends BaseController {
129		- //模板信息
130		- @Autowired
131		- private ContentMessageTemplateService messageTemplateService;
132		- //模板信息标签
133		- @Autowired
134		- private ContentTemplateMessageTagsService messageTagsService;
135		- /**
136		- * 跳转到列表页面
137		- *
138		- * @return
139		- */
140		- @RequestMapping(value = "/toList", method = { RequestMethod.GET })
141		- public String toList() {
142		- return "/content/template_list";
143		- }
144		-
145		- /**
146		- * 跳转到编辑页面
147		- *
148		- * @return
149		- */
150		- @RequestMapping(value = { "/{verId}/toEdit" }, method = RequestMethod.GET)
151		- public String toEdit(@PathVariable String verId, Model model) {
152		- model.addAttribute("verId", verId);
153		- return "/content/template_edit";
154		- }
155		-
156		- /**
157		- * 获取消息内容列表
158		- * @param verId
159		- * @return
160		- */
161		- @ResponseBody
162		- @RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST })
163		- public Map<String, Object> list(@RequestParam String verId) {
164		- Page<ContentMessageTemplateDTO> page = getPage();
165		- System.out.println("verId值:"+verId);
166		- if(StrUtils.isNotEmpty(verId)){
167		- page = messageTemplateService.getContentMessageTemplate(page,verId);
168		- }
169		- return toGridData(page);
170		- }
171		-
172		- /**
173		- * 新增消息模板信息
174		- * <p>
175		- * TODO
176		- *
177		- * @return
178		- */
179		- @RequestMapping(value = "/create", method = RequestMethod.POST)
180		- @ResponseBody
181		- public AjaxResult create(@ModelAttribute InContentMessageTemplateDTO contentMessage, AjaxResult ajaxResult) {
182		- ContentMessageTemplate messTemp = new ContentMessageTemplate();
183		- messTemp.setId(StrUtils.uuid());
184		- messTemp.setCreateTime(new Date());
185		- messTemp.setKeyCode(messTemp.getId());
186		- messTemp.setContent(contentMessage.getContent());
187		- messTemp.setRichTitle(contentMessage.getRichTitle());
188		- messTemp.setRichText(contentMessage.getRichText());
189		- messTemp.setTemplateVersionId(contentMessage.getTemplateVersionId());
190		- boolean tag = messageTemplateService.insert(messTemp);
191		- return handleAjaxResult(ajaxResult, tag, OperationName.CREATE);
192		- }
193		-
194		-}
195		->>>>>>> 181fc2da2ec63e24914c7529c6e7705f02985d0e