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

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

@@ -90,27 +90,24 @@ public class PaymentDataService {
      */
     public RestResponse regionRank(PaymentDataRequest paymentDataRequest) {
         List<RegionPaymentResponse> regionPaymentResponseList = new ArrayList<>();
-        //从redis中获取收款数据
         List<PaymentDataModel> paymentDataModelList = getPaymentDataListFromRedis(paymentDataRequest);
         if (paymentDataModelList != null && paymentDataModelList.size() > 0) {
-            //声明一个final类型变量来封装数据
-            final List<RegionPaymentResponse> finalRegionPaymentResponseList = new ArrayList<>();
             //区域名称对应付款数据
             Map<String, List<PaymentDataModel>> regionNameToPaymentData = paymentDataModelList.stream()
-                    .collect(Collectors.groupingBy(a -> {
-                        if (StringUtils.isNotBlank(a.getRegionName())) {
-                            return a.getRegionName();
+                    .collect(Collectors.groupingBy(paymentDataModel -> {
+                        if (StringUtils.isNotBlank(paymentDataModel.getRegionName())) {
+                            return paymentDataModel.getRegionName();
                         }
                         return "暂无名称";
                     }));
             regionNameToPaymentData.forEach((key, value) -> {
                 RegionPaymentResponse regionPaymentResponse = new RegionPaymentResponse();
                 //计划收款总和
-                double planMoney = paymentDataModelList.stream().mapToDouble(
+                double planMoney = value.stream().mapToDouble(
                         paymentDataModel -> DataStatisticsUtil.getDoubleValue(paymentDataModel.getPlanMoney())
                 ).sum();
                 //实际收款总和
-                double workMoney = paymentDataModelList.stream().mapToDouble(
+                double workMoney = value.stream().mapToDouble(
                         paymentDataModel -> DataStatisticsUtil.getDoubleValue(paymentDataModel.getWorkMoney())
                 ).sum();
                 //超期未收总和
@@ -118,12 +115,12 @@ public class PaymentDataService {
                 regionPaymentResponse.setRegionName(key);
                 regionPaymentResponse.setPlanMoney(planMoney);
                 regionPaymentResponse.setBeyondMoney(beyondMoney);
-                finalRegionPaymentResponseList.add(regionPaymentResponse);
+                regionPaymentResponseList.add(regionPaymentResponse);
             });
             //通过超期款排名，并取前5的数据
-            regionPaymentResponseList = finalRegionPaymentResponseList.stream()
-                    .sorted(Comparator.comparing(RegionPaymentResponse::getBeyondMoney)).limit(5)
-                    .collect(Collectors.toList());
+//            regionPaymentResponseList = finalRegionPaymentResponseList.stream()
+//                    .sorted(Comparator.comparing(RegionPaymentResponse::getBeyondMoney)).limit(5)
+//                    .collect(Collectors.toList());
         }
         return RestResponse.success(regionPaymentResponseList, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }

lift-batch-service/src/main/resources/application.yml

@@ -1,9 +1,5 @@
 server:
   port: 20231
-  tomcat:
-    basedir: /Users/huangyuan/application/tomcat/data/tomcat_temp
-#  tomcat:
-#    basedir: /home/ying/server/application/tomcat/data/zuul_tomcat_temp
 
 spring:
   application:

lift-batch-service/src/main/resources/mapper/LiftDataMapper.xml

@@ -31,9 +31,19 @@
         on
             p.region_id = r.id
         where
-            true
-        and
             pclr.mt_company_id = #{mtCompanyId}
+        <if test = "startTimeDateStr != null and startTimeDateStr != ''">
+            and (
+                pclr.create_date <![CDATA[ >= ]]> #{startTimeDateStr}
+                or
+                pclr.create_date is null)
+        </if>
+        <if test = "endTimeDateStr != null and endTimeDateStr != ''">
+            and (
+                pclr.create_date <![CDATA[ <= ]]> #{endTimeDateStr}
+                or
+                pclr.create_date is null)
+        </if>
     </select>
 
 </mapper>

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/request/MtRecordRequest.java

@@ -90,4 +90,9 @@ public class MtRecordRequest extends PageRequest {
      * 维保记录id集合
      */
     private String recordIds;
+
+    /**
+     * 注册代码/自定义编号
+     */
+    private String liftCodeQuery;
 }

lift-business-service/src/main/resources/mapper/maintenance/MaintenanceRecordMapper.xml

@@ -247,6 +247,10 @@
             <if test="cond.workDate != null">
                 AND mr.work_date = #{cond.workDate}
             </if>
+            <if test="cond.liftCodeQuery != null and cond.liftCodeQuery != ''">
+                AND li.registration_code like '%${liftCodeQuery}%'
+                OR li.custom_number like '%${liftCodeQuery}%'
+            </if>
     </select>
 
     <!--日常保养-保养单：根据条件汇总条数-->

lift-push-pc/src/main/java/cn/com/ty/lift/push/app/PushConsumer.java

@@ -24,12 +24,11 @@ import java.util.List;
 public class PushConsumer {
 
     private TimeMessageService TimeMessageService;
-    private RedisTemplate redisTemplate;
 
     @JmsListener(destination = WebSocketConstants.PUSH_MESSAGE_TO_PC)
     public void listenPCAllQueue(List<TimeMessage> timeMessageList) {
         log.info("listen {} receive message: {}", WebSocketConstants.PUSH_MESSAGE_TO_PC, timeMessageList);
-        TimeyMessageHandler timeMessageHandler = new TimeyMessageHandler(TimeMessageService, redisTemplate);
+        TimeyMessageHandler timeMessageHandler = new TimeyMessageHandler(TimeMessageService);
         timeMessageHandler.saveAndPushMessageToUsers(timeMessageList);
     }
 }

lift-push-pc/src/main/java/cn/com/ty/lift/push/websocket/config/WebSocketConfig.java

@@ -25,10 +25,7 @@ import java.util.concurrent.Executors;
 public class WebSocketConfig implements WebSocketConfigurer {
 
     @Resource
-    private TimeMessageService  timeMessageService;
-
-    @Resource
-    private RedisTemplate redisTemplate;
+    private TimeMessageService timeMessageService;
 
     @Bean
     public TaskScheduler taskScheduler() {
@@ -37,7 +34,7 @@ public class WebSocketConfig implements WebSocketConfigurer {
 
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        registry.addHandler(new TimeyMessageHandler(timeMessageService, redisTemplate), "/myMessageHandler")
+        registry.addHandler(new TimeyMessageHandler(timeMessageService), "/myMessageHandler")
                 .setAllowedOrigins("*")
                 .addInterceptors(new WebSocketInterceptor());
     }

lift-push-pc/src/main/java/cn/com/ty/lift/push/websocket/config/WebSocketInterceptor.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.push.websocket.config;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.http.server.ServletServerHttpRequest;
@@ -10,6 +11,7 @@ import org.springframework.web.socket.server.HandshakeInterceptor;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
+@Slf4j
 public class WebSocketInterceptor implements HandshakeInterceptor {
 
     /**
@@ -23,8 +25,8 @@ public class WebSocketInterceptor implements HandshakeInterceptor {
             ServletServerHttpRequest serverHttpRequest = (ServletServerHttpRequest) request;
             HttpServletRequest httpServletRequest = serverHttpRequest.getServletRequest();
             //获取token
-            String authorizationToken = httpServletRequest.getParameter(ApiConstants.AUTHORIZATION_TOKEN);
-            map.put(ApiConstants.AUTHORIZATION_TOKEN, authorizationToken);
+            String userId = httpServletRequest.getParameter(ApiConstants.CURRENT_USER_ID);
+            map.put(ApiConstants.CURRENT_USER_ID, userId);
         }
         return true;
     }

lift-push-pc/src/main/java/cn/com/ty/lift/push/websocket/handler/TimeyMessageHandler.java

@@ -5,8 +5,11 @@ import cn.com.ty.lift.common.constants.WebSocketConstants;
 import cn.com.ty.lift.common.model.TimeMessage;
 import cn.com.ty.lift.push.message.service.TimeMessageService;
 import cn.com.ty.lift.push.websocket.model.RealTimeMessage;
+import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.socket.*;
 
@@ -19,14 +22,11 @@ public class TimeyMessageHandler implements WebSocketHandler {
 
     private TimeMessageService timeMessageService;
 
-    private RedisTemplate redisTemplate;
-
     public TimeyMessageHandler() {
     }
 
-    public TimeyMessageHandler(TimeMessageService TimeMessageService, RedisTemplate redisTemplate) {
+    public TimeyMessageHandler(TimeMessageService TimeMessageService) {
         this.timeMessageService = TimeMessageService;
-        this.redisTemplate = redisTemplate;
     }
 
     //在线用户列表
@@ -170,14 +170,9 @@ public class TimeyMessageHandler implements WebSocketHandler {
      * @date 2018年9月18日
      */
     private Long getCurrentUser(WebSocketSession session) {
-        String authToken = (String) session.getAttributes().get(ApiConstants.AUTHORIZATION_TOKEN);
-        Object mobileUserInfo = redisTemplate.opsForValue().get(authToken);
-        if (mobileUserInfo != null) {
-            Object userInfo = redisTemplate.opsForValue().get(mobileUserInfo);
-            if (userInfo != null) {
-                Map<String, Object> currentUserInfoMap = JSONUtil.parseObj(userInfo);
-                return (Long) currentUserInfoMap.get(ApiConstants.CURRENT_USER_ID);
-            }
+        String userId = (String) session.getAttributes().get(ApiConstants.CURRENT_USER_ID);
+        if(StringUtils.isNotBlank(userId)) {
+            return Long.parseLong(userId);
         }
         return null;
     }

lift-push-pc/src/main/resources/application-prod.yml

@@ -5,19 +5,7 @@ spring:
     password: Tdkg-13250409
     driver-class-name: com.mysql.cj.jdbc.Driver
 
-  #redis缓存配置
-  redis:
-    database: 0 #数据库索引，默认为0
-    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址)服务器地址
-    port: 6379 #端口
-    password: Gdkc-290431 #验证密码
-    jedis:
-      pool:
-        max-active: 8 #最大连接数
-        max-idle: 8 #最大空闲链接
-        max-wait: 20000ms
-        min-idle: 0
-    timeout: 600000s
+  # activemq配置
   activemq:
     #ActiveMQ通讯地址
     broker-url: tcp://172.16.24.145:61616

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

@@ -58,9 +58,13 @@
 
     <!-- 查询物业用户列表查询条件 -->
     <sql id="projectUserQueryCondition">
-        from project_user
+        from
+            project_user
         where
-        mt_company_id = #{companyId}
+            mt_company_id = #{companyId}
+        <if test = "projectId != null">
+            and project_id = #{projectId}
+        </if>
         <if test="userIdList != null">
             and user_id in
             <foreach item="item" index="index" collection="userIdList" open="(" separator="," close=")">
@@ -76,9 +80,9 @@
     <select id="getProjectUserList" parameterType="cn.com.ty.lift.system.user.dao.entity.model.PropertyUserRequest"
             resultType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUser">
         select
-        project_id as projectId,
-        user_id as userId,
-        user_role as userRole
+            project_id as projectId,
+            user_id as userId,
+            user_role as userRole
         <include refid="projectUserQueryCondition"/>
         limit #{pageNum}, #{pageSize}
     </select>