区分正式、测试数据

src/main/java/com/zzsn/event/controller/SubjectManageController.java

@@ -160,10 +160,11 @@ public class SubjectManageController {
     @GetMapping("/visiblePageList")
     public Result<?> visiblePageList(@RequestParam Integer type,
                                      @RequestParam(required = false) String subjectName,
+                                     @RequestParam(required = false) String environment,
                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         UserVo loginUser = UserUtil.getLoginUser();
-        Page<Node> pageList = subjectService.visiblePageList(loginUser.getUsername(), type, subjectName, pageNo, pageSize);
+        Page<Node> pageList = subjectService.visiblePageList(loginUser.getUsername(), type, subjectName, pageNo, pageSize,environment);
         return Result.OK(pageList);
     }
 

src/main/java/com/zzsn/event/controller/SubjectSimpleController.java

@@ -109,10 +109,7 @@ public class SubjectSimpleController {
 
     /**
      * 专题详情(无验证版本)
-     *
      * @param subjectId 专题id
-     * @author lkg
-     * @date 2025/1/9
      */
     @GetMapping("/queryInfoNoSign")
     public Result<?> queryInfoNoSign(@RequestParam String subjectId){

src/main/java/com/zzsn/event/controller/common/SubjectTypeController.java

@@ -136,12 +136,13 @@ public class SubjectTypeController {
      * @date 2025/1/7
      */
     @GetMapping("/subjectAndTypeTree")
-    public Result<?> subjectAndTypeTree(@RequestParam(required = false) Integer facePublic) {
+    public Result<?> subjectAndTypeTree(@RequestParam(required = false) Integer facePublic,
+                                        @RequestParam(required = false) String environment) {
         List<SubjectTreeVO> dataList = null;
         if (facePublic == null) {
-            dataList = subjectTypeService.subjectAndTypeTree();
+            dataList = subjectTypeService.subjectAndTypeTree(environment);
         } else if (facePublic == 1) {
-            dataList = subjectTypeService.subjectsByFacePublic(facePublic);
+            dataList = subjectTypeService.subjectsByFacePublic(facePublic,environment);
         }
         return Result.OK(dataList);
     }

src/main/java/com/zzsn/event/entity/SubjectType.java

@@ -77,5 +77,7 @@ public class SubjectType implements Serializable {
      * 状态（1启用 0不启用）
      */
     private Integer status;
+    /** 环境 1-测试 2-正式 */
+    private String environment;
 
 }

src/main/java/com/zzsn/event/mapper/SubjectMapper.java

@@ -61,7 +61,7 @@ public interface SubjectMapper extends BaseMapper<Subject> {
      * @author lkg
      * @date 2025/2/8
      */
-    Page<Node> visibleList(@Param("username") String username, @Param("type") Integer type, @Param("subjectName") String subjectName, Page<String> page);
+    Page<Node> visibleList(@Param("username") String username, @Param("type") Integer type, @Param("subjectName") String subjectName, Page<String> page,@Param("environment") String environment);
 
     /**
      * 获取专题详情(包含样例文章信息)

src/main/java/com/zzsn/event/mapper/SubjectTypeMapper.java

@@ -78,7 +78,7 @@ public interface SubjectTypeMapper extends BaseMapper<SubjectType> {
      * @author lkg
      * @date 2025/1/7
      */
-    List<SubjectTreeVO> subjectsByFacePublic(@Param("facePublic") Integer facePublic);
+    List<SubjectTreeVO> subjectsByFacePublic(@Param("facePublic") Integer facePublic,@Param("environment") String environment);
 
     /**
      * 可用的事件和分类列表
@@ -86,7 +86,7 @@ public interface SubjectTypeMapper extends BaseMapper<SubjectType> {
      * @author lkg
      * @date 2024/4/29
      */
-    List<SubjectTreeVO> subjectAndTypeTree(@Param("username") String createBy);
+    List<SubjectTreeVO> subjectAndTypeTree(@Param("username") String createBy,@Param("environment") String environment);
 
     /**
      * 获取分类下的专题列表

src/main/java/com/zzsn/event/mapper/xml/SubjectMapper.xml

@@ -133,6 +133,9 @@
         LEFT JOIN subject_type_map b ON b.subject_id = d.id
         LEFT JOIN subject_type c ON b.type_id = c.id
         where d.face_public = 1
+        <if test="subjectCondition.environment !=null and subjectCondition.environment !=''">
+            and d.environment =#{subjectCondition.environment}
+        </if>
         <if test="subjectCondition.id !=null and subjectCondition.id !=''">
             and d.id =#{subjectCondition.id}
         </if>
@@ -198,6 +201,9 @@
         <if test="subjectName != null and subjectName != ''">
             and subject_name like concat('%',#{subjectName},'%')
         </if>
+        <if test="environment != null and environment != ''">
+            and environment = #{environment}
+        </if>
         <choose>
             <when test="type == 1">
                 and create_by = #{username}

src/main/java/com/zzsn/event/mapper/xml/SubjectTypeMapper.xml

@@ -53,6 +53,9 @@
                s.time_disable as end_time
         from subject s
         where s.face_public = #{facePublic}
+        <if test="environment!=null and environment != ''">
+            and s.environment = #{environment}
+        </if>
         order by create_time
     </select>
 
@@ -73,6 +76,9 @@
         <if test="username!=null and username != ''">
             and s.create_by = #{username}
         </if>
+        <if test="environment!=null and environment != ''">
+            and s.environment = #{environment}
+        </if>
         union
         select n.id, n.name, m.id as pid, 'true' as ynSubject, n.start_time, n.end_time, n.create_time
         from (

src/main/java/com/zzsn/event/service/ISubjectTypeService.java

@@ -79,7 +79,7 @@ public interface ISubjectTypeService extends IService<SubjectType> {
      * @author lkg
      * @date 2025/1/7
      */
-    List<SubjectTreeVO> subjectsByFacePublic(Integer facePublic);
+    List<SubjectTreeVO> subjectsByFacePublic(Integer facePublic,String environment);
 
     /**
      * 专题和分类列表-研究中心
@@ -87,7 +87,7 @@ public interface ISubjectTypeService extends IService<SubjectType> {
      * @author lkg
      * @date 2024/12/26
      */
-    List<SubjectTreeVO> subjectAndTypeTree();
+    List<SubjectTreeVO> subjectAndTypeTree(String environment);
 
     /**
      * 获取分类下的所有节点id集合-研究中心

src/main/java/com/zzsn/event/service/SubjectService.java

@@ -50,7 +50,7 @@ public interface SubjectService extends IService<Subject> {
      * @author lkg
      * @date 2025/2/8
      */
-    Page<Node> visiblePageList(String username, Integer type, String subjectName, Integer pageNo, Integer pageSize);
+    Page<Node> visiblePageList(String username, Integer type, String subjectName, Integer pageNo, Integer pageSize,String environment);
 
     /**
      * 获取专题详情(包含样例文章信息)

src/main/java/com/zzsn/event/service/impl/SubjectServiceImpl.java

@@ -180,9 +180,9 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
     }
 
     @Override
-    public Page<Node> visiblePageList(String username, Integer type, String subjectName, Integer pageNo, Integer pageSize) {
+    public Page<Node> visiblePageList(String username, Integer type, String subjectName, Integer pageNo, Integer pageSize,String environment) {
         Page<String> page = new Page<>(pageNo, pageSize);
-        return baseMapper.visibleList(username, type, subjectName, page);
+        return baseMapper.visibleList(username, type, subjectName, page,environment);
     }
 
     @Override

src/main/java/com/zzsn/event/service/impl/SubjectTypeServiceImpl.java

@@ -95,15 +95,15 @@ public class SubjectTypeServiceImpl extends ServiceImpl<SubjectTypeMapper, Subje
     }
 
     @Override
-    public List<SubjectTreeVO> subjectsByFacePublic(Integer facePublic) {
-        return baseMapper.subjectsByFacePublic(facePublic);
+    public List<SubjectTreeVO> subjectsByFacePublic(Integer facePublic,String environment) {
+        return baseMapper.subjectsByFacePublic(facePublic,environment);
     }
 
     @Override
-    public List<SubjectTreeVO> subjectAndTypeTree() {
+    public List<SubjectTreeVO> subjectAndTypeTree(String environment) {
         String username = UserUtil.getLoginUser().getUsername();
         List<SubjectTreeVO> tree = new ArrayList<>();
-        List<SubjectTreeVO> subjectTreeVOS = baseMapper.subjectAndTypeTree(username);
+        List<SubjectTreeVO> subjectTreeVOS = baseMapper.subjectAndTypeTree(username,environment);
         if (CollectionUtils.isNotEmpty(subjectTreeVOS)) {
             tree = TreeUtil.tree(subjectTreeVOS, "0");
         }

src/main/java/com/zzsn/event/vo/SubjectCondition.java

@@ -36,4 +36,6 @@ public class SubjectCondition {
 
     private String userId;
     private String customerId;
+    /** 环境 1-测试 2-正式 */
+    private String environment;
 }

src/main/resources/application-dev.yml

@@ -159,7 +159,8 @@ python:
   clearDuplicateHistoryUrl: http://1.95.13.40:8080/subject/delete_history_data
 jeecg:
   shiro:
-    excludeUrls:
+    excludeUrls: /info/subjectPageListGroupByLabel,/subject/simple/queryInfoNoSign
+
 kafka:
   topic:
     subject:

src/main/resources/application-test.yml

@@ -161,7 +161,7 @@ python:
   clearDuplicateHistoryUrl: http://1.95.13.40:8080/subject/delete_history_data
 jeecg:
   shiro:
-    excludeUrls: /info/subjectPageList
+    excludeUrls: info/subjectPageListGroupByLabel,/subject/simple/queryInfoNoSign
 kafka:
   topic:
     subject: