From 198561f8f1392a0ea96668763cb2dc7cbed328d4 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Sun, 10 Dec 2023 12:03:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/system/ClewController.java | 10 +- .../web/controller/tool/MinioController.java | 31 ---- .../resources/templates/system/clew/clew.html | 25 ++- .../ruoyi/common/utils/minio/MinioUtils.java | 165 ------------------ .../java/com/ruoyi/system/domain/Clew.java | 2 + .../resources/mapper/system/ClewMapper.xml | 19 ++ 6 files changed, 48 insertions(+), 204 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/MinioController.java delete mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/minio/MinioUtils.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java index 9932c35a..ad19ac8e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java @@ -63,8 +63,10 @@ public class ClewController extends BaseController @RequiresPermissions("system:clew:view") @GetMapping() - public String clew() + public String clew(ModelMap modelMap) { + List users = sysUserService.selectUserList(new SysUser()); + modelMap.put("users", users); return prefix + "/clew"; } @@ -138,6 +140,10 @@ public class ClewController extends BaseController if (CollectionUtils.isNotEmpty(result)){ return AjaxResult.success(); } + + // 不存在手机号则入库线索 + clewService.insertClew(clew); + // 将初始线索设置成已跟踪 ClewPhone model = new ClewPhone(); model.setPhone(clew.getPhone()); @@ -184,7 +190,7 @@ public class ClewController extends BaseController e.printStackTrace(); log.error("回调oppo报错:{}", e.getMessage()); } - return toAjax(clewService.insertClew(clew)); + return AjaxResult.success(); } //huawei-归因 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/MinioController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/MinioController.java deleted file mode 100644 index cf587657..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/MinioController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.ruoyi.web.controller.tool; - -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.minio.MinioUtils; -import io.swagger.annotations.ApiOperation; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; - -/** - *

minio文件服务

- * @author clunt - */ -@Controller -@RequestMapping("/tool/minio") -public class MinioController { - - @ResponseBody - @PostMapping("/upload") - @ApiOperation(value = "文件上传管理-添加minio") - public AjaxResult add(@RequestPart("file") MultipartFile file) throws IOException { - String url = MinioUtils.uploadFile(file); - return AjaxResult.success(url); - } - -} diff --git a/ruoyi-admin/src/main/resources/templates/system/clew/clew.html b/ruoyi-admin/src/main/resources/templates/system/clew/clew.html index f11adb80..5f44d6c3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/clew/clew.html +++ b/ruoyi-admin/src/main/resources/templates/system/clew/clew.html @@ -15,16 +15,29 @@
  • - - + 客服:
  • - - + App来源：
  • - - + 状态： +
    • +
  • + + + - +
  •  搜索 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/minio/MinioUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/minio/MinioUtils.java deleted file mode 100644 index 05c38a14..00000000 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/minio/MinioUtils.java +++ /dev/null @@ -1,165 +0,0 @@ -package com.ruoyi.common.utils.minio; - -import io.minio.*; -import io.minio.messages.Bucket; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.PostConstruct; -import java.io.InputStream; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -/** - *

    minio文件服务管理

    - * - * @author clunt - */ -@Slf4j -@Component -public class MinioUtils { - - private static final String MINIO_KEY = "Wiu3PA9eP6wNjrGe"; - private static final String MINIO_SECRET = "Q2th7VQEuUEc2r6wkywRdygn5c7T71LU"; - private static final String MINIO_URL = "http://211.99.98.27:9001"; - - private static final ThreadLocal dateFormatThreadLocal = ThreadLocal.withInitial(()->new SimpleDateFormat("_yyyyMMddHHmmss")); - - private static final String MINIO_BUCKET = "bwy"; - public static MinioClient minioClient; - /** - * 初始化minio配置 - */ - @PostConstruct - public void init() { - try { - log.info("Minio Initialize........................"); - minioClient = MinioClient.builder().endpoint(MINIO_URL).credentials(MINIO_KEY, MINIO_SECRET).build(); - createBucket(MINIO_BUCKET); - log.info("Minio Initialize........................successful"); - } catch (Exception e) { - e.printStackTrace(); - log.error("初始化minio配置异常:", e.fillInStackTrace()); - } - } - - /** - * 判断bucket是否存在 - */ - @SneakyThrows(Exception.class) - public static boolean bucketExists(String bucketName) { - return minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build()); - } - - /** - * 创建bucket - */ - @SneakyThrows(Exception.class) - public static void createBucket(String bucketName) { - boolean isExist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build()); - if (!isExist) { - minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build()); - } - } - - /** - * 获取全部bucket - */ - @SneakyThrows(Exception.class) - public static List getAllBuckets() { - return minioClient.listBuckets(); - } - - /** - * 文件上传 - * - * @param bucketName: 桶名 - * @param fileName: 文件名 - * @param filePath: 文件路径 - */ - @SneakyThrows(Exception.class) - public static void upload(String bucketName, String fileName, String filePath) { - minioClient.putObject(PutObjectArgs.builder().bucket(bucketName).object(fileName).build()); - } - - /** - * 上传文件 - * 返回可以直接预览文件的URL - */ - public static String uploadFile(MultipartFile file) { - try { - //如果存储桶不存在则创建 - if (!bucketExists(MINIO_BUCKET)) { - createBucket(MINIO_BUCKET); - } - String contentType = file.getContentType(); - String originalFilename = file.getOriginalFilename(); - //得到文件流 - InputStream inputStream = file.getInputStream(); - //保证文件不重名(并且没有特殊字符) - String fileName = MINIO_BUCKET + dateFormatThreadLocal.get().format(new Date()) + originalFilename; - minioClient.uploadObject(UploadObjectArgs.builder() - .bucket(MINIO_BUCKET) - .object(file.getName()) - .filename(originalFilename) - .build() - ); - return getPreviewFileUrl(MINIO_BUCKET, fileName); - } catch (Exception e) { - e.printStackTrace(); - return ""; - } - } - - /** - * 文件上传 - * 返回下载文件url地址 和下面upload方法仅传参不同 - * bucketName 也可以直接从ParamConfig对象中获取 - */ -// @SneakyThrows(Exception.class) -// public static String upload(String bucketName, String fileName, InputStream stream) { -// //bucketName, fileName, stream, new PutObjectOptions(stream.available(), -1) -// minioClient.putObject(PutObjectArgs.builder()..build())); -// return getPreviewFileUrl(bucketName, fileName); -// } -// -// /** -// * 文件上传 -// * 返回下载文件url地址 和上面upload方法仅传参不同 -// */ -// @SneakyThrows(Exception.class) -// public static String upload(String bucketName, MultipartFile file) { -// final InputStream is = file.getInputStream(); -// final String fileName = file.getOriginalFilename(); -// minioClient.putObject(bucketName, fileName, is, new PutObjectOptions(is.available(), -1)); -// is.close(); -// return getPreviewFileUrl(bucketName, fileName); -// } - - /** - * 删除文件 - * - * @param bucketName: 桶名 - * @param fileName: 文件名 - */ - @SneakyThrows(Exception.class) - public static void deleteFile(String bucketName, String fileName) { - minioClient.removeObject(RemoveObjectArgs.builder().bucket(bucketName).object(fileName).build()); - } - - /** - * 获取minio文件的下载或者预览地址 - * 取决于调用本方法的方法中的PutObjectOptions对象有没有设置contentType - * - * @param bucketName: 桶名 - * @param fileName: 文件名 - */ - @SneakyThrows(Exception.class) - public static String getPreviewFileUrl(String bucketName, String fileName) { - return minioClient.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder().bucket(bucketName).object(fileName).build()); - } - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java index b8ab353f..8d51e079 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java @@ -127,6 +127,8 @@ public class Clew extends BaseEntity @Excel(name = "客户情况备注") private String customerRemark; + private String searchStatus; + private String imei; private String oaid; diff --git a/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml index 8ecd846a..98a59fbd 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml @@ -76,6 +76,25 @@ and customer_name like concat('%', #{customerName}, '%') and contact_time = #{contactTime} and other_phone = #{otherPhone} + and remark = #{remark} + + and is_add_wx = '1' + + + and is_effective = '0' + + + and is_plan = '1' + + + and is_deal = '1' + + + AND date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') + + + AND date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + order by create_time desc