From ffc757b759ddb810223eb83fe00ca5efdb51cfe6 Mon Sep 17 00:00:00 2001 From: ls <1793460677@qq.com> Date: Thu, 14 Aug 2025 13:58:03 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base-fast/pom.xml | 4 ++++ .../flow/service/impl/FlwInstanceServiceImpl.java | 1 + .../modules/tickets/controller/TicketsController.java | 6 ++++++ .../boge/modules/tickets/entity/TicketsEntity.java | 10 ++++++++-- .../modules/tickets/repository/TickesRepository.java | 11 +++++++++++ .../tickets/service/impl/TicketsServiceImpl.java | 4 ++-- base-fast/src/main/resources/application-dev.yml | 4 ++++ 7 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 base-fast/src/main/java/com/boge/modules/tickets/repository/TickesRepository.java diff --git a/base-fast/pom.xml b/base-fast/pom.xml index 4966be5..f9aa8ef 100644 --- a/base-fast/pom.xml +++ b/base-fast/pom.xml @@ -71,6 +71,10 @@ org.springframework.boot spring-boot-starter-aop + + org.springframework.boot + spring-boot-starter-data-elasticsearch + org.springframework spring-context-support diff --git a/base-fast/src/main/java/com/boge/modules/flow/service/impl/FlwInstanceServiceImpl.java b/base-fast/src/main/java/com/boge/modules/flow/service/impl/FlwInstanceServiceImpl.java index 717862e..fe46c6e 100644 --- a/base-fast/src/main/java/com/boge/modules/flow/service/impl/FlwInstanceServiceImpl.java +++ b/base-fast/src/main/java/com/boge/modules/flow/service/impl/FlwInstanceServiceImpl.java @@ -344,6 +344,7 @@ public class FlwInstanceServiceImpl extends FlowServiceNoFactory implements FlwI TicketsEntity ticketsEntity = new TicketsEntity(); ticketsEntity.setTicketsId(Long.valueOf(ticketsId)); ticketsEntity.setStatus(TicketsStatusEnums.CANCEL.getCode()); + ticketsEntity.setUpdateTime(new Date()); ticketsService.updateById(ticketsEntity); return R.ok("操作成功"); diff --git a/base-fast/src/main/java/com/boge/modules/tickets/controller/TicketsController.java b/base-fast/src/main/java/com/boge/modules/tickets/controller/TicketsController.java index afce79c..640a965 100644 --- a/base-fast/src/main/java/com/boge/modules/tickets/controller/TicketsController.java +++ b/base-fast/src/main/java/com/boge/modules/tickets/controller/TicketsController.java @@ -1,8 +1,11 @@ package com.boge.modules.tickets.controller; import java.util.Arrays; +import java.util.Date; import java.util.Map; +import com.boge.common.utils.ShiroUtils; +import com.boge.modules.sys.entity.SysUserEntity; import com.boge.modules.tickets.dto.TicketsDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; @@ -60,6 +63,9 @@ public class TicketsController { @RequestMapping("/save") //@RequiresPermissions("tickets:tickets:save") public R save(@RequestBody TicketsEntity tickets){ + SysUserEntity loginUser = ShiroUtils.getUserEntity(); + tickets.setCreateTime(new Date()); + tickets.setCreateUser(loginUser.getNickname()); ticketsService.save(tickets); return R.ok(); diff --git a/base-fast/src/main/java/com/boge/modules/tickets/entity/TicketsEntity.java b/base-fast/src/main/java/com/boge/modules/tickets/entity/TicketsEntity.java index c5b6c8a..18a7c3e 100644 --- a/base-fast/src/main/java/com/boge/modules/tickets/entity/TicketsEntity.java +++ b/base-fast/src/main/java/com/boge/modules/tickets/entity/TicketsEntity.java @@ -6,7 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; import lombok.Data; +import org.springframework.data.elasticsearch.annotations.Document; +import org.springframework.data.elasticsearch.annotations.Field; +import org.springframework.data.elasticsearch.annotations.FieldType; +import org.springframework.data.annotation.Id; /** * * @@ -16,6 +20,7 @@ import lombok.Data; */ @Data @TableName("sys_tickets") +@Document(indexName = "#{index.tickets}",createIndex = true) public class TicketsEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -23,6 +28,7 @@ public class TicketsEntity implements Serializable { * 工单id */ @TableId + @Id private Long ticketsId; /** * 小车类型 @@ -53,9 +59,9 @@ public class TicketsEntity implements Serializable { */ private String deptPhone; /** - * 创建者ID + * 创建者 */ - private Long createUserId; + private String createUser; /** * 创建时间 */ diff --git a/base-fast/src/main/java/com/boge/modules/tickets/repository/TickesRepository.java b/base-fast/src/main/java/com/boge/modules/tickets/repository/TickesRepository.java new file mode 100644 index 0000000..e7f47ba --- /dev/null +++ b/base-fast/src/main/java/com/boge/modules/tickets/repository/TickesRepository.java @@ -0,0 +1,11 @@ +package com.boge.modules.tickets.repository; + + +import com.boge.modules.tickets.entity.TicketsEntity; +import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface TickesRepository extends ElasticsearchRepository { + +} diff --git a/base-fast/src/main/java/com/boge/modules/tickets/service/impl/TicketsServiceImpl.java b/base-fast/src/main/java/com/boge/modules/tickets/service/impl/TicketsServiceImpl.java index 9ae34c4..28e205c 100644 --- a/base-fast/src/main/java/com/boge/modules/tickets/service/impl/TicketsServiceImpl.java +++ b/base-fast/src/main/java/com/boge/modules/tickets/service/impl/TicketsServiceImpl.java @@ -51,10 +51,10 @@ public class TicketsServiceImpl extends ServiceImpl i List longs = sysUserRoleService.queryRoleIdList(loginUser.getUserId()); //判断是否是超级管理员 if (longs.contains(2L)){ - ticketsEntityQueryWrapper.orderBy(true, true,"create_time"); + ticketsEntityQueryWrapper.orderBy(true, false,"create_time"); }else { ticketsEntityQueryWrapper.eq("assign_user_id", loginUser.getUserId()) - .orderBy(true, true,"create_time");; + .orderBy(true, false,"create_time");; } } diff --git a/base-fast/src/main/resources/application-dev.yml b/base-fast/src/main/resources/application-dev.yml index 2e2ec4f..a3397fb 100644 --- a/base-fast/src/main/resources/application-dev.yml +++ b/base-fast/src/main/resources/application-dev.yml @@ -32,3 +32,7 @@ spring: wall: config: multi-statement-allow: true + + elasticsearch: + rest: + uris: http://localhost:9200