小程序登录

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

@@ -6,6 +6,7 @@ import cn.com.ty.lift.batch.applet.dao.model.LiftDataModel;
 import cn.com.ty.lift.batch.applet.dao.model.request.CommonRequest;
 import cn.com.ty.lift.batch.applet.dao.model.request.LiftDataRequest;
 import cn.com.ty.lift.batch.applet.dao.model.response.RegionLiftResponse;
+import cn.com.ty.lift.batch.applet.dao.model.response.RegionLiftResponseTotal;
 import cn.com.ty.lift.batch.applet.util.DataStatisticsUtil;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.constants.CommonEnum;
@@ -172,10 +173,12 @@ public class LiftDataService {
      * @date 2020/2/5 2:43 下午
      */
     public RestResponse regionRank(LiftDataRequest liftDataRequest) {
+        RegionLiftResponseTotal regionLiftResponseTotal = new RegionLiftResponseTotal();
         //区域电梯数据
         List<RegionLiftResponse> regionLiftResponseList = new ArrayList<>();
         List<LiftDataModel> liftDataModelList = getLiftDataListFromRedis(liftDataRequest);
         if (liftDataModelList != null && liftDataModelList.size() > 0) {
+            regionLiftResponseTotal.setTotalLiftNum(liftDataModelList.size());
             final List<RegionLiftResponse> finalRegionLiftResponseList = new ArrayList<>();
             //将数据转化为 区域名称->电梯数据列表
             Map<String, List<LiftDataModel>> regionNameToLiftData = liftDataModelList.stream()
@@ -203,6 +206,7 @@ public class LiftDataService {
                     .sorted(Comparator.comparing(RegionLiftResponse::getLostLiftNums)).limit(5)
                     .collect(Collectors.toList());
         }
+        regionLiftResponseTotal.setRegionLiftResponseList(regionLiftResponseList);
         //通过丢失台量排序获取前五的台量
         return RestResponse.success(regionLiftResponseList, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }

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

@@ -21,6 +21,7 @@ public class UserRequest {
     private String queryCondition;//查询条件
     private String inputSmsCode;//用户输入的短信验证码
     private String authCode;//微信授权码
+    private String appletOpenId;//小程序标识码
     private String weChatOpenId;//用户微信标识码
     private Integer mobileType;//端类型
     private Long pageSize;//每页条数

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

@@ -220,7 +220,6 @@ public class LoginService implements ILoginService {
         if (userResponse == null) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "访问权限不足");
         }
-        request.getSession().setAttribute("openId", openId);
         appletLoginHandle(request, userRequest, userAccount, userResponse);
         return RestResponse.success(userResponse, ApiConstants.RESULT_SUCCESS, "登录成功");
     }
@@ -239,8 +238,7 @@ public class LoginService implements ILoginService {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "用户信息为空无法登录");
         }
         //获取openId
-        String openId = (String) request.getSession().getAttribute("openId");
-        userAccount.setAppletOpenId(openId);
+        userAccount.setAppletOpenId(userRequest.getAppletOpenId());
         UserResponse userResponse = userService.getAppletUserInfo(userAccount.getUserId());
         if (userResponse == null) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "访问权限不足");

lift-system-service/src/main/resources/mapper/TodoDataMapper.xml

@@ -29,9 +29,9 @@
     <!-- 大修记录查询条件sql -->
     <sql id="capitalTodoQuerySql">
         where
-            cr.mt_company_id = #{mtCompanyId}
+            p.mt_company_id = #{mtCompanyId}
         and
-            cr.project_status <![CDATA[ != ]]> 4
+            p.project_status <![CDATA[ != ]]> 4
     </sql>
 
     <!-- 年检记录查询条件sql -->