初始化非现场执法项目-2

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/common/commonenum/DigitalVoiceLoggingStatusEnum.java

@@ -0,0 +1,33 @@
+package com.zdxt.enforcementnos.common.commonenum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 云笔录状态（0-未发起，1-待企业提交，2-待执法人员确认，3-已完成）
+ * @author msy
+ * @Date: 2026/6/9
+ */
+@Getter
+@AllArgsConstructor
+public enum DigitalVoiceLoggingStatusEnum {
+
+    NOT_INITIATED(0, "未发起"),
+    WAITING_SUBMIT(1, "待企业提交"),
+    WAITING_CONFIRM(2, "待执法人员确认"),
+    COMPLETED(3, "已完成");
+
+    private final Integer code;
+
+    private final String name;
+
+    public static String getNameByCode(Integer code) {
+        for (DigitalVoiceLoggingStatusEnum value : DigitalVoiceLoggingStatusEnum.values()) {
+            if (value.getCode().equals(code)) {
+                return value.getName();
+            }
+        }
+        return null;
+    }
+
+}

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/app/enforcement/EnfNosLawEnforcementTaskController.java

@@ -3,10 +3,12 @@ package com.zdxt.enforcementnos.controller.app.enforcement;
 
 import com.zdxt.enforcementnos.common.PageParam;
 import com.zdxt.enforcementnos.domain.bo.NosLawEnforcementTaskApproveBO;
+import com.zdxt.enforcementnos.domain.bo.NosLawEnforcementTaskDigitalVoiceLoggingBO;
 import com.zdxt.enforcementnos.domain.bo.NosLawEnforcementTaskPageBO;
 import com.zdxt.enforcementnos.domain.bo.NosLawEnforcementTaskSaveBO;
 import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementCommentTaskPageVO;
 import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskDetailVO;
+import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskDigitalVoiceLoggingRelationVO;
 import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskPageVO;
 import com.zdxt.enforcementnos.service.NosLawEnforcementTaskService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -109,4 +111,43 @@ public class EnfNosLawEnforcementTaskController {
     public TableDataInfo<NosLawEnforcementCommentTaskPageVO> pageHasCommentTask(@RequestBody @Valid PageParam pageParam) {
         return nosLawEnforcementTaskService.pageHasCommentTask(pageParam);
     }
+
+
+    /**
+     * 开启云笔录
+     * @param taskId 任务id
+     * @return 是否成功
+     */
+    @Operation(summary = "开启云笔录")
+    @Parameter(name = "taskId", description = "任务id", required = true)
+    @GetMapping("/start/digital-voice-logging")
+    public R<Boolean> startDigitalVoiceLogging(@RequestParam("taskId") String taskId) {
+        return R.ok(nosLawEnforcementTaskService.startDigitalVoiceLogging(taskId));
+    }
+
+
+    /**
+     * 查询云笔录详情
+     * @param taskId 任务id
+     * @return 详情
+     */
+    @Operation(summary = "查询云笔录详情")
+    @Parameter(name = "taskId", description = "任务id", required = true)
+    @GetMapping("/digital-voice-logging/detail")
+    public R<NosLawEnforcementTaskDigitalVoiceLoggingRelationVO> getDigitalVoiceLoggingDetail(
+            @RequestParam("taskId") String taskId) {
+        return R.ok(nosLawEnforcementTaskService.getDigitalVoiceLoggingDetail(taskId));
+    }
+
+
+    /**
+     * 确认云笔录材料
+     * @param bo 确认参数
+     * @return 是否成功
+     */
+    @Operation(summary = "确认云笔录材料")
+    @PostMapping("/digital-voice-logging/confirm")
+    public R<Boolean> confirmDigitalVoiceLoggingMaterials(@RequestBody @Valid NosLawEnforcementTaskDigitalVoiceLoggingBO bo) {
+        return R.ok(nosLawEnforcementTaskService.confirmDigitalVoiceLoggingMaterials(bo));
+    }
 }

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/app/enterprise/EntNosLawEnforcementTaskController.java

@@ -3,6 +3,7 @@ package com.zdxt.enforcementnos.controller.app.enterprise;
 
 import com.zdxt.enforcementnos.common.PageParam;
 import com.zdxt.enforcementnos.domain.bo.NosLawEnforcementTaskCommentBO;
+import com.zdxt.enforcementnos.domain.bo.NosLawEnforcementTaskDigitalVoiceLoggingBO;
 import com.zdxt.enforcementnos.domain.bo.NosLawEnforcementTaskPageBO;
 import com.zdxt.enforcementnos.domain.bo.SubmitNosLawEnforcementTaskItemBO;
 import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskByCommentStatusPageVO;
@@ -98,4 +99,16 @@ public class EntNosLawEnforcementTaskController {
             PageParam pageParam) {
         return nosLawEnforcementTaskService.queryByCommentStatus(commentStatus, pageParam);
     }
+
+
+    /**
+     * 提交云笔录材料
+     * @param bo 云笔录参数
+     * @return 提交结果
+     */
+    @Operation(summary = "提交云笔录材料")
+    @PostMapping("/digital-voice-logging/submit")
+    public R<Boolean> submitDigitalVoiceLoggingMaterials(@RequestBody @Valid NosLawEnforcementTaskDigitalVoiceLoggingBO bo) {
+        return R.ok(nosLawEnforcementTaskService.submitDigitalVoiceLoggingMaterials(bo));
+    }
 }

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementTask.java

@@ -130,6 +130,11 @@ public class NosLawEnforcementTask extends BaseEntity {
      */
     private Date commentTime;
 
+    /**
+     * 云笔录状态（0-未发起，1-待企业提交，2-待执法人员确认，3-已完成）
+     */
+    private Integer digitalVoiceLoggingStatus;
+
     /**
      * 逻辑删除：0-否，1-是
      */

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementTaskDigitalVoiceLoggingRelation.java

@@ -0,0 +1,72 @@
+package com.zdxt.enforcementnos.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 非现场执法任务关联云笔录表
+ * @author msy
+ * @TableName nos_law_enforcement_task_digital_voice_logging_relation
+ */
+@TableName(value ="nos_law_enforcement_task_digital_voice_logging_relation")
+@Data
+public class NosLawEnforcementTaskDigitalVoiceLoggingRelation extends BaseEntity {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 非现场执法任务id
+     */
+    private String taskId;
+
+    /**
+     * 云视频
+     */
+    private String cloudVideo;
+
+    /**
+     * 云文字
+     */
+    private String cloudText;
+
+    /**
+     * 意见
+     */
+    private String suggestion;
+
+    /**
+     * 执法人员确认时间
+     */
+    private Date confirmTime;
+
+    /**
+     * 逻辑删除：0-否，1-是
+     */
+    @TableLogic(delval = "1", value = "0")
+    private String isDelete;
+
+    /**
+     * 执法单位id
+     */
+    private String bureauDeptId;
+
+    /**
+     * 部门id
+     */
+    private String deptId;
+
+    /**
+     * 组织单位id
+     */
+    private String organId;
+}

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/bo/NosLawEnforcementTaskDigitalVoiceLoggingBO.java

@@ -0,0 +1,27 @@
+package com.zdxt.enforcementnos.domain.bo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author msy
+ * @Date: 2026/6/8
+ */
+@Data
+public class NosLawEnforcementTaskDigitalVoiceLoggingBO {
+
+    @Schema(description = "id")
+    private String id;
+
+    @Schema(description = "任务id")
+    private String taskId;
+
+    @Schema(description = "云文字")
+    private String cloudText;
+
+    @Schema(description = "云视频")
+    private String cloudVideo;
+
+    @Schema(description = "意见")
+    private String suggestion;
+}

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementCommentTaskPageVO.java

@@ -20,6 +20,12 @@ public class NosLawEnforcementCommentTaskPageVO {
     @Schema(description = "标题", example = "标题")
     private String title;
 
+    @Schema(description = "执法单位id")
+    private String lawEnforcementAgencyId;
+
+    @Schema(description = "执法单位名称")
+    private String lawEnforcementAgency;
+
     @Schema(description = "企业名称", example = "企业名称")
     private String enterpriseName;
 

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskDetailVO.java

@@ -160,4 +160,13 @@ public class NosLawEnforcementTaskDetailVO {
      */
     @Schema(description = "评价原因", example = "1")
     private String commentReason;
+
+    @Schema(description = "云视频")
+    private String cloudVideo;
+
+    @Schema(description = "云文字")
+    private String cloudText;
+
+    @Schema(description = "云笔录意见")
+    private String suggestion;
 }

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskDigitalVoiceLoggingRelationVO.java

@@ -0,0 +1,57 @@
+package com.zdxt.enforcementnos.domain.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * @author msy
+ * @Date: 2026/6/8
+ */
+@Data
+public class NosLawEnforcementTaskDigitalVoiceLoggingRelationVO {
+
+    /**
+     * id
+     */
+    @Schema(description = "id")
+    private String id;
+
+    /**
+     * 非现场执法任务id
+     */
+    @Schema(description = "非现场执法任务id")
+    private String taskId;
+
+    /**
+     * 云视频
+     */
+    @Schema(description = "云视频")
+    private String cloudVideo;
+
+    /**
+     * 云文字
+     */
+    @Schema(description = "云文字")
+    private String cloudText;
+
+    /**
+     * 意见
+     */
+    @Schema(description = "意见")
+    private String suggestion;
+
+    /**
+     * 执法人员确认时间
+     */
+    @Schema(description = "执法人员确认时间")
+    private Date confirmTime;
+
+    /**
+     * 创建时间
+     */
+    @Schema(description = "创建时间（企业提交材料时间）")
+    private Date createTime;
+}

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/mapper/NosLawEnforcementTaskDigitalVoiceLoggingRelationMapper.java

@@ -0,0 +1,14 @@
+package com.zdxt.enforcementnos.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zdxt.enforcementnos.domain.NosLawEnforcementTaskDigitalVoiceLoggingRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * @author msy
+ * @Date: 2026/6/8
+ */
+@Mapper
+public interface NosLawEnforcementTaskDigitalVoiceLoggingRelationMapper extends BaseMapper<NosLawEnforcementTaskDigitalVoiceLoggingRelation> {
+}

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/NosLawEnforcementTaskDigitalVoiceLoggingRelationService.java

@@ -0,0 +1,13 @@
+package com.zdxt.enforcementnos.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zdxt.enforcementnos.domain.NosLawEnforcementTaskDigitalVoiceLoggingRelation;
+
+/**
+ * 
+ * @author msy
+ * @Date: 2026/6/8
+ */
+public interface NosLawEnforcementTaskDigitalVoiceLoggingRelationService
+        extends IService<NosLawEnforcementTaskDigitalVoiceLoggingRelation> {
+}

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/NosLawEnforcementTaskService.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zdxt.enforcementnos.common.PageParam;
 import com.zdxt.enforcementnos.domain.NosLawEnforcementTask;
 import com.zdxt.enforcementnos.domain.bo.*;
-import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementCommentTaskPageVO;
-import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskByCommentStatusPageVO;
-import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskDetailVO;
-import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskPageVO;
+import com.zdxt.enforcementnos.domain.vo.*;
 import jakarta.validation.Valid;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
@@ -34,4 +31,12 @@ public interface NosLawEnforcementTaskService extends IService<NosLawEnforcement
     TableDataInfo<NosLawEnforcementTaskByCommentStatusPageVO> queryByCommentStatus(Integer commentStatus, PageParam pageParam);
 
     TableDataInfo<NosLawEnforcementCommentTaskPageVO> pageHasCommentTask(@Valid PageParam pageParam);
+
+    Boolean startDigitalVoiceLogging(String taskId);
+
+    NosLawEnforcementTaskDigitalVoiceLoggingRelationVO getDigitalVoiceLoggingDetail(String taskId);
+
+    Boolean confirmDigitalVoiceLoggingMaterials(@Valid NosLawEnforcementTaskDigitalVoiceLoggingBO bo);
+
+    Boolean submitDigitalVoiceLoggingMaterials(@Valid NosLawEnforcementTaskDigitalVoiceLoggingBO bo);
 }

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskDigitalVoiceLoggingRelationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zdxt.enforcementnos.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zdxt.enforcementnos.domain.NosLawEnforcementTaskDigitalVoiceLoggingRelation;
+import com.zdxt.enforcementnos.mapper.NosLawEnforcementTaskDigitalVoiceLoggingRelationMapper;
+import com.zdxt.enforcementnos.service.NosLawEnforcementTaskDigitalVoiceLoggingRelationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 
+ * @author msy
+ * @Date: 2026/6/8
+ */
+@Service
+public class NosLawEnforcementTaskDigitalVoiceLoggingRelationServiceImpl
+        extends ServiceImpl<NosLawEnforcementTaskDigitalVoiceLoggingRelationMapper, NosLawEnforcementTaskDigitalVoiceLoggingRelation>
+        implements NosLawEnforcementTaskDigitalVoiceLoggingRelationService {
+
+
+}

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskServiceImpl.java

@@ -14,10 +14,7 @@ import com.zdxt.enforcementnos.common.PageParam;
 import com.zdxt.enforcementnos.common.commonenum.*;
 import com.zdxt.enforcementnos.domain.*;
 import com.zdxt.enforcementnos.domain.bo.*;
-import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementCommentTaskPageVO;
-import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskByCommentStatusPageVO;
-import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskDetailVO;
-import com.zdxt.enforcementnos.domain.vo.NosLawEnforcementTaskPageVO;
+import com.zdxt.enforcementnos.domain.vo.*;
 import com.zdxt.enforcementnos.mapper.NosLawEnforcementTaskMapper;
 import com.zdxt.enforcementnos.service.*;
 import jakarta.annotation.Resource;
@@ -60,6 +57,9 @@ public class NosLawEnforcementTaskServiceImpl extends ServiceImpl<NosLawEnforcem
     @Resource
     private NosLawEnforcementCommentMsgService commentMsgService;
 
+    @Resource
+    private NosLawEnforcementTaskDigitalVoiceLoggingRelationService taskDigitalVoiceLoggingRelationService;
+
 
 
     @Override
@@ -299,6 +299,20 @@ public class NosLawEnforcementTaskServiceImpl extends ServiceImpl<NosLawEnforcem
             }
         }
 
+        // 查询云笔录详情
+        if(DigitalVoiceLoggingStatusEnum.WAITING_CONFIRM.getCode()
+                .equals(task.getDigitalVoiceLoggingStatus()) ||
+                DigitalVoiceLoggingStatusEnum.COMPLETED.getCode().equals(task.getDigitalVoiceLoggingStatus())) {
+            LambdaQueryWrapper<NosLawEnforcementTaskDigitalVoiceLoggingRelation> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(NosLawEnforcementTaskDigitalVoiceLoggingRelation::getTaskId, task.getId());
+            NosLawEnforcementTaskDigitalVoiceLoggingRelation relation = taskDigitalVoiceLoggingRelationService.getOne(queryWrapper);
+            if(relation != null) {
+                vo.setCloudVideo(relation.getCloudVideo());
+                vo.setCloudText(relation.getCloudText());
+                vo.setSuggestion(relation.getSuggestion());
+            }
+        }
+
         return vo;
     }
 
@@ -631,6 +645,100 @@ public class NosLawEnforcementTaskServiceImpl extends ServiceImpl<NosLawEnforcem
         }
         return TableDataInfo.build(page);
     }
+
+    @Override
+    public Boolean startDigitalVoiceLogging(String taskId) {
+        NosLawEnforcementTask task = this.getById(taskId);
+        if (task == null) {
+            throw new ServiceException("任务不存在");
+        }
+
+        if(!NosLawEnforcementTaskStatusEnum.PENDING_REVIEW.getCode().equals(task.getTaskStatus())) {
+            throw new ServiceException("只有待审核的任务可以开启云笔录");
+        }
+
+        task.setDigitalVoiceLoggingStatus(DigitalVoiceLoggingStatusEnum.WAITING_SUBMIT.getCode());
+        return this.updateById(task);
+    }
+
+    @Override
+    public NosLawEnforcementTaskDigitalVoiceLoggingRelationVO getDigitalVoiceLoggingDetail(String taskId) {
+        NosLawEnforcementTask task = this.getById(taskId);
+        if (task == null) {
+            throw new ServiceException("任务不存在");
+        }
+
+        LambdaQueryWrapper<NosLawEnforcementTaskDigitalVoiceLoggingRelation> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(NosLawEnforcementTaskDigitalVoiceLoggingRelation::getTaskId, taskId);
+        NosLawEnforcementTaskDigitalVoiceLoggingRelation digitalVoiceLogging =
+                taskDigitalVoiceLoggingRelationService.getOne(queryWrapper);
+
+        if(digitalVoiceLogging == null) {
+            return null;
+        }
+
+        NosLawEnforcementTaskDigitalVoiceLoggingRelationVO vo = new NosLawEnforcementTaskDigitalVoiceLoggingRelationVO();
+        BeanUtils.copyProperties(digitalVoiceLogging, vo);
+        return vo;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean confirmDigitalVoiceLoggingMaterials(NosLawEnforcementTaskDigitalVoiceLoggingBO bo) {
+        NosLawEnforcementTask task = this.getById(bo.getTaskId());
+        if (task == null) {
+            throw new ServiceException("任务不存在");
+        }
+
+        if(!DigitalVoiceLoggingStatusEnum.WAITING_CONFIRM.getCode().equals(task.getDigitalVoiceLoggingStatus())) {
+            throw new ServiceException("云笔录状态异常，非待确认状态");
+        }
+
+        task.setDigitalVoiceLoggingStatus(DigitalVoiceLoggingStatusEnum.COMPLETED.getCode());
+
+        LambdaQueryWrapper<NosLawEnforcementTaskDigitalVoiceLoggingRelation> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .eq(NosLawEnforcementTaskDigitalVoiceLoggingRelation::getTaskId, bo.getTaskId())
+                .eq(NosLawEnforcementTaskDigitalVoiceLoggingRelation::getId, bo.getId());
+        NosLawEnforcementTaskDigitalVoiceLoggingRelation digitalVoiceLogging =
+                taskDigitalVoiceLoggingRelationService.getOne(queryWrapper);
+        if(digitalVoiceLogging == null) {
+            throw new ServiceException("云笔录材料不存在");
+        }
+        digitalVoiceLogging.setSuggestion(bo.getSuggestion());
+        digitalVoiceLogging.setConfirmTime(new Date());
+        taskDigitalVoiceLoggingRelationService.updateById(digitalVoiceLogging);
+
+        return this.updateById(task);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean submitDigitalVoiceLoggingMaterials(NosLawEnforcementTaskDigitalVoiceLoggingBO bo) {
+        String enterpriseId = LoginHelper.getDeptId();
+
+        LambdaQueryWrapper<NosLawEnforcementTask> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .eq(NosLawEnforcementTask::getId, bo.getTaskId())
+                .eq(NosLawEnforcementTask::getEnterpriseId, enterpriseId);
+        NosLawEnforcementTask task = this.getOne(queryWrapper);
+        if(task == null) {
+            throw new ServiceException("任务不存在");
+        }
+
+        if(!DigitalVoiceLoggingStatusEnum.WAITING_SUBMIT.getCode().equals(task.getDigitalVoiceLoggingStatus())) {
+            throw new ServiceException("云笔录状态异常，非待提交状态");
+        }
+
+        task.setDigitalVoiceLoggingStatus(DigitalVoiceLoggingStatusEnum.WAITING_CONFIRM.getCode());
+        this.updateById(task);
+
+        NosLawEnforcementTaskDigitalVoiceLoggingRelation digitalVoiceLogging = new NosLawEnforcementTaskDigitalVoiceLoggingRelation();
+        digitalVoiceLogging.setTaskId(bo.getTaskId());
+        digitalVoiceLogging.setCloudVideo(bo.getCloudVideo());
+        digitalVoiceLogging.setCloudText(bo.getCloudText());
+        return taskDigitalVoiceLoggingRelationService.save(digitalVoiceLogging);
+    }
 }
 
 

zdxt-modules/zdxt-enforcement-nos/src/main/resources/mapper/enforcementcode/NosLawEnforcementTaskMapper.xml

@@ -70,6 +70,8 @@
     <select id="pageHasCommentTask" resultType="com.zdxt.enforcementnos.domain.vo.NosLawEnforcementCommentTaskPageVO">
         SELECT
         t.id,
+        t.law_enforcement_agency_id as lawEnforcementAgencyId,
+        t.law_enforcement_agency as lawEnforcementAgency,
         t.enterprise_name AS enterpriseName,
         t.comment_time AS commentTime,
         t.create_time AS startTime,

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml

@@ -106,17 +106,34 @@ spring:
         # 多久检查一次连接的活性
         keepaliveTime: 30000
 
+--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
+#spring.data:
+#  redis:
+#    # 地址
+#    host: localhost
+#    # 端口，默认为6379
+#    port: 6379
+#    # 数据库索引
+#    database: 0
+#    # redis 密码必须配置
+#    #password: ruoyi123
+#    # 连接超时时间
+#    timeout: 10s
+#    # 是否开启ssl
+#    ssl.enabled: false
+
+
 --- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
 spring.data:
   redis:
     # 地址
-    host: localhost
+    host: 139.186.148.21
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # redis 密码必须配置
-    password: ruoyi123
+    password: zdxt@123
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 28080
   servlet:
     # 应用的访问路径
     context-path: /
@@ -201,6 +201,8 @@ mybatis-plus:
   typeAliasesPackage: org.dromara.**.domain,com.zdxt.**.domain
   global-config:
     dbConfig:
+      logic-not-delete-value: '0'
+      logic-delete-value: '1'
       # 主键类型
       # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
       # 如需改为自增 需要将数据库表全部设置为自增
@@ -262,7 +264,7 @@ springdoc:
   #这里定义了两个分组，可定义多个，也可以不定义
   group-configs:
     - group: 1、执法监督码
-      packages-to-scan: com.zdxt.enforcementcode
+      packages-to-scan: com.zdxt.enforcementnos
 #    - group: 2.通用模块
 #      packages-to-scan: org.dromara.web
     - group: 3.系统模块
@@ -317,7 +319,7 @@ websocket:
 spring:
   quartz:
     # 是否自动启动调度器，设为false则禁用全部定时任务
-    auto-startup: true
+    auto-startup: false
 
 --- # warm-flow工作流配置
 warm-flow: