Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/entity/EmergencyRepair.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.business.emergency.entity;
 
 import cn.com.ty.lift.business.common.BaseEntity;
 import cn.com.ty.lift.common.utils.ValuePool;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -296,5 +297,6 @@ public class EmergencyRepair extends BaseEntity {
     /**
      * 急修发起的端
      */
+    @TableField(exist = false)
     private Integer mobileType;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectController.java

@@ -50,10 +50,22 @@ public class ProjectController {
     @PostMapping("list")
     @Validation(fields = {"mtCompanyId", "projectStatus"})
     public RestResponse list(@Val @RequestBody ProjectRequest request) {
-        IPage<ProjectResponse> page =  projectService.list(request);
+        IPage<ProjectResponse> page = projectService.list(request);
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 
+    /**
+     * @param request 项目名称
+     * @return 项目列表
+     * @description 获取物业端数据接口
+     * @date 2020/5/11 10:21 上午
+     */
+    @PostMapping("/propertyList")
+    public RestResponse propertyList(@RequestBody ProjectRequest request) {
+        IPage<Project> page = projectService.propertyList(request);
+        return RestResponse.success(page, "获取项目列表成功");
+    }
+
     /**
      * @param request 公司id,项目状态
      * @return 项目数量、电梯数量、停保电梯数量
@@ -140,7 +152,7 @@ public class ProjectController {
     @PostMapping("modify")
     @Validation(fields = {"id"})
     public RestResponse modify(@Val @RequestBody Project project) {
-       return projectService.modify(project);
+        return projectService.modify(project);
     }
 
     /**
@@ -177,7 +189,7 @@ public class ProjectController {
      */
     @PostMapping("plan/print")
     @Validation(fields = {"mtCompanyId", "id", "beginTime"})
-    public RestResponse printPlan(@Val @RequestBody ProjectRequest request){
+    public RestResponse printPlan(@Val @RequestBody ProjectRequest request) {
         MaintenancePlanPrintResponse detail = projectService.planPrint(request);
         if (ObjectUtil.isEmpty(detail)) {
             return RestResponse.success();

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -34,8 +34,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.jms.core.JmsMessagingTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,7 +59,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
+public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
 
     @Resource
     private ProjectLiftRelevanceService projectLiftRelevanceService;
@@ -175,6 +177,21 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
         return baseMapper.findByCondition(request.getPage(), request);
     }
 
+    /**
+     * @param request 项目名称
+     * @return 项目列表
+     * @description 获取物业端数据接口
+     * @date 2020/5/11 10:21 上午
+     */
+    public IPage<Project> propertyList(ProjectRequest request) {
+        String projectName = request.getProjectName();
+        IPage<Project> projectPage = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(projectPage, new QueryWrapper<Project>()
+                .select("id", "project_name projectName", "mt_company_id mtCompanyId")
+                .like(StringUtils.isNotBlank(projectName), "project_name", projectName)
+        );
+    }
+
     /**
      * @param mtCompanyId   公司id
      * @param projectStatus 项目状态
@@ -237,7 +254,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @description 项目ID和名称列表
      * @date 2019/12/16 4:21 PM
      */
-    public List<Map<String,Object>> projectIDList(ProjectRequest request) {
+    public List<Map<String, Object>> projectIDList(ProjectRequest request) {
         QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ObjectUtil.isNotEmpty(request.getMtCompanyId()), "mt_company_id", request.getMtCompanyId());
         queryWrapper.eq(ObjectUtil.isNotEmpty(request.getRegionId()), "region_id", request.getRegionId());
@@ -251,8 +268,8 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @description 根据项目id列表查询项目列表数据
      * @date 2020/2/17 4:47 下午
      */
-    public List<MaintenancePlanPrintResponse> queryProjectListByIdList(List<Long> projectIdList){
-       return baseMapper.queryProjectListByIdList(projectIdList);
+    public List<MaintenancePlanPrintResponse> queryProjectListByIdList(List<Long> projectIdList) {
+        return baseMapper.queryProjectListByIdList(projectIdList);
     }
 
     /**
@@ -302,7 +319,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
     }
 
     /**
-     * @param projectId 项目ID
+     * @param projectId   项目ID
      * @param mtCompanyId 公司ID
      * @return
      * @description 新增项目及项目服务中消息推送
@@ -387,7 +404,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
         return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
     }
 
-    public List<Map<String,String>> exportList(List<String> ids){
+    public List<Map<String, String>> exportList(List<String> ids) {
         return baseMapper.exportList(ids);
     }
 
@@ -423,6 +440,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
             log.error("项目数据导出失败", e);
         }
     }
+
     /**
      * @param request projectId 项目id
      * @return RestResponse 状态码和返回消息
@@ -479,20 +497,21 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
         return project;
     }
 
-    private void rollback(){
+    private void rollback() {
         //强制手动事务回滚
         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
     }
 
     /**
      * 根据表格解析的数据，组装project
-     * @author wcz
+     *
      * @param projectImportModels 解析excel得到项目数据
-     * @param mtCompanyId 维保公司
+     * @param mtCompanyId         维保公司
      * @return RestResponse
+     * @author wcz
      */
     @Transactional(rollbackFor = Exception.class)
-    public RestResponse assemble(List<ProjectImportModel> projectImportModels,Long mtCompanyId){
+    public RestResponse assemble(List<ProjectImportModel> projectImportModels, Long mtCompanyId) {
         //检查列表有效性
         Validate.notNull(projectImportModels, "没有数据");
         //存放新建的project

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

@@ -24,6 +24,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -65,12 +67,7 @@ public class LoginController {
     @PostMapping("/wxRegister")
     @ResponseBody
     public RestResponse wxRegister(HttpServletRequest request, @RequestBody UserRequest userRequest) {
-        RestResponse restResponse = judgeAuthCode(userRequest, WxConstants.APP_LOGIN);
-        if (restResponse == null) {
-            //校验通过走正常注册流程
-            return loginService.register(request, userRequest);
-        }
-        return restResponse;
+        return loginService.register(request, userRequest);
     }
 
     /**
@@ -149,6 +146,24 @@ public class LoginController {
         return restResponse;
     }
 
+    /**
+     * @param
+     * @return
+     * @description 通过授权码获取微信openId
+     * @date 2020/5/11 4:06 下午
+     */
+    @RequestMapping("/getOpenId")
+    @ResponseBody
+    public RestResponse getOpenId(@RequestBody UserRequest userRequest) {
+        RestResponse restResponse = judgeAuthCode(userRequest, WxConstants.APPLET_LOGIN);
+        if (restResponse == null) {
+            Map<String, String> openIdMap = new HashMap<>();
+            openIdMap.put("appletOpenId", userRequest.getAccount());
+            return RestResponse.success(openIdMap, ApiConstants.RESULT_SUCCESS, "获取openId成功");
+        }
+        return restResponse;
+    }
+
     /**
      * @param userRequest 手机号 验证码
      * @return 是否成功

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/mapper/RoleMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
 @MyBatisMapper
 public interface RoleMapper extends BaseMapper<Role> {
 
-    @Select("select r.id, r.code, r.name from role left join user_role ur " +
+    @Select("select r.id, r.code, r.name from role r left join user_role ur " +
             "on r.id = ur.role_id " +
             "where ur.user_id = #{userId} " +
             "and r.code = #{roleCode}")

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

@@ -181,6 +181,7 @@ public class LoginService implements ILoginService {
     @Override
     public RestResponse changeTeam(HttpServletRequest request, UserRequest userRequest) {
         UserResponse userResponse = new UserResponse();
+        userResponse.setUserId(userRequest.getUserId());
         //设置token信息
         userResponse.setToken(userRequest.getToken());
         //校验用户信息，并设置用户信息
@@ -261,9 +262,8 @@ public class LoginService implements ILoginService {
     @Override
     public RestResponse appBindMobile(HttpServletRequest request, UserRequest userRequest) {
         //校验手机号和短信验证码
-        RestResponse restResponse = checkMobileAndSmsCode(userRequest);
-        if (restResponse != null) {
-            return restResponse;
+        if (StringUtils.isBlank(userRequest.getMobile())) {
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "手机号为空无法绑定");
         }
         UserAccount userAccount = userAccountService.getByMobile(userRequest.getMobile());
         if (userAccount == null) {
@@ -365,6 +365,8 @@ public class LoginService implements ILoginService {
         MaintenanceCompany maintenanceCompany = userResponse.getMaintenanceCompany();
         if (maintenanceCompany != null) {
             currentUserInfoMap.put(ApiConstants.CURRENT_COMPANY_ID, maintenanceCompany.getId());
+        } else {
+            currentUserInfoMap.put(ApiConstants.CURRENT_COMPANY_ID, 0L);
         }
         //当前角色id
         Role role = userResponse.getRole();
@@ -484,13 +486,15 @@ public class LoginService implements ILoginService {
         //封装登录用户信息
         Map<String, Object> currentUserInfoMap = getUserInfoMap(userResponse);
         String mobileUserInfo = getUserInfoKeyInRedis(userRequest);
+        //设置token
+        userResponse.setToken(request.getSession().getId());
         //将用户信息放入redis中
         putUserInfoToRedis(userRequest, userResponse, currentUserInfoMap, mobileUserInfo);
         setUserInfoToSession(request, userResponse);
         //添加登录记录
         userLoginService.saveLoginInfo(request, userAccount.getUserId());
         //更新用户信息
-        userAccountService.save(userAccount);
+        userAccountService.updateById(userAccount);
     }
 
     /**

lift-system-service/src/main/java/cn/com/ty/lift/system/wechat/constants/WxConstants.java

@@ -23,9 +23,7 @@ public class WxConstants {
      */
     public interface AppConfigConstants {
 
-        String OPEN_ID_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?"
-                + "appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code";
-
+        String OPEN_ID_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code";
         /**
          * appId
          */