feat: 增加适配oceanbase分支

service-base/pom.xml

@@ -258,7 +258,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>com.oceanbase</groupId>
+            <artifactId>oceanbase-client</artifactId>
+            <version>2.4.9</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>

service-base/src/main/resources/mapper/AssetMapper.xml

@@ -15,7 +15,7 @@
     </resultMap>
 
     <insert id="batchInsert" parameterType="com.simuwang.base.pojo.dos.AssetDO">
-        insert into PPW_EMAIL.asset(fund_id,price_date,asset_net,asset_share,
+        insert into asset(fund_id,price_date,asset_net,asset_share,
                                               isvalid, creatorid, createtime, updaterid, updatetime)
         values
         <foreach collection="itemDoList" item="itemDo" index="index" separator=",">
@@ -26,7 +26,7 @@
 
     <insert id="batchUpdate">
         <foreach collection="itemDoList" item="itemDo" index="index" open="" close="" separator=";">
-            update PPW_EMAIL.asset
+            update asset
             <set>
                 asset_net = #{itemDo.assetNet},
                 asset_share = #{itemDo.assetShare},
@@ -38,10 +38,10 @@
         </foreach>
     </insert>
     <delete id="deleteAsset">
-        update PPW_EMAIL.asset set isvalid=0,updatetime=sysdate(),updaterid=#{updaterId}  where fund_id=#{fundId} and price_date=#{priceDate}
+        update asset set isvalid=0,updatetime=now(),updaterid=#{updaterId}  where fund_id=#{fundId} and price_date=#{priceDate}
     </delete>
     <delete id="batchDeleteAsset">
-        update PPW_EMAIL.asset set isvalid=0,updatetime=sysdate() where fund_id=#{fundId}
+        update asset set isvalid=0,updatetime=now() where fund_id=#{fundId}
         and price_date in
         <foreach collection="priceDateList" index="index" item="priceDate" separator="," open="(" close=")">
             #{priceDate}
@@ -50,7 +50,7 @@
 
     <select id="queryFundNavByDate" resultType="java.lang.String">
         select price_date
-        from PPW_EMAIL.asset
+        from asset
         where isvalid = 1
         and fund_id = #{fundId}
         and price_date in
@@ -62,15 +62,15 @@
             parameterType="com.simuwang.base.pojo.dos.AssetDO">
         select id,fund_id,price_date,asset_net,asset_share,
                isvalid, creatorid, createtime, updaterid, updatetime
-        from PPW_EMAIL.asset where isvalid=1 and fund_id=#{fundId} and price_date=#{priceDate}
+        from asset where isvalid=1 and fund_id=#{fundId} and price_date=#{priceDate}
     </select>
     <select id="selectAssetByFundId" resultMap="BaseResultMap">
         select id,fund_id,price_date,asset_net,asset_share,
                isvalid, creatorid, createtime, updaterid, updatetime
-        from PPW_EMAIL.asset where isvalid=1 and fund_id=#{fundId}
+        from asset where isvalid=1 and fund_id=#{fundId}
     </select>
     <select id="countAssetTotal" resultType="java.lang.Long">
-        select count(1) from PPW_EMAIL.asset where isvalid=1
+        select count(1) from asset where isvalid=1
     </select>
 
 </mapper>

service-base/src/main/resources/mapper/CompanyEmailConfigMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.simuwang.base.mapper.CompanyEmailConfigMapper">
     <insert id="saveCompanyEmailConfig">
-        insert into PPW_EMAIL.company_email_config(
+        insert into company_email_config(
         <if test="companyId != null and companyId != ''">company_id,</if>
         <if test="companyName != null and companyName != ''">company_name,</if>
         <if test="email != null and email != ''">email,</if>
@@ -22,13 +22,13 @@
         <if test="creatorId != null and creatorId != ''">#{creatorId},</if>
         <if test="updaterId != null and updaterId != ''">#{updaterId},</if>
         1,
-        sysdate(),
-        sysdate()
+        now(),
+        now()
         )
     </insert>
 
     <update id="updateCompanyEmailConfig">
-        update PPW_EMAIL.company_email_config
+        update company_email_config
         <set>
             <if test="companyId != null and companyId != ''">company_id=#{companyId},</if>
             <if test="companyName != null and companyName != ''">company_name=#{companyName},</if>
@@ -42,7 +42,7 @@
     </update>
 
     <update id="deleteCompanyEmailConfig">
-        update PPW_EMAIL.company_email_config set isvalid =0,updatetime=sysdate(),updaterid=#{updaterId} where id=#{id}
+        update company_email_config set isvalid =0,updatetime=now(),updaterid=#{updaterId} where id=#{id}
     </update>
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.CompanyEmailConfigDO">
         <id column="id" property="id"/>
@@ -59,7 +59,7 @@
     </resultMap>
     <sql id="selectCompanyEmailConfigDo">
         select id,company_id, company_name, email, open_status,remark, creatorid, createtime, updaterid, updatetime,isvalid
-        from PPW_EMAIL.company_email_config
+        from company_email_config
     </sql>
     <!-- 查询条件 -->
     <sql id="sqlwhereSearch">
@@ -75,7 +75,7 @@
         <include refid="sqlwhereSearch"/>
     </select>
     <select id="searchEmailByCompanyId" resultType="java.lang.String" parameterType="java.lang.String">
-        select email from PPW_EMAIL.company_email_config where company_id = #{companyId} and isvalid =1
+        select email from company_email_config where company_id = #{companyId} and isvalid =1
     </select>
 
     <resultMap id="BaseVOMap" type="com.simuwang.base.pojo.vo.CompanyEmailConfigVO">
@@ -88,27 +88,27 @@
     </resultMap>
     <select id="searchEmailConfig" resultMap="BaseVOMap">
         select id,company_id,company_name,email,open_status,remark from
-         PPW_EMAIL.company_email_config where isvalid =1 and company_id=#{companyId}
+         company_email_config where isvalid =1 and company_id=#{companyId}
         limit #{offset},#{pageSize}
     </select>
     <select id="countEmailConfig" resultType="java.lang.Long" parameterType="java.lang.String">
-        select count(1) from PPW_EMAIL.company_email_config where isvalid =1 and company_id=#{companyId}
+        select count(1) from company_email_config where isvalid =1 and company_id=#{companyId}
     </select>
     <select id="searchEmailConfigByCompanyId" resultMap="BaseVOMap">
         select id,company_id,company_name,email,open_status,remark from
-            PPW_EMAIL.company_email_config where isvalid =1 and company_id=#{companyId}
+            company_email_config where isvalid =1 and company_id=#{companyId}
     </select>
     <select id="selectEmailConfig"  resultMap="BaseResultMap">
         select id,company_id,company_name,email,open_status,remark from
-            PPW_EMAIL.company_email_config where isvalid =1 and company_id=#{companyId} and email=#{email} limit 1
+            company_email_config where isvalid =1 and company_id=#{companyId} and email=#{email} limit 1
     </select>
     <select id="getAllCompanyConfig" resultMap="BaseResultMap">
         select id,company_id,company_name,email,open_status,remark from
-            PPW_EMAIL.company_email_config where isvalid =1 and open_status=1
+            company_email_config where isvalid =1 and open_status=1
     </select>
     <select id="selectCompanyEmailConfigByIdList" resultMap="BaseResultMap">
         select id,company_id,company_name,email,open_status,remark from
-            PPW_EMAIL.company_email_config where isvalid =1 and open_status=1
+            company_email_config where isvalid =1 and open_status=1
         and id in
         <foreach item="id" collection="idList" open="(" separator="," close=")">
             #{id}

service-base/src/main/resources/mapper/CompanyEmailHistoryMapper.xml

@@ -17,17 +17,17 @@
     </resultMap>
     <insert id="saveCompanyEmailSendHistory"
             parameterType="com.simuwang.base.pojo.dos.CompanyEmailSendHistoryDO">
-        insert into PPW_EMAIL.company_email_send_history(company_id,email,send_status,send_time,send_remark,isvalid,createtime,updatetime,creatorid,updaterid)
+        insert into company_email_send_history(company_id,email,send_status,send_time,send_remark,isvalid,createtime,updatetime,creatorid,updaterid)
         values (#{companyId},#{email},#{sendStatus},#{sendTime},#{sendRemark},#{isvalid},#{createTime},#{updateTime},#{creatorId},#{updaterId})
     </insert>
     <update id="deleteEmailHistory">
-        update PPW_EMAIL.company_email_send_history set isvalid =0,updatetime=sysdate() where email in
+        update company_email_send_history set isvalid =0,updatetime=now() where email in
         <foreach item="email" collection="emailList" open="(" separator="," close=")">
             #{email}
         </foreach>
     </update>
     <update id="deleteEmailHistoryByIds">
-        update PPW_EMAIL.company_email_send_history set isvalid =0,updatetime=sysdate(),updaterid=#{userId} where id in
+        update company_email_send_history set isvalid =0,updatetime=now(),updaterid=#{userId} where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -43,8 +43,8 @@
             maxce.send_remark,
             ifnull(maxce.send_status,-1) as send_status
         FROM
-        PPW_EMAIL.company_email_config cec
-        JOIN PPW_EMAIL.pvn_company_info c
+        company_email_config cec
+        JOIN pvn_company_info c
         ON cec.company_id = c.company_id
         LEFT JOIN
         (SELECT
@@ -54,8 +54,8 @@
         me.send_remark,
         me.send_status
         FROM
-        PPW_EMAIL.company_email_send_history me
-        join (select mx.company_id,mx.email,max(mx.send_time) as max_send_time from PPW_EMAIL.company_email_send_history mx where mx.isvalid=1
+        company_email_send_history me
+        join (select mx.company_id,mx.email,max(mx.send_time) as max_send_time from company_email_send_history mx where mx.isvalid=1
         GROUP BY mx.email,
         mx.company_id) as mx on me.email=mx.email and me.company_id=mx.company_id and me.send_time=mx.max_send_time
         WHERE me.isvalid = 1) maxce
@@ -87,8 +87,8 @@
         SELECT
         count(cec.company_id)
         from
-        PPW_EMAIL.company_email_config cec
-        JOIN PPW_EMAIL.pvn_company_info c
+        company_email_config cec
+        JOIN pvn_company_info c
         ON cec.company_id = c.company_id
         LEFT JOIN
         (SELECT
@@ -98,8 +98,8 @@
         me.send_remark,
         me.send_status
         FROM
-        PPW_EMAIL.company_email_send_history me
-        join (select mx.company_id,mx.email,max(mx.send_time) as max_send_time from PPW_EMAIL.company_email_send_history mx where mx.isvalid=1
+        company_email_send_history me
+        join (select mx.company_id,mx.email,max(mx.send_time) as max_send_time from company_email_send_history mx where mx.isvalid=1
         GROUP BY mx.email,
         mx.company_id) as mx on me.email=mx.email and me.company_id=mx.company_id and me.send_time=mx.max_send_time
         WHERE me.isvalid = 1) maxce
@@ -129,10 +129,10 @@
             cesh.send_remark,
             cesh.send_status
         FROM
-            PPW_EMAIL.company_email_send_history cesh
-            JOIN PPW_EMAIL.company_email_config cec
+            company_email_send_history cesh
+            JOIN company_email_config cec
                 ON cec.email = cesh.email and cesh.company_id=cec.company_id
-            JOIN PPW_EMAIL.pvn_company_info c
+            JOIN pvn_company_info c
             ON cesh.company_id = c.company_id
         WHERE cec.isvalid = 1
         AND cesh.isvalid = 1 and c.isvalid =1
@@ -153,10 +153,10 @@
         SELECT
         count(distinct cesh.id)
         FROM
-        PPW_EMAIL.company_email_send_history cesh
-        JOIN PPW_EMAIL.company_email_config cec
+        company_email_send_history cesh
+        JOIN company_email_config cec
         ON cec.email = cesh.email and cesh.company_id=cec.company_id
-        JOIN PPW_EMAIL.pvn_company_info c
+        JOIN pvn_company_info c
         ON cesh.company_id = c.company_id
         WHERE cec.isvalid = 1
         AND cesh.isvalid = 1 and c.isvalid =1

service-base/src/main/resources/mapper/CompanyInformationMapper.xml

@@ -44,20 +44,20 @@
         select c.company_id as `companyId`,
         c.company_name as `companyName`,
         c.register_number as `registerNumber`
-        from PPW_EMAIL.pvn_company_info c where c.isvalid =1
+        from pvn_company_info c where c.isvalid =1
         <if test="keyword != null and keyword !=''">
             and (c.company_name like concat('%',#{keyword},'%') or c.company_short_name like concat('%',#{keyword},'%') or c.register_number like concat('%',#{keyword},'%'))
         </if>
         limit 100
     </select>
     <select id="getCompanyNameByFundId" resultType="java.lang.String" parameterType="java.lang.String">
-        select distinct company_name from PPW_EMAIL.pvn_company_info c join PPW_EMAIL.pvn_fund_info f
+        select distinct company_name from pvn_company_info c join pvn_fund_info f
         on f.trust_id = c.company_id
         where c.isvalid=1 and f.isvalid=1
         and f.fund_id=#{fundId}
     </select>
     <select id="countCompanyTotal" resultType="java.lang.Long">
-        select count(1) from PPW_EMAIL.pvn_company_info where isvalid=1
+        select count(1) from pvn_company_info where isvalid=1
     </select>
 
 </mapper>

service-base/src/main/resources/mapper/DeletionInfoMapper.xml

@@ -18,36 +18,36 @@
         <result column="is_send" property="isSend"/>
     </resultMap>
     <insert id="saveDeletionInfoDO" parameterType="com.simuwang.base.pojo.dos.DeletionInfoDO">
-        insert into PPW_EMAIL.deletion_info(fund_id,deletion_type,deletion_date,isvalid,createtime,updatetime,is_send)
+        insert into deletion_info(fund_id,deletion_type,deletion_date,isvalid,createtime,updatetime,is_send)
         values (#{fundId},#{deletionType},#{deletionDate},#{isvalid},#{createTime},#{updateTime},#{isSend})
     </insert>
     <insert id="batchSaveDeletionInfoDO">
-        insert into PPW_EMAIL.deletion_info(fund_id,deletion_type,deletion_date,isvalid,createtime,updatetime,is_send)
+        insert into deletion_info(fund_id,deletion_type,deletion_date,isvalid,createtime,updatetime,is_send)
         values
         <foreach collection="itemDoList" item="itemDo" index="index" separator=",">
             (#{itemDo.fundId},#{itemDo.deletionType},#{itemDo.deletionDate},#{itemDo.isvalid},#{itemDo.createTime},#{itemDo.updateTime},#{itemDo.isSend})
         </foreach>
     </insert>
     <update id="update" parameterType="com.simuwang.base.pojo.dos.FundDeletionInfoDO">
-        update PPW_EMAIL.deletion_info set fund_id=#{fundId},deletion_type=#{deletionType},deletion_date=#{deletionDate},remark=#{remark},updatetime=#{updateTime}
+        update deletion_info set fund_id=#{fundId},deletion_type=#{deletionType},deletion_date=#{deletionDate},remark=#{remark},updatetime=#{updateTime}
         where id=#{id} and isvalid=1
     </update>
     <update id="batchUpdate">
         <foreach collection="itemDoList" item="itemDo" index="index" open="" close="" separator=";">
-            update PPW_EMAIL.deletion_info
+            update deletion_info
             <set>
                 fund_id=#{itemDo.fundId},
                 deletion_type = #{itemDo.deletionType},
                 deletion_date=#{itemDo.deletionDate},
                 remark=#{itemDo.remark},
-                updatetime=sysdate(),
+                updatetime=now(),
                 updaterid=#{itemDo.updaterId}
             </set>
             where isvalid = 1 and id=#{itemDo.id}
         </foreach>
     </update>
     <update id="updateRemark">
-        update PPW_EMAIL.deletion_info set remark=#{remark},updaterid=#{updaterId} where isvalid=1 and remark is null
+        update deletion_info set remark=#{remark},updaterid=#{updaterId} where isvalid=1 and remark is null
         <if test="fundId != null and fundId !=''">
             and fund_id=#{fundId}
         </if>
@@ -59,14 +59,14 @@
         </if>
     </update>
     <delete id="deleteDeletionRemark">
-        update PPW_EMAIL.deletion_info  set isvalid=0,updatetime=sysdate() where isvalid=1 and fund_id=#{fundId} and deletion_type=#{deletionType}
+        update deletion_info  set isvalid=0,updatetime=now() where isvalid=1 and fund_id=#{fundId} and deletion_type=#{deletionType}
         and deletion_date in
         <foreach item="tradeDate" collection="list" open="(" separator="," close=")">
             #{tradeDate}
         </foreach>
     </delete>
     <delete id="deleteDeletion">
-        update PPW_EMAIL.deletion_info  set isvalid=0,updatetime=sysdate() where isvalid=1 and fund_id=#{fundId} and deletion_type=#{deletionType} and remark is null
+        update deletion_info  set isvalid=0,updatetime=now() where isvalid=1 and fund_id=#{fundId} and deletion_type=#{deletionType} and remark is null
     </delete>
     <select id="searchDeletionList" resultMap="BaseResultMap"
             parameterType="com.simuwang.base.pojo.dto.query.DeletionPageQuery">
@@ -79,11 +79,11 @@
         ddp.processed_num,
         d.last_deletion_date
         FROM
-        (select de.fund_id,de.deletion_type,max(de.deletion_date) as last_deletion_date from PPW_EMAIL.deletion_info de where de.isvalid=1
+        (select de.fund_id,de.deletion_type,max(de.deletion_date) as last_deletion_date from deletion_info de where de.isvalid=1
         group by de.fund_id,de.deletion_type) d
-        LEFT JOIN PPW_EMAIL.pvn_fund_info info
+        LEFT JOIN pvn_fund_info info
         ON d.fund_id = info.fund_id and info.isvalid=1
-        LEFT JOIN PPW_EMAIL.pvn_company_info c
+        LEFT JOIN pvn_company_info c
         ON info.trust_id = c.company_id and c.isvalid=1
         LEFT JOIN
         (SELECT
@@ -91,7 +91,7 @@
         di.deletion_type,
         COUNT(di.fund_id) AS deletion_num
         FROM
-        PPW_EMAIL.deletion_info di
+        deletion_info di
         WHERE di.isvalid = 1
         AND di.remark IS NULL
         GROUP BY di.fund_id,
@@ -104,7 +104,7 @@
         dip.deletion_type,
         COUNT(dip.fund_id) AS processed_num
         FROM
-        PPW_EMAIL.deletion_info dip
+        deletion_info dip
         WHERE dip.isvalid = 1
         AND dip.remark IS NOT NULL
         GROUP BY dip.fund_id,
@@ -147,11 +147,11 @@
         ddn.deletion_num,
         ddp.processed_num
         FROM
-        (select de.fund_id,de.deletion_type,max(de.deletion_date) as last_deletion_date from PPW_EMAIL.deletion_info de where de.isvalid=1
+        (select de.fund_id,de.deletion_type,max(de.deletion_date) as last_deletion_date from deletion_info de where de.isvalid=1
         group by de.fund_id,de.deletion_type) d
-        LEFT JOIN PPW_EMAIL.pvn_fund_info info
+        LEFT JOIN pvn_fund_info info
         ON d.fund_id = info.fund_id and info.isvalid=1
-        LEFT JOIN PPW_EMAIL.pvn_company_info c
+        LEFT JOIN pvn_company_info c
         ON info.trust_id = c.company_id and c.isvalid=1
         LEFT JOIN
         (SELECT
@@ -159,7 +159,7 @@
         di.deletion_type,
         COUNT(di.fund_id) AS deletion_num
         FROM
-        PPW_EMAIL.deletion_info di
+        deletion_info di
         WHERE di.isvalid = 1
         AND di.remark IS NULL
         GROUP BY di.fund_id,
@@ -172,7 +172,7 @@
         dip.deletion_type,
         COUNT(dip.fund_id) AS processed_num
         FROM
-        PPW_EMAIL.deletion_info dip
+        deletion_info dip
         WHERE dip.isvalid = 1
         AND dip.remark IS NOT NULL
         GROUP BY dip.fund_id,
@@ -197,7 +197,7 @@
         </if>) a
     </select>
     <select id="getLastDeletionDateByFundId" resultType="java.lang.String">
-        select max(deletion_date) from PPW_EMAIL.deletion_info where fund_id=#{fundId} and deletion_type=#{deletionType}
+        select max(deletion_date) from deletion_info where fund_id=#{fundId} and deletion_type=#{deletionType}
     </select>
 
     <resultMap id="BaseMap" type="com.simuwang.base.pojo.dos.FundDeletionInfoDO">
@@ -228,8 +228,8 @@
             d.createtime,
             d.updatetime
         FROM
-            PPW_EMAIL.deletion_info d
-        left join PPW_EMAIL.pvn_fund_info info
+            deletion_info d
+        left join pvn_fund_info info
         on d.fund_id =info.fund_id and info.isvalid=1
         WHERE d.isvalid = 1
           AND d.fund_id = #{fundId}
@@ -241,8 +241,8 @@
             parameterType="com.simuwang.base.pojo.dto.query.FundDeletionPageQuery">
         select count(d.id)
         FROM
-            PPW_EMAIL.deletion_info d
-                left join PPW_EMAIL.pvn_fund_info info
+            deletion_info d
+                left join pvn_fund_info info
                           on d.fund_id =info.fund_id and info.isvalid=1
         WHERE d.isvalid = 1
           AND d.fund_id = #{fundId}
@@ -252,7 +252,7 @@
     <select id="selectFundDeletionInfoVOList" resultType="com.simuwang.base.pojo.dos.FundDeletionInfoDO"
             parameterType="java.util.List">
         select id,fund_id,deletion_type,deletion_date,remark,isvalid,creatorid,updaterid,createtime,updatetime
-        from PPW_EMAIL.deletion_info where isvalid=1 and remark is null
+        from deletion_info where isvalid=1 and remark is null
         <if test="fundId != null and fundId !=''">
             and fund_id = #{fundId}
         </if>
@@ -264,7 +264,7 @@
     <select id="getDeletionInfoDO" resultType="com.simuwang.base.pojo.dos.DeletionInfoDO"
             parameterType="com.simuwang.base.pojo.dos.DeletionInfoDO">
         select id,fund_id,deletion_type,deletion_date,remark,isvalid,creatorid,updaterid,createtime,updatetime
-        from PPW_EMAIL.deletion_info where fund_id=#{fundId} and deletion_type=#{deletionType} and deletion_date in
+        from deletion_info where fund_id=#{fundId} and deletion_type=#{deletionType} and deletion_date in
         <foreach item="tradeDate" collection="list" open="(" separator="," close=")">
             #{tradeDate}
         </foreach>
@@ -278,9 +278,9 @@
     </resultMap>
     <select id="getDeletionInfoByFundId" resultType="com.simuwang.base.pojo.dos.EmailDeletionInfoDO">
             select info.fund_name,c.company_name,d.deletion_type,d.deletion_date
-            from PPW_EMAIL.deletion_info d
-            join PPW_EMAIL.pvn_fund_info info on d.fund_id=info.fund_id
-            join PPW_EMAIL.pvn_company_info c on c.company_id=info.trust_id
+            from deletion_info d
+            join pvn_fund_info info on d.fund_id=info.fund_id
+            join pvn_company_info c on c.company_id=info.trust_id
             where d.isvalid=1 and info.isvalid=1 and c.isvalid=1 and d.remark is null and d.is_send=0
             and d.fund_id in
             <foreach collection="fundIdList" index="index" item="fundId" separator="," open="(" close=")">
@@ -289,27 +289,27 @@
             order by info.fund_id desc,d.deletion_type desc,d.deletion_date desc
     </select>
     <update id="removeDistributeDeletion" parameterType="java.lang.String">
-        update PPW_EMAIL.deletion_info set isvalid=0,updatetime=sysdate() where fund_id=#{fundId} and remark is null
+        update deletion_info set isvalid=0,updatetime=now() where fund_id=#{fundId} and remark is null
     </update>
     <update id="updateSendStatusByFundId">
-        update PPW_EMAIL.deletion_info d set is_send=1,updatetime=sysdate() where isvalid=1
+        update deletion_info d set is_send=1,updatetime=now() where isvalid=1
         and d.fund_id in
         <foreach collection="fundIdList" index="index" item="fundId" separator="," open="(" close=")">
             #{fundId}
         </foreach>
     </update>
     <update id="updateDeletionInfoDO">
-        update PPW_EMAIL.deletion_info d set isvalid=1,updatetime=sysdate() where id=#{id}
+        update deletion_info d set isvalid=1,updatetime=now() where id=#{id}
     </update>
     <update id="batchUpdateDeletionInfoDO">
         <foreach collection="itemDoList" item="itemDo" index="index" open="" close="" separator=";">
-            update PPW_EMAIL.deletion_info
+            update deletion_info
             <set>
                 fund_id=#{itemDo.fundId},
                 deletion_type = #{itemDo.deletionType},
                 deletion_date=#{itemDo.deletionDate},
                 remark=#{itemDo.remark},
-                updatetime=sysdate(),
+                updatetime=now(),
                 isvalid=#{itemDo.isvalid},
                 updaterid=#{itemDo.updaterId}
             </set>
@@ -318,7 +318,7 @@
     </update>
     <update id="batchUpdateRemark">
         <foreach collection="itemDoList" item="itemDo" index="index" open="" close="" separator=";">
-            update PPW_EMAIL.deletion_info set remark=#{itemDo.remark},updaterid=#{itemDo.updaterId} where isvalid=1 and remark is null
+            update deletion_info set remark=#{itemDo.remark},updaterid=#{itemDo.updaterId} where isvalid=1 and remark is null
             <if test="itemDo.fundId != null and itemDo.fundId !=''">
                 and fund_id=#{itemDo.fundId}
             </if>

service-base/src/main/resources/mapper/DistributionMapper.xml

@@ -32,15 +32,15 @@
         <result column="updatetime" property="updateTime"/>
     </resultMap>
     <insert id="saveDistribution" parameterType="com.simuwang.base.pojo.dos.DistributionDO">
-        insert into PPW_EMAIL.distribution(fund_id,distribute_date,distribute_type,distribution,isvalid,creatorid,createtime,updatetime,updaterid)
+        insert into distribution(fund_id,distribute_date,distribute_type,distribution,isvalid,creatorid,createtime,updatetime,updaterid)
         values (#{fundId},#{distributeDate},#{distributeType},#{distribution},#{isvalid},#{creatorId},#{createTime},#{updateTime},#{updaterId})
     </insert>
     <update id="updateDistributionById" parameterType="com.simuwang.base.pojo.dos.DistributionDO">
-        update PPW_EMAIL.distribution set distribute_date=#{distributeDate},distribute_type=#{distributeType},distribution=#{distribution},updatetime=#{updateTime},updaterid=#{updaterId}
+        update distribution set distribute_date=#{distributeDate},distribute_type=#{distributeType},distribution=#{distribution},updatetime=#{updateTime},updaterid=#{updaterId}
         where id=#{id} and isvalid =1
     </update>
     <delete id="deleteDistribution" parameterType="com.simuwang.base.pojo.vo.IdListVO">
-        update PPW_EMAIL.distribution set isvalid =0,updatetime=sysdate(),updaterid=#{updaterId} where isvalid =1 and id in
+        update distribution set isvalid =0,updatetime=now(),updaterid=#{updaterId} where isvalid =1 and id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -64,12 +64,12 @@
             d.createtime,
             d.updatetime
         FROM
-            PPW_EMAIL.distribution d
-            JOIN PPW_EMAIL.pvn_fund_info info
+            distribution d
+            JOIN pvn_fund_info info
             ON d.fund_id = info.fund_id
-            left JOIN PPW_EMAIL.pvn_company_info c
+            left JOIN pvn_company_info c
             ON info.trust_id = c.company_id AND c.isvalid = 1
-            JOIN PPW_EMAIL.nav n
+            JOIN nav n
             ON n.fund_id = d.fund_id and d.distribute_date=n.price_date
             AND n.isvalid = 1
         WHERE d.isvalid = 1
@@ -103,12 +103,12 @@
             parameterType="com.simuwang.base.pojo.dto.query.DistributionPageQuery">
         select count(distinct d.id)
         FROM
-        PPW_EMAIL.distribution d
-        JOIN PPW_EMAIL.pvn_fund_info info
+        distribution d
+        JOIN pvn_fund_info info
         ON d.fund_id = info.fund_id
-        left JOIN PPW_EMAIL.pvn_company_info c
+        left JOIN pvn_company_info c
         ON info.trust_id = c.company_id AND c.isvalid = 1
-        JOIN PPW_EMAIL.nav n
+        JOIN nav n
         ON n.fund_id = d.fund_id and d.distribute_date=n.price_date
         WHERE d.isvalid = 1 AND info.isvalid = 1
         AND n.isvalid = 1
@@ -131,25 +131,25 @@
     <select id="selectDistributionById" resultMap="BaseMap"
             parameterType="java.lang.Integer">
         select id,fund_id,distribute_date,distribute_type,distribution,isvalid,creatorid,createtime,updatetime,updaterid
-        from PPW_EMAIL.distribution where isvalid =1 and id=#{id}
+        from distribution where isvalid =1 and id=#{id}
     </select>
     <select id="selectDistributionByDate" resultMap="BaseMap">
         select id,fund_id,distribute_date,distribute_type,distribution,isvalid,creatorid,createtime,updatetime,updaterid
-        from PPW_EMAIL.distribution where isvalid =1 and fund_id=#{fundId} and distribute_date=#{distributeDate}
+        from distribution where isvalid =1 and fund_id=#{fundId} and distribute_date=#{distributeDate}
     </select>
     <select id="getDistributionByFundId" resultMap="BaseMap">
         select id,fund_id,distribute_date,distribute_type,distribution,isvalid,creatorid,createtime,updatetime,updaterid
-        from PPW_EMAIL.distribution where isvalid =1 and fund_id=#{fundId} and distribute_type=#{distributeType}
+        from distribution where isvalid =1 and fund_id=#{fundId} and distribute_type=#{distributeType}
     </select>
     <select id="getSumDistributeByFundId" resultType="java.math.BigDecimal" parameterType="java.lang.String">
-        select sum(distribution) from PPW_EMAIL.distribution where isvalid =1 and fund_id=#{fundId} and distribute_date <![CDATA[ <= ]]> #{distributeDate}
+        select sum(distribution) from distribution where isvalid =1 and fund_id=#{fundId} and distribute_date <![CDATA[ <= ]]> #{distributeDate}
     </select>
     <select id="countDistributionTotal" resultType="java.lang.Long">
-        select count(1) from PPW_EMAIL.distribution where isvalid =1
+        select count(1) from distribution where isvalid =1
     </select>
     <select id="selectDistributeListByTime" resultMap="BaseMap">
         select id,fund_id,distribute_date,distribute_type,distribution,isvalid,creatorid,createtime,updatetime,updaterid
-        from PPW_EMAIL.distribution where updatetime <![CDATA[ <= ]]> #{endDate}
+        from distribution where updatetime <![CDATA[ <= ]]> #{endDate}
         <if test="startDate != null and startDate !=''">
             and updatetime >= #{startDate}
         </if>

service-base/src/main/resources/mapper/EmailFieldMappingMapper.xml

@@ -15,7 +15,7 @@
 
     <select id="getEmailFieldMapping" resultMap="BaseResultMap">
         select *
-        from PPW_EMAIL.email_field_mapping
+        from email_field_mapping
         where isvalid = 1
         <if test="type != null">
             and (TYPE = #{type} or TYPE = 0)

service-base/src/main/resources/mapper/EmailFileInfoMapper.xml

@@ -15,7 +15,7 @@
 
     <insert id="insert" parameterType="com.simuwang.base.pojo.dos.EmailFileInfoDO" useGeneratedKeys="true"
             keyProperty="id" keyColumn="id">
-        insert into PPW_EMAIL.email_file_info(email_id, file_name, file_path,
+        insert into email_file_info(email_id, file_name, file_path,
                                               isvalid, creatorid, createtime, updaterid, updatetime)
         values (#{itemDo.emailId}, #{itemDo.fileName}, #{itemDo.filePath},
                 #{itemDo.isvalid}, #{itemDo.creatorId}, #{itemDo.createTime}, #{itemDo.updaterId}, #{itemDo.updateTime})
@@ -25,19 +25,19 @@
             parameterType="java.lang.Integer">
         select id ,email_id, file_name, file_path,
                isvalid, creatorid, createtime, updaterid, updatetime
-        from PPW_EMAIL.email_file_info where id=#{id} and isvalid=1
+        from email_file_info where id=#{id} and isvalid=1
     </select>
 
     <select id="getEmailFileByEmailId" resultMap="BaseResultMap"
             parameterType="java.lang.Integer">
         select id ,email_id, file_name, file_path,
                isvalid, creatorid, createtime, updaterid, updatetime
-        from PPW_EMAIL.email_file_info where email_id=#{emailId} and isvalid=1
+        from email_file_info where email_id=#{emailId} and isvalid=1
     </select>
 
     <select id="queryByEmailId" resultMap="BaseResultMap">
         select id, file_name, file_path
-        from PPW_EMAIL.email_file_info
+        from email_file_info
         where email_id = #{emailId}
           and isvalid = 1
     </select>
@@ -55,18 +55,18 @@
             efi.file_path as "filePath",
             efi.createtime as "createTime"
         FROM
-            PPW_EMAIL.EMAIL_FILE_INFO efi
+            EMAIL_FILE_INFO efi
             <if test="fileType != 3">
-                JOIN PPW_EMAIL.EMAIL_FUND_NAV efn
+                JOIN EMAIL_FUND_NAV efn
                 ON efi.id = efn.file_id
             </if>
             <if test="fileType == 3">
-                JOIN PPW_EMAIL.AMAC_REPORT_FUND_INFO efn
+                JOIN AMAC_REPORT_FUND_INFO efn
                 ON efi.id = efn.file_id
-                left join PPW_EMAIL.PVN_FUND_INFO info
+                left join PVN_FUND_INFO info
                 on efn.register_number=info.register_number and info.isvalid=1
             </if>
-                JOIN PPW_EMAIL.EMAIL_PARSE_INFO epi
+                JOIN EMAIL_PARSE_INFO epi
                      ON epi.id = efi.email_id
         WHERE efi.isvalid = 1
           AND efn.isvalid = 1
@@ -122,11 +122,11 @@
                 asset.updatetime
          end as updatetime
         FROM
-            PPW_EMAIL.EMAIL_FILE_INFO efi
-                LEFT JOIN PPW_EMAIL.email_fund_nav nav
+            EMAIL_FILE_INFO efi
+                LEFT JOIN email_fund_nav nav
                           ON efi.id = nav.file_id
                               AND nav.isvalid = 1
-                LEFT JOIN PPW_EMAIL.email_fund_asset asset
+                LEFT JOIN email_fund_asset asset
                           ON efi.id = asset.file_id
                               AND asset.isvalid = 1 AND (nav.fund_id=asset.fund_id OR nav.register_number=asset.register_number OR nav.fund_name= asset.fund_name) AND nav.price_date=asset.price_date
         WHERE efi.isvalid = 1
@@ -150,18 +150,18 @@
         efi.file_path as "filePath",
         efi.createtime as "createTime"
         FROM
-        PPW_EMAIL.EMAIL_FILE_INFO efi
+        EMAIL_FILE_INFO efi
         <if test="fileType != 3">
-            JOIN PPW_EMAIL.EMAIL_FUND_NAV efn
+            JOIN EMAIL_FUND_NAV efn
             ON efi.id = efn.file_id
         </if>
         <if test="fileType == 3">
-            JOIN PPW_EMAIL.AMAC_REPORT_FUND_INFO efn
+            JOIN AMAC_REPORT_FUND_INFO efn
             ON efi.id = efn.file_id
-            left join PPW_EMAIL.PVN_FUND_INFO info
+            left join PVN_FUND_INFO info
             on efn.register_number=info.register_number and info.isvalid=1
         </if>
-        JOIN PPW_EMAIL.EMAIL_PARSE_INFO epi
+        JOIN EMAIL_PARSE_INFO epi
         ON epi.id = efi.email_id
         WHERE efi.isvalid = 1
         AND efn.isvalid = 1
@@ -187,11 +187,11 @@
             asset.asset_net,
             asset.asset_share
         FROM
-            PPW_EMAIL.EMAIL_FILE_INFO efi
-                LEFT JOIN PPW_EMAIL.email_fund_nav nav
+            EMAIL_FILE_INFO efi
+                LEFT JOIN email_fund_nav nav
                           ON efi.id = nav.file_id
                               AND nav.isvalid = 1
-                LEFT JOIN PPW_EMAIL.email_fund_asset asset
+                LEFT JOIN email_fund_asset asset
                           ON efi.id = asset.file_id
                               AND asset.isvalid = 1 AND (nav.fund_id=asset.fund_id OR nav.register_number=asset.register_number OR nav.fund_name= asset.fund_name) AND nav.price_date=asset.price_date
         WHERE efi.isvalid = 1
@@ -202,8 +202,8 @@
         SELECT
             distinct file.id
         FROM
-            PPW_EMAIL.EMAIL_FILE_INFO file
-                JOIN PPW_EMAIL.EMAIL_PARSE_INFO info
+            EMAIL_FILE_INFO file
+                JOIN EMAIL_PARSE_INFO info
                      ON file.email_id = info.id
         WHERE info.email_type = 2
           AND file.id IN
@@ -212,13 +212,13 @@
         </foreach>
     </select>
     <select id="getAllPriceDateByFileId" resultType="java.lang.String" parameterType="java.lang.Integer">
-        select * from (select distinct price_date from PPW_EMAIL.EMAIL_FUND_NAV WHERE file_id=#{fileId} and isvalid=1
+        select * from (select distinct price_date from EMAIL_FUND_NAV WHERE file_id=#{fileId} and isvalid=1
         union
-        select distinct price_date from PPW_EMAIL.EMAIL_FUND_ASSET WHERE file_id=#{fileId} and isvalid=1) a order by price_date desc
+        select distinct price_date from EMAIL_FUND_ASSET WHERE file_id=#{fileId} and isvalid=1) a order by price_date desc
     </select>
 
     <update id="updateTimeById">
-        update PPW_EMAIL.EMAIL_FILE_INFO
+        update EMAIL_FILE_INFO
         set updatetime = #{parseDate}
         where isvalid = 1
           and id = #{id}

service-base/src/main/resources/mapper/EmailFundAssetMapper.xml

@@ -24,7 +24,7 @@
     </resultMap>
 
     <insert id="batchInsert" parameterType="com.simuwang.base.pojo.dos.EmailFundAssetDO">
-        insert into PPW_EMAIL.email_fund_asset(file_id, fund_id, fund_name,register_number,price_date,asset_net,asset_share,is_stored,exception_status,
+        insert into email_fund_asset(file_id, fund_id, fund_name,register_number,price_date,asset_net,asset_share,is_stored,exception_status,
                                               isvalid, creatorid, createtime, updaterid, updatetime)
         values
         <foreach collection="itemDoList" item="itemDo" index="index" separator=",">
@@ -35,7 +35,7 @@
     </insert>
     <update id="batchUpdate">
         <foreach collection="itemDoList" item="itemDo" index="index" open="" close="" separator=";">
-            update PPW_EMAIL.email_fund_asset
+            update email_fund_asset
             <set>
                 fund_id = #{itemDo.fundId},
                 exception_status = #{itemDo.exceptionStatus},
@@ -62,12 +62,12 @@
                         asset.updatetime,
                         parse.email_title,
                         parse.id as email_id
-        from PPW_EMAIL.email_fund_asset asset
-        join PPW_EMAIL.email_file_info file
+        from email_fund_asset asset
+        join email_file_info file
         on asset.file_id = file.id
-        join PPW_EMAIL.email_parse_info parse
+        join email_parse_info parse
         on file.email_id = parse.id
-        left join PPW_EMAIL.pvn_fund_info info
+        left join pvn_fund_info info
         on asset.fund_id=info.fund_id and info.isvalid=1
         where asset.isvalid=1 and file.isvalid=1 and parse.isvalid=1
         <if test="fundName != null and fundName !=''">
@@ -127,12 +127,12 @@
             asset.updatetime,
             parse.email_title,
             parse.id as email_id
-        from PPW_EMAIL.email_fund_asset asset
-        join PPW_EMAIL.email_file_info file
+        from email_fund_asset asset
+        join email_file_info file
         on asset.file_id = file.id
-        join PPW_EMAIL.email_parse_info parse
+        join email_parse_info parse
         on file.email_id = parse.id
-        left join PPW_EMAIL.pvn_fund_info info
+        left join pvn_fund_info info
         on asset.fund_id=info.fund_id and info.isvalid=1
         where asset.isvalid=1 and file.isvalid=1 and parse.isvalid=1
         <if test="fundName != null and fundName !=''">
@@ -169,7 +169,7 @@
     </select>
     <select id="countNoStoreAsset" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(id)
-        from PPW_EMAIL.email_fund_asset
+        from email_fund_asset
         where isvalid =1 and exception_status=3
         <if test="fundName != null and fundName !=''">
             and fund_name=#{fundName}
@@ -182,7 +182,7 @@
             parameterType="java.lang.String">
         select distinct id,fund_id,file_id, fund_name,register_number,price_date,asset_net,asset_share,is_stored,exception_status,
                         updatetime
-        from PPW_EMAIL.email_fund_asset
+        from email_fund_asset
         where isvalid =1 and exception_status=3
         <if test="fundName != null and fundName !=''">
             and fund_name=#{fundName}
@@ -222,8 +222,8 @@
             asset.exception_status as asset_exception_status,
             asset.updatetime
         FROM
-            PPW_EMAIL.EMAIL_FILE_INFO efi
-                JOIN PPW_EMAIL.email_fund_asset asset
+            EMAIL_FILE_INFO efi
+                JOIN email_fund_asset asset
                      ON efi.id = asset.file_id
                          AND asset.isvalid = 1
         WHERE efi.isvalid = 1
@@ -232,14 +232,14 @@
     <select id="selectAssetByFundId" resultMap="BaseResultMap">
         select id,file_id, fund_id, fund_name,register_number,price_date,asset_net,asset_share,is_stored,exception_status,
                isvalid, creatorid, createtime, updaterid, updatetime
-        from PPW_EMAIL.email_fund_asset where isvalid=1 and fund_id=#{fundId}
+        from email_fund_asset where isvalid=1 and fund_id=#{fundId}
     </select>
     <select id="countEmailAssetTotal" resultType="java.lang.Long">
-        select count(1) from PPW_EMAIL.email_fund_asset where isvalid=1
+        select count(1) from email_fund_asset where isvalid=1
     </select>
 
     <delete id="deleteByFileId">
-        update PPW_EMAIL.email_fund_asset
+        update email_fund_asset
         set isvalid   = 0,
             updatetime= now()
         where isvalid = 1

service-base/src/main/resources/mapper/EmailFundNavMapper.xml

@@ -24,7 +24,7 @@
     </resultMap>
 
     <insert id="batchInsert" parameterType="com.simuwang.base.pojo.dos.EmailFundNavDO">
-        insert into PPW_EMAIL.email_fund_nav(file_id, fund_id, fund_name,register_number,price_date,
+        insert into email_fund_nav(file_id, fund_id, fund_name,register_number,price_date,
                                               nav,cumulative_nav_withdrawal,is_stored,exception_status,template_id,
                                               isvalid, creatorid, createtime, updaterid, updatetime)
         values
@@ -36,7 +36,7 @@
     </insert>
     <update id="batchUpdate">
         <foreach collection="navList" item="itemDo" index="index" open="" close="" separator=";">
-            update PPW_EMAIL.email_fund_nav
+            update email_fund_nav
             <set>
                 fund_id = #{itemDo.fundId},
                 exception_status = #{itemDo.exceptionStatus},
@@ -48,7 +48,7 @@
         </foreach>
     </update>
     <delete id="deleteByFileId" parameterType="java.lang.Integer">
-        update PPW_EMAIL.email_fund_nav nav set isvalid = 0,updatetime=sysdate() where file_id=#{fileId}
+        update email_fund_nav nav set isvalid = 0,updatetime=now() where file_id=#{fileId}
     </delete>
     <select id="searchNavDetail" resultMap="BaseResultMap">
         SELECT distinct nav.id,nav.file_id,
@@ -66,12 +66,12 @@
             parse.email_title,
             parse.id as email_id
         FROM
-            PPW_EMAIL.email_fund_nav nav
-            join PPW_EMAIL.email_file_info file
+            email_fund_nav nav
+            join email_file_info file
                 on nav.file_id = file.id
-            join PPW_EMAIL.email_parse_info parse
+            join email_parse_info parse
                 on file.email_id = parse.id
-            left join PPW_EMAIL.pvn_fund_info info
+            left join pvn_fund_info info
                 on nav.fund_id=info.fund_id and info.isvalid=1
         WHERE nav.isvalid = 1  and file.isvalid=1 and parse.isvalid=1
         <if test="fundName != null and fundName !=''">
@@ -130,12 +130,12 @@
             nav.is_stored,
             nav.updatetime
         FROM
-        PPW_EMAIL.email_fund_nav nav
-        join PPW_EMAIL.email_file_info file
+        email_fund_nav nav
+        join email_file_info file
         on nav.file_id = file.id
-        join PPW_EMAIL.email_parse_info parse
+        join email_parse_info parse
         on file.email_id = parse.id
-        left join PPW_EMAIL.pvn_fund_info info
+        left join pvn_fund_info info
         on nav.fund_id=info.fund_id and info.isvalid=1
         WHERE nav.isvalid = 1  and file.isvalid=1 and parse.isvalid=1
         <if test="fundName != null and fundName !=''">
@@ -172,7 +172,7 @@
     </select>
     <select id="countNoStoreNav" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(nav.id)
-        from PPW_EMAIL.email_fund_nav nav
+        from email_fund_nav nav
         where nav.isvalid =1 and nav.exception_status=3
         <if test="fundName != null and fundName != ''">
             and nav.fund_name=#{fundName}
@@ -182,7 +182,7 @@
         </if>
     </select>
     <select id="selectFileIdByFundName" resultType="java.lang.Integer" parameterType="java.lang.String">
-        select distinct nav.file_id from PPW_EMAIL.email_fund_nav nav where nav.isvalid =1 and nav.exception_status in(1,3)
+        select distinct nav.file_id from email_fund_nav nav where nav.isvalid =1 and nav.exception_status in(1,3)
         <if test="fundName != null and fundName != ''">
             and nav.fund_name=#{fundName}
         </if>
@@ -207,7 +207,7 @@
                nav.updaterid,
                nav.updatetime,
                nav.createtime
-        from PPW_EMAIL.email_fund_nav nav
+        from email_fund_nav nav
         where nav.isvalid =1 and nav.exception_status in (1,3)
         <if test="fundName != null and fundName != ''">
             and nav.fund_name=#{fundName}
@@ -218,7 +218,7 @@
         order by nav.updatetime desc
     </select>
     <select id="getMaxPriceDate" resultType="java.lang.String" parameterType="java.lang.String">
-        select max(nav.price_date) from PPW_EMAIL.email_fund_nav nav where nav.isvalid =1 and nav.exception_status in (1,3)
+        select max(nav.price_date) from email_fund_nav nav where nav.isvalid =1 and nav.exception_status in (1,3)
                                                                         and nav.fund_name=#{fundName}
     </select>
     <resultMap id="BaseDetailMap" type="com.simuwang.base.pojo.dos.EmailParseDetailDO">
@@ -252,8 +252,8 @@
             null as asset_exception_status,
             nav.updatetime
         FROM
-            PPW_EMAIL.EMAIL_FILE_INFO efi
-                JOIN PPW_EMAIL.email_fund_nav nav
+            EMAIL_FILE_INFO efi
+                JOIN email_fund_nav nav
                      ON efi.id = nav.file_id
                       AND nav.isvalid = 1
         WHERE efi.isvalid = 1
@@ -275,12 +275,12 @@
                nav.updaterid,
                nav.updatetime,
                nav.createtime
-        from PPW_EMAIL.email_fund_nav nav
+        from email_fund_nav nav
         where nav.isvalid =1 and nav.exception_status=1
         and nav.fund_id = #{fundId}
     </select>
     <select id="countEmailNavTotal" resultType="java.lang.Long">
-        select count(1) from PPW_EMAIL.email_fund_nav where isvalid=1
+        select count(1) from email_fund_nav where isvalid=1
     </select>
 
 

service-base/src/main/resources/mapper/EmailParseInfoMapper.xml

@@ -21,14 +21,14 @@
 
 
     <insert id="insert" parameterType="com.simuwang.base.pojo.dos.EmailParseInfoDO" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
-        insert into PPW_EMAIL.email_parse_info(email, sender_email, email_date, parse_date, email_title, email_type, parse_status,
+        insert into email_parse_info(email, sender_email, email_date, parse_date, email_title, email_type, parse_status,
                                      isvalid, creatorid, createtime, updaterid, updatetime)
         values (#{itemDo.email}, #{itemDo.senderEmail}, #{itemDo.emailDate}, #{itemDo.parseDate}, #{itemDo.emailTitle}, #{itemDo.emailType}, #{itemDo.parseStatus},
                 #{itemDo.isvalid}, #{itemDo.creatorId}, #{itemDo.createTime}, #{itemDo.updaterId}, #{itemDo.updateTime})
     </insert>
 
     <update id="updateParseStatus">
-        update PPW_EMAIL.email_parse_info
+        update email_parse_info
         set parse_status = #{parseStatus},
             fail_reason = #{failReason}
         where isvalid = 1
@@ -51,7 +51,7 @@
             epi.updaterid,
             epi.sender_email
         FROM
-            PPW_EMAIL.email_parse_info epi
+            email_parse_info epi
     </sql>
     <!-- 查询条件 -->
     <sql id="sqlwhereSearch">
@@ -111,7 +111,7 @@
     </select>
 
     <select id="searchEmailCount" resultType="java.lang.Integer">
-        select count(1) from PPW_EMAIL.email_parse_info where isvalid=1
+        select count(1) from email_parse_info where isvalid=1
         <if test="parseStatus != null and parseStatus != -1">
             and parse_status=#{parseStatus}
         </if>
@@ -128,18 +128,18 @@
 
     <select id="queryById" resultMap="BaseResultMap">
         select id, email, email_date, parse_date, email_title, email_type, sender_email,parse_status
-        from PPW_EMAIL.email_parse_info
+        from email_parse_info
         where isvalid = 1
           and id = #{id}
     </select>
     <select id="countEmailList" resultType="java.lang.Long"
             parameterType="com.simuwang.base.pojo.dto.query.EmailParseQuery">
-        select count(*) from PPW_EMAIL.email_parse_info epi
+        select count(*) from email_parse_info epi
         <include refid="sqlwhereSearch"/>
     </select>
 
     <update id="updateParseTime">
-        update PPW_EMAIL.email_parse_info
+        update email_parse_info
         set updatetime = #{parseDate},
             parse_date = #{parseDate}
         where isvalid = 1
@@ -155,8 +155,8 @@
                t2.id as fileId,
                t2.file_name as fileName,
                t2.file_path as filePath
-        from PPW_EMAIL.email_parse_info t1
-        join PPW_EMAIL.email_file_info t2 on t1.id = t2.email_id and t2.isvalid = 1
+        from email_parse_info t1
+        join email_file_info t2 on t1.id = t2.email_id and t2.isvalid = 1
         where t1.isvalid = 1
           and t1.email_type = 2
           and t2.id in
@@ -166,7 +166,7 @@
     </select>
     <select id="searchEmailDataBoard" resultType="java.util.Map"
             parameterType="com.simuwang.base.pojo.dto.query.DataboardQuery">
-        select parse_status as "parse_status",count(id) as "total" from PPW_EMAIL.email_parse_info
+        select parse_status as "parse_status",count(id) as "total" from email_parse_info
         where isvalid=1
         <if test="startDate != null  and startDate != ''">
             and email_date >= #{startDate}
@@ -188,7 +188,7 @@
     </select>
     <select id="searchEmailTypeCount" resultType="java.util.Map"
             parameterType="com.simuwang.base.pojo.dto.query.DataboardQuery">
-        select email_type as "email_type",count(id)  as "total" from PPW_EMAIL.email_parse_info
+        select email_type as "email_type",count(id)  as "total" from email_parse_info
         where isvalid=1
         <if test="startDate != null  and startDate != ''">
             and email_date >= #{startDate}
@@ -206,7 +206,7 @@
         order by email_type
     </select>
     <select id="countpdfNoData" resultType="java.lang.Long">
-        select count(1) from PPW_EMAIL.email_parse_info
+        select count(1) from email_parse_info
         where isvalid=1
         <if test="item.startDate != null  and item.startDate != ''">
             and email_date >= #{item.startDate}
@@ -228,7 +228,7 @@
         </if>
     </select>
     <select id="countEmailTotal" resultType="java.lang.Long">
-        select count(1) from PPW_EMAIL.email_parse_info where isvalid=1
+        select count(1) from email_parse_info where isvalid=1
         <if test="emailType !=null">
             and email_type = #{emailType}
         </if>

service-base/src/main/resources/mapper/EmailTaskInfoMapper.xml

@@ -18,19 +18,19 @@
 
 
     <insert id="insert" parameterType="com.simuwang.base.pojo.dos.EmailTaskInfoDO" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
-        insert into PPW_EMAIL.email_task_info(email, task_name,task_type, start_time, end_time, task_status,
+        insert into email_task_info(email, task_name,task_type, start_time, end_time, task_status,
                                      isvalid, creatorid, createtime, updaterid, updatetime)
         values (#{itemDo.email}, #{itemDo.taskName}, #{itemDo.taskType}, #{itemDo.startTime}, #{itemDo.endTime}, #{itemDo.taskStatus},
                 #{itemDo.isvalid}, #{itemDo.creatorId}, #{itemDo.createTime}, #{itemDo.updaterId}, #{itemDo.updateTime})
     </insert>
     <update id="updateTaskStatus">
-        update PPW_EMAIL.email_task_info set task_status=#{taskStatus},updatetime=sysdate() where email=#{email} and start_time=#{startTime} and end_time=#{endTime}
+        update email_task_info set task_status=#{taskStatus},updatetime=now() where email=#{email} and start_time=#{startTime} and end_time=#{endTime}
     </update>
     <update id="updateTaskStatusById">
-        update PPW_EMAIL.email_task_info set task_status=#{taskStatus},updatetime=#{updateTime},end_time=#{endTime} where id=#{id}
+        update email_task_info set task_status=#{taskStatus},updatetime=#{updateTime},end_time=#{endTime} where id=#{id}
     </update>
     <delete id="deleteTaskLog">
-        update PPW_EMAIL.email_task_info set isvalid=0,updatetime=sysdate(),updaterid=#{userId} where isvalid=1
+        update email_task_info set isvalid=0,updatetime=now(),updaterid=#{userId} where isvalid=1
         and id in
         <foreach collection="idList" index="index" item="id" separator="," open="(" close=")">
             #{id}
@@ -40,8 +40,8 @@
             parameterType="com.simuwang.base.pojo.dto.query.TaskPageQuery">
         select task.id,task.email, task.task_name,task.task_type, task.start_time, task.end_time, task.task_status,
         task.isvalid, task.creatorid, task.createtime, task.updaterid, task.updatetime,u.user_name
-        from PPW_EMAIL.email_task_info task
-        left join PPW_EMAIL.sys_user u
+        from email_task_info task
+        left join sys_user u
         on task.creatorid=u.user_id
         where task.isvalid=1
         <if test="email != null and email !=''">
@@ -65,8 +65,8 @@
     <select id="countTaskList" resultType="java.lang.Long"
             parameterType="com.simuwang.base.pojo.dto.query.TaskPageQuery">
         select count(1)
-        from PPW_EMAIL.email_task_info task
-        left join PPW_EMAIL.sys_user u
+        from email_task_info task
+        left join sys_user u
         on task.creatorid=u.user_id
         where task.isvalid=1
         <if test="email != null and email !=''">

service-base/src/main/resources/mapper/EmailTemplateApplicationRuleMapper.xml

@@ -16,7 +16,7 @@
         <result column="updatetime" property="updateTime"/>
     </resultMap>
     <insert id="batchInsert">
-        insert into PPW_EMAIL.email_template_application_rule(template_id,`TYPE`,`ROW`,`COLUMN`,contain_keyword,not_contain_keyword,isvalid,creatorid,createtime,updaterid,updatetime)
+        insert into email_template_application_rule(template_id,`TYPE`,`ROW`,`COLUMN`,contain_keyword,not_contain_keyword,isvalid,creatorid,createtime,updaterid,updatetime)
         values
         <foreach collection="itemDoList" item="itemDo" index="index" separator=",">
             (#{itemDo.templateId},#{itemDo.type},#{itemDo.row},#{itemDo.column},#{itemDo.containKeyword},#{itemDo.notContainKeyword},
@@ -25,7 +25,7 @@
     </insert>
     <update id="batchUpdate">
         <foreach collection="itemDoList" item="itemDo" index="index" open="" close="" separator=";">
-            update PPW_EMAIL.email_template_application_rule
+            update email_template_application_rule
             <set>
                 template_id=#{itemDo.templateId},
                 `TYPE` = #{itemDo.type},
@@ -40,14 +40,14 @@
         </foreach>
     </update>
     <update id="deleteByTemplateId">
-        update PPW_EMAIL.email_template_application_rule set isvalid=0,updatetime=sysdate(),updaterid=#{userId}
+        update email_template_application_rule set isvalid=0,updatetime=now(),updaterid=#{userId}
         where isvalid=1 and  template_id in
         <foreach collection="templateIdList" index="index" item="templateId" open="(" separator="," close=")">
             #{templateId}
         </foreach>
     </update>
     <delete id="deleteByIdList">
-        update PPW_EMAIL.email_template_application_rule set isvalid=0,updatetime=sysdate(),updaterid=#{userId}
+        update email_template_application_rule set isvalid=0,updatetime=now(),updaterid=#{userId}
         where isvalid = 1 and id in
         <foreach collection="idList" index="index" item="id" open="(" separator="," close=")">
             #{id}
@@ -56,7 +56,7 @@
 
     <select id="queryByTemplateId" resultMap="BaseResultMap">
         select *
-        from PPW_EMAIL.email_template_application_rule
+        from email_template_application_rule
         where isvalid = 1
         and template_id in
         <foreach collection="templateIdList" index="index" item="templateId" open="(" separator="," close=")">

service-base/src/main/resources/mapper/EmailTemplateDataRuleMapper.xml

@@ -17,7 +17,7 @@
         <result column="updatetime" property="updateTime"/>
     </resultMap>
     <insert id="batchInsert">
-        insert into PPW_EMAIL.email_template_data_rule(template_id,field_name,`POSITION`,`ROW`,`COLUMN`,field_rule,unit_convert,isvalid,creatorid,createtime,updaterid,updatetime)
+        insert into email_template_data_rule(template_id,field_name,`POSITION`,`ROW`,`COLUMN`,field_rule,unit_convert,isvalid,creatorid,createtime,updaterid,updatetime)
         values
         <foreach collection="itemDoList" item="itemDo" index="index" separator=",">
             (#{itemDo.templateId},#{itemDo.fieldName},#{itemDo.position},#{itemDo.row},#{itemDo.column},#{itemDo.fieldRule},#{itemDo.unitConvert},
@@ -26,7 +26,7 @@
     </insert>
     <update id="batchUpdate">
         <foreach collection="itemDoList" item="itemDo" index="index" open="" close="" separator=";">
-            update PPW_EMAIL.email_template_data_rule
+            update email_template_data_rule
             <set>
                 template_id = #{itemDo.templateId},
                 field_name = #{itemDo.fieldName},
@@ -42,7 +42,7 @@
         </foreach>
     </update>
     <update id="deleteByTemplateId">
-        update PPW_EMAIL.email_template_data_rule set isvalid=0,updatetime=sysdate(),updaterid=#{userId}
+        update email_template_data_rule set isvalid=0,updatetime=now(),updaterid=#{userId}
         where isvalid=1 and template_id in
         <foreach collection="templateIdList" index="index" item="templateId" open="(" separator="," close=")">
             #{templateId}
@@ -51,7 +51,7 @@
 
     <select id="queryByTemplateId" resultMap="BaseResultMap">
         select *
-        from PPW_EMAIL.email_template_data_rule
+        from email_template_data_rule
         where isvalid = 1
         and template_id in
         <foreach collection="templateIdList" index="index" item="templateId" open="(" separator="," close=")">

service-base/src/main/resources/mapper/EmailTemplateInfoMapper.xml

@@ -17,24 +17,24 @@
         <result column="updatetime" property="updateTime"/>
     </resultMap>
     <insert id="saveTemplateInfo"  useGeneratedKeys="true" keyProperty="id">
-        insert into PPW_EMAIL.email_template_info(name,type,direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime)
+        insert into email_template_info(name,type,direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime)
         values
             (#{name},#{type},#{direction},#{startIndex},#{endIndex},#{description},#{status},#{isvalid},#{creatorId},#{createTime},#{updaterId},#{updateTime})
     </insert>
     <update id="deleteTemplateList">
-        update PPW_EMAIL.email_template_info set isvalid=0,updatetime=sysdate(),updaterid=#{userId} where isvalid=1
+        update email_template_info set isvalid=0,updatetime=now(),updaterid=#{userId} where isvalid=1
         and id in
         <foreach item="id" collection="idList" open="(" separator="," close=")">
             #{id}
         </foreach>
     </update>
     <update id="updateTemplateInfo">
-        update PPW_EMAIL.email_template_info set name=#{name},type=#{type},direction=#{direction},description=#{description},status=#{status},updatetime=#{updateTime},updaterid=#{updaterId}
+        update email_template_info set name=#{name},type=#{type},direction=#{direction},description=#{description},status=#{status},updatetime=#{updateTime},updaterid=#{updaterId}
         where id=#{id} and isvalid=1
     </update>
     <select id="searchTemplateList" resultMap="BaseResultMap">
         select id,name,type,direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime
-        from PPW_EMAIL.email_template_info where isvalid=1
+        from email_template_info where isvalid=1
         <if test="name != null and name !=''">
             and name like concat('%',#{name},'%')
         </if>
@@ -52,7 +52,7 @@
     </select>
     <select id="countTemplateList" resultType="java.lang.Long">
         select count(1)
-        from PPW_EMAIL.email_template_info where isvalid=1
+        from email_template_info where isvalid=1
         <if test="name != null and name !=''">
             and name like concat('%',#{name},'%')
         </if>
@@ -68,11 +68,11 @@
     </select>
     <select id="searchTemplateById" resultMap="BaseResultMap">
         select id,name,type,direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime
-        from PPW_EMAIL.email_template_info where isvalid=1 and id=#{id}
+        from email_template_info where isvalid=1 and id=#{id}
     </select>
     <select id="searchTemplateByName" resultType="com.simuwang.base.pojo.dos.EmailTemplateInfoDO">
         select id,name,type,direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime
-        from PPW_EMAIL.email_template_info where isvalid=1 and name=#{name} limit 1
+        from email_template_info where isvalid=1 and name=#{name} limit 1
     </select>
 
 

service-base/src/main/resources/mapper/EmailTemplateMappingMapper.xml

@@ -17,19 +17,19 @@
         <result column="template_name" property="templateName"/>
     </resultMap>
     <insert id="saveEmailTemplateMappingDO">
-        insert into PPW_EMAIL.email_template_mapping(template_id,title,email,company_name,company_id,status,isvalid,creatorid,createtime,updaterid,updatetime)
+        insert into email_template_mapping(template_id,title,email,company_name,company_id,status,isvalid,creatorid,createtime,updaterid,updatetime)
         values
             (#{templateId},#{title},#{email},#{companyName},#{companyId},#{status},#{isvalid},#{creatorId},#{createTime},#{updaterId},#{updateTime})
     </insert>
     <update id="deleteTemplateSetting">
-        update  PPW_EMAIL.email_template_mapping set isvalid=0,updatetime=sysdate(),updaterid=#{userId}
+        update  email_template_mapping set isvalid=0,updatetime=now(),updaterid=#{userId}
         where isvalid=1 and id in
         <foreach item="id" collection="idList" open="(" separator="," close=")">
             #{id}
         </foreach>
     </update>
     <update id="updateEmailTemplateMappingDO">
-        update PPW_EMAIL.email_template_mapping set template_id=#{templateId},title=#{title},email=#{email},company_name=#{companyName},company_id=#{companyId},
+        update email_template_mapping set template_id=#{templateId},title=#{title},email=#{email},company_name=#{companyName},company_id=#{companyId},
                                                     status=#{status},updatetime=#{updateTime},updaterid=#{updaterId}
         where isvalid=1 and id=#{id}
     </update>
@@ -40,8 +40,8 @@
                t2.type as type,
                t2.start_index as startIndex,
                t2.end_index as endIndex
-        from PPW_EMAIL.email_template_mapping t1
-            join PPW_EMAIL.email_template_info t2 on t2.id = t1.template_id and t2.isvalid = 1 and t2.status = 1
+        from email_template_mapping t1
+            join email_template_info t2 on t2.id = t1.template_id and t2.isvalid = 1 and t2.status = 1
         where t1.email = #{email}
           and t2.type = #{type}
           and t1.isvalid = 1
@@ -50,8 +50,8 @@
     <select id="searchTemplateSettingList" resultMap="BaseResultMap">
         select mapping.id,mapping.template_id,mapping.title,mapping.email,mapping.company_name,mapping.company_id,mapping.status,
         t.name as template_name
-        from PPW_EMAIL.email_template_mapping mapping
-            join PPW_EMAIL.email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
+        from email_template_mapping mapping
+            join email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
         where mapping.isvalid=1
         <if test="title != null and title != ''">
             and mapping.title like concat('%',#{title},'%')
@@ -72,8 +72,8 @@
     </select>
     <select id="countTemplateSettingList" resultType="java.lang.Long">
         select count(mapping.id)
-        from PPW_EMAIL.email_template_mapping mapping
-        join PPW_EMAIL.email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
+        from email_template_mapping mapping
+        join email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
         where mapping.isvalid=1
         <if test="title != null and title != ''">
             and mapping.title like concat('%',#{title},'%')
@@ -94,8 +94,8 @@
     <select id="searchTemplateById" resultMap="BaseResultMap">
         select mapping.id,mapping.template_id,mapping.title,mapping.email,mapping.company_name,mapping.company_id,mapping.status,
                t.name as template_name
-        from PPW_EMAIL.email_template_mapping mapping
-                 join PPW_EMAIL.email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
+        from email_template_mapping mapping
+                 join email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
         where mapping.isvalid=1 and mapping.id=#{id}
     </select>
 

service-base/src/main/resources/mapper/EmailTypeRuleMapper.xml

@@ -15,17 +15,17 @@
 
     <select id="getEmailTypeRule" resultMap="BaseResultMap">
         select *
-        from PPW_EMAIL.email_type_rule
+        from email_type_rule
         where isvalid = 1 limit 1
     </select>
     <select id="searchEmailType" resultMap="BaseResultMap">
-        select id,nav,valuation,report,isvalid,creatorid,createtime,updaterid,updatetime from PPW_EMAIL.email_type_rule where isvalid =1 limit 1
+        select id,nav,valuation,report,isvalid,creatorid,createtime,updaterid,updatetime from email_type_rule where isvalid =1 limit 1
     </select>
     <insert id="saveEmailType">
-        insert into PPW_EMAIL.email_type_rule(nav,valuation,report,isvalid,creatorid,createtime,updaterid,updatetime)
+        insert into email_type_rule(nav,valuation,report,isvalid,creatorid,createtime,updaterid,updatetime)
         values (#{nav},#{valuation},#{report},1,#{creatorId},#{createTime},#{updaterId},#{updateTime})
     </insert>
     <update id="updateEmailType">
-        update PPW_EMAIL.email_type_rule set nav=#{nav},valuation=#{valuation},report=#{report},updatetime=sysdate(),updaterid=#{updaterId} where id=#{id} and isvalid =1
+        update email_type_rule set nav=#{nav},valuation=#{valuation},report=#{report},updatetime=now(),updaterid=#{updaterId} where id=#{id} and isvalid =1
     </update>
 </mapper>

service-base/src/main/resources/mapper/FundAliasMapper.xml

@@ -17,11 +17,11 @@
         <result column="updatetime" property="updateTime"/>
     </resultMap>
     <update id="saveFundAlias" parameterType="com.simuwang.base.pojo.dos.FundAliasDO">
-        update PPW_EMAIL.fund_alias set target_fund_id=#{targetFundId},updatetime=#{updateTime}
+        update fund_alias set target_fund_id=#{targetFundId},updatetime=#{updateTime}
         where isvalid =1 and id=#{id}
     </update>
     <update id="batchDelete">
-        update PPW_EMAIL.fund_alias set isvalid=0,updatetime=sysdate(),updaterid=#{updaterId} where isvalid =1 and id in
+        update fund_alias set isvalid=0,updatetime=now(),updaterid=#{updaterId} where isvalid =1 and id in
         <foreach collection="idList" index="index" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
@@ -31,8 +31,8 @@
         select alias.target_fund_id,
                info.fund_name as target_fund_name,
                info.register_number as target_register_number
-        from PPW_EMAIL.fund_alias alias
-                 join PPW_EMAIL.pvn_fund_info info
+        from fund_alias alias
+                 join pvn_fund_info info
                            on alias.target_fund_id = info.fund_id and info.isvalid=1
         where alias.isvalid = 1
           and alias.source_fund_name = #{fundName}
@@ -41,7 +41,7 @@
 
     <select id="queryFundIdByNameAndRegisterNumber" resultMap="BaseResultMap">
         select *
-        from PPW_EMAIL.fund_alias
+        from fund_alias
         where isvalid = 1
           and source_fund_name = #{fundName}
           and source_register_number = #{registerNumber}
@@ -51,8 +51,8 @@
         select alias.target_fund_id,
                info.fund_name as target_fund_name,
                info.register_number as target_register_number
-        from PPW_EMAIL.fund_alias alias
-                join PPW_EMAIL.pvn_fund_info info
+        from fund_alias alias
+                join pvn_fund_info info
                            on alias.target_fund_id = info.fund_id and info.isvalid=1
         where alias.isvalid = 1
           and alias.source_fund_name = #{fundName}
@@ -60,7 +60,7 @@
 
     <select id="queryFundIdByName" resultMap="BaseResultMap">
         select *
-        from PPW_EMAIL.fund_alias
+        from fund_alias
         where isvalid = 1
           and source_fund_name = #{fundName}
     </select>
@@ -69,8 +69,8 @@
         select alias.target_fund_id,
                info.fund_name as target_fund_name,
                info.register_number as target_register_number
-        from PPW_EMAIL.fund_alias alias
-                 join PPW_EMAIL.pvn_fund_info info
+        from fund_alias alias
+                 join pvn_fund_info info
                            on alias.target_fund_id = info.fund_id and info.isvalid=1
         where alias.isvalid = 1
           and alias.source_register_number = #{registerNumber}
@@ -78,7 +78,7 @@
 
     <select id="queryFundIdByRegisterNumber" resultMap="BaseResultMap">
         select *
-        from PPW_EMAIL.fund_alias
+        from fund_alias
         where isvalid = 1
           and source_register_number = #{registerNumber}
     </select>
@@ -98,12 +98,12 @@
         alias.createtime,
         alias.updatetime,
         alias.updaterid
-        from PPW_EMAIL.fund_alias alias
-        left join PPW_EMAIL.pvn_fund_info info
+        from fund_alias alias
+        left join pvn_fund_info info
         on alias.target_fund_id = info.fund_id and info.isvalid=1
-        left join PPW_EMAIL.pvn_company_info c
+        left join pvn_company_info c
         on c.company_id = info.trust_id and c.isvalid=1
-        left join (select c.fund_name,c.register_number,max(c.price_date) as last_price_date from PPW_EMAIL.email_fund_nav c where c.isvalid=1
+        left join (select c.fund_name,c.register_number,max(c.price_date) as last_price_date from email_fund_nav c where c.isvalid=1
                                                                                              group by c.fund_name,c.register_number) a
         on a.fund_name = alias.source_fund_name and a.register_number=alias.source_register_number
         where alias.isvalid=1
@@ -136,10 +136,10 @@
     </select>
     <select id="countFundAlias" resultType="java.lang.Long"
             parameterType="com.simuwang.base.pojo.dto.query.FundAliasPageQuery">
-        select count(1) from PPW_EMAIL.fund_alias alias
-        left join PPW_EMAIL.pvn_fund_info info
+        select count(1) from fund_alias alias
+        left join pvn_fund_info info
         on alias.target_fund_id = info.fund_id and info.isvalid=1
-        left join PPW_EMAIL.pvn_company_info c
+        left join pvn_company_info c
         on c.company_id = info.trust_id and c.isvalid=1
         where alias.isvalid=1
         <if test="fundName != null and fundName !=''">
@@ -168,14 +168,14 @@
                alias.createtime,
                alias.updatetime,
                alias.updaterid
-        from PPW_EMAIL.fund_alias alias
-                 left join PPW_EMAIL.pvn_fund_info info
+        from fund_alias alias
+                 left join pvn_fund_info info
                            on alias.target_fund_id = info.fund_id and info.isvalid=1
         where alias.isvalid=1 and alias.id=#{id}
     </select>
 
     <insert id="batchInsert">
-        insert into PPW_EMAIL.fund_alias(source_fund_name, source_register_number,target_fund_id,
+        insert into fund_alias(source_fund_name, source_register_number,target_fund_id,
                                          isvalid,creatorid,createtime,updaterid,updatetime)
         values
         <foreach collection="itemDoList" item="itemDo" index="index" separator=",">

service-base/src/main/resources/mapper/FundInfoMapper.xml

@@ -34,7 +34,7 @@
         select f.fund_id as "fundId",
         f.fund_short_name as "fundShortName",
         f.register_number as "registerNumber"
-        from PPW_EMAIL.pvn_fund_info f where f.isvalid =1
+        from pvn_fund_info f where f.isvalid =1
         <if test="keyword != null and keyword !=''">
             and (f.fund_name like concat('%',#{keyword},'%') or f.fund_short_name like concat('%',#{keyword},'%') or f.register_number like concat('%',#{keyword},'%') or f.fund_id like concat('%',#{keyword},'%'))
         </if>
@@ -56,11 +56,11 @@
                r.asset_Frequency as assetFrequency,
                r.valuation_Frequency as valuationFrequency,
                r.frequency_remark as frequencyRemark
-        from PPW_EMAIL.pvn_fund_info f
-        left join PPW_EMAIL.pvn_company_info c on f.trust_id = c.company_id and c.isvalid =1
-        left join (select nv.fund_id,max(nv.price_date) as last_price_date from PPW_EMAIL.nav nv where nv.isvalid =1 group by nv.fund_id) n
+        from pvn_fund_info f
+        left join pvn_company_info c on f.trust_id = c.company_id and c.isvalid =1
+        left join (select nv.fund_id,max(nv.price_date) as last_price_date from nav nv where nv.isvalid =1 group by nv.fund_id) n
         on f.fund_id = n .fund_id
-        left join PPW_EMAIL.fund_report_frequency r on r.fund_id = f.fund_id and r.isvalid =1
+        left join fund_report_frequency r on r.fund_id = f.fund_id and r.isvalid =1
         where f.isvalid =1
         <if test="fundId != null and fundId !=''">
             and f.fund_id like concat('%',#{fundId},'%')
@@ -106,7 +106,7 @@
         select fund_id         as fundId,
                fund_name       as fundName,
                register_number as registerNumber
-        from PPW_EMAIL.pvn_fund_info
+        from pvn_fund_info
         where isvalid = 1
           and fund_name = #{fundName}
           and register_number = #{registerNumber}
@@ -116,7 +116,7 @@
         select fund_id         as fundId,
                fund_name       as fundName,
                register_number as registerNumber
-        from PPW_EMAIL.pvn_fund_info
+        from pvn_fund_info
         where isvalid = 1
           and fund_name = #{fundName}
     </select>
@@ -125,14 +125,14 @@
         select fund_id         as fundId,
                fund_name       as fundName,
                register_number as registerNumber
-        from PPW_EMAIL.pvn_fund_info
+        from pvn_fund_info
         where isvalid = 1
           and register_number = #{registerNumber}
     </select>
     <select id="countFundInfoByKeyword" resultType="java.lang.Long"
             parameterType="com.simuwang.base.pojo.dto.query.FundInputPageQuery">
         select count(f.fund_id)
-        from PPW_EMAIL.pvn_fund_info f where f.isvalid =1
+        from pvn_fund_info f where f.isvalid =1
         <if test="keyword != null and keyword !=''">
             and (f.fund_name like concat('%',#{keyword},'%') or f.fund_short_name like concat('%',#{keyword},'%') or f.register_number like concat('%',#{keyword},'%') or f.fund_id like concat('%',#{keyword},'%'))
         </if>
@@ -140,11 +140,11 @@
     <select id="countFundInfo" resultType="java.lang.Long"
             parameterType="com.simuwang.base.pojo.dto.query.FundInfoPageQuery">
         select count(f.fund_id)
-        from PPW_EMAIL.pvn_fund_info f
-        left join PPW_EMAIL.pvn_company_info c on f.trust_id = c.company_id and c.isvalid =1
-        left join (select nv.fund_id,max(nv.price_date) as last_price_date from PPW_EMAIL.nav nv where nv.isvalid =1 group by nv.fund_id) n
+        from pvn_fund_info f
+        left join pvn_company_info c on f.trust_id = c.company_id and c.isvalid =1
+        left join (select nv.fund_id,max(nv.price_date) as last_price_date from nav nv where nv.isvalid =1 group by nv.fund_id) n
         on f.fund_id = n .fund_id
-        left join PPW_EMAIL.fund_report_frequency r on r.fund_id = f.fund_id and r.isvalid =1
+        left join fund_report_frequency r on r.fund_id = f.fund_id and r.isvalid =1
         where f.isvalid =1
         <if test="fundId != null and fundId !=''">
             and f.fund_id like concat('%',#{fundId},'%')
@@ -172,28 +172,28 @@
         </if>
     </select>
     <select id="getFundNameByFundId" resultType="java.lang.String" parameterType="java.lang.String">
-        select fund_name from PPW_EMAIL.pvn_fund_info where fund_id=#{fundId} and isvalid=1
+        select fund_name from pvn_fund_info where fund_id=#{fundId} and isvalid=1
     </select>
     <select id="queryFundIdByName" resultType="java.lang.String" parameterType="java.lang.String">
         select fund_id
-        from PPW_EMAIL.pvn_fund_info
+        from pvn_fund_info
         where isvalid = 1
           and fund_name = #{fundName} limit 1
     </select>
     <select id="getCompanyNameByFundId" resultType="java.lang.String" parameterType="java.lang.String">
-        select c.company_name from PPW_EMAIL.pvn_company_info c
-        join PPW_EMAIL.pvn_fund_info info on info.trust_id=c.company_id
+        select c.company_name from pvn_company_info c
+        join pvn_fund_info info on info.trust_id=c.company_id
         where info.fund_id=#{fundId} and info.isvalid=1 and c.isvalid=1
     </select>
     <select id="getLiquidateDateByFundId" resultType="java.lang.String" parameterType="java.lang.String">
-        select liquidate_date from PPW_EMAIL.pvn_fund_info where fund_id=#{fundId} and isvalid=1
+        select liquidate_date from pvn_fund_info where fund_id=#{fundId} and isvalid=1
     </select>
     <select id="getFundIdByCompanyId" resultType="java.lang.String" parameterType="java.lang.String">
-        select info.fund_id from PPW_EMAIL.pvn_fund_info info join PPW_EMAIL.pvn_company_info c on info.trust_id=c.company_id
+        select info.fund_id from pvn_fund_info info join pvn_company_info c on info.trust_id=c.company_id
         where info.isvalid=1 and c.isvalid=1 and c.company_id=#{companyId}
     </select>
     <select id="getInceptionDateByFundId" resultType="java.lang.String" parameterType="java.lang.String">
-        select inception_date from PPW_EMAIL.pvn_fund_info where fund_id=#{fundId} and isvalid=1
+        select inception_date from pvn_fund_info where fund_id=#{fundId} and isvalid=1
     </select>
 
     <select id="queryFundAndTrustByRegisterNumber" resultType="com.simuwang.base.pojo.dos.FundAndCompanyInfoDO">
@@ -202,8 +202,8 @@
                t.register_number as registerNumber,
                t1.company_id as companyId,
                t1.company_name as companyName
-        from PPW_EMAIL.pvn_fund_info t
-            left join PPW_EMAIL.pvn_company_info t1 on t1.isvalid = 1 and t1.company_id = t.trust_id
+        from pvn_fund_info t
+            left join pvn_company_info t1 on t1.isvalid = 1 and t1.company_id = t.trust_id
         where t.isvalid = 1
           and t.register_number = #{registerNumber}
         limit 1
@@ -218,16 +218,16 @@
                info.is_amac_show,info.fund_status,info.amac_source_type,
                info.investment_type,info.liquidate_date,info.performance_start_date,
                info.is_shareclass,info.amac_url
-        from PPW_EMAIL.pvn_fund_info info
-        left join PPW_EMAIL.pvn_company_info a
+        from pvn_fund_info info
+        left join pvn_company_info a
                   on info.advisor_id = a.company_id and a.isvalid=1
-        left join PPW_EMAIL.pvn_company_info t
+        left join pvn_company_info t
                   on info.trust_id = t.company_id and t.isvalid=1
-        left join PPW_EMAIL.pvn_company_info ic
+        left join pvn_company_info ic
                   on info.issuer_id = ic.company_id and ic.isvalid=1
         where info.isvalid=1 and info.fund_id=#{fundId}
     </select>
     <select id="countFundTotal" resultType="java.lang.Long">
-        select count(1) from PPW_EMAIL.pvn_fund_info where isvalid=1
+        select count(1) from pvn_fund_info where isvalid=1
     </select>
 </mapper>

service-base/src/main/resources/mapper/FundNavAssetMapper.xml

@@ -25,10 +25,10 @@
         asset.asset_net,
         nav.updatetime
         FROM
-        PPW_EMAIL.nav nav
-        JOIN PPW_EMAIL.pvn_fund_info info
+        nav nav
+        JOIN pvn_fund_info info
         ON info.fund_id = nav.fund_id
-        LEFT JOIN PPW_EMAIL.asset asset
+        LEFT JOIN asset asset
         ON nav.fund_id = asset.fund_id
         AND nav.price_date = asset.price_date
         AND asset.isvalid = 1
@@ -63,10 +63,10 @@
             parameterType="com.simuwang.base.pojo.dto.query.FundNavAssetPageQuery">
         SELECT count(1)
         FROM
-        PPW_EMAIL.nav nav
-        JOIN PPW_EMAIL.pvn_fund_info info
+        nav nav
+        JOIN pvn_fund_info info
         ON info.fund_id = nav.fund_id
-        LEFT JOIN PPW_EMAIL.asset asset
+        LEFT JOIN asset asset
         ON nav.fund_id = asset.fund_id
         AND nav.price_date = asset.price_date
         AND asset.isvalid = 1

service-base/src/main/resources/mapper/FundPositionDetailMapper.xml

@@ -30,18 +30,18 @@
     </resultMap>
 
     <delete id="deleteUnUsed">
-        update PPW_EMAIL.fund_position_detail
+        update fund_position_detail
         set isvalid    = 0
         where fund_id = #{fundId}
           and valuation_date = #{valuationDate}
     </delete>
     <select id="fundPositionDetailByFundId" resultMap="BaseResultMap"
             parameterType="java.lang.String">
-        select distinct fund_id,valuation_date from PPW_EMAIL.fund_position_detail where fund_id=#{fundId} and isvalid=1
+        select distinct fund_id,valuation_date from fund_position_detail where fund_id=#{fundId} and isvalid=1
     </select>
 
     <insert id="insertMulti" parameterType="com.simuwang.base.pojo.dos.FundPositionDetailDO">
-        INSERT INTO PPW_EMAIL.fund_position_detail (
+        INSERT INTO fund_position_detail (
         fund_id,valuation_id,valuation_date,LEVEL,currency,exchange_rate,subject_code,
         securities_amount, securities_code,securities_name, sec_type,market_value,
         market_value_ratio,nature,subject_type,increment,halt_info,net_cost,net_cost_ratio,market_price,

service-base/src/main/resources/mapper/FundReportFrequencyMapper.xml

@@ -16,7 +16,7 @@
     </resultMap>
     <sql id="selectFundReportFrequencyVo">
         select id, fund_id, nav_frequency, frequency_remark, asset_frequency, creatorid, updaterid, updatetime, createtime, isvalid,valuation_frequency
-        from PPW_EMAIL.fund_report_frequency
+        from fund_report_frequency
     </sql>
     <sql id="sqlwhereSearch">
         <where>

service-base/src/main/resources/mapper/MailBoxInfoMapper.xml

@@ -19,7 +19,7 @@
         <result column="isvalid" property="isvalid"/>
     </resultMap>
     <update id="deleteEmailConfigByIds">
-        update PPW_EMAIL.mailbox_info set isvalid =0,updatetime=sysdate(),updaterid=#{updaterId} where id in
+        update mailbox_info set isvalid =0,updatetime=now(),updaterid=#{updaterId} where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -27,12 +27,12 @@
 
     <select id="listMailboxInfo" resultMap="BaseResultMap">
         select *
-        from PPW_EMAIL.mailbox_info
+        from mailbox_info
         where isvalid = 1
           and open_status = 1
     </select>
     <select id="searchEmailConfigList" resultMap="BaseResultMap">
-        select id, type, email, password, protocol, server, port, cron, open_status,description,isvalid,creatorid,createtime,updaterid,updatetime from PPW_EMAIL.mailbox_info
+        select id, type, email, password, protocol, server, port, cron, open_status,description,isvalid,creatorid,createtime,updaterid,updatetime from mailbox_info
         where isvalid = 1
         <if test="email != null and email != ''">
             and email like concat('%',#{email},'%')
@@ -41,7 +41,7 @@
     </select>
     <sql id="selectConfigVo">
         select id, type, email, password, protocol, server, port, cron, open_status,description,isvalid,creatorid,createtime,updaterid,updatetime
-        from PPW_EMAIL.mailbox_info
+        from mailbox_info
     </sql>
     <select id="selectEmailConfigByEmail" resultType="com.simuwang.base.pojo.dos.MailboxInfoDO">
         <include refid="selectConfigVo"/>
@@ -49,7 +49,7 @@
     </select>
     <select id="countEmailConfig" resultType="java.lang.Long"
             parameterType="com.simuwang.base.pojo.dto.query.EmailPageQuery">
-        select count(1) from PPW_EMAIL.mailbox_info
+        select count(1) from mailbox_info
         where isvalid = 1
         <if test="email != null and email != ''">
             and email like concat('%',#{email},'%')

service-base/src/main/resources/mapper/NavMapper.xml

@@ -16,7 +16,7 @@
     </resultMap>
 
     <insert id="batchInsert" parameterType="com.simuwang.base.pojo.dos.NavDO">
-        insert into PPW_EMAIL.nav(fund_id,price_date,nav,cumulative_nav,cumulative_nav_withdrawal,
+        insert into nav(fund_id,price_date,nav,cumulative_nav,cumulative_nav_withdrawal,
                                   isvalid, creatorid, createtime, updaterid, updatetime)
         values
         <foreach collection="itemDoList" item="itemDo" index="index" separator=",">
@@ -28,7 +28,7 @@
 
     <insert id="batchUpdate">
         <foreach collection="itemDoList" item="itemDo" index="index" open="" close="" separator=";">
-            update PPW_EMAIL.nav
+            update nav
             <set>
                 nav = #{itemDo.nav},
                 cumulative_nav_withdrawal = #{itemDo.cumulativeNavWithdrawal},
@@ -40,14 +40,14 @@
         </foreach>
     </insert>
     <insert id="saveNav" parameterType="com.simuwang.base.pojo.dos.NavDO">
-        insert into PPW_EMAIL.nav(fund_id,price_date,nav,cumulative_nav,cumulative_nav_withdrawal,
+        insert into nav(fund_id,price_date,nav,cumulative_nav,cumulative_nav_withdrawal,
         isvalid, creatorid, createtime, updaterid, updatetime)
         values
             (#{fundId},#{priceDate},#{nav},#{cumulativeNav},#{cumulativeNavWithdrawal},
             #{isvalid}, #{creatorId}, #{createTime}, #{updaterId}, #{updateTime})
     </insert>
     <update id="updateNav" parameterType="com.simuwang.base.pojo.dos.NavDO">
-        update PPW_EMAIL.nav
+        update nav
         <set>
             nav = #{nav},
             cumulative_nav_withdrawal = #{cumulativeNavWithdrawal},
@@ -57,19 +57,19 @@
         and id=#{id}
     </update>
     <update id="batchDeleteNav">
-        update PPW_EMAIL.nav set isvalid=0,updatetime=sysdate() where fund_id=#{fundId}
+        update nav set isvalid=0,updatetime=now() where fund_id=#{fundId}
         and price_date in
         <foreach collection="priceDateList" index="index" item="priceDate" separator="," open="(" close=")">
             #{priceDate}
         </foreach>
     </update>
     <delete id="deleteNav">
-        update PPW_EMAIL.nav set isvalid=0,updatetime=sysdate(),updaterid=#{updaterId} where fund_id=#{fundId} and price_date=#{priceDate}
+        update nav set isvalid=0,updatetime=now(),updaterid=#{updaterId} where fund_id=#{fundId} and price_date=#{priceDate}
     </delete>
 
     <select id="queryFundNavByDate" resultType="java.lang.String">
         select price_date
-        from PPW_EMAIL.nav
+        from nav
         where isvalid = 1
           and fund_id = #{fundId}
         and price_date in
@@ -81,28 +81,28 @@
             parameterType="com.simuwang.base.pojo.dos.NavDO">
         SELECT id, fund_id,price_date,nav,cumulative_nav,cumulative_nav_withdrawal,
                isvalid, creatorid, createtime, updaterid, updatetime
-        from PPW_EMAIL.nav
+        from nav
         where isvalid = 1
           and fund_id = #{fundId}
           and price_date=#{priceDate}
     </select>
     <select id="getAllFundId" resultType="java.lang.String">
-        select distinct fund_id from PPW_EMAIL.nav where isvalid=1
+        select distinct fund_id from nav where isvalid=1
     </select>
     <select id="selectNavByFundId" resultMap="BaseResultMap"
             parameterType="java.lang.String">
         SELECT id, fund_id,price_date,nav,cumulative_nav,cumulative_nav_withdrawal,
                isvalid, creatorid, createtime, updaterid, updatetime
-        from PPW_EMAIL.nav
+        from nav
         where isvalid = 1
           and fund_id = #{fundId}
         order by price_date
     </select>
     <select id="countNavTotal" resultType="java.lang.Long">
-        select count(1) from PPW_EMAIL.nav where isvalid=1
+        select count(1) from nav where isvalid=1
     </select>
     <select id="countNavByTime" resultType="java.lang.Long">
-        select count(1) from PPW_EMAIL.nav where updatetime <![CDATA[ <= ]]> #{endDate}
+        select count(1) from nav where updatetime <![CDATA[ <= ]]> #{endDate}
         <if test="startDate != null and startDate !=''">
             and updatetime >= #{startDate}
         </if>
@@ -110,14 +110,14 @@
     <select id="selectNavListByTime" resultMap="BaseResultMap">
         select id,fund_id,price_date,nav,cumulative_nav,cumulative_nav_withdrawal,
                isvalid, creatorid, createtime, updaterid, updatetime
-        from PPW_EMAIL.nav where updatetime <![CDATA[ <= ]]> #{endDate}
+        from nav where updatetime <![CDATA[ <= ]]> #{endDate}
         <if test="startDate != null and startDate !=''">
             and updatetime >= #{startDate}
         </if>
         order by updatetime desc
     </select>
     <select id="selectMaxMinId" resultType="java.util.Map">
-        select max(id) as maxId,min(id) as minId from PPW_EMAIL.nav where updatetime <![CDATA[ <= ]]> #{endDate}
+        select max(id) as maxId,min(id) as minId from nav where updatetime <![CDATA[ <= ]]> #{endDate}
         <if test="startDate != null and startDate !=''">
             and updatetime >= #{startDate}
         </if>
@@ -125,7 +125,7 @@
     <select id="selectNavListById" resultType="com.simuwang.base.pojo.dos.NavDO">
         select id,fund_id,price_date,nav,cumulative_nav,cumulative_nav_withdrawal,
         isvalid, creatorid, createtime, updaterid, updatetime
-        from PPW_EMAIL.nav where updatetime <![CDATA[ <= ]]> #{endDate} and id >= #{minId} and id <![CDATA[ <= ]]> #{maxId}
+        from nav where updatetime <![CDATA[ <= ]]> #{endDate} and id >= #{minId} and id <![CDATA[ <= ]]> #{maxId}
         <if test="startDate != null and startDate !=''">
             and updatetime >= #{startDate}
         </if>

service-base/src/main/resources/mapper/PdfValuationRecordMapper.xml

@@ -20,7 +20,7 @@
 
     <insert id="batchInsert" parameterType="com.simuwang.base.pojo.dos.PdfValuationRecordDO"
             useGeneratedKeys="true" keyProperty="id">
-        insert into PPW_EMAIL.pdf_valuation_record ( fund_id, upload_date, file_name, pdf_url,
+        insert into pdf_valuation_record ( fund_id, upload_date, file_name, pdf_url,
         excel_url,from_email,is_success,reason,
         creatorid, createtime, updaterid, updatetime, isvalid)
         values

service-base/src/main/resources/mapper/TradeDateMapper.xml

@@ -16,7 +16,7 @@
     </resultMap>
     <select id="selectTradeDate" resultMap="BaseResultMap">
         select id,trade_date,end_year,yearmonth,week_of_year,year_week,day_of_week,isholiday,isvalid,createtime,updatetime
-        from PPW_EMAIL.pvn_trade_date where isvalid=1 and isholiday=0 and trade_date>=#{startDate} and trade_date <![CDATA[ <= ]]> #{endDate}
+        from pvn_trade_date where isvalid=1 and isholiday=0 and trade_date>=#{startDate} and trade_date <![CDATA[ <= ]]> #{endDate}
     </select>
 
 

service-base/src/main/resources/mapper/ValuationMarketCodeMapper.xml

@@ -15,7 +15,7 @@
 
     <select id="queryMarketCode" resultType="java.lang.String">
         select market_code
-        from PPW_EMAIL.valuation_market_code
+        from valuation_market_code
         where isvalid = 1
         order by sort_id
     </select>

service-base/src/main/resources/mapper/ValuationTableAttributeMapper.xml

@@ -30,13 +30,13 @@
 
     <delete id="deleteByValuationId">
         delete
-        from PPW_EMAIL.valuation_table_attribute
+        from valuation_table_attribute
         where valuation_id = #{valuationId}
           and isvalid = 1
     </delete>
 
     <insert id="batchInsert" parameterType="com.simuwang.base.pojo.dos.ValuationTableAttributeDO">
-        insert into PPW_EMAIL.valuation_table_attribute(valuation_id, subject_code, subject_name, currency, exchange_rate, securities_amount,
+        insert into valuation_table_attribute(valuation_id, subject_code, subject_name, currency, exchange_rate, securities_amount,
                                                         unit_cost, ori_currency_cost, net_cost, net_cost_ratio, market_price, ori_currency_market_value,
                                                         market_value, market_value_ratio, ori_currency_increment, increment, halt_info, rights_interests_info,
                                                         isvalid, creatorid, createtime, updaterid, updatetime)

service-base/src/main/resources/mapper/ValuationTableMapper.xml

@@ -30,18 +30,18 @@
     </resultMap>
 
     <update id="unValid">
-        update  PPW_EMAIL.valuation_table
+        update  valuation_table
         set isvalid = 0
         where file_id = #{fileId}
     </update>
     <select id="selectValuationTableByFundId" resultMap="BaseResultMap"
             parameterType="java.lang.String">
-        select distinct fund_id,valuation_date from PPW_EMAIL.valuation_table where fund_id=#{fundId} and isvalid=1 and valuation_date is not null
+        select distinct fund_id,valuation_date from valuation_table where fund_id=#{fundId} and isvalid=1 and valuation_date is not null
     </select>
 
     <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.simuwang.base.pojo.dos.ValuationTableDO" useGeneratedKeys="true">
         <!--@mbg.generated-->
-        insert into PPW_EMAIL.valuation_table (fund_id,file_id,
+        insert into valuation_table (fund_id,file_id,
         title, valuation_date, nav,
         head_info, tail_info, original_file,
         converted_file, file_url, table_type,
@@ -59,7 +59,7 @@
     </insert>
 
     <update id="updateUpdateAnalyzed">
-        update PPW_EMAIL.valuation_table
+        update valuation_table
         set is_analyzed = 1,
             has_stock = #{hasStock},
             has_bond = #{hasBond},

service-base/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <sql id="selectConfigDo">
         select config_id, config_name, config_key, config_value, config_type, creatorid, createtime, updaterid, updatetime, remark,isvalid
-		from PPW_EMAIL.sys_config
+		from sys_config
     </sql>
     
     <!-- 查询条件 -->
@@ -65,10 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where config_key = #{configKey}  and isvalid =1 limit 1
     </select>
     <select id="selectConfigByKey" resultType="java.lang.String">
-            select config_value from PPW_EMAIL.sys_config where config_key = #{configKey}  and isvalid =1 limit 1
+            select config_value from sys_config where config_key = #{configKey}  and isvalid =1 limit 1
     </select>
     <select id="countConfigList" resultType="java.lang.Long">
-        select count(1) from PPW_EMAIL.sys_config
+        select count(1) from sys_config
         <where>
             isvalid=1
             <if test="configName != null and configName != ''">
@@ -101,8 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterId != null and updaterId != ''">#{updaterId},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
             1,
- 			sysdate(),
-            sysdate()
+ 			now(),
+            now()
 		)
     </insert>
 	 
@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="configType != null and configType != ''">config_type = #{configType},</if>
             <if test="updaterId != null and updaterId != ''">updaterid = #{updaterId},</if>
             <if test="remark != null">remark = #{remark},</if>
- 			updatetime = sysdate()
+ 			updatetime = now()
         </set>
         where config_id = #{configId} and isvalid=1
     </update>

service-base/src/main/resources/mapper/system/SysLogMapper.xml

@@ -14,15 +14,15 @@
         <result column="createtime" property="createTime"/>
     </resultMap>
     <update id="deleteLog">
-        delete from  PPW_EMAIL.sys_log where id in
+        delete from  sys_log where id in
         <foreach item="id" collection="idList" open="(" separator="," close=")">
             #{id}
         </foreach>
     </update>
     <select id="searchLogList" resultMap="BaseResultMap">
           select distinct log.id,log.title,log.type,log.request_uri,log.method,log.remote_addr,log.execute_time,log.params,log.params,log.createtime,u.user_name
-          from PPW_EMAIL.sys_log log
-          left join PPW_EMAIL.sys_user u
+          from sys_log log
+          left join sys_user u
           on log.creatorid=u.user_id and u.isvalid=1
         <where>
             <if test="title != null and title !=''">
@@ -37,8 +37,8 @@
     </select>
     <select id="countLogList" resultType="java.lang.Long">
         select count(distinct log.id)
-        from PPW_EMAIL.sys_log log
-        left join PPW_EMAIL.sys_user u
+        from sys_log log
+        left join sys_user u
         on log.creatorid=u.user_id and u.isvalid=1
         <where>
             <if test="title != null and title !=''">

service-deploy/src/main/resources/application.yml

@@ -27,10 +27,10 @@ spring:
     data-daq:
       # 指定为HikariDataSource
       type: com.zaxxer.hikari.HikariDataSource
-      driver-class-name: dm.jdbc.driver.DmDriver
-      url: jdbc:dm://192.168.1.39:5236/?schema=PPW_EMAIL
-      username: PPW_EMAIL
-      password: Dmppw2024
+      driver-class-name: com.alipay.oceanbase.obproxy.mysql.jdbc.Driver
+      url:  jdbc:oceanbase://192.168.1.28:2881/ppw_email?serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false&useSSL=false&nullNamePatternMatchesAll=true&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true
+      username: root
+      password:  Smppw@2024
       # hikari连接池配置 对应 HikariConfig 配置属性类
       hikari:
         pool-name: HikariCP-daq