Merge branch 'yonge_master' into test

cms/src/main/java/com/ym/mec/cms/config/ResourceServerConfig.java

@@ -27,7 +27,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 		http.authorizeRequests()
 		.antMatchers("/task/**")
 		.hasIpAddress("0.0.0.0/0")
-				.antMatchers("/v2/api-docs", "/news/list", "/news/query", "/news/homeList")
+				.antMatchers("/v2/api-docs", "/news/list", "/news/query", "/news/homeList", "/news/typeList")
 				.permitAll()
 				// 任何人不登录都可以获取的资源
 				// .antMatchers("/ipController/**").hasIpAddress("127.0.0.1") //特定ip可以不登录获取资源

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -1,8 +1,5 @@
 package com.ym.mec.cms.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -19,10 +16,13 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.cms.controller.queryinfo.NewsInformationQueryInfo;
 import com.ym.mec.cms.dal.dao.SysNewsInformationDao;
 import com.ym.mec.cms.dal.entity.SysNewsInformation;
 import com.ym.mec.cms.service.SysNewsInformationService;
+import com.ym.mec.cms.service.SysNewsTypeService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.util.collection.MapUtil;
 import com.yonge.log.model.AuditLogAnnotation;
@@ -36,6 +36,9 @@ public class NewsController extends BaseController {
 	private SysNewsInformationService sysNewsInformationService;
 	
 	@Autowired
+	private SysNewsTypeService sysNewsTypeService;
+	
+	@Autowired
 	private SysNewsInformationDao sysNewsInformationDao;
 	
 	@Autowired
@@ -57,6 +60,12 @@ public class NewsController extends BaseController {
 		return succeed(sysNewsInformationService.queryPage(queryInfo));
 	}
 
+	@ApiOperation("资讯类型列表查询")
+	@GetMapping(value = "/typeList")
+	public Object getTypeList(Integer parentId) {
+		return succeed(sysNewsTypeService.queryByParentId(parentId));
+	}
+
 	@ApiOperation("资讯列表分页查询")
 	@GetMapping(value = "/homeList")
 	public Object getHomeList(NewsInformationQueryInfo queryInfo) {

cms/src/main/java/com/ym/mec/cms/dal/dao/SysNewsTypeDao.java

@@ -0,0 +1,13 @@
+package com.ym.mec.cms.dal.dao;
+
+import java.util.List;
+
+import com.ym.mec.cms.dal.entity.SysNewsType;
+import com.ym.mec.cms.dal.entity.SysNewsTypeTree;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface SysNewsTypeDao extends BaseDAO<Integer, SysNewsType> {
+
+	// 根据父级查询子集
+	List<SysNewsTypeTree> queryByParentId(Integer parentId);
+}

cms/src/main/java/com/ym/mec/cms/dal/entity/SysNewsType.java

@@ -0,0 +1,81 @@
+package com.ym.mec.cms.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(sys_news_type):
+ */
+public class SysNewsType {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private String name;
+	
+	/**  */
+	private Integer parentId;
+	
+	/**  */
+	private boolean delFlag;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setName(String name){
+		this.name = name;
+	}
+	
+	public String getName(){
+		return this.name;
+	}
+			
+	public void setParentId(Integer parentId){
+		this.parentId = parentId;
+	}
+	
+	public Integer getParentId(){
+		return this.parentId;
+	}
+			
+	public void setDelFlag(boolean delFlag){
+		this.delFlag = delFlag;
+	}
+	
+	public boolean isDelFlag(){
+		return this.delFlag;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

cms/src/main/java/com/ym/mec/cms/dal/entity/SysNewsTypeTree.java

@@ -0,0 +1,17 @@
+package com.ym.mec.cms.dal.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SysNewsTypeTree extends SysNewsType {
+
+	private List<SysNewsTypeTree> subTypeList = new ArrayList<SysNewsTypeTree>();
+
+	public List<SysNewsTypeTree> getSubTypeList() {
+		return subTypeList;
+	}
+
+	public void setSubTypeList(List<SysNewsTypeTree> subTypeList) {
+		this.subTypeList = subTypeList;
+	}
+}

cms/src/main/java/com/ym/mec/cms/service/SysNewsTypeService.java

@@ -0,0 +1,15 @@
+package com.ym.mec.cms.service;
+
+import java.util.List;
+
+import com.ym.mec.cms.dal.entity.SysNewsType;
+import com.ym.mec.cms.dal.entity.SysNewsTypeTree;
+import com.ym.mec.common.service.BaseService;
+
+public interface SysNewsTypeService extends BaseService<Integer, SysNewsType> {
+	
+	List<SysNewsTypeTree> queryTree(Integer parentId);
+
+	//根据父级查询子集
+	List<SysNewsTypeTree> queryByParentId(Integer parentId);
+}

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsTypeServiceImpl.java

@@ -0,0 +1,49 @@
+package com.ym.mec.cms.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.cms.dal.dao.SysNewsTypeDao;
+import com.ym.mec.cms.dal.entity.SysNewsType;
+import com.ym.mec.cms.dal.entity.SysNewsTypeTree;
+import com.ym.mec.cms.service.SysNewsTypeService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class SysNewsTypeServiceImpl extends BaseServiceImpl<Integer, SysNewsType>  implements SysNewsTypeService {
+	
+	@Autowired
+	private SysNewsTypeDao sysNewsTypeDao;
+
+	@Override
+	public BaseDAO<Integer, SysNewsType> getDAO() {
+		return sysNewsTypeDao;
+	}
+
+	@Override
+	public List<SysNewsTypeTree> queryTree(Integer parentId) {
+		if(parentId == null){
+			parentId = 0 ;
+		}
+		List<SysNewsTypeTree> sysNewsTypeList = queryByParentId(parentId);
+		if(sysNewsTypeList != null && sysNewsTypeList.size() > 0){
+			for(SysNewsTypeTree type : sysNewsTypeList){
+				type.setSubTypeList(queryTree(type.getId()));
+			}
+		}
+		
+		return sysNewsTypeList;
+	}
+
+	@Override
+	public List<SysNewsTypeTree> queryByParentId(Integer parentId) {
+		if(parentId == null){
+			parentId = 0 ;
+		}
+		return sysNewsTypeDao.queryByParentId(parentId);
+	}
+	
+}

cms/src/main/resources/config/mybatis/SysNewsTypeMapper.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<mapper namespace="com.ym.mec.cms.dal.dao.SysNewsTypeDao">
+
+	<resultMap type="com.ym.mec.cms.dal.entity.SysNewsType" id="SysNewsType">
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="parent_id_" property="parentId" />
+		<result column="del_flag_" property="delFlag" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<resultMap type="com.ym.mec.cms.dal.entity.SysNewsTypeTree" extends="SysNewsType" id="SysNewsTypeTree">
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="SysNewsType">
+		SELECT * FROM
+		sys_news_type WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="SysNewsType">
+		SELECT * FROM sys_news_type ORDER
+		BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.cms.dal.entity.SysNewsType"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO sys_news_type
+		(id_,name_,parent_id_,del_flag_,create_time_,update_time_)
+		VALUES(#{id},#{name},#{parentId},#{delFlag},#{createTime},#{updateTime})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.cms.dal.entity.SysNewsType">
+		UPDATE sys_news_type
+		<set>
+			<if test="parentId != null">
+				parent_id_ = #{parentId},
+			</if>
+			<if test="delFlag != null">
+				del_flag_ = #{delFlag},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="name != null">
+				name_ = #{name},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM sys_news_type WHERE id_ = #{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="SysNewsType" parameterType="map">
+		SELECT * FROM sys_news_type ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM sys_news_type
+	</select>
+	
+	<select id="queryByParentId" resultMap="SysNewsTypeTree">
+		SELECT * FROM sys_news_type where parent_id_ = #{parentId}
+	</select>
+</mapper>