Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/dao/model/AnnualInspectionDataModel.java

@@ -2,8 +2,9 @@ package cn.com.ty.lift.batch.applet.dao.model;
 
 import cn.com.ty.lift.batch.applet.constants.DataStatisticsConstants;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 
 /**
@@ -16,7 +17,7 @@ public class AnnualInspectionDataModel extends BaseDataModel {
     /**
      * 计划年检时间
      */
-    private LocalDateTime planDate;
+    private LocalDate planDate;
     /**
      * 年检状态（0 待完成；1 已完成；2 超期）
      */
@@ -52,11 +53,13 @@ public class AnnualInspectionDataModel extends BaseDataModel {
      * @return
      * @description 获取年检计划时间，格式为yyyy-MM-dd
      */
-    public LocalDateTime getPlanDate() {
+    public LocalDate getPlanDate() {
         if (planDate != null) {
             //转换日期格式为yyyy-MM-dd
             String planDateStr = planDate.format(DateTimeFormatter.ofPattern(DataStatisticsConstants.PLAN_DATE_FORMAT));
-            return LocalDateTime.parse(planDateStr, DateTimeFormatter.ofPattern(DataStatisticsConstants.PLAN_DATE_FORMAT));
+            if (StringUtils.isNotBlank(planDateStr)) {
+                return LocalDate.parse(planDateStr, DateTimeFormatter.ofPattern(DataStatisticsConstants.PLAN_DATE_FORMAT));
+            }
         }
         return null;
     }

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/AnnualInspectionDataService.java

@@ -65,7 +65,7 @@ public class AnnualInspectionDataService {
                 annualInspectionDataModelList = annualInspectionDataModelList.stream()
                         .filter(a -> {
                             if (a.getPlanDate() != null) {
-                                return a.getPlanDate().isAfter(annualInspectionDataRequest.getStartTimeDate());
+                                return a.getPlanDate().isAfter(annualInspectionDataRequest.getStartTimeDate().toLocalDate());
                             }
                             return false;
                         })
@@ -76,7 +76,7 @@ public class AnnualInspectionDataService {
                 annualInspectionDataModelList = annualInspectionDataModelList.stream()
                         .filter(a -> {
                             if (a.getPlanDate() != null) {
-                                a.getPlanDate().isBefore(annualInspectionDataRequest.getEndTimeDate());
+                                a.getPlanDate().isBefore(annualInspectionDataRequest.getEndTimeDate().toLocalDate());
                             }
                             return false;
                         })

lift-common/src/main/java/cn.com.ty.lift.common/utils/ProjectUtils.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.common.utils;
 import cn.com.ty.lift.common.model.StatisticsKVModel;
 import cn.hutool.core.util.StrUtil;
 
+import java.io.*;
 import java.lang.reflect.Method;
 import java.util.*;
 
@@ -159,7 +160,7 @@ public class ProjectUtils {
                 outStatisticsKVModel.setKey(key);
                 //判断值是否为也为map如果是就行封装 目前只涉及一层封装
                 if (value != null && value instanceof Map) {
-                    outStatisticsKVModel.setValue(transReturnMapToStatisticsKVModel((Map)value));
+                    outStatisticsKVModel.setValue(transReturnMapToStatisticsKVModel((Map) value));
                 } else {
                     outStatisticsKVModel.setValue(value);
                 }
@@ -169,4 +170,25 @@ public class ProjectUtils {
         return statisticsKVModelList;
     }
 
+    /**
+     * @param list 要拷贝的list
+     * @return 返回拷贝后的对象
+     * @description 对集合进行拷贝
+     * @date 2020/4/16 5:05 下午
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> List<T> deepCopy(List<T> list) {
+        List<T> dest = new ArrayList<>();
+        try (ByteArrayOutputStream byteOut = new ByteArrayOutputStream()) {
+            ObjectOutputStream out = new ObjectOutputStream(byteOut);
+            out.writeObject(list);
+            ByteArrayInputStream byteIn = new ByteArrayInputStream(byteOut.toByteArray());
+            ObjectInputStream in = new ObjectInputStream(byteIn);
+            dest = (List<T>) in.readObject();
+        } catch (IOException | ClassNotFoundException e){
+            e.printStackTrace();
+        }
+        return dest;
+    }
+
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/controller/MaintenanceOptionController.java

@@ -41,8 +41,8 @@ public class MaintenanceOptionController {
     public RestResponse list(@RequestBody OptionReq req) {
         IPage<MaintenanceOption> page = optionService.page(
                 new Page<>(req.getPageNum(), req.getPageSize()), new QueryWrapper<MaintenanceOption>()
-                        //10086是平台的团队id
-                        .in("mt_company_id", 10086L, req.getMtCompanyId())
+                        //0L是固定数据的公司id
+                        .in("mt_company_id", 0L, req.getMtCompanyId())
                         //留1是为了兼容以前数据,2.0使用的status版本1 ,    3.0使用的status版本2
                         .eq("status", 2)
                         .in(req.getType() != null, "type", type(req))
@@ -70,8 +70,8 @@ public class MaintenanceOptionController {
         }
         List<MaintenanceOption> options = optionService.list(
                 new QueryWrapper<MaintenanceOption>()
-                        //10086是平台的团队id
-                        .in("mt_company_id", 10086L, req.getMtCompanyId())
+                        //0L是固定数据的公司id
+                        .in("mt_company_id", 0L, req.getMtCompanyId())
                         //留1是为了兼容以前数据,2.0使用的status版本1 ,    3.0使用的status版本2
                         .eq("status", 2)
                         .in(req.getType() != null, "type", type(req))
@@ -108,8 +108,8 @@ public class MaintenanceOptionController {
      */
     @PostMapping("/modify")
     public RestResponse modify(@RequestBody MaintenanceOption option) {
-        //10086是平台的团队id
-        if (option.getMtCompanyId().equals(10086L)) {
+        //0L是固定数据的公司id
+        if (option.getMtCompanyId().equals(0L)) {
             return RestResponse.fail("默认维保项无法编辑");
         }
         if (optionService.updateById(option)) {
@@ -127,7 +127,7 @@ public class MaintenanceOptionController {
     @PostMapping("/delete")
     public RestResponse delete(@RequestBody MaintenanceOption option) {
         //10086是平台的团队id
-        if (option.getMtCompanyId().equals(10086L)) {
+        if (option.getMtCompanyId().equals(0L)) {
             return RestResponse.fail("默认维保项无法删除");
         }
         if (optionService.removeById(option.getId())) {

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/LiftDataService.java

@@ -248,8 +248,14 @@ public class LiftDataService {
      */
     private Map<Long, String> getLiftIdToMaintenanceRecordStatus(List<MtRecordDataModel> mtRecordDataModels) {
         if (mtRecordDataModels != null && mtRecordDataModels.size() > 0) {
+            mtRecordDataModels = mtRecordDataModels.stream().filter(mtRecordDataModel ->
+                    mtRecordDataModel.getLiftId() != null &&
+                            mtRecordDataModel.getStatus() != null)
+                    .collect(Collectors.toList());
             return mtRecordDataModels.stream()
-                    .collect(Collectors.toMap(MtRecordDataModel::getLiftId, MtRecordDataModel::getStatus));
+                    .collect(Collectors.toMap(
+                            MtRecordDataModel::getLiftId, MtRecordDataModel::getStatus
+                    ));
         }
         return new HashMap<>();
     }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/UserController.java

@@ -1,12 +1,9 @@
 package cn.com.ty.lift.system.user.controller;
 
-import cn.com.ty.lift.common.constants.ApiConstants;
-import cn.com.ty.lift.system.user.dao.entity.UserAccount;
 import cn.com.ty.lift.system.user.dao.entity.model.ChangeMobileRequest;
 import cn.com.ty.lift.system.user.dao.entity.model.UserRequest;
 import cn.com.ty.lift.system.user.service.IUserService;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,9 +30,8 @@ public class UserController {
      * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/list")
-    public RestResponse list(UserRequest userRequest) {
-        IPage<UserAccount> userAccountPage = userService.list(userRequest);
-        return RestResponse.success(userAccountPage, ApiConstants.RESULT_SUCCESS, "获取用户信息成功");
+    public RestResponse list(@RequestBody UserRequest userRequest) {
+        return userService.list(userRequest);
     }
 
     /**
@@ -93,4 +89,39 @@ public class UserController {
         return userService.changeMobile(changeMobileRequest);
     }
 
+    /**
+     * @param userRequest 请求数据
+     * @return
+     * @description
+     * @date 2020/4/16 10:33 上午
+     */
+    @RequestMapping("/personalCenter")
+    public RestResponse personCenter(@RequestBody UserRequest userRequest) {
+        return userService.personalCenter(userRequest);
+    }
+
+    /**
+     * @param userRequest 用户帐号
+     * @return 是否成功
+     * @description 修改帐号
+     * @date 2020/4/16 2:40 下午
+     */
+    @PostMapping("/modifyAccount")
+    public RestResponse modifyAccount(@RequestBody UserRequest userRequest) {
+        return userService.modifyAccount(userRequest);
+    }
+
+    /**
+     * @param userRequest 用户描述
+     * @return 是否成功
+     * @description 修改用户描述
+     * @date 2020/4/16 2:54 下午
+     */
+    @PostMapping("/modifyRemarks")
+    public RestResponse modifyRemarks(@RequestBody UserRequest userRequest) {
+        return userService.modifyRemarks(userRequest);
+    }
+
+
+
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/UserAccount.java

@@ -41,6 +41,16 @@ public class UserAccount {
 
 	private LocalDateTime createDate;
 
+	/**
+	 * 设备类型
+	 */
+	private Integer deviceModel;
+
+	/**
+	 * 设备标识
+	 */
+	private String deviceFlag;
+
 	private int deleteFlag;
 
 	private int expertFlag;

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/PersonalCenterResponse.java

@@ -0,0 +1,40 @@
+package cn.com.ty.lift.system.user.dao.entity.model;
+
+import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author huangyuan
+ * @date 2020/4/16
+ * @description 个人中心响应数据
+ */
+@Data
+public class PersonalCenterResponse {
+    /**
+     * 用户名
+     */
+    private String name;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 角色名称
+     */
+    private String roleName;
+    /**
+     * 帐号(小梯号)
+     */
+    private String account;
+    /**
+     * 描述
+     */
+    private String remarks;
+    /**
+     * 用户所在团队
+     */
+    private List<MaintenanceCompany> maintenanceCompanyList;
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/UserRequest.java

@@ -17,6 +17,7 @@ public class UserRequest {
     private String mobile;//手机号
     private String password;//密码
     private String name;//用户真实姓名
+    private String remarks;//用户描述
     private String queryCondition;//查询条件
     private String inputSmsCode;//用户输入的短信验证码
     private String authCode;//微信授权码

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/UserResponse.java

@@ -6,7 +6,7 @@ import cn.com.ty.lift.system.user.dao.entity.Role;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -22,7 +22,7 @@ public class UserResponse {
     private Integer type;//用户类型
     private String avatarUrl;//用户头像
     private BigDecimal balance;//余额
-    private Date createTime;//创建时间/注册时间
+    private LocalDateTime createTime;//创建时间/注册时间
     private Integer expertFlag;//专家标识
     private String token;//验证token
     private List<MaintenanceCompany> companyList;//用户所在团队信息集合

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/IUserService.java

@@ -5,7 +5,6 @@ import cn.com.ty.lift.system.user.dao.entity.model.ChangeMobileRequest;
 import cn.com.ty.lift.system.user.dao.entity.model.UserRequest;
 import cn.com.ty.lift.system.user.dao.entity.model.UserResponse;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
 import java.util.Map;
@@ -30,7 +29,7 @@ public interface IUserService {
      * @description 获取用户列表信息
      * @date 2019/11/27 10:03 AM
      */
-    IPage<UserAccount> list(UserRequest userRequest);
+    RestResponse list(UserRequest userRequest);
 
     /**
      * @param userRequest 用户请求参数对象
@@ -81,18 +80,42 @@ public interface IUserService {
     List<Long> getIdListByQueryCondition(String queryCondition);
 
     /**
-     * @description 获取用户信息
-     * @date 2019-12-28 15:41
      * @param
      * @return
+     * @description 获取用户信息
+     * @date 2019-12-28 15:41
      */
     RestResponse getUserInfo(UserRequest userRequest);
 
     /**
-     * @description 更换手机号
-     * @date 2020-01-04 10:31
      * @param
      * @return
+     * @description 更换手机号
+     * @date 2020-01-04 10:31
      */
     RestResponse changeMobile(ChangeMobileRequest changeMobileRequest);
+
+    /**
+     * @param userRequest 用户id
+     * @return 用户信息
+     * @description 获取用户数据
+     * @date 2020/4/16 9:24 上午
+     */
+    RestResponse personalCenter(UserRequest userRequest);
+
+    /**
+     * @param userRequest 用户账号
+     * @return 返回数据
+     * @description 编辑用户帐号
+     * @date 2020/4/16 2:38 下午
+     */
+    RestResponse modifyAccount(UserRequest userRequest);
+
+    /**
+     * @param userRequest 用户描述
+     * @return
+     * @description 修改用户描述
+     * @date 2020/4/16 2:50 下午
+     */
+    RestResponse modifyRemarks(UserRequest userRequest);
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/LoginService.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.system.user.service.impl;
 
 import cn.com.ty.lift.common.aliservice.constants.AliConstants;
 import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
 import cn.com.ty.lift.system.user.dao.entity.Menu;
@@ -21,9 +22,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -241,7 +240,7 @@ public class LoginService implements ILoginService {
             currentUserInfoMap.put(ApiConstants.CURRENT_ROLE_ID, role.getId());
         }
         //用户权限信息
-        String permissionUrl = menuService.menuToUrl(userResponse.getMenus());
+        String permissionUrl = menuService.menuToUrl(ProjectUtils.deepCopy(userResponse.getMenus()));
         currentUserInfoMap.put(ApiConstants.CURRENT_PERMISSION_URL, permissionUrl);
         return currentUserInfoMap;
     }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserService.java

@@ -20,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +39,9 @@ public class UserService implements IUserService {
     @Resource
     private IUserInfoService userInfoService;
 
+    @Resource
+    private IUserService userService;
+
     @Resource
     private IMtCompanyUserService mtCompanyUserService;
 
@@ -68,6 +72,8 @@ public class UserService implements IUserService {
         //设置账号(小梯号)
         userAccount.setAccount(userRequest.getAccount());
         userAccount.setCreateDate(LocalDateTime.now());
+        //设置用户注册时间
+        userAccount.setCreateDate(LocalDateTime.now());
         //设置用户类型
         userAccount.setType(ApiConstants.UserConstants.TYPE_USER);
         //设置用户微信openId
@@ -96,17 +102,37 @@ public class UserService implements IUserService {
     }
 
     @Override
-    public IPage<UserAccount> list(UserRequest userRequest) {
-        IPage<UserAccount> userAccountPage = new Page<>(userRequest.getPageNum(), userRequest.getPageSize());
+    public RestResponse list(UserRequest userRequest) {
+        IPage userAccountPage = new Page<>(userRequest.getPageNum(), userRequest.getPageSize());
         userAccountPage = userAccountService.page(userAccountPage, new QueryWrapper<UserAccount>()
                 //通过用户名模糊查询
-                .like(StringUtils.isNotBlank(userRequest.getQueryCondition()), "account", userRequest.getQueryCondition())
+                .like(StringUtils.isNotBlank(userRequest.getQueryCondition()), "account",
+                        userRequest.getQueryCondition())
                 .or()
                 //通过用户手机号模糊查询
-                .like(StringUtils.isNotBlank(userRequest.getQueryCondition()), "mobile", userRequest.getQueryCondition())
+                .like(StringUtils.isNotBlank(userRequest.getQueryCondition()), "mobile",
+                        userRequest.getQueryCondition())
                 .eq("delete_flag", ApiConstants.DELETE_NO)
         );
-        return userAccountPage;
+        List<UserAccount> userAccountList = userAccountPage.getRecords();
+        if (userAccountList != null && userAccountList.size() > 0) {
+            List<Long> userIdList = ProjectUtils.getAttrList(userAccountList, "userId", null);
+            Map<Long, UserInfo> userIdToUserInfo = userInfoService.userIdToInfo(userIdList);
+            List<UserResponse> userResponseList = new ArrayList<>(10);
+            if (userIdToUserInfo != null && userIdToUserInfo.size() > 0) {
+                userAccountList.forEach(userAccount -> {
+                    UserResponse userResponse = new UserResponse();
+                    UserInfo userInfo = userIdToUserInfo.get(userAccount.getUserId());
+                    userResponse.setUserId(userAccount.getUserId());
+                    userResponse.setName(userInfo.getName());
+                    userResponse.setMobile(userInfo.getMobile());
+                    userResponse.setCreateTime(userAccount.getCreateDate());
+                    userResponseList.add(userResponse);
+                });
+            }
+            userAccountPage.setRecords(userResponseList);
+        }
+        return RestResponse.success(userAccountPage, "获取用户信息成功");
     }
 
     @Override
@@ -180,7 +206,7 @@ public class UserService implements IUserService {
             maintenanceCompanyService.setCompanyUserNum(maintenanceCompanyList);
             userResponse.setCompanyList(maintenanceCompanyList);
             //用户进入后的默认团队信息
-            if(maintenanceCompanyList != null && maintenanceCompanyList.size() > 0){
+            if (maintenanceCompanyList != null && maintenanceCompanyList.size() > 0) {
                 MaintenanceCompany maintenanceCompany = maintenanceCompanyList.get(0);
                 userResponse.setMaintenanceCompany(maintenanceCompany);
                 //获取用户在默认团队中的角色信息
@@ -300,17 +326,17 @@ public class UserService implements IUserService {
         //验证手机号验证码
         RestResponse restResponse = loginService.verifySmsCode(changeMobileRequest.getNewMobile(),
                 changeMobileRequest.getNewMobileSmsCode());
-        if(restResponse != null){
+        if (restResponse != null) {
             return restResponse;
         }
         //验证用户原来手机号是否有效
         UserAccount oldUserAccount = userAccountService.getByMobile(changeMobileRequest.getOldMobile());
-        if(oldUserAccount == null){
+        if (oldUserAccount == null) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "原手尚未注册无法");
         }
         //校验新手机号是否已经存在
         UserAccount newUserAccount = userAccountService.getByMobile(changeMobileRequest.getNewMobile());
-        if(newUserAccount != null){
+        if (newUserAccount != null) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "新手机号已经被注册，无法更换");
         }
         //校验通过，更换手机号
@@ -326,4 +352,54 @@ public class UserService implements IUserService {
         return RestResponse.success(ApiConstants.RESULT_SUCCESS, "更换手机号成功");
     }
 
+    @Override
+    public RestResponse personalCenter(UserRequest userRequest) {
+        Long userId = userRequest.getUserId();
+        Long companyId = userRequest.getCompanyId();
+        //获取用户信息
+        UserAccount userAccount = userAccountService.getByUserId(userId);
+        UserInfo userInfo = userInfoService.getByUserId(userId);
+        //获取公司信息
+        List<MtCompanyUser> mtCompanyUserList = mtCompanyUserService.list(new QueryWrapper<MtCompanyUser>()
+                .select("mt_company_id")
+                .eq("user_id", userId)
+                .eq("delete_flag", ApiConstants.DELETE_NO)
+        );
+        //获取角色信息
+        Role role = roleService.getRoleByUserIdAndCompanyId(userId, companyId);
+        List<Long> mtCompanyIdList = ProjectUtils.getAttrList(mtCompanyUserList, "mtCompanyId", null);
+        List<MaintenanceCompany> maintenanceCompanyList = maintenanceCompanyService.list(new QueryWrapper<MaintenanceCompany>()
+                .in(mtCompanyIdList.size() > 0, "id", mtCompanyIdList)
+        );
+        PersonalCenterResponse personalCenterResponse = new PersonalCenterResponse();
+        //设置用户信息
+        personalCenterResponse.setAccount(userAccount.getAccount());
+        personalCenterResponse.setMobile(userAccount.getMobile());
+        personalCenterResponse.setRemarks(userInfo.getRemarks());
+        personalCenterResponse.setName(userInfo.getName());
+        //设置角色信息
+        if (role != null) {
+            personalCenterResponse.setRoleName(role.getName());
+        }
+        //设置团队信息
+        personalCenterResponse.setMaintenanceCompanyList(maintenanceCompanyList);
+        return RestResponse.success(personalCenterResponse,"获取用户信息成功");
+    }
+
+    @Override
+    public RestResponse modifyAccount(UserRequest userRequest) {
+        UserAccount userAccount = userAccountService.getByUserId(userRequest.getUserId());
+        userAccount.setAccount(userRequest.getAccount());
+        userAccountService.updateUserAccount(userAccount);
+        return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "修改帐号成功");
+    }
+
+    @Override
+    public RestResponse modifyRemarks(UserRequest userRequest) {
+        UserInfo userInfo = userInfoService.getByUserId(userRequest.getUserId());
+        userInfo.setRemarks(userRequest.getRemarks());
+        userInfoService.updateUserInfo(userInfo);
+        return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "修改描述成功");
+    }
+
 }

lift-system-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,8 @@
+{
+  "properties": [
+    {
+      "name": "mybatis-plus.mapper-locations",
+      "type": "java.lang.String",
+      "description": "Description for mybatis-plus.mapper-locations."
+  }
+] }