From e516ccb2be739021ce63eb91942edc679f791242 Mon Sep 17 00:00:00 2001 From: yqy Date: Mon, 4 Sep 2023 17:08:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E8=AE=B0=E5=BD=95=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=92=8C=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClueFollowRecordController.java | 38 --------------- .../entity/ClueFollowRecordEntity.java | 46 ------------------- .../distribute/entity/ClueStageEntity.java | 10 ---- .../mapper/ClueFollowRecordMapper.java | 8 ---- .../service/ClueFollowRecordService.java | 10 ---- .../impl/ClueFollowRecordServiceImpl.java | 35 -------------- .../service/impl/ClueServiceImpl.java | 23 ---------- pom.xml | 36 --------------- 8 files changed, 206 deletions(-) delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/controller/ClueFollowRecordController.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/entity/ClueFollowRecordEntity.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/mapper/ClueFollowRecordMapper.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/ClueFollowRecordService.java delete mode 100644 admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueFollowRecordServiceImpl.java diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueFollowRecordController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/ClueFollowRecordController.java deleted file mode 100644 index 9ed27af..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueFollowRecordController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.baiye.modules.distribute.controller; - -import com.baiye.modules.distribute.entity.ClueFollowRecordEntity; -import com.baiye.modules.distribute.service.ClueFollowRecordService; -import com.baiye.result.BaseResultCode; -import com.baiye.result.R; -import com.baiye.validation.group.CreateGroup; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RequiredArgsConstructor -@RestController -@Tag(name = "资源跟进记录API") -@RequestMapping("/clueFollow") -public class ClueFollowRecordController { - - private final ClueFollowRecordService clueFollowRecordService; - - @PostMapping("/add") - @Operation(summary = "新增线索跟进记录", description = "新增线索跟进记录") - public R add(@Validated({ CreateGroup.class }) @RequestBody ClueFollowRecordEntity clueStageEntity) { - return clueFollowRecordService.add(clueStageEntity) ? R.ok() - : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "添加失败"); - } - - @DeleteMapping("/delAll") - @Operation(summary = "ID删除线索阶段") - public R deleteByUserId(@RequestBody List ids) { - return clueFollowRecordService.removeBatchByIds(ids) ? R.ok() - : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "删除失败"); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueFollowRecordEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/ClueFollowRecordEntity.java deleted file mode 100644 index 23fef84..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueFollowRecordEntity.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.baiye.modules.distribute.entity; - -import com.baiye.entity.BaseEntity; -import com.baiye.validation.group.CreateGroup; -import com.baiye.validation.group.UpdateGroup; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.List; - -@Getter -@Setter -@ToString -@TableName("tb_clue_follow_record") -@Schema(title = "线索跟进记录表") -public class ClueFollowRecordEntity extends BaseEntity { - - @TableId - @Schema(title = "ID") - @NotNull(message = "ID不能为空", groups = { UpdateGroup.class }) - private Long id; - - @Schema(title = "线索ID") - @NotNull(message = "线索ID不能为空", groups = { CreateGroup.class }) - private Long clueId; - - @Schema(title = "线索阶段ID") - @NotNull(message = "线索阶段ID不能为空", groups = { CreateGroup.class }) - private Long clueStageId; - - @Schema(title = "跟进信息") - private String recordInfo; - - @Schema(title = "跟进信息集合") - @TableField(exist = false) - @NotEmpty(message = "跟进信息不能为空", groups = { CreateGroup.class }) - private List recordInfoList; - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueStageEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/ClueStageEntity.java index eed6a8d..8725bd1 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueStageEntity.java +++ b/admin/src/main/java/com/baiye/modules/distribute/entity/ClueStageEntity.java @@ -3,7 +3,6 @@ package com.baiye.modules.distribute.entity; import com.baiye.entity.BaseEntity; import com.baiye.validation.group.CreateGroup; import com.baiye.validation.group.UpdateGroup; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -13,12 +12,7 @@ import lombok.ToString; import org.springframework.validation.annotation.Validated; import javax.validation.constraints.NotNull; -import java.util.List; -/** - * @Author YQY - * @Date 2023/8/15 - */ @Getter @Setter @ToString @@ -42,8 +36,4 @@ public class ClueStageEntity extends BaseEntity { @NotNull(message = "线索阶段排序不能为空", groups = { CreateGroup.class }) private Integer sort; - @Schema(title = "线索阶段记录") - @TableField(exist = false) - private List clueFollowRecordList; - } diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueFollowRecordMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueFollowRecordMapper.java deleted file mode 100644 index 1c0063f..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueFollowRecordMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baiye.modules.distribute.mapper; - -import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; -import com.baiye.modules.distribute.entity.ClueFollowRecordEntity; - -public interface ClueFollowRecordMapper extends ExtendMapper { - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/ClueFollowRecordService.java b/admin/src/main/java/com/baiye/modules/distribute/service/ClueFollowRecordService.java deleted file mode 100644 index b044d15..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/ClueFollowRecordService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.baiye.modules.distribute.service; - -import com.baiye.extend.mybatis.plus.service.ExtendService; -import com.baiye.modules.distribute.entity.ClueFollowRecordEntity; - -public interface ClueFollowRecordService extends ExtendService { - - boolean add(ClueFollowRecordEntity clueStageEntity); - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueFollowRecordServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueFollowRecordServiceImpl.java deleted file mode 100644 index 974b23b..0000000 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueFollowRecordServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.baiye.modules.distribute.service.impl; - -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baiye.modules.distribute.entity.ClueFollowRecordEntity; -import com.baiye.modules.distribute.mapper.ClueFollowRecordMapper; -import com.baiye.modules.distribute.service.ClueFollowRecordService; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -@Service -@Slf4j -public class ClueFollowRecordServiceImpl extends ExtendServiceImpl - implements ClueFollowRecordService { - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean add(ClueFollowRecordEntity entity) { - List list = new ArrayList<>(); - List recordInfoList = entity.getRecordInfoList(); - for (String recordInfo : recordInfoList) { - ClueFollowRecordEntity clueFollowRecordEntity = new ClueFollowRecordEntity(); - BeanUtils.copyProperties(entity, clueFollowRecordEntity); - clueFollowRecordEntity.setRecordInfo(recordInfo); - list.add(clueFollowRecordEntity); - } - return SqlHelper.retBool(baseMapper.insertBatchSomeColumn(list)); - } - -} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java index 5be34d8..36ae976 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java @@ -8,7 +8,6 @@ import com.baiye.domain.PageResult; import com.baiye.modules.distribute.converter.ClueConverter; import com.baiye.modules.distribute.dto.ClueDTO; import com.baiye.modules.distribute.entity.*; -import com.baiye.modules.distribute.mapper.ClueFollowRecordMapper; import com.baiye.modules.distribute.mapper.ClueMapper; import com.baiye.modules.distribute.mapper.ClueRecordMapper; import com.baiye.modules.distribute.qo.ClueQo; @@ -20,7 +19,6 @@ import com.baiye.security.util.SecurityUtils; import com.baiye.util.AESUtils; import com.baiye.util.MobileUtil; import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import lombok.RequiredArgsConstructor; @@ -45,8 +43,6 @@ public class ClueServiceImpl extends ExtendServiceImpl i private final ClueStageService clueStageService; - private final ClueFollowRecordMapper clueFollowRecordMapper; - private final SecurityProperties securityProperties; @Override @@ -163,25 +159,6 @@ public class ClueServiceImpl extends ExtendServiceImpl i List organizeEntities = labelOrganizeService.queryUserList(whichUserId); // 查询上级用户阶段 List clueStageEntities = clueStageService.queryUserList(whichUserId); - if (CollUtil.isNotEmpty(clueStageEntities)) { - List clueStageIds = clueStageEntities.stream() - .map(ClueStageEntity::getClueStageId) - .collect(Collectors.toList()); - // 查询阶段的记录 - List clueFollowRecordEntities = clueFollowRecordMapper.selectList( - new LambdaQueryWrapper().eq(ClueFollowRecordEntity::getClueId, clueId) - .in(ClueFollowRecordEntity::getClueStageId, clueStageIds)); - // 记录放入阶段中 - if (CollUtil.isNotEmpty(clueFollowRecordEntities)) { - Map> map = clueFollowRecordEntities.stream() - .collect(Collectors.groupingBy(ClueFollowRecordEntity::getClueStageId)); - for (ClueStageEntity clueStageEntity : clueStageEntities) { - if (map.containsKey(clueStageEntity.getClueStageId())) { - clueStageEntity.setClueFollowRecordList(map.get(clueStageEntity.getClueStageId())); - } - } - } - } clueVO.setOrganizeEntities(organizeEntities); clueVO.setClueStageEntities(clueStageEntities); diff --git a/pom.xml b/pom.xml index c69687d..77506ff 100644 --- a/pom.xml +++ b/pom.xml @@ -518,19 +518,6 @@ - - io.spring.javaformat - spring-javaformat-maven-plugin - - - - validate - - true - validate - - - org.codehaus.mojo flatten-maven-plugin @@ -558,11 +545,6 @@ - - io.spring.javaformat - spring-javaformat-maven-plugin - ${spring-javaformat-checkstyle.version} - org.apache.maven.plugins maven-compiler-plugin @@ -617,23 +599,5 @@ - - - hccake - chengbohua@foxmail.com - - - - - MIT License - http://www.opensource.org/licenses/mit-license.php - repo - - - - https://github.com/hccake/ballcat - https://github.com/hccake/ballcat.git - https://github.com/hccake -