Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

12 小时以前 c6730faba09365bc31dba0e97d462ad542c577bf

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeManagementCardMapper.java

New file
@@ -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);
}

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagementCard.java

New file
@@ -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;

}

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeManagementCardMapper.xml

New file
@@ -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>

 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;

    /**