diff --git a/src/main/java/com/spring/modules/sift/entity/QuerySavedDetail.java b/src/main/java/com/spring/modules/sift/entity/QuerySavedDetail.java index ee22a477..cee86ad0 100644 --- a/src/main/java/com/spring/modules/sift/entity/QuerySavedDetail.java +++ b/src/main/java/com/spring/modules/sift/entity/QuerySavedDetail.java @@ -1,5 +1,6 @@ package com.spring.modules.sift.entity; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/spring/modules/sift/mapper/QuerySavedDetailMapper.java b/src/main/java/com/spring/modules/sift/mapper/QuerySavedDetailMapper.java index 52cc3a6c..2ae505c6 100644 --- a/src/main/java/com/spring/modules/sift/mapper/QuerySavedDetailMapper.java +++ b/src/main/java/com/spring/modules/sift/mapper/QuerySavedDetailMapper.java @@ -3,8 +3,12 @@ package com.spring.modules.sift.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.spring.modules.sift.entity.QuerySavedDetail; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; @Mapper public interface QuerySavedDetailMapper extends BaseMapper { + void insertBatch(@Param("list") List collect); } diff --git a/src/main/java/com/spring/modules/sift/utils/QueryCriteriaConstructorDefault.java b/src/main/java/com/spring/modules/sift/utils/QueryCriteriaConstructorDefault.java index 9c042341..d2aa342d 100644 --- a/src/main/java/com/spring/modules/sift/utils/QueryCriteriaConstructorDefault.java +++ b/src/main/java/com/spring/modules/sift/utils/QueryCriteriaConstructorDefault.java @@ -271,6 +271,7 @@ public class QueryCriteriaConstructorDefault implements QueryCriteriaConstructor BeanUtils.copyProperties(item,detail); detail.setItemNo(finalHeader.getItemNo()); detail.setItemDesc(finalHeader.getItemDesc()); + detail.setUserId(finalHeader.getUserId()); detail.setDtsName(finalHeader.getDtsName()); querySavedDetailService.save(detail); }); diff --git a/src/main/java/com/spring/modules/sift/utils/QueryUserSettingUtils.java b/src/main/java/com/spring/modules/sift/utils/QueryUserSettingUtils.java index 764ba9fa..8e9542f1 100644 --- a/src/main/java/com/spring/modules/sift/utils/QueryUserSettingUtils.java +++ b/src/main/java/com/spring/modules/sift/utils/QueryUserSettingUtils.java @@ -2,9 +2,11 @@ package com.spring.modules.sift.utils; import com.spring.modules.sift.entity.QuerySavedDetail; import com.spring.modules.sift.entity.QuerySavedHeader; +import com.spring.modules.sift.mapper.QuerySavedDetailMapper; import com.spring.modules.sift.service.QuerySavedDetailService; import com.spring.modules.sift.service.QuerySavedHeaderService; import com.spring.modules.sift.vo.QuerySavedVo; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -15,6 +17,7 @@ import java.util.stream.Collectors; @Service +@Slf4j public class QueryUserSettingUtils { @Autowired @@ -23,6 +26,9 @@ public class QueryUserSettingUtils { @Autowired private QuerySavedDetailService querySavedDetailService; + @Autowired + private QuerySavedDetailMapper querySavedDetailMapper; + @Transactional public void lastQuery(QuerySavedVo querySavedVo){ // 1、判断参数 @@ -33,9 +39,6 @@ public class QueryUserSettingUtils { if (list.isEmpty()){ throw new RuntimeException("参数列表为空"); } - if (querySavedVo.getUserId() == null) { - throw new RuntimeException("querySavedVo用户ID为空"); - } // 2、判断是否存在上一次修改 List querySavedHeaders = querySavedHeaderService.lambdaQuery() .eq(QuerySavedHeader::getMenuId, querySavedVo.getMenuId()) @@ -52,9 +55,6 @@ public class QueryUserSettingUtils { querySavedHeader.setItemDesc("上一次查询"); querySavedHeaderService.save(querySavedHeader); }else { - if (querySavedHeader.getUserId()==null){ - throw new RuntimeException("querySavedHeader用户ID为空"); - } querySavedDetailService.lambdaUpdate(). eq(QuerySavedDetail::getMenuId,querySavedHeader.getMenuId()). eq(QuerySavedDetail::getUserId,querySavedHeader.getUserId()). @@ -62,9 +62,6 @@ public class QueryUserSettingUtils { } // 2-2、新增 QuerySavedHeader finalQuerySavedHeader = querySavedHeader; - if (finalQuerySavedHeader.getUserId()==null){ - throw new RuntimeException("finalQuerySavedHeader用户ID为空"); - } List collect = list.stream().map(queryUserSetting -> { QuerySavedDetail detail = new QuerySavedDetail(); detail.setMenuId(finalQuerySavedHeader.getMenuId()); @@ -84,6 +81,6 @@ public class QueryUserSettingUtils { detail.setITagId(queryUserSetting.getITagId()); return detail; }).collect(Collectors.toList()); - querySavedDetailService.saveBatch(collect); + querySavedDetailMapper.insertBatch(collect); } } diff --git a/src/main/resources/mapper/sift/QuerySavedDetailMapper.xml b/src/main/resources/mapper/sift/QuerySavedDetailMapper.xml new file mode 100644 index 00000000..6e0061ed --- /dev/null +++ b/src/main/resources/mapper/sift/QuerySavedDetailMapper.xml @@ -0,0 +1,11 @@ + + + + + INSERT INTO query_saved_detail (menu_id, user_id, DTS_name, item_no, item_desc, field_name, field_caption, symbol, formula, sort_by, order_seq, original_field, data_type, funs, LOV_seq_id, i_tag_id) + VALUES + + (#{item.menuId}, #{item.userId}, #{item.dtsName}, #{item.itemNo}, #{item.itemDesc}, #{item.fieldName}, #{item.fieldCaption}, #{item.symbol}, #{item.formula}, #{item.sortBy}, #{item.orderSeq}, #{item.originalField}, #{item.dataType}, #{item.funs}, #{item.lovSeqId}, #{item.iTagId}) + + + \ No newline at end of file