From b067f93af27963390eff4c65a88f49bdffac2f72 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 09 七月 2024 10:56:35 +0800
Subject: [PATCH] 名称统一
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrDevice.java | 8 +-
/dev/null | 40 -------------
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrDeviceMapper.java | 40 +++++++++++++
pms-parent/pms-global/src/main/resources/mapper/PrDeviceMapper.xml | 66 +++++++++++-----------
4 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrDeviceMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrDeviceMapper.java
new file mode 100644
index 0000000..d096b44
--- /dev/null
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrDeviceMapper.java
@@ -0,0 +1,40 @@
+package com.dy.pmsGlobal.daoPr;
+
+import com.dy.pmsGlobal.pojoPr.PrDevice;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author 灏忔槑
+* @description 閽堝琛ㄣ�恜r_device(璁惧琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-05-29 15:53:10
+* @Entity com.dy.pmsGlobal.pojoPr.PrDevice
+*/
+@Mapper
+public interface PrDeviceMapper {
+
+ int deleteByPrimaryKey(Long id);
+
+ int insert(PrDevice record);
+
+ int insertSelective(PrDevice record);
+
+ PrDevice selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(PrDevice record);
+
+ int updateByPrimaryKey(PrDevice record);
+
+ Long selectSomeCount(Map<String,Object> params);
+
+ List<PrDevice> selectSome(Map<String,Object> params);
+
+ int insertBatch(List<PrDevice> list);
+
+ List<PrDevice> selectByBatchId(Long batchId);
+
+ void deleteByBatchId(Long batchId);
+
+}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrEquipMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrEquipMapper.java
deleted file mode 100644
index ce90332..0000000
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrEquipMapper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.dy.pmsGlobal.daoPr;
-
-import com.dy.pmsGlobal.pojoPr.PrEquip;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
-* @author 灏忔槑
-* @description 閽堝琛ㄣ�恜r_equip(璁惧琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-05-29 15:53:10
-* @Entity com.dy.pmsGlobal.pojoPr.PrEquip
-*/
-@Mapper
-public interface PrEquipMapper {
-
- int deleteByPrimaryKey(Long id);
-
- int insert(PrEquip record);
-
- int insertSelective(PrEquip record);
-
- PrEquip selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(PrEquip record);
-
- int updateByPrimaryKey(PrEquip record);
-
- Long selectSomeCount(Map<String,Object> params);
-
- List<PrEquip> selectSome(Map<String,Object> params);
-
- int insertBatch(List<PrEquip> list);
-
- List<PrEquip> selectByBatchId(Long batchId);
-
- void deleteByBatchId(Long batchId);
-
-}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrEquip.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrDevice.java
similarity index 86%
rename from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrEquip.java
rename to pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrDevice.java
index 56b48b9..8495254 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrEquip.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrDevice.java
@@ -10,15 +10,15 @@
/**
* 璁惧琛�
- * @TableName pr_equip
+ * @TableName pr_device
*/
-@TableName(value="pr_equip", autoResultMap = true)
+@TableName(value="pr_device", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
-public class PrEquip implements BaseEntity {
+public class PrDevice implements BaseEntity {
/**
*
*/
@@ -41,7 +41,7 @@
/**
* 璁惧鐮�
*/
- public String equipNo;
+ public String deviceNo;
@TableField(exist = false)
public String qrCode;
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrEquipMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrDeviceMapper.xml
similarity index 78%
rename from pms-parent/pms-global/src/main/resources/mapper/PrEquipMapper.xml
rename to pms-parent/pms-global/src/main/resources/mapper/PrDeviceMapper.xml
index 64bca34..581d229 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrEquipMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrDeviceMapper.xml
@@ -2,75 +2,75 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pmsGlobal.daoPr.PrEquipMapper">
+<mapper namespace="com.dy.pmsGlobal.daoPr.PrDeviceMapper">
- <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoPr.PrEquip">
+ <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoPr.PrDevice">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="proId" column="pro_id" jdbcType="BIGINT"/>
<result property="batchId" column="batch_id" jdbcType="BIGINT"/>
- <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
+ <result property="deviceNo" column="device_no" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="TINYINT"/>
</resultMap>
<sql id="Base_Column_List">
id,pro_id,batch_id,
- equip_no,status
+ device_no,status
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from pr_equip
+ from pr_device
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from pr_equip
+ delete from pr_device
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByBatchId">
- delete from pr_equip
+ delete from pr_device
where batch_id = #{batchId,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrEquip" useGeneratedKeys="true">
- insert into pr_equip
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice" useGeneratedKeys="true">
+ insert into pr_device
( id,pro_id,batch_id
- ,equip_no,status)
+ ,device_no,status)
values (#{id,jdbcType=BIGINT},#{proId,jdbcType=BIGINT},#{batchId,jdbcType=BIGINT}
- ,#{equipNo,jdbcType=BIGINT},#{status,jdbcType=TINYINT})
+ ,#{deviceNo,jdbcType=BIGINT},#{status,jdbcType=TINYINT})
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrEquip" useGeneratedKeys="true">
- insert into pr_equip
+ <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice" useGeneratedKeys="true">
+ insert into pr_device
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="proId != null">pro_id,</if>
<if test="batchId != null">batch_id,</if>
- <if test="equipNo != null">equip_no,</if>
+ <if test="deviceNo != null">device_no,</if>
<if test="status != null">status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="proId != null">#{proId,jdbcType=BIGINT},</if>
<if test="batchId != null">#{batchId,jdbcType=BIGINT},</if>
- <if test="equipNo != null">#{equipNo,jdbcType=BIGINT},</if>
+ <if test="deviceNo != null">#{deviceNo</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
</trim>
</insert>
<insert id="insertBatch" parameterType="java.util.List">
- insert into pr_equip
- ( id,pro_id,batch_id,equip_no,status) values
+ insert into pr_device
+ ( id,pro_id,batch_id,device_no,status) values
<foreach collection="list" item="item" separator=",">
(
#{item.id,jdbcType=BIGINT},
#{item.proId,jdbcType=BIGINT},
#{item.batchId,jdbcType=BIGINT},
- #{item.equipNo,jdbcType=BIGINT},
+ #{item.deviceNo,jdbcType=BIGINT},
#{item.status,jdbcType=TINYINT}
)
</foreach>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrEquip">
- update pr_equip
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice">
+ update pr_device
<set>
<if test="proId != null">
pro_id = #{proId,jdbcType=BIGINT},
@@ -78,8 +78,8 @@
<if test="batchId != null">
batch_id = #{batchId,jdbcType=BIGINT},
</if>
- <if test="equipNo != null">
- equip_no = #{equipNo,jdbcType=BIGINT},
+ <if test="deviceNo != null">
+ device_no = #{deviceNo
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT},
@@ -87,12 +87,12 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoPr.PrEquip">
- update pr_equip
+ <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice">
+ update pr_device
set
pro_id = #{proId,jdbcType=BIGINT},
batch_id = #{batchId,jdbcType=BIGINT},
- equip_no = #{equipNo,jdbcType=BIGINT},
+ device_no = #{deviceNo
status = #{status,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
@@ -100,7 +100,7 @@
<select id="selectSome" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from pr_equip
+ from pr_device
<trim prefix="where" suffixOverrides="and">
<if test="id != null">
id = #{id,jdbcType=BIGINT} and
@@ -111,8 +111,8 @@
<if test="batchId != null">
batch_id = #{batchId,jdbcType=BIGINT} and
</if>
- <if test="equipNo != null">
- equip_no = #{equipNo,jdbcType=BIGINT} and
+ <if test="deviceNo != null">
+ device_no = #{deviceNo,jdbcType=BIGINT} and
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT} and
@@ -128,7 +128,7 @@
<select id="selectSomeCount" resultType="java.lang.Long">
select count(1)
- from pr_equip
+ from pr_device
<trim prefix="where" suffixOverrides="and">
<if test="id != null">
id = #{id,jdbcType=BIGINT} and
@@ -139,18 +139,18 @@
<if test="batchId != null">
batch_id = #{batchId,jdbcType=BIGINT} and
</if>
- <if test="equipNo != null">
- equip_no = #{equipNo,jdbcType=BIGINT} and
+ <if test="deviceNo != null">
+ device_no = #{deviceNo,jdbcType=BIGINT} and
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT} and
</if>
</trim>
</select>
- <select id="selectByBatchId" resultType="com.dy.pmsGlobal.pojoPr.PrEquip">
+ <select id="selectByBatchId" resultType="com.dy.pmsGlobal.pojoPr.PrDevice">
select
<include refid="Base_Column_List" />
- from pr_equip
+ from pr_device
where batch_id = #{batchId,jdbcType=BIGINT}
</select>
</mapper>
--
Gitblit v1.8.0