chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhaowenyuan 2024-06-25 09:32:05 +08:00
parent 022f3981b3 3fcb4d1995
commit 9adf9290ed
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java
View File

@ -11,6 +11,7 @@ import com.chushang.common.mybatis.utils.PageResult;
import com.chushang.inspection.project.dto.ContractDTO;
import com.chushang.inspection.project.dto.ProjectDTO;
import com.chushang.inspection.project.po.WrkProject;
import com.chushang.inspection.project.po.WrkProjectContract;
import com.chushang.inspection.project.service.WrkProjectContractService;
import com.chushang.inspection.project.service.WrkProjectService;
import com.chushang.security.annotation.RequiresPermissions;
@ -128,10 +129,10 @@ public class WrkProjectController {
*/
@GetMapping(value = "/contract/list")
@RequiresPermissions("inspection:contract:list")
public AjaxResult list(Long projectId)
public AjaxResult list(WrkProjectContract contract)
{
CommonParam commonParam = CommonParam.buildPageRequest();
return AjaxResult.success(contractService.pageList(projectId, commonParam));
return AjaxResult.success(contractService.pageList(contract, commonParam));
}
// /**

8
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java
View File

@ -34,10 +34,10 @@ public class WrkProjectContractService extends ServiceImpl<WrkProjectContractMap
removeById(contractId);
}
public PageResult pageList(Long projectId, CommonParam commonParam) {
WrkProjectContract contract = WrkProjectContract.builder().projectId(projectId).build();
return pageList(contract, commonParam);
}
// public PageResult pageList(Long projectId, CommonParam commonParam) {
// WrkProjectContract contract = WrkProjectContract.builder().projectId(projectId).build();
// return pageList(contract, commonParam);
// }
public PageResult pageList(WrkProjectContract contract, CommonParam commonParam) {
LambdaQueryWrapper<WrkProjectContract> queryWrapper = WrapperUtils.builder(contract, commonParam);

1
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java
View File

@ -81,6 +81,7 @@ public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject>
wrkProject.setProjectEffect(1);
}
this.save(wrkProject);
contract.setProjectId(wrkProject.getProjectId());
// 项目合同
saveContract(contract);
return wrkProject.getProjectId();

2
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java
View File

@ -8,6 +8,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.nacos.shaded.com.google.common.collect.Maps;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.chushang.common.core.constant.SecurityConstants;
@ -29,7 +30,6 @@ import com.chushang.task.entity.dto.CreateTaskDTO;
import com.chushang.task.enums.ServiceEnum;
import com.chushang.task.enums.TaskTypeEnum;
import com.chushang.task.feign.RemoteTaskService;
import com.google.common.collect.Maps;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

2
chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java
View File

@ -54,7 +54,7 @@ public class FileController {
*/
@SysLog(value = "合同上传", businessType = BusinessType.INSERT)
@PostMapping(value = "/uploadContract")
@RequiresPermissions("system:file:ucontract")
@RequiresPermissions("system:file:upload")
public AjaxResult uploadContract(@RequestParam(value = "file") MultipartFile file) throws Exception
{
return AjaxResult.success(fileSourceService.uploadContract(file));

4
chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java
View File

@ -238,7 +238,7 @@ public class FileSourceService
public String uploadContract(MultipartFile file) throws Exception{
String ip = IPUtils.clientIp(ServletUtils.getRequest());
String fid = generateFid();
String fName = file.getName();
String fName = file.getOriginalFilename();
long length = file.getSize();
String md5 = FileUtils.getMd5(file.getInputStream());
// image/jpeg mimeType
@ -247,7 +247,7 @@ public class FileSourceService
fileSourceInfo.setFid(fid);
fileSourceInfo.setName(fName);
fileSourceInfo.setSize(length);
fileSourceInfo.setPath("qcCode/"+fName);
fileSourceInfo.setPath("contract/"+fName);
fileSourceInfo.setMd5(md5);
fileSourceInfo.setMimeType("image/jpeg");
String upload = ossService.upload(file.getInputStream(), fileSourceInfo);