智慧保安后台管理-外网-验收版本
tangzy
2021-08-27 733edfcd6ad1c38dcf4aa761a417f4e4bfd754b2
1.许可审批
5 files modified
110 ■■■■ changed files
src/main/java/org/springblade/modules/information/controller/InformationController.java 27 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java 55 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/talk/controller/TalkController.java 26 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/talk/entity/Talk.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/talk/mapper/TalkMapper.xml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -315,31 +315,4 @@
    }
    public static void main(String[] args) {
//        File file = new File("D:\\anbao");
//        if (file.exists()) {
//            File[] files = file.listFiles();
//            if (null == files || files.length == 0) {
//                System.out.println("文件夹是空的!");
//                return;
//            } else {
//                for (File file2 : files) {
//                    if (file2.isDirectory()) {
//                        System.out.println("文件夹:" + file2.getAbsolutePath());
//                    } else {
//                        System.out.println("文件:" + file2.getAbsolutePath());
//                        String urls = file2.getAbsolutePath();
//                        String s = OutJson.TestJsons(urls);
//                        //sql语句
//                        String sql = OutJson.stringReplace(s);
//                        System.out.println(sql);
//                    }
//                }
//            }
//        } else {
//            System.out.println("文件不存在!");
//        }
    }
}
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -49,6 +49,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.security.InvalidKeyException;
@@ -58,6 +60,8 @@
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import static org.springblade.common.constant.FtpConstant.*;
/**
 * 对象存储端点
@@ -267,6 +271,57 @@
        return R.data(map);
    }
    /**
     *
     * 文件上传,自定义上传
     * @param file 图片对象
     */
    @PostMapping("put-files-talk")
    public R putFilestak(@RequestParam MultipartFile file) throws IOException, ServerException, InsufficientDataException, InternalException, InvalidResponseException, InvalidKeyException, NoSuchAlgorithmException, XmlParserException, ErrorResponseException {
        //填写你文件上传的地址以及相应信息
        String url = "http://223.82.109.183:2081";
        String access = "zhbaadmin";
        String secret = "zhbapassword";
        String bucket = "zhba";
        MinioClient minioClient =
            MinioClient.builder()
                .endpoint(url)
                .credentials(access, secret)
                .build();
        // 检查存储桶是否已经存在
        boolean isExist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucket).build());
        if (!isExist) {
            // 创建一个名为zip的存储桶,用于zip文件。
            minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
            minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
        }
        String fileName = file.getOriginalFilename();
        String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")
            + fileName.substring(fileName.lastIndexOf("."));
        InputStream in = file.getInputStream();
        String[] split = newName.split("/");
        //创建头部信息
        Map<String, String> headers = new HashMap<>(1 << 2);
        //添加自定义内容类型
        headers.put("Content-Type", "application/octet-stream");
        //上传
        minioClient.putObject(
            PutObjectArgs.builder().bucket(bucket).object(newName).stream(
                in, in.available(), -1)
                .headers(headers)
                .build());
        FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], in);
        in.close();
        String urls = "http://223.82.109.183:2081/zhba/" + newName;
        //数据封装
        Map<String, Object> map = new HashMap<>(2);
        map.put("name",newName);
        map.put("url",urls);
        //返回
        return R.data(map);
    }
    /**
     * 上传文件
     *
src/main/java/org/springblade/modules/talk/controller/TalkController.java
@@ -21,12 +21,14 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.information.entity.Information;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,10 +38,11 @@
import org.springblade.core.boot.ctrl.BladeController;
import springfox.documentation.annotations.ApiIgnore;
import java.text.SimpleDateFormat;
import java.util.Map;
/**
 *  控制器
 * 控制器
 *
 * @author BladeX
 * @since 2021-08-10
@@ -92,7 +95,26 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入talk")
    public R save(@Valid @RequestBody Talk talk) {
        return R.status(talkService.save(talk));
        talkService.save(talk);
        String[] split = talk.getImgurl().split(",");
        for (int i=0;i<split.length;i++){
            String s = split[i].substring(0,split[i].indexOf("/"));
            System.out.println(s);
        }
//        //数据同步
//        String s1 =
//            "insert into sys_talk(id,title,real_name,talkcontent,talktime,conclusion,evaluate,deptid,imgurl) " +
//                "values(" + "'" + talk.getId() + "'" + "," +
//                "'" + talk.getTitle() + "'" + "," +
//                "'" + talk.getRealName() + "'" + "," +
//                "'" + talk.getTalkcontent() + "'" + "," +
//                "'" + new SimpleDateFormat("yyyy-MM-dd").format(talk.getTalktime()) + "'" + "," +
//                "'" + talk.getConclusion() + "'" + "," +
//                "'" + talk.getEvaluate() + "'" + "," +
//                "'" + talk.getDeptid() + "'" + "," +
//                "'" + talk.getImgurl() + "'" + ")";
//        FtpUtil.sqlFileUpload(s1);
        return R.success("新增成功");
    }
    /**
src/main/java/org/springblade/modules/talk/entity/Talk.java
@@ -78,6 +78,7 @@
        @ApiModelProperty(value = "评价")
        private String evaluate;
        private String deptid;
        private String imgurl;
}
src/main/java/org/springblade/modules/talk/mapper/TalkMapper.xml
@@ -12,6 +12,7 @@
        <result column="conclusion" property="conclusion"/>
        <result column="evaluate" property="evaluate"/>
        <result column="deptid" property="deptid"/>
        <result column="imgurl" property="imgurl"/>
    </resultMap>