feat: 添加问题语音等

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<MenuDto> menus) {
         if (CollectionUtils.isEmpty(menus)) {
             return;
         }
-        redisCache.setCacheObject(menusKey(userId), menus);
+        redisCache.setCacheObject(menusKey(userId), menus, 7, TimeUnit.DAYS);
     }
 
     @Data

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<String> problemImages;
         private List<String> handleImages;
+        private List<String> problemVoices;
     }
 
-    public void setDoc(List<String> problemImages, List<String> handleImages) {
+    public void setDoc(List<String> problemImages, List<String> handleImages, List<String> problemVoices) {
-        this.doc = JSON.toJSONString(new Doc(problemImages, handleImages));
+        this.doc = JSON.toJSONString(new Doc(problemImages, handleImages, problemVoices));
     }
 
     public Doc getDocObj() {

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java

@@ -141,6 +141,9 @@ public class DfRecordDetailDto {
         @ApiModelProperty("问题图片")
         private List<String> problemImages = Collections.emptyList();
 
+        @ApiModelProperty("问题语音")
+        private List<String> problemVoices = Collections.emptyList();
+
         @ApiModelProperty("处置内容")
         private String handleContent;
 

shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java

@@ -141,7 +141,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
             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;
         };

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java

@@ -41,6 +41,9 @@ public interface SzYhRecordMapper extends BaseMapper<SzYhRecord> {
             "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 " +
+            "<if test='searchDto.wagaCode != null and searchDto.wagaCode != \"\"'>" +
+            "AND jbxx.waga_code = #{searchDto.wagaCode} " +
+            "</if>" +
             "<if test='searchDto.startCreatedTime != null'>" +
             "AND yhjl.create_time &gt;= #{searchDto.startCreatedTime} " +
             "</if>" +

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);