工位终端配置代码更新

hdy

2024-01-15 14e848b328eeb9dcf463d91da7f84da65b3cd12d

工位终端配置代码更新

 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java

@@ -58,6 +58,8 @@
    @Excel(name = "更改用户")
    private String updateUser;

    @Excel(name = "网卡地址")
    private String macAddress;
    /** 备注 */
    @Excel(name = "备注")
    private String remarks;
@@ -76,9 +78,15 @@
        this.processesCode = processesCode;
    }

    public String getProcessesCode() 
    public String getProcessesCode()
    {
        return processesCode;
    }
    public void setMacAddress(String macAdress) {this.macAddress = macAdress;}

    public String getMacAddress()
    {
        return macAddress;
    }
    public void setProcessesName(String processesName) 
    {
@@ -176,6 +184,7 @@
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("processesCode", getProcessesCode())
             .append("macAddress", getMacAddress())
            .append("processesName", getProcessesName())
            .append("processesType", getProcessesType())
            .append("ipAddress", getIpAddress())

 jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml

@@ -19,15 +19,17 @@
        <result property="updateUser"    column="update_user"    />
        <result property="updateTime"    column="update_time"    />
        <result property="remarks"    column="remarks"    />
        <result property="macAddress"    column="mac_address"    />
    </resultMap>

    <sql id="selectScStationConfVo">
        select id, processes_code, processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
        select id, processes_code, mac_address,processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
    </sql>

    <select id="selectScStationConfList" parameterType="ScStationConf" resultMap="ScStationConfResult">
        <include refid="selectScStationConfVo"/>
        <where>  
            <if test="macAddress != null  and macAddress != ''"> and mac_adress = #{macAddress}</if>
            <if test="processesCode != null  and processesCode != ''"> and processes_code = #{processesCode}</if>
            <if test="processesName != null  and processesName != ''"> and processes_name like concat('%', #{processesName}, '%')</if>
            <if test="processesType != null  and processesType != ''"> and processes_type = #{processesType}</if>
@@ -51,6 +53,7 @@
        insert into sc_station_conf
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="processesCode != null">processes_code,</if>
            <if test="macAddress != null">mac_address,</if>
            <if test="processesName != null">processes_name,</if>
            <if test="processesType != null">processes_type,</if>
            <if test="ipAddress != null">ip_address,</if>
@@ -66,6 +69,7 @@
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="processesCode != null">#{processesCode},</if>
            <if test="macAddress != null">#{macAddress},</if>
            <if test="processesName != null">#{processesName},</if>
            <if test="processesType != null">#{processesType},</if>
            <if test="ipAddress != null">#{ipAddress},</if>
@@ -86,6 +90,7 @@
        <trim prefix="SET" suffixOverrides=",">
            <if test="processesCode != null">processes_code = #{processesCode},</if>
            <if test="processesName != null">processes_name = #{processesName},</if>
            <if test="macAddress != null">mac_address = #{macAddress},</if>
            <if test="processesType != null">processes_type = #{processesType},</if>
            <if test="ipAddress != null">ip_address = #{ipAddress},</if>
            <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>

 jcdm-ui/src/views/main/sc/stationConf/index.vue

@@ -89,6 +89,9 @@
          </el-table-column>
          <el-table-column label="IP地址" align="center" prop="ipAddress">
          </el-table-column>
          <el-table-column label="网卡地址" align="center" prop="macAddress">
          </el-table-column>

          <el-table-column label="备注" align="center" prop="remarks">
          </el-table-column>
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
@@ -147,6 +150,9 @@
        <el-form-item label="IP地址" prop="ipAddress">
          <el-input v-model="form.ipAddress" placeholder="请输入IP地址" />
        </el-form-item>
        <el-form-item label="网卡地址" prop="macAddress">
          <el-input v-model="form.macAddress" placeholder="请输入网卡地址" />
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" placeholder="请输入备注" />
        </el-form-item>
@@ -195,6 +201,7 @@
        processesName: null,
        processesType: null,
        ipAddress: null,
        macAddress: null,
        spareField1: null,
        spareField2: null,
        spareField3: null,