增加支付/缴费/提现

module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamodule.html

@@ -118,7 +118,7 @@
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
                                     return '-';
                                 }
-                                var img = '<img id="' + rowData + '" src="route/file/download/false/' + rowData  + '" align="加载失败" lay-event="bigdataModulePhotoImageEvent">';
+                                var img = '<img id="' + rowData + '" src="route/file/download/true/' + rowData  + '" align="加载失败" lay-event="bigdataModulePhotoImageEvent">';
                                 if(initImageTimeout) {
                                     clearTimeout(initImageTimeout);
                                 }

module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamoduleselect.html

@@ -104,7 +104,7 @@
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
                                     return '-';
                                 }
-                                var img = '<img id="' + rowData + '" src="route/file/download/false/' + rowData  + '" align="加载失败" lay-event="bigdataModulePhotoImageEvent">';
+                                var img = '<img id="' + rowData + '" src="route/file/download/true/' + rowData  + '" align="加载失败" lay-event="bigdataModulePhotoImageEvent">';
                                 if(initImageTimeout) {
                                     clearTimeout(initImageTimeout);
                                 }

module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamoduleselect2.html

@@ -65,7 +65,7 @@
                     <span style="color:forestgreen;font-weight: bold">选项联动</span>
                 {{# } }}
                 <h3 class="title">{{d[i].bigdataModuleName}}</h3>
-                <img alt="{{d[i].bigdataModuleCode}} - {{d[i].bigdataModuleTypeDictionaryName}}" src="route/file/download/false/{{d[i].bigdataModulePhoto}}">
+                <img alt="{{d[i].bigdataModuleCode}} - {{d[i].bigdataModuleTypeDictionaryName}}" src="route/file/download/true/{{d[i].bigdataModulePhoto}}">
                 <b class="badge orange status">{{d[i].bigdataModuleCode}} - {{d[i].bigdataModuleTypeDictionaryName}}</b>
             </div>
         </li>

module-building-pictures/src/main/resources/templates/picturestemplate/list-picturestemplate.html

@@ -98,9 +98,9 @@
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
                                     return '-';
                                 }
-                                var value = '<img style="height: 50px;width: 50px;" src="route/file/download/false/'+ rowData +'" >';
+                                var value = '<img style="height: 50px;width: 50px;" src="route/file/download/true/'+ rowData +'" >';
                                 if(picturesTemplatePictureUrl) {
-                                    value = '<img style="height: 50px;width: 50px;" src="route/file/download/false/' + picturesTemplatePictureUrl + '">';
+                                    value = '<img style="height: 50px;width: 50px;" src="route/file/download/true/' + picturesTemplatePictureUrl + '">';
                                 }
                                 setTimeout(function() {
                                     new Viewer(document.getElementById("viewer"),{

module-config-column/src/main/java/cn/com/tenlion/configcolumn/service/configcolumngroup/impl/ConfigColumnGroupServiceImpl.java

@@ -220,6 +220,7 @@ public class ConfigColumnGroupServiceImpl extends DefaultBaseService implements
 
     @Override
     public List<ConfigColumnGroupDTO> listToApp(String token, Map<String, Object> params) {
+        String configColumnRole = params.get("configColumnRole") == null ? "0" : params.get("configColumnRole").toString();
         // 只加载显示状态为true的栏目组
         params.put("configColumnGroupStatus", "1");
         List<ConfigColumnGroupDTO> configColumnGroupDTOs = list(params);
@@ -229,7 +230,7 @@ public class ConfigColumnGroupServiceImpl extends DefaultBaseService implements
             List<ConfigColumnDTO> configColumnList = new ArrayList<ConfigColumnDTO>();
             // 只加载显示的栏目
             for(ConfigColumnDTO dto : list) {
-                if ("1".equals(dto.getConfigColumnStatus())) {
+                if ("1".equals(dto.getConfigColumnStatus()) && dto.getConfigColumnRole().contains(configColumnRole)) {
                     ConfigColumnSetDTO setDisplayDTO = iConfigColumnSetService.getSetDisplay(token, dto.getConfigColumnId());
                     ConfigColumnSetDTO setNameDTO = iConfigColumnSetService.getSetName(token, dto.getConfigColumnId());
                     // 封装自定义名称

module-config-column/src/main/resources/mybatis/mapper/configcolumn/config-column-mapper.xml

@@ -25,6 +25,8 @@
         <result column="config_column_dispatch" property="configColumnDispatch"/>
         <result column="config_column_like" property="configColumnLike"/>
         <result column="config_column_collect" property="configColumnCollect"/>
+        <result column="config_column_role" property="configColumnRole"/>
+        <result column="config_column_help" property="configColumnHelp"/>
         <result column="creator" property="creator"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="modifier" property="modifier"/>
@@ -107,7 +109,9 @@
             t1.config_column_comment,
             t1.config_column_dispatch,
             t1.config_column_like,
-            t1.config_column_collect
+            t1.config_column_collect,
+            t1.config_column_role,
+            t1.config_column_help
         FROM
             m_config_column t1
         WHERE
@@ -138,7 +142,9 @@
             t1.config_column_comment,
             t1.config_column_dispatch,
             t1.config_column_like,
-            t1.config_column_collect
+            t1.config_column_collect,
+            t1.config_column_role,
+            t1.config_column_help
         FROM
             m_config_column t1
         WHERE
@@ -172,6 +178,8 @@
             config_column_dispatch,
             config_column_like,
             config_column_collect,
+            config_column_role,
+            config_column_help,
             creator,
             gmt_create,
             modifier,
@@ -200,6 +208,8 @@
             #{configColumnDispatch},
             #{configColumnLike},
             #{configColumnCollect},
+            #{configColumnRole},
+            #{configColumnHelp},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -287,6 +297,10 @@
         <if test="configColumnRowTargetUrl != null and configColumnRowTargetUrl != ''">
             config_column_row_target_url = #{configColumnRowTargetUrl},
         </if>
+        <if test="configColumnRole != null and configColumnRole != ''">
+            config_column_role = #{configColumnRole},
+        </if>
+            config_column_help = #{configColumnHelp},
             config_column_comment = #{configColumnComment},
             config_column_dispatch = #{configColumnDispatch},
             config_column_like = #{configColumnLike},
@@ -322,7 +336,9 @@
             t1.config_column_comment,
             t1.config_column_dispatch,
             t1.config_column_like,
-            t1.config_column_collect
+            t1.config_column_collect,
+            t1.config_column_role,
+            t1.config_column_help
         FROM
             m_config_column t1
         WHERE
@@ -442,7 +458,9 @@
             t1.config_column_comment,
             t1.config_column_dispatch,
             t1.config_column_like,
-            t1.config_column_collect
+            t1.config_column_collect,
+            t1.config_column_role,
+            t1.config_column_help
         FROM
             m_config_column t1
         WHERE

module-config-column/src/main/resources/mybatis/mapper/configcolumngroup/config-column-group-mapper.xml

@@ -14,6 +14,7 @@
         <result column="config_column_group_target_mode" property="configColumnGroupTargetMode"/>
         <result column="config_column_group_target_url" property="configColumnGroupTargetUrl"/>
         <result column="config_column_group_style" property="configColumnGroupStyle"/>
+        <result column="config_column_group_role" property="configColumnGroupRole"/>
         <result column="creator" property="creator"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="modifier" property="modifier"/>
@@ -63,7 +64,8 @@
             t1.config_column_group_order,
             t1.config_column_group_target_mode,
             t1.config_column_group_target_url,
-            t1.config_column_group_style
+            t1.config_column_group_style,
+            t1.config_column_group_role
         FROM
             m_config_column_group t1
         WHERE
@@ -84,6 +86,7 @@
             config_column_group_target_mode,
             config_column_group_target_url,
             config_column_group_style,
+            config_column_group_role,
             creator,
             gmt_create,
             modifier,
@@ -101,6 +104,7 @@
             #{configColumnGroupTargetMode},
             #{configColumnGroupTargetUrl},
             #{configColumnGroupStyle},
+            #{configColumnGroupRole},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -167,6 +171,7 @@
         <if test="configColumnGroupStyle != null and configColumnGroupStyle != ''">
             config_column_group_style = #{configColumnGroupStyle},
         </if>
+            config_column_group_role = #{configColumnGroupRole},
             gmt_modified = #{gmtModified},
             modifier = #{modifier},
             config_column_group_id = config_column_group_id
@@ -187,7 +192,8 @@
             t1.config_column_group_order,
             t1.config_column_group_target_mode,
             t1.config_column_group_target_url,
-            t1.config_column_group_style
+            t1.config_column_group_style,
+            t1.config_column_group_role
         FROM
             m_config_column_group t1
         WHERE
@@ -275,11 +281,14 @@
             t1.modifier,
             t1.gmt_modified,
             t1.is_delete,
-            1
+            t1.config_column_group_role
         FROM
             m_config_column_group t1
         WHERE
             t1.is_delete = 0
+        <if test="configColumnGroupRole != null and configColumnGroupRole != ''">
+            AND t1.config_column_group_role LIKE CONCAT('%', CONCAT( #{configColumnGroupRole} , '%'))
+        </if>
         <if test="configColumnGroupStatus != null and configColumnGroupStatus != ''">
             AND t1.config_column_group_status = #{configColumnGroupStatus}
         </if>

module-config-column/src/main/resources/templates/configcolumn/list.html

@@ -33,6 +33,14 @@
                     </div>
                     <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
                     <!-- 表头按钮组 -->
+                    <script type="text/html" id="headerToolBar1">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
+                                <i class="fa fa-lg fa-edit"></i> 编辑
+                            </button>
+                        </div>
+                    </script>
+                    <!-- 表头按钮组 -->
                     <script type="text/html" id="headerToolBar">
                         <div class="layui-btn-group">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent">
@@ -79,7 +87,7 @@
                 height: $win.height() - 90,
                 limit: 20,
                 limits: [20, 40, 60, 80, 100, 200],
-                toolbar: configColumnGroupId ? "" : '#headerToolBar' ,
+                toolbar: configColumnGroupId ? "#headerToolBar1" : '#headerToolBar' ,
                 request: {
                     pageName: 'page',
                     limitName: 'rows'
@@ -94,7 +102,7 @@
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
                                     return '-';
                                 }
-                                var value = '<img style="height: 50px;width: 50px;" src="route/file/download/false/'+ rowData +'" >';
+                                var value = '<img style="height: 50px;width: 50px;" src="route/file/download/true/'+ rowData +'" >';
                                 setTimeout(function() {
                                     new Viewer(document.getElementById("viewer"),{
                                         loop:true

module-config-column/src/main/resources/templates/configcolumn/save.html

@@ -237,6 +237,21 @@
                         </div>
                     </div>
                 </div>
+                <div class="layui-form-item " pane>
+                    <label class="layui-form-label">支持角色<span style="color: red">*</span></label>
+                    <div class="layui-input-block layui-form">
+                        <input type="checkbox" lay-verify="required" name="configColumnRole[0]" value="0"  title="默认显示">
+                        <input type="checkbox"  lay-verify="required" name="configColumnRole[1]" value="1"  title="个人普通版">
+                        <input type="checkbox"  lay-verify="required" name="configColumnRole[2]" value="2"  title="企业普通版">
+                        <input type="checkbox" lay-verify="required" name="configColumnRole[3]" value="3"  title="企业高级版">
+                    </div>
+                </div>
+                <div class="layui-form-item layui-form-text">
+                    <label class="layui-form-label">提示说明<span style="color: red">*</span></label>
+                    <div class="layui-input-block">
+                        <textarea id="configColumnHelp" name="configColumnHelp" class="layui-textarea" placeholder="请输入提示说明"></textarea>
+                    </div>
+                </div>
                 <div class="layui-form-item layui-layout-admin">
                     <div class="layui-input-block">
                         <div class="layui-footer" style="left: 0;">
@@ -449,6 +464,7 @@
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;
+                formData.field['configColumnRole'] = top.restAjax.checkBoxToString(formData.field, 'configColumnRole');
                 top.restAjax.post(top.restAjax.path('api/configcolumn/save', []), formData.field, null, function(code, data) {
                     var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, {
                         time: 0,

module-config-column/src/main/resources/templates/configcolumn/update.html

@@ -238,6 +238,21 @@
                         </div>
                     </div>
                 </div>
+                <div  class="layui-form-item " pane>
+                    <label class="layui-form-label">支持角色<span style="color: red">*</span></label>
+                    <div class="layui-input-block layui-form">
+                        <input type="checkbox" lay-verify="required" name="configColumnRole[0]" value="0"  title="默认显示">
+                        <input type="checkbox"  lay-verify="required" name="configColumnRole[1]" value="1"  title="个人普通版">
+                        <input type="checkbox"  lay-verify="required" name="configColumnRole[2]" value="2"  title="企业普通版">
+                        <input type="checkbox" lay-verify="required" name="configColumnRole[3]" value="3"  title="企业高级版">
+                    </div>
+                </div>
+                <div class="layui-form-item layui-form-text">
+                    <label class="layui-form-label">提示说明<span style="color: red">*</span></label>
+                    <div class="layui-input-block">
+                        <textarea id="configColumnHelp" name="configColumnHelp" class="layui-textarea" placeholder="请输入提示说明"></textarea>
+                    </div>
+                </div>
                 <div class="layui-form-item layui-layout-admin">
                     <div class="layui-input-block">
                         <div class="layui-footer" style="left: 0;">
@@ -475,6 +490,12 @@
                 initConfigColumnPhotoUploadFile();
                 initConfigColumnRowTargetUrl(dataFormData.configColumnRowTargetUrl);
                 initConfigColumnTargetUrl(dataFormData.configColumnTargetUrl);
+                var checkboxValue = dataFormData.configColumnRole.split(',');
+                var checkboxObj = {};
+                for(var j = 0, checkbox = checkboxValue[j]; checkbox = checkboxValue[j++];) {
+                    checkboxObj['configColumnRole['+ checkbox +']'] = true;
+                }
+                form.val('dataForm', checkboxObj);
             }, function(code, data) {
                 top.dialog.msg(data.msg);
             }, function() {
@@ -490,6 +511,7 @@
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;
+                formData.field['configColumnRole'] = top.restAjax.checkBoxToString(formData.field, 'configColumnRole');
                 top.restAjax.put(top.restAjax.path('api/configcolumn/update/{configColumnId}', [configColumnId]), formData.field, null, function(code, data) {
                     var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, {
                         time: 0,

module-config-column/src/main/resources/templates/configcolumngroup/list.html

@@ -93,7 +93,7 @@
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
                                     return '-';
                                 }
-                                var value = '<img style="height: 50px;width: 50px;" src="route/file/download/false/'+ rowData +'" >';
+                                var value = '<img style="height: 50px;width: 50px;" src="route/file/download/true/'+ rowData +'" >';
                                 setTimeout(function() {
                                     new Viewer(document.getElementById("viewer"),{
                                         loop:true

module-config-column/src/main/resources/templates/configcolumngroup/save.html

@@ -127,6 +127,15 @@
                         </div>
                     </div>
                 </div>
+                <div class="layui-form-item " pane>
+                    <label class="layui-form-label">支持角色<span style="color: red">*</span></label>
+                    <div class="layui-input-block layui-form">
+                        <input type="checkbox" lay-verify="required" name="configColumnGroupRole[0]" value="0"  title="默认显示">
+                        <input type="checkbox"  lay-verify="required" name="configColumnGroupRole[1]" value="1"  title="个人普通版">
+                        <input type="checkbox"  lay-verify="required" name="configColumnGroupRole[2]" value="2"  title="企业普通版">
+                        <input type="checkbox" lay-verify="required" name="configColumnGroupRole[3]" value="3"  title="企业高级版">
+                    </div>
+                </div>
                <div class="layui-form-item layui-row ">
                    <div class="layui-col-lg12" >
                        <label class="layui-form-label">说明</label>
@@ -328,6 +337,7 @@
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;
+                formData.field['configColumnGroupRole'] = top.restAjax.checkBoxToString(formData.field, 'configColumnGroupRole');
                 top.restAjax.post(top.restAjax.path('api/configcolumngroup/save', []), formData.field, null, function(code, data) {
                     var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, {
                         time: 0,

module-config-column/src/main/resources/templates/configcolumngroup/update.html

@@ -127,6 +127,15 @@
                         </div>
                     </div>
                 </div>
+                <div class="layui-form-item " pane>
+                    <label class="layui-form-label">支持角色<span style="color: red">*</span></label>
+                    <div class="layui-input-block layui-form">
+                        <input type="checkbox" lay-verify="required" name="configColumnGroupRole[0]" value="0"  title="默认显示">
+                        <input type="checkbox"  lay-verify="required" name="configColumnGroupRole[1]" value="1"  title="个人普通版">
+                        <input type="checkbox"  lay-verify="required" name="configColumnGroupRole[2]" value="2"  title="企业普通版">
+                        <input type="checkbox" lay-verify="required" name="configColumnGroupRole[3]" value="3"  title="企业高级版">
+                    </div>
+                </div>
                 <div class="layui-form-item layui-row ">
                     <div class="layui-col-lg12" >
                         <label class="layui-form-label">说明</label>
@@ -336,6 +345,12 @@
                 }
                 form.val('dataForm', dataFormData);
                 form.render(null, 'dataForm');
+                var checkboxValue = dataFormData.configColumnGroupRole.split(',');
+                var checkboxObj = {};
+                for(var j = 0, checkbox = checkboxValue[j]; checkbox = checkboxValue[j++];) {
+                    checkboxObj['configColumnGroupRole['+ checkbox +']'] = true;
+                }
+                form.val('dataForm', checkboxObj);
                 initConfigColumnGroupPhotoUploadFile();
                 if(dataFormData.configColumnGroupTargetMode != 4 ) {
                     initConfigColumnGroupTargetUrl(dataFormData.configColumnGroupTargetUrl);
@@ -360,6 +375,7 @@
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;
+                formData.field['configColumnGroupRole'] = top.restAjax.checkBoxToString(formData.field, 'configColumnGroupRole');
                 top.restAjax.put(top.restAjax.path('api/configcolumngroup/update/{configColumnGroupId}', [configColumnGroupId]), formData.field, null, function(code, data) {
                     var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, {
                         time: 0,

module-config-content/src/main/java/cn/com/tenlion/configcontent/controller/app/api/contentcollect/ContentCollectAppController.java

@@ -80,6 +80,7 @@ public class ContentCollectAppController extends DefaultBaseController {
     @ApiOperation(value = "CBC内容管理我的收藏记录表分页列表", notes = "CBC内容管理我的收藏记录表分页列表接口")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "token", value = "token", paramType = "header"),
+        @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path"),
         @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
         @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
         @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
@@ -87,10 +88,11 @@ public class ContentCollectAppController extends DefaultBaseController {
         @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("listpage")
+    @GetMapping("listpage/{projectId}")
-    public SuccessResultList<List<ContentCollectDTO>> listPage(@RequestHeader("token") String token, ListPage page) throws Exception {
+    public SuccessResultList<List<ContentCollectDTO>> listPage(@RequestHeader("token") String token, ListPage page, @PathVariable("projectId") String projectId) throws Exception {
         Map<String, Object> params = requestParams();
         params.put("creator", getUserId(token));
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         page.setParams(params);
         return contentCollectService.listPage(page);
     }
@@ -98,25 +100,29 @@ public class ContentCollectAppController extends DefaultBaseController {
     @ApiOperation(value = "CBC内容管理收藏记录表统计", notes = "CBC内容管理收藏记录表统计接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "path", dataType = "String"),
+            @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("count" + ISystemConstant.RELEASE_SUFFIX + "/{businessId}")
+    @GetMapping("count" + ISystemConstant.RELEASE_SUFFIX + "/{projectId}/{businessId}")
-    SuccessResultData<Integer> count(@PathVariable("businessId") String businessId) {
+    SuccessResultData<Integer> count(@PathVariable("projectId") String projectId, @PathVariable("businessId") String businessId) {
         Map<String, Object> params = requestParams();
         params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         return new SuccessResultData<>(contentCollectService.count(params));
     }
 
     @ApiOperation(value = "CBC内容管理收藏记录表是否已收藏", notes = "CBC内容管理收藏记录表是否已收藏")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "path", dataType = "String"),
+            @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String"),
             @ApiImplicitParam(name = "token", value = "token", paramType = "header")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("status/{businessId}")
+    @GetMapping("status/{projectId}/{businessId}")
-    SuccessResultData<Boolean> collectStatus(@RequestHeader("token") String token, @PathVariable("businessId") String businessId) throws Exception {
+    SuccessResultData<Boolean> collectStatus(@RequestHeader("token") String token,@PathVariable("projectId") String projectId, @PathVariable("businessId") String businessId) throws Exception {
         Map<String, Object> params = requestParams();
         params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         params.put("creator", getUserId(token));
         return new SuccessResultData<>(contentCollectService.count(params) > 0 ? true : false);
     }

module-config-content/src/main/java/cn/com/tenlion/configcontent/controller/app/api/contentcomment/ContentCommentAppController.java

@@ -54,10 +54,10 @@ public class ContentCommentAppController extends DefaultBaseController {
             @ApiImplicitParam(name = "businessIds", value = "ID列表, 用逗号分割", paramType = "path")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("countlist/{businessIds}")
+    @GetMapping("countlist/{projectId}/{businessIds}")
     @CheckRequestBodyAnnotation
-    public List<ContentCountStatusDTO> countList(@RequestHeader("token") String token, @PathVariable("businessIds") String businessIds) {
+    public List<ContentCountStatusDTO> countList(@RequestHeader("token") String token, @PathVariable("projectId") String projectId, @PathVariable("businessIds") String businessIds) {
-        return contentCommentService.countList(token, businessIds);
+        return contentCommentService.countList(token, projectId, businessIds);
     }
 
     private String getUserId(String token) throws Exception {
@@ -91,22 +91,24 @@ public class ContentCommentAppController extends DefaultBaseController {
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @DeleteMapping("remove/{ids}")
-    public SuccessResult remove(@RequestHeader("token") String token, @PathVariable("ids") String ids) {
+    public SuccessResult remove(@RequestHeader("token") String token,  @PathVariable("ids") String ids) {
-        contentCommentService.remove(token, Arrays.asList(ids.split("\\_")));
+        contentCommentService.remove(token,  Arrays.asList(ids.split("\\_")));
         return new SuccessResult();
     }
 
     @ApiOperation(value = "CBC内容管理评论记录表列表", notes = "CBC内容管理评论记录表列表接口")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "path", dataType = "String"),
+        @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String"),
         @ApiImplicitParam(name = "contentCommentParentId", value = "父评论节点ID", paramType = "query", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("list" + ISystemConstant.RELEASE_SUFFIX + "/{businessId}")
+    @GetMapping("list" + ISystemConstant.RELEASE_SUFFIX + "/{projectId}/{businessId}")
-    public List<ContentCommentDTO> list(@PathVariable("businessId") String businessId) throws Exception {
+    public List<ContentCommentDTO> list(@PathVariable("projectId") String projectId, @PathVariable("businessId") String businessId) throws Exception {
         Map<String, Object> params = requestParams();
         params.put("contentCommentStatus", "1");
         params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         params.put("contentCommentParentId", params.get("contentCommentParentId") == null ? "0" : params.get("contentCommentParentId"));
         return contentCommentService.list(params);
     }
@@ -114,6 +116,7 @@ public class ContentCommentAppController extends DefaultBaseController {
     @ApiOperation(value = "CBC内容管理评论记录表分页列表", notes = "CBC内容管理评论记录表分页列表接口")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "path", dataType = "String"),
+        @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String"),
         @ApiImplicitParam(name = "contentCommentParentId", value = "父评论节点ID", paramType = "query", dataType = "String"),
         @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
         @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
@@ -122,11 +125,12 @@ public class ContentCommentAppController extends DefaultBaseController {
         @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("listpage" + ISystemConstant.RELEASE_SUFFIX + "/{businessId}")
+    @GetMapping("listpage" + ISystemConstant.RELEASE_SUFFIX + "/{projectId}/{businessId}")
-    public SuccessResultList<List<ContentCommentDTO>> listPage(ListPage page,  @PathVariable("businessId") String businessId) throws Exception {
+    public SuccessResultList<List<ContentCommentDTO>> listPage(ListPage page, @PathVariable("projectId") String projectId, @PathVariable("businessId") String businessId) throws Exception {
         Map<String, Object> params = requestParams();
         params.put("contentCommentStatus", "1");
         params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         params.put("contentCommentParentId", params.get("contentCommentParentId") == null ? "0" : params.get("contentCommentParentId"));
         page.setParams(params);
         return contentCommentService.listPage(page);
@@ -134,14 +138,16 @@ public class ContentCommentAppController extends DefaultBaseController {
 
     @ApiOperation(value = "CBC内容管理评论记录表统计", notes = "CBC内容管理评论记录表统计接口")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "path", dataType = "String"),
+        @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "path", dataType = "String"),
+        @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("count" + ISystemConstant.RELEASE_SUFFIX + "/{businessId}")
+    @GetMapping("count" + ISystemConstant.RELEASE_SUFFIX + "/{projectId}/{businessId}")
-    SuccessResultData<Integer> count(@PathVariable("businessId") String businessId) throws Exception {
+    SuccessResultData<Integer> count(@PathVariable("projectId") String projectId, @PathVariable("businessId") String businessId) throws Exception {
         Map<String, Object> params = requestParams();
         params.put("contentCommentStatus", "1");
         params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         return new SuccessResultData<>(contentCommentService.count(params));
     }
 

module-config-content/src/main/java/cn/com/tenlion/configcontent/controller/app/api/contentdispatch/ContentDispatchAppController.java

@@ -78,12 +78,14 @@ public class ContentDispatchAppController extends DefaultBaseController {
     @ApiOperation(value = "CBC内容管理转发记录表统计", notes = "CBC内容管理转发记录表统计接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "path", dataType = "String"),
+            @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("count" + ISystemConstant.RELEASE_SUFFIX + "/{businessId}")
-    SuccessResultData<Integer> count(@PathVariable("businessId") String businessId) {
+    SuccessResultData<Integer> count(@PathVariable("projectId") String projectId, @PathVariable("businessId") String businessId) {
         Map<String, Object> params = requestParams();
         params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         return new SuccessResultData<>(contentDispatchService.count(params));
     }
 

module-config-content/src/main/java/cn/com/tenlion/configcontent/controller/app/api/contentlike/ContentLikeAppController.java

@@ -67,19 +67,22 @@ public class ContentLikeAppController extends DefaultBaseController {
 
     @ApiOperation(value = "CBC内容管理点赞记录表列表", notes = "CBC内容管理点赞记录表列表接口")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "path", dataType = "String")
+        @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "path", dataType = "String"),
+        @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("list" + ISystemConstant.RELEASE_SUFFIX + "/{businessId}")
+    @GetMapping("list" + ISystemConstant.RELEASE_SUFFIX + "/{projectId}/{businessId}")
-    public List<ContentLikeDTO> list(@PathVariable("businessId") String businessId) {
+    public List<ContentLikeDTO> list(@PathVariable("projectId") String projectId, @PathVariable("businessId") String businessId) {
         Map<String, Object> params = requestParams();
         params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         return contentLikeService.list(params);
     }
 
     @ApiOperation(value = "CBC内容管理点赞记录表分页列表", notes = "CBC内容管理点赞记录表分页列表接口")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "query", dataType = "String"),
+        @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String"),
         @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
         @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
         @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
@@ -87,10 +90,11 @@ public class ContentLikeAppController extends DefaultBaseController {
         @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("listpage" + ISystemConstant.RELEASE_SUFFIX + "/{businessId}")
+    @GetMapping("listpage" + ISystemConstant.RELEASE_SUFFIX + "/{projectId}/{businessId}")
-    public SuccessResultList<List<ContentLikeDTO>> listPage(ListPage page, @PathVariable("businessId") String businessId) {
+    public SuccessResultList<List<ContentLikeDTO>> listPage(ListPage page, @PathVariable("projectId") String projectId, @PathVariable("businessId") String businessId) {
         Map<String, Object> params = requestParams();
         params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         page.setParams(params);
         return contentLikeService.listPage(page);
     }
@@ -98,25 +102,29 @@ public class ContentLikeAppController extends DefaultBaseController {
     @ApiOperation(value = "CBC内容管理点赞记录表统计", notes = "CBC内容管理点赞记录表统计接口")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "path", dataType = "String"),
+        @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("count" + ISystemConstant.RELEASE_SUFFIX + "/{businessId}")
+    @GetMapping("count" + ISystemConstant.RELEASE_SUFFIX + "/{projectId}/{businessId}")
-    SuccessResultData<Integer> count(@PathVariable("businessId") String businessId) {
+    SuccessResultData<Integer> count(@PathVariable("projectId") String projectId, @PathVariable("businessId") String businessId) {
         Map<String, Object> params = requestParams();
         params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         return new SuccessResultData<>(contentLikeService.count(params));
     }
 
     @ApiOperation(value = "CBC内容管理点赞记录表是否已点赞", notes = "CBC内容管理点赞记录表统计是否已点赞")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "path", dataType = "String"),
+            @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String"),
             @ApiImplicitParam(name = "token", value = "token", paramType = "header")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("status/{businessId}")
+    @GetMapping("status/{projectId}/{businessId}")
-    SuccessResultData<Boolean> likeStatus(@RequestHeader("token") String token, @PathVariable("businessId") String businessId) throws Exception {
+    SuccessResultData<Boolean> likeStatus(@RequestHeader("token") String token, @PathVariable("projectId") String projectId, @PathVariable("businessId") String businessId) throws Exception {
         Map<String, Object> params = requestParams();
         params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         params.put("creator", getUserId(token));
         return new SuccessResultData<>(contentLikeService.count(params) > 0 ? true : false);
     }

module-config-content/src/main/java/cn/com/tenlion/configcontent/controller/app/api/contentscans/ContentScansAppController.java

@@ -79,6 +79,7 @@ public class ContentScansAppController extends DefaultBaseController {
 
     @ApiOperation(value = "CBC内容管理我的查看记录表分页列表", notes = "CBC内容管理我的查看记录表分页列表接口")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String"),
             @ApiImplicitParam(name = "token", value = "token", paramType = "header"),
             @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
             @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
@@ -87,10 +88,11 @@ public class ContentScansAppController extends DefaultBaseController {
             @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("listpage")
+    @GetMapping("listpage/{projectId}")
-    public SuccessResultList<List<ContentScansDTO>> listPage(@RequestHeader("token") String token, ListPage page) throws Exception {
+    public SuccessResultList<List<ContentScansDTO>> listPage(@PathVariable("projectId") String projectId, @RequestHeader("token") String token, ListPage page) throws Exception {
         Map<String, Object> params = requestParams();
         params.put("creator", getUserId(token));
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         page.setParams(params);
         return contentScansService.listPage(page);
     }
@@ -98,6 +100,7 @@ public class ContentScansAppController extends DefaultBaseController {
     @ApiOperation(value = "CBC内容管理查看记录表分页列表", notes = "CBC内容管理查看记录表分页列表接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String"),
             @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
             @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
             @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
@@ -105,10 +108,11 @@ public class ContentScansAppController extends DefaultBaseController {
             @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("listpage" + ISystemConstant.RELEASE_SUFFIX + "/{businessId}")
+    @GetMapping("listpage" + ISystemConstant.RELEASE_SUFFIX + "/{projectId}/{businessId}")
-    public SuccessResultList<List<ContentScansDTO>> listPageBusinessId(@PathVariable("businessId") String businessId, ListPage page) throws Exception {
+    public SuccessResultList<List<ContentScansDTO>> listPageBusinessId(@PathVariable("projectId") String projectId, @PathVariable("businessId") String businessId, ListPage page) throws Exception {
         Map<String, Object> params = requestParams();
         params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         page.setParams(params);
         return contentScansService.listPage(page);
     }
@@ -116,12 +120,14 @@ public class ContentScansAppController extends DefaultBaseController {
     @ApiOperation(value = "CBC内容管理查看记录表统计", notes = "CBC内容管理查看记录表统计接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "businessId", value = "业务ID", paramType = "path", dataType = "String"),
+            @ApiImplicitParam(name = "projectId", value = "项目ID", paramType = "path", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("count" + ISystemConstant.RELEASE_SUFFIX + "/{businessId}")
+    @GetMapping("count" + ISystemConstant.RELEASE_SUFFIX + "/{projectId}/{businessId}")
-    SuccessResultData<Integer> count(@PathVariable("businessId") String businessId) {
+    SuccessResultData<Integer> count(@PathVariable("projectId") String projectId, @PathVariable("businessId") String businessId) {
         Map<String, Object> params = requestParams();
         params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+        params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
         return new SuccessResultData<>(contentScansService.count(params));
     }
 

module-config-content/src/main/java/cn/com/tenlion/configcontent/dao/contentcomment/IContentCommentDao.java

@@ -119,4 +119,6 @@ public interface IContentCommentDao {
     List<ContentCommentDTO> getCommentByBusinessIdAndCommentContent(Map<String, Object> params);
 
     void updateLike(Map<String, Object> params);
+
+    void removeApp(Map<String, Object> params);
 }

module-config-content/src/main/java/cn/com/tenlion/configcontent/service/contentcomment/IContentCommentService.java

@@ -204,6 +204,6 @@ public interface IContentCommentService {
      */
     Integer count(Map<String, Object> params);
 
-    List<ContentCountStatusDTO> countList(String token, String businessIds);
+    List<ContentCountStatusDTO> countList(String token, String projectId, String businessIds);
 
 }

module-config-content/src/main/java/cn/com/tenlion/configcontent/service/contentcomment/impl/ContentCommentServiceImpl.java

@@ -311,7 +311,7 @@ public class ContentCommentServiceImpl extends DefaultBaseService implements ICo
     }
 
     @Override
-    public List<ContentCountStatusDTO> countList(String token, String businessIds) {
+    public List<ContentCountStatusDTO> countList(String token, String projectId, String businessIds) {
         String[] arr = businessIds.split(",");
         List<ContentCountStatusDTO> list = new ArrayList<ContentCountStatusDTO>();
         Map<String, Object> params = getHashMap(3);
@@ -321,6 +321,7 @@ public class ContentCommentServiceImpl extends DefaultBaseService implements ICo
             dto.setBusinessId(businessId);
             params.clear();
             params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+            params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
             dto.setLikeCount(contentLikeService.count(params));
             dto.setCollectCount(contentCollectService.count(params));
             dto.setDispatchCount(contentDispatchService.count(params));
@@ -329,6 +330,7 @@ public class ContentCommentServiceImpl extends DefaultBaseService implements ICo
             dto.setCommentCount(count(params));
             params.clear();
             params.put("businessId", StringUtils.isEmpty(businessId) ? "notCheck" : businessId);
+            params.put("projectId", StringUtils.isEmpty(projectId) ? "notCheck" : projectId);
             params.put("creator", userId);
             dto.setLikeStatus(contentLikeService.count(params) > 0 ? true : false);
             dto.setCollectStatus(contentCollectService.count(params) > 0 ? true : false);
@@ -337,4 +339,5 @@ public class ContentCommentServiceImpl extends DefaultBaseService implements ICo
         return list;
     }
 
+
 }

module-config-content/src/main/resources/mybatis/mapper/contentcollect/content-collect-mapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="contentCollectDTO" type="cn.com.tenlion.configcontent.pojo.dtos.contentcollect.ContentCollectDTO">
         <result column="content_collect_id" property="contentCollectId"/>
         <result column="business_id" property="businessId"/>
+        <result column="project_id" property="projectId"/>
         <result column="content_collect_user_name" property="contentCollectUserName"/>
         <result column="content_collect_user_icon" property="contentCollectUserIcon"/>
         <result column="content_collect_tag" property="contentCollectTag"/>
@@ -49,6 +50,7 @@
             content_collect_user_name,
             content_collect_user_icon,
             content_collect_tag,
+            project_id,
             creator,
             gmt_create,
             modifier,
@@ -60,6 +62,7 @@
             #{contentCollectUserName},
             #{contentCollectUserIcon},
             #{contentCollectTag},
+            #{projectId},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -122,7 +125,8 @@
             t1.content_collect_user_name,
             t1.content_collect_user_icon,
             t1.content_collect_tag,
-            t1.content_collect_id
+            t1.content_collect_id,
+            t1.project_id
         FROM
             m_content_collect t1
         WHERE
@@ -141,6 +145,7 @@
             t1.content_collect_user_name,
             t1.content_collect_user_icon,
             t1.content_collect_tag,
+            t1.project_id,
             t1.creator,
             t1.gmt_create,
             t1.modifier,
@@ -164,6 +169,7 @@
             t1.content_collect_user_name,
             t1.content_collect_user_icon,
             t1.content_collect_tag,
+            t1.project_id,
             t1.creator,
             t1.gmt_create,
             t1.modifier,
@@ -187,6 +193,7 @@
             t1.content_collect_user_name,
             t1.content_collect_user_icon,
             t1.content_collect_tag,
+            t1.project_id,
             t1.creator,
             t1.gmt_create,
             t1.modifier,
@@ -203,6 +210,9 @@
         <if test="businessId != null and businessId != ''">
             AND t1.business_id = #{businessId}
         </if>
+        <if test="projectId != null and projectId != ''">
+            AND t1.project_id = #{projectId}
+        </if>
         <if test="keywords != null and keywords != ''">
         AND (
             <!-- 这里添加其他条件 -->
@@ -321,6 +331,9 @@
         <if test="businessId != null and businessId != ''">
             AND t1.business_id = #{businessId}
         </if>
+        <if test="projectId != null and projectId != ''">
+            AND t1.project_id = #{projectId}
+        </if>
     </select>
 
 </mapper>

module-config-content/src/main/resources/mybatis/mapper/contentcomment/content-comment-mapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="contentCommentDTO" type="cn.com.tenlion.configcontent.pojo.dtos.contentcomment.ContentCommentDTO">
         <result column="content_comment_id" property="contentCommentId"/>
         <result column="business_id" property="businessId"/>
+        <result column="project_id" property="projectId"/>
         <result column="content_comment_dislike" property="contentCommentDislike"/>
         <result column="content_comment_like" property="contentCommentLike"/>
         <result column="content_comment_content" property="contentCommentContent"/>
@@ -89,6 +90,7 @@
     <select id="getCommentByBusinessIdAndCommentContent" parameterType="map" resultMap="contentCommentDTO">
         SELECT
             t1.business_id,
+            t1.project_id,
             t1.content_comment_dislike,
             t1.content_comment_like,
             t1.content_comment_content,
@@ -109,7 +111,6 @@
             m_content_comment t1
         WHERE
             t1.is_delete = 0 AND t1.business_id = #{businessId} AND t1.creator = #{creator} AND t1.content_comment_content = #{contentCommentContent}
-
     </select>
 
     <!-- 新增CBC内容管理评论记录表 -->
@@ -117,6 +118,7 @@
         INSERT INTO m_content_comment(
             content_comment_id,
             business_id,
+            project_id,
             content_comment_dislike,
             content_comment_like,
             content_comment_content,
@@ -140,6 +142,7 @@
         ) VALUES(
             #{contentCommentId},
             #{businessId},
+            #{projectId},
             #{contentCommentDislike},
             #{contentCommentLike},
             #{contentCommentContent},
@@ -354,6 +357,7 @@
         SELECT
             t1.content_comment_id,
             t1.business_id,
+            t1.project_id,
             t1.content_comment_dislike,
             t1.content_comment_like,
             t1.content_comment_content,
@@ -396,6 +400,9 @@
         <if test="businessId != null and businessId != ''">
             AND t1.business_id = #{businessId}
         </if>
+        <if test="projectId != null and projectId != ''">
+            AND t1.project_id = #{projectId}
+        </if>
         <if test="contentCommentStatus != null and contentCommentStatus != ''">
             AND t1.content_comment_status = #{contentCommentStatus}
         </if>
@@ -533,6 +540,9 @@
         <if test="businessId != null and businessId != ''">
             AND t1.business_id = #{businessId}
         </if>
+        <if test="projectId != null and projectId != ''">
+            AND t1.project_id = #{projectId}
+        </if>
         <if test="contentCommentStatus != null and contentCommentStatus != ''">
             AND t1.content_comment_status = #{contentCommentStatus}
         </if>

module-config-content/src/main/resources/mybatis/mapper/contentdispatch/content-dispatch-mapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="contentDispatchDTO" type="cn.com.tenlion.configcontent.pojo.dtos.contentdispatch.ContentDispatchDTO">
         <result column="content_dispatch_id" property="contentDispatchId"/>
         <result column="business_id" property="businessId"/>
+        <result column="project_id" property="projectId"/>
         <result column="content_dispatch_parent_id" property="contentDispatchParentId"/>
         <result column="content_dispatch_user_name" property="contentDispatchUserName"/>
         <result column="content_dispatch_user_icon" property="contentDispatchUserIcon"/>
@@ -59,6 +60,7 @@
         INSERT INTO m_content_dispatch(
             content_dispatch_id,
             business_id,
+            project_id,
             content_dispatch_parent_id,
             content_dispatch_user_name,
             content_dispatch_user_icon,
@@ -72,6 +74,7 @@
         ) VALUES(
             #{contentDispatchId},
             #{businessId},
+            #{projectId},
             #{contentDispatchParentId},
             #{contentDispatchUserName},
             #{contentDispatchUserIcon},
@@ -147,7 +150,8 @@
             t1.content_dispatch_user_icon,
             t1.content_dispatch_device,
             t1.content_dispatch_id,
-            t1.content_dispatch_content
+            t1.content_dispatch_content,
+            t1.project_id
         FROM
             m_content_dispatch t1
         WHERE
@@ -216,6 +220,7 @@
             t1.content_dispatch_user_icon,
             t1.content_dispatch_device,
             t1.content_dispatch_content,
+            t1.project_id,
             t1.creator,
             t1.gmt_create,
             t1.modifier,
@@ -229,6 +234,9 @@
         <if test="businessId != null and businessId != ''">
             AND t1.business_id = #{businessId}
         </if>
+        <if test="projectId != null and projectId != ''">
+            AND t1.project_id = #{projectId}
+        </if>
         <if test="creator != null and creator != ''">
             AND t1.creator = #{creator}
         </if>
@@ -349,6 +357,9 @@
         <if test="businessId != null and businessId != ''">
             AND t1.business_id = #{businessId}
         </if>
+        <if test="projectId != null and projectId != ''">
+            AND t1.project_id = #{projectId}
+        </if>
         <if test="creator != null and creator != ''">
             AND t1.creator = #{creator}
         </if>

module-config-content/src/main/resources/mybatis/mapper/contentlike/content-like-mapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="contentLikeDTO" type="cn.com.tenlion.configcontent.pojo.dtos.contentlike.ContentLikeDTO">
         <result column="content_like_id" property="contentLikeId"/>
         <result column="business_id" property="businessId"/>
+        <result column="project_id" property="projectId"/>
         <result column="content_like_user_name" property="contentLikeUserName"/>
         <result column="content_like_user_icon" property="contentLikeUserIcon"/>
         <result column="creator" property="creator"/>
@@ -45,6 +46,7 @@
             business_id,
             content_like_user_name,
             content_like_user_icon,
+            project_id,
             creator,
             gmt_create,
             modifier,
@@ -55,6 +57,7 @@
             #{businessId},
             #{contentLikeUserName},
             #{contentLikeUserIcon},
+            #{projectId},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -113,7 +116,8 @@
             t1.business_id,
             t1.content_like_user_name,
             t1.content_like_user_icon,
-            t1.content_like_id
+            t1.content_like_id,
+            t1.project_id
         FROM
             m_content_like t1
         WHERE
@@ -173,6 +177,7 @@
         SELECT
             t1.content_like_id,
             t1.business_id,
+            t1.project_id,
             t1.content_like_user_name,
             t1.content_like_user_icon,
             t1.creator,
@@ -191,6 +196,9 @@
         <if test="businessId != null and businessId != ''">
             AND t1.business_id = #{businessId}
         </if>
+        <if test="projectId != null and projectId != ''">
+            AND t1.project_id = #{projectId}
+        </if>
         <if test="keywords != null and keywords != ''">
         AND (
             <!-- 这里添加其他条件 -->
@@ -307,6 +315,9 @@
         <if test="businessId != null and businessId != ''">
             AND t1.business_id = #{businessId}
         </if>
+        <if test="projectId != null and projectId != ''">
+            AND t1.project_id = #{projectId}
+        </if>
     </select>
 
 </mapper>

module-config-content/src/main/resources/mybatis/mapper/contentscans/content-scans-mapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="contentScansDTO" type="cn.com.tenlion.configcontent.pojo.dtos.contentscans.ContentScansDTO">
         <result column="content_scans_id" property="contentScansId"/>
         <result column="business_id" property="businessId"/>
+        <result column="project_id" property="projectId"/>
         <result column="content_scans_user_name" property="contentScansUserName"/>
         <result column="content_scans_user_icon" property="contentScansUserIcon"/>
         <result column="content_dispatch_id" property="contentDispatchId"/>
@@ -58,6 +59,7 @@
             content_scans_user_name,
             content_scans_user_icon,
             content_dispatch_id,
+            project_id,
             creator,
             gmt_create,
             modifier,
@@ -69,6 +71,7 @@
             #{contentScansUserName},
             #{contentScansUserIcon},
             #{contentDispatchId},
+            #{projectId},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -134,7 +137,8 @@
             t1.content_scans_user_name,
             t1.content_scans_user_icon,
             t1.content_dispatch_id,
-            t1.content_scans_id
+            t1.content_scans_id,
+            t1.project_id
         FROM
             m_content_scans t1
         WHERE
@@ -204,7 +208,7 @@
             t1.modifier,
             t1.gmt_modified,
             t1.is_delete,
-            1
+            t1.project_id
         FROM
             m_content_scans t1
         WHERE
@@ -215,6 +219,9 @@
         <if test="businessId != null and businessId != ''">
             AND t1.business_id = #{businessId}
         </if>
+        <if test="projectId != null and projectId != ''">
+            AND t1.project_id = #{projectId}
+        </if>
         <if test="keywords != null and keywords != ''">
         AND (
             <!-- 这里添加其他条件 -->
@@ -333,6 +340,9 @@
         <if test="businessId != null and businessId != ''">
             AND t1.business_id = #{businessId}
         </if>
+        <if test="projectId != null and projectId != ''">
+            AND t1.project_id = #{projectId}
+        </if>
     </select>
 
 </mapper>

module-project-config/src/main/java/cn/com/tenlion/projectconfig/controller/app/api/projectconfig/ProjectConfigAppController.java

@@ -77,5 +77,13 @@ public class ProjectConfigAppController extends DefaultBaseController {
         return new SuccessResultData<String>(ProjectConfigUtil.getText(key));
     }
 
+    @ApiOperation(value = "获取富文本配置", notes = "获取富文本配置接口")
+    @ApiImplicitParams({
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("html/{key}")
+    public SuccessResultData<String> getHtml(@PathVariable("key") String key) {
+        return new SuccessResultData<String>(ProjectConfigUtil.getHtml(key));
+    }
 
 }

module-project-config/src/main/resources/mybatis/mapper/projectconfig/project-config-mapper.xml

@@ -317,6 +317,8 @@
             t1.id LIKE CONCAT('%', #{keywords}, '%')
             OR
             t1.project_config_remark LIKE CONCAT('%', #{keywords}, '%')
+            OR
+            t1.project_config_key LIKE CONCAT('%', #{keywords}, '%')
         )
         </if>
         <if test="startTime != null and startTime != ''">

module-project-config/src/main/resources/templates/projectconfig/list.html

@@ -143,7 +143,7 @@
                                     return value;
                                 }else  if(rowData == "3") {
                                     var image = row['projectConfigImage'];
-                                    var value = '<img style="height: 50px;width: 50px;" src="route/file/download/false/'+ image +'" >';
+                                    var value = '<img style="height: 50px;width: 50px;" src="route/file/download/true/'+ image +'" >';
                                     setTimeout(function() {
                                         new Viewer(document.getElementById("viewer"),{
                                             loop:true

pojo-config-column/src/main/java/cn/com/tenlion/configcolumn/pojo/dtos/configcolumn/ConfigColumnDTO.java

@@ -81,6 +81,26 @@ public class ConfigColumnDTO {
     private String configColumnLike;
     @ApiModelProperty(name = "configColumnCollect", value = "收藏开关")
     private String configColumnCollect;
+    @ApiModelProperty(name = "configColumnHelp", value = "帮助提示说明语")
+    private String configColumnHelp;
+    @ApiModelProperty(name = "configColumnRole", value = "适用角色")
+    private String configColumnRole;
+
+    public String getConfigColumnRole() {
+        return configColumnRole == null ? "" : configColumnRole;
+    }
+
+    public void setConfigColumnRole(String configColumnRole) {
+        this.configColumnRole = configColumnRole;
+    }
+
+    public String getConfigColumnHelp() {
+        return configColumnHelp == null ? "" : configColumnHelp;
+    }
+
+    public void setConfigColumnHelp(String configColumnHelp) {
+        this.configColumnHelp = configColumnHelp;
+    }
 
     public String getConfigTableCode() {
         return configTableCode == null ? "" : configTableCode;

pojo-config-column/src/main/java/cn/com/tenlion/configcolumn/pojo/dtos/configcolumngroup/ConfigColumnGroupDTO.java

@@ -44,6 +44,8 @@ public class ConfigColumnGroupDTO {
     private Integer configColumnGroupOrder = 0;
     @ApiModelProperty(name = "configColumnGroupStyle", value = "引导页样式")
     private String configColumnGroupStyle;
+    @ApiModelProperty(name = "configColumnGroupRole", value = "适用角色0:默认,1:个人普通版,2:企业普通版,3:企业高级版")
+    private String configColumnGroupRole;
     @ApiModelProperty(name = "creator", value = "")
     private String creator;
     @ApiModelProperty(name = "gmtCreate", value = "")
@@ -55,6 +57,14 @@ public class ConfigColumnGroupDTO {
     @ApiModelProperty(name = "isDelete", value = "")
     private Integer isDelete;
 
+    public String getConfigColumnGroupRole() {
+        return configColumnGroupRole == null ? "" : configColumnGroupRole;
+    }
+
+    public void setConfigColumnGroupRole(String configColumnGroupRole) {
+        this.configColumnGroupRole = configColumnGroupRole;
+    }
+
     public String getConfigColumnGroupStyle() {
         return configColumnGroupStyle == null ? "" : configColumnGroupStyle;
     }

pojo-config-column/src/main/java/cn/com/tenlion/configcolumn/pojo/vos/configcolumn/ConfigColumnVO.java

@@ -73,6 +73,27 @@ public class ConfigColumnVO {
     @ApiModelProperty(name = "configColumnCollect", value = "收藏开关")
     @CheckNumberAnnotation(name = "收藏开关")
     private String configColumnCollect;
+    @ApiModelProperty(name = "configColumnHelp", value = "帮助提示说明语")
+    private String configColumnHelp;
+    @ApiModelProperty(name = "configColumnRole", value = "适用角色")
+    @CheckEmptyAnnotation(name = "支持角色")
+    private String configColumnRole;
+
+    public String getConfigColumnHelp() {
+        return configColumnHelp == null ? "" : configColumnHelp;
+    }
+
+    public void setConfigColumnHelp(String configColumnHelp) {
+        this.configColumnHelp = configColumnHelp;
+    }
+
+    public String getConfigColumnRole() {
+        return configColumnRole == null ? "" : configColumnRole;
+    }
+
+    public void setConfigColumnRole(String configColumnRole) {
+        this.configColumnRole = configColumnRole;
+    }
 
     public void setConfigColumnOrder(Integer configColumnOrder) {
         this.configColumnOrder = configColumnOrder;

pojo-config-column/src/main/java/cn/com/tenlion/configcolumn/pojo/vos/configcolumngroup/ConfigColumnGroupVO.java

@@ -42,6 +42,16 @@ public class ConfigColumnGroupVO {
     private Integer configColumnGroupOrder = 0;
     @ApiModelProperty(name = "configColumnGroupStyle", value = "引导页样式")
     private String configColumnGroupStyle;
+    @ApiModelProperty(name = "configColumnGroupRole", value = "适用角色0:默认,1:个人普通版,2:企业普通版,3:企业高级版")
+    private String configColumnGroupRole;
+
+    public String getConfigColumnGroupRole() {
+        return configColumnGroupRole == null ? "" : configColumnGroupRole;
+    }
+
+    public void setConfigColumnGroupRole(String configColumnGroupRole) {
+        this.configColumnGroupRole = configColumnGroupRole;
+    }
 
     public String getConfigColumnGroupStyle() {
         return configColumnGroupStyle == null ? "" : configColumnGroupStyle;

pojo-config-content/src/main/java/cn/com/tenlion/configcontent/pojo/dtos/contentcollect/ContentCollectDTO.java

@@ -18,6 +18,8 @@ public class ContentCollectDTO {
     private String contentCollectId;
     @ApiModelProperty(name = "businessId", value = "业务ID")
     private String businessId;
+    @ApiModelProperty(name = "projectId", value = "项目ID")
+    private String projectId;
     @ApiModelProperty(name = "contentCollectUserName", value = "收藏人姓名")
     private String contentCollectUserName;
     @ApiModelProperty(name = "contentCollectUserIcon", value = "收藏人头像")
@@ -35,6 +37,14 @@ public class ContentCollectDTO {
     @ApiModelProperty(name = "isDelete", value = "")
     private Integer isDelete;
 
+    public String getProjectId() {
+        return projectId == null ? "" : projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
     public String getContentCollectId() {
         return contentCollectId == null ? "" : contentCollectId.trim();
     }

pojo-config-content/src/main/java/cn/com/tenlion/configcontent/pojo/dtos/contentcomment/ContentCommentDTO.java

@@ -18,6 +18,8 @@ public class ContentCommentDTO {
     private String contentCommentId;
     @ApiModelProperty(name = "businessId", value = "业务表ID")
     private String businessId;
+    @ApiModelProperty(name = "projectId", value = "项目ID")
+    private String projectId;
     @ApiModelProperty(name = "contentCommentDislike", value = "评论不喜欢数量")
     private Integer contentCommentDislike;
     @ApiModelProperty(name = "contentCommentLike", value = "评论喜欢数量")
@@ -61,6 +63,14 @@ public class ContentCommentDTO {
     @ApiModelProperty(name = "isDelete", value = "")
     private Integer isDelete;
 
+    public String getProjectId() {
+        return projectId == null ? "" : projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
     public Integer getContentCommentSubCount() {
         return contentCommentSubCount;
     }

pojo-config-content/src/main/java/cn/com/tenlion/configcontent/pojo/dtos/contentdispatch/ContentDispatchDTO.java

@@ -18,6 +18,8 @@ public class ContentDispatchDTO {
     private String contentDispatchId;
     @ApiModelProperty(name = "businessId", value = "业务ID")
     private String businessId;
+    @ApiModelProperty(name = "projectId", value = "项目ID")
+    private String projectId;
     @ApiModelProperty(name = "contentDispatchParentId", value = "上一级转发ID")
     private String contentDispatchParentId;
     @ApiModelProperty(name = "contentDispatchUserName", value = "转发人姓名")
@@ -39,6 +41,14 @@ public class ContentDispatchDTO {
     @ApiModelProperty(name = "isDelete", value = "")
     private Integer isDelete;
 
+    public String getProjectId() {
+        return projectId == null ? "" : projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
     public String getContentDispatchContent() {
         return contentDispatchContent == null ? "" : contentDispatchContent;
     }

pojo-config-content/src/main/java/cn/com/tenlion/configcontent/pojo/dtos/contentlike/ContentLikeDTO.java

@@ -18,6 +18,8 @@ public class ContentLikeDTO {
     private String contentLikeId;
     @ApiModelProperty(name = "businessId", value = "业务表ID")
     private String businessId;
+    @ApiModelProperty(name = "projectId", value = "项目ID")
+    private String projectId;
     @ApiModelProperty(name = "contentLikeUserName", value = "点赞人姓名")
     private String contentLikeUserName;
     @ApiModelProperty(name = "contentLikeUserIcon", value = "点赞人头像")
@@ -33,6 +35,14 @@ public class ContentLikeDTO {
     @ApiModelProperty(name = "isDelete", value = "")
     private Integer isDelete;
 
+    public String getProjectId() {
+        return projectId == null ? "" : projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
     public String getContentLikeId() {
         return contentLikeId == null ? "" : contentLikeId.trim();
     }

pojo-config-content/src/main/java/cn/com/tenlion/configcontent/pojo/dtos/contentscans/ContentScansDTO.java

@@ -18,6 +18,8 @@ public class ContentScansDTO {
     private String contentScansId;
     @ApiModelProperty(name = "businessId", value = "业务ID")
     private String businessId;
+    @ApiModelProperty(name = "projectId", value = "项目ID")
+    private String projectId;
     @ApiModelProperty(name = "contentScansUserName", value = "查看人姓名")
     private String contentScansUserName;
     @ApiModelProperty(name = "contentScansUserIcon", value = "查看人头像")
@@ -35,6 +37,14 @@ public class ContentScansDTO {
     @ApiModelProperty(name = "isDelete", value = "")
     private Integer isDelete;
 
+    public String getProjectId() {
+        return projectId == null ? "" : projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
     public String getContentScansId() {
         return contentScansId == null ? "" : contentScansId.trim();
     }

pojo-config-content/src/main/java/cn/com/tenlion/configcontent/pojo/vos/contentcollect/ContentCollectVO.java

@@ -19,6 +19,9 @@ public class ContentCollectVO {
     @ApiModelProperty(name = "businessId", value = "业务ID")
     @CheckEmptyAnnotation(name = "业务ID")
     private String businessId;
+    @ApiModelProperty(name = "projectId", value = "项目ID")
+    @CheckEmptyAnnotation(name = "项目ID")
+    private String projectId;
     @ApiModelProperty(name = "contentCollectUserName", value = "收藏人姓名")
     private String contentCollectUserName;
     @ApiModelProperty(name = "contentCollectUserIcon", value = "收藏人头像")
@@ -26,6 +29,14 @@ public class ContentCollectVO {
     @ApiModelProperty(name = "contentCollectTag", value = "收藏备注")
     private String contentCollectTag;
 
+    public String getProjectId() {
+        return projectId == null ? "" : projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
     public String getBusinessId() {
         return businessId == null ? "" : businessId.trim();
     }

pojo-config-content/src/main/java/cn/com/tenlion/configcontent/pojo/vos/contentcomment/ContentCommentVO.java

@@ -19,6 +19,9 @@ public class ContentCommentVO {
     @ApiModelProperty(name = "businessId", value = "业务表ID")
     @CheckEmptyAnnotation(name = "业务表ID")
     private String businessId;
+    @ApiModelProperty(name = "projectId", value = "项目ID")
+    @CheckEmptyAnnotation(name = "项目ID")
+    private String projectId;
     @ApiModelProperty(name = "contentCommentContent", value = "评论内容")
     @CheckEmptyAnnotation(name = "评论内容")
     private String contentCommentContent;
@@ -53,6 +56,14 @@ public class ContentCommentVO {
     @CheckNumberAnnotation(name = "纬度")
     private Double contentCommentLatitude;
 
+    public String getProjectId() {
+        return projectId == null ? "" : projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
     public String getBusinessId() {
         return businessId == null ? "" : businessId.trim();
     }

pojo-config-content/src/main/java/cn/com/tenlion/configcontent/pojo/vos/contentdispatch/ContentDispatchVO.java

@@ -19,6 +19,9 @@ public class ContentDispatchVO {
     @ApiModelProperty(name = "businessId", value = "业务ID")
     @CheckEmptyAnnotation(name = "业务ID")
     private String businessId;
+    @ApiModelProperty(name = "projectId", value = "项目ID")
+    @CheckEmptyAnnotation(name = "项目ID")
+    private String projectId;
     @ApiModelProperty(name = "contentDispatchDevice", value = "转发目标1:微信,2:QQ")
     @CheckEmptyAnnotation(name = "转发目标")
     private String contentDispatchDevice;
@@ -31,6 +34,14 @@ public class ContentDispatchVO {
     @ApiModelProperty(name = "contentDispatchContent", value = "转发携带文字")
     private String contentDispatchContent;
 
+    public String getProjectId() {
+        return projectId == null ? "" : projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
     public String getContentDispatchContent() {
         return contentDispatchContent == null ? "" : contentDispatchContent;
     }

pojo-config-content/src/main/java/cn/com/tenlion/configcontent/pojo/vos/contentlike/ContentLikeVO.java

@@ -19,11 +19,22 @@ public class ContentLikeVO {
     @ApiModelProperty(name = "businessId", value = "业务表ID")
     @CheckEmptyAnnotation(name = "业务表ID")
     private String businessId;
+    @ApiModelProperty(name = "projectId", value = "项目ID")
+    @CheckEmptyAnnotation(name = "项目ID")
+    private String projectId;
     @ApiModelProperty(name = "contentLikeUserName", value = "点赞人姓名")
     private String contentLikeUserName;
     @ApiModelProperty(name = "contentLikeUserIcon", value = "点赞人头像")
     private String contentLikeUserIcon;
 
+    public String getProjectId() {
+        return projectId == null ? "" : projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
     public String getBusinessId() {
         return businessId == null ? "" : businessId.trim();
     }

pojo-config-content/src/main/java/cn/com/tenlion/configcontent/pojo/vos/contentscans/ContentScansVO.java

@@ -19,6 +19,9 @@ public class ContentScansVO {
     @ApiModelProperty(name = "businessId", value = "业务ID")
     @CheckEmptyAnnotation(name = "业务ID")
     private String businessId;
+    @ApiModelProperty(name = "projectId", value = "项目ID")
+    @CheckEmptyAnnotation(name = "项目ID")
+    private String projectId;
     @ApiModelProperty(name = "contentScansUserName", value = "查看人姓名")
     private String contentScansUserName;
     @ApiModelProperty(name = "contentScansUserIcon", value = "查看人头像")
@@ -26,6 +29,14 @@ public class ContentScansVO {
     @ApiModelProperty(name = "contentDispatchId", value = "转发查看则关联的转发ID")
     private String contentDispatchId;
 
+    public String getProjectId() {
+        return projectId == null ? "" : projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
     public String getBusinessId() {
         return businessId == null ? "" : businessId.trim();
     }