3/4 system 优化1.0

src/main/java/com/glxp/api/dao/system/CompanyDao.java

@@ -1,5 +1,6 @@
 package com.glxp.api.dao.system;
 
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.auth.AliKeyEntity;
 import com.glxp.api.entity.system.CompanyEntity;
 import com.glxp.api.req.auth.FilterCompanyRequest;
@@ -9,16 +10,12 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface CompanyDao {
+public interface CompanyDao extends BaseMapperPlus<CompanyDao,CompanyEntity,CompanyEntity> {
 
     CompanyEntity findCompany(@Param("customerId") String CustomerId);
 
     CompanyEntity findCompanyByName(String companyName);
 
-    List<CompanyEntity> getSubCompany(FilterCompanyRequest companyRequest);
-
-    List<CompanyEntity> getSubCompany2(FilterCompanyRequest companyRequest);
-
     List<CompanyEntity> filterCompany(FilterCompanyRequest companyRequest);
 
     boolean modifyCompany(CompanyEntity companyEntity);
@@ -27,5 +24,4 @@ public interface CompanyDao {
 
     boolean deleteCompany(Long customerId);
 
-    AliKeyEntity findKey(String customerId);
 }

src/main/java/com/glxp/api/dao/system/SetupDao.java

@@ -7,10 +7,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SetupDao {
 
-//    SetupEntity findSetup(FilterSetupRequest filterSetupRequest);
+
-//
-//    boolean modifySetup(SetupEntity setupEntity);
-//
-//    boolean insertSetup(SetupEntity setupEntity);
 
 }

src/main/java/com/glxp/api/dao/system/SyncDataBustypeDao.java

@@ -12,7 +12,6 @@ public interface SyncDataBustypeDao extends BaseMapper<SyncDataBustypeEntity> {
 
     List<SyncDataBustypeEntity> findAll();
 
-
     void inserts(@Param("syncDataBustypeEntities") List<SyncDataBustypeEntity> syncDataBustypeEntities);
 
 }

src/main/java/com/glxp/api/dao/system/SysServerLogDao.java

@@ -1,17 +1,11 @@
 package com.glxp.api.dao.system;
-
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.system.SysServerLogEntity;
-import com.glxp.api.req.system.FilterSetupRequest;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
 
 @Mapper
-public interface SysServerLogDao {
+public interface SysServerLogDao extends BaseMapperPlus<SysServerLogDao, SysServerLogEntity,SysServerLogEntity> {
-
-
-    List<SysServerLogEntity> filterLog(FilterSetupRequest filterSetupRequest);
 
-    boolean insertLog(SysServerLogEntity sysServerLogEntity);
 
 }

src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java

@@ -15,9 +15,6 @@ public interface SystemPDFTemplateDao extends BaseMapperPlus<SystemPDFTemplateDa
 
     List<SystemPDFTemplateEntity> listPDFTemplates();
 
-    SystemPDFTemplateEntity findSystemPDFTemplate(FilterPdfTemplateRequest filterPdfTemplateRequest);
-
-
     boolean updateEntity(SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest);
 
     boolean insertEntity(SystemPDFTemplateEntity systemPDFTemplateEntity);

src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java

@@ -1,5 +1,6 @@
 package com.glxp.api.dao.system;
 
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity;
@@ -13,51 +14,17 @@ import java.util.List;
 
 
 @Mapper
-public interface SystemPDFTemplateRelevanceDao {
+public interface SystemPDFTemplateRelevanceDao extends BaseMapperPlus<SystemPDFTemplateRelevanceDao,SystemPDFTemplateRelevanceEntity,SystemPDFTemplateRelevanceEntity> {
-
 
     List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
 
-    /**
+    int insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
-     * 根据 customerId 查询
-     *
-     * @param customerId 传入的 customerId
-     * @return
-     */
-    List<SystemPDFTemplateRelevanceEntity> listByCustomerId(Long customerId);
-
-    /**
-     * 根据 多个 customerId 查询
-     *
-     * @param customerIds 传入的 customerIds
-     * @return
-     */
-    List<SystemPDFTemplateRelevanceEntity> listByCustomerIdIn(List<Long> customerIds);
-
-    /**
-     * 根据 template_id 查询 customer_id
-     *
-     * @param templateId 传入的 templateId
-     * @return
-     */
-    List<SystemPDFTemplateRelevanceEntity> listByTemplateId(int templateId);
-
-    /**
-     * 批量插入
-     *
-     * @param systemPDFTemplateRelevanceEntityList
-     * @return
-     */
-    int insertSystemPDFTemplateRelevanceAll(List<SystemPDFTemplateRelevanceEntity> systemPDFTemplateRelevanceEntityList);
-
-    boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
 
     SysPdfTemplateRelevanceLabelEntity selectByLabelId(String id);
 
     SysPdfTemplateRelevanceStatemenEntity selectByStatemenId(String id);
 
 
-
     /**
      * 根据 customerId 删除
      *
@@ -67,7 +34,4 @@ public interface SystemPDFTemplateRelevanceDao {
 
     boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
 
-    SystemPDFTemplateRelevanceEntity selectModuleldAndAction(@Param("moduleId") Integer moduleId,@Param("localAction") String localAction);
-
-    SysPdfTemplateRelevanceCodeEntity selectNameAndAction(@Param("name") String name, @Param("localAction") String localAction);
 }

src/main/java/com/glxp/api/dao/system/ThirdSysApiDao.java

@@ -11,5 +11,4 @@ public interface ThirdSysApiDao {
 
     List<ThirdSysApiEntity> findSysApi(FilterSysApiRequest filterSysApiRequest);
 
-    boolean modifySysApi(ThirdSysApiEntity thirdSysApiEntity);
 }

src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java

@@ -11,9 +11,7 @@ public interface SystemPDFTemplateRelevanceService {
 
     List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
 
-    int insertSystemPDFTemplateRelevanceAll(List<SystemPDFTemplateRelevanceEntity> systemPDFTemplateRelevanceEntityList);
+    int insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
-
-    boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
 
     boolean deleteByCustomerId(Integer customerId);
 

src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java

@@ -31,24 +31,8 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR
     }
 
 
-    /**
-     * 批量插入
-     *
-     * @param systemPDFTemplateRelevanceEntityList
-     * @return
-     */
-    @Override
-    public int insertSystemPDFTemplateRelevanceAll(List<SystemPDFTemplateRelevanceEntity> systemPDFTemplateRelevanceEntityList) {
-
-        if (systemPDFTemplateRelevanceEntityList == null || systemPDFTemplateRelevanceEntityList.isEmpty()) {
-            return 0;
-        }
-
-        return systemPDFTemplateRelevanceDao.insertSystemPDFTemplateRelevanceAll(systemPDFTemplateRelevanceEntityList);
-    }
-
     @Override
-    public boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity) {
+    public int insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity) {
         return systemPDFTemplateRelevanceDao.insert(systemPDFTemplateRelevanceEntity);
     }
 

src/main/resources/mybatis/mapper/info/SetupDao.xml

@@ -3,37 +3,4 @@
 
 <mapper namespace="com.glxp.api.dao.system.SetupDao">
 
-
-    <select id="findSetup" parameterType="Long"
-            resultType="com.glxp.api.entity.info.SetupEntity">
-        SELECT * FROM customer_set where  customerId = #{customerId}
-    </select>
-
-    <update id="modifySetup" parameterType="com.glxp.api.entity.info.SetupEntity">
-
-        UPDATE customer_set
-        <set>
-            <if test="checkUpbill != null">checkUpbill=#{checkUpbill},</if>
-            <if test="checkStock != null">checkStock=#{checkStock},</if>
-            <if test="checkRepeat != null">checkRepeat=#{checkRepeat},</if>
-            <if test="downloadRelation != null">downloadRelation=#{downloadRelation},</if>
-            <if test="uploadTime != null">uploadTime=#{uploadTime},</if>
-            <if test="lastUploadDate != null">lastUploadDate=#{lastUploadDate},</if>
-        </set>
-        WHERE customerId=#{customerId}
-
-
-    </update>
-
-    <insert id="insertSetup" parameterType="com.glxp.api.entity.info.SetupEntity">
-       replace INTO customer_set(customerId,
-       checkUpbill,checkStock,checkRepeat,downloadRelation,uploadTime,lastUploadDate) values
-       (
-      #{customerId},
-      #{checkUpbill}, #{checkStock} ,  #{checkRepeat},  #{downloadRelation}
-      ,#{uploadTime},#{lastUploadDate})
-    </insert>
-
-
-
 </mapper>

src/main/resources/mybatis/mapper/system/CompanyDao.xml

@@ -47,61 +47,6 @@
         FROM sup_company
         where companyName = #{companyName}
     </select>
-    <select id="getSubCompany" parameterType="com.glxp.api.req.auth.FilterCompanyRequest"
-            resultType="com.glxp.api.entity.system.CompanyEntity">
-        SELECT *
-        FROM sup_company
-        <where>
-            <if test="customerId != null and customerId != ''">
-                and parentIdFk = #{customerId}
-            </if>
-            <if test="companyName != null and companyName != ''">
-                and companyName like concat('%', #{companyName}, '%')
-            </if>
-            <if test="creditNum != null and creditNum != ''">
-                and creditNum like concat('%', #{creditNum}, '%')
-            </if>
-            <if test="auditStatus != null and auditStatus != ''">
-                and auditStatus = #{auditStatus}
-            </if>
-            <if test="unitIdFk != null and unitIdFk != ''">
-                and unitIdFk = #{unitIdFk}
-            </if>
-            <if test="(auditStatus == null or auditStatus == '') and auditStatusList != null and auditStatusList.size() > 0">
-                <foreach collection="auditStatusList" item="auditStatus" open="AND (" separator="OR" close=")">
-                    auditStatus = #{auditStatus,jdbcType=VARCHAR}
-                </foreach>
-            </if>
-        </where>
-    </select>
-    <select id="getSubCompany2" parameterType="com.glxp.api.req.auth.FilterCompanyRequest"
-            resultType="com.glxp.api.entity.system.CompanyEntity">
-        SELECT *
-        FROM (sup_company
-        inner JOIN company_product_relevance
-        ON sup_company.customerId = company_product_relevance.customerId)
-        <where>
-            <if test="customerId != null and customerId != ''">
-                and parentIdFk = #{customerId}
-            </if>
-            <if test="companyName != null and companyName != ''">
-                and companyName like concat('%', #{companyName}, '%')
-            </if>
-            <if test="creditNum != null and creditNum != ''">
-                and creditNum like concat('%', #{creditNum}, '%')
-            </if>
-            <if test="auditStatus != null and auditStatus != ''">
-                and (sup_company.auditStatus = #{auditStatus}
-                or company_product_relevance.auditStatus = #{auditStatus}
-                )
-            </if>
-            <if test="(auditStatus == null or auditStatus == '') and auditStatusList != null and auditStatusList.size() > 0">
-                <foreach collection="auditStatusList" item="auditStatus" open="AND (" separator="OR" close=")">
-                    auditStatus = #{auditStatus,jdbcType=VARCHAR}
-                </foreach>
-            </if>
-        </where>
-    </select>
 
     <update id="modifyCompany" parameterType="com.glxp.api.entity.system.CompanyEntity">
         UPDATE sup_company
@@ -266,16 +211,6 @@
                 #{filePath3},
                 #{filePath4}, #{unitIdFk})
     </insert>
-    <select id="findKey" parameterType="java.lang.String"
-            resultType="com.glxp.api.entity.auth.AliKeyEntity">
-        SELECT sup_company.refEntId,
-               sup_company.entId,
-               alicert.appKey,
-               alicert.appSecret
-        from sup_company
-                 INNER JOIN alicert on sup_company.certIdFk = alicert.id
-        where sup_company.customerId = #{customerId}
-    </select>
 
 
 </mapper>

src/main/resources/mybatis/mapper/system/SysServerLogDao.xml

@@ -0,0 +1,5 @@
+<?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.glxp.api.dao.system.SysServerLogDao">
+
+</mapper>

src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml

@@ -30,12 +30,6 @@
         order by update_time desc
     </select>
 
-    <select id="findSystemPDFTemplate" parameterType="com.glxp.api.req.system.FilterPdfTemplateRequest"
-            resultType="com.glxp.api.entity.system.SystemPDFTemplateEntity">
-        SELECT *
-        FROM sys_pdf_template
-        WHERE id = #{id}
-    </select>
 
     <update id="updateEntity" parameterType="com.glxp.api.req.system.SysPdfTemplateSaveRequest">
         UPDATE sys_pdf_template

src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml

@@ -2,11 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
 <mapper namespace="com.glxp.api.dao.system.SystemPDFTemplateRelevanceDao">
-    <select id="listByCustomerId" resultType="com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity">
-        SELECT templateId
-        FROM sys_pdf_template_relevance
-        where customerId = #{customerId}
-    </select>
 
     <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
             resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
@@ -35,32 +30,6 @@
         </where>
     </select>
 
-
-    <select id="listByCustomerIdIn" resultType="com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity">
-        SELECT *
-        FROM sys_pdf_template_relevance
-        where customerId in
-        <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </select>
-
-    <select id="listByTemplateId" resultType="com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity">
-        SELECT customerId
-        FROM sys_pdf_template_relevance
-        where templateId = #{templateId}
-    </select>
-
-    <insert id="insertSystemPDFTemplateRelevanceAll">
-        INSERT INTO sys_pdf_template_relevance
-            (templateId, customerId)
-        VALUES
-        <foreach collection="list" item="item" separator=",">
-            <if test="item.templateId != null and item.customerId != null">
-                (#{item.templateId}, #{item.customerId})
-            </if>
-        </foreach>
-    </insert>
     <select id="selectByLabelId" parameterType="java.lang.String"
             resultType="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity">
         select *
@@ -129,30 +98,6 @@
         where id = #{id}
     </delete>
 
-    <select id="selectModuleldAndAction" resultType="com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity">
-        SELECT *
-        FROM sys_pdf_template_relevance
-        <where>
-            <if test="moduleId != null">
-                AND `moduleId` = #{moduleId}
-            </if>
-            <if test="localAction != null">
-                AND `localAction` = #{localAction}
-            </if>
-        </where>
-    </select>
 
-    <select id="selectNameAndAction" resultType="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
-        SELECT *
-        FROM sys_pdf_template_relevance_code
-        <where>
-            <if test="name != null">
-                AND `name` = #{name}
-            </if>
-            <if test="localAction != null">
-                AND `localAction` = #{localAction}
-            </if>
-        </where>
-    </select>
 
 </mapper>

src/main/resources/mybatis/mapper/system/ThirdSysApiDao.xml

@@ -14,14 +14,5 @@
         </where>
     </select>
 
-    <update id="modifySysApi" parameterType="com.glxp.api.entity.system.ThirdSysApiEntity">
-       UPDATE sys_thirdsys_api SET
-       name = #{name},
-       apiUrl = #{apiUrl},
-       guideUrl = #{guideUrl},
-       remark = #{remark}
-       where id = #{id}
-    </update>
-
 
 </mapper>