minio图片上传和获取token和数据传输代码开发

hazard-sdk/pom.xml

@@ -9,91 +9,24 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-    <version>1.0</version>
     <artifactId>hazard-sdk</artifactId>
 
     <dependencies>
 
-        <!-- spring-boot-devtools -->
+        <!-- SpringBoot Web容器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional> <!-- 表示依赖不会传递 -->
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
-        <!-- swagger3-->
-        <!--        <dependency>-->
-        <!--            <groupId>io.springfox</groupId>-->
-        <!--            <artifactId>springfox-boot-starter</artifactId>-->
-        <!--        </dependency>-->
-
-        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-
         <!-- Mysql驱动包 -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-
-        <!-- 核心模块-->
-        <dependency>
-            <groupId>com.ozs</groupId>
-            <artifactId>base-framework</artifactId>
-        </dependency>
-
-        <!-- 定时任务-->
-        <dependency>
-            <groupId>com.ozs</groupId>
-            <artifactId>base-quartz</artifactId>
-        </dependency>
-
-        <!-- 代码生成-->
-        <dependency>
-            <groupId>com.ozs</groupId>
-            <artifactId>base-generator</artifactId>
-        </dependency>
-
         <!-- 业务代码-->
         <dependency>
             <groupId>com.ozs</groupId>
             <artifactId>business-service</artifactId>
         </dependency>
-
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.1.1.RELEASE</version>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-    </build>
 </project>

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -1,15 +1,15 @@
 package com.ozs.controller.upload;
 
-import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.Result;
+import com.ozs.common.utils.ApiTokenUtils;
 import com.ozs.common.utils.StringUtils;
-import com.ozs.framework.web.service.TokenService;
-import com.ozs.system.domain.vo.ReqMsgAlarmVo;
-import com.ozs.system.domain.vo.RespGeoHazardMonitorVo;
-import com.ozs.system.domain.vo.RespMsgAlarmVo;
+import com.ozs.vo.ReqMsgAlarmVo;
+import com.ozs.vo.RespGeoHazardMonitorVo;
+import com.ozs.vo.RespMsgAlarmVo;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 public class GeoHazardMonitorTokenController {
 
     @Resource
-    private TokenService tokenService;
+    private ApiTokenUtils apiTokenUtils;
 
     /**
      * 获取访问令牌
@@ -36,18 +36,23 @@ public class GeoHazardMonitorTokenController {
      * @return
      */
     @PostMapping("/IPAddress/token")
-    public Result login(@RequestParam("grantType") String grantType, @RequestParam("clientId") String clientId, @RequestParam("clientSecret") String clientSecret) {
+    @ResponseBody
+    public Result login(@RequestParam("grantType") String grantType,
+                        @RequestParam("clientId") String clientId,
+                        @RequestParam("clientSecret") String clientSecret) {
         // 生成令牌
-        ArrayList<String> objects = tokenService.createGeoHazardMonitorToken();
-        if (objects.size() > 0) {
-            RespGeoHazardMonitorVo respGeoHazardMonitorVo = new RespGeoHazardMonitorVo();
-            respGeoHazardMonitorVo.setAccessToken(objects.get(1));
-            respGeoHazardMonitorVo.setExpiresIn(Long.valueOf(objects.get(0)));
-            respGeoHazardMonitorVo.setTokenType("令牌类型");
-            return new Result(1, "成功", respGeoHazardMonitorVo);
-        } else {
-            return new Result(2, "失败", "生成token失败！！");
-        }
+//        ArrayList<String> objects = apiTokenUtils.createGeoHazardMonitorToken();
+//        if (objects.size() > 0) {
+//            RespGeoHazardMonitorVo respGeoHazardMonitorVo = new RespGeoHazardMonitorVo();
+//            respGeoHazardMonitorVo.setAccessToken(objects.get(1));
+//            respGeoHazardMonitorVo.setExpiresIn(Long.valueOf(objects.get(0)));
+//            respGeoHazardMonitorVo.setTokenType("令牌类型");
+//            return new Result(1, "成功", respGeoHazardMonitorVo);
+//        } else {
+//            return new Result(2, "失败", "生成token失败！！");
+//        }
+        int i=1;
+        return Result.success();
     }
 
     /**
@@ -59,7 +64,7 @@ public class GeoHazardMonitorTokenController {
     @PostMapping("/IPAddress/alarm")
     public Result login(@RequestBody ReqMsgAlarmVo reqMsgAlarmVo, HttpServletRequest request) {
         // 生成令牌
-        String token = tokenService.getGeoHazardMonitorToken(request);
+        String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         if (StringUtils.isNotEmpty(token)) {
             RespMsgAlarmVo respMsgAlarmVo = new RespMsgAlarmVo();
             respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());

hazard-sdk/src/main/java/com/ozs/controller/upload/UploadController.java

@@ -18,35 +18,35 @@ import java.util.Date;
 @RequestMapping("/system/upLoad")
 public class UploadController {
 
-    @Value("${minio.bucketName}")
-    private String bucketName;
-
-    @Resource
-    MinioUtils minioUtils;
-
-
-    @PostMapping("/upLoadImage")
-    public AjaxResult upLoadImage(@RequestParam("file") MultipartFile image) throws Exception {
-        if (image.isEmpty()) {
-            return AjaxResult.error("不能上传空文件哦");
-        }
-        //图片保存路径
-        //String fileUploadPath ="/"+userId+"/image";
-        String uploadFile=null;
-        if (image != null && !image.isEmpty()) {
-
-            String imageName = image.getOriginalFilename();
-            if (StringUtils.isNotBlank(imageName)) {
-                String date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
-                String filename = date + image.getOriginalFilename().substring(image.getOriginalFilename().lastIndexOf("."));
-                String imgName = "img" + "/" + filename;
-                minioUtils.minIoClientUpload(image.getInputStream(), imgName);
-                uploadFile =  "/" + bucketName + "/" + imgName;
-
-            }
-        } else {
-            return AjaxResult.error("上传功能出错");
-        }
-        return AjaxResult.success(uploadFile);
-    }
+//    @Value("${minio.bucketName}")
+//    private String bucketName;
+//
+//    @Resource
+//    MinioUtils minioUtils;
+//
+//
+//    @PostMapping("/upLoadImage")
+//    public AjaxResult upLoadImage(@RequestParam("file") MultipartFile image) throws Exception {
+//        if (image.isEmpty()) {
+//            return AjaxResult.error("不能上传空文件哦");
+//        }
+//        //图片保存路径
+//        //String fileUploadPath ="/"+userId+"/image";
+//        String uploadFile=null;
+//        if (image != null && !image.isEmpty()) {
+//
+//            String imageName = image.getOriginalFilename();
+//            if (StringUtils.isNotBlank(imageName)) {
+//                String date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+//                String filename = date + image.getOriginalFilename().substring(image.getOriginalFilename().lastIndexOf("."));
+//                String imgName = "img" + "/" + filename;
+//                minioUtils.minIoClientUpload(image.getInputStream(), imgName);
+//                uploadFile =  "/" + bucketName + "/" + imgName;
+//
+//            }
+//        } else {
+//            return AjaxResult.error("上传功能出错");
+//        }
+//        return AjaxResult.success(uploadFile);
+//    }
 }

hazard-sdk/src/main/java/com/ozs/vo/ReqMsgAlarmVo.java

@@ -0,0 +1,53 @@
+package com.ozs.vo;
+
+import com.ozs.common.core.domain.entity.SysDept;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * 报警信息请求参数
+ */
+@Data
+public class ReqMsgAlarmVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private Long alarmId;
+
+    /** 报警时间 */
+    private String alarmTime;
+
+    /** 相机编码 */
+    private Long alarmCamera;
+
+    /** 报警里程位置 */
+    private String alarmMile;
+
+    /** 报警内容 */
+    private String content;
+
+    /** 报警置信度（百分比） */
+    private String alarmConfidence;
+
+    /** 报警行别 */
+    private Integer lineDir;
+
+    /** 报警病害类型（目前只有1泥石流，后续可扩展使用） */
+    private Integer alarmType;
+
+    /** 报警病害属性（可以给出泥石流的框定范围） */
+    private String alarmArrr;
+
+    private String files;
+
+    /** 报警图片地址 */
+    private String imageUrl;
+
+    /** 报警是否解除 1已解除2未解除 */
+    private Integer isLock;
+}

hazard-sdk/src/main/java/com/ozs/vo/RespGeoHazardMonitorVo.java

@@ -0,0 +1,27 @@
+package com.ozs.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 地址灾害获取token返回参数
+ * @author Administrator
+ */
+@Data
+public class RespGeoHazardMonitorVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 访问令牌
+     */
+    private String accessToken;
+    /**
+     * 过期时间，单位秒
+     */
+    private Long expiresIn;
+    /**
+     * 令牌类型
+     */
+    private String  tokenType;
+}

hazard-sdk/src/main/java/com/ozs/vo/RespMsgAlarmVo.java

@@ -0,0 +1,27 @@
+package com.ozs.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * 报警信息请求参数
+ */
+@Data
+public class RespMsgAlarmVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private Long alarmId;
+
+    /** 报警解除时间 */
+    private String cancelTime;
+
+    /** 相机编码 */
+    private Long alarmCamera;
+    
+    /** 报警是否解除 1已解除2未解除 */
+    private Integer isCancel;
+}

hazard-sdk/src/main/resources/application-druid.yml

@@ -1,57 +1,7 @@
 # 数据源配置
 spring:
     datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://124.70.58.209:1122/hazard?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: admin
-                password: 106aD>>ql95K5S
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url:
-                username:
-                password:
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter:
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: ruoyi
-                login-password: 123456
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true
+        url: jdbc:mysql://124.70.58.209:1122/hazard?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: admin
+        password: 106aD>>ql95K5S