From 22fee1efabe983c7c9ea9d3ee627e2a4319c0fc5 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 04 十二月 2023 15:30:06 +0800
Subject: [PATCH] *Mapper.java和*Mapper.xml中的insert方法改名为putin，哪果不改运行时会产生警告，警告insert已经加载过了，实际是MyBattisPlus的默认实现BaseMapper.java中已经存有instert方法
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/resource/rtuLog/RtuLogManager.java | 3 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java | 4 +-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoUserMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java | 2 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java | 2 +
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoUserMapper.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientTypeMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoRoleMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserRoleMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 2
32 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java
index 8e4a570..6316a23 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java
@@ -47,7 +47,7 @@
* @param record the record
* @return insert count
*/
- int insert(BaBlock record);
+ int putin(BaBlock record);
/**
* insert record to table selective
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientMapper.java
index 4291e92..5ce36ec 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientMapper.java
@@ -44,7 +44,7 @@
* @param record the record
* @return insert count
*/
- int insert(BaClient record);
+ int putin(BaClient record);
/**
* insert record to table selective
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientTypeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientTypeMapper.java
index 2847f2e..9b273d3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientTypeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientTypeMapper.java
@@ -49,7 +49,7 @@
* @param record the record
* @return insert count
*/
- int insert(BaClientType record);
+ int putin(BaClientType record);
/**
* insert record to table selective
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java
index abfb214..8916527 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java
@@ -35,7 +35,7 @@
* @param record the record
* @return insert count
*/
- int insert(BaDistrict record);
+ int putin(BaDistrict record);
/**
* insert record to table selective
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java
index 493b892..dc5bad0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java
@@ -41,7 +41,7 @@
* @param record the record
* @return insert count
*/
- int insert(BaDivide record);
+ int putin(BaDivide record);
/**
* insert record to table selective
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
index 240b513..9c9cca4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
@@ -33,7 +33,7 @@
* @param record the record
* @return insert count
*/
- int insert(BaPrivilege record);
+ int putin(BaPrivilege record);
/**
* insert record to table selective
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java
index 9f67df6..9d07534 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java
@@ -45,7 +45,7 @@
* @param record the record
* @return insert count
*/
- int insert(BaRole record);
+ int putin(BaRole record);
/**
* insert record to table selective
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java
index bc9cd3b..ea41c94 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java
@@ -13,7 +13,7 @@
* @param record the record
* @return insert count
*/
- int insert(BaRolePrivilege record);
+ int putin(BaRolePrivilege record);
/**
* insert record to table selective
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
index a3b347a..cef278f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
@@ -40,7 +40,7 @@
* @param record the record
* @return insert count
*/
- int insert(BaUser record);
+ int putin(BaUser record);
/**
* insert record to table selective
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserRoleMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserRoleMapper.java
index 8ad2404..d5ee293 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserRoleMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserRoleMapper.java
@@ -13,7 +13,7 @@
* @param record the record
* @return insert count
*/
- int insert(BaUserRole record);
+ int putin(BaUserRole record);
/**
* insert record to table selective
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoRoleMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoRoleMapper.java
index 2610121..c5f9b2c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoRoleMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoRoleMapper.java
@@ -23,7 +23,7 @@
* @param record the record
* @return insert count
*/
- int insert(DemoRole record);
+ int putin(DemoRole record);
/**
* insert record to table selective
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoUserMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoUserMapper.java
index 176c82f..c8d0e74 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoUserMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoUserMapper.java
@@ -11,7 +11,7 @@
@Mapper
public interface DemoUserMapper extends BaseMapper<DemoUser> {
- int insert(DemoUser user) ;
+ int putin(DemoUser user) ;
DemoUser selectById1(@Param("id") Long id);
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
index c3cf336..ccf3c1a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
@@ -2,7 +2,9 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import lombok.*;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
index 7d58afd..f8f9dbc 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
@@ -2,7 +2,9 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import lombok.*;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
index 9398b38..0d21824 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
@@ -81,7 +81,7 @@
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
<!--@mbg.generated-->
insert into ba_block (id, `name`, `header`, phone, area, color, remark, deleted)
values (#{id,jdbcType=BIGINT},
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
index 7af8c7e..bb53f2c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -120,7 +120,7 @@
</if>
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClient">
<!--@mbg.generated-->
insert into ba_client (id, countyId, townId, villageId, blockId, divideId,
typeId, `name`, num, phone,
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
index b97da7e..195831a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml
@@ -60,7 +60,7 @@
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClientType">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaClientType">
<!--@mbg.generated-->
insert into ba_client_type (id, `name`)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR})
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
index 52cab3f..4234af5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
@@ -41,7 +41,7 @@
where deleted != 1 and supperId = #{supperId,jdbcType=BIGINT}
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDistrict">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDistrict">
<!--@mbg.generated-->
insert into ba_district (id, supperId, `name`, num, `level`, deleted)
values (#{id,jdbcType=BIGINT},
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
index a59feb6..b0c2a9c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
@@ -101,7 +101,7 @@
</if>
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
<!--@mbg.generated-->
insert into ba_divide (id, `name`, countyId,
townId, villageId, blockId,
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
index 3fcaf3b..6af6bd3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
@@ -43,7 +43,7 @@
</if>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
<!--@mbg.generated-->
insert into ba_privilege (<include refid="Base_Column_List" />)
values (#{id,jdbcType=BIGINT},
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
index 14923bd..a18ba5d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -70,7 +70,7 @@
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRole">
insert into ba_role (<include refid="Base_Column_List" />)
values (#{id,jdbcType=BIGINT},
#{name,jdbcType=VARCHAR},
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml
index 2ab0a18..b90a5e9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml
@@ -14,7 +14,7 @@
roleId, privilegeId
</sql>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege">
<!--@mbg.generated-->
insert into ba_role_privilege (roleId, privilegeId)
values (#{roleId,jdbcType=BIGINT}, #{privilegeId,jdbcType=BIGINT})
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
index 60ab981..e2c99bc 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -90,7 +90,7 @@
</if>
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
insert into ba_user (<include refid="Base_Column_List" />)
values (#{id,jdbcType=BIGINT},
#{name,jdbcType=VARCHAR},
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml
index 5b84062..ccdf6ef 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml
@@ -14,7 +14,7 @@
userId, roleId
</sql>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUserRole">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUserRole">
<!--@mbg.generated-->
insert into ba_user_role (userId, roleId)
values (#{userId,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT})
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml
index 3bb647f..9a5e14d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml
@@ -29,7 +29,7 @@
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole">
<!--@mbg.generated-->
insert into demo_role (id, `name`, deleted
)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoUserMapper.xml
index 72563af..13b5d2a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoUserMapper.xml
@@ -92,7 +92,7 @@
</select>
<!--瀵瑰簲mapper鎺ュ彛鏂规硶public void insert(DemoUser user);-->
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoUser">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoUser">
insert into
demo_user (id, name, password, roleId, disabled, deleted)
values (#{id},#{name},#{password},#{roleId},
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/resource/rtuLog/RtuLogManager.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/resource/rtuLog/RtuLogManager.java
index 60704e6..63287c0 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/resource/rtuLog/RtuLogManager.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/resource/rtuLog/RtuLogManager.java
@@ -26,6 +26,7 @@
private static final Integer maxNodeAddWorkThread = 500 ;//缂撳瓨杈惧埌杩欎釜鏁伴噺锛屽皢澧炲姞绾跨▼
private static final Integer maxWorkThread = 5 ;//鏈�澶у伐浣滅嚎绋嬫暟
+ private static final Object maxWorkThreadSynObj = new Object() ;//鏈�澶у伐浣滅嚎绋嬫暟
private static int workThread = 0 ;//宸ヤ綔绾跨▼鏁�
private RtuLogManager(){
@@ -83,7 +84,7 @@
if(RtuLogManager.logQueue.size() > maxNodeAddWorkThread){
if(workThread < maxWorkThread){
- synchronized(maxWorkThread){
+ synchronized(maxWorkThreadSynObj){
if(workThread < maxWorkThread){
startWorkThread() ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
index 6e09240..cd9577e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
@@ -68,7 +68,7 @@
*/
@Transactional
public int save(BaBlock po){
- return this.dao.insert(po) ;
+ return this.dao.putin(po) ;
}
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java
index 32dd927..73c23fc 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java
@@ -54,7 +54,7 @@
*/
@Transactional
public int save(BaDistrict po){
- return this.dao.insert(po) ;
+ return this.dao.putin(po) ;
}
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java
index 3ffed6f..d67b381 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java
@@ -80,7 +80,7 @@
*/
@Transactional
public int save(BaRole po){
- return this.dao.insert(po) ;
+ return this.dao.putin(po) ;
}
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
index eb95297..ed562ae 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
@@ -68,7 +68,7 @@
*/
@Transactional
public int save(BaUser po){
- return this.dao.insert(po) ;
+ return this.dao.putin(po) ;
}
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
index d61e5f6..713f350 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
@@ -170,7 +170,7 @@
po.num = num ;
po.level = DistrictLevel.get(level.byteValue()) ;
po.deleted = Deleted.NO ;
- this.distriDao.insert(po) ;
+ this.distriDao.putin(po) ;
return po.getId() ;
}else{
return null ;
@@ -198,7 +198,7 @@
po.supperAdmin = supperAdmin.byteValue() ;
po.disabled = Disabled.NO ;
po.deleted = Deleted.NO ;
- this.userDao.insert(po) ;
+ this.userDao.putin(po) ;
}
}
--
Gitblit v1.8.0