update coffee项目改为nb项目

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

@@ -1,7 +1,7 @@
-package com.coffee.admin;
+package com.nb.admin;
 
-import com.coffee.bus.web.RequestCheckProperties;
-import com.coffee.common.config.AppConfig;
+import com.nb.bus.web.RequestCheckProperties;
+import com.nb.common.config.AppConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -17,13 +17,13 @@ import org.tio.websocket.starter.EnableTioWebSocketServer;
  *
  * @author Kevin
  */
-@SpringBootApplication(scanBasePackages ={"com.coffee","springfox.documentation.schema"}, exclude = {DataSourceAutoConfiguration.class})
+@SpringBootApplication(scanBasePackages ={"com.nb","springfox.documentation.schema"}, exclude = {DataSourceAutoConfiguration.class})
 @Import(cn.hutool.extra.spring.SpringUtil.class)
 @EnableTioWebSocketServer
 @EnableScheduling
 @EnableAsync
 @EnableConfigurationProperties(RequestCheckProperties.class)
-@ServletComponentScan(basePackages = "com.coffee.common.config")
+@ServletComponentScan(basePackages = "com.nb.common.config")
 public class AdminApplication {
 
     public static void main(String[] args) {

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

@@ -1,7 +1,7 @@
-package com.coffee.admin;
+package com.nb.admin;
 
-import com.coffee.system.service.ISysConfigService;
-import com.coffee.system.service.ISysDictService;
+import com.nb.system.service.ISysConfigService;
+import com.nb.system.service.ISysDictService;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 

nb-admin/src/main/java/com/coffee/admin/controller/IndexController.java → nb-admin/src/main/java/com/nb/admin/controller/IndexController.java

@@ -1,4 +1,4 @@
-package com.coffee.admin.controller;
+package com.nb.admin.controller;
 
 import cn.hutool.extra.servlet.ServletUtil;
 import lombok.SneakyThrows;

nb-admin/src/main/java/com/coffee/admin/controller/common/CommonController.java → nb-admin/src/main/java/com/nb/admin/controller/common/CommonController.java

@@ -1,14 +1,14 @@
-package com.coffee.admin.controller.common;
+package com.nb.admin.controller.common;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
-import com.coffee.common.config.AppConfig;
-import com.coffee.common.exception.CustomException;
-import com.coffee.common.result.R;
-import com.coffee.common.result.ResultCode;
-import com.coffee.oss.strategy.FileStorageStrategy;
-import com.coffee.oss.strategy.context.FileStorageContext;
-import com.coffee.oss.strategy.storage.SysStorage;
+import com.nb.common.config.AppConfig;
+import com.nb.common.exception.CustomException;
+import com.nb.common.result.R;
+import com.nb.common.result.ResultCode;
+import com.nb.oss.strategy.FileStorageStrategy;
+import com.nb.oss.strategy.context.FileStorageContext;
+import com.nb.oss.strategy.storage.SysStorage;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

nb-admin/src/main/java/com/coffee/admin/controller/monitor/OnlineUserController.java → nb-admin/src/main/java/com/nb/admin/controller/monitor/OnlineUserController.java

@@ -1,16 +1,15 @@
-package com.coffee.admin.controller.monitor;
+package com.nb.admin.controller.monitor;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.coffee.common.Constants;
-import com.coffee.common.annotation.Log;
-import com.coffee.common.bo.LoginUser;
-import com.coffee.common.redis.RedisUtils;
-import com.coffee.common.result.R;
+import com.nb.common.Constants;
+import com.nb.common.annotation.Log;
+import com.nb.common.bo.LoginUser;
+import com.nb.common.redis.RedisUtils;
+import com.nb.common.result.R;
 import com.google.common.collect.Lists;
 import org.springframework.web.bind.annotation.*;
 

nb-admin/src/main/java/com/coffee/admin/controller/system/SysLoginController.java → nb-admin/src/main/java/com/nb/admin/controller/system/SysLoginController.java

@@ -1,21 +1,19 @@
-package com.coffee.admin.controller.system;
+package com.nb.admin.controller.system;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.coffee.admin.controller.system.vo.UserPassVo;
-import com.coffee.common.annotation.Log;
-import com.coffee.common.dto.LoginDTO;
-import com.coffee.common.exception.CustomException;
-import com.coffee.common.result.R;
-import com.coffee.common.util.SecurityUtil;
-import com.coffee.framework.web.service.IUserService;
-import com.coffee.system.common.vo.AccountInfoVO;
-import com.coffee.system.entity.SysUser;
-import com.coffee.system.service.ISysUserService;
+import com.nb.admin.controller.system.vo.UserPassVo;
+import com.nb.common.annotation.Log;
+import com.nb.common.dto.LoginDTO;
+import com.nb.common.exception.CustomException;
+import com.nb.common.result.R;
+import com.nb.common.util.SecurityUtil;
+import com.nb.framework.web.service.IUserService;
+import com.nb.system.common.vo.AccountInfoVO;
+import com.nb.system.entity.SysUser;
+import com.nb.system.service.ISysUserService;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

nb-admin/src/main/java/com/coffee/admin/controller/system/vo/UserPassVo.java → nb-admin/src/main/java/com/nb/admin/controller/system/vo/UserPassVo.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.coffee.admin.controller.system.vo;
+package com.nb.admin.controller.system.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

nb-admin/src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
       max-file-size: 10MB
       max-request-size: 15MB
   application:
-    name: coffee-service.
+    name: nb-service.
   profiles:
     active: @profiles.active@
   jackson:
@@ -53,7 +53,7 @@ sa-token:
 
 logging:
   level:
-    com.coffee: @logging.level@
+    com.nb: @logging.level@
   config: classpath:logback-spring.xml
   file:
     path: ./logs
@@ -64,7 +64,7 @@ logging:
     console: UTF-8
 
 mybatis-plus:
-  mapperPackage: com.coffee.**.mapper
+  mapperPackage: com.nb.**.mapper
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   checkConfigLocation: false
   global-config:
@@ -75,7 +75,7 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     default-enum-type-handler: com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler
-  type-aliases-package: com.coffee.bus.entity
+  type-aliases-package: com.nb.bus.entity
 
 
 captcha:

nb-admin/src/main/resources/logback-spring.xml

@@ -78,7 +78,7 @@
     </appender>
 
     <!-- 系统模块日志级别控制  -->
-    <logger name="com.coffee" level="info"/>
+    <logger name="com.nb" level="info"/>
     <!-- Spring日志级别控制  -->
     <logger name="org.springframework" level="warn"/>
 

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

@@ -1,7 +1,7 @@
-package com.coffee.admin;
+package com.nb.admin;
 
-import com.coffee.bus.entity.BusDeviceEntity;
-import com.coffee.bus.service.LocalBusDeviceService;
+import com.nb.bus.entity.BusDeviceEntity;
+import com.nb.bus.service.LocalBusDeviceService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,80 +0,0 @@
-package com.coffee.admin;
-
-import com.aliyuncs.iot.model.v20180120.QueryDeviceResponse;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.coffee.aliyun.sdk.AliyunIotSdk;
-import com.coffee.bus.entity.BusDeviceEntity;
-import com.coffee.bus.entity.BusDeviceRunningEntity;
-import com.coffee.bus.entity.BusInfusionHistoryEntity;
-import com.coffee.bus.listener.event.bean.DeviceInfoEvent;
-import com.coffee.bus.service.LocalBusDeviceService;
-import com.coffee.bus.service.LocalBusInfusionHistoryService;
-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.context.ApplicationContext;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
-
-/**
- * @Author longsanlang
- * @Date 2022-04-06 17:55:44
- * @Version 1.0
- * @Description XXX
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = AdminApplication.class)
-public class AliyunTest {
-
-    @Autowired
-    private ApplicationContext applicationContext;
-
-    @Autowired
-    private LocalBusInfusionHistoryService localBusInfusionHistoryService;
-
-    @Autowired
-    private LocalBusDeviceService deviceService;
-    @Autowired
-    private LocalBusInfusionHistoryService infusionHistoryService;
-
-    @Autowired
-    private AliyunIotSdk aliyunIotSdk;
-
-    @Test
-    public void test001(){
-        BusDeviceRunningEntity pump = new BusDeviceRunningEntity();
-        pump.setAlias("123456777");
-        DeviceInfoEvent event = new DeviceInfoEvent(this,pump,"123");
-        applicationContext.publishEvent(event);
-
-        try {
-            Thread.sleep(2000000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void test002(){
-        List<BusDeviceEntity> deviceList = deviceService.list();
-        for (BusDeviceEntity deviceEntity : deviceList) {
-            BusInfusionHistoryEntity one = infusionHistoryService.getOne(new QueryWrapper<BusInfusionHistoryEntity>()
-                    .lambda().eq(BusInfusionHistoryEntity::getDeviceId, deviceEntity.getDeviceId())
-                    .orderByDesc(BusInfusionHistoryEntity::getStartTime)
-                    .last("limit 1"));
-            if(one!=null){
-                deviceEntity.setInfusionId(one.getId());
-            }
-        }
-        deviceService.updateBatchById(deviceList);
-    }
-
-    @Test
-    public void test003(){
-        List<QueryDeviceResponse.DeviceInfo> deviceInfos = aliyunIotSdk.queryDevice();
-        System.out.println(deviceInfos.size());
-    }
-
-}

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

@@ -1,107 +0,0 @@
-package com.coffee.admin;
-
-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.coffee.bus.controller.vo.ClinicStatsVo;
-import com.coffee.bus.entity.BusClinicEntity;
-import com.coffee.bus.entity.BusDeviceRunningEntity;
-import com.coffee.bus.entity.BusDocEntity;
-import com.coffee.bus.entity.BusInfusionHistoryEntity;
-import com.coffee.bus.listener.event.bean.DeviceInfoEvent;
-import com.coffee.bus.service.LocalBusClinicService;
-import com.coffee.bus.service.LocalBusDocService;
-import com.coffee.bus.service.LocalBusInfusionHistoryService;
-import com.coffee.bus.service.dto.ClinicStatsReturnResult;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.redisson.api.RBlockingQueue;
-import org.redisson.api.RDelayedQueue;
-import org.redisson.api.RedissonClient;
-import org.redisson.codec.JsonJacksonCodec;
-import org.redisson.codec.TypedJsonJacksonCodec;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ApplicationContext;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @Author longsanlang
- * @Date 2022-04-06 17:55:44
- * @Version 1.0
- * @Description XXX
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = AdminApplication.class)
-public class BusClinicTest {
-
-    @Autowired
-    private RedissonClient redissonClient;
-    @Autowired
-    private LocalBusClinicService clinicService;
-    @Autowired
-    private ObjectMapper objectMapper;
-    @Autowired
-    private LocalBusInfusionHistoryService infusionHistoryService;
-@Autowired
-private LocalBusDocService docService;
-    @Test
-    public void stats(){
-        ClinicStatsVo clinicStatsVo = new ClinicStatsVo();
-        clinicStatsVo.setContinueDose(true);
-        clinicStatsVo.setInValidCount(true);
-        clinicStatsVo.setValidCount(true);
-        clinicStatsVo.setClinicId("1519516923748319234");
-        clinicStatsVo.setDeviceId("456");
-        ClinicStatsReturnResult stats = clinicService.stats(clinicStatsVo);
-        System.out.println(stats);
-    }
-
-    @Test
-    public void redisson(){
-        RBlockingQueue<Object> blockingFairQueue = redissonClient.getBlockingQueue("delay_queue",new JsonJacksonCodec());
-        RDelayedQueue<Object> delayedQueue = redissonClient.getDelayedQueue(blockingFairQueue);
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.putOpt(DateUtil.now(),"1");
-        System.out.println(jsonObject);
-
-        delayedQueue.offerAsync(jsonObject,60, TimeUnit.SECONDS);
-        while (true){
-
-        }
-    }
-
-    @Test
-    public void save(){
-        List<Map<String, Object>> mapList = infusionHistoryService
-                .listMaps(new QueryWrapper<BusInfusionHistoryEntity>()
-                        .select("clinic_id","count(1) as c")
-                        .lambda()
-                        .groupBy(BusInfusionHistoryEntity::getClinicId));
-        System.out.println(mapList);
-    }
-
-
-    @Test
-    @Transactional(rollbackFor = ArithmeticException.class)
-    public void test(){
-        clinicService.update(new UpdateWrapper<BusClinicEntity>().lambda().eq(BusClinicEntity::getId,"1528668113304244226")
-        .set(BusClinicEntity::getSurgeryName,"临床数据5"));
-        docService.update(new UpdateWrapper<BusDocEntity>().lambda().eq(BusDocEntity::getId,"1512720050274963458")
-        .set(BusDocEntity::getType,"about1"));
-        int i=1/0;
-    }
-
-
-    public void publish(){
-
-    }
-
-}

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

@@ -1,106 +0,0 @@
-package com.coffee.admin;
-
-import com.coffee.bus.controller.BusDeviceController;
-import com.coffee.bus.controller.BusDeviceHistoryController;
-import com.coffee.bus.entity.BusDeviceAlarmEntity;
-import com.coffee.bus.entity.BusDeviceEntity;
-import com.coffee.bus.entity.BusInfusionHistoryEntity;
-import com.coffee.bus.enums.DeviceAlarmEnum;
-import com.coffee.bus.enums.DeviceStatusEnum;
-import com.coffee.bus.enums.FlowStatusEnum;
-import com.coffee.bus.mapper.BusDeviceAlarmMapper;
-import com.coffee.bus.service.LocalBusDeviceAlarmService;
-import com.coffee.bus.service.LocalBusInfusionHistoryService;
-import com.coffee.bus.service.dto.DeviceAlarmQuery;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author zsl
- * @version 1.0.0
- * @ClassName BusDeviceAlarmTest.java
- * @Description TODO
- * @createTime 2022/5/218:42
- */
-@RunWith(SpringRunner.class)
-@Slf4j
-@SpringBootTest(classes = AdminApplication.class)
-@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
-public class BusDeviceAlarmTest {
-
-    @Autowired
-    BusDeviceAlarmMapper busDeviceAlarmMapper;
-    @Autowired
-    LocalBusDeviceAlarmService service;
-    @Autowired
-    BusDeviceHistoryController controller;
-    @Autowired
-    LocalBusInfusionHistoryService infusionHistoryService;
-    @Test
-    public void test001(){
-        DeviceAlarmQuery query = new DeviceAlarmQuery();
-        System.out.println(        busDeviceAlarmMapper.selectAlarmCount(query));
-        System.out.println(busDeviceAlarmMapper.selectWarnCount(query));
-    }
-    @Test
-    public void test002(){
-        System.out.println(service.selectCountAlarm(new DeviceAlarmQuery()));
-    }
-
-
-    @Test
-    public void test003(){
-        DeviceAlarmQuery query = new DeviceAlarmQuery();
-        query.setHositalName("驼人医疗器械有限公司");
-        //   query.setTenantId("1");
-        System.out.println(controller.deviceUse("1",query));
-    }
-
-    @Test
-    public void test004(){
-
-        BusDeviceAlarmEntity busDeviceAlarmEntity = new BusDeviceAlarmEntity();
-//        busDeviceAlarmEntity.setAlarm(Boolean.TRUE);
-        // busDeviceAlarmEntity.setAlarmState(DeviceAlarmEnum.Bubble);
-        //busDeviceAlarmEntity.setWarnAnalgesicPoor(1==1);
-        busDeviceAlarmEntity.setRunState(DeviceStatusEnum.NoSignal);
-//        busDeviceAlarmEntity.setWarnFlow(FlowStatusEnum.Lowest);
-        System.out.println(busDeviceAlarmMapper.selectDeviceCount(busDeviceAlarmEntity));
-    }
-    @Test
-    public void test005(){
-
-        BusDeviceAlarmEntity busDeviceAlarmEntity = new BusDeviceAlarmEntity();
-//        busDeviceAlarmEntity.setAlarm(Boolean.TRUE);
-        // busDeviceAlarmEntity.setAlarmState(DeviceAlarmEnum.Bubble);
-        //busDeviceAlarmEntity.setWarnAnalgesicPoor(1==1);
-        busDeviceAlarmEntity.setRunState(DeviceStatusEnum.NoSignal);
-        //busDeviceAlarmEntity.setWarnFlow(FlowStatusEnum.Lowest);
-        System.out.println(service.selectUseDetail(busDeviceAlarmEntity));
-    }
-    @Test
-    public void test006(){
-        ArrayList<BusDeviceAlarmEntity> objects = new ArrayList<>();
-        List<BusDeviceAlarmEntity> list = service.list();
-        for (BusDeviceAlarmEntity deviceAlarmEntity : list) {
-            BusInfusionHistoryEntity byId = infusionHistoryService.getById(deviceAlarmEntity.getInfusionId());
-            if(byId==null){
-                service.removeById(deviceAlarmEntity);
-                continue;
-            }
-            objects.add(deviceAlarmEntity);
-            deviceAlarmEntity.setDeviceType(byId.getType());
-        }
-        service.updateBatchById(objects);
-    }
-}

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

@@ -1,89 +0,0 @@
-package com.coffee.admin;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.coffee.bus.entity.BusDeviceEntity;
-import com.coffee.bus.entity.BusDeviceHistoryEntity;
-import com.coffee.bus.service.LocalBusDeviceHistoryService;
-import com.coffee.bus.service.LocalBusDeviceService;
-import com.coffee.bus.service.dto.ClinicAnalInfusionRecord;
-import lombok.extern.slf4j.Slf4j;
-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;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author XX
- * @Date 2022-04-25 19:00:10
- * @Version 1.0
- * @Description XXX
- */
-@RunWith(SpringRunner.class)
-@Slf4j
-@SpringBootTest(classes = AdminApplication.class)
-public class BusDeviceTest {
-
-    @Autowired
-    LocalBusDeviceService deviceService;
-
-    @Autowired
-    LocalBusDeviceHistoryService historyService;
-    @Test
-    public void test001(){
-        BusDeviceEntity device = new BusDeviceEntity();
-        device.setDeviceId("12345678910");
-        device.setCreateBy("auto");
-        device.setCreateTime(new Date());
-        deviceService.saveDevice(device);
-
-    }
-
-    @Test
-    public void addAlias(){
-        List<BusDeviceEntity> list = deviceService.list();
-        for (BusDeviceEntity device : list) {
-
-            device.setAlias(BusPatientTest.getName());
-        }
-        deviceService.updateBatchById(list);
-
-    }
-
-    @Test
-    public void test002(){
-        deviceService.removeByDeviceId("nbceshi001");
-    }
-
-
-    @Test
-    public void copy(){
-        Page<BusDeviceHistoryEntity> page = historyService.page(Page.of(0, 50));
-        List<BusDeviceHistoryEntity> records = page.getRecords();
-
-        for (int i = 0; i < 100; i++) {
-            long current = System.currentTimeMillis();
-            records.stream().forEach(record->{
-//            long start = System.currentTimeMillis();
-                BeanUtil.copyProperties(record, ClinicAnalInfusionRecord.class);
-//            System.out.println("BeanCopy耗时：" + (System.currentTimeMillis() - start));
-            });
-            System.out.println("BeanCopy单线程总耗时：" + (System.currentTimeMillis() - current));
-        }
-
-        for (int i = 0; i < 100; i++) {
-            long current1 = System.currentTimeMillis();
-            records.parallelStream().forEach(record->{
-//            long start = System.currentTimeMillis();
-                BeanUtil.copyProperties(record, ClinicAnalInfusionRecord.class);
-//            System.out.println("BeanCopy耗时：" + (System.currentTimeMillis() - start));
-            });
-            System.out.println("BeanCopy多线程总耗时：" + (System.currentTimeMillis() - current1));
-        }
-
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.coffee.admin;
-
-import com.coffee.bus.controller.BusHospitalController;
-import com.coffee.bus.controller.BusHospitalLogController;
-import com.coffee.bus.entity.BusHospitalEntity;
-import com.coffee.bus.entity.BusHospitalLogEntity;
-import com.coffee.bus.enums.HospitalLogEnum;
-import com.coffee.bus.service.LocalBusHospitalLogService;
-import com.coffee.bus.service.LocalBusHospitalService;
-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;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @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 BusHospitalLogTest {
-    @Autowired
-    private LocalBusHospitalLogService logService;
-
-    @Autowired
-    private BusHospitalLogController logController;
-    @Test
-    public void save(){
-//        BusHospitalLogEntity logEntity = new BusHospitalLogEntity();
-//        logEntity.setIp("192.168.100.32");
-//        logEntity.setReceiveTime(new Date());
-//        logEntity.setResult("success");
-//        logEntity.setType(HospitalLogEnum.HEART);
-//        logService.save(logEntity);
-    }
-
-    @Test
-    public void query(){
-        List<BusHospitalLogEntity> list = logService.list();
-        System.out.println(list);
-    }
-}

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

@@ -1,102 +0,0 @@
-package com.coffee.admin;
-
-import cn.dev33.satoken.stp.StpUtil;
-import com.coffee.bus.bean.GeoPoint;
-import com.coffee.bus.bean.Script;
-import com.coffee.bus.controller.BusHospitalController;
-import com.coffee.bus.entity.BusHospitalEntity;
-import com.coffee.bus.enums.ConstantMixEnum;
-import com.coffee.bus.service.LocalBusHospitalService;
-import com.coffee.bus.service.LocalBusPatientService;
-import com.coffee.bus.service.constant.LocalBusConMixService;
-import com.coffee.bus.service.dto.MonitorStatusStatsCountResult;
-import com.coffee.bus.utils.CodeUtils;
-import com.coffee.common.result.R;
-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;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @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 BusHospitalTest {
-    @Autowired
-    private LocalBusHospitalService busHospitalService;
-    @Autowired
-    private LocalBusPatientService patientService;
-    @Autowired
-    private LocalBusConMixService conMixService;
-    @Autowired
-    private BusHospitalController busHospitalController;
-    @Test
-    public void save(){
-//        StpUtil.login();
-        BusHospitalEntity busHospitalEntity = new BusHospitalEntity();
-        busHospitalEntity.setAddress("河南长垣");
-        busHospitalEntity.setAreaCode("453400");
-
-        GeoPoint geoPoint = new GeoPoint();
-        geoPoint.setLat("101");
-        geoPoint.setLon("1010");
-        busHospitalEntity.setCoordinate(geoPoint);
-        busHospitalEntity.setName("人民医院");
-        busHospitalEntity.setTelephone("18339543637");
-        busHospitalEntity.setEmail("493216081@qq.com");
-//        busHospitalController.add(busHospitalEntity);
-    }
-
-    @Test
-    public void query(){
-        List<BusHospitalEntity> list = busHospitalService.list();
-        list.forEach(busHospitalEntity -> busHospitalEntity.setCode(CodeUtils.genInviteCode(Long.valueOf(busHospitalEntity.getId()))));
-        busHospitalService.updateBatchById(list);
-    }
-
-    @Test
-    public void Delete(){
-        boolean b = busHospitalService.removeById(1505789328745721857L);
-        System.out.println(b);
-    }
-
-    @Test
-    public void script(){
-        String id="";
-        String str = "# -*- coding: utf-8 -*-\n" +
-                "import sys\n" +
-                "reload(sys)\n" +
-                "sys.setdefaultencoding('utf-8')\n" +
-                "import json\n" +
-                "import xmltodict as xmltodict\n" +
-                "\n" +
-                "\n" +
-                "def parse(str):\n" +
-                "    json_dict = xmltodict.parse(str, encoding='utf-8')\n" +
-                "    json_str = json.dumps(json_dict, indent=2)\n" +
-                "    return json_str";
-        BusHospitalEntity busHospitalEntity = new BusHospitalEntity();
-        busHospitalEntity.setId("1505789859765604353");
-        Script script = new Script();
-        script.setId("python");
-        script.setContent(str);
-        busHospitalEntity.setScript(script);
-        busHospitalService.updateById(busHospitalEntity);
-    }
-
-    @Test
-    public void debug(){
-        MonitorStatusStatsCountResult monitorStatusStatsCountResult = patientService.statusStats("1");
-//        conMixService.insertUniqueCon(ConstantMixEnum.ward, Arrays.asList("手术名称1","手术名称2","手术3").stream().collect(Collectors.toSet()), "1");
-    }
-}

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

@@ -1,263 +0,0 @@
-package com.coffee.admin;
-
-import cn.hutool.core.date.DateField;
-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.coffee.bus.controller.BusDeviceManualController;
-import com.coffee.bus.controller.vo.ClinicEditVo;
-import com.coffee.bus.entity.BusClinicEntity;
-import com.coffee.bus.entity.BusDeviceManualEntity;
-import com.coffee.bus.entity.BusInfusionHistoryEntity;
-import com.coffee.bus.entity.BusPatientEntity;
-import com.coffee.bus.enums.DeviceManualEnum;
-import com.coffee.bus.hospital.his.strategy.all.EqualsStrategyHandler;
-import com.coffee.bus.service.LocalBusClinicService;
-import com.coffee.bus.service.LocalBusInfusionHistoryService;
-import com.coffee.bus.service.LocalBusPatientService;
-import com.coffee.bus.service.dto.PatientDeviceRepeatResult;
-import com.coffee.common.enums.SexEnum;
-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;
-
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @author lifang
- * @version 1.0.0
- * @ClassName BusPatientTest.java
- * @Description TODO
- * @createTime 2022年04月19日 15:08:00
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = AdminApplication.class)
-public class BusPatientTest {
-    @Autowired
-    private LocalBusPatientService patientService;
-
-    @Autowired
-    private LocalBusClinicService clinicService;
-
-    @Autowired
-    private LocalBusInfusionHistoryService infusionHistoryService;
-
-    @Autowired
-    private EqualsStrategyHandler equalsStrategyHandler;
-    @Autowired
-    private BusDeviceManualController manualController;
-    @Test
-    public  void test(){
-        List<PatientDeviceRepeatResult> patientDeviceRepeatResults = patientService.repeatDevice();
-        System.out.println(getName());
-        System.out.println(patientDeviceRepeatResults);
-    }
-
-    public static List<String> clinicNames= Arrays.asList("阑尾手术","肛门手术","肝脏手术","感冒","发烧","肠其他手术","结肠造口术","回肠造口术","肠造口闭合术","肠固定术","肠的其他修补","阑尾切除术","腹腔镜下阑尾切除术","阑尾切除术","阑尾残端切除术");
-    public static List<String> anaTypes=Arrays.asList("局部麻醉","全麻");
-    public static List<String> analTypes=Arrays.asList("PCIA","PCEA","PCSA","PCNA");
-
-    @Test
-    public void save(){
-        for (int i = 0; i < 30; i++) {
-            BusClinicEntity clinic = new BusClinicEntity();
-            clinic.setStartTime(new Date());
-            clinic.setSurgeryName(clinicNames.get(RandomUtil.randomInt(clinicNames.size()-1)));
-            clinic.setPatientName(getName());
-            clinic.setPatientGender(EnumUtil.likeValueOf(SexEnum.class,RandomUtil.randomInt(1,2)));
-            clinic.setBedNo(String.valueOf(RandomUtil.randomInt(10,100)));
-            clinic.setWard(String.valueOf(RandomUtil.randomInt(10,100)));
-            clinic.setWeight(String.valueOf(RandomUtil.randomInt(90,150)));
-            clinic.setWeight(String.valueOf(RandomUtil.randomInt(150,200)));
-            clinic.setAnaDoctor(getName());
-            clinic.setAnaType(anaTypes.get(RandomUtil.randomInt(anaTypes.size()-1)));
-            clinic.setAnalType(analTypes.get(RandomUtil.randomInt(analTypes.size()-1)));
-            clinic.setSurgeryDoctor(getName());
-            clinic.setConfigPerson(getName());
-            clinic.setPatientCode(String.valueOf(RandomUtil.randomInt(100000,300000)));
-            clinic.setMonitorType(true);
-            clinic.setTenantId("1");
-            BusPatientEntity patient = BusPatientEntity.of(clinic);
-//        patientService.save(patient);
-//        clinicService.save(clinic);
-            patientService.manualEdit(clinic);
-        }
-    }
-
-    @Test
-    public void fill(){
-        List<BusClinicEntity> clinicList = clinicService.list(new QueryWrapper<BusClinicEntity>().lambda().eq(BusClinicEntity::getMonitorType, true));
-        Map<String, List<BusClinicEntity>> groupByHospital = clinicList.stream().collect(Collectors.groupingBy(BusClinicEntity::getTenantId));
-        groupByHospital.forEach((tenantId,list)->{
-            Map< String, List<BusClinicEntity>> groupByPatientCode = list.stream().collect(Collectors.groupingBy(BusClinicEntity::getPatientCode));
-            groupByPatientCode.forEach((k,targets)->{
-                List<BusClinicEntity> source = new ArrayList<>();
-                for (BusClinicEntity target : targets) {
-                    BusClinicEntity clinic = new BusClinicEntity();
-                    clinic.setStartTime(target.getStartTime()==null?
-                            RandomUtil.randomDate(DateUtil.beginOfMonth(new Date()), DateField.HOUR,-30,30):target.getStartTime());
-                    clinic.setSurgeryName(clinicNames.get(RandomUtil.randomInt(clinicNames.size()-1)));
-                    clinic.setPatientName(getName());
-                    clinic.setPatientGender(EnumUtil.likeValueOf(SexEnum.class,RandomUtil.randomInt(1,2)));
-                    clinic.setBedNo(target.getBedNo());
-                    clinic.setWard(target.getWard());
-                    clinic.setWeight(String.valueOf(RandomUtil.randomInt(90,150)));
-                    clinic.setWeight(String.valueOf(RandomUtil.randomInt(150,200)));
-                    clinic.setAnaDoctor(getName());
-                    clinic.setAnaType(anaTypes.get(RandomUtil.randomInt(anaTypes.size()-1)));
-                    clinic.setAnalType(analTypes.get(RandomUtil.randomInt(analTypes.size()-1)));
-                    clinic.setSurgeryDoctor(getName());
-                    clinic.setConfigPerson(getName());
-                    clinic.setPatientCode(target.getPatientCode());
-                    clinic.setMonitorType(true);
-                    clinic.setTenantId("1");
-                    source.add(clinic);
-                }
-                equalsStrategyHandler.handle(source,targets);
-            });
-
-        });
-
-    }
-    public void fillPatientCode(){
-        List<BusPatientEntity> list = patientService.list();
-    }
-
-    @Test
-    public void manualSave(){
-        for (int i = 0; i < 30; i++) {
-            ClinicEditVo clinicEditVo = new ClinicEditVo();
-            BusClinicEntity clinic = new BusClinicEntity();
-            clinic.setStartTime(new Date());
-            clinic.setSurgeryName(clinicNames.get(RandomUtil.randomInt(clinicNames.size()-1)));
-            clinic.setPatientAge(RandomUtil.randomInt(15,50));
-            clinic.setPatientName(getName());
-            clinic.setPatientGender(EnumUtil.likeValueOf(SexEnum.class,RandomUtil.randomInt(1,2)));
-            clinic.setBedNo(String.valueOf(RandomUtil.randomInt(10,100)));
-            clinic.setWard(String.valueOf(RandomUtil.randomInt(10,100)));
-            clinic.setWeight(String.valueOf(RandomUtil.randomInt(90,150)));
-            clinic.setWeight(String.valueOf(RandomUtil.randomInt(150,200)));
-            clinic.setAnaDoctor(getName());
-            clinic.setAnaType(anaTypes.get(RandomUtil.randomInt(anaTypes.size()-1)));
-            clinic.setAnalType(analTypes.get(RandomUtil.randomInt(analTypes.size()-1)));
-            clinic.setSurgeryDoctor(getName());
-            clinic.setConfigPerson(getName());
-            clinic.setPatientCode(String.valueOf(RandomUtil.randomInt(100000,300000)));
-            clinic.setTenantId("1");
-
-            clinicEditVo.setClinic(clinic);
-
-            BusDeviceManualEntity manual = new BusDeviceManualEntity();
-            manual.setType(DeviceManualEnum.machine);
-            manual.setTotalDose(RandomUtil.randomInt(100));
-            manual.setContinueDose(RandomUtil.randomBigDecimal(BigDecimal.valueOf(10)));
-            manual.setSelfControlDose(RandomUtil.randomBigDecimal(BigDecimal.valueOf(10)));
-            manual.setSelfControlLockTime(RandomUtil.randomInt(100));
-            clinicEditVo.setManual(manual);
-//            manualController.save(clinicEditVo);
-
-//        patientService.save(patient);
-//        clinicService.save(clinic);
-        }
-    }
-
-    @Test
-    public void updateClinicPatientId(){
-        List<BusClinicEntity> list = clinicService.list();
-        for (BusClinicEntity clinicEntity : list) {
-            BusPatientEntity patientEntity = patientService.getOne(new QueryWrapper<BusPatientEntity>()
-                    .lambda().eq(BusPatientEntity::getCode, clinicEntity.getPatientCode())
-                    .eq(BusPatientEntity::getTenantId, clinicEntity.getTenantId()));
-            if(patientEntity==null){
-                continue;
-            }
-            clinicEntity.setPatientId(patientEntity.getId());
-        }
-        clinicService.updateBatchById(list);
-    }
-
-    @Test
-    public void updateInfusionPatientId(){
-        List<BusInfusionHistoryEntity> list = infusionHistoryService.list();
-        for (BusInfusionHistoryEntity infusionHistoryEntity : list) {
-            BusPatientEntity patientEntity = patientService.getOne(new QueryWrapper<BusPatientEntity>()
-                    .lambda().eq(BusPatientEntity::getCode, infusionHistoryEntity.getPatientCode())
-                    .eq(BusPatientEntity::getTenantId, infusionHistoryEntity.getTenantId()));
-            if(patientEntity==null){
-                continue;
-            }
-            infusionHistoryEntity.setPatientId(patientEntity.getId());
-        }
-        infusionHistoryService.updateBatchById(list);
-    }
-
-    public static void main(String[] args) {
-        System.out.println(getName());
-    }
-
-    public static String getName(){
-        Random random=new Random(System.currentTimeMillis());
-        /* 598 百家姓 */
-        String[] Surname= {"赵","钱","孙","李","周","吴","郑","王","冯","陈","褚","卫","蒋","沈","韩","杨","朱","秦","尤","许",
-                "何","吕","施","张","孔","曹","严","华","金","魏","陶","姜","戚","谢","邹","喻","柏","水","窦","章","云","苏","潘","葛","奚","范","彭","郎",
-                "鲁","韦","昌","马","苗","凤","花","方","俞","任","袁","柳","酆","鲍","史","唐","费","廉","岑","薛","雷","贺","倪","汤","滕","殷",
-                "罗","毕","郝","邬","安","常","乐","于","时","傅","皮","卞","齐","康","伍","余","元","卜","顾","孟","平","黄","和",
-                "穆","萧","尹","姚","邵","湛","汪","祁","毛","禹","狄","米","贝","明","臧","计","伏","成","戴","谈","宋","茅","庞","熊","纪","舒",
-                "屈","项","祝","董","梁","杜","阮","蓝","闵","席","季","麻","强","贾","路","娄","危","江","童","颜","郭","梅","盛","林","刁","钟",
-                "徐","邱","骆","高","夏","蔡","田","樊","胡","凌","霍","虞","万","支","柯","昝","管","卢","莫","经","房","裘","缪","干","解","应",
-                "宗","丁","宣","贲","邓","郁","单","杭","洪","包","诸","左","石","崔","吉","钮","龚","程","嵇","邢","滑","裴","陆","荣","翁","荀",
-                "羊","于","惠","甄","曲","家","封","芮","羿","储","靳","汲","邴","糜","松","井","段","富","巫","乌","焦","巴","弓","牧","隗","山",
-                "谷","车","侯","宓","蓬","全","郗","班","仰","秋","仲","伊","宫","宁","仇","栾","暴","甘","钭","厉","戎","祖","武","符","刘","景",
-                "詹","束","龙","叶","幸","司","韶","郜","黎","蓟","溥","印","宿","白","怀","蒲","邰","从","鄂","索","咸","籍","赖","卓","蔺","屠",
-                "蒙","池","乔","阴","郁","胥","能","苍","双","闻","莘","党","翟","谭","贡","劳","逄","姬","申","扶","堵","冉","宰","郦","雍","却",
-                "璩","桑","桂","濮","牛","寿","通","边","扈","燕","冀","浦","尚","农","温","别","庄","晏","柴","瞿","阎","充","慕","连","茹","习",
-                "宦","艾","鱼","容","向","古","易","慎","戈","廖","庾","终","暨","居","衡","步","都","耿","满","弘","匡","国","文","寇","广","禄",
-                "阙","东","欧","殳","沃","利","蔚","越","夔","隆","师","巩","厍","聂","晁","勾","敖","融","冷","訾","辛","阚","那","简","饶","空",
-                "曾","毋","沙","乜","养","鞠","须","丰","巢","关","蒯","相","查","后","荆","红","游","郏","竺","权","逯","盖","益","桓","公","仉",
-                "督","岳","帅","缑","亢","况","郈","有","琴","归","海","晋","楚","闫","法","汝","鄢","涂","钦","商","牟","佘","佴","伯","赏","墨",
-                "哈","谯","篁","年","爱","阳","佟","言","福","南","火","铁","迟","漆","官","冼","真","展","繁","檀","祭","密","敬","揭","舜","楼",
-                "疏","冒","浑","挚","胶","随","高","皋","原","种","练","弥","仓","眭","蹇","覃","阿","门","恽","来","綦","召","仪","风","介","巨",
-                "木","京","狐","郇","虎","枚","抗","达","杞","苌","折","麦","庆","过","竹","端","鲜","皇","亓","老","是","秘","畅","邝","还","宾",
-                "闾","辜","纵","侴","万俟","司马","上官","欧阳","夏侯","诸葛","闻人","东方","赫连","皇甫","羊舌","尉迟","公羊","澹台","公冶","宗正",
-                "濮阳","淳于","单于","太叔","申屠","公孙","仲孙","轩辕","令狐","钟离","宇文","长孙","慕容","鲜于","闾丘","司徒","司空","兀官","司寇",
-                "南门","呼延","子车","颛孙","端木","巫马","公西","漆雕","车正","壤驷","公良","拓跋","夹谷","宰父","谷梁","段干","百里","东郭","微生",
-                "梁丘","左丘","东门","西门","南宫","第五","公仪","公乘","太史","仲长","叔孙","屈突","尔朱","东乡","相里","胡母","司城","张廖","雍门",
-                "毋丘","贺兰","綦毋","屋庐","独孤","南郭","北宫","王孙"};
-
-        int index=random.nextInt(Surname.length-1);
-        String name = Surname[index]; //获得一个随机的姓氏
-
-        /* 从常用字中选取一个或两个字作为名 */
-        if(random.nextBoolean()){
-            name+=getChinese()+getChinese();
-        }else {
-            name+=getChinese();
-        }
-        return name;
-    }
-
-    public static String getChinese() {
-        String str = null;
-        int highPos, lowPos;
-        Random random = new Random();
-        highPos = (176 + Math.abs(random.nextInt(71)));//区码，0xA0打头，从第16区开始，即0xB0=11*16=176,16~55一级汉字，56~87二级汉字
-        random = new Random();
-        lowPos = 161 + Math.abs(random.nextInt(94));//位码，0xA0打头，范围第1~94列
-
-        byte[] bArr = new byte[2];
-        bArr[0] = (new Integer(highPos)).byteValue();
-        bArr[1] = (new Integer(lowPos)).byteValue();
-        try {
-            str = new String(bArr, "GB2312");    //区位码组合成汉字
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return str;
-    }
-}

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

@@ -1,38 +0,0 @@
-package com.coffee.admin;
-
-import cn.hutool.core.io.FileUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.coffee.bus.entity.BusDeviceEntity;
-import com.coffee.bus.entity.BusDeviceRunningEntity;
-import com.coffee.bus.entity.BusInfusionHistoryEntity;
-import com.coffee.bus.listener.event.bean.DeviceInfoEvent;
-import com.coffee.bus.service.LocalBusDeviceService;
-import com.coffee.bus.service.LocalBusInfusionHistoryService;
-import com.coffee.common.util.MinioUtil;
-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.context.ApplicationContext;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
-
-/**
- * @Author longsanlang
- * @Date 2022-04-06 17:55:44
- * @Version 1.0
- * @Description XXX
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = AdminApplication.class)
-public class FileUploadTest {
-    @Autowired
-    MinioUtil minioUtil;
-
-    @Test
-    public void upload(){
-        String s = minioUtil.uploadObject(FileUtil.getInputStream(FileUtil.file("C:\\Users\\JR\\Desktop\\新疆患者数据.xls")), "/docker-compose.yml");
-        System.out.println(s);
-    }
-}

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

@@ -1,118 +0,0 @@
-package com.coffee.admin;
-
-import cn.hutool.core.date.DateField;
-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.coffee.bus.entity.BusClinicEntity;
-import com.coffee.bus.hospital.his.strategy.HisStrategyEnum;
-import com.coffee.bus.hospital.his.strategy.HisStrategyHandler;
-import com.coffee.bus.hospital.his.strategy.HisStrategyManager;
-import com.coffee.bus.hospital.his.strategy.HisStrategyManagerRegister;
-import com.coffee.bus.service.LocalBusClinicService;
-import com.coffee.common.enums.SexEnum;
-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;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import static com.coffee.admin.BusPatientTest.getName;
-
-/**
- * @Author XX
- * @Date 2022-04-25 19:00:10
- * @Version 1.0
- * @Description XXX
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = AdminApplication.class)
-public class HisStrategyTest {
-
-    @Autowired
-    HisStrategyManagerRegister managerRegister;
-
-    @Autowired
-    LocalBusClinicService clinicService;
-
-    String patientCode="120263";
-    String tenantId="1";
-    @Test
-    public void allEquals(){
-        HisStrategyManager<? extends HisStrategyHandler> hisStrategyManager = managerRegister.get(HisStrategyEnum.ALL);
-
-    }
-
-
-    @Test
-    public void allMoreToLess(){
-        HisStrategyManager<? extends HisStrategyHandler> hisStrategyManager = managerRegister.get(HisStrategyEnum.ALL);
-        List<BusClinicEntity> sources = new ArrayList<>();
-        List<BusClinicEntity> targets = clinicService.list(new QueryWrapper<BusClinicEntity>().lambda().eq(BusClinicEntity::getPatientCode, patientCode).eq(BusClinicEntity::getTenantId, tenantId));
-        for (BusClinicEntity target : targets) {
-            BusClinicEntity clinic = new BusClinicEntity();
-            clinic.setStartTime(target.getStartTime()==null?
-                    RandomUtil.randomDate(DateUtil.beginOfMonth(new Date()), DateField.HOUR,-30,30):DateUtil.date(target.getStartTime()).offset(DateField.HOUR_OF_DAY,-1));
-            clinic.setSurgeryName(BusPatientTest.clinicNames.get(RandomUtil.randomInt(BusPatientTest.clinicNames.size()-1)));
-            clinic.setPatientName(getName());
-            clinic.setPatientGender(EnumUtil.likeValueOf(SexEnum.class,RandomUtil.randomInt(1,2)));
-            clinic.setBedNo(target.getBedNo());
-            clinic.setWard(target.getWard());
-            clinic.setWeight(String.valueOf(RandomUtil.randomInt(90,150)));
-            clinic.setWeight(String.valueOf(RandomUtil.randomInt(150,200)));
-            clinic.setAnaDoctor(getName());
-            clinic.setAnaType(BusPatientTest.anaTypes.get(RandomUtil.randomInt(BusPatientTest.anaTypes.size()-1)));
-            clinic.setAnalType(BusPatientTest.analTypes.get(RandomUtil.randomInt(BusPatientTest.analTypes.size()-1)));
-            clinic.setSurgeryDoctor(getName());
-            clinic.setConfigPerson(getName());
-            clinic.setPatientCode(target.getPatientCode());
-            clinic.setMonitorType(true);
-            clinic.setTenantId("1");
-            sources.add(clinic);
-        }
-        BusClinicEntity clinic = new BusClinicEntity();
-        clinic.setStartTime(DateUtil.beginOfDay(new Date()));
-        clinic.setSurgeryName(BusPatientTest.clinicNames.get(RandomUtil.randomInt(BusPatientTest.clinicNames.size()-1)));
-        clinic.setPatientName(getName());
-        clinic.setPatientGender(EnumUtil.likeValueOf(SexEnum.class,RandomUtil.randomInt(1,2)));
-        clinic.setBedNo("10");
-        clinic.setWard("10");
-        clinic.setWeight(String.valueOf(RandomUtil.randomInt(90,150)));
-        clinic.setWeight(String.valueOf(RandomUtil.randomInt(150,200)));
-        clinic.setAnaDoctor(getName());
-        clinic.setAnaType(BusPatientTest.anaTypes.get(RandomUtil.randomInt(BusPatientTest.anaTypes.size()-1)));
-        clinic.setAnalType(BusPatientTest.analTypes.get(RandomUtil.randomInt(BusPatientTest.analTypes.size()-1)));
-        clinic.setSurgeryDoctor(getName());
-        clinic.setConfigPerson(getName());
-        clinic.setPatientCode(patientCode);
-        clinic.setMonitorType(true);
-        clinic.setTenantId("1");
-        sources.add(clinic);
-        hisStrategyManager.getHandlers()
-                .stream()
-                .filter(handler-> handler.apply(sources,targets))
-                .forEach(handler->handler.handle(sources,targets));
-    }
-
-
-    @Test
-    public void allLessToMore(){
-        HisStrategyManager<? extends HisStrategyHandler> hisStrategyManager = managerRegister.get(HisStrategyEnum.ALL);
-
-    }
-    @Test
-    public void onlyNew(){
-        HisStrategyManager<? extends HisStrategyHandler> hisStrategyManager = managerRegister.get(HisStrategyEnum.NEW);
-
-    }
-
-    @Test
-    public void part(){
-        HisStrategyManager<? extends HisStrategyHandler> hisStrategyManager = managerRegister.get(HisStrategyEnum.PART);
-    }
-}

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

@@ -1,23 +0,0 @@
-package com.coffee.admin;
-
-import org.junit.Assert;
-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 SpringBootApplicationTests.java
- * @Description TODO
- * @createTime 2022年03月17日 13:50:00
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = AdminApplication.class)
-public class SpringBootApplicationTests {
-
-
-
-}

nb-codegen/src/main/java/com/coffee/codegen/CodeGenerator.java → nb-codegen/src/main/java/com/nb/codegen/CodeGenerator.java

@@ -1,4 +1,4 @@
-package com.coffee.codegen;
+package com.nb.codegen;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.DateType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.baomidou.mybatisplus.generator.engine.VelocityTemplateEngine;
-import com.coffee.common.util.IdUtil;
+import com.nb.common.util.IdUtil;
 import com.google.common.collect.Maps;
 
 import java.util.*;
@@ -22,7 +22,7 @@ import java.util.*;
 @SuppressWarnings("ALL")
 public class CodeGenerator {
 
-    public static final String JDBC_URL = "jdbc:mysql://localhost:3306/coffee-dev?characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai";
+    public static final String JDBC_URL = "jdbc:mysql://localhost:3306/nb-dev?characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai";
     public static final String JDBC_USERNAME = "root";
     public static final String JDBC_PASSWORD = "123456";
     public static final String JDBC_DRIVER = "com.mysql.cj.jdbc.Driver";
@@ -30,7 +30,7 @@ public class CodeGenerator {
     /** 按照个人需要，进行修改 */
     public static final String AUTHOR = "Kevin";
     public static final String PROJECT_PATH = "D:\\tempCode";
-    public static final String PACKAGE_PARENT = "com.coffee";
+    public static final String PACKAGE_PARENT = "com.nb";
     public static final String MODULE_NAME = "system";
 
     /** 生成SQL脚本的上级菜单的ID，要开发的功能，需要放到XXX菜单下面，请找到XXX菜单的ID */

nb-codegen/src/main/resources/templates/controller.java.vm

@@ -1,7 +1,6 @@
 package ${package.Controller};
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.coffee.common.annotation.Log;
+import com.nb.common.annotation.Log;
 import ${package.Controller.replace(".${package.ModuleName}.controller", "")}.common.result.R;
 import ${package.Controller.replace(".${package.ModuleName}.controller", "")}.common.utils.ExcelUtils;
 import ${package.Controller.replace(".controller", "")}.common.dto.${table.entityName}AddDTO;

nb-common/src/main/java/com/coffee/common/enums/LinkExternalEnum.java

@@ -1,28 +0,0 @@
-package com.coffee.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-
-/**
- * 是否外链
- *
- * @author Kevin
- */
-@Getter
-@AllArgsConstructor
-public enum LinkExternalEnum {
-
-    /**
-     * 是
-     */
-    YES("0", "是"),
-    /**
-     * 否
-     */
-    NO("1", "否");
-
-    private String code;
-    private String desc;
-
-}

nb-common/src/main/java/com/coffee/common/Constants.java → nb-common/src/main/java/com/nb/common/Constants.java

@@ -1,6 +1,6 @@
-package com.coffee.common;
+package com.nb.common;
 
-import com.coffee.common.config.AppConfig;
+import com.nb.common.config.AppConfig;
 
 /**
  * 常量类

nb-common/src/main/java/com/coffee/common/MenuConstants.java → nb-common/src/main/java/com/nb/common/MenuConstants.java

@@ -1,4 +1,4 @@
-package com.coffee.common;
+package com.nb.common;
 
 /**
  * 菜单常量类

nb-common/src/main/java/com/coffee/common/annotation/DataScope.java → nb-common/src/main/java/com/nb/common/annotation/DataScope.java

@@ -1,4 +1,4 @@
-package com.coffee.common.annotation;
+package com.nb.common.annotation;
 
 import java.lang.annotation.*;
 

nb-common/src/main/java/com/coffee/common/annotation/DataSource.java → nb-common/src/main/java/com/nb/common/annotation/DataSource.java

@@ -1,6 +1,6 @@
-package com.coffee.common.annotation;
+package com.nb.common.annotation;
 
-import com.coffee.common.enums.DataSourceTypeEnum;
+import com.nb.common.enums.DataSourceTypeEnum;
 
 import java.lang.annotation.*;
 

nb-common/src/main/java/com/coffee/common/annotation/ExcelDict.java → nb-common/src/main/java/com/nb/common/annotation/ExcelDict.java

@@ -1,4 +1,4 @@
-package com.coffee.common.annotation;
+package com.nb.common.annotation;
 
 import java.lang.annotation.*;
 

nb-common/src/main/java/com/coffee/common/annotation/IgnoreToken.java → nb-common/src/main/java/com/nb/common/annotation/IgnoreToken.java

@@ -1,4 +1,4 @@
-package com.coffee.common.annotation;
+package com.nb.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

nb-common/src/main/java/com/coffee/common/annotation/Log.java → nb-common/src/main/java/com/nb/common/annotation/Log.java

@@ -1,6 +1,6 @@
-package com.coffee.common.annotation;
+package com.nb.common.annotation;
 
-import com.coffee.common.enums.UserPlatformEnum;
+import com.nb.common.enums.UserPlatformEnum;
 
 import java.lang.annotation.*;
 

nb-common/src/main/java/com/coffee/common/bo/DictModel.java → nb-common/src/main/java/com/nb/common/bo/DictModel.java

@@ -1,4 +1,4 @@
-package com.coffee.common.bo;
+package com.nb.common.bo;
 
 import lombok.Data;
 

nb-common/src/main/java/com/coffee/common/bo/LoginUser.java → nb-common/src/main/java/com/nb/common/bo/LoginUser.java

@@ -1,7 +1,6 @@
-package com.coffee.common.bo;
+package com.nb.common.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;

nb-common/src/main/java/com/coffee/common/bo/SysRoleBO.java → nb-common/src/main/java/com/nb/common/bo/SysRoleBO.java

@@ -1,4 +1,4 @@
-package com.coffee.common.bo;
+package com.nb.common.bo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

nb-common/src/main/java/com/coffee/common/bo/SysUserBO.java → nb-common/src/main/java/com/nb/common/bo/SysUserBO.java

@@ -1,4 +1,4 @@
-package com.coffee.common.bo;
+package com.nb.common.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

nb-common/src/main/java/com/coffee/common/cache/CacheConfig.java → nb-common/src/main/java/com/nb/common/cache/CacheConfig.java

@@ -1,4 +1,4 @@
-package com.coffee.common.cache;
+package com.nb.common.cache;
 
 import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Bean;

nb-common/src/main/java/com/coffee/common/cache/ClusterConfigStorage.java → nb-common/src/main/java/com/nb/common/cache/ClusterConfigStorage.java

@@ -1,8 +1,8 @@
-package com.coffee.common.cache;
+package com.nb.common.cache;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.IEnum;
-import com.coffee.common.cache.value.Value;
+import com.nb.common.cache.value.Value;
 import org.springframework.data.redis.core.BoundHashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.util.CollectionUtils;

nb-common/src/main/java/com/coffee/common/cache/ConfigStorage.java → nb-common/src/main/java/com/nb/common/cache/ConfigStorage.java

@@ -1,9 +1,8 @@
-package com.coffee.common.cache;
+package com.nb.common.cache;
 
 
-import com.coffee.common.cache.value.Value;
+import com.nb.common.cache.value.Value;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
 

nb-common/src/main/java/com/coffee/common/cache/manager/ClusterConfigStorageManager.java → nb-common/src/main/java/com/nb/common/cache/manager/ClusterConfigStorageManager.java

@@ -1,7 +1,7 @@
-package com.coffee.common.cache.manager;
+package com.nb.common.cache.manager;
 
-import com.coffee.common.cache.ClusterConfigStorage;
-import com.coffee.common.cache.ConfigStorage;
+import com.nb.common.cache.ClusterConfigStorage;
+import com.nb.common.cache.ConfigStorage;
 import org.redisson.api.RedissonClient;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;

nb-common/src/main/java/com/coffee/common/cache/manager/ConfigStorageManager.java → nb-common/src/main/java/com/nb/common/cache/manager/ConfigStorageManager.java

@@ -1,6 +1,6 @@
-package com.coffee.common.cache.manager;
+package com.nb.common.cache.manager;
 
-import com.coffee.common.cache.ConfigStorage;
+import com.nb.common.cache.ConfigStorage;
 
 /** 
  * @Author lifang

nb-common/src/main/java/com/coffee/common/cache/message/ClusterCache.java → nb-common/src/main/java/com/nb/common/cache/message/ClusterCache.java

@@ -1,6 +1,5 @@
-package com.coffee.common.cache.message;
+package com.nb.common.cache.message;
 
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.Collection;

nb-common/src/main/java/com/coffee/common/cache/message/RedisClusterCache.java → nb-common/src/main/java/com/nb/common/cache/message/RedisClusterCache.java

@@ -1,4 +1,4 @@
-package com.coffee.common.cache.message;
+package com.nb.common.cache.message;
 
 import org.springframework.data.redis.core.Cursor;
 import org.springframework.data.redis.core.HashOperations;

nb-common/src/main/java/com/coffee/common/cache/value/SimpleValue.java → nb-common/src/main/java/com/nb/common/cache/value/SimpleValue.java

@@ -1,4 +1,4 @@
-package com.coffee.common.cache.value;
+package com.nb.common.cache.value;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;

nb-common/src/main/java/com/coffee/common/cache/value/Value.java → nb-common/src/main/java/com/nb/common/cache/value/Value.java

@@ -1,4 +1,4 @@
-package com.coffee.common.cache.value;
+package com.nb.common.cache.value;
 
 import cn.hutool.core.util.ObjectUtil;
 

nb-common/src/main/java/com/coffee/common/config/AppConfig.java → nb-common/src/main/java/com/nb/common/config/AppConfig.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config;
+package com.nb.common.config;
 
 import lombok.Getter;
 import org.springframework.boot.context.properties.ConfigurationProperties;

nb-common/src/main/java/com/coffee/common/config/BooleanToIntegerSerializer.java → nb-common/src/main/java/com/nb/common/config/BooleanToIntegerSerializer.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config;
+package com.nb.common.config;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;

nb-common/src/main/java/com/coffee/common/config/CacheHttpServletRequestWrapper.java → nb-common/src/main/java/com/nb/common/config/CacheHttpServletRequestWrapper.java

@@ -1,7 +1,5 @@
-package com.coffee.common.config;
+package com.nb.common.config;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ReflectUtil;
 import org.springframework.util.StreamUtils;
 
 import javax.servlet.ReadListener;

nb-common/src/main/java/com/coffee/common/config/CachingContentFilter.java → nb-common/src/main/java/com/nb/common/config/CachingContentFilter.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config;
+package com.nb.common.config;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import lombok.extern.slf4j.Slf4j;

nb-common/src/main/java/com/coffee/common/config/CorsConfig.java → nb-common/src/main/java/com/nb/common/config/CorsConfig.java

@@ -1,6 +1,5 @@
-package com.coffee.common.config;
+package com.nb.common.config;
 
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

nb-common/src/main/java/com/coffee/common/config/MinioConfig.java → nb-common/src/main/java/com/nb/common/config/MinioConfig.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config;
+package com.nb.common.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

nb-common/src/main/java/com/coffee/common/config/mybatis/DateToBigIntHandler.java → nb-common/src/main/java/com/nb/common/config/mybatis/DateToBigIntHandler.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config.mybatis;
+package com.nb.common.config.mybatis;
 
 import org.apache.ibatis.type.*;
 

nb-common/src/main/java/com/coffee/common/config/mybatis/GetNameInterface.java → nb-common/src/main/java/com/nb/common/config/mybatis/GetNameInterface.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config.mybatis;
+package com.nb.common.config.mybatis;
 
 /**
  * @author lifang

nb-common/src/main/java/com/coffee/common/config/mybatis/TenantNameHandler.java → nb-common/src/main/java/com/nb/common/config/mybatis/TenantNameHandler.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config.mybatis;
+package com.nb.common.config.mybatis;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.extra.spring.SpringUtil;

nb-common/src/main/java/com/coffee/common/config/websocket/DefaultMessageListener.java → nb-common/src/main/java/com/nb/common/config/websocket/DefaultMessageListener.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config.websocket;
+package com.nb.common.config.websocket;
 
 import cn.hutool.json.JSONUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -7,8 +7,6 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RPatternTopic;
 import org.redisson.api.listener.PatternMessageListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.tio.core.ChannelContext;
 import org.tio.core.Tio;
 import org.tio.core.utils.TioUtils;

nb-common/src/main/java/com/coffee/common/config/websocket/DefaultRedisCallBack.java → nb-common/src/main/java/com/nb/common/config/websocket/DefaultRedisCallBack.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config.websocket;
+package com.nb.common.config.websocket;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.redis.connection.RedisConnection;

nb-common/src/main/java/com/coffee/common/config/websocket/HospitalCodeCheck.java → nb-common/src/main/java/com/nb/common/config/websocket/HospitalCodeCheck.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config.websocket;
+package com.nb.common.config.websocket;
 
 /**
  * @author lifang

nb-common/src/main/java/com/coffee/common/config/websocket/MessageResponse.java → nb-common/src/main/java/com/nb/common/config/websocket/MessageResponse.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config.websocket;
+package com.nb.common.config.websocket;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

nb-common/src/main/java/com/coffee/common/config/websocket/MessagingRequest.java → nb-common/src/main/java/com/nb/common/config/websocket/MessagingRequest.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config.websocket;
+package com.nb.common.config.websocket;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;

nb-common/src/main/java/com/coffee/common/config/websocket/TopicMessage.java → nb-common/src/main/java/com/nb/common/config/websocket/TopicMessage.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config.websocket;
+package com.nb.common.config.websocket;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

nb-common/src/main/java/com/coffee/common/config/websocket/WebSocketConstant.java → nb-common/src/main/java/com/nb/common/config/websocket/WebSocketConstant.java

@@ -1,7 +1,7 @@
-package com.coffee.common.config.websocket;
+package com.nb.common.config.websocket;
 
 import cn.hutool.core.util.StrUtil;
-import com.coffee.common.config.websocket.handler.TopicWrapper;
+import com.nb.common.config.websocket.handler.TopicWrapper;
 
 /**
  * @author lifang

nb-common/src/main/java/com/coffee/common/config/websocket/handler/Subscribe.java → nb-common/src/main/java/com/nb/common/config/websocket/handler/Subscribe.java

@@ -1,14 +1,14 @@
-package com.coffee.common.config.websocket.handler;
+package com.nb.common.config.websocket.handler;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
-import com.coffee.common.Constants;
-import com.coffee.common.bo.LoginUser;
-import com.coffee.common.config.websocket.DefaultMessageListener;
-import com.coffee.common.config.websocket.MessagingRequest;
-import com.coffee.common.config.websocket.TopicMessage;
-import com.coffee.common.config.websocket.WebSocketConstant;
-import com.coffee.common.util.RedissonUtil;
+import com.nb.common.Constants;
+import com.nb.common.bo.LoginUser;
+import com.nb.common.config.websocket.DefaultMessageListener;
+import com.nb.common.config.websocket.MessagingRequest;
+import com.nb.common.config.websocket.TopicMessage;
+import com.nb.common.config.websocket.WebSocketConstant;
+import com.nb.common.util.RedissonUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RPatternTopic;

nb-common/src/main/java/com/coffee/common/config/websocket/handler/TopicWrapper.java → nb-common/src/main/java/com/nb/common/config/websocket/handler/TopicWrapper.java

@@ -1,4 +1,4 @@
-package com.coffee.common.config.websocket.handler;
+package com.nb.common.config.websocket.handler;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

nb-common/src/main/java/com/coffee/common/config/websocket/handler/WsHandler.java → nb-common/src/main/java/com/nb/common/config/websocket/handler/WsHandler.java

@@ -1,6 +1,6 @@
-package com.coffee.common.config.websocket.handler;
+package com.nb.common.config.websocket.handler;
 
-import com.coffee.common.config.websocket.MessagingRequest;
+import com.nb.common.config.websocket.MessagingRequest;
 import org.tio.core.ChannelContext;
 
 /**

nb-common/src/main/java/com/coffee/common/convert/ExcelDictConverter.java → nb-common/src/main/java/com/nb/common/convert/ExcelDictConverter.java

@@ -1,4 +1,4 @@
-package com.coffee.common.convert;
+package com.nb.common.convert;
 
 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.util.StrUtil;
@@ -8,8 +8,8 @@ import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.data.ReadCellData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
-import com.coffee.common.annotation.ExcelDict;
-import com.coffee.common.util.DictUtil;
+import com.nb.common.annotation.ExcelDict;
+import com.nb.common.util.DictUtil;
 
 import java.lang.reflect.Field;
 

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

@@ -1,4 +1,4 @@
-package com.coffee.common.crud;
+package com.nb.common.crud;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -19,10 +19,10 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.coffee.common.bo.LoginUser;
-import com.coffee.common.entity.QueryParamEntity;
-import com.coffee.common.entity.param.Term;
-import com.coffee.common.exception.CustomException;
+import com.nb.common.bo.LoginUser;
+import com.nb.common.entity.QueryParamEntity;
+import com.nb.common.entity.param.Term;
+import com.nb.common.exception.CustomException;
 import org.apache.ibatis.binding.MapperMethod;
 import org.springframework.jdbc.BadSqlGrammarException;
 import org.springframework.transaction.annotation.Transactional;
@@ -274,7 +274,7 @@ public abstract class BaseService<M extends BaseMapper<E>, E,PK extends Serializ
             queryWrapper.orderByDesc("create_time");
         }
         if(CharSequenceUtil.isNotEmpty(param.getTenantId())&&!CharSequenceUtil.isNullOrUndefined(param.getTenantId())){
-            LoginUser loginUser = (LoginUser) StpUtil.getTokenSession().get(com.coffee.common.Constants.LOGIN_USER_KEY);
+            LoginUser loginUser = (LoginUser) StpUtil.getTokenSession().get(com.nb.common.Constants.LOGIN_USER_KEY);
             //是否为系统用户
             if(loginUser!=null&&Boolean.TRUE.equals(loginUser.getIsSys())){
                 queryWrapper.eq("tenant_id",param.getTenantId());

nb-common/src/main/java/com/coffee/common/crud/controller/BaseCrudController.java → nb-common/src/main/java/com/nb/common/crud/controller/BaseCrudController.java

@@ -1,4 +1,4 @@
-package com.coffee.common.crud.controller;
+package com.nb.common.crud.controller;
 
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.stp.StpLogic;

nb-common/src/main/java/com/coffee/common/crud/controller/BaseCurdAuthController.java → nb-common/src/main/java/com/nb/common/crud/controller/BaseCurdAuthController.java

@@ -1,4 +1,4 @@
-package com.coffee.common.crud.controller;
+package com.nb.common.crud.controller;
 
 import cn.dev33.satoken.stp.StpLogic;
 import cn.hutool.core.text.CharSequenceUtil;

nb-common/src/main/java/com/coffee/common/crud/controller/BaseDeleteController.java → nb-common/src/main/java/com/nb/common/crud/controller/BaseDeleteController.java

@@ -1,10 +1,10 @@
-package com.coffee.common.crud.controller;
+package com.nb.common.crud.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
-import com.coffee.common.crud.BaseService;
-import com.coffee.common.result.R;
+import com.nb.common.crud.BaseService;
+import com.nb.common.result.R;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;

nb-common/src/main/java/com/coffee/common/crud/controller/BaseQueryController.java → nb-common/src/main/java/com/nb/common/crud/controller/BaseQueryController.java

@@ -1,12 +1,12 @@
-package com.coffee.common.crud.controller;
+package com.nb.common.crud.controller;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.coffee.common.crud.BaseService;
-import com.coffee.common.entity.QueryParamEntity;
-import com.coffee.common.result.R;
+import com.nb.common.crud.BaseService;
+import com.nb.common.entity.QueryParamEntity;
+import com.nb.common.result.R;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;

nb-common/src/main/java/com/coffee/common/crud/controller/BaseSaveController.java → nb-common/src/main/java/com/nb/common/crud/controller/BaseSaveController.java

@@ -1,10 +1,10 @@
-package com.coffee.common.crud.controller;
+package com.nb.common.crud.controller;
 
 import com.baomidou.mybatisplus.core.mapper.Mapper;
-import com.coffee.common.crud.BaseService;
-import com.coffee.common.entity.GenericEntity;
-import com.coffee.common.entity.TenantGenericEntity;
-import com.coffee.common.result.R;
+import com.nb.common.crud.BaseService;
+import com.nb.common.entity.GenericEntity;
+import com.nb.common.entity.TenantGenericEntity;
+import com.nb.common.result.R;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.validation.annotation.Validated;

nb-common/src/main/java/com/coffee/common/dto/LoginDTO.java → nb-common/src/main/java/com/nb/common/dto/LoginDTO.java

@@ -1,4 +1,4 @@
-package com.coffee.common.dto;
+package com.nb.common.dto;
 
 import lombok.Data;
 

nb-common/src/main/java/com/coffee/common/entity/AbstractMsgId.java → nb-common/src/main/java/com/nb/common/entity/AbstractMsgId.java

@@ -1,4 +1,4 @@
-package com.coffee.common.entity;
+package com.nb.common.entity;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import lombok.Data;

nb-common/src/main/java/com/coffee/common/entity/Entity.java → nb-common/src/main/java/com/nb/common/entity/Entity.java

@@ -1,4 +1,4 @@
-package com.coffee.common.entity;
+package com.nb.common.entity;
 
 import cn.hutool.core.bean.BeanUtil;
 

nb-common/src/main/java/com/coffee/common/entity/GenericEntity.java → nb-common/src/main/java/com/nb/common/entity/GenericEntity.java

@@ -1,16 +1,13 @@
-package com.coffee.common.entity;
+package com.nb.common.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.validation.annotation.Validated;
 
 
 import javax.validation.constraints.NotNull;

nb-common/src/main/java/com/coffee/common/entity/GenericTreeEntity.java → nb-common/src/main/java/com/nb/common/entity/GenericTreeEntity.java

@@ -1,4 +1,4 @@
-package com.coffee.common.entity;
+package com.nb.common.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;

nb-common/src/main/java/com/coffee/common/entity/QueryParamEntity.java → nb-common/src/main/java/com/nb/common/entity/QueryParamEntity.java

@@ -1,8 +1,8 @@
-package com.coffee.common.entity;
+package com.nb.common.entity;
 
 import cn.hutool.db.sql.Order;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.coffee.common.entity.param.Term;
+import com.nb.common.entity.param.Term;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

nb-common/src/main/java/com/coffee/common/entity/RecordCreationEntity.java → nb-common/src/main/java/com/nb/common/entity/RecordCreationEntity.java

@@ -1,4 +1,4 @@
-package com.coffee.common.entity;
+package com.nb.common.entity;
 
 import java.util.Date;
 

nb-common/src/main/java/com/coffee/common/entity/RecordModifierEntity.java → nb-common/src/main/java/com/nb/common/entity/RecordModifierEntity.java

@@ -1,4 +1,4 @@
-package com.coffee.common.entity;
+package com.nb.common.entity;
 
 import java.util.Date;
 

nb-common/src/main/java/com/coffee/common/entity/TenantGenericEntity.java → nb-common/src/main/java/com/nb/common/entity/TenantGenericEntity.java

@@ -1,4 +1,4 @@
-package com.coffee.common.entity;
+package com.nb.common.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

nb-common/src/main/java/com/coffee/common/entity/param/Term.java → nb-common/src/main/java/com/nb/common/entity/param/Term.java

@@ -1,4 +1,4 @@
-package com.coffee.common.entity.param;
+package com.nb.common.entity.param;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

nb-common/src/main/java/com/coffee/common/entity/param/TermType.java → nb-common/src/main/java/com/nb/common/entity/param/TermType.java

@@ -1,4 +1,4 @@
-package com.coffee.common.entity.param;
+package com.nb.common.entity.param;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import java.util.*;

nb-common/src/main/java/com/coffee/common/enums/BizEnum.java → nb-common/src/main/java/com/nb/common/enums/BizEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/DataScopeEnum.java → nb-common/src/main/java/com/nb/common/enums/DataScopeEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/DataSourceTypeEnum.java → nb-common/src/main/java/com/nb/common/enums/DataSourceTypeEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 /**
  * 数据源

nb-common/src/main/java/com/coffee/common/enums/DelFlagEnum.java → nb-common/src/main/java/com/nb/common/enums/DelFlagEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/FileStorageStrategyEnum.java → nb-common/src/main/java/com/nb/common/enums/FileStorageStrategyEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 /**
  * 文件存储策略

nb-common/src/main/java/com/coffee/common/enums/FrameEnum.java → nb-common/src/main/java/com/nb/common/enums/FrameEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/GrantTypeEnum.java → nb-common/src/main/java/com/nb/common/enums/GrantTypeEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/KeepaliveEnum.java → nb-common/src/main/java/com/nb/common/enums/KeepaliveEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/LockFlagEnum.java → nb-common/src/main/java/com/nb/common/enums/LockFlagEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/LogStatusEnum.java → nb-common/src/main/java/com/nb/common/enums/LogStatusEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/MenuTypeEnum.java → nb-common/src/main/java/com/nb/common/enums/MenuTypeEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/PeriodEnum.java → nb-common/src/main/java/com/nb/common/enums/PeriodEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/PswModifiedEnum.java → nb-common/src/main/java/com/nb/common/enums/PswModifiedEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/SexEnum.java → nb-common/src/main/java/com/nb/common/enums/SexEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;

nb-common/src/main/java/com/coffee/common/enums/StatusEnum.java → nb-common/src/main/java/com/nb/common/enums/StatusEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/UniqueEnum.java → nb-common/src/main/java/com/nb/common/enums/UniqueEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/UserPlatformEnum.java → nb-common/src/main/java/com/nb/common/enums/UserPlatformEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/VisibleEnum.java → nb-common/src/main/java/com/nb/common/enums/VisibleEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/enums/YesNoEnum.java → nb-common/src/main/java/com/nb/common/enums/YesNoEnum.java

@@ -1,4 +1,4 @@
-package com.coffee.common.enums;
+package com.nb.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nb-common/src/main/java/com/coffee/common/exception/CaptchaException.java → nb-common/src/main/java/com/nb/common/exception/CaptchaException.java

@@ -1,4 +1,4 @@
-package com.coffee.common.exception;
+package com.nb.common.exception;
 
 import lombok.Data;