update 模块分组

nb-admin/pom.xml

@@ -12,14 +12,22 @@
     <artifactId>nb-admin</artifactId>
 
     <dependencies>
+
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>config-common</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>web-service</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+
         <!-- OSS文件存储模块 -->
         <dependency>
             <groupId>com.tuoren</groupId>
@@ -35,97 +43,125 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>iot-service</artifactId>
-            <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
     </dependencies>
 
 
+    <!--<build>-->
+        <!--<resources>-->
+            <!--<resource>-->
+                <!--<directory>src/main/resources</directory>-->
+                <!--<includes>-->
+                    <!--&lt;!&ndash; **/* &ndash;&gt;-->
+                    <!--<include>**/*.xml</include>-->
+                    <!--<include>**/*.yml</include>-->
+                <!--</includes>-->
+                <!--<filtering>true</filtering>-->
+            <!--</resource>-->
+        <!--</resources>-->
+        <!--<plugins>-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-compiler-plugin</artifactId>-->
+                <!--<version>3.6.2</version>-->
+                <!--<configuration>-->
+                    <!--<source>${maven.compile.source}</source>-->
+                    <!--<target>${maven.compile.target}</target>-->
+                    <!--<encoding>${project.build.sourceEncoding}</encoding>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
+
+            <!--&lt;!&ndash;<plugin>&ndash;&gt;-->
+                <!--&lt;!&ndash;<artifactId>maven-assembly-plugin</artifactId>&ndash;&gt;-->
+                <!--&lt;!&ndash;<configuration>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<archive>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<manifest>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<mainClass>com.nb.admin.AdminApplication</mainClass>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</manifest>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<manifestEntries>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<Class-Path>.</Class-Path>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</manifestEntries>&ndash;&gt;-->
+                    <!--&lt;!&ndash;</archive>&ndash;&gt;-->
+                <!--&lt;!&ndash;</configuration>&ndash;&gt;-->
+                <!--&lt;!&ndash;<executions>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<execution>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<id>make-assembly</id>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<phase>package</phase>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<goals>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<goal>single</goal>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</goals>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<configuration>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<descriptors>&ndash;&gt;-->
+                                <!--&lt;!&ndash;<descriptor>src/main/resources/assembly.xml</descriptor>&ndash;&gt;-->
+                            <!--&lt;!&ndash;</descriptors>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</configuration>&ndash;&gt;-->
+                    <!--&lt;!&ndash;</execution>&ndash;&gt;-->
+                <!--&lt;!&ndash;</executions>&ndash;&gt;-->
+            <!--&lt;!&ndash;</plugin>&ndash;&gt;-->
+        <!--</plugins>-->
+    <!--</build>-->
+
     <build>
+        <finalName>${project.name}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
-                <!--开启过滤，用指定的参数替换directory下的文件中的参数-->
                 <filtering>true</filtering>
             </resource>
         </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4.1</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>com.nb.AdminApplication</mainClass>
-                        </manifest>
-                    </archive>
-                    <!--打包时，包含所有依赖的jar包-->
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                    </execution>
-                </executions>
-
-            </plugin>
-            <!--生成javadoc文件-->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.2.0</version>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                    <charset>UTF-8</charset>
-                    <docencoding>UTF-8</docencoding>
-                    <doclint>none</doclint>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!--生成source文件-->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.4</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
+        <!--<pluginManagement>-->
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>${spring-boot.version}</version>
+                    <configuration>
+                        <mainClass>com.nb.admin.AdminApplication</mainClass>
+                        <finalName>${project.build.finalName}</finalName>
+                        <layers>
+                            <enabled>true</enabled>
+                        </layers>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>repackage</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        <!--</pluginManagement>-->
     </build>
 
     <profiles>

nb-admin/src/main/java/com/nb/AdminApplication.java → nb-admin/src/main/java/com/nb/admin/AdminApplication.java

@@ -1,4 +1,4 @@
-package com.nb;
+package com.nb.admin;
 
 import com.nb.common.config.properties.DruidProperties;
 import com.nb.common.config.web.RequestCheckProperties;
@@ -8,6 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.tio.websocket.starter.EnableTioWebSocketServer;
@@ -22,6 +23,7 @@ import org.tio.websocket.starter.EnableTioWebSocketServer;
         "com.nb.aliyun",
         "com.nb.web",
         "com.nb.auth",
+        "com.nb.admin",
         "springfox.documentation.schema"})
 @Import(cn.hutool.extra.spring.SpringUtil.class)
 @EnableTioWebSocketServer

nb-admin/src/main/java/com/nb/admin/StartUpRunner.java

@@ -2,7 +2,10 @@ package com.nb.admin;
 
 import com.nb.web.service.system.service.ISysConfigService;
 import com.nb.web.service.system.service.ISysDictService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.web.context.WebServerInitializedEvent;
+import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -13,7 +16,8 @@ import javax.annotation.Resource;
  * @author Kevin
  */
 @Component
-public class StartUpRunner implements CommandLineRunner {
+@Slf4j
+public class StartUpRunner implements CommandLineRunner , ApplicationListener<WebServerInitializedEvent> {
 
     @Resource
     ISysDictService sysDictService;
@@ -23,9 +27,14 @@ public class StartUpRunner implements CommandLineRunner {
 
     @Override
     public void run(String... args) {
-        System.out.println("============ 服务器启动中....，开始加载数据 ============");
+        log.info("============  web is running ,start load data============");
         sysDictService.loadAllDictCache();
         sysConfigService.loadAllConfig();
     }
 
+
+    @Override
+    public void onApplicationEvent(WebServerInitializedEvent event) {
+        log.info("web start success ，port：【{}】",event.getWebServer().getPort());
+    }
 }

nb-admin/src/main/test/java/com/coffee/admin/BusDeviceRegisterTest.java

@@ -1,44 +0,0 @@
-package com.nb.admin;
-
-import com.nb.web.service.bus.entity.BusDeviceEntity;
-import com.nb.web.service.bus.service.LocalBusDeviceService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * @author lifang
- * @version 1.0.0
- * @ClassName BusHospitalTest.java
- * @Description TODO
- * @createTime 2022年03月19日 10:27:00
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = AdminApplication.class)
-public class BusDeviceRegisterTest {
-    @Autowired
-    private LocalBusDeviceService registeredService;
-
-    @Test
-    public void save(){
-        BusDeviceEntity deviceEntity = new BusDeviceEntity();
-        deviceEntity.setAlias("测试泵");
-        deviceEntity.setDeviceId("123");
-        deviceEntity.setEnable(true);
-        registeredService.save(deviceEntity);
-
-    }
-
-    @Test
-    public void query(){
-
-    }
-
-    @Test
-    public void Delete(){
-//        boolean b = busHospitalService.removeById(1505789328745721857L);
-//        System.out.println(b);
-    }
-}

nb-admin/src/test/java/com/nb/admin/AliyunTest.java

@@ -1,7 +1,6 @@
 package com.nb.admin;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.nb.AdminApplication;
 import com.nb.aliyun.api.service.AliyunIotSdk;
 import com.nb.web.api.entity.BusDeviceEntity;
 import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;

nb-admin/src/test/java/com/nb/admin/BusClinicTest.java

@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.nb.AdminApplication;
 import com.nb.web.service.bus.controller.vo.ClinicStatsVo;
 import com.nb.web.service.bus.entity.BusClinicEntity;
 import com.nb.web.service.bus.entity.BusDocEntity;

nb-admin/src/test/java/com/nb/admin/BusDeviceAlarmTest.java

@@ -1,6 +1,5 @@
 package com.nb.admin;
 
-import com.nb.AdminApplication;
 import com.nb.web.service.bus.controller.BusDeviceHistoryController;
 import com.nb.web.service.bus.entity.BusDeviceAlarmEntity;
 import com.nb.web.service.bus.entity.BusInfusionHistoryEntity;

nb-admin/src/test/java/com/nb/admin/BusDeviceTest.java

@@ -3,7 +3,6 @@ package com.nb.admin;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nb.AdminApplication;
 import com.nb.web.api.entity.BusDeviceEntity;
 import com.nb.web.service.bus.entity.BusDeviceHistoryEntity;
 import com.nb.web.service.bus.service.LocalBusDeviceHistoryService;

nb-admin/src/test/java/com/nb/admin/BusHospitalLogTest.java

@@ -1,6 +1,5 @@
 package com.nb.admin;
 
-import com.nb.AdminApplication;
 import com.nb.web.service.bus.controller.BusHospitalLogController;
 import com.nb.web.api.entity.BusHospitalLogEntity;
 import com.nb.web.service.bus.service.LocalBusHospitalLogService;

nb-admin/src/test/java/com/nb/admin/BusHospitalTest.java

@@ -1,6 +1,5 @@
 package com.nb.admin;
 
-import com.nb.AdminApplication;
 import com.nb.web.api.bean.GeoPoint;
 import com.nb.web.api.bean.Script;
 import com.nb.web.service.bus.controller.BusHospitalController;

nb-admin/src/test/java/com/nb/admin/BusNetpumpTest.java

@@ -2,7 +2,6 @@ package com.nb.admin;
 
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.nb.AdminApplication;
 import com.nb.web.api.entity.BusDeviceEntity;
 import com.nb.web.service.bus.service.LocalBusDeviceService;
 import com.fasterxml.jackson.core.JsonProcessingException;

nb-admin/src/test/java/com/nb/admin/BusPatientTest.java

@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.nb.AdminApplication;
 import com.nb.web.service.bus.controller.BusDeviceManualController;
 import com.nb.web.service.bus.controller.vo.ClinicEditVo;
 import com.nb.web.service.bus.entity.BusClinicEntity;

nb-admin/src/test/java/com/nb/admin/DelayMessageTest.java

@@ -1,6 +1,5 @@
 package com.nb.admin;
 
-import com.nb.AdminApplication;
 import com.nb.web.service.bus.hospital.config.HospitalDeviceAutoUndoConfigHandler;
 import com.nb.web.service.bus.hospital.config.handler.HandlerConstant;
 import com.nb.core.Value;

nb-admin/src/test/java/com/nb/admin/DeviceOperateTest.java

@@ -1,6 +1,5 @@
 package com.nb.admin;
 
-import com.nb.AdminApplication;
 import com.nb.web.service.bus.registry.device.DeviceOperator;
 import com.nb.web.service.bus.registry.device.DeviceRegistry;
 import org.junit.Test;

nb-admin/src/test/java/com/nb/admin/FileUploadTest.java

@@ -1,7 +1,6 @@
 package com.nb.admin;
 
 import cn.hutool.core.io.FileUtil;
-import com.nb.AdminApplication;
 import com.nb.oss.strategy.MinioUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;

nb-admin/src/test/java/com/nb/admin/HisStrategyTest.java

@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.nb.AdminApplication;
 import com.nb.web.service.bus.entity.BusClinicEntity;
 import com.nb.web.service.bus.hospital.his.strategy.HisStrategyEnum;
 import com.nb.web.service.bus.hospital.his.strategy.HisStrategyHandler;

nb-admin/src/test/java/com/nb/admin/NotifyTest.java

@@ -1,7 +1,6 @@
 package com.nb.admin;
 
 import cn.hutool.json.JSONUtil;
-import com.nb.AdminApplication;
 import com.nb.web.service.bus.job.DeviceFlowStatsJob;
 import com.nb.common.config.notice.msg.DiskMsg;
 import com.nb.common.config.notice.wechat.EnterpriseWeChatNotify;

nb-admin/src/test/java/com/nb/admin/SpringBootApplicationTests.java

@@ -1,7 +1,6 @@
 package com.nb.admin;
 
 import cn.hutool.json.JSONUtil;
-import com.nb.AdminApplication;
 import com.nb.web.service.bus.hospital.HospitalManagerRegister;
 import com.nb.web.service.bus.hospital.config.HospitalDeviceAutoUndoConfigHandler;
 import com.nb.web.service.bus.hospital.config.handler.DeputyDeviceAutoUndoHandler;

nb-common/config-common/pom.xml

@@ -36,10 +36,12 @@
             <artifactId>spring-boot-starter-undertow</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>

nb-common/config-common/src/main/java/com/nb/common/config/ConfigAutoConfiguration.java

@@ -1,7 +1,9 @@
 package com.nb.common.config;
 
+import com.nb.common.config.mybatisplus.MybatisPlusConfig;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
 /**
  * @author lifang

nb-common/config-common/src/main/java/com/nb/common/config/mybatisplus/MybatisPlusConfig.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.MySqlDialect;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 /**
  * mybatis-plus配置类
@@ -13,11 +15,10 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  * @author Kevin
  */
 @EnableTransactionManagement(proxyTargetClass = true)
-@AllArgsConstructor
+@Configuration
 public class MybatisPlusConfig {
-    private final TenantLineInnerInterceptor tenantLineInnerInterceptor;
     @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+    public MybatisPlusInterceptor mybatisPlusInterceptor(TenantLineInnerInterceptor tenantLineInnerInterceptor) {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         //多租户插件
         interceptor.addInnerInterceptor(tenantLineInnerInterceptor);

nb-common/config-common/src/main/java/com/nb/common/config/mybatisplus/interceptor/DefaultTenantLineInnerInterceptor.java

@@ -13,6 +13,7 @@ import com.nb.core.entity.TenantGenericEntity;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.schema.Column;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -32,7 +33,8 @@ import static org.springframework.web.context.request.RequestAttributes.SCOPE_RE
  * @Description 默认多租户插件
  * @createTime 2022年08月02日 08:50:00
  */
-@ConditionalOnMissingBean({TenantLineInnerInterceptor.class,TenantIdManager.class})
+@ConditionalOnMissingBean({TenantLineInnerInterceptor.class})
+@ConditionalOnBean(TenantIdManager.class)
 @Configuration
 public class DefaultTenantLineInnerInterceptor {
     private final List<String> ignoreUrlTenantId= Arrays.asList("/login","/getUserInfo","/token");

nb-common/crud-common/src/main/java/com/nb/common/crud/BaseService.java

@@ -224,6 +224,7 @@ public abstract class BaseService<M extends BaseMapper<E>, E,PK extends Serializ
                 page.setRecords(list);
                 return page;
             }catch (Exception e){
+                log.error("查询参数出错,",e);
                 if(e instanceof BadSqlGrammarException){
                     throw new CustomException(e.getCause().getMessage());
                 }

nb-core/src/main/java/com/nb/core/SimpleValue.java

@@ -19,6 +19,7 @@ public class SimpleValue implements Value {
 
     public static SimpleValue of(Object nativeValue){
         SimpleValue simpleValue = new SimpleValue();
+        simpleValue.nativeValue=nativeValue;
         return simpleValue;
     }
     @Getter

nb-oss/pom.xml

@@ -17,15 +17,18 @@
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-undertow</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>crud-common</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>

nb-oss/src/main/java/com/nb/oss/strategy/mapper/SysLocalStorageMapper.java

@@ -2,6 +2,7 @@ package com.nb.oss.strategy.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.nb.oss.strategy.entity.SysStorage;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.nb.oss.strategy.entity.SysStorage;
  * @author Kevin
  * @since 2021-06-10
  */
+@Mapper
 public interface SysLocalStorageMapper extends BaseMapper<SysStorage> {
 
 }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/enums/DeviceAlarmEnum.java

@@ -29,7 +29,7 @@ public enum DeviceAlarmEnum  implements IEnum<Integer> {
     InfusionMax(4,"输注总量报警"),
     Limit(5,"极限报警"),
     Finished(6,"输液结束"),
-    LowBattery(7,"低电量报警"),
+    LowBattery(7,"电量耗尽报警"),
 //    OutOfControl(8,"电机失控报警"),
     Machine(9,"机械故障"),;
 

nb-service/iot-service/src/main/java/com/nb/aliyun/AliyunConsumerGroupService.java → nb-service/iot-service/src/main/java/com/nb/aliyun/service/AliyunConsumerGroupService.java

@@ -1,4 +1,4 @@
-package com.nb.aliyun;
+package com.nb.aliyun.service;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.json.JSONUtil;

nb-service/iot-service/src/main/java/com/nb/aliyun/AliyunIotSubscribeClient.java → nb-service/iot-service/src/main/java/com/nb/aliyun/service/AliyunIotSubscribeClient.java

@@ -1,4 +1,4 @@
-package com.nb.aliyun;
+package com.nb.aliyun.service;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.nb.aliyun.api.bean.PlatformAccount;

nb-service/iot-service/src/main/java/com/nb/aliyun/PlatformLog.java → nb-service/iot-service/src/main/java/com/nb/aliyun/service/PlatformLog.java

@@ -1,4 +1,4 @@
-package com.nb.aliyun;
+package com.nb.aliyun.service;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

nb-service/iot-service/src/main/java/com/nb/aliyun/PlatformType.java → nb-service/iot-service/src/main/java/com/nb/aliyun/service/PlatformType.java

@@ -1,4 +1,4 @@
-package com.nb.aliyun;
+package com.nb.aliyun.service;
 
 /**
  * @Author XX

nb-service/iot-service/src/main/java/com/nb/aliyun/bean/AliIotConfig.java → nb-service/iot-service/src/main/java/com/nb/aliyun/service/bean/AliIotConfig.java

@@ -1,4 +1,4 @@
-package com.nb.aliyun.bean;
+package com.nb.aliyun.service.bean;
 
 import lombok.Data;
 

nb-service/iot-service/src/main/java/com/nb/aliyun/utils/Constants.java → nb-service/iot-service/src/main/java/com/nb/aliyun/service/utils/Constants.java

@@ -1,4 +1,4 @@
-package com.nb.aliyun.utils;
+package com.nb.aliyun.service.utils;
 
 /**
  * @Author 龙三郎

nb-service/iot-service/src/main/java/com/nb/aliyun/utils/DeviceAlarmUtils.java → nb-service/iot-service/src/main/java/com/nb/aliyun/service/utils/DeviceAlarmUtils.java

@@ -1,4 +1,4 @@
-package com.nb.aliyun.utils;
+package com.nb.aliyun.service.utils;
 
 import com.nb.web.api.enums.DeviceAlarmEnum;
 

nb-service/iot-service/src/main/java/com/nb/aliyun/utils/DeviceRunStatusUtils.java → nb-service/iot-service/src/main/java/com/nb/aliyun/service/utils/DeviceRunStatusUtils.java

@@ -1,4 +1,4 @@
-package com.nb.aliyun.utils;
+package com.nb.aliyun.service.utils;
 
 import com.nb.web.api.enums.DeviceStatusEnum;
 

nb-service/iot-service/src/main/java/com/nb/aliyun/utils/DeviceTypeUtils.java → nb-service/iot-service/src/main/java/com/nb/aliyun/service/utils/DeviceTypeUtils.java

@@ -1,4 +1,4 @@
-package com.nb.aliyun.utils;
+package com.nb.aliyun.service.utils;
 
 import com.nb.web.api.enums.DeviceTypeEnum;
 

nb-service/iot-service/src/main/java/com/nb/aliyun/utils/PumpParams.java → nb-service/iot-service/src/main/java/com/nb/aliyun/service/utils/PumpParams.java

@@ -1,4 +1,4 @@
-package com.nb.aliyun.utils;
+package com.nb.aliyun.service.utils;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-service/iot-service/src/main/java/com/nb/aliyun/utils/WarnFlowUtils.java → nb-service/iot-service/src/main/java/com/nb/aliyun/service/utils/WarnFlowUtils.java

@@ -1,4 +1,4 @@
-package com.nb.aliyun.utils;
+package com.nb.aliyun.service.utils;
 
 import com.nb.web.api.enums.FlowStatusEnum;
 

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/HospitalManager.java

@@ -128,6 +128,10 @@ public class HospitalManager {
             switch (config.getType()) {
                 case undo:
                     FunctionUndoConfig functionUndoConfig = JSONUtil.toBean(JSONUtil.toJsonStr(param), FunctionUndoConfig.class);
+                    if(functionUndoConfig==null){
+                        log.warn("医院【{}】未配置【结束管理】功能",hospitalId);
+                        return;
+                    }
                     //自动撤泵
                     FunctionAutoUndoConfig autoUndo = functionUndoConfig.getAuto();
                     autoUndoConfigHandler.setConfig(autoUndo);
@@ -137,6 +141,10 @@ public class HospitalManager {
                     break;
                 case other:
                     FunctionOtherConfig otherConfig = JSONUtil.toBean(JSONUtil.toJsonStr(param), FunctionOtherConfig.class);
+                    if(otherConfig==null){
+                        log.warn("医院【{}】未配置【其他】功能",hospitalId);
+                        return;
+                    }
                     //镇痛不足
                     FunctionAnalConfig anal = otherConfig.getAnal();
                     analConfigHandler.setConfig(anal);
@@ -146,6 +154,10 @@ public class HospitalManager {
                     break;
                 case patientCode:
                     FunctionPatientCodeConfig codeConfig = JSONUtil.toBean(JSONUtil.toJsonStr(param), FunctionPatientCodeConfig.class);
+                    if(codeConfig==null){
+                        log.warn("医院【{}】未配置【住院号配置】功能",hospitalId);
+                        return;
+                    }
                     codeHandler.setConfig(codeConfig);
                     break;
                 default:break;

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusClinicMapper.java

@@ -21,7 +21,6 @@ import org.apache.ibatis.annotations.Select;
  * @Description TODO
  * @createTime 2022年03月19日 09:15:00
  */
-@Mapper
 public interface BusClinicMapper extends BaseMapper<BusClinicEntity> {
 
     /**

pom.xml

@@ -55,7 +55,6 @@
     </modules>
 
     <dependencies>
-        <!-- test -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -70,6 +69,7 @@
     <!-- 依赖管理 -->
     <dependencyManagement>
         <dependencies>
+
             <dependency>
                 <groupId>com.tuoren</groupId>
                 <artifactId>ws-common</artifactId>
@@ -233,16 +233,19 @@
                 <artifactId>iot-service-api</artifactId>
                 <version>${nb.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.tuoren</groupId>
                 <artifactId>iot-service</artifactId>
                 <version>${nb.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.tuoren</groupId>
                 <artifactId>web-service-api</artifactId>
                 <version>${nb.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.tuoren</groupId>
                 <artifactId>web-service</artifactId>