copy

LOG_PATH_IS_UNDEFINED/LOG_FILE_IS_UNDEFINED-2020-10-10-0.log

+2020-10-10 16:28:58.427 [main] INFO  c.a.cloud.nacos.client.NacosPropertySourceBuilder - Loading nacos data, dataId: 'common-sit.properties', group: 'DEFAULT_GROUP'
+2020-10-10 16:28:58.435 [main] INFO  c.a.cloud.nacos.client.NacosPropertySourceBuilder - Loading nacos data, dataId: 'portal-sit.properties', group: 'DEFAULT_GROUP'
+2020-10-10 16:28:58.436 [main] INFO  o.s.c.b.c.PropertySourceBootstrapConfiguration - Located property source: [BootstrapPropertySource {name='bootstrapProperties-portal-sit.properties'}, BootstrapPropertySource {name='bootstrapProperties-portal.properties'}, BootstrapPropertySource {name='bootstrapProperties-common-sit.properties'}]

LOG_PATH_IS_UNDEFINED/LOG_FILE_IS_UNDEFINED-2020-10-12-0.log

+2020-10-12 13:55:38.681 [main] INFO  c.a.cloud.nacos.client.NacosPropertySourceBuilder - Loading nacos data, dataId: 'common-sit.properties', group: 'DEFAULT_GROUP'
+2020-10-12 13:55:38.691 [main] INFO  c.a.cloud.nacos.client.NacosPropertySourceBuilder - Loading nacos data, dataId: 'portal-sit.properties', group: 'DEFAULT_GROUP'
+2020-10-12 13:55:38.692 [main] INFO  o.s.c.b.c.PropertySourceBootstrapConfiguration - Located property source: [BootstrapPropertySource {name='bootstrapProperties-portal-sit.properties'}, BootstrapPropertySource {name='bootstrapProperties-portal.properties'}, BootstrapPropertySource {name='bootstrapProperties-common-sit.properties'}]
+2020-10-12 13:57:28.505 [main] INFO  c.a.cloud.nacos.client.NacosPropertySourceBuilder - Loading nacos data, dataId: 'common-sit.properties', group: 'DEFAULT_GROUP'
+2020-10-12 13:57:28.513 [main] INFO  c.a.cloud.nacos.client.NacosPropertySourceBuilder - Loading nacos data, dataId: 'portal-sit.properties', group: 'DEFAULT_GROUP'
+2020-10-12 13:57:28.514 [main] INFO  o.s.c.b.c.PropertySourceBootstrapConfiguration - Located property source: [BootstrapPropertySource {name='bootstrapProperties-portal-sit.properties'}, BootstrapPropertySource {name='bootstrapProperties-portal.properties'}, BootstrapPropertySource {name='bootstrapProperties-common-sit.properties'}]
+2020-10-12 14:01:17.889 [main] INFO  c.a.cloud.nacos.client.NacosPropertySourceBuilder - Loading nacos data, dataId: 'common-sit.properties', group: 'DEFAULT_GROUP'
+2020-10-12 14:01:17.897 [main] INFO  c.a.cloud.nacos.client.NacosPropertySourceBuilder - Loading nacos data, dataId: 'portal-sit.properties', group: 'DEFAULT_GROUP'
+2020-10-12 14:01:17.898 [main] INFO  o.s.c.b.c.PropertySourceBootstrapConfiguration - Located property source: [BootstrapPropertySource {name='bootstrapProperties-portal-sit.properties'}, BootstrapPropertySource {name='bootstrapProperties-portal.properties'}, BootstrapPropertySource {name='bootstrapProperties-common-sit.properties'}]
+2020-10-12 15:27:56.331 [main] INFO  c.a.cloud.nacos.client.NacosPropertySourceBuilder - Loading nacos data, dataId: 'common-sit.properties', group: 'DEFAULT_GROUP'
+2020-10-12 15:27:56.339 [main] INFO  c.a.cloud.nacos.client.NacosPropertySourceBuilder - Loading nacos data, dataId: 'portal-sit.properties', group: 'DEFAULT_GROUP'
+2020-10-12 15:27:56.340 [main] INFO  o.s.c.b.c.PropertySourceBootstrapConfiguration - Located property source: [BootstrapPropertySource {name='bootstrapProperties-portal-sit.properties'}, BootstrapPropertySource {name='bootstrapProperties-portal.properties'}, BootstrapPropertySource {name='bootstrapProperties-common-sit.properties'}]

README.md

-# site-project
-
+站点管理，配置PC首页、微信(APP)首页
\ No newline at end of file

cloud-site-api/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.yizhi</groupId>
+        <artifactId>site-project</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cloud-site-api</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-common-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-orm</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-util</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.mybatis.generator</groupId>
+                <artifactId>mybatis-generator-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file

cloud-site-api/src/main/java/com/yizhi/site/application/enums/BlockTypeCode.java

+package com.yizhi.site.application.enums;
+
+/**
+ * @Author: XieHaijun
+ * @Description:
+ * @Date: Created in 16:43 2018/7/24
+ * @Modified By
+ */
+public enum BlockTypeCode {
+
+    NOTICE(3,"公告栏区块"),
+    NAVIGATION_MENU(2,"菜单栏区块"),
+    BOTTOM_MENU(1,"底部菜单区块");
+
+    private Integer code;
+    private String name;
+
+    BlockTypeCode(Integer code,String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

cloud-site-api/src/main/java/com/yizhi/site/application/enums/FunctionDeviceTypeCode.java

+package com.yizhi.site.application.enums;
+
+/**
+ * @Author: XieHaijun
+ * @Description:
+ * @Date: Created in 16:43 2018/7/24
+ * @Modified By
+ */
+public enum FunctionDeviceTypeCode {
+
+    PC_AND_TEL("01","pc端&移动端"),
+    PC("02","PC端"),
+    MG_WECHAT_PC("05","后台、PC端&移动端");
+
+    private String code;
+    private String name;
+
+    FunctionDeviceTypeCode(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

cloud-site-api/src/main/java/com/yizhi/site/application/enums/FunctionTypeCode.java

+package com.yizhi.site.application.enums;
+
+/**
+ * @Author: XieHaijun
+ * @Description:
+ * @Date: Created in 16:43 2018/7/24
+ * @Modified By
+ */
+public enum FunctionTypeCode {
+
+    COURSE("01","课程学时显示"),
+    TRAINING("02","项目学时显示"),
+    VIDEO_HORSE_LAMP("03","视频跑马灯"),
+    SIGN("04","签到打卡悬浮入口"),
+    // 语种
+    LANGUAGE("05","语种"),
+    LIVEREPLAY("06","直播回放入口");
+
+    private String code;
+    private String name;
+
+    FunctionTypeCode(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

cloud-site-api/src/main/java/com/yizhi/site/application/enums/ImportError.java

+package com.yizhi.site.application.enums;
+
+/**
+ * @description:
+ * @author: lingye
+ * @date: 2020-8-20
+ **/
+public interface ImportError {
+
+    final String KEY_EMPTY ="key值为空";
+    final String PRE_TRANSLATION_EMPTY ="中文字段为空";
+    final String POST_TRANSLATION_EMPTY ="";
+    final String SCORE_EMPTY ="讲师评分为空";
+    final String LECTURER_NOT_EXIST ="编码匹配的讲师不存在";
+    final String COURSE_NOT_EXIST ="课程不存在";
+    final String GRADE_NOT_EXIST ="级别不存在";
+    final String COURSE_TYPE_ERROR ="课程类型不正确";
+    final String GRADE_EMPTY ="评级为空";
+    final String SCORE_FORMAT_ERROR ="评分必须在区间0~5，保留小数点后一位";
+    final String COURSE_EXIST = "课程已经关联讲师";
+    final String REPEAT_CODE = "讲师重复";
+    final String COURSE_CODE_NOT_EXIST = "课程code不能为空";
+    final String KEY_EXIST_IN_FILE ="文件中key重复";
+}

cloud-site-api/src/main/java/com/yizhi/site/application/enums/PortalEnum.java

+package com.yizhi.site.application.enums;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * 门户枚举字段
+ * @date 2019年5月9日
+ * @author lly
+ */
+public enum PortalEnum {
+
+    ZERO,ONE,TWO,THREE,FOUR,FIVE,SIX,SEVEN,EIGHT,NINE,TEN,TWELVE(12),FIFTEEN(15);
+
+    private int value;
+
+    PortalEnum() {
+    }
+
+    PortalEnum(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    @JsonCreator
+    public static PortalEnum forValue(int ordinal) {
+        return PortalEnum.values()[ordinal];
+    }
+
+    @JsonValue
+    public int toValue() {
+        return this.ordinal();
+    }
+
+}

cloud-site-api/src/main/java/com/yizhi/site/application/enums/SiteEnum.java

+package com.yizhi.site.application.enums;
+
+/**
+ * 操作枚举类
+ * @author lly
+ * @date 2019-4-19
+ */
+public enum SiteEnum {
+    UP("up","上移"),DOWN("down","下移"),TOP("top","置顶"),STOP("stop","停用"),START("start","启用");
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    private String key;
+    private String value;
+
+    SiteEnum(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/AboutusManageFeignClients.java

+package com.yizhi.site.application.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(name = "portal", contextId = "AboutusManageFeignClients")
+public interface AboutusManageFeignClients {
+	
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/BannerManageFeignClients.java

+package com.yizhi.site.application.feign;
+
+import com.yizhi.site.application.vo.site.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * 轮播
+ * @author HUIHUI.DUAN
+ * @date 2018/3/28 10:44
+ */
+@FeignClient(name = "portal", contextId = "BannerManageFeignClients")
+public interface BannerManageFeignClients {
+	
+	/**
+	 * 轮播banner管理
+	 * @param page
+	 * @return
+	 */
+	@GetMapping("/manage/banner/list")
+    ReturnImageVO listPage(@RequestBody SiteComponyIdVO siteComponyIdVO);
+	
+	
+	/**
+	 * 轮播banner预览
+	 * @param id
+	 * @return
+	 */
+	@GetMapping("/manage/banner/preview")
+	List<PortalBannerVo>  viewMessage(@RequestParam("id") Long id);
+	
+	/**
+	 * 轮播banner项列表
+	 * @return
+	 */
+	@GetMapping("/manage/banner/item/list")
+	public List<ImageListVO> selectBanner(ImageListVO imageListVO);
+	
+
+	/**
+	 * 轮播banner图片拖动
+	 * @param vo
+	 * @return
+	 */
+	@PostMapping("/manage/banner/item/drag")
+	Boolean dragImage(@RequestBody IdTwoVO vo);
+	
+	/**
+	 * 轮播banner项新增
+	 * @param PortalBanner
+	 * @return
+	 */
+	@PostMapping("/manage/banner/item/insert")
+	Long insertDetail(@RequestBody BannerImageListVO vo);
+	
+	/**
+	 * 轮播banner项修改
+	 * @param PortalBanner
+	 * @return
+	 */
+	@PostMapping("/manage/banner/item/update")
+	Long updateImage(@RequestBody BannerImageListVO vo);
+	
+	/**
+	 * 轮播banner项删除
+	 * @param id
+	 * @return
+	 */
+	@PostMapping("/manage/banner/item/delete")
+	Boolean bannerDelete(@RequestBody IdOneVO vo);
+	
+	
+	/**
+	 * 轮播banner项上架
+	 * @param id
+	 * @return
+	 */
+	@PostMapping("/manage/banner/item/up")
+	Boolean bannerUp(@RequestBody IdOneVO vo);
+	
+	/**
+	 * 轮播banner项下架
+	 * @param id
+	 * @return
+	 */
+	@PostMapping("/manage/banner/item/down")
+	Boolean bannerDown(@RequestBody IdOneVO vo);
+	
+	/**
+	 * 首页获取轮播图片
+	 * @param vo
+	 * @return
+	 */
+	@PostMapping("/manage/banner/home/image/listHomeImage")
+	List<ImageListVO> listAllHomeBannerImage(@RequestBody AllHomeBannerImageVO vo);
+
+    /**
+     * 定时上架banner
+     * @param id
+     * @return
+     * @since 2018-9-5 15:23:40
+     */
+    @PostMapping(value = "/manage/banner/up")
+    Boolean upBanner(@RequestParam(value = "id") Long id);
+
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/ClassifyManageFeignClients.java

+package com.yizhi.site.application.feign;
+
+import com.yizhi.core.application.context.RequestContext;
+import com.yizhi.site.application.vo.domain.DataClassificationVo;
+import com.yizhi.site.application.vo.domain.InformationVo;
+import com.yizhi.site.application.vo.site.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "portal", contextId = "ClassifyManageFeignClients")
+public interface ClassifyManageFeignClients {
+	
+	/**
+	 * 根据父类id查询子级分类
+	 * @param parentId
+	 * @return
+	 */
+	@GetMapping("/manage/classify/childnode/find")
+	List<DataClassificationVo> getInformation(@RequestParam(name="parentId") Long parentId);
+	
+	/**
+	 * 获取分类列表
+	 * @param siteId
+	 * @return
+	 */
+	@GetMapping("/manage/site/classify/list")
+	List<ClassificationVO> getClassification(
+			@RequestBody SiteComponyIdVO siteComponyIdVO);
+	/**
+	 * 新增分类
+	 * @param dataClassificationEntityVo
+	 * @return
+	 */
+	@PostMapping("/manage/site/classify/insertClassify")
+	Boolean insertClassify(@RequestBody DataClassificationVo dataClassificationEntityVo);
+	/**
+	 * 查询所有的父节点
+	 * @return
+	 */
+	@GetMapping("/manage/site/classify/select")
+	List<DataClassificationVo> selectParent(@RequestBody RequestContext context);
+	/**
+	 * 修改分类资料
+	 * @param
+	 * @return
+	 */
+	@PostMapping("/manage/site/classify/updateClassify")
+	public Boolean updateClassify(@RequestBody DataClassificationVo dataClassificationEntityVo);
+	/**
+	 * 删除分类
+	 * @param id
+	 */
+	@PostMapping("/manage/site/classify/delete")
+	public RespVO deleteClassify(@RequestBody IdOneVO vo);
+	/**
+	 * 查找资讯
+	 * @param id
+	 */
+	@GetMapping("/manage/site/classify/information/select")
+	public List<InformationVo> selectInformation(@RequestParam(name="typeTwo")Long typeTwo);
+
+	/**
+	 * 资讯分类拖拽排序
+	 */
+	@PostMapping("/manage/site/classify/dragClassify")
+	Boolean dragClassify(@RequestBody IdTwoVO vo);
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/InformationManageFeignClients.java

+package com.yizhi.site.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.site.application.vo.domain.InformationVo;
+import com.yizhi.site.application.vo.site.IdOneVO;
+import com.yizhi.site.application.vo.site.InfomationParamReleaseVO;
+import com.yizhi.site.application.vo.site.InfomationParamVO;
+import com.yizhi.site.application.vo.site.ParamVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "portal", contextId = "InformationManageFeignClients")
+public interface InformationManageFeignClients {
+
+	/**
+	 * 查看资讯
+	 */
+	@PostMapping("/manage/site/classify/info/list")
+	public Page<InformationVo> list(@RequestBody InfomationParamVO vo);
+
+	@ApiOperation(value = "查询发布的新闻列表")
+	@PostMapping("/manage/site/classify/info/release/list")
+	public Page<InformationVo> releaseList(@RequestBody InfomationParamReleaseVO vo);
+
+	/**
+	 * 保存资料分类
+	 */
+	@PostMapping("/manage/site/classify/info/insert")
+	public Long insert(@RequestBody InformationVo information);
+
+	/**
+	 * 修改资料分类
+	 */
+	@PostMapping("/manage/site/classify/info/update")
+	public Boolean update(@RequestBody InformationVo information);
+
+	/**
+	 * 删除资讯
+	 */
+	@PostMapping("/manage/site/classify/info/delete")
+	Boolean deleteById(@RequestBody IdOneVO vo);
+
+	/**
+	 * 资讯发布
+	 */
+	@PostMapping("/manage/site/classify/info/releases")
+	boolean releases(@RequestBody ParamVO vo);
+
+	/**
+	 * 资讯取消发布
+	 */
+	@PostMapping("/manage/site/classify/info/unreleases")
+	boolean unreleases(@RequestBody ParamVO vo);
+
+	/**
+	 * 资讯预览
+	 */
+	@GetMapping(value = "/manage/site/classify/info/view/{id}")
+	InformationVo informationView(@RequestParam(name = "id") Long id);
+
+	/**
+	 * 置顶
+	 */
+	@PostMapping("/manage/site/classify/info/top")
+	Boolean top(@RequestBody IdOneVO vo);
+
+	/**
+	 * 搜索资讯
+	 */
+	@GetMapping(value = "/manage/site/classify/info/listbyName")
+	List<InformationVo> listbyName(@RequestParam(name = "name") String name, @RequestParam(name = "siteId") Long siteId);
+
+    /**
+     * 新闻资讯公告上架
+     * @param id 新闻公告id
+     * @return
+     */
+    @GetMapping("/manage/site/classify/info/upInfomation")
+    public boolean upInfomation(@RequestParam(value = "id") Long id);
+	/**
+	 * 新闻资讯pdf转图片需要
+	 * @return
+	 */
+	@PostMapping(value = "/manage/site/classify/info/updateContent")
+	public boolean updateContent(@RequestBody InformationVo information);
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/InformationStudentFeignClients.java

+package com.yizhi.site.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.site.application.vo.domain.InformationVo;
+import com.yizhi.site.application.vo.site.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 学员端-新闻资讯接口
+ * @author mei
+ *
+ */
+@FeignClient(name = "portal", contextId = "InformationStudentFeignClients")
+public interface InformationStudentFeignClients {
+
+	/**
+	 * 获取新闻资讯列表
+	 * @param
+	 * @return
+	 */
+	@PostMapping("/api/info/page/list")
+	public InformationListVO informationPageList(@RequestBody InfoVO infoVO);
+
+	/**
+	 * 获取新闻资讯banner
+	 * @param infoVO
+	 * @return
+	 */
+	@PostMapping("/api/info/mobile/bannerImages")
+	public List<ImageListVO> listBannerImages(@RequestBody InfoVO infoVO);
+
+	/**
+	 *pc端,新闻/公告列表
+	 *
+	 * @param infoVO
+	 * @return
+	 */
+	@PostMapping("/api/info/page/pcList")
+	public InformationListPcVo informationPcPageList(@RequestBody InfoVO infoVO);
+
+	/**
+	 *pc端,新闻/公告列表
+	 * 版本2  公告的查询修改
+	 */
+	@PostMapping("/api/info/page/v2/pcList")
+	public InformationListPcVo informationPcPageListV2(@RequestBody InfoVO infoVO);
+
+	/**
+	 * pc端查看新闻资讯详情
+	 *
+	 * @param id
+	 * @return
+	 */
+	@PostMapping("/api/info/pcView")
+	public InformationViewVO getPcInformation(@RequestBody IdOneVO id);
+
+	/**
+	 * 获取新闻资讯列表
+	 * @param
+	 * @return
+	 */
+	@PostMapping("/api/info/list")
+	public InformationListVO informationList(@RequestBody InfoVO infoVO);
+
+	/**
+	 * 查看新闻资讯详情
+	 * @param
+	 * @return
+	 */
+	@PostMapping("/api/info/view")
+	public InformationViewVO getInformation(@RequestBody IdOneVO id);
+
+	public
+
+	/**
+	 * 首页搜索新闻资讯
+	 * @param id
+	 * @return
+	 */
+	@PostMapping("/api/info/home/search")
+	Page<InformationVo> searchInformation(@RequestBody InfomationParamVO vo);
+
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/InternationalClient.java

+package com.yizhi.site.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.site.application.vo.domain.SiteLanguageVo;
+import com.yizhi.site.application.vo.site.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 国际化feign
+ * 2020-8-24 17:11:14
+ *
+ * @author lingye
+ */
+@FeignClient(name = "portal", contextId = "InternationalClient")
+public interface InternationalClient {
+    /**
+     * 国际化导入
+     * @param model
+     * @return
+     */
+    @PostMapping(value = "/international/import")
+    String importInternational(@RequestBody InternationalFileUpVO model);
+
+    /**
+     * 查询国际化的管理管的列表
+     *
+     * @param type
+     * @param languageId
+     * @param keywords
+     * @param state
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/international/page")
+    Page<InternationalVO> findInternationalPage(
+            @RequestParam(name = "type", required = false) Integer type,
+            @RequestParam(name = "languageId", required = false) Long languageId,
+            @RequestParam(name = "keywords", required = false) String keywords,
+            @RequestParam(name = "state", required = false) Integer state,
+            @RequestParam(name = "pageNo", required = false) Integer pageNo,
+            @RequestParam(name = "pageSize", required = false) Integer pageSize);
+
+    /**
+     * 接口列表
+     * @param type
+     * @param languageId
+     * @param keywords
+     * @param state
+     * @return
+     */
+    @GetMapping("/international/list")
+    List<InternationalVO> findInternationalList(
+            @RequestParam(name = "type", required = false) Integer type,
+            @RequestParam(name = "languageId", required = false) Long languageId,
+            @RequestParam(name = "keywords", required = false) String keywords,
+            @RequestParam(name = "state", required = false) Integer state
+    );
+
+    /**
+     * 修改国际化实体
+     *
+     * @param internationalVO
+     * @return
+     */
+    @PostMapping("/international/update")
+    InternationalVO updateInternational(
+            @RequestBody InternationalVO internationalVO);
+
+
+    /**
+     * 国际化导出
+     *
+     * @param model
+     * @return
+     */
+    @PostMapping(value = "/international/import")
+    String importInternational(@RequestBody FileUploadModel model);
+
+    /**
+     * 列表
+     *
+     * @param pageNo
+     * @param pageSize
+     * @param status
+     * @return
+     */
+
+    @GetMapping("/siteLanguage/list")
+    Page<SiteLanguageVO> getList(
+            @RequestParam(name = "pageNo") Integer pageNo,
+            @RequestParam(name = "pageSize") Integer pageSize,
+            @RequestParam(name = "status",required = false) Integer status
+    );
+    /**
+     * 上移下移语言
+     * @param sortVO
+     * @return
+     */
+    @PostMapping("/siteLanguage/sort")
+    Boolean sortLanguage(@RequestBody PortalTemplateVO sortVO);
+
+    /**
+     * 停用启用
+     * @param siteLanguage
+     * @return
+     */
+    @PostMapping("/siteLanguage/update")
+    Boolean update(@RequestBody SiteLanguageVo siteLanguage);
+
+    /**
+     * 初始化语言json redis
+     */
+    @GetMapping(value = "/international/language/init")
+    void initLanguage();
+    /**
+     * 获取语言json
+     * @param type
+     * @param languageCode
+     * @return
+     */
+    @GetMapping("/international/language/get")
+    HashMap<String, String> getLanguage(@RequestParam(name = "type",required = true) Integer type, @RequestParam(name = "languageCode",required = true) String languageCode);
+
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/MoreSiteManageFeignClients.java

+package com.yizhi.site.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.site.application.vo.domain.SiteVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 多站点管理
+ * 
+ * @author HUIHUI.DUAN
+ * @date 2018/3/28 10:44
+ *
+ */
+@FeignClient(name = "portal", contextId = "MoreSiteManageFeignClients")
+public interface MoreSiteManageFeignClients {
+
+	/**
+	 * 分页列表
+	 */
+	@GetMapping("/sites/list")
+	Page<SiteVo> listPage(@RequestBody Page<SiteVo> page);
+
+	/**
+	 * 新增站点
+	 */
+	@PostMapping("/sites/insert")
+	Boolean insertDetail(@RequestBody SiteVo site);
+
+	/**
+	 * 站点编辑
+	 */
+	@PostMapping("/sites/update")
+	Boolean updateById(@RequestBody SiteVo site);
+
+	/**
+	 * 站点查看
+	 */
+	@GetMapping("/sites/view")
+	SiteVo find(@RequestParam("id") Long id);
+
+	/**
+	 * 站点上架
+	 */
+	@PostMapping("/sites/up")
+	Boolean siteUp(@RequestParam("id") Long id);
+
+	/**
+	 * 站点上架
+	 */
+	@PostMapping("/sites/down")
+	Boolean siteDown(@RequestParam("id") Long id);
+
+	/**
+	 * 站点设置管理人员
+	 */
+	@PostMapping("/sites/user/manage")
+	Boolean setManagePersonnal(@RequestParam("siteId") Long siteId, @RequestParam("accountId") Long accountId);
+
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/MyItemConfigManageClients.java

+package com.yizhi.site.application.feign;
+
+import com.yizhi.site.application.vo.domain.MyItemConfigVo;
+import com.yizhi.site.application.vo.site.MyItemConfigVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "portal", contextId = "MyItemConfigManageClients")
+public interface MyItemConfigManageClients {
+
+    @PostMapping("/myItemConfig/manage/add")
+    public Integer add(@RequestBody MyItemConfigVo myItemConfig);
+
+
+    /**
+     * @param itemId
+     * @return
+     */
+    @GetMapping("/myItemConfig/manage/delete")
+    public Integer delete(@RequestParam(value = "itemId") Long itemId);
+
+    /**
+     * @param itemId   根据id，使其显示
+     * @param showable 是否显示:0不显示,1显示（默认为0）
+     * @return
+     */
+    @GetMapping("/myItemConfig/manage/showable")
+    public Integer showable(@RequestParam(value = "itemId") Long itemId, @RequestParam(value = "showable") Integer showable);
+
+    @PostMapping("/myItemConfig/manage/update")
+    public Integer update(@RequestBody MyItemConfigVo myItemConfig);
+
+    @GetMapping("/myItemConfig/manage/queryById")
+    public MyItemConfigVO queryById(@RequestParam(value = "id") Long id);
+
+    /**
+     * 根据条件，查询相应的list
+     *
+     * @param name         项目名称
+     * @param showable     是否显示:0不显示,1显示（默认为0）
+     * @param terminalType 终端类型：1-PC端、2-移动端 3-PC端&移动端
+     * @return
+     */
+    @GetMapping("/myItemConfig/manage/queryMyItemConfigByCondition")
+    public List<MyItemConfigVO> queryMyitemConfigByCondition(@RequestParam(value = "name", required = false) String name,
+                                                             @RequestParam(value = "showable", required = false) Integer showable,
+                                                             @RequestParam(value = "terminalType", required = false) Integer terminalType);
+
+    /**
+     * @param id   栏目id
+     * @param type 1-代表上移  2-代表下移
+     * @return
+     */
+    @GetMapping("/myItemConfig/manage/move")
+    public Integer move(@RequestParam(value = "type") Integer type, @RequestParam(value = "id") Long id);
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/PageFooterClient.java

+package com.yizhi.site.application.feign;
+
+import com.yizhi.site.application.vo.domain.PageFooterItemVo;
+import com.yizhi.site.application.vo.domain.PageFooterVo;
+import com.yizhi.site.application.vo.site.PageFooterItemConfigVo;
+import com.yizhi.site.application.vo.site.PageFooterVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ *   底页编辑 接口
+ */
+@FeignClient(name = "portal", contextId = "PageFooterClient")
+public interface PageFooterClient {
+
+
+    /**
+     * 编辑页底信息
+     *
+     * @param pageFooter
+     * @return
+     */
+    @PostMapping("/manage/page/pageFooter/save")
+    public PageFooterVo pageFooterSave(@RequestBody PageFooterVo pageFooter);
+
+    /**
+     * 保存文案
+     * @param pageFooterItem
+     * @return
+     */
+    @PostMapping("/manage/page/pageFooterItem/save")
+    public PageFooterItemVo pageFooterItemSave(@RequestBody PageFooterItemVo pageFooterItem);
+
+    /**
+     * 保存链接
+     * @param pageFooterItemConfigVo
+     * @return
+     */
+    @PostMapping("/manage/page/pageFooterItemConfig/save")
+    PageFooterItemConfigVo spageFooterItemConfigSave(@RequestBody PageFooterItemConfigVo pageFooterItemConfigVo);
+
+
+    /**
+     * 根据FooterItemId 删除
+     * @param id
+     * @return
+     */
+    @GetMapping("/manage/page/pageFooterItem/delete")
+    public Boolean delete(@RequestParam("id") Long id);
+
+    /**
+     * 新增回显查询列表
+     *
+     * @param TerminalType
+     * @return
+     */
+    @GetMapping("/manage/page/pageFooterItem/getList")
+    public PageFooterVO getList(@RequestParam(name = "TerminalType") Integer TerminalType);
+
+
+
+    /**
+     * 底页查询列表
+     *
+     * @return
+     */
+    @GetMapping("/manage/page/pageFooterItem/get")
+    public PageFooterVO selectPage(@RequestParam(name = "TerminalType")Integer TerminalType);
+
+    /**
+     * 排序(文案、链接)
+     *
+     * @param list
+     * @return
+     */
+    @PostMapping("/manage/page/pageFooterItem/sort")
+    public Integer pageFooterItemSort(@RequestBody List<PageFooterItemVo> list);
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/PortalThemeColorClients.java

+package com.yizhi.site.application.feign;
+
+import com.yizhi.site.application.vo.site.PortalThemeColorEntityVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "portal", contextId = "PortalThemeColorClients")
+public interface PortalThemeColorClients {
+
+    /**
+     * 查询站点和终端类型的颜色配置信息
+     * @param companyId
+     * @param siteId
+     * @param terminalType
+     * @return
+     */
+    @GetMapping("/theme/color/get")
+    PortalThemeColorEntityVo getThemeColorBySiteId(@RequestParam(value = "companyId") Long companyId,
+                                                   @RequestParam(value = "siteId") Long siteId,
+                                                   @RequestParam(value = "terminalType") Integer terminalType);
+
+    /**
+     * 根据主键重置
+     * @param id
+     * @return
+     */
+    @GetMapping("/theme/color/reset")
+    Boolean reset(@RequestParam(value = "id") Long id,
+                  @RequestParam(value = "accountId") Long accountId);
+
+
+    /**
+     * 保存主题颜色配置
+     * @param portalThemeColor
+     * @return
+     */
+    @PostMapping("/theme/color/save")
+    PortalThemeColorEntityVo save(@RequestBody PortalThemeColorEntityVo portalThemeColor);
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/SiteManageFeignClients.java

+package com.yizhi.site.application.feign;
+
+import com.yizhi.site.application.vo.domain.AppVersionVo;
+import com.yizhi.site.application.vo.domain.SiteVo;
+import com.yizhi.site.application.vo.site.SiteConfigVO;
+import com.yizhi.site.application.vo.site.SystemSiteVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author admin
+ */
+@FeignClient(name = "portal", contextId = "SiteManageFeignClients")
+public interface SiteManageFeignClients {
+    /**
+     * 修改网页名称和logo
+     * @param siteConfigVO
+     * @return
+     */
+    @PostMapping("/manage/site/config/update")
+    SiteConfigVO update(@RequestBody SiteConfigVO siteConfigVO);
+
+    /**
+     * 获取log和name
+     * @return
+     */
+    @GetMapping("/manage/site/config/get")
+    SiteConfigVO get(@RequestBody SystemSiteVO siteVO);
+
+    /**
+     * 获取用版本控制 最新版本
+     * @param siteCode
+     * @param type
+     * @return
+     */
+    @GetMapping("/appVersion/get")
+    AppVersionVo getAppVersion(@RequestParam(name = "siteCode") String siteCode,
+                               @RequestParam(name = "companyCode") String companyCode,
+                               @RequestParam(name = "type") Integer type);
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/TrSiteStudentFeignClients.java

+package com.yizhi.site.application.feign;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yizhi.site.application.vo.TrSitePageVO;
+import com.yizhi.site.application.vo.TrSiteStudentParamsVo;
+import com.yizhi.site.application.vo.TrSiteStudentVo;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author admin
+ */
+@FeignClient(name = "portal", contextId = "TrSiteStudentFeignClients")
+public interface TrSiteStudentFeignClients {
+
+    /**
+     * 保存配置的站点
+     *
+     * @param vos
+     * @return
+     */
+    @PostMapping("/trSiteStudent/save")
+    public Integer save(@ApiParam("vos") @RequestBody List<TrSiteStudentVo> vos);
+
+    /**
+     * 查询配置的列表
+     *
+     * @param trSitePageVO
+     * @return
+     */
+    @PostMapping("/trSiteStudent/getPage")
+    public Page<TrSiteStudentVo> getPage(@RequestBody TrSitePageVO trSitePageVO);
+
+    /**
+     * 删除已配置的数据
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/trSiteStudent/remove")
+    public Integer remove(@RequestParam("id") Long id);
+
+    /**
+     * 上移下移
+     *
+     * @param paramsVo
+     * @return
+     */
+    @PostMapping("/trSiteStudent/move")
+    public TrSiteStudentParamsVo move(@RequestBody TrSiteStudentParamsVo paramsVo);
+
+    /**
+     * 判断对应终端是否发布  1:发布了   0：未发布
+     * @param type
+     * @return
+     */
+    @GetMapping("/trSiteStudent/canVisit")
+    public Integer canVisit(@RequestParam("type") Integer type);
+
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/api/FunctionDisplayConfigApiClients.java

+package com.yizhi.site.application.feign.api;
+
+import com.yizhi.site.application.vo.domain.FunctionDisplayConfigVo;
+import com.yizhi.site.application.vo.site.FunctionDisplayConfigVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @Author: XieHaijun
+ * @Description:
+ * @Date: Created in 17:59 2019/4/29
+ * @Modified By
+ */
+@FeignClient(name = "portal", contextId = "FunctionDisplayConfigApiClients")
+public interface FunctionDisplayConfigApiClients {
+
+    @GetMapping("/api/functionDisplayConfig/siteId/all/get")
+    List<FunctionDisplayConfigVo> getConfigBySiteId(@RequestParam(value = "siteId") Long siteId);
+
+    @GetMapping("/api/functionDisplayConfig/site/all/get")
+    List<FunctionDisplayConfigVo> getAllBySiteId();
+
+    /**
+     * 根据站点查询配置显示信息（没有配置信息返回null）
+     * @return null 或者 List data
+     */
+    @GetMapping("/api/functionDisplayConfig/site/get")
+    List<FunctionDisplayConfigVo> getBySiteId(@RequestParam("siteId") Long siteId);
+
+    @PostMapping("/api/functionDisplayConfig/update")
+    Integer update(@RequestBody List<FunctionDisplayConfigVO> vos);
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/api/MyItemConfigApiClients.java

+package com.yizhi.site.application.feign.api;
+
+import com.yizhi.site.application.vo.site.MyItemConfigVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "portal", contextId = "MyItemConfigApiClients")
+public interface MyItemConfigApiClients {
+
+
+    @GetMapping("/myItemConfig/api/queryByAuthoity")
+    public List<MyItemConfigVO> queryByAuthoity(@RequestParam(value = "terminalType",required = false) List<Integer> terminalType);
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/api/MyItemConfigDefaultApiClients.java

+package com.yizhi.site.application.feign.api;
+
+import com.yizhi.site.application.vo.site.MyItemConfigVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "portal", contextId = "MyItemConfigDefaultApiClients")
+public interface MyItemConfigDefaultApiClients {
+
+
+    @GetMapping("/myItemConfigDefault/api/queryByAuthoity")
+    public List<MyItemConfigVO> queryByAuthoity(@RequestParam(value = "terminalType",required = false) List<Integer> terminalType);
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/api/PortalApiFeignClients.java

+package com.yizhi.site.application.feign.api;
+
+import com.yizhi.site.application.vo.domain.*;
+import com.yizhi.site.application.vo.site.HomeTerminalVo;
+import com.yizhi.site.application.vo.site.PortalHomeOtherVO;
+import com.yizhi.site.application.vo.site.PortalPlateVO;
+import com.yizhi.site.application.vo.site.ApiTemplateMiddlerVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "portal", contextId = "PortalApiFeignClients")
+public interface PortalApiFeignClients {
+	
+	/**
+	 * 获取登陆页面
+	 */
+	@GetMapping(value = "/api/portal/loginPageView")
+    PortalLoginVo loginPageView(@RequestParam("siteId") Long siteId, @RequestParam("type") Integer type);
+	
+	/**
+	 * 首页除模板外的所有信息
+	 */
+	@GetMapping(value = "/api/portal/listHomeOther")
+    PortalHomeOtherVO listHomeOther(@RequestBody HomeTerminalVo htvo);
+
+	/**
+	 * 门户模板信息
+	 */
+	@GetMapping(value = "/api/portal/listHomeTemplate")
+	List<ApiTemplateMiddlerVO> listHomeTemplate(@RequestBody HomeTerminalVo htvo);
+
+	/**
+	 * 获取terminalId
+	 * @param htvo
+	 * @return
+	 */
+	@GetMapping("/api/terminalId/get")
+	public Long getTerminalId(@RequestBody HomeTerminalVo htvo);
+
+    /**
+     * 获取plateList
+     * @param templateId
+     * @return
+     */
+    @GetMapping(value = "/getPlate")
+    List<PortalPlateVO> getPlateVOList(@RequestParam(value = "templateId") Long templateId);
+
+	/**
+	 * 根据模块id查询模块内容列表
+	 * @param templateId
+	 * @return
+	 */
+	@GetMapping(value = "/getPlateListByTemplateId")
+	List<ProtalPlateVo> getPlateListByTemplateId(@RequestParam(value = "templateId") Long templateId);
+
+    /**
+     * 根据code 默认信息
+     * @param code
+     * @return
+     */
+    @GetMapping("/relation/get")
+    RelationLinkVo getRelationLink(@RequestParam(name = "code") Integer code);
+
+    /**
+     * 模块快排序
+     * @param id
+     * @param code
+     * @return
+     */
+    @PostMapping(value = "/sortPlate")
+    boolean sortPlate( @RequestParam(name = "id", required = true) Long id,
+                              @RequestParam(name = "code", required = true) String code);
+    
+    
+    /**
+     * 各个模块的搜索记录
+     * @param trSearchRecorde
+     * @return
+     */
+    @PostMapping(value="/search/recorde/list")
+    List<String> getSearchRecorde(@RequestBody TrSearchRecordeVo trSearchRecorde);
+    
+    /**
+     * 各个模块的搜索记录
+     * @param trSearchRecorde
+     * @return
+     */
+    @PostMapping(value="/search/recorde/save")
+    Boolean saveSearchRecorde(@RequestBody TrSearchRecordeVo trSearchRecorde);
+    
+    
+    /**
+     * 各个模块的搜索记录
+     * @param trSearchRecorde
+     * @return
+     */
+    @PostMapping(value="/search/recorde/delete")
+    Boolean deleteSearchRecorde(@RequestBody TrSearchRecordeVo trSearchRecorde);
+    
+    @GetMapping("/getReport")
+    public RelationReportVo getReport(@RequestParam("terminalType") Integer terminalType);
+
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/api/PortalApiPCFeignClients.java

+package com.yizhi.site.application.feign.api;
+
+import com.yizhi.site.application.vo.domain.*;
+import com.yizhi.site.application.vo.site.AnnouncementVO;
+import com.yizhi.site.application.vo.site.ApiPortalPCLink;
+import com.yizhi.site.application.vo.site.HomeLogoEntityVo;
+import com.yizhi.site.application.vo.site.PortalTemplateVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "portal", contextId = "PortalApiPCFeignClients")
+public interface PortalApiPCFeignClients {
+	
+	/**
+	 * 首页第一行信息
+	 */
+	@GetMapping(value = "/api/portal/pc/base/message")
+    HomeLogoEntityVo baseMeaage(@RequestParam("siteId") Long siteId, @RequestParam("terminalType") Integer terminalType);
+	
+	
+	@GetMapping(value="/api/portal/pc/link/up")
+	List<ApiPortalPCLink> listApiPortalPCLinkUp(@RequestParam("siteId") Long siteId, @RequestParam("terminalType") Integer terminalType);
+	
+	
+	@GetMapping(value="/api/portal/pc/banner/image")
+	List<PortalImageVo> listApiPortalPCPortalImage(@RequestParam("siteId") Long siteId, @RequestParam("terminalType") Integer terminalType);
+	
+	@GetMapping(value="/api/portal/pc/look/num")
+    TrPortalLookNumVo listApiPortalPCPortalLookNum(@RequestParam("siteId") Long siteId, @RequestParam("terminalType") Integer terminalType);
+	
+	
+	@GetMapping(value="/api/portal/pc/live")
+	Long getLiveActivityPc(@RequestParam("siteId") Long siteId, @RequestParam("terminalType") Integer terminalType);
+	
+	
+	@GetMapping(value="/api/portal/pc/link/down")
+	List<ApiPortalPCLink> listApiPortalPCLinkDown(@RequestParam("siteId") Long siteId, @RequestParam("terminalType") Integer terminalType);
+	
+
+	@GetMapping(value="/api/portal/pc/announcement/select")
+	List<AnnouncementVO> getApiRelationAnnouncement(@RequestParam("siteId") Long siteId, @RequestParam("terminalType") Integer terminalType);
+	
+	/**
+	 * 模板list
+	 * @param terminalId
+	 * @return
+	 */
+	@GetMapping("/api/portal/pc/module/list/select")
+	List<PortalTemplateVo> moduleListSelectApi(@RequestParam("siteId") Long siteId, @RequestParam("terminalType") Integer terminalType);
+	
+	
+	/**
+	 * 模板内容展示
+	 * @param id
+	 * @return
+	 */
+	@GetMapping("/api/portal/pc/template/content/view")
+	List<ProtalPlateVo> templateContentView(@RequestParam(name = "id", required = true) Long id);
+	
+	
+	
+	/**
+	 * 推荐新闻
+	 * @param siteId
+	 * @param ids
+	 * @return
+	 */
+	@GetMapping("/api/portal/pc/news/supply/notIds")
+	List<InformationVo> listSupplyInformation(@RequestParam("siteId")Long siteId, @RequestParam(name="ids",required=false)List<Long> ids);
+	
+	@GetMapping("/api/portal/pc/news/read/count")
+	Integer newsReadCount(@RequestParam("id")Long id);
+
+	/**
+	 * 获取用模板的详情
+	 * @param id
+	 * @return
+	 */
+	@GetMapping("/api/portal/pc/get/template")
+	PortalTemplateVo getPortalTemplate(@RequestParam(name = "id") Long id);
+	
+}

cloud-site-api/src/main/java/com/yizhi/site/application/feign/api/PortalBlockFeignClients.java

+package com.yizhi.site.application.feign.api;
+
+import com.yizhi.site.application.vo.site.PortalBlockVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @Author: XieHaijun
+ * @Description:
+ * @Date: Created in 9:27 2018/7/25
+ * @Modified By
+ */
+@FeignClient(name = "portal", contextId = "PortalBlockFeignClients")
+public interface PortalBlockFeignClients {
+
+    /**
+     * 首页区块显示设置变更
+     * @param portalBlockVO
+     * @return
+     */
+    @RequestMapping(value = "/portalBlock/status/change",method = RequestMethod.POST)
+    public PortalBlockVO displayChange(@RequestBody PortalBlockVO portalBlockVO);
+
+    /**
+     * 根据终端id和区块id查询区块显示状态
+     * @param terminalId
+     * @param blockType
+     * @param optionId
+     * @param optionName
+     * @return
+     */
+    @RequestMapping(value = "/portalBlock/terminalId/get",method = RequestMethod.GET)
+    public PortalBlockVO getByTerminalId(@RequestParam(value = "terminalId") Long terminalId,
+                                         @RequestParam(value = "blockType") Integer blockType,
+                                         @RequestParam("optionId") Long optionId,
+                                         @RequestParam("optionName") String optionName);
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * APP版本控制表
+ * </p>
+ *
+ * @author lingye
+ * @since 2019-07-22
+ */
+@Data
+@Api(tags = "AppVersionEntityVo", description = "APP版本控制表")
+public class AppVersionVo  {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "应用安装包地址")
+    private String appUrl;
+
+    @ApiModelProperty(value = "类型：1 IOS，2 Android")
+    private Integer type;
+
+    @ApiModelProperty(value = "站点id")
+    private Long siteId;
+
+    @ApiModelProperty(value = "站点Code")
+    private String siteCode;
+
+    @ApiModelProperty(value = "公司Code")
+    private String companyCode;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "版本号")
+    private String version;
+
+    @ApiModelProperty(value = "app_des")
+    private String appDes;
+
+    @ApiModelProperty(value = "删除标记,1 删除，0 正常")
+    private Integer delFlag;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "DataClassificationEntityVo", description = "资讯分类")
+@Data
+public class DataClassificationVo {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "资料分类ID主键")
+    private Long id;
+    
+    @ApiModelProperty(value = "分类名称")
+    private String name;
+    
+    @ApiModelProperty(value = "分类描述")
+    private String description;
+    
+    @ApiModelProperty(value = "上级分类")
+    private Long parentId;
+    
+    @ApiModelProperty(value = "排序")
+    private Long sort;
+    
+    @ApiModelProperty(value = "状态,0: 删除 1:未删除")
+    private Integer state;
+    
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    
+    @ApiModelProperty(value = "创建人")
+    private Long createById;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String createByName;
+    
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+    
+    @ApiModelProperty(value = "修改人")
+    private Long updateById;
+    
+    @ApiModelProperty(value = "修改人姓名")
+    private String updateByName;
+    
+    @ApiModelProperty(value = "站点ID")
+    private Long siteId;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 显示配置---》功能项显示配置
+ * </p>
+ *
+ * @author 谢海军123
+ * @since 2019-04-29
+ */
+@Data
+@ApiModel(value = "FunctionDisplayConfigEntityVo", description = "显示配置---》功能项显示配置")
+public class FunctionDisplayConfigVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "唯一主键")
+	private Long id;
+
+    @ApiModelProperty(value = "功能名称")
+	private String functionName;
+
+    @ApiModelProperty(value = "功能类型：01 课程学时显示；02 项目学时显示")
+	private String functionType;
+
+    @ApiModelProperty(value = "使用的设备")
+	private String useDevice;
+
+    @ApiModelProperty(value = "使用设备类型：01 pc端&移动端")
+	private String useDeviceType;
+
+    @ApiModelProperty(value = "是否显示 0:不显示（false）；1:显示（true）")
+	private Boolean showDisplay;
+
+    @ApiModelProperty(value = "企业id")
+	private Long companyId;
+
+    @ApiModelProperty(value = "站点id")
+	private Long siteId;
+
+    @ApiModelProperty(value = "组织id")
+	private Long orgId;
+
+	private Long createById;
+
+	private String createByName;
+
+	private Date createTime;
+
+	private Long updateById;
+
+	private String updateByName;
+
+	private Date updateTime;
+
+    @ApiModelProperty(value = "操作日志")
+	private String operateLog;
+
+
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-04-02
+ */
+@ApiModel(value = "HomeAnnouncementEntityVo", description = "首页公告")
+@Data
+public class HomeAnnouncementVo {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "首页公告ID")
+    private Long id;
+    
+    @ApiModelProperty(value = "首页ID")
+    private Long homeId;
+    
+    @ApiModelProperty(value = "公告ID")
+    private Long informationId;
+    
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+    
+    @ApiModelProperty(value = "公告是否显示 公告0不显示  1 显示")
+    private Integer display;
+    
+    @ApiModelProperty(value = "状态 0 删除  1未删除")
+    private Integer state;
+    
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    
+    @ApiModelProperty(value = "创建人")
+    private Long createById;
+    
+    @ApiModelProperty(value = "创建姓名")
+    private String createByName;
+    
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    
+    @ApiModelProperty(value = "更新人")
+    private Long updateById;
+    
+    @ApiModelProperty(value = "更新姓名")
+    private String updateByName;
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "HomeImageEntityVo", description = "终端关联轮播图片")
+@Data
+public class HomeImageVo {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    
+    @ApiModelProperty(value = "首页ID")
+    private Long homeId;
+    
+    @ApiModelProperty(value = "站点ID")
+    private Long siteId;
+    
+    @ApiModelProperty(value = "轮播图片ID")
+    private Long imageId;
+    
+    @ApiModelProperty(value = "0删除 1: 未发布 2：发布")
+    private Integer state;
+    
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    
+    @ApiModelProperty(value = "创建人")
+    private Long createById;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String createByName;
+    
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+    
+    @ApiModelProperty(value = "修改人")
+    private Long updateById;
+    
+    @ApiModelProperty(value = "修改人姓名")
+    private String updateByName;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-04-02
+ */
+@ApiModel(value = "HomeLogoEntityVo", description = "首页logo")
+@Data
+public class HomeLogoVo  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "首页logoID")
+    private Long id;
+    
+    @ApiModelProperty(value = "首页id")
+    private Long homeId;
+    
+    @ApiModelProperty(value = "logo图片地址")
+    private String logoPath;
+    
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+    
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    
+    @ApiModelProperty(value = "创建人")
+    private Long createById;
+    
+    @ApiModelProperty(value = "创建姓名")
+    private String createByName;
+    
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    
+    @ApiModelProperty(value = "更新人")
+    private Long updateById;
+    
+    @ApiModelProperty(value = "更新姓名")
+    private String updateByName;
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel(value = "InformationEntityVo", description = "资讯")
+@Data
+public class InformationReadNumberVo {
+
+	    @ApiModelProperty(value = "主鍵")
+	    private Long id;
+	    
+	    @ApiModelProperty(value = "资讯id")
+	    private Long informationId;
+	    
+	    @ApiModelProperty(value = "站点id")
+	    private Long siteId;
+	    
+	    @ApiModelProperty(value = "阅读次数")
+	    private Integer number;
+	    
+	    @ApiModelProperty(value = "创建时间")
+	    private Date createTime;
+	    
+	    @ApiModelProperty(value = "创建人id")
+	    private Long createById;
+	    
+	    @ApiModelProperty(value = "创建人名")
+	    private String createByName;
+	    
+	    @ApiModelProperty(value = "修改时间")
+	    private Date updateTime;
+	    
+	    @ApiModelProperty(value = "修改人id")
+	    private Long updateById;
+	    
+	    @ApiModelProperty(value = "修改人名")
+	    private String updateByName;
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "InformationEntityVo", description = "资讯")
+@Data
+public class InformationVo{
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "主鍵")
+	private Long id;
+
+	@ApiModelProperty(value = "封面logo")
+	private String logoPath;
+
+	@ApiModelProperty(value = "编号")
+	private String number;
+
+	@ApiModelProperty(value = "文章名称")
+	private String fileName;
+
+	@ApiModelProperty(value = "文章父类型  1： 新闻   2: 公告")
+	private Long typeOne;
+
+
+	private String typeOneName;
+
+	@ApiModelProperty(value = "文章子类型")
+	private Long typeTwo;
+
+	private String typeTwoName;
+
+	@ApiModelProperty(value = "作者")
+	private String author;
+
+	@ApiModelProperty(value = "发布时间")
+	private Date releaseTime;
+
+	@ApiModelProperty(value = "内容")
+	private String content;
+
+	@ApiModelProperty(value = "原文链接")
+	private String linkUrl;
+
+	@ApiModelProperty(value = "自定义关键字")
+	private String keyWords;
+	
+	@ApiModelProperty(value = "置顶状态, 0: 未置顶 1:置顶")
+	private Long isTop;
+
+	@ApiModelProperty(value = "状态 0 删除 1 未发布 2 发布")
+	private Integer state;
+
+	@ApiModelProperty(value = "站点ID")
+	private Long siteId;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+	@ApiModelProperty(value = "创建人")
+	private Long createById;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String createByName;
+
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+
+	@ApiModelProperty(value = "修改人")
+	private Long updateById;
+
+	@ApiModelProperty(value = "修改人姓名")
+	private String updateByName;
+
+	@ApiModelProperty(value = "上传的pdfOss路径")
+	private String pdfOssUrl;
+
+	@ApiModelProperty(value = "上传的pdf文件名")
+	private String pdfFileName;
+
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+}
\ No newline at end of file

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 国际化
+ * </p>
+ *
+ * @author lingye
+ * @since 2020-08-13
+ */
+@Data
+@Api(tags = "InternationalEntityVo", description = "")
+public class InternationalVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "key值")
+    private String key;
+
+    @ApiModelProperty(value = "中文字段")
+    private String preTranslation;
+
+    @ApiModelProperty(value = "翻译后")
+    private String postTranslation;
+
+    @ApiModelProperty(value = "备注")
+    private String translateRemark;
+
+    @ApiModelProperty(value = "0管理端 1 移动端 2 PC端")
+    private Integer type;
+
+    @ApiModelProperty(value = "语种id")
+    private Long languageId;
+
+    @ApiModelProperty(value = "创建时时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人id")
+    private Long createById;
+
+    @ApiModelProperty(value = "修改人id")
+    private Long updateById;
+
+    @ApiModelProperty(value = "删除标记 1，删除")
+    private Integer deleted;
+
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * <p>
+ * </p>
+ *
+ * @author hutao123
+ * @since 2019-03-11
+ */
+@Data
+@Api(tags = "MyItemConfigDefaultEntityVo", description = "默认的配置信息")
+public class MyItemConfigDefaultVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "栏目id 默认配置信息")
+    private Long id;
+
+    @ApiModelProperty(value = "栏目名称")
+    private String name;
+
+    @ApiModelProperty(value = "栏目code")
+    private String pcCode;
+
+    @ApiModelProperty(value = "配合前端在学员端跳转页面所需addUrl")
+    private String pcAddUrl;
+
+    @ApiModelProperty(value = "栏目code")
+    private String weixinCode;
+
+    @ApiModelProperty(value = "栏目类型")
+    private Integer itemType;
+
+    @ApiModelProperty(value = "0 :未删除   1: 删除(默认为0) ")
+    private Integer deleted;
+
+    @ApiModelProperty(value = "是否显示:0不显示,1显示（默认为0）")
+    private Integer showable;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "终端类型：1-PC端、2-移动端")
+    private Integer terminalType;
+
+    @ApiModelProperty(value = "站点_ID")
+    private Long siteId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人id")
+    private Long createById;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String createByName;
+
+    private Date updateTime;
+
+    private Long updateById;
+
+    private String updateByName;
+
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 自定义页底-链接
+ * </p>
+ *
+ * @author hutao123
+ * @since 2019-02-21
+ */
+@Data
+@Api(tags = "MyItemConfigEntityVo", description = "我的配置")
+public class MyItemConfigVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "栏目id")
+    private Long id;
+
+    @ApiModelProperty(value = "栏目名称")
+    private String name;
+
+    @ApiModelProperty(value = "栏目code")
+    private String pcCode;
+
+    @ApiModelProperty(value = "配合前端在学员端跳转页面所需addUrl")
+    private String pcAddUrl;
+
+    @ApiModelProperty(value = "栏目code")
+    private String weixinCode;
+
+    @ApiModelProperty(value = "栏目类型 1-我的培训" + "2-我的课程" + "3-我的作业" + "4-我的考试" + "5-我的调研" +
+            "6-我的积分" + "7-我的做课" + "8-我的投票" + "9-我的分享" + "10-我的消息" + "11-收藏" + "12-我的证书"+"签到"+"我的收藏"
+    +"13-")
+    private Integer itemType;
+
+    @ApiModelProperty(value = "0 :未删除   1: 删除(默认为0) ")
+    private Integer deleted;
+
+    @ApiModelProperty(value = "是否显示:0不显示,1显示（默认为0）")
+    private Integer showable;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "终端类型：1-PC端、2-移动端 3-PC端&移动端")
+    private Integer terminalType;
+
+    @ApiModelProperty(value = "站点_ID")
+    private Long siteId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人id")
+    private Long createById;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String createByName;
+
+    private Date updateTime;
+
+    private Long updateById;
+
+    private String updateByName;
+
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author liang123
+ * @since 2018-12-21
+ */
+@Data
+@Api(tags = "PageFooterItemConfigEntityVo", description = "链接")
+public class PageFooterItemConfigVo {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private Long pageFooterItemId;
+
+    @ApiModelProperty(value = "文字链接标签")
+    private String charaterTag;
+
+    @ApiModelProperty(value = "图片地址")
+    private String imgOssUrl;
+
+    @ApiModelProperty(value = "链接路径: 文字链接 / 图片链接")
+    private String link;
+
+    @ApiModelProperty(value = " 0  未删除  1 表示删除  (默认 0)")
+    private Integer delete;
+
+    @ApiModelProperty(value = " 排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "企业_ID")
+    private Long companyId;
+
+    @ApiModelProperty(value = "站点_ID")
+    private Long siteId;
+
+    @ApiModelProperty(value = "部门_ID")
+    private Long orgId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人id")
+    private Long createById;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String createByName;
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author liang123
+ * @since 2018-12-21
+ */
+@Data
+@Api(tags = "PageFooterItemEntityVo", description = "")
+public class PageFooterItemVo{
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    private Long pageFooterId;
+
+    @ApiModelProperty(value = "0文案 / 1链接")
+    private Integer pageType;
+
+    @ApiModelProperty(value = "0文字连接,1图片链接")
+    private Integer type;
+
+    @ApiModelProperty(value = "链接名称")
+    private String name;
+
+    @ApiModelProperty(value = "文案")
+    private String officialDocumentContent;
+
+    @ApiModelProperty(value = "是否显示:0不显示,1显示")
+    private Integer showable;
+
+    @ApiModelProperty(value = "0 未删除   1 删除")
+    private Integer delete;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "企业_ID")
+    private Long companyId;
+
+    @ApiModelProperty(value = "站点_ID")
+    private Long siteId;
+
+    @ApiModelProperty(value = "部门_ID")
+    private Long orgId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人id")
+    private Long createById;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String createByName;
+
+    @ApiModelProperty(value = "修改人id")
+    private Long updateById;
+
+    @ApiModelProperty(value = "修改人名")
+    private String updateByName;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author liang123
+ * @since 2018-12-21
+ */
+@Data
+@Api(tags = "PageFooterEntityVo", description = "底页编辑")
+public class PageFooterVo  {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    @ApiModelProperty(value = "0 默认页底  1 自定义页底")
+    private Integer type;
+
+    @ApiModelProperty(value = "首页id")
+    private Long homeId;
+
+    @ApiModelProperty(value = "企业_ID")
+    private Long companyId;
+
+    @ApiModelProperty(value = "站点_ID")
+    private Long siteId;
+
+    @ApiModelProperty(value = "部门_ID")
+    private Long orgId;
+
+    @ApiModelProperty(value = " 0  未删除  1 表示删除  (默认 0)")
+    private Integer delete;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人id")
+    private Long createById;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String createByName;
+
+    @ApiModelProperty(value = "修改人id")
+    private Long updateById;
+
+    @ApiModelProperty(value = "修改人名")
+    private String updateByName;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "PortalBannerEntityVo", description = "轮播图")
+@Data
+public class PortalBannerVo {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "轮播图ID")
+	private Long id;
+	
+	@ApiModelProperty(value = "终端ID")
+	private Long terminalId;	
+	
+	@ApiModelProperty(value = "所属栏目")
+	private String bannerName;
+
+	@ApiModelProperty(value = "0删除 1:未删除")
+	private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+	@ApiModelProperty(value = "创建人")
+	private Long createById;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String createByName;
+
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+
+	@ApiModelProperty(value = "修改人")
+	private Long updateById;
+
+	@ApiModelProperty(value = "修改人姓名")
+	private String updateByName;
+	
+	@ApiModelProperty(value = "站点ID")
+    private Long siteId; 
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "PortalHomeEntityVo", description = "首页")
+@Data
+public class PortalHomeVo  {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+	
+	@ApiModelProperty(value = "终端ID")
+	private Long terminalId;
+	
+	@ApiModelProperty(value = "0删除 1:未发布 2 发布")
+	private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+	@ApiModelProperty(value = "创建人")
+	private Long createById;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String createByName;
+
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+
+	@ApiModelProperty(value = "修改人")
+	private Long updateById;
+
+	@ApiModelProperty(value = "修改人姓名")
+	private String updateByName;
+
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "PortalImageEntityVo", description = "轮播项图片")
+@Data
+public class PortalImageVo {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "主键")
+	private Long id;
+
+	@ApiModelProperty(value = "轮播图ID")
+	private Long bannerId;
+
+	@ApiModelProperty(value = "图片标题")
+	private String imgTitle;
+
+	@ApiModelProperty(value = "存放图片路径")
+	private String bannerPath;
+
+	@ApiModelProperty(value = "跳转后的功能id, pc端外部链接")
+	private String linkUrl;
+	
+	
+	//王飞达注释首页的类型, /首页的类型, 1：课程  2：考试   3：培训  4：外部链接 5:新闻 6:营销  8:首页不选类型时候（仅仅图片）   0:不是首页';2019-01-14
+	@ApiModelProperty(value = "//首页的类型, 1：课程  2：考试   3：培训  4：外部链接 5:活动 6:调研 7:新闻 8:首页不选类型时候（仅仅图片）   0:不是首页")
+	private Integer homeType;
+	
+	@ApiModelProperty(value = "指定上架时间")
+	private Date addTime;
+
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+
+	@ApiModelProperty(value = "0删除 1: 上架 2：下架")
+	private Integer state;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+	@ApiModelProperty(value = "创建人")
+	private Long createById;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String createByName;
+
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+
+	@ApiModelProperty(value = "修改人")
+	private Long updateById;
+
+	@ApiModelProperty(value = "修改人姓名")
+	private String updateByName;
+
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "PortalLoginEntityVo", description = "登录页")
+@Data
+public class PortalLoginVo  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    
+    @ApiModelProperty(value = "终端ID")
+    private Long terminalId;
+
+    @ApiModelProperty(value = "站点ID")
+    private Long siteId;
+
+    @ApiModelProperty(value = "背景")
+    private String bgimgPath;
+
+    @ApiModelProperty(value = "0: 删除  1: 未发布  2: 发布")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createById;
+
+    @ApiModelProperty(value = "创建姓名")
+    private String createByName;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "更新人")
+    private Long updateById;
+
+    @ApiModelProperty(value = "更新姓名")
+    private String updateByName;
+
+    @ApiModelProperty(value = "登录名说明文字")
+    private String loginNameDesc;
+
+    @ApiModelProperty(value = "登陆密码说明文字")
+    private String loginPwdDesc;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "PortalNavigateEntityVo", description = "头部导航栏")
+@Data
+public class PortalNavigateVo {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "导航栏ID主键")
+    private Long id;
+    
+    @ApiModelProperty(value = "首页ID")
+    private Long homeId;
+    
+    @ApiModelProperty(value = "站点ID")
+    private Long siteId;
+    
+    @ApiModelProperty(value = "显示名称")
+    private String showName;
+    
+    @ApiModelProperty(value = "图片路径")
+    private String imgPath;
+    
+    @ApiModelProperty(value = "关联功能类型,  自定义的为 1，  系统提供的为0")
+    private Integer relationFunc;
+    
+    
+    @ApiModelProperty(value = "关联功能编码")
+    private String relationFuncCode;
+    
+    @ApiModelProperty(value = "关联功能名称")
+    private String relationFuncName;
+    
+    @ApiModelProperty(value = "关联功能链接")
+    private String relationFuncUrl;
+
+    @ApiModelProperty(value = "显示状态, 0 不显示  1 显示")
+    private Integer display;
+    
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+    
+    @ApiModelProperty(value = "0: 删除  1:未发布 2：发布")
+    private Integer state;
+    
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    
+    @ApiModelProperty(value = "创建人")
+    private Long createById;
+    
+    @ApiModelProperty(value = "创建姓名")
+    private String createByName;
+    
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    
+    @ApiModelProperty(value = "更新人")
+    private Long updateById;
+    
+    @ApiModelProperty(value = "更新姓名")
+    private String updateByName;
+    
+    @ApiModelProperty(value = "pc端")
+    private Integer pcType;
+
+    @ApiModelProperty(value = "关联的id")
+    private Long relationId;
+
+    @ApiModelProperty(value = "关联的课程分类")
+    private String classifyName;
+
+    @ApiModelProperty(value = "1 学习时长排行榜,2 案例排行榜")
+    private String relationNum;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "PortalTemplate", description = "正文模板")
+@Data
+public class PortalTemplateVo {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "模块ID")
+    private Long id;
+    
+    @ApiModelProperty(value = "首页ID")
+    
+    private Long homeId;
+    
+    @ApiModelProperty(value = "站点ID")
+    
+    private Long siteId;
+    
+    @ApiModelProperty(value = "板块类型,1:推荐/精选,2:项目培训,3:课程,5:直播,4:讲师库")
+    
+    private Integer moduleType;
+    
+    @ApiModelProperty(value = "图片logo")
+    
+    private String icon;
+    
+    @ApiModelProperty(value = "模块名称")
+    
+    private String moduleName;
+    
+    @ApiModelProperty(value = "选择项目, 推荐/精选 项目培训 课程 有,  直播 新闻 没有")
+    
+    private String selectProject;
+    
+    @ApiModelProperty(value = "选择项目名称")
+    
+    private String selectProjectName;
+    
+    @ApiModelProperty(value = "内容个数")
+    private Integer num;
+    
+    @ApiModelProperty(value = "0: 删除  1: 未发布  2：发布")
+    private Integer state;
+    
+    @ApiModelProperty(value = "1显示  2 不显示")
+    private Integer display;
+    
+    @ApiModelProperty(value = "创建时间")
+    
+    private Date createTime;
+    
+    @ApiModelProperty(value = "创建人")
+    
+    private Long createById;
+    
+    @ApiModelProperty(value = "创建姓名")
+    
+    private String createByName;
+    
+    @ApiModelProperty(value = "更新时间")
+    
+    private Date updateTime;
+    
+    @ApiModelProperty(value = "更新人")
+    
+    private Long updateById;
+    
+    @ApiModelProperty(value = "更新姓名")
+    
+    private String updateByName;
+    
+    @ApiModelProperty(value = "排序规则")
+    private Integer sort;
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "PortalTerminalEntityVo", description = "终端")
+@Data
+public class PortalTerminalVo  {
+
+    private static final long serialVersionUID = 1L;
+    
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    
+    @ApiModelProperty(value = "站点ID")
+    private Long siteId;
+    
+    @ApiModelProperty(value = "应用名称")
+    private String terminalName;
+    
+    @ApiModelProperty(value = "终端类型:1-PC 2-APP 3-微信")
+    private Integer type;
+    
+    @ApiModelProperty(value = "0未发布 1已生效（已发布）")
+    private Integer state;
+    
+    @ApiModelProperty(value = "0不显示 1显示")
+    private Integer display;
+    
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    
+    @ApiModelProperty(value = "创建人")
+    private Long createById;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String createByName;
+    
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+    
+    @ApiModelProperty(value = "修改人")
+    private Long updateById;
+    
+    @ApiModelProperty(value = "修改人姓名")
+    private String updateByName;
+    
+    @ApiModelProperty(value = "公司ID")
+    private Long companyId;
+    
+    @ApiModelProperty(value = "部门ID")
+    private Long orgId;
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 门户主题色配置
+ * </p>
+ *
+ * @author fulan123
+ * @since 2020-08-12
+ */
+@Data
+@ApiModel(value = "PortalThemeColorEntityVo", description = "门户主题色配置")
+public class PortalThemeColorVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键")
+	private Long id;
+
+    @ApiModelProperty(value = "企业id")
+	private Long companyId;
+
+    @ApiModelProperty(value = "站点id")
+	private Long siteId;
+
+    @ApiModelProperty(value = "终端类型：1 后台管理端  ；2 PC端 ； 3 移动端")
+	private Integer terminalType;
+
+    @ApiModelProperty(value = "主题色")
+	private String themeColor;
+
+    @ApiModelProperty(value = "辅助色")
+	private String auxiliarColor;
+
+    @ApiModelProperty(value = "创建用户")
+	private Long createById;
+
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+    @ApiModelProperty(value = "更新用户")
+	private Long updateById;
+
+    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+
+
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "ProtalContactEntityVo", description = "联系我们")
+@Data
+public class ProtalContactVo {
+
+    private static final long serialVersionUID = 1L;
+    
+    @ApiModelProperty(value = "联系我们ID")
+    private Long id;
+    
+    @ApiModelProperty(value = "首页ID")
+
+    private Long homeId;
+    
+    @ApiModelProperty(value = "站点ID")
+    private Long siteId;
+    
+    @ApiModelProperty(value = "平台介绍")
+    private String platformInfo;
+    
+    @ApiModelProperty(value = "浏览建议")
+    private String scanSuggest;
+    
+    @ApiModelProperty(value = "联系电话")
+    private String contactTel;
+    
+    @ApiModelProperty(value = "客服电话")
+    private String consumerTel;
+    
+    @ApiModelProperty(value = "微信下载")
+    private String wechatPath;
+    
+    @ApiModelProperty(value = "IOS下载")
+    private String iosPath;
+    
+    @ApiModelProperty(value = "安卓下载")
+    private String androidPath;
+    
+    @ApiModelProperty(value = "0:删除， 1：未发布 2：发布")
+    private Integer state;
+    
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    
+    @ApiModelProperty(value = "创建人")
+    private Long createById;
+    
+    @ApiModelProperty(value = "创建姓名")
+    private String createByName;
+    
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    
+    @ApiModelProperty(value = "更新人")
+    private Long updateById;
+    
+    @ApiModelProperty(value = "更新姓名")
+    private String updateByName;
+    
+    @ApiModelProperty(value = "备用1")
+    private String spare1;
+    
+    @ApiModelProperty(value = "客服邮箱")
+    private String consumerEmail;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "ProtalPlateEntityVo", description = "模板类型")
+@Data
+public class ProtalPlateVo {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "推荐/精选ID")
+	private Long id;
+
+	@ApiModelProperty(value = "模块ID")
+	private Long templateId;
+
+	@ApiModelProperty(value = "新闻ID")
+	private Long newsId;
+	
+	@ApiModelProperty(value = "选择活动    推荐/精选  有  外链的id")
+	private Long selectActivity;
+	
+	@ApiModelProperty(value = "选择活动名称    推荐/精选  有  外链的名字")
+	private String selectActivityName;
+	
+	@ApiModelProperty(value = "是否推荐    推荐/精选  有  0 不推荐  1 推荐")
+	private Integer isRecommend;
+
+	@ApiModelProperty(value = "id,  选择直播, 选择项目, 选择课程 有  推荐/精选 没有")
+	private Long linkContent;
+
+	//7和13都是外链  但是7去培训项目找活动外联，13是纯外链和培训项目本身没有任何关系
+	@ApiModelProperty(value = "链接活动类型  //0'课程'   1'考试' 2'调研' 3'直播' 4'投票' 5'作业' 6'证书'7'培训项目的外部链接活动'8'报名'9'签到'10'线下课程'11营销课程 12培训项目  13纯活动外联")
+	private Integer linkType;
+
+    @ApiModelProperty(value = "课程编码")
+
+    private String courseNo;
+	
+	@ApiModelProperty(value = "选择直播, 选择项目, 选择课程  名称")
+
+	private String linkContentName;
+
+	@ApiModelProperty(value = "pc:1使用内容图片 2使用新图片")
+	private Integer thumbnail;
+
+	@ApiModelProperty(value = "图片路径")
+
+	private String imgPath;
+
+	@ApiModelProperty(value = "说明")
+	private String directions;
+
+	@ApiModelProperty(value = "0: 删除  1: 未发布  2： 发布")
+	private Integer state;
+
+	@ApiModelProperty(value = "创建时间")
+
+	private Date createTime;
+
+	@ApiModelProperty(value = "创建人")
+
+	private Long createById;
+
+	@ApiModelProperty(value = "创建姓名")
+	private String createByName;
+
+	@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updateById;
+
+	@ApiModelProperty(value = "更新姓名")
+	private String updateByName;
+	
+	@ApiModelProperty(value="排序规则")
+	private Integer sort;
+	
+	protected Serializable pkVal() {
+		return this.id;
+	}
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fulan123
+ * @since 2018-12-13
+ */
+@Data
+@Api(tags = "RelationLinkEntityVo", description = "")
+public class RelationLinkVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键")
+	private Integer id;
+
+	private Integer code;
+
+	private String name;
+
+	private String url;
+	
+	private Integer state;  //0下架 1上架
+
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fulan123
+ * @since 2018-12-17
+ */
+@Data
+@Api(tags = "RelationLiveEntityVo", description = "")
+public class RelationLiveVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键")
+	private Long id;
+
+@ApiModelProperty(value = "终端ID")
+	private Long terminalId;
+
+@ApiModelProperty(value = "关联的直播id")
+	private Long liveId;
+
+
+@ApiModelProperty(value = "状态")
+private Integer state;
+
+
+	private Long createById;
+
+	private String createByName;
+
+	private Date createTime;
+
+	private Long updateById;
+
+	private String updateByName;
+
+	private Date updateTime;
+
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@Api(tags = "RelationReportEntityVo", description = "")
+public class RelationReportVo {
+
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键")
+	private Long id;
+
+    @ApiModelProperty(value = "终端ID")
+	private Long terminalId;
+
+    @ApiModelProperty(value = "关联的报告id")
+	private Long reportId;
+
+    @ApiModelProperty(value = "关联的报告名称")
+	private String reportName;
+    
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "是否置顶")
+    private Integer isTop;
+    
+    @ApiModelProperty(value = "推送开始时间")
+    private Date startPush;
+    
+    @ApiModelProperty(value = "推送结束时间")
+    private Date endPush;
+    
+    @ApiModelProperty(value = "统计开始时间")
+    private Date startTime;
+    
+    @ApiModelProperty(value = "统计结束时间")
+    private Date endTime;
+
+	private Long createById;
+
+	private String createByName;
+
+	private Date createTime;
+
+	private Long updateById;
+
+	private String updateByName;
+
+	private Date updateTime;
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 站点网页名称图片
+ * </p>
+ *
+ * @author fulan123
+ * @since 2019-07-05
+ */
+@Data
+@Api(tags = "SiteConfigEntityVo", description = "站点网页名称图片")
+public class SiteConfigVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "站点id")
+    private Long siteId;
+
+    @ApiModelProperty(value = "公司id")
+    private Long companyId;
+
+
+    @ApiModelProperty(value = "网页图标")
+    private String headIco;
+
+    @ApiModelProperty(value = "网页名称")
+    private String titleName;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人的id")
+    private Long createById;
+
+    @ApiModelProperty(value = "更新人的id")   private Long updateById;
+
+    @ApiModelProperty(value = "1.删除。0.未删除")
+    private Integer delFlag;
+
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 门户系统字典
+ * </p>
+ *
+ * @author lly
+ * @since 2019-4-29
+ */
+@Data
+@ApiModel(value = "SiteDicEntityVo", description = "门户系统字典")
+public class SiteDicVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "记录id")
+	private Long id;
+
+    @ApiModelProperty(value = "父节点id")
+	private Long parentId;
+
+    @ApiModelProperty(value = "字典名称")
+	private String name;
+
+    @ApiModelProperty(value = "字典代码")
+	private String code;
+
+    @ApiModelProperty(value = "描述")
+	private String des;
+
+    @ApiModelProperty(value = "启用状态 1 启用 2失效")
+	private String status;
+
+    @ApiModelProperty(value = "图片")
+	private String imgUrl;
+
+    @ApiModelProperty(value = "字典类型")
+	private String type;
+
+    @ApiModelProperty(value = "添加时间")
+	private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+
+
+    protected Serializable pkVal() {
+        return null;
+    }
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 站点国际化语言表
+ * </p>
+ *
+ * @author fulan123
+ * @since 2020-09-11
+ */
+@Data
+@Api(tags = "SiteLanguageEntityVo", description = "站点国际化语言表")
+public class SiteLanguageVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "语言id")
+    private Long languageId;
+
+    @ApiModelProperty(value = "公司id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "站点id")
+    private Long siteId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "删除标记 0 正常 1 删除")
+    private Integer deleted;
+
+    @ApiModelProperty(value = "状态 0 停用 1 启用")
+    private Integer status;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "SiteManageEntityVO", description = "站点管理人员")
+@Data
+public class SiteManageVo {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "主键")
+	private Long id;
+
+	@ApiModelProperty(value = "站点ID")
+	private Long siteId;
+
+	@ApiModelProperty(value = "人员ID")
+	private Long accountId;
+
+	@ApiModelProperty(value = "0无效 1有效")
+	private Integer state;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+	@ApiModelProperty(value = "创建人ID")
+	private Long createById;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String createByName;
+
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+
+	@ApiModelProperty(value = "修改人ID")
+	private Long updateById;
+
+	@ApiModelProperty(value = "修改人姓名")
+	private String updateByName;
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-03-27
+ */
+@ApiModel(value = "SiteEntityVo", description = "站点")
+@Data
+public class SiteVo {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "主键")
+	private Long id;
+
+	@ApiModelProperty(value = "站点名称")
+	private String name;
+
+	@ApiModelProperty(value = "站点编码")
+	private String code;
+
+	@ApiModelProperty(value = "存放路径")
+	private String logoPath;
+
+	@ApiModelProperty(value = "站点前台访问地址")
+	private String receptionAdd;
+
+	@ApiModelProperty(value = "自定义访问地址")
+	private String customizeAdd;
+
+	@ApiModelProperty(value = "关联部门, 多个用，隔开")
+	private Long relatedOrg;
+
+	@ApiModelProperty(value = "0停用 1启用")
+	private Integer state;
+
+	@ApiModelProperty(value = "0不是 1是")
+	private Integer main;
+
+	@ApiModelProperty(value = "父站点ID")
+	private Long parentId;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+	@ApiModelProperty(value = "创建人ID")
+	private Long createById;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String createByName;
+
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+
+	@ApiModelProperty(value = "修改人ID")
+	private Long updateById;
+
+	@ApiModelProperty(value = "修改人姓名")
+	private String updateByName;
+
+	@ApiModelProperty(value = "公司ID")
+	private Long companyId;
+
+	@ApiModelProperty(value = "1: 统一站点  0: 多站点")
+	private Integer unite;
+
+	@ApiModelProperty(value = "部门ID")
+	private Long orgId;
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-04-10
+ */
+@ApiModel(value="TemplateCourseEntityVo", description="热门课程")
+@Data
+public class TemplateCourseVo {
+
+    private static final long serialVersionUID = 1L;
+    
+    @ApiModelProperty(value="主键id")
+    private Long id;
+    
+    @ApiModelProperty(value="模块Id")
+    private Long templateId;
+    
+    @ApiModelProperty(value="分类名称")
+    private String name;
+    
+    @ApiModelProperty(value="是否显示 0 不显示  1 显示")
+    private Integer display;
+    
+    @ApiModelProperty(value="状态 0 删除 1 未删除")
+    private Integer state;
+    
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value="创建人")
+    private Long createById;
+
+    @ApiModelProperty(value="创建姓名")
+    private String createByName;
+
+    @ApiModelProperty(value="更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value="更新人")
+    private Long updateById;
+    
+    @ApiModelProperty(value="更新姓名")
+    private String updateByName;
+
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资讯阅读次数统计
+ * </p>
+ *
+ * @author lilingye
+ * @since 2018-06-25
+ */
+@Data
+@Api(tags = "TrInformationReadNumberEntityVo", description = "资讯阅读次数统计")
+public class TrInformationReadNumberVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键")
+	private Long id;
+
+@ApiModelProperty(value = "外键")
+	private Long informationId;
+
+@ApiModelProperty(value = "冗余")
+	private Long siteId;
+
+@ApiModelProperty(value = "阅读次数")
+	private Integer number;
+
+@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+@ApiModelProperty(value = "创建人")
+	private Long createById;
+
+@ApiModelProperty(value = "创建人姓名")
+	private String createByName;
+
+@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+
+@ApiModelProperty(value = "更新人")
+	private Long updateById;
+
+@ApiModelProperty(value = "更新姓名")
+	private String updateByName;
+
+
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢海军
+ * @since 2018-07-24
+ */
+@Data
+@ApiModel(value = "TrPortalBlockEntityVo", description = "门户列表区块对象")
+public class TrPortalBlockVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "唯一主键")
+	private Long id;
+
+    @ApiModelProperty(value = "终端ID")
+	private Long terminalId;
+
+    @ApiModelProperty(value = "门户列表块的类型 1：底部菜单区块；2：菜单栏区块；3：公告栏区块")
+	private Integer blockType;
+
+    @ApiModelProperty(value = "区块是否显示 1：显示；0：不显示")
+	private Integer display;
+
+	@ApiModelProperty(value = "底部菜单列表")
+	private String bottomMenu;
+
+    @ApiModelProperty(value = "创建人id")
+	private Long createById;
+
+    @ApiModelProperty(value = "创建人姓名")
+	private String createByName;
+
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+    @ApiModelProperty(value = "修改人id")
+	private Long updateById;
+
+    @ApiModelProperty(value = "修改人姓名")
+	private String updateByName;
+
+    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+
+
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wfd123
+ * @since 2019-02-22
+ */
+@Data
+public class TrPortalLookNumVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+	private Long id;
+
+
+	private Long homeId;
+
+@ApiModelProperty(value = "0不显示1显示")
+	private Integer display;
+
+@ApiModelProperty(value = "设置的默认值")
+	private Integer defaultNum;
+
+
+
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fulan123
+ * @since 2018-12-11
+ */
+@Data
+@Api(tags = "TrPortalPageBottomLinkEntityVo", description = "")
+public class TrPortalPageBottomLinkVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键ID")
+	private Long id;
+
+@ApiModelProperty(value = "链接id")
+	private Long linkId;
+
+
+@ApiModelProperty(value = "如果是文字链接，文字标签最多四个字")
+	private String tag;
+
+@ApiModelProperty(value = "网址")
+private String contentUrl;
+
+	private Date createTime;
+
+	private Long createById;
+private String createByName;
+
+	private Date updateTime;
+
+	private Long updateById;
+
+	private String updateByName;
+
+
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fulan123
+ * @since 2018-12-11
+ */
+@Data
+@Api(tags = "TrPortalPageBottomEntityVo", description = "")
+public class TrPortalPageBottomVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键ID")
+	private Long id;
+
+@ApiModelProperty(value = "主页ID")
+	private Long pageId;
+
+@ApiModelProperty(value = "1代表文案，2代表链接")
+	private Integer type;
+
+@ApiModelProperty(value = "针对链接，如果1链接名字显示，如果2链接名字不显示")
+	private Integer display;
+
+@ApiModelProperty(value = "如果是文案，这列是文案信息，如果是链接，这列是链接名字，最多都是六个字")
+	private String content;
+
+@ApiModelProperty(value = "文字链接/图片链接")
+private Integer contentType;
+
+@ApiModelProperty(value = "排序规则")
+	private Integer sort;
+
+@ApiModelProperty(value = "0删除1未删除")
+private Integer state;
+
+	private Date createTime;
+
+	private Long createById;
+
+	private String createByName;
+	private Date updateTime;
+
+	private Long updateById;
+
+	private String updateByName;
+
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author liang123
+ * @since 2018-12-24
+ */
+@Data
+@Api(tags = "TrPortalPageEntityVo", description = "")
+public class TrPortalPageVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+@ApiModelProperty(value = "主键ID")
+	private Long id;
+
+@ApiModelProperty(value = "终端ID")
+private Long terminalId;
+
+@ApiModelProperty(value = "类型,默认页底0，选择页底1")
+	private Integer type;
+
+@ApiModelProperty(value = "上海易知科技提供技术支持")
+	private String content;
+
+	private Date createTime;
+
+	private Long createById;
+
+	private String createByName;
+
+	private Date updateTime;
+
+	private Long updateById;
+
+	private String updateByName;
+
+
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

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

+package com.yizhi.site.application.vo.domain;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hutao
+ * @since 2019-07-29
+ */
+@Data
+@Api(tags = "TrSearchRecordeEntityVo", description = "")
+public class TrSearchRecordeVo {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "主键")
+	private Long id;
+
+	@ApiModelProperty(value = "终端类型1PC2微信3app")
+	private Integer terminalType;
+
+	@ApiModelProperty(value = "类型 1全栈 2课程 3培训 4营销课程 5讲师库 6帖子")
+	private Integer type;
+
+	@ApiModelProperty(value = "内容")
+	private String content;
+
+	@ApiModelProperty(value = "0未删除1删除")
+	private Integer deleted;
+
+	private Long accountId;
+	private Long orgId;
+
+	private Long siteId;
+
+	private Long companyId;
+
+	private Date createTime;
+
+	private Long createById;
+
+	private Date updateTime;
+
+	private Long updateById;
+
+	protected Serializable pkVal() {
+		return this.id;
+	}
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value="AllHomeBannerImageVO", description="获取首页轮播图参数")
+@Data
+public class AllHomeBannerImageVO {
+	
+	@ApiModelProperty(value="轮播图所属栏目")
+	private String bannerName;
+	
+	@ApiModelProperty(value="终端名称")
+	private String terminalName;
+	
+	@ApiModelProperty(value="公司ID")
+	private Long companyId;
+	
+	@ApiModelProperty(value="站点ID")
+	private Long siteId;
+	
+	@ApiModelProperty(value="部门ID")
+	private Long orgId;
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "AnnouncementVO", description = "选择公告列表")
+@Data
+public class AnnouncementVO extends KindAndTypeVO {
+	
+	@ApiModelProperty(value = "资讯ID")
+    private Long id;
+	
+    @ApiModelProperty(value = "文章名称")
+    private String fileName;
+    
+    
+    /**
+     * --------分隔符--------
+     */
+    @ApiModelProperty("终端ID")
+    private Long terminalId;
+    
+    @ApiModelProperty("插入用到公告ids")
+    private List<Long>  announcementIds;
+    
+    @ApiModelProperty(value = "改变状态模块是否显示,0不显示,1显示")
+    private Integer display;
+    
+    @ApiModelProperty("删除公告iD")
+    private Long  announcementId;
+    
+    @ApiModelProperty("bannerIDS")
+    private List<Long> ids;
+
+}

cloud-site-api/src/main/java/com/yizhi/site/application/vo/site/ApiFeatureVO.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;
+
+@ApiModel(value="ApiFeatureVO", description="模块精选VO")
+@Data
+public class ApiFeatureVO extends KindAndTypeVO {
+	
+	@ApiModelProperty(value = "跳转后的功能id")
+	private Long relaId;
+	
+	@ApiModelProperty(value = "精选名称")
+	private String title;
+	
+	@ApiModelProperty(value = "图片路径")
+	private String imgPath;
+	
+	@ApiModelProperty(value = "链接地址")
+	private String linkUrl;
+	
+	@ApiModelProperty(value = "开始时间")
+	private Date startTime;
+}

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

+package com.yizhi.site.application.vo.site;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value="ApiPortalPCLogo", description="门户PC学员端第一行")
+@Data
+public class ApiPortalPCBaseMessage {
+	
+	@ApiModelProperty(value = "图片路径")
+	private String imgLogo;
+	
+	
+	@ApiModelProperty(value = "站点名字")
+	private String siteName;
+	
+	
+	@ApiModelProperty(value="消息个数")
+	private Integer messageNum;
+	
+	
+	@ApiModelProperty(value="登录名")
+	private String accountName;
+	
+	
+	
+	
+	
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value="ApiPortalPCLink", description="门户PC学员端链接")
+@Data
+public class ApiPortalPCLink {
+	
+	@ApiModelProperty(value = "显示名字(栏目名称)")
+	private String name;
+	
+	
+	@ApiModelProperty(value = "0站内链接  1站外连接")
+	private Integer relationFunc;
+	
+	
+	@ApiModelProperty(value="站内链接对应code编码")
+	private String relationFuncCode;
+	
+	@ApiModelProperty(value="站内链接code编码对应的名字")
+	private String relationFuncName;
+	
+	
+	@ApiModelProperty(value="站外连接对应的网址")
+	private String relationFuncUrl;
+	
+	
+	@ApiModelProperty("对应的图片")
+	private String imgLogo;
+
+
+    @ApiModelProperty("相关联id,如课程分类id")
+    private Long relationId;
+
+
+	@ApiModelProperty("关联的内容")
+	private String relationNum;
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel(value="ApiPortalPCLive", description="门户PC学员端直播")
+@Data
+public class ApiPortalPCLive {
+	
+	@ApiModelProperty(value="直播ID")
+	private Long id;
+	
+	@ApiModelProperty(value = "直播名字")
+	private String title;
+	
+	
+	@ApiModelProperty(value = "直播讲师")
+	private String teacherName;
+	
+	
+	@ApiModelProperty(value="开始时间")
+	private String startTime;
+	
+	@ApiModelProperty(value="logo")
+	private String logo;
+	
+	
+	@ApiModelProperty(value="状态-1状态异常  1即将开始 2直播中 3直播结束（直播回放）")
+	private Integer state;
+	
+	@ApiModelProperty(value="直播频道号")
+	private String channel;
+
+
+	@ApiModelProperty(value = "观看类型：0: 公开播放 ; 1: 站内授权播放; ")
+	private Integer viewType;
+
+	@ApiModelProperty(value = "直播开始时间")
+	private Date liveStartTime;
+
+	@ApiModelProperty(value = "直播结束时间")
+	private Date liveEndTime;
+
+	@ApiModelProperty(value = "在学人数")
+	private Integer onlineCount;
+
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value="ApiTemplateListVO", description="学员端模块列表")
+@Data
+public class ApiTemplateListVO {
+
+	@ApiModelProperty(value = "模块ID")
+    private Long id;
+
+    @ApiModelProperty(value = "模块图片")
+    private String imageUrl;
+	
+	@ApiModelProperty(value = "首页ID")
+    private Long homeId;
+    
+    @ApiModelProperty(value = "站点ID")
+    private Long siteId;
+    
+    @ApiModelProperty(value = "板块类型,1:推荐/精选,2:项目培训,3:课程,4:直播,5:新闻")
+    private Integer moduleType;
+    
+    @ApiModelProperty(value = "图片")
+    private String icon;
+    
+    @ApiModelProperty(value = "显示名称")
+    private String moduleName;
+    
+    @ApiModelProperty(value = "选择项目, 推荐/精选 有,  直播 新闻 没有")
+    private String selectProject;
+    
+    @ApiModelProperty(value = "内容个数")
+    private Integer num;
+    
+    @ApiModelProperty(value = "精选专题")
+    private List<ApiFeatureVO> featureList;
+    
+    @ApiModelProperty(value = "培训项目")
+    private List<MyProjectAndCourseVO> projectList;
+    
+    @ApiModelProperty(value = "热门课程分类")
+    private List<PopCourseListVO> popularCourseList;
+    
+    @ApiModelProperty(value = "课程")
+    private List<MyProjectAndCourseVO> courseList;
+    
+    @ApiModelProperty(value = "新闻")
+    private List<TemplateNewsVO> newsList;
+    
+    @ApiModelProperty(value = "直播")
+    private List<MyProjectAndCourseVO> liveList;
+    
+//    @ApiModelProperty(value = "学员个人相关， 培训项目、课程")
+//    private List<MyProjectAndCourseVO> myList;
+}

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

+package com.yizhi.site.application.vo.site;
+
+import java.util.List;
+
+
+import com.yizhi.site.application.vo.domain.PortalTemplateVo;
+import com.yizhi.site.application.vo.domain.ProtalPlateVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value="ApiTemplateMiddlerVO", description="模块返回中台组装数据")
+@Data
+public class ApiTemplateMiddlerVO {
+	
+	@ApiModelProperty(value = "正文模板")
+	private PortalTemplateVo portalTemplate;
+	
+	@ApiModelProperty(value = "模块分类")
+	private List<ProtalPlateVo> ppList;
+	
+	@ApiModelProperty(value = "新闻")
+    private List<TemplateNewsVO> newsList;
+	
+	@ApiModelProperty(value = "热门课程分类")
+    private List<PopCourseListVO> popularCourseList;
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value="BannerImageListVO", description="轮播图片 新增")
+public class BannerImageListVO {
+	
+	@ApiModelProperty(value = "主键")
+	private Long id;
+	
+	@ApiModelProperty(value = "图片标题")
+	private String imgTitle;
+	
+	@ApiModelProperty(value = "存放图片路径")
+	private String bannerPath;
+	
+	@ApiModelProperty(value = "banner名称，营销，首页，培训，课程，新闻资讯，专辑")
+	private String bannerName;
+	
+	@ApiModelProperty(value = "跳转后的功能id")
+	private String linkUrl;
+
+	@ApiModelProperty(value = "首页类型, 1：课程  2：考试   3：培训  4：外部链接,  0 不是首页, 8:首页不选类型时候（仅仅图片），7专辑")
+	private Integer homeType;
+	
+	@ApiModelProperty(value = "指定上架时间")
+	private Date addTime;
+	
+	@ApiModelProperty(value = "站点ID")
+	private Long siteId;
+
+	@ApiModelProperty(value = "终端ID")
+	private Long terminalId;
+	
+	@ApiModelProperty(value = "用户ID")
+	private Long accountId;	
+	
+	@ApiModelProperty(value = "公司ID")
+	private Long companyId;
+	
+	@ApiModelProperty(value = "部门ID")
+	private Long orgId;
+	
+	@ApiModelProperty(value = "用户名称")
+	private String accountName;
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: XieHaijun
+ * @Description:
+ * @Date: Created in 16:50 2018/9/13
+ * @Modified By
+ */
+@Data
+@Api(tags = "BottomMenuVO", description = "底部菜单VO")
+public class BottomMenuVO implements Cloneable{
+
+    @ApiModelProperty(value = "底部菜单id")
+    private Long id;
+
+    @ApiModelProperty(value = "底部菜单名称")
+    private String value;
+
+    @ApiModelProperty(value = "是否选中")
+    private Boolean checked;
+
+    public BottomMenuVO(){}
+
+    public BottomMenuVO(Long id,String value,Boolean checked){
+        this.id = id;
+        this.value = value;
+        this.checked = checked;
+    }
+
+    @Override
+    public Object clone() {
+        BottomMenuVO bottomMenuVO = null;
+        try {
+            bottomMenuVO = (BottomMenuVO) super.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return bottomMenuVO;
+
+    }
+
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import java.util.Date;
+import java.util.List;
+
+
+import com.yizhi.site.application.vo.domain.DataClassificationVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Api(tags = "ClassificationVO", description = "资料分类")
+public class ClassificationVO {
+
+	 @ApiModelProperty(value = "资料分类id")
+	 private Long id;
+	 
+	 @ApiModelProperty(value = "资料分类名称")
+	 private String name;
+	 
+	 @ApiModelProperty(value = "资料创建时间")
+	 private Date createTime;
+	 
+	 @ApiModelProperty(value = "资料实体")
+	 private List<DataClassificationVo> data;
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+
+import com.yizhi.core.application.context.RequestContext;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="ContextVO", description="上下文")
+public class ContextVO {
+	
+	@ApiModelProperty(value="上下文")
+	private RequestContext context;
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value="CourseAddVO", description="热门课程分类新增集合VO")
+@Data
+public class CourseAddVO extends ContextVO {
+	
+	@ApiModelProperty(value="模块Id")
+    private Long templateId;
+	
+	@ApiModelProperty(value="热门课程分类集合")
+	private List<PopCourseListVO> courseList;
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import lombok.Data;
+
+@Data
+public class FileUploadModel {
+	//文件名
+	private String fileName;
+	//文件url
+    private String fileUrl;
+}

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

+package com.yizhi.site.application.vo.site;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 显示配置---》功能项显示配置
+ * </p>
+ *
+ * @author 谢海军123
+ * @since 2019-04-29
+ */
+@Data
+@ApiModel(value = "FunctionDisplayConfigVO", description = "显示配置---》功能项显示配置")
+public class FunctionDisplayConfigVO {
+
+    @ApiModelProperty(value = "唯一主键")
+	private Long id;
+
+    @ApiModelProperty(value = "功能名称")
+	private String functionName;
+
+    @ApiModelProperty(value = "功能类型：01 课程学时显示；02 项目学时显示")
+	private String functionType;
+
+    @ApiModelProperty(value = "使用的设备")
+	private String useDevice;
+
+    @ApiModelProperty(value = "使用设备类型：01 pc端&移动端")
+	private String useDeviceType;
+
+    @ApiModelProperty(value = "是否显示 0:不显示（false）；1:显示（true）")
+	private Boolean showDisplay;
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+
+import com.baomidou.mybatisplus.plugins.Page;
+import lombok.Data;
+
+@Data
+public class HeadNavigateListVO {
+	
+	private Long siteId;
+	
+	private Long homeId;
+	
+	private Page<NavigateListVO> page;
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "HomeImageListVO", description = "首页关联轮播片")
+@Data
+public class HomeImageListVO extends ContextVO {
+
+	@ApiModelProperty(value = "首页ID")
+	private Long homeId;
+	
+	@ApiModelProperty(value = "轮播图片主键")
+	private Long imageId;
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "HomeInformationListVO", description = "首页关联公告")
+@Data
+public class HomeInformationListVO extends ContextVO {
+	
+	@ApiModelProperty(value = "首页ID")
+	private Long homeId;
+	
+	@ApiModelProperty(value = "公告ID")
+	private Long informationId;
+
+}

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

+package com.yizhi.site.application.vo.site;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bob123
+ * @since 2018-04-02
+ */
+@ApiModel(value = "HomeLogoEntityVo", description = "首页logo")
+@Data
+@TableName("tr_home_logo")
+public class HomeLogoEntityVo extends Model<HomeLogoEntityVo> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "首页logoID")
+    private Long id;
+    
+    @ApiModelProperty(value = "首页id")
+    @TableField("home_id")
+    private Long homeId;
+    
+    @ApiModelProperty(value = "logo图片地址")
+    @TableField("logo_path")
+    private String logoPath;
+    
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+    
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+    
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by_id")
+    private Long createById;
+    
+    @ApiModelProperty(value = "创建姓名")
+    @TableField("create_by_name")
+    private String createByName;
+    
+    @ApiModelProperty(value = "更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+    
+    @ApiModelProperty(value = "更新人")
+    @TableField("update_by_id")
+    private Long updateById;
+    
+    @ApiModelProperty(value = "更新姓名")
+    @TableField("update_by_name")
+    private String updateByName;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}