From ba8df27b47d33db95e0a0b70c4e3df14ca41aece Mon Sep 17 00:00:00 2001 From: hxh Date: Fri, 28 Jun 2024 10:36:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/framework/web/service/SysPermissionService.java | 5 +++-- .../main/java/com/kms/yxgh/df/domain/DfRecordItem.java | 5 +++-- .../main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java | 3 +++ .../java/com/kms/yxgh/df/service/DfRecordService.java | 2 +- .../java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java | 3 +++ sql/sy/v1.3.0/全量脚本/menu.sql | 8 ++++++++ 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/framework/web/service/SysPermissionService.java b/shuili-system/src/main/java/com/kms/framework/web/service/SysPermissionService.java index f5f0579a..166bcc14 100644 --- a/shuili-system/src/main/java/com/kms/framework/web/service/SysPermissionService.java +++ b/shuili-system/src/main/java/com/kms/framework/web/service/SysPermissionService.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; @@ -104,14 +105,14 @@ public class SysPermissionService { if (CollectionUtils.isEmpty(perms)) { return; } - redisCache.setCacheObject(permsKey(userId), perms); + redisCache.setCacheObject(permsKey(userId), perms, 7, TimeUnit.DAYS); } public void setUserMenuFromPortal(String userId, List menus) { if (CollectionUtils.isEmpty(menus)) { return; } - redisCache.setCacheObject(menusKey(userId), menus); + redisCache.setCacheObject(menusKey(userId), menus, 7, TimeUnit.DAYS); } @Data diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecordItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecordItem.java index 68ac0dff..122883c1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecordItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecordItem.java @@ -78,10 +78,11 @@ public class DfRecordItem extends SyBaseEntity { public static class Doc { private List problemImages; private List handleImages; + private List problemVoices; } - public void setDoc(List problemImages, List handleImages) { - this.doc = JSON.toJSONString(new Doc(problemImages, handleImages)); + public void setDoc(List problemImages, List handleImages, List problemVoices) { + this.doc = JSON.toJSONString(new Doc(problemImages, handleImages, problemVoices)); } public Doc getDocObj() { diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java index 323a41eb..3911e3fc 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java @@ -141,6 +141,9 @@ public class DfRecordDetailDto { @ApiModelProperty("问题图片") private List problemImages = Collections.emptyList(); + @ApiModelProperty("问题语音") + private List problemVoices = Collections.emptyList(); + @ApiModelProperty("处置内容") private String handleContent; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index 52559eb2..551e2906 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -141,7 +141,7 @@ public class DfRecordService extends BaseService { if (item != null) { item.setRecordId(recordId); item.setParts(String.join(PART_SEPARATOR, o.getParts())); - item.setDoc(o.getProblemImages(), o.getHandleImages()); + item.setDoc(o.getProblemImages(), o.getHandleImages(), o.getProblemVoices()); } return item; }; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java index 84e272e9..fb0fadea 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java @@ -41,6 +41,9 @@ public interface SzYhRecordMapper extends BaseMapper { "LEFT JOIN bs_sgc_sz_jbxx jbxx ON yhjl.waga_code = jbxx.waga_code " + // 使用LEFT JOIN连接基本信息表 "WHERE 1=1 " + "and jbxx.expr_date is null " + + "" + + "AND jbxx.waga_code = #{searchDto.wagaCode} " + + "" + "" + "AND yhjl.create_time >= #{searchDto.startCreatedTime} " + "" + diff --git a/sql/sy/v1.3.0/全量脚本/menu.sql b/sql/sy/v1.3.0/全量脚本/menu.sql index 918d6289..bc2d30e5 100644 --- a/sql/sy/v1.3.0/全量脚本/menu.sql +++ b/sql/sy/v1.3.0/全量脚本/menu.sql @@ -550,3 +550,11 @@ VALUES('65c10cec627745259ecfcec81b6d7a22', '批量删除按钮', '02ca1718e86e4e INSERT IGNORE INTO sys_menu (id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) VALUES('ae58fd1b4e57475eb740598f0c7c44c2', '监督检查', '7e4624ce1e4d49279a59394decdd28ec', 3, 'supervisionInspetion', 'dike/runManage/supervisionInspetion/index', 1, 'M', '0', '0', '', 'form', '1', '2024-02-28 14:50:49', '1', '2024-03-18 09:47:21', '', NULL); + +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('2a8930beb0254ebbbd93b0006eccae7f', '新增按钮', '09b65d8be95942d1af76848bdcce964d', 0, '', NULL, 1, 'F', '0', '0', 'df:run:checking:item:add', '#', '1', '2024-06-28 09:53:44', '', '2024-06-28 09:53:44', '', NULL); + +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('db7c49ff81354e27b30e2aa75bb553ff', '删除按钮', '09b65d8be95942d1af76848bdcce964d', 0, '', NULL, 1, 'F', '0', '0', 'df:run:checking:item:delete', '#', '1', '2024-06-28 09:53:21', '', '2024-06-28 09:53:21', '', NULL); \ No newline at end of file