公司邮箱配置代码自测调整

service-base/src/main/java/com/simuwang/base/config/ShiroConfig.java

@@ -146,6 +146,9 @@ public class ShiroConfig {
         map.put("/v1/login", "anon");
         map.put("/v1/rsa-key", "anon");
         map.put("/test/**", "anon");
+        map.put("/company/**", "anon");
+        map.put("/fund/**", "anon");
+        map.put("/email/**", "anon");
         map.put("/v1/**", "jwt");
         map.put("/**", "jwt");
         return map;

service-base/src/main/java/com/simuwang/base/mapper/CompanyEmailConfigMapper.java

@@ -13,4 +13,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CompanyEmailConfigMapper extends BaseMapper<CompanyEmailConfigDO> {
     void deleteCompanyEmailConfig(String email);
+
+    void saveCompanyEmailConfig(CompanyEmailConfigDO emailConfigDO);
+
+    void updateCompanyEmailConfig(CompanyEmailConfigDO emailConfigDO);
+
+    CompanyEmailConfigDO selectCompanyEmailConfigById(Integer id);
 }

service-base/src/main/java/com/simuwang/base/pojo/vo/CompanyEmailConfigVO.java

@@ -15,6 +15,7 @@ import java.util.Date;
  * Description: ${DESCRIPTION}
  */
 @Data
+@TableName("company_email_config")
 public class CompanyEmailConfigVO {
     /**
      * ID

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

@@ -1,8 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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(
+        <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>
+        <if test="openStatus != null and openStatus != ''">open_status,</if>
+        <if test="creatorId != null and creatorId != ''">creatorid,</if>
+        <if test="updaterId != null and updaterId != ''">updaterId,</if>
+        isvalid,
+        createtime,
+        updatetime
+        )values(
+        <if test="companyId != null and companyId != ''">#{companyId},</if>
+        <if test="companyName != null and companyName != ''">#{companyName},</if>
+        <if test="email != null and email != ''">#{email},</if>
+        <if test="openStatus != null and openStatus != ''">#{openStatus},</if>
+        <if test="creatorId != null and creatorId != ''">#{creatorId},</if>
+        <if test="updaterId != null and updaterId != ''">#{updaterId},</if>
+        1,
+        sysdate(),
+        sysdate()
+        )
+    </insert>
+
+    <update id="updateCompanyEmailConfig">
+        update PPW_EMAIL.company_email_config
+        <set>
+            <if test="companyId != null and companyId != ''">company_id=#{companyId},</if>
+            <if test="companyName != null and companyName != ''">company_name=#{companyName},</if>
+            <if test="email != null and email != ''">email=#{email},</if>
+            <if test="openStatus != null and openStatus != ''">open_status=#{openStatus},</if>
+            <if test="updaterId != null and updaterId != ''">updaterid=#{updaterId},</if>
+            <if test="updateTime != null">updatetime=#{updateTime},</if>
+        </set>
+        where id = #{id} and isvalid=1
+    </update>
 
     <update id="deleteCompanyEmailConfig">
         update PPW_EMAIL.company_email_config set isvalid =0 where email=#{email}
     </update>
+    <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.CompanyEmailConfigDO">
+        <id column="id" property="id"/>
+        <result column="company_id" property="companyId"/>
+        <result column="company_name" property="companyName"/>
+        <result column="email" property="email"/>
+        <result column="open_status" property="openStatus"/>
+        <result column="creatorid" property="creatorId"/>
+        <result column="updaterid" property="updaterId"/>
+        <result column="createtime" property="createTime"/>
+        <result column="updatetime" property="updateTime"/>
+        <result column="isvalid" property="isvalid"/>
+    </resultMap>
+    <sql id="selectConfigDo">
+        select company_id, company_name, email, open_status, creatorid, createtime, updaterid, updatetime,isvalid
+        from PPW_EMAIL.company_email_config
+    </sql>
+    <!-- 查询条件 -->
+    <sql id="sqlwhereSearch">
+        <where>
+            isvalid=1
+            <if test="id !=null">
+                and id = #{id}
+            </if>
+        </where>
+    </sql>
+    <select id="selectCompanyEmailConfigById" resultMap="BaseResultMap">
+        <include refid="selectConfigDo"/>
+        <include refid="sqlwhereSearch"/>
+    </select>
 </mapper>

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

@@ -34,9 +34,8 @@
                 JOIN PPW_EMAIL.company_information c
                      ON cec.company_id = c.company_id
                 LEFT JOIN PPW_EMAIL.company_email_send_history cesh
-                     ON cec.email = cesh.email
-        WHERE cec.isvalid = 1
-          AND cesh.isvalid = 1 and c.isvalid=1
+                     ON cec.email = cesh.email AND cesh.isvalid = 1
+        WHERE cec.isvalid = 1 and c.isvalid=1
         <if test="companyName != null and companyName !=''">
             and (c.company_name like concat('',#{companyName},'') or c.company_short_name like concat('',#{companyName},''))
         </if>

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

@@ -41,9 +41,9 @@
         <result column="isvalid" property="isvalid"/>
     </resultMap>
     <select id="searchCompanyInfoByKeyword" resultType="java.util.Map" parameterType="java.lang.String">
-        select c.company_id as companyId,
-        c.company_name as companyName
-        c.register_number as registerNumber
+        select c.company_id as `companyId`,
+        c.company_name as `companyName`,
+        c.register_number as `registerNumber`
         from PPW_EMAIL.company_information 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},'%'))

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 sys_config
+		from PPW_EMAIL.sys_config
     </sql>
     
     <!-- 查询条件 -->

service-manage/src/main/java/com/simuwang/manage/api/company/CompanyEmailSendHistoryController.java

@@ -88,7 +88,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
         try{
             companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOS);
         }catch (Exception e){
-            vo = new ResultVo(ResultCode.SAVE_SUCCESS);
+            vo = new ResultVo(ResultCode.SAVE_FAILED);
             logger.error(e.getMessage(),e);
         }
         return vo;
@@ -105,7 +105,7 @@ public class CompanyEmailSendHistoryController extends BaseController {
         try{
             companyEmailConfigService.updateCompanyEmailConfig(companyEmailConfigVO);
         }catch (Exception e){
-            vo = new ResultVo(ResultCode.SAVE_SUCCESS);
+            vo = new ResultVo(ResultCode.SAVE_FAILED);
             logger.error(e.getMessage(),e);
         }
         return vo;

service-manage/src/main/java/com/simuwang/manage/service/impl/CompanyEmailConfigServiceImpl.java

@@ -33,10 +33,10 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
             emailConfigDO.setUpdateTime(new Date());
             if(emailConfigVO.getId() != null){
                 emailConfigDO.setId(emailConfigVO.getId());
-                companyEmailConfigMapper.updateById(emailConfigDO);
+                companyEmailConfigMapper.updateCompanyEmailConfig(emailConfigDO);
             }else{
                 emailConfigDO.setCreateTime(new Date());
-                companyEmailConfigMapper.insert(emailConfigDO);
+                companyEmailConfigMapper.saveCompanyEmailConfig(emailConfigDO);
             }
         }
     }
@@ -53,13 +53,13 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
 
     @Override
     public void updateCompanyEmailConfig(CompanyEmailConfigVO companyEmailConfigVO) {
-        CompanyEmailConfigDO configDO = companyEmailConfigMapper.selectById(companyEmailConfigVO.getId());
+        CompanyEmailConfigDO configDO = companyEmailConfigMapper.selectCompanyEmailConfigById(companyEmailConfigVO.getId());
         if(configDO != null){
             configDO.setEmail(companyEmailConfigVO.getEmail());
             configDO.setCompanyId(companyEmailConfigVO.getCompanyId());
             configDO.setCompanyName(companyEmailConfigVO.getCompanyName());
             configDO.setUpdateTime(new Date());
-            companyEmailConfigMapper.updateById(configDO);
+            companyEmailConfigMapper.updateCompanyEmailConfig(configDO);
         }
     }
 }