1.许可审批

tangzy

2021-08-27 ffdb63951da8b66bb6a5a06369dc3fe75a6df133

1.许可审批

 src/main/java/org/springblade/modules/information/controller/InformationController.java

@@ -186,11 +186,10 @@
        String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(information.getEstablishtime());
        //Integer id = information.getId();
        String s = "insert into sys_information(id,creditcode,enterprisename,representative,establishtime," +
            "registeredcapital,organizationcode,registrationnumber,identificationnumber, enterprises, address," +
            "registeredcapital,organizationcode,registrationnumber, enterprises, address," +
            " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell,contacts,contactscell) " +
            "values(" + "'" + information.getId() + "'" + "," + "'" + information.getCreditcode() + "'" + "," + "'" + information.getEnterprisename() + "'" + "," + "'" + information.getRepresentative() + "'" + "," +
            "'" + formatStr + "'" + "," + "'" + information.getRegisteredcapital() + "'" + "," + "'" + information.getOrganizationcode() + "'" + "," + "'" + information.getRegistrationnumber() + "'" + "," +
            "'" + information.getIdentificationnumber() + "'" + "," + "'" + information.getEnterprises() + "'" + "," + "'" +
            "'" + formatStr + "'" + "," + "'" + information.getRegisteredcapital() + "'" + "," + "'" + information.getOrganizationcode() + "'" + "," + "'" + information.getRegistrationnumber() + "'" + "," + "'" + information.getEnterprises() + "'" + "," + "'" +
            information.getAddress() + "'" + "," + "'" + information.getBusiness() + "'" + "," + "'" +
            information.getRegion() + "'" + "," + "'" + information.getRegistration() + "'" + "," + "'" + information.getIndustry() + "'" + "," + "'" + information.getDepartmentid() + "'" + "," +
            "'" + information.getStats() + "'" + "," + "'" + information.getJurisdiction() + "'" + "," + "'" + information.getRepresentativecell() + "'" + "," +

 src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java

@@ -180,8 +180,8 @@


    /**
     *
     * app 文件上传
     *
     * @param file 图片对象
     */
    @PostMapping("put-file-app")
@@ -224,8 +224,8 @@


    /**
     *
     * 文件上传,自定义上传
     *
     * @param file 图片对象
     */
    @PostMapping("put-files")
@@ -265,16 +265,16 @@
        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);
        map.put("name", newName);
        map.put("url", urls);
        //返回
        return R.data(map);
    }


    /**
     *
     * 文件上传,自定义上传
     *
     * @param file 图片对象
     */
    @PostMapping("put-files-talk")
@@ -316,8 +316,8 @@
        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);
        map.put("name", newName);
        map.put("url", urls);
        //返回
        return R.data(map);
    }
@@ -344,10 +344,11 @@
     */
    @SneakyThrows
    @PostMapping("/put-file-attach")
    public R<BladeFile> putFileAttach(@RequestParam MultipartFile file,String deptid,String type,Long noticeId,String cardid) {
    public R<BladeFile> putFileAttach(@RequestParam MultipartFile file, String deptid, String type, Long noticeId, String cardid) {
        String fileName = file.getOriginalFilename();
        BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
        Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type,noticeId,cardid);
        InputStream inputStream = file.getInputStream();
        Long attachId = buildAttach(fileName, file.getSize(), bladeFile, deptid, type, noticeId, cardid, inputStream);
        bladeFile.setAttachId(attachId);
        return R.data(bladeFile);
    }
@@ -361,9 +362,9 @@
     */
    @SneakyThrows
    @PostMapping("/put-file-attach-by-name")
    public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file,String deptid,String type,Long noticeId,String cardid) {
    public R<BladeFile> putFileAttach(@RequestParam String fileName, @RequestParam MultipartFile file, String deptid, String type, Long noticeId, String cardid) {
        BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
        Long attachId = buildAttach(fileName, file.getSize(), bladeFile,deptid,type,noticeId,cardid);
        Long attachId = buildAttach(fileName, file.getSize(), bladeFile, deptid, type, noticeId, cardid, file.getInputStream());
        bladeFile.setAttachId(attachId);
        return R.data(bladeFile);
    }
@@ -376,7 +377,7 @@
     * @param bladeFile 对象存储文件
     * @return attachId
     */
    private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile,String deptid,String type,Long noticeId,String cardid) throws Exception {
    private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile, String deptid, String type, Long noticeId, String cardid, InputStream in) throws Exception {
        //BladeUser user = AuthUtil.getUser();
        String fileExtension = FileUtil.getFileExtension(fileName);
        Attach attach = new Attach();
@@ -389,32 +390,46 @@
        attach.setDeptid(deptid);
        attach.setCardid(cardid);
        attach.setType(type);
        if (null!=noticeId){
        if (null != noticeId) {
            attach.setNoticeId(noticeId);
        }
        attachService.save(attach);
        String[] split = bladeFile.getName().split("/");
        String ip = "http://192.168.0.108/zhba/picture/";
        String imgurl = ip + split[2];
        FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], in);
        //数据同步
        String s1 =
            "insert into blade_attach(id,tenant_id,link,domain,name,original_name,extension,attach_size,create_user,create_dept," +
                "create_time,update_user,update_time,status,is_deleted,deptid,type,notice_id,cardid) " +
                "create_time,update_user,update_time,status,is_deleted,type,cardid";
        if (noticeId != null) {
            s1 += ",notice_id";
        } else {
            s1 += ") " +
                "values(" + "'" + attach.getId() + "'" + "," +
                "'" + attach.getTenantId() + "'" + "," +
                "'" + attach.getLink() + "'" + "," +
                "'" + attach.getDomain() + "'" + "," +
                "'" + attach.getName() + "'" + "," +
                "'" + imgurl + "'" + "," +
                "'" + ip + "'" + "," +
                "'" + split[2] + "'" + "," +
                "'" + attach.getOriginalName() + "'" + "," +
                "'" + attach.getExtension() + "'" + "," +
                "'" + attach.getAttachSize() + "'" + "," +
                "'" + attach.getCreateUser() + "'" + "," +
                "'" + attach.getCreateDept() + "'" + "," +
                "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())  + "'" + "," +
                "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +
                "'" + attach.getUpdateUser() + "'" + "," +
                "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())  + "'" + "," +
                "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +
                "'" + attach.getStatus() + "'" + "," +
                "'" + attach.getIsDeleted() + "'" + "," +
                "'" + attach.getType() + "'" + "," +
                "'" + attach.getNoticeId() + "'" + "," +
                "'" +attach.getCardid() + "'" + ")";
                "'" + cardid + "'";
        }
        if (noticeId != null) {
            s1 += "'" + noticeId + "'" + ")";
        }
        else {
            s1+=")";
        }
        FtpUtil.sqlFileUpload(s1);
        return attach.getId();
    }

 src/main/java/org/springblade/modules/talk/controller/TalkController.java

@@ -39,6 +39,7 @@
import springfox.documentation.annotations.ApiIgnore;

import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Map;

/**
@@ -96,24 +97,28 @@
    @ApiOperation(value = "新增", notes = "传入talk")
    public R save(@Valid @RequestBody Talk talk) {
        talkService.save(talk);
        String ip = "http://192.168.0.108";
        String url = "";
        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);
        for (int i = 0; i < split.length; i++) {
            String s = split[i].substring(26, split[i].length());
            url += ip + 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);
        String substring = url.substring(0, url.length() - 1);
        talk.setImgurl(substring);
        //数据同步
        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("新增成功");
    }

@@ -124,7 +129,27 @@
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入talk")
    public R update(@Valid @RequestBody Talk talk) {
        return R.status(talkService.updateById(talk));
        talkService.updateById(talk);
        String ip = "http://192.168.0.108";
        String url = "";
        String[] split = talk.getImgurl().split(",");
        for (int i = 0; i < split.length; i++) {
            String s = split[i].substring(26, split[i].length());
            url += ip + s + ",";
        }
        String substring = url.substring(0, url.length() - 1);
        talk.setImgurl(substring);
        String s1 = "update sys_talk set title = " + "'" + talk.getTitle() + "'" +
            ",real_name = " + "'" + talk.getRealName() + "'" +
            ",talkcontent = " + "'" + talk.getTalkcontent() + "'" +
            ",talktime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(talk.getTalktime()) + "'" +
            ",conclusion = " + "'" + talk.getConclusion() + "'" +
            ",evaluate = " + "'" + talk.getEvaluate() + "'" +
            ",deptid = " + "'" + talk.getDeptid() + "'" +
            ",imgurl = " + "'" + talk.getImgurl() + "'" +
            " " + "where id = " + "'" + talk.getId() + "'";
        FtpUtil.sqlFileUpload(s1);
        return R.success("修改成功");
    }

    /**
@@ -145,6 +170,13 @@
    @ApiOperationSupport(order = 8)
    @ApiOperation(value = "删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        //内网删除
        List<Long> list = Func.toLongList(ids);
        list.forEach(id -> {
            //内网同步
            String s1 = "delete from sys_talk where id = " + "'" + id + "'";
            FtpUtil.sqlFileUpload(s1);
        });
        return R.status(talkService.removeByIds(Func.toLongList(ids)));
    }