zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化文件上传大小

Browse Source
This commit is contained in:
tangwei 2026-05-06 13:05:51 +08:00
parent 294e34dbbf
commit fd34228c58
8 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/com/yfd/platform/data/mapper/FishDraftDataMapper.java
View File

@ -27,7 +27,10 @@ public interface FishDraftDataMapper extends BaseMapper<FishDraftData> {
@Param("status") String status,
@Param("ftp") String ftp,
@Param("startTime") String startTime,
@Param("endTime") String endTime,@Param("userId") String userId,@Param("hbrvcd") String hbrvcd);
@Param("endTime") String endTime,
@Param("userId") String userId,
@Param("hbrvcd") String hbrvcd,
@Param("approvalId") String approvalId);
/**
* 关联查询过鱼数据（不分页）

3
backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java
View File

@ -60,6 +60,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
Page<FishDraftDataVO> page = KendoUtil.getPage(dataSourceRequest);
DataSourceLoadOptionsBase loadOptions = dataSourceRequest.toDevRequest();
String stcd = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "stcd");
String approvalId = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "approvalId");
String rstcd = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "rstcd");
String hbrvcd = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "hbrvcd");
String baseId = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "baseId");
@ -75,7 +76,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
startTime=TM.split(",")[0];
endTime=TM.split(",")[1];
}
Page<FishDraftDataVO> resultPage = fishDraftDataMapper.selectJoinPage(page, stcd, rstcd, baseId, direction, status, ftp, startTime, endTime,userId,hbrvcd);
Page<FishDraftDataVO> resultPage = fishDraftDataMapper.selectJoinPage(page, stcd, rstcd, baseId, direction, status, ftp, startTime, endTime,userId,hbrvcd,approvalId);
fillUserNames(resultPage.getRecords());
return resultPage;
}

13
backend/src/main/java/com/yfd/platform/system/controller/LoginController.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import cn.hutool.jwt.JWTUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.wf.captcha.base.Captcha;
import com.yfd.platform.annotation.Log;
@ -190,7 +191,7 @@ public class LoginController {
}
@Log(module = "用户登录", value = "更改用户密码")
@GetMapping("/updatePassword")
@PostMapping("/updatePassword")
@Operation(summary = "更改用户密码")
@ResponseBody
public ResponseResult updatePassword(@RequestBody SysUser user) throws Exception {
@ -199,9 +200,13 @@ public class LoginController {
user.getPassword());
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
String cryptPassword = passwordEncoder.encode(password);
UpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("password", cryptPassword);
updateWrapper.eq("id", user.getId());
// 验证新密码和旧密码是否一致
if (passwordEncoder.matches(password, user.getOldPassword())) {
return ResponseResult.error("新密码不能与旧密码相同");
}
LambdaUpdateWrapper<SysUser> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(SysUser::getPassword, cryptPassword);
updateWrapper.eq(SysUser::getId, user.getId());
userService.update(updateWrapper);
return ResponseResult.success();
}

6
backend/src/main/java/com/yfd/platform/system/domain/SysUser.java
View File

@ -155,6 +155,12 @@ public class SysUser implements Serializable {
*/
private String companyCode;
@TableField(exist = false)
/**
* 登录密码（加密存储）
*/
private String oldPassword;
@TableField(exist = false)
List<SysRole> roles;
}

4
backend/src/main/resources/application-devtw.yml
View File

@ -27,8 +27,8 @@ spring:
matching-strategy: ant_path_matcher
servlet:
multipart:
max-file-size: 30MB
max-request-size: 100MB
max-file-size: 300MB
max-request-size: 500MB
logging:
file:

6
backend/src/main/resources/application-prod.yml
View File

@ -27,8 +27,8 @@ spring:
matching-strategy: ant_path_matcher
servlet:
multipart:
max-file-size: 30MB
max-request-size: 100MB
max-file-size: 300MB
max-request-size: 500MB
logging:
file:
@ -36,7 +36,7 @@ logging:
level:
root: info
com.yfd.platform: info
com.yfd.platform.*.mapper: trace
# com.yfd.platform.*.mapper: trace
# 在线文档： swagger-ui（生产环境建议关闭）
swagger-ui:

2
backend/src/main/resources/application.yml
View File

@ -1,6 +1,6 @@
spring:
profiles:
active: devtw
active: prod
jasypt:
encryptor:

3
backend/src/main/resources/mapper/data/FishDraftDataMapper.xml
View File

@ -160,6 +160,9 @@
<if test="status != null and status != ''">
AND D.STATUS = #{status}
</if>
<if test="approvalId != null and approvalId != ''">
AND D.APPROVAL_ID = #{approvalId}
</if>
<if test="startTime != null and startTime != ''">
AND D.TM &gt;= TO_DATE(#{startTime}, 'yyyy-mm-dd hh24:mi:ss')
</if>