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 3fd9aaf..58ccabb 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 @@ -122,11 +122,11 @@ * 由openId获取项目列表信息 */ @RequestMapping(value = "/project") - public Object project(String openId) { + public Object userProject(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); }); - return appUserService.project(openId); + return appUserService.userProject(openId); } /** 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 3fd9aaf..58ccabb 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 @@ -122,11 +122,11 @@ * 由openId获取项目列表信息 */ @RequestMapping(value = "/project") - public Object project(String openId) { + public Object userProject(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); }); - return appUserService.project(openId); + return appUserService.userProject(openId); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java new file mode 100644 index 0000000..b739656 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dto; + +import lombok.Builder; +import lombok.Data; + +/** + * @author cz + * 小程序用户 + */ +@Data +@Builder +public class SampleProjectResponse { + + private String projectId; + private String projectName; +} 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 3fd9aaf..58ccabb 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 @@ -122,11 +122,11 @@ * 由openId获取项目列表信息 */ @RequestMapping(value = "/project") - public Object project(String openId) { + public Object userProject(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); }); - return appUserService.project(openId); + return appUserService.userProject(openId); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java new file mode 100644 index 0000000..b739656 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dto; + +import lombok.Builder; +import lombok.Data; + +/** + * @author cz + * 小程序用户 + */ +@Data +@Builder +public class SampleProjectResponse { + + private String projectId; + private String projectName; +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java index bab99e7..45decec 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java @@ -2,10 +2,13 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; +import com.casic.missiles.modular.app.dto.SampleProjectResponse; import lombok.Data; import org.hibernate.validator.constraints.NotBlank; import java.util.Date; +import java.util.List; +import java.util.Map; @Data @TableName("app_user") @@ -28,6 +31,8 @@ private Date labelLastTime; private Date createtime; private Date updateTime; - private String salt; + private String salt; private String status; + @TableField(exist = false) + private List projects; } 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 3fd9aaf..58ccabb 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 @@ -122,11 +122,11 @@ * 由openId获取项目列表信息 */ @RequestMapping(value = "/project") - public Object project(String openId) { + public Object userProject(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); }); - return appUserService.project(openId); + return appUserService.userProject(openId); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java new file mode 100644 index 0000000..b739656 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dto; + +import lombok.Builder; +import lombok.Data; + +/** + * @author cz + * 小程序用户 + */ +@Data +@Builder +public class SampleProjectResponse { + + private String projectId; + private String projectName; +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java index bab99e7..45decec 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java @@ -2,10 +2,13 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; +import com.casic.missiles.modular.app.dto.SampleProjectResponse; import lombok.Data; import org.hibernate.validator.constraints.NotBlank; import java.util.Date; +import java.util.List; +import java.util.Map; @Data @TableName("app_user") @@ -28,6 +31,8 @@ private Date labelLastTime; private Date createtime; private Date updateTime; - private String salt; + private String salt; private String status; + @TableField(exist = false) + private List projects; } 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 dc639bf..3b33880 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 @@ -22,7 +22,7 @@ Object resetPassword(AppUserSaveDTO appUserDTO); - Object project(String openId); + Object userProject(String openId); Page relateProject(Long projectId, Page page); 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 3fd9aaf..58ccabb 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 @@ -122,11 +122,11 @@ * 由openId获取项目列表信息 */ @RequestMapping(value = "/project") - public Object project(String openId) { + public Object userProject(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); }); - return appUserService.project(openId); + return appUserService.userProject(openId); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java new file mode 100644 index 0000000..b739656 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dto; + +import lombok.Builder; +import lombok.Data; + +/** + * @author cz + * 小程序用户 + */ +@Data +@Builder +public class SampleProjectResponse { + + private String projectId; + private String projectName; +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java index bab99e7..45decec 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java @@ -2,10 +2,13 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; +import com.casic.missiles.modular.app.dto.SampleProjectResponse; import lombok.Data; import org.hibernate.validator.constraints.NotBlank; import java.util.Date; +import java.util.List; +import java.util.Map; @Data @TableName("app_user") @@ -28,6 +31,8 @@ private Date labelLastTime; private Date createtime; private Date updateTime; - private String salt; + private String salt; private String status; + @TableField(exist = false) + private List projects; } 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 dc639bf..3b33880 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 @@ -22,7 +22,7 @@ Object resetPassword(AppUserSaveDTO appUserDTO); - Object project(String openId); + Object userProject(String openId); Page relateProject(Long projectId, Page page); 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 0cebc12..c98688a 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 @@ -16,6 +16,7 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.core.util.RSAUtils; import com.casic.missiles.modular.app.dao.AppUserMapper; +import com.casic.missiles.modular.app.dto.SampleProjectResponse; import com.casic.missiles.modular.app.dto.user.AppUserImportValid; import com.casic.missiles.modular.app.dto.user.AppUserListDTO; import com.casic.missiles.modular.app.dto.user.AppUserLoginDTO; @@ -155,15 +156,16 @@ @Override - public Object project(String openId) { + public Object userProject(String openId) { EntityWrapper appUserWrapper = new EntityWrapper(); appUserWrapper.eq("openId", openId); List appUserList = this.baseMapper.selectList(appUserWrapper); Optional appUserOptional = appUserList.stream().findFirst(); if (appUserOptional.isPresent()) { AppUser appUser = appUserOptional.get(); - List> projects = tranIdsToListNames(appUser.getProjectIds()); - return ResponseData.success(projects); + List projects = tranIdsToListNames(appUser.getProjectIds()); + appUser.setProjects(projects); + return ResponseData.success(appUser); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -342,19 +344,21 @@ /** * 通过项目ids获取项目名称列表 */ - private List> tranIdsToListNames(String projectIds) { + private List tranIdsToListNames(String projectIds) { Map wellPreMaps = appWellPreService.getProjestIdMap(); - List> projectNamelist = new ArrayList<>(); - String[] projectIdStrs = projectIds.split(","); - for (String projectId : projectIdStrs) { + List sampleProjectList = new ArrayList<>(); + String[] projectIdStr = projectIds.split(","); + for (String projectId : projectIdStr) { if (!StringUtils.isEmpty(projectId)) { - Map projectMap = new HashMap(); - projectMap.put("projectId", projectId); - projectMap.put("projectName", wellPreMaps.get(projectId)); - projectNamelist.add(projectMap); + sampleProjectList.add( + SampleProjectResponse.builder() + .projectId(projectId) + .projectName(wellPreMaps.get(projectId)) + .build() + ); } } - return projectNamelist; + return sampleProjectList; } private EntityWrapper initQueryParam(AppUserListDTO appUserListDTO) { 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 3fd9aaf..58ccabb 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 @@ -122,11 +122,11 @@ * 由openId获取项目列表信息 */ @RequestMapping(value = "/project") - public Object project(String openId) { + public Object userProject(String openId) { Assert.isFalse(Objects.isNull(openId), () -> { throw new BusinessException(BusinessExceptionEnum.OPENID_NULL); }); - return appUserService.project(openId); + return appUserService.userProject(openId); } /** diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java new file mode 100644 index 0000000..b739656 --- /dev/null +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/SampleProjectResponse.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.app.dto; + +import lombok.Builder; +import lombok.Data; + +/** + * @author cz + * 小程序用户 + */ +@Data +@Builder +public class SampleProjectResponse { + + private String projectId; + private String projectName; +} diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java index bab99e7..45decec 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java @@ -2,10 +2,13 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; +import com.casic.missiles.modular.app.dto.SampleProjectResponse; import lombok.Data; import org.hibernate.validator.constraints.NotBlank; import java.util.Date; +import java.util.List; +import java.util.Map; @Data @TableName("app_user") @@ -28,6 +31,8 @@ private Date labelLastTime; private Date createtime; private Date updateTime; - private String salt; + private String salt; private String status; + @TableField(exist = false) + private List projects; } 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 dc639bf..3b33880 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 @@ -22,7 +22,7 @@ Object resetPassword(AppUserSaveDTO appUserDTO); - Object project(String openId); + Object userProject(String openId); Page relateProject(Long projectId, Page page); 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 0cebc12..c98688a 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 @@ -16,6 +16,7 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.core.util.RSAUtils; import com.casic.missiles.modular.app.dao.AppUserMapper; +import com.casic.missiles.modular.app.dto.SampleProjectResponse; import com.casic.missiles.modular.app.dto.user.AppUserImportValid; import com.casic.missiles.modular.app.dto.user.AppUserListDTO; import com.casic.missiles.modular.app.dto.user.AppUserLoginDTO; @@ -155,15 +156,16 @@ @Override - public Object project(String openId) { + public Object userProject(String openId) { EntityWrapper appUserWrapper = new EntityWrapper(); appUserWrapper.eq("openId", openId); List appUserList = this.baseMapper.selectList(appUserWrapper); Optional appUserOptional = appUserList.stream().findFirst(); if (appUserOptional.isPresent()) { AppUser appUser = appUserOptional.get(); - List> projects = tranIdsToListNames(appUser.getProjectIds()); - return ResponseData.success(projects); + List projects = tranIdsToListNames(appUser.getProjectIds()); + appUser.setProjects(projects); + return ResponseData.success(appUser); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -342,19 +344,21 @@ /** * 通过项目ids获取项目名称列表 */ - private List> tranIdsToListNames(String projectIds) { + private List tranIdsToListNames(String projectIds) { Map wellPreMaps = appWellPreService.getProjestIdMap(); - List> projectNamelist = new ArrayList<>(); - String[] projectIdStrs = projectIds.split(","); - for (String projectId : projectIdStrs) { + List sampleProjectList = new ArrayList<>(); + String[] projectIdStr = projectIds.split(","); + for (String projectId : projectIdStr) { if (!StringUtils.isEmpty(projectId)) { - Map projectMap = new HashMap(); - projectMap.put("projectId", projectId); - projectMap.put("projectName", wellPreMaps.get(projectId)); - projectNamelist.add(projectMap); + sampleProjectList.add( + SampleProjectResponse.builder() + .projectId(projectId) + .projectName(wellPreMaps.get(projectId)) + .build() + ); } } - return projectNamelist; + return sampleProjectList; } private EntityWrapper initQueryParam(AppUserListDTO appUserListDTO) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 4968887..b540b70 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -21,8 +21,8 @@ producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid - appid: wx79419f886f8c77ef #微信小程序开发appid - secret: 1bb1a8ed46c5217715e674ecd077e9ff #微信小程序开发密钥 + appid: wx8f4b331065a9ac2e #微信小程序开发appid + secret: 6c22ca8bca0b239c0cb152f9230e9c52 #微信小程序开发密钥 photoPath: http://192.168.8.110:8083/static/ #导出照片位置存放目录 export-file-delete: 0 0 */1 * * ? #日志文件有效扫描时间(现为一天扫描一次) file-valid-days: -1 #日志文件有效天数