打印机配置增加打印机编号
This commit is contained in:
parent
4d6d6192db
commit
3ca40878da
@ -3,6 +3,7 @@ package com.ktg.print.controller;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import com.ktg.common.constant.UserConstants;
|
||||||
import com.ktg.print.domain.PrintPrinterConfig;
|
import com.ktg.print.domain.PrintPrinterConfig;
|
||||||
import com.ktg.print.service.IPrintPrinterConfigService;
|
import com.ktg.print.service.IPrintPrinterConfigService;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
@ -79,6 +80,10 @@ public class PrintPrinterConfigController extends BaseController
|
|||||||
@PostMapping
|
@PostMapping
|
||||||
public AjaxResult add(@RequestBody PrintPrinterConfig printPrinterConfig)
|
public AjaxResult add(@RequestBody PrintPrinterConfig printPrinterConfig)
|
||||||
{
|
{
|
||||||
|
if(UserConstants.NOT_UNIQUE.equals(printPrinterConfigService.checkPrinterCodeUnique(printPrinterConfig))){
|
||||||
|
return AjaxResult.error("打印机编号已存在!");
|
||||||
|
}
|
||||||
|
|
||||||
return toAjax(printPrinterConfigService.insertPrintPrinterConfig(printPrinterConfig));
|
return toAjax(printPrinterConfigService.insertPrintPrinterConfig(printPrinterConfig));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -90,6 +95,10 @@ public class PrintPrinterConfigController extends BaseController
|
|||||||
@PutMapping
|
@PutMapping
|
||||||
public AjaxResult edit(@RequestBody PrintPrinterConfig printPrinterConfig)
|
public AjaxResult edit(@RequestBody PrintPrinterConfig printPrinterConfig)
|
||||||
{
|
{
|
||||||
|
if(UserConstants.NOT_UNIQUE.equals(printPrinterConfigService.checkPrinterCodeUnique(printPrinterConfig))){
|
||||||
|
return AjaxResult.error("打印机编号已存在!");
|
||||||
|
}
|
||||||
|
|
||||||
return toAjax(printPrinterConfigService.updatePrintPrinterConfig(printPrinterConfig));
|
return toAjax(printPrinterConfigService.updatePrintPrinterConfig(printPrinterConfig));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,6 +18,11 @@ public class PrintPrinterConfig extends BaseEntity
|
|||||||
/** 打印机ID */
|
/** 打印机ID */
|
||||||
private Long printerId;
|
private Long printerId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打印机编号
|
||||||
|
*/
|
||||||
|
private String printerCode;
|
||||||
|
|
||||||
/** 打印机类型 */
|
/** 打印机类型 */
|
||||||
@Excel(name = "打印机类型")
|
@Excel(name = "打印机类型")
|
||||||
private String printerType;
|
private String printerType;
|
||||||
@ -91,7 +96,16 @@ public class PrintPrinterConfig extends BaseEntity
|
|||||||
{
|
{
|
||||||
return printerId;
|
return printerId;
|
||||||
}
|
}
|
||||||
public void setPrinterType(String printerType)
|
|
||||||
|
public String getPrinterCode() {
|
||||||
|
return printerCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPrinterCode(String printerCode) {
|
||||||
|
this.printerCode = printerCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPrinterType(String printerType)
|
||||||
{
|
{
|
||||||
this.printerType = printerType;
|
this.printerType = printerType;
|
||||||
}
|
}
|
||||||
|
@ -21,6 +21,14 @@ public interface PrintPrinterConfigMapper
|
|||||||
*/
|
*/
|
||||||
public PrintPrinterConfig selectPrintPrinterConfigByPrinterId(Long printerId);
|
public PrintPrinterConfig selectPrintPrinterConfigByPrinterId(Long printerId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询打印机配置
|
||||||
|
*
|
||||||
|
* @param printerCode 打印机编号
|
||||||
|
* @return 打印机配置
|
||||||
|
*/
|
||||||
|
public PrintPrinterConfig selectPrintPrinterConfigByPrinterCode(String printerCode);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询打印机配置列表
|
* 查询打印机配置列表
|
||||||
*
|
*
|
||||||
@ -29,6 +37,13 @@ public interface PrintPrinterConfigMapper
|
|||||||
*/
|
*/
|
||||||
public List<PrintPrinterConfig> selectPrintPrinterConfigList(PrintPrinterConfig printPrinterConfig);
|
public List<PrintPrinterConfig> selectPrintPrinterConfigList(PrintPrinterConfig printPrinterConfig);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检查编号是否唯一
|
||||||
|
* @param config
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public PrintPrinterConfig checkPrinterCodeUnique(PrintPrinterConfig config);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增打印机配置
|
* 新增打印机配置
|
||||||
*
|
*
|
||||||
|
@ -20,6 +20,14 @@ public interface IPrintPrinterConfigService
|
|||||||
*/
|
*/
|
||||||
public PrintPrinterConfig selectPrintPrinterConfigByPrinterId(Long printerId);
|
public PrintPrinterConfig selectPrintPrinterConfigByPrinterId(Long printerId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据打印机编号查询打印机配置
|
||||||
|
*
|
||||||
|
* @param printerCode 打印机编号
|
||||||
|
* @return 打印机配置
|
||||||
|
*/
|
||||||
|
public PrintPrinterConfig selectPrintPrinterConfigByPrinterCode(String printerCode);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询打印机配置列表
|
* 查询打印机配置列表
|
||||||
*
|
*
|
||||||
@ -28,6 +36,14 @@ public interface IPrintPrinterConfigService
|
|||||||
*/
|
*/
|
||||||
public List<PrintPrinterConfig> selectPrintPrinterConfigList(PrintPrinterConfig printPrinterConfig);
|
public List<PrintPrinterConfig> selectPrintPrinterConfigList(PrintPrinterConfig printPrinterConfig);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检查编号是否唯一
|
||||||
|
* @param config
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public String checkPrinterCodeUnique(PrintPrinterConfig config);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增打印机配置
|
* 新增打印机配置
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
package com.ktg.print.service.impl;
|
package com.ktg.print.service.impl;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.ktg.common.constant.UserConstants;
|
||||||
import com.ktg.common.utils.DateUtils;
|
import com.ktg.common.utils.DateUtils;
|
||||||
|
import com.ktg.common.utils.StringUtils;
|
||||||
import com.ktg.print.domain.PrintPrinterConfig;
|
import com.ktg.print.domain.PrintPrinterConfig;
|
||||||
import com.ktg.print.mapper.PrintPrinterConfigMapper;
|
import com.ktg.print.mapper.PrintPrinterConfigMapper;
|
||||||
import com.ktg.print.service.IPrintPrinterConfigService;
|
import com.ktg.print.service.IPrintPrinterConfigService;
|
||||||
@ -32,6 +35,11 @@ public class PrintPrinterConfigServiceImpl implements IPrintPrinterConfigService
|
|||||||
return printPrinterConfigMapper.selectPrintPrinterConfigByPrinterId(printerId);
|
return printPrinterConfigMapper.selectPrintPrinterConfigByPrinterId(printerId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PrintPrinterConfig selectPrintPrinterConfigByPrinterCode(String printerCode) {
|
||||||
|
return printPrinterConfigMapper.selectPrintPrinterConfigByPrinterCode(printerCode);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询打印机配置列表
|
* 查询打印机配置列表
|
||||||
*
|
*
|
||||||
@ -44,6 +52,19 @@ public class PrintPrinterConfigServiceImpl implements IPrintPrinterConfigService
|
|||||||
return printPrinterConfigMapper.selectPrintPrinterConfigList(printPrinterConfig);
|
return printPrinterConfigMapper.selectPrintPrinterConfigList(printPrinterConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String checkPrinterCodeUnique(PrintPrinterConfig config) {
|
||||||
|
|
||||||
|
PrintPrinterConfig p = printPrinterConfigMapper.checkPrinterCodeUnique(config);
|
||||||
|
|
||||||
|
Long configId = config.getPrinterId() == null? -1L:config.getPrinterId();
|
||||||
|
if(StringUtils.isNotNull(p) && configId.longValue() !=p.getPrinterId().longValue()){
|
||||||
|
return UserConstants.NOT_UNIQUE;
|
||||||
|
}else {
|
||||||
|
return UserConstants.UNIQUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增打印机配置
|
* 新增打印机配置
|
||||||
*
|
*
|
||||||
|
@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<mapper namespace="com.ktg.print.mapper.PrintPrinterConfigMapper">
|
<mapper namespace="com.ktg.print.mapper.PrintPrinterConfigMapper">
|
||||||
<resultMap type="PrintPrinterConfig" id="PrintPrinterConfigResult">
|
<resultMap type="PrintPrinterConfig" id="PrintPrinterConfigResult">
|
||||||
<result property="printerId" column="printer_id" />
|
<result property="printerId" column="printer_id" />
|
||||||
|
<result property="printerCode" column="printer_code" />
|
||||||
<result property="printerType" column="printer_type" />
|
<result property="printerType" column="printer_type" />
|
||||||
<result property="printerName" column="printer_name" />
|
<result property="printerName" column="printer_name" />
|
||||||
<result property="brand" column="brand" />
|
<result property="brand" column="brand" />
|
||||||
@ -30,13 +31,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectPrintPrinterConfigVo">
|
<sql id="selectPrintPrinterConfigVo">
|
||||||
select printer_id, printer_type, printer_name, brand, printer_model, connection_type, printer_url, printer_ip, printer_port, client_sid, client_ip, client_port, enable_flag, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from print_printer_config
|
select printer_id, printer_code, printer_type, printer_name, brand, printer_model, connection_type, printer_url, printer_ip, printer_port, client_sid, client_ip, client_port, enable_flag, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from print_printer_config
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectPrintPrinterConfigList" parameterType="PrintPrinterConfig" resultMap="PrintPrinterConfigResult">
|
<select id="selectPrintPrinterConfigList" parameterType="PrintPrinterConfig" resultMap="PrintPrinterConfigResult">
|
||||||
<include refid="selectPrintPrinterConfigVo"/>
|
<include refid="selectPrintPrinterConfigVo"/>
|
||||||
<where>
|
<where>
|
||||||
<if test="printerType != null and printerType != ''"> and printer_type = #{printerType}</if>
|
<if test="printerType != null and printerType != ''"> and printer_type = #{printerType}</if>
|
||||||
|
<if test="printerCode != null and printerCode != ''"> and printer_code = #{printerCode}</if>
|
||||||
<if test="printerName != null and printerName != ''"> and printer_name like concat('%', #{printerName}, '%')</if>
|
<if test="printerName != null and printerName != ''"> and printer_name like concat('%', #{printerName}, '%')</if>
|
||||||
<if test="brand != null and brand != ''"> and brand = #{brand}</if>
|
<if test="brand != null and brand != ''"> and brand = #{brand}</if>
|
||||||
<if test="printerModel != null and printerModel != ''"> and printer_model = #{printerModel}</if>
|
<if test="printerModel != null and printerModel != ''"> and printer_model = #{printerModel}</if>
|
||||||
@ -56,10 +58,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<include refid="selectPrintPrinterConfigVo"/>
|
<include refid="selectPrintPrinterConfigVo"/>
|
||||||
where printer_id = #{printerId}
|
where printer_id = #{printerId}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="selectPrintPrinterConfigByPrinterCode" parameterType="String" resultMap="PrintPrinterConfigResult">
|
||||||
|
<include refid="selectPrintPrinterConfigVo"/>
|
||||||
|
where printer_code = #{printerCode} limit 1
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<select id="checkPrinterCodeUnique" parameterType="PrintPrinterConfig" resultMap="PrintPrinterConfigResult">
|
||||||
|
<include refid="selectPrintPrinterConfigVo"/>
|
||||||
|
where printer_code = #{printerCode} limit 1
|
||||||
|
</select>
|
||||||
|
|
||||||
|
|
||||||
<insert id="insertPrintPrinterConfig" parameterType="PrintPrinterConfig" useGeneratedKeys="true" keyProperty="printerId">
|
<insert id="insertPrintPrinterConfig" parameterType="PrintPrinterConfig" useGeneratedKeys="true" keyProperty="printerId">
|
||||||
insert into print_printer_config
|
insert into print_printer_config
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
|
<if test="printerCode != null">printer_code,</if>
|
||||||
<if test="printerType != null">printer_type,</if>
|
<if test="printerType != null">printer_type,</if>
|
||||||
<if test="printerName != null and printerName != ''">printer_name,</if>
|
<if test="printerName != null and printerName != ''">printer_name,</if>
|
||||||
<if test="brand != null">brand,</if>
|
<if test="brand != null">brand,</if>
|
||||||
@ -84,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="updateTime != null">update_time,</if>
|
<if test="updateTime != null">update_time,</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
|
<if test="printerCode != null">#{printerCode},</if>
|
||||||
<if test="printerType != null">#{printerType},</if>
|
<if test="printerType != null">#{printerType},</if>
|
||||||
<if test="printerName != null and printerName != ''">#{printerName},</if>
|
<if test="printerName != null and printerName != ''">#{printerName},</if>
|
||||||
<if test="brand != null">#{brand},</if>
|
<if test="brand != null">#{brand},</if>
|
||||||
@ -112,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<update id="updatePrintPrinterConfig" parameterType="PrintPrinterConfig">
|
<update id="updatePrintPrinterConfig" parameterType="PrintPrinterConfig">
|
||||||
update print_printer_config
|
update print_printer_config
|
||||||
<trim prefix="SET" suffixOverrides=",">
|
<trim prefix="SET" suffixOverrides=",">
|
||||||
|
<if test="printerCode != null">printer_code = #{printerCode},</if>
|
||||||
<if test="printerType != null">printer_type = #{printerType},</if>
|
<if test="printerType != null">printer_type = #{printerType},</if>
|
||||||
<if test="printerName != null and printerName != ''">printer_name = #{printerName},</if>
|
<if test="printerName != null and printerName != ''">printer_name = #{printerName},</if>
|
||||||
<if test="brand != null">brand = #{brand},</if>
|
<if test="brand != null">brand = #{brand},</if>
|
||||||
|
Loading…
Reference in New Issue
Block a user