Merge branch 'dev' into 'master'

Dev

See merge request !1

cloud-site-api/src/main/java/com/yizhi/site/application/vo/domain/SiteDicVo.java

@@ -52,6 +52,9 @@ public class SiteDicVo {
 
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
+    
+    @ApiModelProperty(value = "排序")
+	private Integer sort;
 
 
     protected Serializable pkVal() {

cloud-site-api/src/main/java/com/yizhi/site/application/vo/site/ImageListVO.java

 package com.yizhi.site.application.vo.site;
 
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,4 +33,10 @@ public class ImageListVO extends KindAndTypeVO {
 	
 	@ApiModelProperty(value = "新闻类型")
     private Long newsType;
+	
+	@ApiModelProperty(value = "创建者名称")
+    private String createByName;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 }

cloud-site-api/src/main/java/com/yizhi/site/application/vo/site/MyItemConfigVO.java

@@ -31,8 +31,8 @@ public class MyItemConfigVO {
 
     @ApiModelProperty(value = "栏目code")
     private String weixinCode;
-    @ApiModelProperty(value = "栏目类型 1-我的培训" + "2-我的课程" + "3-我的作业" + "4-我的考试" + "5-我的调研" +
-            "6-我的积分" + "7-我的做课" + "8-我的投票" + "9-我的分享" + "10-我的消息" + "11-收藏" + "12-我的证书"+"签到"+"我的收藏  等等")
+    @ApiModelProperty(value = "栏目类型 1-我的培训（我的活动）" + "2-我的课程" + "3-我的作业" + "4-我的考试" + "5-我的调研（我参与的问卷）" +
+            "6-我的积分" + "7-我的做课" + "8-我的投票" + "9-我的分享" + "10-我的消息" + "11-收藏" + "12-我的证书"+"签到"+"我的收藏 ;13-我的培训;14-我的评论;15-我的投稿 等等")
     private Integer itemType;
 
     @ApiModelProperty(value = "是否显示:0不显示,1显示（默认为0）")
@@ -50,6 +50,8 @@ public class MyItemConfigVO {
     @ApiModelProperty(value = "接口数据")
     private String interfaceData;
 
+    @ApiModelProperty(value = "logo图标地址")
+    private String logoImg;
 
 
 

cloud-site-service/src/main/java/com/yizhi/site/application/controller/api/PortalBlockController.java

@@ -34,7 +34,7 @@ public class PortalBlockController {
 
     public static final List<BottomMenuVO> defaultBottomMenu = Arrays.asList(
             new BottomMenuVO(1L,"首页",true),
-            new BottomMenuVO(2L,"项目",true),
+            new BottomMenuVO(2L,"活动",true),
             new BottomMenuVO(3L,"课程",true),
             new BottomMenuVO(4L,"营销",true),
             new BottomMenuVO(6L,"社群",false),

cloud-site-service/src/main/java/com/yizhi/site/application/domain/MyItemConfig.java

@@ -94,6 +94,8 @@ public class MyItemConfig extends Model<MyItemConfig> {
     @TableField(value = "update_by_name", fill = FieldFill.INSERT)
     private String updateByName;
 
+    @ApiModelProperty(value = "logo图标地址")
+    private String logoImg;
 
     @Override
     protected Serializable pkVal() {

cloud-site-service/src/main/java/com/yizhi/site/application/domain/MyItemConfigDefault.java

@@ -93,7 +93,9 @@ public class MyItemConfigDefault extends Model<MyItemConfigDefault> {
     @TableField(value = "update_by_name", fill = FieldFill.INSERT)
     private String updateByName;
 
-
+    @ApiModelProperty(value = "logo图标地址")
+    private String logoImg;
+    
     @Override
     protected Serializable pkVal() {
         return this.id;

cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/SiteDicServiceImpl.java

@@ -39,23 +39,29 @@ public class SiteDicServiceImpl extends ServiceImpl<SiteDicMapper, SiteDic> impl
 
     @Override
     public List<SiteDic> getSiteDicListByCode(String code) {
-    	//从新闻资讯获取栏目
-    	List<SiteDic> dics = this.baseMapper.getSiteNewsDicListByCode();
     	//从字典表中获取栏目
     	List<SiteDic> siteDics = this.baseMapper.getSiteDicListByCode(code);
-    	if (CollectionUtils.isNotEmpty(dics) && CollectionUtils.isNotEmpty(siteDics)) {
-    		//重新对字典表中取出的栏目Sort，放在新闻资讯栏目后面
-    		int len = dics.size();
-    		for(SiteDic item : siteDics) {
-    			if(item.getSort() == null){
-    				item.setSort(0);
-    			}
-    			item.setSort(item.getSort() + len);
-    		}
-    		
-    		dics.addAll(siteDics);
+    	
+    	//管理端配置
+    	if(code.equals("mb_navigate")){
+    		//从新闻资讯获取栏目
+        	List<SiteDic> dics = this.baseMapper.getSiteNewsDicListByCode();
+        	if (CollectionUtils.isNotEmpty(dics) && CollectionUtils.isNotEmpty(siteDics)) {
+        		//重新对字典表中取出的栏目Sort，放在新闻资讯栏目后面
+        		int len = dics.size();
+        		for(SiteDic item : siteDics) {
+        			if(item.getSort() == null){
+        				item.setSort(0);
+        			}
+        			item.setSort(item.getSort() + len);
+        		}
+        		
+        		dics.addAll(siteDics);
+        	}
+            return dics;
     	}
-        return dics;
+    	
+    	return siteDics;
     }
 
     @Override

cloud-site-service/src/main/resources/mapper/DataClassificationMapper.xml

@@ -74,7 +74,7 @@
 	
 	<select id="selectClassification" resultType="com.yizhi.site.application.vo.domain.DataClassificationVo">
 		select id, name, create_time as createTime
-		from data_classification where parent_id=#{parentId} and site_id=#{siteId}
+		from data_classification where parent_id=#{parentId} and site_id=#{siteId} AND state=1
 		order by sort
 	</select>
 </mapper>

cloud-site-service/src/main/resources/mapper/MyItemConfigDefaultMapper.xml

@@ -21,6 +21,7 @@
         <result column="updateTime" property="updateTime"/>
         <result column="updateById" property="updateById"/>
         <result column="updateByName" property="updateByName"/>
+        <result column="logo_img" property="logoImg"/>
     </resultMap>
 
     <!--&lt;!&ndash; 通用查询结果列 &ndash;&gt;-->
@@ -28,12 +29,12 @@
             my.id AS id, my.name AS name,my.itemType AS itemType , my.deleted AS deleted, my.showable AS showable,
         my.sort AS sort, my.terminal_type AS terminalType, my.pc_add_url AS pcAddUrl,my.pc_code AS pcCode,my.weixin_code AS weixinCode, my.site_id AS siteId,
         my.create_time AS createTime, my.create_by_id AS createById, my.create_by_name AS createByName,
-        my.update_time AS updateTime, my.update_by_id AS updateById, my.update_by_name AS updateByName
+        my.update_time AS updateTime, my.update_by_id AS updateById, my.update_by_name AS updateByName,my.logo_img
     </sql>
 
     <select id="queryByAuthority" resultMap="BaseResultMap">
         select my.id AS id, my.name AS name,my.item_type AS itemType,my.deleted AS deleted, my.showable AS showable,
-        my.sort AS sort, my.terminal_type AS terminalType,my.site_id AS siteId,my.pc_code AS pcCode,my.pc_add_url AS pcAddUrl,my.weixin_code AS weixinCode
+        my.sort AS sort, my.terminal_type AS terminalType,my.site_id AS siteId,my.pc_code AS pcCode,my.pc_add_url AS pcAddUrl,my.weixin_code AS weixinCode,my.logo_img
         from my_item_config_default my
         <where>
             my.deleted = 0 and my.showable = 1
@@ -49,7 +50,7 @@
 
     <select id="queryMyitemConfigByCondition" resultMap="BaseResultMap">
         select my.id AS id, my.name AS name,my.item_type AS itemType , my.deleted AS deleted, my.showable AS showable,
-        my.sort AS sort, my.terminal_type AS terminalType, my.site_id AS siteId,my.pc_code AS pcCode,my.pc_add_url AS pcAddUrl,my.weixin_code AS weixinCode
+        my.sort AS sort, my.terminal_type AS terminalType, my.site_id AS siteId,my.pc_code AS pcCode,my.pc_add_url AS pcAddUrl,my.weixin_code AS weixinCode,my.logo_img
         from my_item_config_default my
         <where>
             my.deleted = 0

cloud-site-service/src/main/resources/mapper/MyItemConfigMapper.xml

@@ -21,6 +21,7 @@
         <result column="updateTime" property="updateTime"/>
         <result column="updateById" property="updateById"/>
         <result column="updateByName" property="updateByName"/>
+        <result column="logo_img" property="logoImg"/>
     </resultMap>
 
     <!--&lt;!&ndash; 通用查询结果列 &ndash;&gt;-->
@@ -28,12 +29,12 @@
         my.id AS id, my.name AS name,my.itemType AS itemType , my.deleted AS deleted, my.showable AS showable,
         my.sort AS sort, my.terminal_type AS terminalType, my.pc_add_url AS pcAddUrl,my.pc_code AS pcCode,my.weixin_code AS weixinCode, my.site_id AS siteId,
         my.create_time AS createTime, my.create_by_id AS createById, my.create_by_name AS createByName,
-        my.update_time AS updateTime, my.update_by_id AS updateById, my.update_by_name AS updateByName
+        my.update_time AS updateTime, my.update_by_id AS updateById, my.update_by_name AS updateByName,my.logo_img
     </sql>
 
     <select id="queryMyitemConfigByCondition" resultMap="BaseResultMap">
         select my.id AS id, my.name AS name,my.item_type AS itemType , my.deleted AS deleted, my.showable AS showable,
-        my.sort AS sort, my.terminal_type AS terminalType, my.site_id AS siteId
+        my.sort AS sort, my.terminal_type AS terminalType, my.site_id AS siteId,my.logo_img
         from my_item_config my
         <where>
             my.deleted = 0
@@ -55,7 +56,7 @@
 
     <select id="queryByAuthoity" resultMap="BaseResultMap">
         select my.id AS id, my.name AS name,my.item_type AS itemType,my.deleted AS deleted, my.showable AS showable,
-        my.sort AS sort, my.terminal_type AS terminalType,my.site_id AS siteId,my.pc_code AS pcCode,my.pc_add_url AS pcAddUrl,my.weixin_code AS weixinCode
+        my.sort AS sort, my.terminal_type AS terminalType,my.site_id AS siteId,my.pc_code AS pcCode,my.pc_add_url AS pcAddUrl,my.weixin_code AS weixinCode,my.logo_img
         from my_item_config my
         <where>
             my.deleted = 0

cloud-site-service/src/main/resources/mapper/SiteDicMapper.xml

@@ -32,7 +32,7 @@
         WHERE
         parent_id = ( SELECT ld.id FROM site_dic ld WHERE ld.`code` = #{code})
         and status <![CDATA[ <> ]]> 0
-        <if test= "code == 'language' or code == 'mb_navigate'">
+        <if test= "code == 'language' or code == 'mb_navigate' or code == 'activity_type'">
         order by sort,name
         </if>
         <if test= "code != 'language' and code != 'mb_navigate'">
@@ -43,7 +43,7 @@
 	<select id="getSiteNewsDicListByCode" resultType="com.yizhi.site.application.domain.SiteDic">
         SELECT a.id,a.id AS relationId,a.parent_id,a.name,'news' AS code,a.description AS des,a.state AS status,0 AS type,a.create_time,a.update_time,a.sort
 		FROM data_classification a
-		WHERE a.parent_id=0
+		WHERE a.parent_id=0 AND a.state=1
 		ORDER BY a.sort
     </select>