diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index b5c2ce3c0..cc7e42409 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -289,11 +289,12 @@ public class AppUserServiceImpl implements AppUserService { // 组装用户注册信息 EpdcGridLeaderRegisterDTO gridLeaderRegister = this.packageGridLeaderWhileRegister(leaderRegisterDto.getSysUser(), formDto.getWxCode()); List userGridList = ConvertUtils.sourceToTarget(leaderRegisterDto.getLeaderGridList(), UserGridRelationDTO.class); - for(UserGridRelationDTO item: userGridList){ - item.setAllDeptNames(item.getDistrict()+"-"+item.getStreet()+"-"+item.getCommunity()+"-"+item.getGrid()); - item.setAllDeptIds(item.getDistrictId()+","+item.getStreetId()+","+item.getCommunityId()+","+item.getGridId()); - item.setParentDeptIds(item.getDistrict()+"-"+item.getStreet()+"-"+item.getCommunity()); - item.setParentDeptNames(item.getDistrictId()+","+item.getStreetId()+","+item.getCommunityId()); + for (UserGridRelationDTO item : userGridList) { + //TODO:修改此地bug +// item.setAllDeptNames(item.getDistrict()+"-"+item.getStreet()+"-"+item.getCommunity()+"-"+item.getGrid()); +// item.setAllDeptIds(item.getDistrictId()+","+item.getStreetId()+","+item.getCommunityId()+","+item.getGridId()); +// item.setParentDeptIds(item.getDistrict()+"-"+item.getStreet()+"-"+item.getCommunity()); +// item.setParentDeptNames(item.getDistrictId()+","+item.getStreetId()+","+item.getCommunityId()); } EpdcGridLeaderRegisterFormDTO registerDto = new EpdcGridLeaderRegisterFormDTO(); registerDto.setGridLeader(gridLeaderRegister); @@ -810,7 +811,7 @@ public class AppUserServiceImpl implements AppUserService { return new Result().error(verification); } } - }else { + } else { userDto.setIdentityNo(null); } // 验证手机号 @@ -833,7 +834,7 @@ public class AppUserServiceImpl implements AppUserService { Result completeResult = userFeignClient.completeUserInfo(dto); if (!completeResult.success()) { //党员认证失败 - if(100006001==completeResult.getCode()){ + if (100006001 == completeResult.getCode()) { EpdcAppAuthorizationDTO authorizationDto = new EpdcAppAuthorizationDTO(); authorizationDto.setResultCode(YesOrNoEnum.YES.value()); authorizationDto.setResultMsg(completeResult.getMsg()); @@ -977,13 +978,13 @@ public class AppUserServiceImpl implements AppUserService { UserDTO userDTO = new UserDTO(); userDTO.setId(userDetail.getUserId()); userDTO.setNickname(wxMaUserInfo.getNickName()); - //上传微信头像 - Result uploadDTOResult = ossFeignClient.saveWeChatFaceImg(wxMaUserInfo.getAvatarUrl()); - if (uploadDTOResult.success()) { - userDTO.setFaceImg(uploadDTOResult.getData().getUrl()); - } else { - userDTO.setFaceImg(USER_FACE); - } + //上传微信头像 + Result uploadDTOResult = ossFeignClient.saveWeChatFaceImg(wxMaUserInfo.getAvatarUrl()); + if (uploadDTOResult.success()) { + userDTO.setFaceImg(uploadDTOResult.getData().getUrl()); + } else { + userDTO.setFaceImg(USER_FACE); + } //微信性别0未知 1:男 2：女 本系统：1男,0女 if (UserSexEnum.WX_MALE.sex().equals(wxMaUserInfo.getGender())) { userDTO.setSex(UserSexEnum.MALE.sex()); @@ -1044,7 +1045,7 @@ public class AppUserServiceImpl implements AppUserService { */ private void joinGridPartyGroup(UserDTO userDto, List userGridList, String lordFlag) { List formDTOList = new ArrayList<>(userGridList.size()); - for (UserGridRelationDTO dto: + for (UserGridRelationDTO dto : userGridList) { GroupUserFormDTO formDto = new GroupUserFormDTO(); formDto.setUserId(userDto.getId()); @@ -1129,19 +1130,20 @@ public class AppUserServiceImpl implements AppUserService { /** * 查询是否为志愿者 + * * @param tokenDto * @return */ @Override - public Result getVolunteerCountById(TokenDto tokenDto){ + public Result getVolunteerCountById(TokenDto tokenDto) { Result result = new Result(); Result volunteerCountResult = userFeignClient.getVolunteerCountById(tokenDto.getUserId()); if (!volunteerCountResult.success() || null == volunteerCountResult.getData()) { result.error("志愿者验证错误"); - }else{ - if(volunteerCountResult.getData() == 0){ + } else { + if (volunteerCountResult.getData() == 0) { result.error("该用户不是志愿者"); - }else{ + } else { result.setMsg("志愿者认证通过"); } } @@ -1220,5 +1222,4 @@ public class AppUserServiceImpl implements AppUserService { } - } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java index a5180722d..f936febab 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java @@ -104,11 +104,6 @@ public class CategoryEntity extends BaseEntity { @TableField(exist = false) private String label; - /** - * 第三方平台分类编码 - */ - private String infoCode; - /** * 启用标识（0-否，1-是） */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEvaluateDeptEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEvaluateDeptEntity.java index 68a1a69cd..25478848d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEvaluateDeptEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEvaluateDeptEntity.java @@ -26,41 +26,41 @@ import lombok.EqualsAndHashCode; import java.util.Date; /** - * 部门满意度评价表 + * 部门满意度评价表 * * @author qu qu@elink-cn.com * @since v1.0.0 2019-09-17 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("epdc_item_evaluate_dept") public class ItemEvaluateDeptEntity extends BaseEpdcEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 项目ID - */ - private String itemId; + /** + * 项目ID + */ + private String itemId; /** * 被评价部门ID */ - private Long deptId; + private Long deptId; /** * 被评价部门名称 */ - private String deptName; + private String deptName; /** * 评价满意度 */ - private Integer evaluationLevel; + private Integer evaluationLevel; /** * 操作人部门ID */ - private Long createdDeptId; + private Long createdDeptId; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java index 4aa40316d..51d2d202a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java @@ -16,6 +16,7 @@ */ package com.elink.esua.epdc.modules.item.service.impl; + import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.result.ItemDeptEvaluateResultDTO; @@ -30,7 +31,7 @@ import java.util.Arrays; import java.util.List; /** - * 部门满意度评价表 + * 部门满意度评价表 * * @author qu qu@elink-cn.com * @since v1.0.0 2019-09-17 @@ -49,7 +50,7 @@ public class ItemEvaluateDeptServiceImpl extends BaseServiceImpl evaluateDeptDTOS, String itemId, Long createdDeptId) { List evaluateDeptEntities = new ArrayList<>(); - for (ItemEvaluateDeptDTO dto: + for (ItemEvaluateDeptDTO dto : evaluateDeptDTOS) { ItemEvaluateDeptEntity entity = new ItemEvaluateDeptEntity(); entity.setDeptId(dto.getDeptId()); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 5f93244a3..fb1830626 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -36,10 +36,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.GPSUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.constant.EventIssueItemState; -import com.elink.esua.epdc.constant.EventsNoticeConstant; -import com.elink.esua.epdc.constant.ImageConstant; -import com.elink.esua.epdc.constant.ItemInformationConstant; +import com.elink.esua.epdc.constant.*; import com.elink.esua.epdc.constants.MenuCodeConstant; import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.DeptGridPlatformDTO; @@ -177,10 +174,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { Result resultdept = adminFeignClient.getSysDeptInfo(Long.parseLong(params.get("streetId").toString())); - SysDeptDTO dept =resultdept.getData(); + SysDeptDTO dept = resultdept.getData(); Object deptId = params.get("streetId"); if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(dept.getTypeKey())) { - params.put("districtDeptId",deptId); + params.put("districtDeptId", deptId); params.remove("streetId"); } } @@ -629,10 +626,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { - boolean reportFlag = this.checkReport(dto.getId()); - if (reportFlag) { - return new Result().error("当前项目已上报网格化平台"); - } + boolean reportFlag = this.checkReport(dto.getId()); + if (reportFlag) { + return new Result().error("当前项目已上报网格化平台"); + } handleProcessEntity.setState(dto.getHandleCategory()); informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT); GridDto gridDto = null; @@ -952,6 +949,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem List list = baseDao.selectListGridEvaluationMetaData(metaDataFormDto); return list; } + /** * @param dto * @return void @@ -977,11 +975,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** - * * 保存接口调用日志 * - * @params [referenceId, businessType, interfaceName, successFlag, callMsgBody, returnMsgBody] * @return void + * @params [referenceId, businessType, interfaceName, successFlag, callMsgBody, returnMsgBody] * @author liuchuang * @since 2019/12/26 11:08 */ @@ -997,101 +994,101 @@ public class ItemServiceImpl extends BaseServiceImpl implem interfaceLogService.insert(interfaceLogEntity); } - /** - * @param itemEntity - * @return com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto - * @Author yinzuomei - * @Description 组装案件信息上报接口入参 - * @Date 2019/12/25 13:14 - **/ - private SendInputInfoFormDto packageReportEntity(ItemEntity itemEntity) throws Exception { - UserDetail user = SecurityUser.getUser(); - SendInputInfoFormDto formDto = new SendInputInfoFormDto(); - // 案件来源 - formDto.setInfoSourceID(CommonConstants.INFO_SOURCE_ID); - // 渠道来源 - formDto.setReportDept(CommonConstants.REPORT_DEPT); - // 案件属性 - formDto.setInfoTypeID(CommonConstants.INFO_TYPE_ID); - // 案件大类 - formDto.setInfoBC(CommonConstants.INFO_BC); - // 案件小类 - formDto.setInfoSC(CommonConstants.INFO_SC); - // 案件子类 - formDto.setInfoZC(CommonConstants.INFO_ZC); - // 发生地址 - formDto.setStandardAddress(itemEntity.getIssueAddress()); - // 问题描述 + /** + * @param itemEntity + * @return com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto + * @Author yinzuomei + * @Description 组装案件信息上报接口入参 + * @Date 2019/12/25 13:14 + **/ + private SendInputInfoFormDto packageReportEntity(ItemEntity itemEntity) throws Exception { + UserDetail user = SecurityUser.getUser(); + SendInputInfoFormDto formDto = new SendInputInfoFormDto(); + // 案件来源 + formDto.setInfoSourceID(CommonConstants.INFO_SOURCE_ID); + // 渠道来源 + formDto.setReportDept(CommonConstants.REPORT_DEPT); + // 案件属性 + formDto.setInfoTypeID(CommonConstants.INFO_TYPE_ID); + // 案件大类 + formDto.setInfoBC(CommonConstants.INFO_BC); + // 案件小类 + formDto.setInfoSC(CommonConstants.INFO_SC); + // 案件子类 + formDto.setInfoZC(CommonConstants.INFO_ZC); + // 发生地址 + formDto.setStandardAddress(itemEntity.getIssueAddress()); + // 问题描述 formDto.setDescription(itemEntity.getItemContent());// 测试999勿删谢谢 - // 反映人 - formDto.setReportPerson(itemEntity.getNickName());// itemEntity.getNickName()测试人员 - // 联系方式 - formDto.setContactMode(itemEntity.getMobile()); - double[] gps= GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(),itemEntity.getIssueLongitude()); - // 坐标X + // 反映人 + formDto.setReportPerson(itemEntity.getNickName());// itemEntity.getNickName()测试人员 + // 联系方式 + formDto.setContactMode(itemEntity.getMobile()); + double[] gps = GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(), itemEntity.getIssueLongitude()); + // 坐标X formDto.setCoordX(new BigDecimal(gps[1]).setScale(15, BigDecimal.ROUND_HALF_UP)); - // 坐标Y + // 坐标Y formDto.setCoordY(new BigDecimal(gps[0]).setScale(15, BigDecimal.ROUND_HALF_UP)); - // 监督员编号 - formDto.setKeepersn(""); - // 操作时间 - formDto.setInsertTime(new Date()); - // 操作人 - formDto.setInsertUser(user.getRealName());// - // 外系统编号 - formDto.setHotLinesn(itemEntity.getId()); - // 先查询网格对应街道id - Result completeDeptDTOResult = adminFeignClient.getCompleteDept(itemEntity.getGridId()); - if (!completeDeptDTOResult.success()) { - throw new Exception("根据网格ID获取所有上级机构信息失败" + completeDeptDTOResult.getMsg()); - } - // 根据街道id查询对应平台的deptCode、streetCode - Result deptGridPlatformDTOResult = adminFeignClient.getDeptGridPlatformDTO(completeDeptDTOResult.getData().getStreetId().toString()); - if (!deptGridPlatformDTOResult.success() || null == deptGridPlatformDTOResult.getData()) { - throw new Exception("根据街道查询平台部门信息失败" + deptGridPlatformDTOResult.getMsg()); - } - //外系统编码 必填!!!!!!! - formDto.setDeptCode(deptGridPlatformDTOResult.getData().getDeptCode());// 130099 - // 街道编码!!!!!!!!!!!! - formDto.setStreetCode(deptGridPlatformDTOResult.getData().getStreetCode()); - // 网格编码 - formDto.setGridCode(null); - - //查询图片列表 - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(itemEntity.getEventId()), "REFERENCE_ID", itemEntity.getEventId()); - List imageList = imgDao.selectList(wrapper); - if (null != imageList && !imageList.isEmpty()) { - String url = null; - String filename = null; - ReportFile reportFile = null; - List reportFiles = new ArrayList<>(); - for (ImgEntity image : imageList) { - url = image.getImgUrl(); - if (org.apache.commons.lang.StringUtils.isNotBlank(url)) { - filename = url.substring(url.lastIndexOf(CommonConstants.CHAR_ASCII_47) + CommonConstants.NUMBER_ONE); - reportFile = new ReportFile(); - reportFile.setName(filename); - reportFile.setUrl(url); - reportFile.setBase64string(""); - reportFiles.add(reportFile); - } - } - ImageFile imageFile = new ImageFile(); - imageFile.setReportFileList(reportFiles); - formDto.setImageFile(imageFile); - } - return formDto; - } - - /** - * @param gridDto - * @param handleProcessEntity - * @return void - * @Author yinzuomei - * @Description - * @Date 2019/12/25 15:29 - **/ + // 监督员编号 + formDto.setKeepersn(""); + // 操作时间 + formDto.setInsertTime(new Date()); + // 操作人 + formDto.setInsertUser(user.getRealName());// + // 外系统编号 + formDto.setHotLinesn(itemEntity.getId()); + // 先查询网格对应街道id + Result completeDeptDTOResult = adminFeignClient.getCompleteDept(itemEntity.getGridId()); + if (!completeDeptDTOResult.success()) { + throw new Exception("根据网格ID获取所有上级机构信息失败" + completeDeptDTOResult.getMsg()); + } + // 根据街道id查询对应平台的deptCode、streetCode + Result deptGridPlatformDTOResult = adminFeignClient.getDeptGridPlatformDTO(completeDeptDTOResult.getData().getStreetId().toString()); + if (!deptGridPlatformDTOResult.success() || null == deptGridPlatformDTOResult.getData()) { + throw new Exception("根据街道查询平台部门信息失败" + deptGridPlatformDTOResult.getMsg()); + } + //外系统编码 必填!!!!!!! + formDto.setDeptCode(deptGridPlatformDTOResult.getData().getDeptCode());// 130099 + // 街道编码!!!!!!!!!!!! + formDto.setStreetCode(deptGridPlatformDTOResult.getData().getStreetCode()); + // 网格编码 + formDto.setGridCode(null); + + //查询图片列表 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(itemEntity.getEventId()), "REFERENCE_ID", itemEntity.getEventId()); + List imageList = imgDao.selectList(wrapper); + if (null != imageList && !imageList.isEmpty()) { + String url = null; + String filename = null; + ReportFile reportFile = null; + List reportFiles = new ArrayList<>(); + for (ImgEntity image : imageList) { + url = image.getImgUrl(); + if (org.apache.commons.lang.StringUtils.isNotBlank(url)) { + filename = url.substring(url.lastIndexOf(CommonConstants.CHAR_ASCII_47) + CommonConstants.NUMBER_ONE); + reportFile = new ReportFile(); + reportFile.setName(filename); + reportFile.setUrl(url); + reportFile.setBase64string(""); + reportFiles.add(reportFile); + } + } + ImageFile imageFile = new ImageFile(); + imageFile.setReportFileList(reportFiles); + formDto.setImageFile(imageFile); + } + return formDto; + } + + /** + * @param gridDto + * @param handleProcessEntity + * @return void + * @Author yinzuomei + * @Description + * @Date 2019/12/25 15:29 + **/ private void saveItemGridPlatformInfo(GridDto gridDto, ItemHandleProcessEntity handleProcessEntity) { UserDetail user = SecurityUser.getUser(); ItemGridPlatformEntity itemGridPlatformEntity = new ItemGridPlatformEntity(); @@ -1119,7 +1116,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 获取已上报网格平台未结案的项目 List gridPlatformDTOList = itemGridPlatformService.listOfGridPlatformItemNotEnd(); // 拉取处理情况 - for (ItemGridPlatformDTO dto: + for (ItemGridPlatformDTO dto : gridPlatformDTOList) { SearchCaseProcessByTaskIdDto searchResultDot = shiBeiCityGridApi.searchCaseProcessByTaskId(dto.getTaskid()); String successFlag = YesOrNoEnum.NO.value(); @@ -1153,11 +1150,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** - * * 删除历史网格化平台处理记录 * - * @params [id] * @return void + * @params [id] * @author liuchuang * @since 2019/12/25 19:08 */ @@ -1173,18 +1169,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** - * * 保存新的网格化平台处理记录 * - * @params [progressList] * @return void + * @params [progressList] * @author liuchuang * @since 2019/12/25 19:27 */ private void insertNewHandleProcess(List progressList, String itemId, String itemGridPlatformId) { try { - for (SearchCaseProcessByTaskIdItemDto dto: + for (SearchCaseProcessByTaskIdItemDto dto : progressList) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); Date insertTime = sdf.parse(dto.getInserttime()); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserAuthenticateHistoryEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserAuthenticateHistoryEntity.java index 5ff740bc7..3a3b14bf5 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserAuthenticateHistoryEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserAuthenticateHistoryEntity.java @@ -73,9 +73,4 @@ public class UserAuthenticateHistoryEntity extends BaseEpdcEntity { */ private String remark; - /** - * 认证类别(0-居民认证，1-党员认证，2-志愿者认证) - */ - private String authenticatedType; - }