ToolTech/tool-tech
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ToolTech:main
Branches Tags
ToolTech:main
ToolTech:release-v1.0
ToolTech:v1.0_lukg
ToolTech:v1.0.0
..
compare: ToolTech:release-v1.0
Branches Tags
ToolTech:main
ToolTech:release-v1.0
ToolTech:v1.0_lukg
ToolTech:v1.0.0

No commits in common. "main" and "release-v1.0" have entirely different histories.
main ... release-v1

6 changed files with 21 additions and 48 deletions
Show Stats Expand all files Collapse all files

2
tool-tech-admin/src/main/java/com/rzdata/web/controller/system/SysRoleController.java
View File

@ -132,8 +132,8 @@ public class SysRoleController extends BaseController
LoginUser loginUser = getLoginUser();
if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
{
loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
tokenService.setLoginUser(loginUser);
}
return success();

2
tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java
View File

@ -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(@RequestBody Tool tool)
public AjaxResult exportWordList(Tool tool)
{
List<Tool> list = toolService.selectAllList(tool);
return AjaxResult.success(list);

37
tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java
View File

@ -24,37 +24,36 @@ public class Tool extends BaseEntity
private String toolId;
/** 工具编号 */
@Excel(name = "编号",sort=1)
private String toolCode;
/** 工具名称 */
@Excel(name = "中文别名",sort=2)
@Excel(name = "工具名称",sort=1)
private String toolName;
/** 工具类别 */
@Excel(name = "类别",dictType="tool_type",sort=5)
@Excel(name = "工具类别",dictType="tool_type",sort=2)
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=6)
//@Excel(name = "工具用途",sort=7)
private String toolUse;
/** 测试情况 */
@Excel(name = "测评机构",sort=7)
//@Excel(name = "测评情况",sort=8)
private String testSituation;
/** 功能描述 */
@Excel(name = "功能简介",sort=8)
//@Excel(name = "功能描述",sort=9)
private String functionDesc;
/** 适用条件 */
@Excel(name = "适用条件",sort=9)
//@Excel(name = "适用条件",sort=10)
private String applyCondition;
/** 操作说明 */
@ -65,32 +64,21 @@ public class Tool extends BaseEntity
private String toolPrincipals;
/** 负责人名称 */
@Excel(name = "负责人",sort=4)
private String toolPrincipalsName;
/** 归属单位 */
private String toolRespDept;
@Excel(name = "归属单位",sort=12)
@Excel(name = "归属单位",sort=5)
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=4)
@Excel(name = "状态",dictType="tool_status",sort=6)
private String status;
/** 备注 */
@Excel(name = "备注",sort=15)
//@Excel(name = "备注",sort=12)
private String remark;
/** 关联工具 */
@ -99,11 +87,12 @@ 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",sort=16)
@Excel(name = "创建时间", dateFormat="yyyy-MM-dd")
private Date createTime;
private Boolean editStatus;

20
tool-tech-admin/src/main/resources/mapper/ToolMapper.xml
View File

@ -19,10 +19,6 @@
<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" />
@ -44,7 +40,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, 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
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
</sql>
<select id="selectToolByToolId" parameterType="String" resultMap="ToolResult">
@ -73,10 +69,6 @@
<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>
@ -101,10 +93,6 @@
<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>
@ -132,10 +120,6 @@
<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>
@ -160,7 +144,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.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,
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,
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

6
tool-tech-common/src/main/java/com/rzdata/common/utils/file/MimeTypeUtils.java
View File

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

2
tool-tech-framework/src/main/java/com/rzdata/framework/config/ResourcesConfig.java
View File

@ -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());;
}
/**