From c6730faba09365bc31dba0e97d462ad542c577bf Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 24 六月 2025 17:54:15 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagementCard.java | 105 +++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeManagementCardMapper.xml | 197 ++++++++++++++++++++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoReissue.java | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeManagementCardMapper.java | 27 ++++
4 files changed, 329 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeManagementCardMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeManagementCardMapper.java
new file mode 100644
index 0000000..9e72a65
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeManagementCardMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pipIrrGlobal.daoSe;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoSe.SeManagementCard;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2025-06-24 16:47
+ * @LastEditTime 2025-06-24 16:47
+ * @Description
+ */
+
+@Mapper
+public interface SeManagementCardMapper extends BaseMapper<SeManagementCard> {
+ int deleteByPrimaryKey(Long id);
+
+ int insert(SeManagementCard record);
+
+ int insertSelective(SeManagementCard record);
+
+ SeManagementCard selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(SeManagementCard record);
+
+ int updateByPrimaryKey(SeManagementCard record);
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagementCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagementCard.java
new file mode 100644
index 0000000..9daf090
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagementCard.java
@@ -0,0 +1,105 @@
+package com.dy.pipIrrGlobal.pojoSe;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2025-06-24 16:47
+ * @LastEditTime 2025-06-24 16:47
+ * @Description 鍏呭�兼満鐢ㄧ鐞嗗崱
+ */
+
+@TableName(value="se_management_card", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class SeManagementCard implements BaseEntity {
+ public static final long serialVersionUID = 202506240651001L;
+
+ /**
+ * 涓婚敭
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ private Long id;
+
+ /**
+ * 閫氳鍗忚
+ */
+ @NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖")
+ private String protocol;
+
+ /**
+ * 鍗＄墖鍦板潃
+ */
+ @NotBlank(message = "鍗＄墖鍦板潃涓嶈兘涓虹┖")
+ private String cardAddr;
+
+ /**
+ * 璇嗗埆鐮�
+ */
+ @NotBlank(message = "璇嗗埆鐮佷笉鑳戒负绌�")
+ private String securityCode;
+
+ /**
+ * 鍗＄墖绫诲瀷;2-璁剧疆鍖哄煙琛ㄥ彿鍗★紝3-鍙栨暟鍗★紝4-妫�鏌ュ崱锛�5-娴嬭瘯鍗★紝6-娓呴浂鍗★紝7-IP璁剧疆鍗★紝8-鍩熷悕璁剧疆鍗★紝9-GPS鍗★紝10-鏃堕棿閰嶇疆鍗�
+ */
+ @NotNull(message = "鍗＄墖绫诲瀷涓嶈兘涓虹┖")
+ private Byte cardType;
+
+ /**
+ * 寮�鍗℃椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @NotNull(message = "寮�鍗℃椂闂翠笉鑳戒负绌�")
+ private Date createTime;
+
+ /**
+ * 璁㈠崟鍙�
+ */
+ private String orderNo;
+
+ /**
+ * 5绾ц鏀垮尯鍒掔紪鐮�
+ */
+ private String districtCode;
+
+ /**
+ * 椤圭洰缂栫爜
+ */
+ private Integer projectNo;
+
+ /**
+ * IP鍦板潃
+ */
+ private String ip;
+
+ /**
+ * 鍩熷悕
+ */
+ private String domain;
+
+ /**
+ * 寮�鍏抽榾鏃堕棿
+ */
+ private Integer openClostTime;
+
+ /**
+ * 澶囨敞淇℃伅
+ */
+ private String remarks;
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeManagementCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeManagementCardMapper.xml
new file mode 100644
index 0000000..0e28a72
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeManagementCardMapper.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.daoSe.SeManagementCardMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoSe.SeManagementCard">
+ <!--@mbg.generated-->
+ <!--@Table se_management_card-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="protocol" jdbcType="VARCHAR" property="protocol" />
+ <result column="card_addr" jdbcType="VARCHAR" property="cardAddr" />
+ <result column="security_code" jdbcType="VARCHAR" property="securityCode" />
+ <result column="card_type" jdbcType="TINYINT" property="cardType" />
+ <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+ <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+ <result column="district_code" jdbcType="VARCHAR" property="districtCode" />
+ <result column="project_no" jdbcType="INTEGER" property="projectNo" />
+ <result column="ip" jdbcType="VARCHAR" property="ip" />
+ <result column="domain" jdbcType="VARCHAR" property="domain" />
+ <result column="open_clost_time" jdbcType="INTEGER" property="openClostTime" />
+ <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, protocol, card_addr, security_code, card_type, create_time, order_no, district_code,
+ project_no, ip, `domain`, open_clost_time, remarks
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from se_management_card
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete from se_management_card
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeManagementCard">
+ <!--@mbg.generated-->
+ insert into se_management_card (id, protocol, card_addr,
+ security_code, card_type, create_time,
+ order_no, district_code, project_no,
+ ip, `domain`, open_clost_time,
+ remarks)
+ values (#{id,jdbcType=BIGINT}, #{protocol,jdbcType=VARCHAR}, #{cardAddr,jdbcType=VARCHAR},
+ #{securityCode,jdbcType=VARCHAR}, #{cardType,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP},
+ #{orderNo,jdbcType=VARCHAR}, #{districtCode,jdbcType=VARCHAR}, #{projectNo,jdbcType=INTEGER},
+ #{ip,jdbcType=VARCHAR}, #{domain,jdbcType=VARCHAR}, #{openClostTime,jdbcType=INTEGER},
+ #{remarks,jdbcType=VARCHAR})
+ </insert>
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeManagementCard">
+ <!--@mbg.generated-->
+ insert into se_management_card
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="protocol != null">
+ protocol,
+ </if>
+ <if test="cardAddr != null">
+ card_addr,
+ </if>
+ <if test="securityCode != null">
+ security_code,
+ </if>
+ <if test="cardType != null">
+ card_type,
+ </if>
+ <if test="createTime != null">
+ create_time,
+ </if>
+ <if test="orderNo != null">
+ order_no,
+ </if>
+ <if test="districtCode != null">
+ district_code,
+ </if>
+ <if test="projectNo != null">
+ project_no,
+ </if>
+ <if test="ip != null">
+ ip,
+ </if>
+ <if test="domain != null">
+ `domain`,
+ </if>
+ <if test="openClostTime != null">
+ open_clost_time,
+ </if>
+ <if test="remarks != null">
+ remarks,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="protocol != null">
+ #{protocol,jdbcType=VARCHAR},
+ </if>
+ <if test="cardAddr != null">
+ #{cardAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="securityCode != null">
+ #{securityCode,jdbcType=VARCHAR},
+ </if>
+ <if test="cardType != null">
+ #{cardType,jdbcType=TINYINT},
+ </if>
+ <if test="createTime != null">
+ #{createTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="orderNo != null">
+ #{orderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="districtCode != null">
+ #{districtCode,jdbcType=VARCHAR},
+ </if>
+ <if test="projectNo != null">
+ #{projectNo,jdbcType=INTEGER},
+ </if>
+ <if test="ip != null">
+ #{ip,jdbcType=VARCHAR},
+ </if>
+ <if test="domain != null">
+ #{domain,jdbcType=VARCHAR},
+ </if>
+ <if test="openClostTime != null">
+ #{openClostTime,jdbcType=INTEGER},
+ </if>
+ <if test="remarks != null">
+ #{remarks,jdbcType=VARCHAR},
+ </if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeManagementCard">
+ <!--@mbg.generated-->
+ update se_management_card
+ <set>
+ <if test="protocol != null">
+ protocol = #{protocol,jdbcType=VARCHAR},
+ </if>
+ <if test="cardAddr != null">
+ card_addr = #{cardAddr,jdbcType=VARCHAR},
+ </if>
+ <if test="securityCode != null">
+ security_code = #{securityCode,jdbcType=VARCHAR},
+ </if>
+ <if test="cardType != null">
+ card_type = #{cardType,jdbcType=TINYINT},
+ </if>
+ <if test="createTime != null">
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="orderNo != null">
+ order_no = #{orderNo,jdbcType=VARCHAR},
+ </if>
+ <if test="districtCode != null">
+ district_code = #{districtCode,jdbcType=VARCHAR},
+ </if>
+ <if test="projectNo != null">
+ project_no = #{projectNo,jdbcType=INTEGER},
+ </if>
+ <if test="ip != null">
+ ip = #{ip,jdbcType=VARCHAR},
+ </if>
+ <if test="domain != null">
+ `domain` = #{domain,jdbcType=VARCHAR},
+ </if>
+ <if test="openClostTime != null">
+ open_clost_time = #{openClostTime,jdbcType=INTEGER},
+ </if>
+ <if test="remarks != null">
+ remarks = #{remarks,jdbcType=VARCHAR},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeManagementCard">
+ <!--@mbg.generated-->
+ update se_management_card
+ set protocol = #{protocol,jdbcType=VARCHAR},
+ card_addr = #{cardAddr,jdbcType=VARCHAR},
+ security_code = #{securityCode,jdbcType=VARCHAR},
+ card_type = #{cardType,jdbcType=TINYINT},
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+ order_no = #{orderNo,jdbcType=VARCHAR},
+ district_code = #{districtCode,jdbcType=VARCHAR},
+ project_no = #{projectNo,jdbcType=INTEGER},
+ ip = #{ip,jdbcType=VARCHAR},
+ `domain` = #{domain,jdbcType=VARCHAR},
+ open_clost_time = #{openClostTime,jdbcType=INTEGER},
+ remarks = #{remarks,jdbcType=VARCHAR}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoReissue.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoReissue.java
index fed7810..32c6c19 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoReissue.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/dto/DtoReissue.java
@@ -44,7 +44,6 @@
/**
* 鏀粯鏂瑰紡
*/
- @NotNull(message = "鏀粯鏂瑰紡涓嶈兘涓虹┖")
private Long paymentId;
/**
--
Gitblit v1.8.0