From 6a78d39ae6cf9ca7e7156e707d95ad3708aa5d99 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 8 Aug 2024 17:22:41 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BC=A0=E7=A9=BA=E7=BD=AE=EF=BC=9Bfix?= =?UTF-8?q?=EF=BC=9A=E6=A0=87=E7=AD=BE=E9=9A=90=E8=97=8F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9Bopt:=20=E6=88=90=E6=9C=AC=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E5=8C=BA=E5=9F=9F=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsRegion2Controller.java | 22 ++++++----- .../bms/controller/BmsRegionController.java | 23 ++++++----- .../controller/ExlTableDataController.java | 13 ++++++- .../tag/controller/TagDataController.java | 4 +- .../qs/serve/modules/tag/entity/TagData.java | 3 ++ .../modules/tag/mapper/TagDataMapper.java | 10 +++++ src/main/java/com/qs/serve/task/TagTask.java | 39 +++++++++++++++++++ .../resources/mapper/goods/GoodsSpuMapper.xml | 2 +- .../resources/mapper/tag/TagDataMapper.xml | 4 ++ 9 files changed, 98 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/qs/serve/task/TagTask.java diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java index 7a3a371c..87b13f04 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java @@ -30,9 +30,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -96,18 +94,24 @@ public class BmsRegion2Controller { String userId = AuthContextUtils.getSysUserId(); List userIds = postUserService.listByChildIds(userId); userIds.add(userId); - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(BmsRegionUser::getType,1); - lqw.in(BmsRegionUser::getUserId,userIds); - List regionUsers = bmsRegionUserService.list(lqw); - List regionIds = regionUsers.stream().map(BmsRegionUser::getRegionId).collect(Collectors.toList()); + + Set regionIds = new HashSet<>(); + for (String uid : userIds) { + BmsSupplier param = new BmsSupplier(); + param.setCurrUserId(uid); + List list = bmsSupplierService.selectSupplierList(param); + for (BmsSupplier supplier : list) { + regionIds.addAll(supplier.listBizRegionIds()); + } + } + if(StringUtils.hasText(supplierId)){ BmsSupplier supplier = bmsSupplierService.getById(supplierId); if(supplier.listBizRegionIds()!=null){ regionIds.addAll(supplier.listBizRegionIds()); } } - return buildTreeSortUpward(regionIds); + return buildTreeSortUpward(new ArrayList<>(regionIds)); } /** diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index 61fbcf11..11832321 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java @@ -30,10 +30,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -160,16 +157,22 @@ public class BmsRegionController { String userId = AuthContextUtils.getSysUserId(); List userIds = postUserService.listByChildIds(userId); userIds.add(userId); - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(BmsRegionUser::getType,0); - lqw.in(BmsRegionUser::getUserId,userIds); - List regionUsers = bmsRegionUserService.list(lqw); - List regionIds = regionUsers.stream().map(BmsRegionUser::getRegionId).collect(Collectors.toList()); + + Set regionIds = new HashSet<>(); + for (String uid : userIds) { + BmsSupplier param = new BmsSupplier(); + param.setCurrUserId(uid); + List list = bmsSupplierService.selectSupplierList(param); + for (BmsSupplier supplier : list) { + regionIds.addAll(supplier.listBizRegionIds()); + } + } + if(StringUtils.hasText(supplierId)){ BmsSupplier supplier = bmsSupplierService.getById(supplierId); regionIds.addAll(supplier.listSaleRegionIds()); } - return buildRegionTreeByRegionIds(stopFlag, regionIds); + return buildRegionTreeByRegionIds(stopFlag, new ArrayList<>(regionIds)); } @Nullable diff --git a/src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java b/src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java index 8730d1b5..4f06d61e 100644 --- a/src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java +++ b/src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java @@ -307,7 +307,18 @@ public class ExlTableDataController { this.appendErrorMsg(ErrMsgKey, jsonObject, columnConf); continue; } - insertSql.append("'"+string+"'"); + + /** + * date、datetime类型设置了非必填，如果导入excel是空的，则导入失败。应该是代码处理时插入空白值报错，而不是null值，需修复 + */ + if(columnConf.getColumnType().equals(ExlConst.DATE_TYPE)&&!StringUtils.hasText(string)){ + insertSql.append(" null "); + }else if(columnConf.getColumnType().equals(ExlConst.DATETIME_TYPE)&&!StringUtils.hasText(string)){ + insertSql.append(" null "); + }else { + insertSql.append("'"+string+"'"); + } + if(columnConf.getColumnType().equals(ExlConst.TYPE_USER_CODE)){ insertSql.append(","); String name = ""; diff --git a/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java b/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java index 40dcf424..5b3a400b 100644 --- a/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java +++ b/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java @@ -87,6 +87,8 @@ public class TagDataController { @GetMapping("batchQueryPage") public R queryBatchPage(TagData query){ PageUtil.startPage(); + //忽略日期拦截 + query.setIgnoreDateFlag(1); List tagDataList = tagDataService.selectList(query); return R.byPageHelperList(tagDataList); } @@ -107,7 +109,7 @@ public class TagDataController { * @param param * @return */ - @PostMapping("updateById/{id}") + @PostMapping("updateById") public R updateById(@RequestBody TagData param){ TagData data = new TagData(); data.setId(param.getId()); diff --git a/src/main/java/com/qs/serve/modules/tag/entity/TagData.java b/src/main/java/com/qs/serve/modules/tag/entity/TagData.java index afe3ee42..e1051fd5 100644 --- a/src/main/java/com/qs/serve/modules/tag/entity/TagData.java +++ b/src/main/java/com/qs/serve/modules/tag/entity/TagData.java @@ -113,6 +113,9 @@ public class TagData implements Serializable { @TableField(exist = false) private List queryTagIds; + @TableField(exist = false) + private Integer ignoreDateFlag; + public static TagData toNewObject(TagData source){ TagData data = new TagData(); data.setId(source.getId()); diff --git a/src/main/java/com/qs/serve/modules/tag/mapper/TagDataMapper.java b/src/main/java/com/qs/serve/modules/tag/mapper/TagDataMapper.java index e9df518d..7757603f 100644 --- a/src/main/java/com/qs/serve/modules/tag/mapper/TagDataMapper.java +++ b/src/main/java/com/qs/serve/modules/tag/mapper/TagDataMapper.java @@ -1,8 +1,10 @@ package com.qs.serve.modules.tag.mapper; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.tag.entity.TagData; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -13,6 +15,14 @@ import java.util.List; */ public interface TagDataMapper extends BaseMapper { + /** + * 移除逾期数据 + * @return + */ + @InterceptorIgnore(tenantLine = "1") + @Update("update tag_data set del_flag = 1 where end_date < now() ") + int deleteExpireData(); + List selectList(@Param("query") TagData param); } diff --git a/src/main/java/com/qs/serve/task/TagTask.java b/src/main/java/com/qs/serve/task/TagTask.java new file mode 100644 index 00000000..56c26367 --- /dev/null +++ b/src/main/java/com/qs/serve/task/TagTask.java @@ -0,0 +1,39 @@ +package com.qs.serve.task; + +import com.qs.serve.common.framework.redis.RedisService; +import com.qs.serve.common.model.consts.RedisCacheKeys; +import com.qs.serve.common.util.AuthContextUtils; +import com.qs.serve.modules.his.service.HisUserSupplierTempService; +import com.qs.serve.modules.tag.mapper.TagDataMapper; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.concurrent.TimeUnit; + +/** + * @author YenHex + * @since 2023/5/31 + */ +@Slf4j +@Component +@AllArgsConstructor +@ConditionalOnProperty(value = "project.task", havingValue = "true") +public class TagTask { + + private TagDataMapper tagDataMapper; + + /** + * 数据处理10-15分钟，清理过期数据 + */ + @Scheduled(cron="0 0/1 * * * ?") + public void buildTempTable(){ + tagDataMapper.deleteExpireData(); + } + + +} diff --git a/src/main/resources/mapper/goods/GoodsSpuMapper.xml b/src/main/resources/mapper/goods/GoodsSpuMapper.xml index 3aae16a0..ebfaf198 100644 --- a/src/main/resources/mapper/goods/GoodsSpuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSpuMapper.xml @@ -160,7 +160,7 @@ and `goods_spu`.`id` = #{query.id} and `goods_spu`.`spu_code` like concat('%', #{query.spuCode},'%') - and (`goods_spu`.`spu_code` like concat('%', #{query.spuCodeOrName},'%') or `goods_spu`.`spu_code` like concat('%', #{query.spuCodeOrName},'%') ) + and (`goods_spu`.`spu_code` like concat('%', #{query.spuCodeOrName},'%') or `goods_spu`.`name` like concat('%', #{query.spuCodeOrName},'%') ) and `goods_spu`.`name` like concat('%', #{query.name},'%') and `goods_spu`.`category_first` = #{query.categoryFirst} diff --git a/src/main/resources/mapper/tag/TagDataMapper.xml b/src/main/resources/mapper/tag/TagDataMapper.xml index 08dbb72b..8b278701 100644 --- a/src/main/resources/mapper/tag/TagDataMapper.xml +++ b/src/main/resources/mapper/tag/TagDataMapper.xml @@ -49,6 +49,10 @@ left join tag_info on tag_data.tag_id = tag_info.id and tag_info.del_flag = 0 and `tag_data`.del_flag = 0 + + and (tag_data.start_date is null or tag_data.start_date >= now() ) + and (tag_data.end_date is null or tag_data.end_date <= now() ) + and `tag_data`.`id` = #{query.id} and `tag_data`.`tag_name` = #{query.tagName} and `tag_data`.`tag_id` = #{query.tagId}