1. 修改管家下拉列表查询BUG

src/main/java/com/care/bms/controller/SysUserController.java

@@ -47,11 +47,17 @@ public class SysUserController {
      * @return
      */
     @GetMapping("/listKeeper4Select")
-    @ApiOperation(value = "某个服务站下的管家下拉列表")
+    @ApiOperation(value = "登陆人所属机构、服务站下的管家下拉列表")
     public Result<List<CareSysUserVO>> listNotHandle(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                                      @RequestParam(name = "stationId", required = false) Long stationId){
         try {
-            List<CareSysUserVO> datas = this.bmsSysUserService.queryKeeperListByStationId(stationId);
+            UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+            Long orgId = loginUser.getOrgId();
+            if (stationId==null){
+                stationId = loginUser.getStationId();
+            }
+
+            List<CareSysUserVO> datas = this.bmsSysUserService.queryKeeperListByStationId(orgId,stationId);
             return Result.success(datas);
         }catch (Exception e) {
             log.error("某个服务站下的管家下拉列表出现异常",e);

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -85,7 +85,7 @@ public class BmsEventOrderService {
                 .like(StrUtil.isNotEmpty(olderName),CareEventOrder::getOlderName,olderName)
                 .eq(CareEventOrder::getOrgId,loginUser.getOrgId())
                 .eq(loginUser.getStationId()!=null,CareEventOrder::getStationId,loginUser.getStationId())
-                .orderByAsc(CareEventOrder::getCreateTime);
+                .orderByDesc(CareEventOrder::getCreateTime);
 
         IPage<CareEventOrder> pageRes = this.careEventOrderService.page(page, queryWrapper);
         IPage<EventOrderVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());

src/main/java/com/care/bms/service/BmsMemberInfoService.java

@@ -74,7 +74,9 @@ public class BmsMemberInfoService {
                         BeanUtils.copyProperties(item,resVO);
                         //服务设备数量
                         QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.lambda().eq(CareDevice::getMemberId,resVO.getId());
+                        queryWrapper1.lambda().eq(CareDevice::getMemberId,resVO.getId())
+                        .eq(CareDevice::getOrgId,loginUser.getOrgId())
+                        .eq(loginUser.getStationId()!=null,CareDevice::getStationId,loginUser.getStationId());
                         resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
                         list.add(resVO);
                     });

src/main/java/com/care/bms/service/BmsSysUserService.java

@@ -83,10 +83,10 @@ public class BmsSysUserService{
      * @param stationId
      * @return
      */
-    public List<CareSysUserVO> queryKeeperListByStationId(Long stationId){
+    public List<CareSysUserVO> queryKeeperListByStationId(Long orgId,Long stationId){
         List<CareSysUserVO> datas = new ArrayList<>();
         QueryWrapper<CareSysUser>  userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.lambda().eq(stationId != null,CareSysUser::getStationId,stationId)
+        userQueryWrapper.lambda().eq(orgId != null,CareSysUser::getOrgId,orgId).eq(CareSysUser::getStationId,stationId)
                 .eq(CareSysUser::getRole, UserRoleEnum.CHANMB.getValue())
                 .orderByAsc(CareSysUser::getName);
         List<CareSysUser> users = this.careSysUserService.list(userQueryWrapper);

src/main/java/com/care/common/config/MyBatisPlusConfig.java

@@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  * @date 2021/1/2 20:41
  */
 @EnableTransactionManagement
-@MapperScan("com.ccb.inm.rims.**.mapper")
+@MapperScan("com.care.**.mapper")
 @Configuration
 public class MyBatisPlusConfig {
 

src/main/java/com/care/common/service/impl/CareDeviceServiceImpl.java

@@ -56,7 +56,8 @@ public class CareDeviceServiceImpl extends ServiceImpl<CareDeviceMapper, CareDev
                 topic +="&companyKey="+org.getCompanyKey()+"&companyId="+org.getCompanyId();
                 String toWx =   url3DUrlHost + url3DUrlPath + topic;
                 map.put("toWX",toWx);
-                map.put("toBms", url3DUrlPath + topic);
+               // map.put("toBms", url3DUrlPath + topic);
+                map.put("toBms", toWx);
             } catch (UnsupportedEncodingException e) {
                 e.printStackTrace();
             }

src/main/java/com/care/mqtt/service/MqttMsgRedisService.java

@@ -139,7 +139,7 @@ public class MqttMsgRedisService {
 
         //判断房屋是否有未完成的告警事件,不区分类型
         QueryWrapper<CareEventOrder> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.lambda().eq(CareEventOrder::getHouseId,careDevice.getHouseId()).and(
+        queryWrapper2.lambda().eq(CareEventOrder::getDevId,careDevice.getId()).and(
                 wrapper-> wrapper.eq(CareEventOrder::getStatus, OrderStatusEnum.TODO.getValue())
                         .or().eq(CareEventOrder::getStatus,OrderStatusEnum.DOING.getValue()));
 

src/main/java/com/care/mqtt/service/MqttMsgService.java

@@ -87,6 +87,7 @@ public class MqttMsgService {
             }
             //处理心跳,放入redis
             if ("HeartBeat".equals(type)) {
+                logger.info("{} 接收到MQTT  HeartBeat消息,{}",topic,mqttMessageStr);
                 redisUtil.hset(RedisKeyConstant.MQTT_DEV_HEARBEAT_INFO, topic, "1", RedisKeyConstant.MQTT_DEV_HEARBEAT_INFO_TIME);
                 return;
             }
@@ -95,7 +96,7 @@ public class MqttMsgService {
                // logger.error("不是要处理的消息");
                 return;
             }
-
+            logger.info("{} 接收到MQTT 事件消息,{}",topic,mqttMessageStr);
             CareDevice  careDevice = getCareDevice(topic);
             if(careDevice == null) {
                 logger.error("数据库中没找到对应设备");
@@ -153,7 +154,7 @@ public class MqttMsgService {
 
             //判断房屋是否有未完成的告警事件,不区分类型
             QueryWrapper<CareEventOrder> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.lambda().eq(CareEventOrder::getHouseId,careDevice.getHouseId()).and(
+            queryWrapper2.lambda().eq(CareEventOrder::getDevId,careDevice.getId()).and(
                     wrapper-> wrapper.eq(CareEventOrder::getStatus, OrderStatusEnum.TODO.getValue())
                             .or().eq(CareEventOrder::getStatus,OrderStatusEnum.DOING.getValue()));
             CareEventOrder orderDb = careEventOrderService.getOne(queryWrapper2);

src/main/resources/application-dev.properties

@@ -14,7 +14,7 @@ mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 ## logging 日志配置
 # 设置日志输出级别
-logging.level.root=info
+logging.level.com.care=info
 
 #################################### 以下是redis的集群标准配置 ##################################
 spring.redis.host=124.70.58.209
@@ -47,8 +47,8 @@ mqtt.on=1
 mqtt.dev.jihuo.timeout=10
 
 #设备工作时接受消息的mqtt topic
-mqtt.topic.work.template=5JPD/monitor/XXXXX/event
-#mqtt.topic.work.template=/shangxingkeji/XXXXX/event
+#mqtt.topic.work.template=5JPD/monitor/XXXXX/event
+mqtt.topic.work.template=/shangxingkeji/XXXXX/event
 
 #设备安装时发送消息的mqtt topic
 mqtt.topic.install.template=5JPD/monintor/XXXXX/control

src/main/resources/logback.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds">
+    <!-- 你的应用程序名称简写 如端到端:logback-etem -->
+    <contextName>logback-rims</contextName>
+    <!-- 日志存储路径 使用绝对路径 如:/home/ap/inm/sys/logs 如果不知道生产环境配置路径请联 系你们的实施人员 -->
+    <property name="logging.path" value="./logs"/>
+    <!-- 日志输出格式 -->
+    <property name="PATTERN" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36}.%method:%L - %msg%n"/>
+
+    <!-- 控制台日志配置 -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>${PATTERN}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+    <!-- debug日志配置 -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logging.path}/debug.log</file>
+        <encoder>
+            <pattern>${PATTERN}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${logging.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>14</maxHistory>
+            <totalSizeCap>10GB</totalSizeCap>
+        </rollingPolicy>
+
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <!-- info日志配置 -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logging.path}/info.log</file>
+        <encoder>
+            <pattern>${PATTERN}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${logging.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>14</maxHistory>
+            <totalSizeCap>10GB</totalSizeCap>
+        </rollingPolicy>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <!-- warn配置 -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logging.path}/warn.log</file>
+        <encoder>
+            <pattern>${PATTERN}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${logging.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>14</maxHistory>
+            <totalSizeCap>10GB</totalSizeCap>
+        </rollingPolicy>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <!-- error配置 -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logging.path}/error.log</file>
+        <encoder>
+            <pattern>${PATTERN}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${logging.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>14</maxHistory>
+            <totalSizeCap>10GB</totalSizeCap>
+        </rollingPolicy>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <!-- 整体日志策略 debug -->
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="DEBUG_FILE"/>
+        <appender-ref ref="INFO_FILE"/>
+        <appender-ref ref="WARN_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+    </root>
+    <logger name="com.care" level="INFO" additivity="false">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="DEBUG_FILE"/>
+        <appender-ref ref="INFO_FILE"/>
+        <appender-ref ref="WARN_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+    </logger>
+    <!-- 控制台打印sql 包名要写到dao 此处不需要可以注掉 -->
+    <logger name="com.care.**.mapper" level="trace" additivity="false">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+</configuration>