diff --git a/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java b/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java index 3f5810c4..cf036a6d 100644 --- a/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java +++ b/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java @@ -55,13 +55,13 @@ public class CommonApi { @Autowired private SysUserProService sysUserProService; -// 文件路径 + // 文件路径 @Value("${jianwei.profile}") private String filePath; @ApiOperation("字典数据") @GetMapping("dict/{dictType}") - public AjaxResult dict(@PathVariable("dictType")String dictType){ + public AjaxResult dict(@PathVariable("dictType") String dictType) { List dictCache = DictUtils.getDictCache(dictType); return AjaxResult.success(dictCache); @@ -78,9 +78,9 @@ public class CommonApi { @ApiOperation("分片上传") @RequestMapping("sliceUpload") public AjaxResult upload(HttpServletRequest request, Chunk chunk) throws IOException { - System.out.println("开始时间:"+System.currentTimeMillis()); + System.out.println("开始时间:" + System.currentTimeMillis()); JSONObject jsonObject = new JSONObject(); - jsonObject.put("id",chunk.getIdentifier()); + jsonObject.put("id", chunk.getIdentifier()); boolean isMultipart = ServletFileUpload.isMultipartContent(request); if (isMultipart) { MultipartFile file = chunk.getFile(); @@ -91,14 +91,14 @@ public class CommonApi { if (chunkNumber == null) { chunkNumber = 0; } - jsonObject.put("num",chunkNumber); + jsonObject.put("num", chunkNumber); File outFile = new File(filePath + File.separator + chunk.getIdentifier(), chunkNumber + ".part"); InputStream inputStream = file.getInputStream(); FileUtils.copyInputStreamToFile(inputStream, outFile); - }else{ - jsonObject.put("count",chunk.getTotalChunks()); + } else { + jsonObject.put("count", chunk.getTotalChunks()); } - System.out.println("结束时间:"+System.currentTimeMillis()); + System.out.println("结束时间:" + System.currentTimeMillis()); return AjaxResult.success(jsonObject); } @@ -148,9 +148,8 @@ public class CommonApi { } - @PostMapping("/show") - public void show(@RequestBody ShowFileUrl showFileUrl , HttpServletResponse response) throws IOException { + public void show(@RequestBody ShowFileUrl showFileUrl, HttpServletResponse response) throws IOException { byte[] bytes = fastDfsUtil.downloadFile(showFileUrl.getFileUrl()); response.getOutputStream().write(bytes); } @@ -161,22 +160,31 @@ public class CommonApi { List sysRoles = sysRoleService.getRoleByUserId(user.getId()); List legalPerson = sysRoles.stream().filter(x -> x.getRoleKey().equals("legalPerson")).collect(Collectors.toList()); - - if (CollectionUtil.isEmpty(legalPerson)) { return true; - }else { + } else { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(SysUserPro.class).eq(SysUserPro::getUserId, user.getId()); List list = sysUserProService.list(queryWrapper); if (CollectionUtil.isEmpty(list)) { return false; - }else { + } else { return true; } } } + @PostMapping("/bindPro") + public AjaxResult bindPro(@RequestBody List proNos) { + SysUser user = UserUtils.getUser(); + List proList = proNos.stream() + .map(x -> new SysUserPro(x, user.getId(), user.getId(), null)) + .collect(Collectors.toList()); + + return AjaxResult.success(sysUserProService.saveBatch(proList)); + + } + } diff --git a/jwtech-system/src/main/java/com/kms/system/domain/SysUserPro.java b/jwtech-system/src/main/java/com/kms/system/domain/SysUserPro.java index 58af5d2f..06096b5a 100644 --- a/jwtech-system/src/main/java/com/kms/system/domain/SysUserPro.java +++ b/jwtech-system/src/main/java/com/kms/system/domain/SysUserPro.java @@ -2,7 +2,9 @@ package com.kms.system.domain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.jianwei.common.annotation.Excel; @@ -21,6 +23,8 @@ import com.jianwei.common.core.domain.BaseEntity; @TableName("sys_user_pro") @Data @ApiModel("用户项目关联") +@AllArgsConstructor +@NoArgsConstructor public class SysUserPro extends BaseEntity { private static final long serialVersionUID = 1L;