From 81c3775856badcd421751e928d2cee16fe8a0adc Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Wed, 4 Dec 2024 18:59:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java | 2 +- .../main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java | 2 +- .../com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java | 2 +- .../com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java | 6 +++--- ruoyi-admin/src/main/resources/mapper/UnitMapper.xml | 8 +++++++- .../java/com/ruoyi/framework/config/SecurityConfig.java | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java index 48bba95..d705ba5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java @@ -53,7 +53,7 @@ public interface AssetAppCpMapper extends BaseMapper { * @param taskId 任务id * @param btgyy 不通过原因 */ - @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ") + @Update("update asset_app_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ") void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java index a3218e3..08a1f6d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java @@ -45,7 +45,7 @@ public interface AssetEmailCpMapper extends BaseMapper { * @param taskId 任务id * @param btgyy 不通过原因 */ - @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ") + @Update("update asset_email_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ") void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java index a9e4b26..2c67231 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java @@ -46,7 +46,7 @@ public interface AssetOfficialAccountCpMapper extends BaseMapper emailNewList = appList.stream() + List emailNewList = emailCpPoListList.stream() .map(cpPo -> { AssetEmail current = new AssetEmail(); BeanUtils.copyProperties(cpPo, current); // 复制属性 @@ -572,7 +572,7 @@ public class AssetTaskServiceImpl extends ServiceImpl miniNewList = appList.stream() + List miniNewList = miniProgramsCpPoListList.stream() .map(cpPo -> { AssetMiniPrograms current = new AssetMiniPrograms(); BeanUtils.copyProperties(cpPo, current); // 复制属性 @@ -591,7 +591,7 @@ public class AssetTaskServiceImpl extends ServiceImpl officialNewList = appList.stream() + List officialNewList = officialAccountCpPoListList.stream() .map(cpPo -> { AssetOfficialAccount current = new AssetOfficialAccount(); BeanUtils.copyProperties(cpPo, current); // 复制属性 diff --git a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml index 66ff94b..18ba45f 100644 --- a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml @@ -148,7 +148,13 @@ FROM asset_task b where b.task_status = 1 AND FIND_IN_SET(a.nick_name, b.dwmc) - AND FIND_IN_SET(#{req.type}, b.type) + + AND ( + + FIND_IN_SET(#{type}, b.type) + + ) + ) AND a.del_flag = '0' diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 04cab7d..5d83220 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -115,7 +115,7 @@ public class SecurityConfig // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() -// .antMatchers("/unit/assetTask/**","/tc/**","/unit/assetLc/**","/tc/unit/**").permitAll() + .antMatchers("/unit/assetTask/**","/tc/**","/unit/assetLc/**","/tc/unit/**").permitAll() // 除上面外的所有请求全部需要鉴权认证 .antMatchers("/tc/without/**").permitAll() .anyRequest().authenticated(); From ca4b11be7c61ae23ba04ece0061533aeb1473337 Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Wed, 4 Dec 2024 20:31:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tc/service/impl/AssetTaskServiceImpl.java | 12 ++++++++---- .../main/resources/mapper/AssetAppMapper.xml | 2 +- .../resources/mapper/AssetCurrentMapper.xml | 2 +- .../main/resources/mapper/AssetEmailMapper.xml | 2 +- .../mapper/AssetMiniProgramsMapper.xml | 2 +- .../mapper/AssetOfficialAccountMapper.xml | 2 +- .../src/main/resources/mapper/UnitMapper.xml | 17 ++++++++++++++++- 7 files changed, 29 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java index 8bb1663..0a5a785 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java @@ -250,7 +250,8 @@ public class AssetTaskServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ssdw", part); queryWrapper.eq("isbf", 0); - List list = assetMiniProgramsService.list(queryWrapper); + queryWrapper.eq("del_flag", 0); + List list = assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw, part).eq(AssetMiniPrograms::getIsbf,0).eq(AssetMiniPrograms::getDelFlag,0).list(); List miniProgramsNewList = list.stream() .map(cpPo -> { AssetMiniProgramsCpPo assetMiniProgramsCpPo = new AssetMiniProgramsCpPo(); @@ -271,7 +272,8 @@ public class AssetTaskServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ssdw", part); queryWrapper.eq("isbf", 0); - List list = assetOfficialAccountService.list(queryWrapper); + queryWrapper.eq("del_flag", 0); + List list = assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw, part).eq(AssetOfficialAccount::getIsbf,0).eq(AssetOfficialAccount::getDelFlag,0).list(); List officialAccountProgramsNewList = list.stream() .map(cpPo -> { AssetOfficialAccountCpPo assetOfficialAccountCpPo = new AssetOfficialAccountCpPo(); @@ -292,7 +294,8 @@ public class AssetTaskServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ssdw", part); queryWrapper.eq("isbf", 0); - List list = assetEmailService.list(queryWrapper); + queryWrapper.eq("del_flag", 0); + List list = assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw, part).eq(AssetEmail::getIsbf,0).eq(AssetEmail::getDelFlag,0).list();; List emailCpNewList = list.stream() .map(cpPo -> { AssetEmailCpPo emailCpPo = new AssetEmailCpPo(); @@ -313,7 +316,8 @@ public class AssetTaskServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ssdw", part); queryWrapper.eq("isbf", 0); - List list = assetAppService.list(queryWrapper); + queryWrapper.eq("del_flag", 0); + List list = assetAppService.lambdaQuery().eq(AssetApp::getSsdw, part).eq(AssetApp::getIsbf,0).eq(AssetApp::getDelFlag,0).list(); List appCpNewList = list.stream() .map(cpPo -> { AssetAppCpPo appCpPo = new AssetAppCpPo(); diff --git a/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml index 1e847a5..c693384 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml @@ -36,7 +36,7 @@ diff --git a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml index d1d6cc7..072a510 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml @@ -462,6 +462,6 @@ select count(*) from asset_current - where dwmc = #{part} and isbf=0 + where dwmc = #{part} and isbf=0 and del_flag=0 \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml index d7c82c5..cbfd6fb 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml @@ -36,7 +36,7 @@ diff --git a/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml index adf6d1b..80a65e2 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml @@ -37,7 +37,7 @@ diff --git a/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml index 8b56f72..7d70ba3 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml @@ -16,7 +16,7 @@