Merge remote-tracking branch 'origin/dev' into dev

coffee-system/src/main/java/com/coffee/bus/service/LocalBusEvaluationService.java

@@ -1,38 +0,0 @@
-package com.coffee.bus.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.coffee.bus.entity.BusEvaluationEntity;
-import com.coffee.bus.mapper.BusEvaluationMapper;
-import com.coffee.bus.service.dto.EvalQuery;
-import com.coffee.common.crud.BaseService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author lifang
- * @version 1.0.0
- * @ClassName LocalBusHospitalService.java
- * @Description TODO
- * @createTime 2022年03月19日 09:27:00
- */
-@Service
-public class LocalBusEvaluationService extends BaseService<BusEvaluationMapper, BusEvaluationEntity,String> {
-
-    public IPage<BusEvaluationEntity> pageQuery(EvalQuery query) {
-        return this.baseMapper.pageQuery(query.getPage(),query);
-    }
-
-    @Override
-    public void validateBeforeSave(BusEvaluationEntity entity) {
-
-    }
-
-    @Override
-    public void validateBeforeUpdate(BusEvaluationEntity entity) {
-
-    }
-
-    @Override
-    public void validateBeforeDelete(String id) {
-
-    }
-}

coffee-system/src/main/java/com/coffee/bus/service/constant/LocalBusConAlarmService.java

@@ -1,36 +0,0 @@
-package com.coffee.bus.service.constant;
-
-import com.coffee.bus.entity.BusConAlarmEntity;
-import com.coffee.bus.enums.ConstantEnum;
-import com.coffee.bus.mapper.BusConAlarmMapper;
-import org.springframework.stereotype.Service;
-
-/**
- * @author lifang
- * @version 1.0.0
- * @ClassName LocalBusConDoctorService.java
- * @Description TODO
- * @createTime 2022年03月19日 09:27:00
- */
-@Service
-public class LocalBusConAlarmService extends AbstractConstantService<BusConAlarmMapper, BusConAlarmEntity,String>{
-    @Override
-    public void validateBeforeSave(BusConAlarmEntity entity) {
-
-    }
-
-    @Override
-    public void validateBeforeUpdate(BusConAlarmEntity entity) {
-
-    }
-
-    @Override
-    public void validateBeforeDelete(String id) {
-
-    }
-
-    @Override
-    public ConstantEnum getName() {
-        return ConstantEnum.alarm;
-    }
-}

coffee-admin/pom.xml → nb-admin/pom.xml

@@ -3,24 +3,24 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>coffee-boot</artifactId>
-        <groupId>com.coffee</groupId>
+        <artifactId>nb-root</artifactId>
+        <groupId>com.tuoren</groupId>
         <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>coffee-admin</artifactId>
+    <artifactId>nb-admin</artifactId>
 
     <dependencies>
         <!-- 核心模块 -->
         <dependency>
-            <groupId>com.coffee</groupId>
-            <artifactId>coffee-framework</artifactId>
+            <groupId>com.tuoren</groupId>
+            <artifactId>nb-framework</artifactId>
         </dependency>
         <!-- OSS文件存储模块 -->
         <dependency>
-            <groupId>com.coffee</groupId>
-            <artifactId>coffee-oss</artifactId>
+            <groupId>com.tuoren</groupId>
+            <artifactId>nb-oss</artifactId>
         </dependency>
 
         <dependency>

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

@@ -8,6 +8,7 @@ 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 lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
@@ -70,19 +71,19 @@ public class CommonController {
 
     @PostMapping("/upload")
     @SneakyThrows
-    public R upload(MultipartFile file, HttpServletRequest request) {
-        String bizPath = request.getParameter("bizPath");
+    public R<SysStorage> upload(@RequestParam("file") MultipartFile file, @RequestParam("file") String bizPath) {
         if (StrUtil.isBlank(bizPath)) {
-            throw new CustomException(ResultCode.PARAM_MISS.getMessage());
+            throw new CustomException(ResultCode.PARAM_TYPE_ERROR.getMessage());
         }
         if (Objects.isNull(file)) {
-            throw new CustomException(ResultCode.PARAM_MISS.getMessage());
+            throw new CustomException(ResultCode.PARAM_TYPE_ERROR.getMessage());
         }
         FileStorageStrategy fileStorageStrategy = fileStorageContext.getContext();
-        String url = fileStorageStrategy.upload(file, bizPath);
-        return R.success(url);
+        SysStorage storage = fileStorageStrategy.upload(file, bizPath);
+        return R.success(storage);
     }
 
+
     @GetMapping("/download")
     @SneakyThrows
     public void download(@RequestParam String filepath, HttpServletResponse response) {

coffee-admin/src/main/resources/application-dev.yml → nb-admin/src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 app:
   # 项目名称
-  name: coffee
+  name: nbnetpump
   # 实例演示开关
   demoEnabled: false
   # 获取ip地址开关
@@ -15,9 +15,9 @@ app:
 
 # MinIO相关配置
 minio:
-  endpoint: http://127.0.0.1:9000
-  accessKey: minioadmin
-  secretKey: minioadmin
+  endpoint: http://192.168.100.32:7001
+  accessKey: nbnetpump
+  secretKey: tuoren123
   bucketName: ${app.name}-${profiles.active}-bucket
 
 # 数据源配置

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

@@ -0,0 +1,38 @@
+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);
+    }
+}

coffee-codegen/pom.xml → nb-codegen/pom.xml

@@ -3,13 +3,13 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>coffee-boot</artifactId>
-        <groupId>com.coffee</groupId>
+        <artifactId>nb-root</artifactId>
+        <groupId>com.tuoren</groupId>
         <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>coffee-codegen</artifactId>
+    <artifactId>nb-codegen</artifactId>
 
     <dependencies>
         <dependency>
@@ -29,8 +29,8 @@
             <artifactId>velocity-engine-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.coffee</groupId>
-            <artifactId>coffee-common</artifactId>
+            <groupId>com.tuoren</groupId>
+            <artifactId>nb-common</artifactId>
         </dependency>
     </dependencies>
 

coffee-common/pom.xml → nb-common/pom.xml

@@ -3,13 +3,13 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>coffee-boot</artifactId>
-        <groupId>com.coffee</groupId>
+        <artifactId>nb-root</artifactId>
+        <groupId>com.tuoren</groupId>
         <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>coffee-common</artifactId>
+    <artifactId>nb-common</artifactId>
 
     <dependencies>
         <dependency>

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

@@ -12,7 +12,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  * @Description TODO
  * @createTime 2022年03月23日 14:49:00
  */
-@Configuration
+//@Configuration
 @Profile("dev")
 public class CorsConfig implements WebMvcConfigurer {
     @Override

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

@@ -103,8 +103,8 @@ public abstract class Subscribe implements WsHandler {
             return;
         }
         Set<String> allTopics=new HashSet<>();
-        allTopics.add(topic);
-        if("all".equalsIgnoreCase(topic)){
+
+        if(topic.startsWith("all")){
             allTopics.addAll(getChannelTopic(channelContext));
         }