初始化脚本

本地调试
支持webm视频格式上传
2025-07-21 10:59:52 +08:00 · 2025-07-21 10:37:57 +08:00 · 2024-10-31 16:07:07 +08:00 · 2024-09-30 13:13:55 +08:00 · 2024-09-27 15:32:46 +08:00 · 2024-09-18 09:29:26 +08:00
9 changed files with 1550 additions and 30 deletions
--- a/sql/tool_tech.sql
+++ b/sql/tool_tech.sql
--- a/tool-tech-admin/src/main/java/com/rzdata/web/controller/system/SysRoleController.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/controller/system/SysRoleController.java
@@ -132,8 +132,8 @@ public class SysRoleController extends BaseController
            LoginUser loginUser = getLoginUser();
            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
            {
-                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
                tokenService.setLoginUser(loginUser);
            }
            return success();
--- a/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java
@@ -103,7 +103,7 @@ public class ToolController extends BaseController
    @Log(title = "工具信息", businessType = BusinessType.EXPORT)
    @PreAuthorize("@ss.hasPermi('tool:list')")
    @PostMapping("/export/word/list")
-    public AjaxResult exportWordList(Tool tool)
+    public AjaxResult exportWordList(@RequestBody Tool tool)
    {
        List<Tool> list = toolService.selectAllList(tool);
        return AjaxResult.success(list);
--- a/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java
@@ -24,36 +24,37 @@ public class Tool extends BaseEntity
    private String toolId;

    /** 工具编号 */
+    @Excel(name = "编号",sort=1)
    private String toolCode;

    /** 工具名称 */
-    @Excel(name = "工具名称",sort=1)
+    @Excel(name = "中文别名",sort=2)
    private String toolName;

    /** 工具类别 */
-    @Excel(name = "工具类别",dictType="tool_type",sort=2)
+    @Excel(name = "类别",dictType="tool_type",sort=5)
    private String toolType;

    /** 来源 */
-    @Excel(name = "工具来源",dictType="tool_source",sort=3)
+    @Excel(name = "来源",dictType="tool_source",sort=3)
    private String toolSource;

    private String toolSourceName;

    /** 用途 */
-    //@Excel(name = "工具用途",sort=7)
+    @Excel(name = "用途",sort=6)
    private String toolUse;

    /** 测试情况 */
-    //@Excel(name = "测评情况",sort=8)
+    @Excel(name = "测评机构",sort=7)
    private String testSituation;

    /** 功能描述 */
-    //@Excel(name = "功能描述",sort=9)
+    @Excel(name = "功能简介",sort=8)
    private String functionDesc;

    /** 适用条件 */
-    //@Excel(name = "适用条件",sort=10)
+    @Excel(name = "适用条件",sort=9)
    private String applyCondition;

    /** 操作说明 */
@@ -64,21 +65,32 @@ public class Tool extends BaseEntity
    private String toolPrincipals;

    /** 负责人名称 */
-    @Excel(name = "负责人",sort=4)
    private String toolPrincipalsName;

    /** 归属单位 */
    private String toolRespDept;

-    @Excel(name = "归属单位",sort=5)
+    @Excel(name = "归属单位",sort=12)
    private String toolRespDeptName;

+    @Excel(name = "加密方式",sort=10)
+    private String encryptionMode;
+
+    @Excel(name = "服务时间",sort=11)
+    private String serviceTime;
+
+    @Excel(name = "联系人",sort=13)
+    private String contactPerson;
+
+    @Excel(name = "联系方式",sort=14)
+    private String contactPhone;
+
    /** 状态 */
-    @Excel(name = "状态",dictType="tool_status",sort=6)
+    @Excel(name = "形态",dictType="tool_status",sort=4)
    private String status;

    /** 备注 */
-    //@Excel(name = "备注",sort=12)
+    @Excel(name = "备注",sort=15)
    private String remark;

    /** 关联工具 */
@@ -87,12 +99,11 @@ public class Tool extends BaseEntity
    private BpmClientInputModelBo bpmClientInputModel;

    /** done：办结，doing：进行中**/
-    @Excel(name = "流程状态",dictType="flow_status",sort=7)
    private String recordStatus;

    /** 创建时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "创建时间", dateFormat="yyyy-MM-dd")
+    //@Excel(name = "创建时间", dateFormat="yyyy-MM-dd",sort=16)
    private Date createTime;

    private Boolean editStatus;
--- a/tool-tech-admin/src/main/resources/application-druid.yml
+++ b/tool-tech-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,15 @@ spring:
        druid:
            # 主库数据源
            master:
-                url: jdbc:mysql://192.168.1.168:3307/tool_tech?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: tool_tech
-                password: Tooltech@123
+                #url: jdbc:mysql://120.26.204.194:3307/tool_tech?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #username: root
+                #password: Password123@mysql
+                url: jdbc:mysql://localhost:3306/tool_tech?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: root
+                #url: jdbc:mysql://192.168.1.168:3307/tool_tech?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #username: tool_tech
+                #password: Tooltech@123
            # 从库数据源
            slave:
                # 从数据源开关/默认关闭
--- a/tool-tech-admin/src/main/resources/application.yml
+++ b/tool-tech-admin/src/main/resources/application.yml
@@ -6,8 +6,9 @@ ja:
  version: 3.8.8
  # 版权年份
  copyrightYear: 2024
-  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ja/uploadPath
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath D:/ja/uploadPath，Linux配置 /home/ruoyi/uploadPath /opt/tooltech/attachment）
+  profile: /tooltech/attachment
+  #profile:  D:/ja/uploadPath
  # 获取ip地址开关
  addressEnabled: false
  # 验证码类型 math 数字计算 char 字符验证
@@ -69,13 +70,14 @@ spring:
  # redis 配置
  redis:
    # 地址
-    host: 192.168.1.168
+    host: 127.0.0.1
+    #host: 120.26.204.194
    # 端口，默认为6379
    port: 6379
    # 数据库索引
    database: 0
    # 密码
-    password:
+    password: Password123@redis
    # 连接超时时间
    timeout: 10s
    lettuce:
@@ -136,5 +138,7 @@ application:

 bpmc:
  tenantId: TLTC_SYS
-  serviceUrl: http://124.223.108.21:9081/ebpm-process-rest/
-  uniteWorkUrl: http://localhost/tool-tech/workflowRouter
+  #serviceUrl: http://192.168.2.6:9081/ebpm-process-rest/
+  serviceUrl: http://localhost:8081/ebpm-process-rest/
+  #uniteWorkUrl: http://192.168.2.18:81/tool-tech/workflowRouter
+  uniteWorkUrl:  http://localhost:80/tool-tech/workflowRouter
--- a/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
+++ b/tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
@@ -19,6 +19,10 @@
        <result property="toolPrincipalsName"    column="tool_principals_name"    />
        <result property="toolRespDept"    column="tool_resp_dept"    />
        <result property="toolRespDeptName"    column="tool_resp_dept_name"    />
+        <result property="encryptionMode"    column="encryption_mode"    />
+        <result property="serviceTime"    column="service_time"    />
+        <result property="contactPerson"    column="contact_person"    />
+        <result property="contactPhone"    column="contact_phone"    />
        <result property="status"    column="status"    />
        <result property="remark"    column="remark"    />
        <result property="createBy"    column="create_by"    />
@@ -40,7 +44,7 @@
    </resultMap>

    <sql id="selectToolVo">
-        select tool_id, tool_code, tool_name, tool_type, tool_source, tool_use, test_situation, function_desc, apply_condition, operate_explain, tool_principals, tool_principals_name, tool_resp_dept, status, remark, create_by, create_time, update_by, update_time,proc_inst_id,record_status,association from t_tool
+        select tool_id, tool_code, tool_name, tool_type, tool_source, tool_use, test_situation, function_desc, apply_condition, operate_explain, tool_principals, tool_principals_name, tool_resp_dept, encryption_mode, service_time, contact_person, contact_phone, status, remark, create_by, create_time, update_by, update_time,proc_inst_id,record_status,association from t_tool
    </sql>

    <select id="selectToolByToolId" parameterType="String" resultMap="ToolResult">
@@ -69,6 +73,10 @@
            <if test="toolPrincipals != null">tool_principals,</if>
            <if test="toolPrincipalsName != null">tool_principals_name,</if>
            <if test="toolRespDept != null">tool_resp_dept,</if>
+            <if test="encryptionMode != null">encryption_mode,</if>
+            <if test="serviceTime != null">service_time,</if>
+            <if test="contactPerson != null">contact_person,</if>
+            <if test="contactPhone != null">contact_phone,</if>
            <if test="status != null">status,</if>
            <if test="remark != null">remark,</if>
            <if test="createBy != null">create_by,</if>
@@ -93,6 +101,10 @@
            <if test="toolPrincipals != null">#{toolPrincipals},</if>
            <if test="toolPrincipalsName != null">#{toolPrincipalsName},</if>
            <if test="toolRespDept != null">#{toolRespDept},</if>
+            <if test="encryptionMode != null">#{encryptionMode},</if>
+            <if test="serviceTime != null">#{serviceTime},</if>
+            <if test="contactPerson != null">#{contactPerson},</if>
+            <if test="contactPhone != null">#{contactPhone},</if>
            <if test="status != null">#{status},</if>
            <if test="remark != null">#{remark},</if>
            <if test="createBy != null">#{createBy},</if>
@@ -120,6 +132,10 @@
            <if test="toolPrincipals != null">tool_principals = #{toolPrincipals},</if>
            <if test="toolPrincipalsName != null">tool_principals_name = #{toolPrincipalsName},</if>
            <if test="toolRespDept != null">tool_resp_dept = #{toolRespDept},</if>
+            <if test="encryptionMode != null">encryption_mode = #{encryptionMode},</if>
+            <if test="serviceTime != null">service_time = #{serviceTime},</if>
+            <if test="contactPerson != null">contact_person = #{contactPerson},</if>
+            <if test="contactPhone != null">contact_phone = #{contactPhone},</if>
            <if test="status != null">status = #{status},</if>
            <if test="remark != null">remark = #{remark},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
@@ -144,7 +160,7 @@
    </select>

    <select id="selectToolList" parameterType="Tool" resultMap="ToolResult">
-        select u.tool_id, u.tool_code, u.tool_name, u.tool_type, u.tool_source, u.tool_use, u.test_situation, u.function_desc, u.apply_condition, u.operate_explain,u.record_status,u.proc_inst_id,
+        select u.tool_id, u.tool_code, u.tool_name, u.tool_type, u.tool_source, u.encryption_mode, u.service_time, u.contact_person, u.contact_phone, u.tool_use, u.test_situation, u.function_desc, u.apply_condition, u.operate_explain,u.record_status,u.proc_inst_id,
               u.tool_principals, u.tool_principals_name, u.tool_resp_dept, u.status, u.create_by, u.create_time, u.remark, d.dept_name as tool_resp_dept_name,u.association
        from t_tool u
        left join sys_user su on u.create_by = su.user_id
--- a/tool-tech-common/src/main/java/com/rzdata/common/utils/file/MimeTypeUtils.java
+++ b/tool-tech-common/src/main/java/com/rzdata/common/utils/file/MimeTypeUtils.java
@@ -22,9 +22,9 @@ public class MimeTypeUtils
    public static final String[] FLASH_EXTENSION = { "swf", "flv" };

    public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
-            "asf", "rm", "rmvb" };
+            "asf", "rm", "webm" };

-    public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" };
+    public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "webm" };

    public static final String[] DEFAULT_ALLOWED_EXTENSION = {
            // 图片
@@ -34,7 +34,7 @@ public class MimeTypeUtils
            // 压缩文件
            "rar", "zip", "gz", "bz2",
            // 视频格式
-            "mp4", "avi", "rmvb",
+            "mp4", "avi", "webm",
            // pdf
            "pdf" };

--- a/tool-tech-framework/src/main/java/com/rzdata/framework/config/ResourcesConfig.java
+++ b/tool-tech-framework/src/main/java/com/rzdata/framework/config/ResourcesConfig.java
@@ -36,7 +36,7 @@ public class ResourcesConfig implements WebMvcConfigurer
        /** swagger配置 */
        registry.addResourceHandler("/swagger-ui/**")
                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")
-                .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());;
+                .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());
    }

    /**
Author	SHA1	Message	Date
pan	6eecc5f30f	初始化脚本	2025-07-21 10:59:52 +08:00
pan	764b57ae66	本地调试	2025-07-21 10:37:57 +08:00
pan	471441918c	支持webm视频格式上传	2024-10-31 16:07:07 +08:00
hanjian	90599a8f9a	1.工具管理去除负责人和创建时间导出字段	2024-09-30 13:13:55 +08:00
hanjian	bc38b6767e	1.工具管理新增字段【加密方式、服务时间、联系人、联系方式】修改字段：“归属部门”修改为【归属单位】，“”测试情况“”名称修改为【测评机构】、“功能描述”修改为【功能简介】、工具状态修改为【工具形态】涉及的功能工具管理：工具发布、修改、提交、暂存、全量导出、批量导出、列表查询条件 2.word导出功能，批量导出未按批量执行问题修复，导出模板调整	2024-09-27 15:32:46 +08:00
pan	ac865eafc7	修复角色修改展示为空的bug	2024-09-18 09:29:26 +08:00