*Mapper.java和*Mapper.xml中的insert方法改名为putin,哪果不改运行时会产生警告,警告insert已经加载过了,实际是MyBattisPlus的默认实现BaseMapper.java中已经存有instert方法
32个文件已修改
67 ■■■■ 已修改文件
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaClientTypeMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDivideMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserRoleMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoRoleMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoUserMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientTypeMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoRoleMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/DemoUserMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/resource/rtuLog/RtuLogManager.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
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
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
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
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
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
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
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
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
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
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
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);
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.*;
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.*;
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},
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,
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})
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},
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, 
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},
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},
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})
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},
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})
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
      )
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},
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() ;
                                    }
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) ;
    }
    /**
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) ;
    }
    /**
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) ;
    }
    /**
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) ;
    }
    /**
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) ;
        }
    }