From 3c02de4784833101259cd10196148a73542cd9ae Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 4 Sep 2026 14:15:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E9=83=A8=E8=AE=A1=E5=88=92=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LongGangInterfaceController.java | 16 ++++----- .../domain/EfcodeCpPlanUsers.java | 1 + .../domain/bo/EfcodeCpPlanBo.java | 9 +++++ .../domain/bo/EfcodeCpPlanUsersBo.java | 1 + ...eTaskBo.java => LongGangCreatePlanBo.java} | 36 +++++-------------- .../LongGangCreatePlanVo.java | 8 ++--- .../LongGangCreateTaskVo.java | 19 ---------- .../impl/OutEfcodeCpPlanServiceImpl.java | 1 + 8 files changed, 29 insertions(+), 62 deletions(-) rename zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/externalInterface/{LongGangCreateTaskBo.java => LongGangCreatePlanBo.java} (83%) delete mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/externalInterface/LongGangCreateTaskVo.java diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/externalInterface/LongGangInterfaceController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/externalInterface/LongGangInterfaceController.java index 7404f390..3a4fb397 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/externalInterface/LongGangInterfaceController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/externalInterface/LongGangInterfaceController.java @@ -8,15 +8,11 @@ import com.zdxt.enforcementcode.domain.EfcodeCpPlan; import com.zdxt.enforcementcode.domain.SysApiPlatformConfigEntity; import com.zdxt.enforcementcode.domain.bo.EfcodeCpPlanBo; import com.zdxt.enforcementcode.domain.bo.EfcodeCpTaskBo; -import com.zdxt.enforcementcode.domain.bo.externalInterface.LongGangBindPlanBo; -import com.zdxt.enforcementcode.domain.bo.externalInterface.LongGangCreateTaskBo; -import com.zdxt.enforcementcode.domain.bo.externalInterface.LongGangDeletePlanBo; -import com.zdxt.enforcementcode.domain.bo.externalInterface.LongGangUnbindPlanBo; +import com.zdxt.enforcementcode.domain.bo.externalInterface.*; import com.zdxt.enforcementcode.domain.vo.EfcodeCpPlanVo; -import com.zdxt.enforcementcode.domain.vo.EfcodeCpTaskVo; import com.zdxt.enforcementcode.domain.vo.EnterpriseInformationVo; import com.zdxt.enforcementcode.domain.vo.SrzDeptVo; -import com.zdxt.enforcementcode.domain.vo.externalInterface.LongGangCreateTaskVo; +import com.zdxt.enforcementcode.domain.vo.externalInterface.LongGangCreatePlanVo; import com.zdxt.enforcementcode.service.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -67,7 +63,7 @@ public class LongGangInterfaceController { if (StrUtil.isBlank(channelNo)) { return R.fail("渠道未配置 channelNo"); } - return R.ok(channelNo); + return R.ok("操作成功",channelNo); } /** @@ -87,9 +83,9 @@ public class LongGangInterfaceController { @RepeatSubmit() @Log(title = "外部接口-新增或修改计划", businessType = BusinessType.OTHER) @PostMapping("/plan/saveOrUpdatePlan") - public R saveOrUpdatePlan( + public R saveOrUpdatePlan( @RequestHeader(value = HEADER_APP_KEY, required = false) String appKey, - @Validated @RequestBody LongGangCreateTaskBo bo) { + @Validated @RequestBody LongGangCreatePlanBo bo) { // ========== 1. 渠道认证 ========== R authResult = authenticateChannel(appKey); if (!R.isSuccess(authResult)) { @@ -122,7 +118,7 @@ public class LongGangInterfaceController { List existingList = outEfcodeCpPlanService.queryList(queryBo); boolean isUpdate = !existingList.isEmpty(); - LongGangCreateTaskVo vo = new LongGangCreateTaskVo(); + LongGangCreatePlanVo vo = new LongGangCreatePlanVo(); vo.setOutSerialNo(bo.getOutSerialNo()); if (isUpdate) { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpPlanUsers.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpPlanUsers.java index 268356c9..556aab27 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpPlanUsers.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpPlanUsers.java @@ -48,4 +48,5 @@ public class EfcodeCpPlanUsers extends BaseEntity { private String userTel; + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanBo.java index 44756bd4..d57eb26d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanBo.java @@ -1,5 +1,7 @@ package com.zdxt.enforcementcode.domain.bo; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.zdxt.enforcementcode.domain.EfcodeCpPlan; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; @@ -214,4 +216,11 @@ public class EfcodeCpPlanBo extends BaseEntity { * 外部流水号 */ private String outSerialNo; + + + /** + * 创建者 + */ + private Long createBy; + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanUsersBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanUsersBo.java index 8e78597b..7ace9bc1 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanUsersBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanUsersBo.java @@ -50,4 +50,5 @@ public class EfcodeCpPlanUsersBo extends BaseEntity { private String userTel; + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/externalInterface/LongGangCreateTaskBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/externalInterface/LongGangCreatePlanBo.java similarity index 83% rename from zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/externalInterface/LongGangCreateTaskBo.java rename to zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/externalInterface/LongGangCreatePlanBo.java index 2474a156..4c50828a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/externalInterface/LongGangCreateTaskBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/externalInterface/LongGangCreatePlanBo.java @@ -3,6 +3,7 @@ package com.zdxt.enforcementcode.domain.bo.externalInterface; import com.fasterxml.jackson.annotation.JsonFormat; import com.zdxt.enforcementcode.domain.bo.EfcodeCpPlanBo; import io.github.linpeilie.annotations.AutoMapper; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import jakarta.validation.constraints.NotBlank; @@ -14,7 +15,7 @@ import java.util.Date; */ @Data @AutoMapper(target = EfcodeCpPlanBo.class) -public class LongGangCreateTaskBo { +public class LongGangCreatePlanBo { /** * 计划ID（修改时必传，新增时不传） @@ -58,11 +59,6 @@ public class LongGangCreateTaskBo { @NotBlank(message = "企业信用代码不能为空") private String enterpriseNumber; -// /** -// * 被检查企业/机构ID（系统内主键） -// */ -// private String enterpriseId; - /** * 企业联系人 */ @@ -101,27 +97,6 @@ public class LongGangCreateTaskBo { */ private Long isUnion = 0L; -// /** -// * 执法单位ID -// */ -// @NotBlank(message = "执法单位ID不能为空") -// private String bureauDeptId; -// -// /** -// * 执法单位名称 -// */ -// @NotBlank(message = "执法单位名称不能为空") -// private String bureauDeptName; - -// /** -// * 市认证机构ID -// */ -// private String organId; -// -// /** -// * 市认证机构名称 -// */ -// private String organName; /** * 市认证部门ID @@ -148,5 +123,12 @@ public class LongGangCreateTaskBo { /** * 任务id:空串表示还没生成任务 */ + @Schema(hidden = true) private String taskId; + + /** + * 创建者,默认第一个执法者 + */ + @NotNull(message = "创建者不能为空") + private Long createBy; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/externalInterface/LongGangCreatePlanVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/externalInterface/LongGangCreatePlanVo.java index 26c6c75b..451a36e7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/externalInterface/LongGangCreatePlanVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/externalInterface/LongGangCreatePlanVo.java @@ -11,13 +11,9 @@ public class LongGangCreatePlanVo implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * 计划ID - */ private String planId; - /** - * 计划流水号 - */ + private String taskId; + private String outSerialNo; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/externalInterface/LongGangCreateTaskVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/externalInterface/LongGangCreateTaskVo.java deleted file mode 100644 index a22fffcd..00000000 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/externalInterface/LongGangCreateTaskVo.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.zdxt.enforcementcode.domain.vo.externalInterface; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -@Data -public class LongGangCreateTaskVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - private String planId; - - private String taskId; - - private String outSerialNo; -} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/OutEfcodeCpPlanServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/OutEfcodeCpPlanServiceImpl.java index 42b6131e..78a66ff4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/OutEfcodeCpPlanServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/OutEfcodeCpPlanServiceImpl.java @@ -317,6 +317,7 @@ public class OutEfcodeCpPlanServiceImpl implements IOutEfcodeCpPlanService { lqw.eq(bo.getIsDelete() != null, EfcodeCpPlan::getIsDelete, bo.getIsDelete()); lqw.eq(StringUtils.isNotBlank(bo.getMyRemark()), EfcodeCpPlan::getMyRemark, bo.getMyRemark()); lqw.eq(StringUtils.isNotBlank(bo.getChannelNo()), EfcodeCpPlan::getChannelNo, bo.getChannelNo()); + lqw.eq(StringUtils.isNotBlank(bo.getOutSerialNo()), EfcodeCpPlan::getOutSerialNo, bo.getOutSerialNo()); lqw.eq(StringUtils.isNotBlank(bo.getTaskId()), EfcodeCpPlan::getTaskId, bo.getTaskId()); return lqw; }