From 4f684daa948d3ec0ea10c7b80b5ff295499be872 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 4 Mar 2025 11:10:32 +0800 Subject: [PATCH] =?UTF-8?q?3/4=20system=20=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/dao/system/CompanyDao.java | 8 +-- .../com/glxp/api/dao/system/SetupDao.java | 6 +- .../api/dao/system/SyncDataBustypeDao.java | 1 - .../glxp/api/dao/system/SysServerLogDao.java | 10 +-- .../api/dao/system/SystemPDFTemplateDao.java | 3 - .../system/SystemPDFTemplateRelevanceDao.java | 42 +----------- .../glxp/api/dao/system/ThirdSysApiDao.java | 1 - .../SystemPDFTemplateRelevanceService.java | 4 +- ...SystemPDFTemplateRelevanceServiceImpl.java | 18 +---- .../mybatis/mapper/info/SetupDao.xml | 33 ---------- .../mybatis/mapper/system/CompanyDao.xml | 65 ------------------- .../mybatis/mapper/system/SysServerLogDao.xml | 5 ++ .../mapper/system/SystemPDFTemplateDao.xml | 6 -- .../system/SystemPDFTemplateRelevanceDao.xml | 55 ---------------- .../mybatis/mapper/system/ThirdSysApiDao.xml | 11 +--- 15 files changed, 16 insertions(+), 252 deletions(-) create mode 100644 src/main/resources/mybatis/mapper/system/SysServerLogDao.xml diff --git a/src/main/java/com/glxp/api/dao/system/CompanyDao.java b/src/main/java/com/glxp/api/dao/system/CompanyDao.java index 3b9dff1f..ece07261 100644 --- a/src/main/java/com/glxp/api/dao/system/CompanyDao.java +++ b/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 { CompanyEntity findCompany(@Param("customerId") String CustomerId); CompanyEntity findCompanyByName(String companyName); - List getSubCompany(FilterCompanyRequest companyRequest); - - List getSubCompany2(FilterCompanyRequest companyRequest); - List filterCompany(FilterCompanyRequest companyRequest); boolean modifyCompany(CompanyEntity companyEntity); @@ -27,5 +24,4 @@ public interface CompanyDao { boolean deleteCompany(Long customerId); - AliKeyEntity findKey(String customerId); } diff --git a/src/main/java/com/glxp/api/dao/system/SetupDao.java b/src/main/java/com/glxp/api/dao/system/SetupDao.java index 2ae7a77f..7c249c3f 100644 --- a/src/main/java/com/glxp/api/dao/system/SetupDao.java +++ b/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); + } diff --git a/src/main/java/com/glxp/api/dao/system/SyncDataBustypeDao.java b/src/main/java/com/glxp/api/dao/system/SyncDataBustypeDao.java index 9196f3ac..f3931fbd 100644 --- a/src/main/java/com/glxp/api/dao/system/SyncDataBustypeDao.java +++ b/src/main/java/com/glxp/api/dao/system/SyncDataBustypeDao.java @@ -12,7 +12,6 @@ public interface SyncDataBustypeDao extends BaseMapper { List findAll(); - void inserts(@Param("syncDataBustypeEntities") List syncDataBustypeEntities); } diff --git a/src/main/java/com/glxp/api/dao/system/SysServerLogDao.java b/src/main/java/com/glxp/api/dao/system/SysServerLogDao.java index 91acb7e1..908f5496 100644 --- a/src/main/java/com/glxp/api/dao/system/SysServerLogDao.java +++ b/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 { - - - List filterLog(FilterSetupRequest filterSetupRequest); +public interface SysServerLogDao extends BaseMapperPlus { - boolean insertLog(SysServerLogEntity sysServerLogEntity); } diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java index 9e93b3f3..c9c79534 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java @@ -15,9 +15,6 @@ public interface SystemPDFTemplateDao extends BaseMapperPlus listPDFTemplates(); - SystemPDFTemplateEntity findSystemPDFTemplate(FilterPdfTemplateRequest filterPdfTemplateRequest); - - boolean updateEntity(SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest); boolean insertEntity(SystemPDFTemplateEntity systemPDFTemplateEntity); diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java index 80b56fbc..6809093d 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java +++ b/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 { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); - /** - * 根据 customerId 查询 - * - * @param customerId 传入的 customerId - * @return - */ - List listByCustomerId(Long customerId); - - /** - * 根据 多个 customerId 查询 - * - * @param customerIds 传入的 customerIds - * @return - */ - List listByCustomerIdIn(List customerIds); - - /** - * 根据 template_id 查询 customer_id - * - * @param templateId 传入的 templateId - * @return - */ - List listByTemplateId(int templateId); - - /** - * 批量插入 - * - * @param systemPDFTemplateRelevanceEntityList - * @return - */ - int insertSystemPDFTemplateRelevanceAll(List systemPDFTemplateRelevanceEntityList); - - boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); + int 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); } diff --git a/src/main/java/com/glxp/api/dao/system/ThirdSysApiDao.java b/src/main/java/com/glxp/api/dao/system/ThirdSysApiDao.java index 8784eca6..9cfeffdf 100644 --- a/src/main/java/com/glxp/api/dao/system/ThirdSysApiDao.java +++ b/src/main/java/com/glxp/api/dao/system/ThirdSysApiDao.java @@ -11,5 +11,4 @@ public interface ThirdSysApiDao { List findSysApi(FilterSysApiRequest filterSysApiRequest); - boolean modifySysApi(ThirdSysApiEntity thirdSysApiEntity); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java index fede7e5d..6529130e 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java @@ -11,9 +11,7 @@ public interface SystemPDFTemplateRelevanceService { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); - int insertSystemPDFTemplateRelevanceAll(List systemPDFTemplateRelevanceEntityList); - - boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); + int insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); boolean deleteByCustomerId(Integer customerId); diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java index ba530a2b..82473f46 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java +++ b/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 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); } diff --git a/src/main/resources/mybatis/mapper/info/SetupDao.xml b/src/main/resources/mybatis/mapper/info/SetupDao.xml index 7e6bac6d..b012f4d0 100644 --- a/src/main/resources/mybatis/mapper/info/SetupDao.xml +++ b/src/main/resources/mybatis/mapper/info/SetupDao.xml @@ -3,37 +3,4 @@ - - - - - - UPDATE customer_set - - checkUpbill=#{checkUpbill}, - checkStock=#{checkStock}, - checkRepeat=#{checkRepeat}, - downloadRelation=#{downloadRelation}, - uploadTime=#{uploadTime}, - lastUploadDate=#{lastUploadDate}, - - WHERE customerId=#{customerId} - - - - - - replace INTO customer_set(customerId, - checkUpbill,checkStock,checkRepeat,downloadRelation,uploadTime,lastUploadDate) values - ( - #{customerId}, - #{checkUpbill}, #{checkStock} , #{checkRepeat}, #{downloadRelation} - ,#{uploadTime},#{lastUploadDate}) - - - - diff --git a/src/main/resources/mybatis/mapper/system/CompanyDao.xml b/src/main/resources/mybatis/mapper/system/CompanyDao.xml index 36467c2d..47eb9756 100644 --- a/src/main/resources/mybatis/mapper/system/CompanyDao.xml +++ b/src/main/resources/mybatis/mapper/system/CompanyDao.xml @@ -47,61 +47,6 @@ FROM sup_company where companyName = #{companyName} - - UPDATE sup_company @@ -266,16 +211,6 @@ #{filePath3}, #{filePath4}, #{unitIdFk}) - diff --git a/src/main/resources/mybatis/mapper/system/SysServerLogDao.xml b/src/main/resources/mybatis/mapper/system/SysServerLogDao.xml new file mode 100644 index 00000000..c1c7c880 --- /dev/null +++ b/src/main/resources/mybatis/mapper/system/SysServerLogDao.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml index d980af90..7b7440d1 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml @@ -30,12 +30,6 @@ order by update_time desc - UPDATE sys_pdf_template diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml index ea612809..5d9ee110 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml @@ -2,11 +2,6 @@ - - - - - - - - INSERT INTO sys_pdf_template_relevance - (templateId, customerId) - VALUES - - - (#{item.templateId}, #{item.customerId}) - - - - SELECT * - FROM sys_pdf_template_relevance - - - AND `moduleId` = #{moduleId} - - - AND `localAction` = #{localAction} - - - - diff --git a/src/main/resources/mybatis/mapper/system/ThirdSysApiDao.xml b/src/main/resources/mybatis/mapper/system/ThirdSysApiDao.xml index 2e469f63..f2064344 100644 --- a/src/main/resources/mybatis/mapper/system/ThirdSysApiDao.xml +++ b/src/main/resources/mybatis/mapper/system/ThirdSysApiDao.xml @@ -14,14 +14,5 @@ - - UPDATE sys_thirdsys_api SET - name = #{name}, - apiUrl = #{apiUrl}, - guideUrl = #{guideUrl}, - remark = #{remark} - where id = #{id} - - - \ No newline at end of file +