diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 0aafd03..3fd9aaf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -109,6 +109,18 @@ /** * 由openId获取项目列表信息 */ + @RequestMapping(value = "/relate/project") + public Object relateProject(Long projectId) { + Assert.isFalse(Objects.isNull(projectId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + Page page = new PageFactory().defaultPage(); + return ResponseData.success(super.packForBT(appUserService.relateProject(projectId,page))); + } + + /** + * 由openId获取项目列表信息 + */ @RequestMapping(value = "/project") public Object project(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { @@ -118,6 +130,17 @@ } /** + * 由openId获取项目列表信息 + */ + @RequestMapping(value = "/regain") + public Object regain(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return appUserService.unbind(id); + } + + /** * 解除绑定 */ @RequestMapping(value = "/unbind") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 0aafd03..3fd9aaf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -109,6 +109,18 @@ /** * 由openId获取项目列表信息 */ + @RequestMapping(value = "/relate/project") + public Object relateProject(Long projectId) { + Assert.isFalse(Objects.isNull(projectId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + Page page = new PageFactory().defaultPage(); + return ResponseData.success(super.packForBT(appUserService.relateProject(projectId,page))); + } + + /** + * 由openId获取项目列表信息 + */ @RequestMapping(value = "/project") public Object project(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { @@ -118,6 +130,17 @@ } /** + * 由openId获取项目列表信息 + */ + @RequestMapping(value = "/regain") + public Object regain(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return appUserService.unbind(id); + } + + /** * 解除绑定 */ @RequestMapping(value = "/unbind") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 74b4578..9447a07 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -19,5 +19,7 @@ List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + int unbind(@Param("id")Long id,@Param("status")String status); + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 0aafd03..3fd9aaf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -109,6 +109,18 @@ /** * 由openId获取项目列表信息 */ + @RequestMapping(value = "/relate/project") + public Object relateProject(Long projectId) { + Assert.isFalse(Objects.isNull(projectId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + Page page = new PageFactory().defaultPage(); + return ResponseData.success(super.packForBT(appUserService.relateProject(projectId,page))); + } + + /** + * 由openId获取项目列表信息 + */ @RequestMapping(value = "/project") public Object project(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { @@ -118,6 +130,17 @@ } /** + * 由openId获取项目列表信息 + */ + @RequestMapping(value = "/regain") + public Object regain(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return appUserService.unbind(id); + } + + /** * 解除绑定 */ @RequestMapping(value = "/unbind") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 74b4578..9447a07 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -19,5 +19,7 @@ List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + int unbind(@Param("id")Long id,@Param("status")String status); + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index f0257e9..0a9f74d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -9,7 +9,7 @@ @@ -44,5 +44,12 @@ ORDER BY createTime DESC + + UPDATE app_user + SET status=#{status},openId="",attr="",labelLastTime=null + where id=#{id} + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 0aafd03..3fd9aaf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -109,6 +109,18 @@ /** * 由openId获取项目列表信息 */ + @RequestMapping(value = "/relate/project") + public Object relateProject(Long projectId) { + Assert.isFalse(Objects.isNull(projectId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + Page page = new PageFactory().defaultPage(); + return ResponseData.success(super.packForBT(appUserService.relateProject(projectId,page))); + } + + /** + * 由openId获取项目列表信息 + */ @RequestMapping(value = "/project") public Object project(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { @@ -118,6 +130,17 @@ } /** + * 由openId获取项目列表信息 + */ + @RequestMapping(value = "/regain") + public Object regain(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return appUserService.unbind(id); + } + + /** * 解除绑定 */ @RequestMapping(value = "/unbind") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 74b4578..9447a07 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -19,5 +19,7 @@ List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + int unbind(@Param("id")Long id,@Param("status")String status); + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index f0257e9..0a9f74d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -9,7 +9,7 @@ @@ -44,5 +44,12 @@ ORDER BY createTime DESC + + UPDATE app_user + SET status=#{status},openId="",attr="",labelLastTime=null + where id=#{id} + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java index 4cae735..3e1b0fa 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java @@ -47,7 +47,6 @@ private String wellTypeName; @ExcelProperty("位置信息") - @NotBlank(message = "位置信息不能为空") private String position; private String projectId; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 0aafd03..3fd9aaf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -109,6 +109,18 @@ /** * 由openId获取项目列表信息 */ + @RequestMapping(value = "/relate/project") + public Object relateProject(Long projectId) { + Assert.isFalse(Objects.isNull(projectId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + Page page = new PageFactory().defaultPage(); + return ResponseData.success(super.packForBT(appUserService.relateProject(projectId,page))); + } + + /** + * 由openId获取项目列表信息 + */ @RequestMapping(value = "/project") public Object project(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { @@ -118,6 +130,17 @@ } /** + * 由openId获取项目列表信息 + */ + @RequestMapping(value = "/regain") + public Object regain(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return appUserService.unbind(id); + } + + /** * 解除绑定 */ @RequestMapping(value = "/unbind") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 74b4578..9447a07 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -19,5 +19,7 @@ List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + int unbind(@Param("id")Long id,@Param("status")String status); + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index f0257e9..0a9f74d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -9,7 +9,7 @@ @@ -44,5 +44,12 @@ ORDER BY createTime DESC + + UPDATE app_user + SET status=#{status},openId="",attr="",labelLastTime=null + where id=#{id} + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java index 4cae735..3e1b0fa 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java @@ -47,7 +47,6 @@ private String wellTypeName; @ExcelProperty("位置信息") - @NotBlank(message = "位置信息不能为空") private String position; private String projectId; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 3bdd529..dc639bf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -12,7 +12,7 @@ Boolean checkPassWord(AppUserLoginDTO appUserLoginDTO, AppUser appUser); - Object bindWechatUser(AppUserLoginDTO appUserLoginDTO,AppUser appUser); + Object bindWechatUser(AppUserLoginDTO appUserLoginDTO, AppUser appUser); Page listPage(Page page, AppUserListDTO appUserListDTO); @@ -24,6 +24,8 @@ Object project(String openId); + Page relateProject(Long projectId, Page page); + AppUser detail(String openId); Object unbind(Long id); @@ -35,5 +37,4 @@ AppUser getAppUserByAccount(String account); - } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 0aafd03..3fd9aaf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -109,6 +109,18 @@ /** * 由openId获取项目列表信息 */ + @RequestMapping(value = "/relate/project") + public Object relateProject(Long projectId) { + Assert.isFalse(Objects.isNull(projectId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + Page page = new PageFactory().defaultPage(); + return ResponseData.success(super.packForBT(appUserService.relateProject(projectId,page))); + } + + /** + * 由openId获取项目列表信息 + */ @RequestMapping(value = "/project") public Object project(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { @@ -118,6 +130,17 @@ } /** + * 由openId获取项目列表信息 + */ + @RequestMapping(value = "/regain") + public Object regain(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return appUserService.unbind(id); + } + + /** * 解除绑定 */ @RequestMapping(value = "/unbind") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 74b4578..9447a07 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -19,5 +19,7 @@ List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + int unbind(@Param("id")Long id,@Param("status")String status); + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index f0257e9..0a9f74d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -9,7 +9,7 @@ @@ -44,5 +44,12 @@ ORDER BY createTime DESC + + UPDATE app_user + SET status=#{status},openId="",attr="",labelLastTime=null + where id=#{id} + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java index 4cae735..3e1b0fa 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java @@ -47,7 +47,6 @@ private String wellTypeName; @ExcelProperty("位置信息") - @NotBlank(message = "位置信息不能为空") private String position; private String projectId; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 3bdd529..dc639bf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -12,7 +12,7 @@ Boolean checkPassWord(AppUserLoginDTO appUserLoginDTO, AppUser appUser); - Object bindWechatUser(AppUserLoginDTO appUserLoginDTO,AppUser appUser); + Object bindWechatUser(AppUserLoginDTO appUserLoginDTO, AppUser appUser); Page listPage(Page page, AppUserListDTO appUserListDTO); @@ -24,6 +24,8 @@ Object project(String openId); + Page relateProject(Long projectId, Page page); + AppUser detail(String openId); Object unbind(Long id); @@ -35,5 +37,4 @@ AppUser getAppUserByAccount(String account); - } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java index a71b460..3d36304 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -55,6 +55,10 @@ @Value("${casic.file-upload-path}") private String filePath; + + @Value("${casic.file-download-path}") + private String fileDownPath; + @Value("${casic.photoPath}") private String photoPath; @Value("${casic.batchNumber}") @@ -155,7 +159,7 @@ .distinct().collect(Collectors.toList()); //删除目录 for (Long userId : userIds) { - String currentStampDir = filePath + userId + File.separator; + String currentStampDir = fileDownPath + userId + File.separator; File invalidFile = new File(currentStampDir); //删除子目录 if (invalidFile != null && invalidFile.isDirectory()) { @@ -198,7 +202,7 @@ }); Long stampeDir = System.currentTimeMillis(); //以当前时间戳为目录 - String currentStampDir = filePath + currentUserId + File.separator + stampeDir + File.separator; + String currentStampDir = fileDownPath + currentUserId + File.separator + stampeDir + File.separator; setLocalFileDir(currentStampDir); List batchExportLogsList = new ArrayList<>(); @@ -230,7 +234,7 @@ //删除所有的文件日志 this.batchExportLogMapper.delete(query); //删除所有历史文件 - deleteFile(new File(filePath + currentUserId + File.separator), String.valueOf(stampeDir)); + deleteFile(new File(fileDownPath + currentUserId + File.separator), String.valueOf(stampeDir)); //批量导入日志 batchExportLogsList.stream().forEach( batchExportLog -> this.batchExportLogMapper.insert(batchExportLog) @@ -277,7 +281,7 @@ if (invalidFile.list().length == 0) { log.debug("invalid print file has already delete success!"); } - if (!invalidFile.getAbsolutePath().equals(filePath)) { + if (!invalidFile.getAbsolutePath().equals(fileDownPath)) { //删除子目录 if (invalidFile != null && invalidFile.isDirectory() && invalidFile.listFiles().length == 0) { invalidFile.delete(); @@ -334,7 +338,7 @@ response.setHeader("Access-Control-Allow-Origin", "*"); System.out.println(response.getHeader("Content-Disposition")); ZipUtils zipUtils = new ZipUtils(); - zipPath = zipUtils.zipFileCreator(filePath, recentDir); + zipPath = zipUtils.zipFileCreator(fileDownPath, recentDir); //开始下载 is = new FileInputStream(new File(zipPath)); out = new BufferedOutputStream(response.getOutputStream()); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 0aafd03..3fd9aaf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -109,6 +109,18 @@ /** * 由openId获取项目列表信息 */ + @RequestMapping(value = "/relate/project") + public Object relateProject(Long projectId) { + Assert.isFalse(Objects.isNull(projectId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + Page page = new PageFactory().defaultPage(); + return ResponseData.success(super.packForBT(appUserService.relateProject(projectId,page))); + } + + /** + * 由openId获取项目列表信息 + */ @RequestMapping(value = "/project") public Object project(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { @@ -118,6 +130,17 @@ } /** + * 由openId获取项目列表信息 + */ + @RequestMapping(value = "/regain") + public Object regain(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return appUserService.unbind(id); + } + + /** * 解除绑定 */ @RequestMapping(value = "/unbind") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 74b4578..9447a07 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -19,5 +19,7 @@ List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + int unbind(@Param("id")Long id,@Param("status")String status); + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index f0257e9..0a9f74d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -9,7 +9,7 @@ @@ -44,5 +44,12 @@ ORDER BY createTime DESC + + UPDATE app_user + SET status=#{status},openId="",attr="",labelLastTime=null + where id=#{id} + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java index 4cae735..3e1b0fa 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java @@ -47,7 +47,6 @@ private String wellTypeName; @ExcelProperty("位置信息") - @NotBlank(message = "位置信息不能为空") private String position; private String projectId; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 3bdd529..dc639bf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -12,7 +12,7 @@ Boolean checkPassWord(AppUserLoginDTO appUserLoginDTO, AppUser appUser); - Object bindWechatUser(AppUserLoginDTO appUserLoginDTO,AppUser appUser); + Object bindWechatUser(AppUserLoginDTO appUserLoginDTO, AppUser appUser); Page listPage(Page page, AppUserListDTO appUserListDTO); @@ -24,6 +24,8 @@ Object project(String openId); + Page relateProject(Long projectId, Page page); + AppUser detail(String openId); Object unbind(Long id); @@ -35,5 +37,4 @@ AppUser getAppUserByAccount(String account); - } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java index a71b460..3d36304 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -55,6 +55,10 @@ @Value("${casic.file-upload-path}") private String filePath; + + @Value("${casic.file-download-path}") + private String fileDownPath; + @Value("${casic.photoPath}") private String photoPath; @Value("${casic.batchNumber}") @@ -155,7 +159,7 @@ .distinct().collect(Collectors.toList()); //删除目录 for (Long userId : userIds) { - String currentStampDir = filePath + userId + File.separator; + String currentStampDir = fileDownPath + userId + File.separator; File invalidFile = new File(currentStampDir); //删除子目录 if (invalidFile != null && invalidFile.isDirectory()) { @@ -198,7 +202,7 @@ }); Long stampeDir = System.currentTimeMillis(); //以当前时间戳为目录 - String currentStampDir = filePath + currentUserId + File.separator + stampeDir + File.separator; + String currentStampDir = fileDownPath + currentUserId + File.separator + stampeDir + File.separator; setLocalFileDir(currentStampDir); List batchExportLogsList = new ArrayList<>(); @@ -230,7 +234,7 @@ //删除所有的文件日志 this.batchExportLogMapper.delete(query); //删除所有历史文件 - deleteFile(new File(filePath + currentUserId + File.separator), String.valueOf(stampeDir)); + deleteFile(new File(fileDownPath + currentUserId + File.separator), String.valueOf(stampeDir)); //批量导入日志 batchExportLogsList.stream().forEach( batchExportLog -> this.batchExportLogMapper.insert(batchExportLog) @@ -277,7 +281,7 @@ if (invalidFile.list().length == 0) { log.debug("invalid print file has already delete success!"); } - if (!invalidFile.getAbsolutePath().equals(filePath)) { + if (!invalidFile.getAbsolutePath().equals(fileDownPath)) { //删除子目录 if (invalidFile != null && invalidFile.isDirectory() && invalidFile.listFiles().length == 0) { invalidFile.delete(); @@ -334,7 +338,7 @@ response.setHeader("Access-Control-Allow-Origin", "*"); System.out.println(response.getHeader("Content-Disposition")); ZipUtils zipUtils = new ZipUtils(); - zipPath = zipUtils.zipFileCreator(filePath, recentDir); + zipPath = zipUtils.zipFileCreator(fileDownPath, recentDir); //开始下载 is = new FileInputStream(new File(zipPath)); out = new BufferedOutputStream(response.getOutputStream()); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java index 0b63971..0cebc12 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java @@ -87,7 +87,9 @@ public Page listPage(Page page, AppUserListDTO appUserListDTO) { EntityWrapper entityWrapper = initQueryParam(appUserListDTO); List appUserList = this.baseMapper.selectPage(page, entityWrapper); + Map dictRoleMap = getDictRole(true); for (AppUser appUser : appUserList) { + appUser.setRole(dictRoleMap.containsKey(appUser.getRole()) ? dictRoleMap.get(appUser.getRole()) : null); appUser.setProjectNames(tranIdsToStrNames(appUser.getProjectIds())); } page.setRecords(appUserList); @@ -167,6 +169,16 @@ } @Override + public Page relateProject(Long projectId, Page page) { + EntityWrapper appUserWrapper = new EntityWrapper(); + appUserWrapper.like("projectIds", projectId.toString()); + List appUsers = this.baseMapper.selectPage(page, appUserWrapper); + page.setRecords(appUsers); + return page; + } + + + @Override public AppUser detail(String openId) { EntityWrapper appUserWrapper = new EntityWrapper(); appUserWrapper.eq("openId", openId); @@ -181,15 +193,7 @@ @Override public Object unbind(Long id) { - AppUser appUser = new AppUser(); - appUser.setId(id); - appUser.setLabelLastTime(null); - appUser.setOpenId(null); - appUser.setAttr(null); - appUser.setAttrAlias(null); - //状态置为未绑定 - appUser.setStatus(NOT_BOUND); - int unbindFlag = this.baseMapper.updateById(appUser); + int unbindFlag = this.baseMapper.unbind(id, NOT_BOUND); if (unbindFlag > 0) { return ResponseData.success(); } @@ -211,6 +215,7 @@ list.add("用户获取校验参数出错"); return list; } + Map currentPhoneMap = new HashMap<>(); if (!CollectionUtil.isEmpty(results)) { final Integer[] index = {0}; results.forEach(user -> { @@ -233,7 +238,11 @@ return; } } - + if (currentPhoneMap.containsKey(user.getPhone())) { + list.add("第" + index[0] + "行与" + currentPhoneMap.get(user.getPhone()) + "手机号重复注册，请修改！"); + return; + } + currentPhoneMap.put(user.getPhone(), "第" + index[0] + "行"); if (StringUtils.isEmpty(user.getPassword())) { user.setPassword("111111"); } @@ -257,7 +266,7 @@ //验证角色类型 if (StringUtils.isNotEmpty(user.getRole())) { Boolean roleIsExist = userValid.getRoleMap().containsKey(user.getRole()); - if (roleIsExist) { + if (!roleIsExist) { //默认为普通角色 user.setRole("2"); } else { @@ -365,7 +374,7 @@ try { return AppUserImportValid.builder() .projectNameMap(appWellPreService.getProjestNameMap()) - .roleMap(getDictRole()) + .roleMap(getDictRole(false)) .userPhoneMap(getUserPhoneMap()) .build(); } catch (Exception ex) { @@ -378,12 +387,19 @@ /** * 获取字典类型点位类型 */ - private Map getDictRole() { + private Map getDictRole(Boolean codeAsKey) { //获取点位编号 List suilWellDict = this.dictMapper.selectByParentCode("appRole"); - Map dictRoleMap = suilWellDict.stream().collect( - Collectors.toMap(Dict::getName, Dict::getCode) - ); + Map dictRoleMap = null; + if (codeAsKey) { + dictRoleMap = suilWellDict.stream().collect( + Collectors.toMap(Dict::getCode, Dict::getName) + ); + } else { + dictRoleMap = suilWellDict.stream().collect( + Collectors.toMap(Dict::getName, Dict::getCode) + ); + } return dictRoleMap; } @@ -391,7 +407,6 @@ //获取项目名称 private Map getUserPhoneMap() { List userPhoneList = this.baseMapper.getUserPhoneList(); - if (!CollectionUtils.isEmpty(userPhoneList)) { List userPhoneFilerList = userPhoneList.stream().filter(e -> StringUtils.isNotEmpty(e)).collect(Collectors.toList()); //由名称查询id diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 0aafd03..3fd9aaf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -109,6 +109,18 @@ /** * 由openId获取项目列表信息 */ + @RequestMapping(value = "/relate/project") + public Object relateProject(Long projectId) { + Assert.isFalse(Objects.isNull(projectId), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + Page page = new PageFactory().defaultPage(); + return ResponseData.success(super.packForBT(appUserService.relateProject(projectId,page))); + } + + /** + * 由openId获取项目列表信息 + */ @RequestMapping(value = "/project") public Object project(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { @@ -118,6 +130,17 @@ } /** + * 由openId获取项目列表信息 + */ + @RequestMapping(value = "/regain") + public Object regain(Long id) { + Assert.isFalse(Objects.isNull(id), () -> { + throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); + }); + return appUserService.unbind(id); + } + + /** * 解除绑定 */ @RequestMapping(value = "/unbind") diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 74b4578..9447a07 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -19,5 +19,7 @@ List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + int unbind(@Param("id")Long id,@Param("status")String status); + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index f0257e9..0a9f74d 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -9,7 +9,7 @@ @@ -44,5 +44,12 @@ ORDER BY createTime DESC + + UPDATE app_user + SET status=#{status},openId="",attr="",labelLastTime=null + where id=#{id} + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java index 4cae735..3e1b0fa 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/WellPreAdd.java @@ -47,7 +47,6 @@ private String wellTypeName; @ExcelProperty("位置信息") - @NotBlank(message = "位置信息不能为空") private String position; private String projectId; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java index 3bdd529..dc639bf 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppUserService.java @@ -12,7 +12,7 @@ Boolean checkPassWord(AppUserLoginDTO appUserLoginDTO, AppUser appUser); - Object bindWechatUser(AppUserLoginDTO appUserLoginDTO,AppUser appUser); + Object bindWechatUser(AppUserLoginDTO appUserLoginDTO, AppUser appUser); Page listPage(Page page, AppUserListDTO appUserListDTO); @@ -24,6 +24,8 @@ Object project(String openId); + Page relateProject(Long projectId, Page page); + AppUser detail(String openId); Object unbind(Long id); @@ -35,5 +37,4 @@ AppUser getAppUserByAccount(String account); - } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java index a71b460..3d36304 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -55,6 +55,10 @@ @Value("${casic.file-upload-path}") private String filePath; + + @Value("${casic.file-download-path}") + private String fileDownPath; + @Value("${casic.photoPath}") private String photoPath; @Value("${casic.batchNumber}") @@ -155,7 +159,7 @@ .distinct().collect(Collectors.toList()); //删除目录 for (Long userId : userIds) { - String currentStampDir = filePath + userId + File.separator; + String currentStampDir = fileDownPath + userId + File.separator; File invalidFile = new File(currentStampDir); //删除子目录 if (invalidFile != null && invalidFile.isDirectory()) { @@ -198,7 +202,7 @@ }); Long stampeDir = System.currentTimeMillis(); //以当前时间戳为目录 - String currentStampDir = filePath + currentUserId + File.separator + stampeDir + File.separator; + String currentStampDir = fileDownPath + currentUserId + File.separator + stampeDir + File.separator; setLocalFileDir(currentStampDir); List batchExportLogsList = new ArrayList<>(); @@ -230,7 +234,7 @@ //删除所有的文件日志 this.batchExportLogMapper.delete(query); //删除所有历史文件 - deleteFile(new File(filePath + currentUserId + File.separator), String.valueOf(stampeDir)); + deleteFile(new File(fileDownPath + currentUserId + File.separator), String.valueOf(stampeDir)); //批量导入日志 batchExportLogsList.stream().forEach( batchExportLog -> this.batchExportLogMapper.insert(batchExportLog) @@ -277,7 +281,7 @@ if (invalidFile.list().length == 0) { log.debug("invalid print file has already delete success!"); } - if (!invalidFile.getAbsolutePath().equals(filePath)) { + if (!invalidFile.getAbsolutePath().equals(fileDownPath)) { //删除子目录 if (invalidFile != null && invalidFile.isDirectory() && invalidFile.listFiles().length == 0) { invalidFile.delete(); @@ -334,7 +338,7 @@ response.setHeader("Access-Control-Allow-Origin", "*"); System.out.println(response.getHeader("Content-Disposition")); ZipUtils zipUtils = new ZipUtils(); - zipPath = zipUtils.zipFileCreator(filePath, recentDir); + zipPath = zipUtils.zipFileCreator(fileDownPath, recentDir); //开始下载 is = new FileInputStream(new File(zipPath)); out = new BufferedOutputStream(response.getOutputStream()); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java index 0b63971..0cebc12 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java @@ -87,7 +87,9 @@ public Page listPage(Page page, AppUserListDTO appUserListDTO) { EntityWrapper entityWrapper = initQueryParam(appUserListDTO); List appUserList = this.baseMapper.selectPage(page, entityWrapper); + Map dictRoleMap = getDictRole(true); for (AppUser appUser : appUserList) { + appUser.setRole(dictRoleMap.containsKey(appUser.getRole()) ? dictRoleMap.get(appUser.getRole()) : null); appUser.setProjectNames(tranIdsToStrNames(appUser.getProjectIds())); } page.setRecords(appUserList); @@ -167,6 +169,16 @@ } @Override + public Page relateProject(Long projectId, Page page) { + EntityWrapper appUserWrapper = new EntityWrapper(); + appUserWrapper.like("projectIds", projectId.toString()); + List appUsers = this.baseMapper.selectPage(page, appUserWrapper); + page.setRecords(appUsers); + return page; + } + + + @Override public AppUser detail(String openId) { EntityWrapper appUserWrapper = new EntityWrapper(); appUserWrapper.eq("openId", openId); @@ -181,15 +193,7 @@ @Override public Object unbind(Long id) { - AppUser appUser = new AppUser(); - appUser.setId(id); - appUser.setLabelLastTime(null); - appUser.setOpenId(null); - appUser.setAttr(null); - appUser.setAttrAlias(null); - //状态置为未绑定 - appUser.setStatus(NOT_BOUND); - int unbindFlag = this.baseMapper.updateById(appUser); + int unbindFlag = this.baseMapper.unbind(id, NOT_BOUND); if (unbindFlag > 0) { return ResponseData.success(); } @@ -211,6 +215,7 @@ list.add("用户获取校验参数出错"); return list; } + Map currentPhoneMap = new HashMap<>(); if (!CollectionUtil.isEmpty(results)) { final Integer[] index = {0}; results.forEach(user -> { @@ -233,7 +238,11 @@ return; } } - + if (currentPhoneMap.containsKey(user.getPhone())) { + list.add("第" + index[0] + "行与" + currentPhoneMap.get(user.getPhone()) + "手机号重复注册，请修改！"); + return; + } + currentPhoneMap.put(user.getPhone(), "第" + index[0] + "行"); if (StringUtils.isEmpty(user.getPassword())) { user.setPassword("111111"); } @@ -257,7 +266,7 @@ //验证角色类型 if (StringUtils.isNotEmpty(user.getRole())) { Boolean roleIsExist = userValid.getRoleMap().containsKey(user.getRole()); - if (roleIsExist) { + if (!roleIsExist) { //默认为普通角色 user.setRole("2"); } else { @@ -365,7 +374,7 @@ try { return AppUserImportValid.builder() .projectNameMap(appWellPreService.getProjestNameMap()) - .roleMap(getDictRole()) + .roleMap(getDictRole(false)) .userPhoneMap(getUserPhoneMap()) .build(); } catch (Exception ex) { @@ -378,12 +387,19 @@ /** * 获取字典类型点位类型 */ - private Map getDictRole() { + private Map getDictRole(Boolean codeAsKey) { //获取点位编号 List suilWellDict = this.dictMapper.selectByParentCode("appRole"); - Map dictRoleMap = suilWellDict.stream().collect( - Collectors.toMap(Dict::getName, Dict::getCode) - ); + Map dictRoleMap = null; + if (codeAsKey) { + dictRoleMap = suilWellDict.stream().collect( + Collectors.toMap(Dict::getCode, Dict::getName) + ); + } else { + dictRoleMap = suilWellDict.stream().collect( + Collectors.toMap(Dict::getName, Dict::getCode) + ); + } return dictRoleMap; } @@ -391,7 +407,6 @@ //获取项目名称 private Map getUserPhoneMap() { List userPhoneList = this.baseMapper.getUserPhoneList(); - if (!CollectionUtils.isEmpty(userPhoneList)) { List userPhoneFilerList = userPhoneList.stream().filter(e -> StringUtils.isNotEmpty(e)).collect(Collectors.toList()); //由名称查询id diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppWellPreServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppWellPreServiceImpl.java index 63a7aab..3df50ce 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppWellPreServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppWellPreServiceImpl.java @@ -74,10 +74,11 @@ List list = new ArrayList<>(); //准备校验参数 WellPreImportValid wellPreValid = prepareWellPreValid(); - if(wellPreValid==null){ + if (wellPreValid == null) { list.add("获取校验参数出错"); return list; } + Map currentWellCodeMap = new HashMap<>(); if (!CollectionUtil.isEmpty(results)) { final Integer[] index = {0}; results.forEach(wellPreAdd -> { @@ -95,9 +96,14 @@ //点位编号的唯一性 Boolean wellCodeIsExist = wellPreValid.getWellCodeMap().containsKey(wellPreAdd.getWellCode()); if (wellCodeIsExist) { - list.add("第" + index[0] + "行，设备编号已经存在！"); + list.add("第" + index[0] + "行，点位编号已经存在！"); return; } + if (currentWellCodeMap.containsKey(wellPreAdd.getWellCode())) { + list.add("第" + index[0] + "行与" + currentWellCodeMap.get(wellPreAdd.getWellCode()) + "点位编号重复注册，请修改！"); + return; + } + currentWellCodeMap.put(wellPreAdd.getWellCode(), "第" + index[0] + "行"); //验证项目名称是否存在 Boolean projectIdIsExist = wellPreValid.getProjectMap().containsKey(wellPreAdd.getProjectName()); if (!projectIdIsExist) { @@ -177,8 +183,8 @@ .wellCodeMap(getAllWellCodeMap(null)) .dictSuiltWellMap(getDictSluitWell()) .build(); - }catch (Exception ex){ - log.error("验证准备阶段出现异常，异常信息为{}",ex); + } catch (Exception ex) { + log.error("验证准备阶段出现异常，异常信息为{}", ex); } return null; } @@ -210,7 +216,7 @@ @Override public Map getProjestNameMap() { List> projects = this.baseMapper.getProjectList(); - List> projectFilters=projects.stream().filter(e->e.get("projectName")!=null).collect(Collectors.toList()); + List> projectFilters = projects.stream().filter(e -> e.get("projectName") != null).collect(Collectors.toList()); //由名称查询id Map projectMap = projectFilters.stream().collect( Collectors.toMap(e -> e.get("projectName").toString(),