diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/security/controller/PenaltySecurityController.java b/src/main/java/com/chinaweal/aiccs/aiccs/security/controller/PenaltySecurityController.java index ed9c3f8..126cbe8 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/security/controller/PenaltySecurityController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/security/controller/PenaltySecurityController.java @@ -1,23 +1,27 @@ package com.chinaweal.aiccs.aiccs.security.controller; import com.alibaba.fastjson.JSONObject; +import com.chinaweal.aiccs.aiccs.security.entity.PenaltyAcceptLog; import com.chinaweal.aiccs.aiccs.security.entity.PenaltyAppInfo; import com.chinaweal.aiccs.aiccs.security.entity.dto.LoginInfoParamDto; +import com.chinaweal.aiccs.aiccs.security.entity.dto.PenaltyCaseInfoEntInfoDto; import com.chinaweal.aiccs.aiccs.security.entity.dto.PenaltyCaseInfoRequestDto; +import com.chinaweal.aiccs.aiccs.security.entity.vo.SecurityResultAcceptVO; import com.chinaweal.aiccs.aiccs.security.entity.vo.SecurityResultVO; import com.chinaweal.aiccs.aiccs.security.enums.ErrorCode; +import com.chinaweal.aiccs.aiccs.security.service.IPenaltyAcceptLogService; import com.chinaweal.aiccs.aiccs.security.service.IPenaltyAppInfoService; import com.chinaweal.aiccs.common.constant.Constant; import com.chinaweal.aiccs.common.util.StringUtils; import com.chinaweal.aiccs.org.entity.TUsers; import com.chinaweal.aiccs.org.service.TUsersService; -import com.chinaweal.aicorg.exception.CryptException; -import com.chinaweal.aicorg.util.PasswordVerify; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; + /** * 批量吊销对外接口 * @@ -33,6 +37,8 @@ public class PenaltySecurityController { private TUsersService tUsersService; @Autowired private IPenaltyAppInfoService penaltyAppInfoService; + @Autowired + private IPenaltyAcceptLogService penaltyAcceptLogService; /** * 登录 @@ -115,11 +121,21 @@ public class PenaltySecurityController { if (StringUtils.isBlank(requestDto.getPenaltyorg())) { return SecurityResultVO.error(ErrorCode.PARAM_VALID_FAIL_6); } - if (CollectionUtils.isNotEmpty(requestDto.getPenaltylist())) { + if (CollectionUtils.isEmpty(requestDto.getPenaltylist())) { return SecurityResultVO.error(ErrorCode.PARAM_VALID_FAIL_7); } + for (PenaltyCaseInfoEntInfoDto each : requestDto.getPenaltylist()) { + if (StringUtils.isAnyBlank(each.getPripid(), each.getUniscid(), each.getLegal(), each.getEnttype())) { + return SecurityResultVO.error(ErrorCode.PARAM_VALID_FAIL_8); + } + } + PenaltyAcceptLog penaltyAcceptLog = new PenaltyAcceptLog(); + penaltyAcceptLog.setAcceptId(StringUtils.getUUID()); + penaltyAcceptLog.setDataJson(JSONObject.toJSONString(requestDto)); + penaltyAcceptLog.setCreateTime(LocalDateTime.now()); + penaltyAcceptLogService.save(penaltyAcceptLog); // TODO: 接收业务处理 accpetid - return SecurityResultVO.success(); + return SecurityResultAcceptVO.success(penaltyAcceptLog.getAcceptId()); } } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/security/entity/PenaltyAcceptLog.java b/src/main/java/com/chinaweal/aiccs/aiccs/security/entity/PenaltyAcceptLog.java new file mode 100644 index 0000000..18e9eb5 --- /dev/null +++ b/src/main/java/com/chinaweal/aiccs/aiccs/security/entity/PenaltyAcceptLog.java @@ -0,0 +1,40 @@ +package com.chinaweal.aiccs.aiccs.security.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 批量吊销接口对接记录 + * @author lroyia + * @since 2026/2/9 11:29 + **/ +@Data +@Accessors(chain = true) +public class PenaltyAcceptLog implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 受理记录id + */ + @TableId(type = IdType.ASSIGN_UUID, value = "ACCEPT_ID") + private String acceptId; + + /** + * 数据json + */ + @TableField("DATA_JSON") + private String dataJson; + + /** + * 创建时间 + */ + @TableField("CREATE_TIME") + private LocalDateTime createTime; +} diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/security/enums/ErrorCode.java b/src/main/java/com/chinaweal/aiccs/aiccs/security/enums/ErrorCode.java index 15c1447..2cfb76d 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/security/enums/ErrorCode.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/security/enums/ErrorCode.java @@ -26,6 +26,7 @@ public enum ErrorCode { PARAM_VALID_FAIL_5("14005", "参数校验失败", "处罚决定日期不能为空"), PARAM_VALID_FAIL_6("14006", "参数校验失败", "处罚决定机关不能为空"), PARAM_VALID_FAIL_7("14007", "参数校验失败", "吊销市场主体清单不能为空"), + PARAM_VALID_FAIL_8("14008", "参数校验失败", "吊销市场主体清单内容不能有空"), ; private final String code; diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/security/mapper/PenaltyAcceptLogMapper.java b/src/main/java/com/chinaweal/aiccs/aiccs/security/mapper/PenaltyAcceptLogMapper.java new file mode 100644 index 0000000..5757687 --- /dev/null +++ b/src/main/java/com/chinaweal/aiccs/aiccs/security/mapper/PenaltyAcceptLogMapper.java @@ -0,0 +1,12 @@ +package com.chinaweal.aiccs.aiccs.security.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.chinaweal.aiccs.aiccs.security.entity.PenaltyAcceptLog; + +/** + * 批量吊销接口对接记录 Mapper + * @author lroyia + * @since 2026/2/9 11:33 + **/ +public interface PenaltyAcceptLogMapper extends BaseMapper { +} diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/security/service/IPenaltyAcceptLogService.java b/src/main/java/com/chinaweal/aiccs/aiccs/security/service/IPenaltyAcceptLogService.java new file mode 100644 index 0000000..f142a85 --- /dev/null +++ b/src/main/java/com/chinaweal/aiccs/aiccs/security/service/IPenaltyAcceptLogService.java @@ -0,0 +1,12 @@ +package com.chinaweal.aiccs.aiccs.security.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.chinaweal.aiccs.aiccs.security.entity.PenaltyAcceptLog; + +/** + * 批量吊销接口对接记录 service + * @author lroyia + * @since 2026/2/9 11:33 + **/ +public interface IPenaltyAcceptLogService extends IService { +} diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/security/service/impl/PenaltyAcceptLogServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/security/service/impl/PenaltyAcceptLogServiceImpl.java new file mode 100644 index 0000000..0fb314f --- /dev/null +++ b/src/main/java/com/chinaweal/aiccs/aiccs/security/service/impl/PenaltyAcceptLogServiceImpl.java @@ -0,0 +1,17 @@ +package com.chinaweal.aiccs.aiccs.security.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chinaweal.aiccs.aiccs.security.entity.PenaltyAcceptLog; +import com.chinaweal.aiccs.aiccs.security.mapper.PenaltyAcceptLogMapper; +import com.chinaweal.aiccs.aiccs.security.service.IPenaltyAcceptLogService; +import org.springframework.stereotype.Service; + +/** + * 批量吊销接口对接记录 service实现类 + * + * @author lroyia + * @since 2026/2/9 11:34 + **/ +@Service +public class PenaltyAcceptLogServiceImpl extends ServiceImpl implements IPenaltyAcceptLogService { +} diff --git a/src/main/resources/mybatis/mapper/aiccs/security/PenaltyAcceptLogMapper.xml b/src/main/resources/mybatis/mapper/aiccs/security/PenaltyAcceptLogMapper.xml new file mode 100644 index 0000000..c73518f --- /dev/null +++ b/src/main/resources/mybatis/mapper/aiccs/security/PenaltyAcceptLogMapper.xml @@ -0,0 +1,6 @@ + + + + + +