tangzy
2021-09-01 be923adca382374294dfb44fce92c9c15f7413f1
1.检查
4 files modified
58 ■■■■■ changed files
src/main/java/org/springblade/modules/FTP/monitor.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/coinspect/controller/CoinspectController.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/directive/controller/DirectiveController.java 50 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/seinspect/controller/SeinspectController.java 4 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/FTP/monitor.java
@@ -151,7 +151,7 @@
        } catch (Exception e) {
            System.out.println("ftp连接失败");
            e.printStackTrace();
        } finally {
src/main/java/org/springblade/modules/coinspect/controller/CoinspectController.java
@@ -94,6 +94,7 @@
    public R save(@Valid @RequestBody Coinspect coinspect) throws Exception {
        coinspectService.save(coinspect);
        String url = "";
        if (coinspect.getUrl()!=null && !"".equals(coinspect.getUrl())){
        String[] split = coinspect.getUrl().split(",");
        for (int i = 0; i < split.length; i++) {
            String s = split[i].substring(26, split[i].length());
@@ -101,6 +102,7 @@
        }
        String substring = url.substring(0, url.length() - 1);
        coinspect.setUrl(substring);
        }
        //数据同步
        String s1 =
            "insert into sys_coinspect(id,name,sName,deptName,reviewTime,insid,results,url) " +
src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.constant.FtpConstant;
import org.springblade.common.utils.arg;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -33,6 +34,7 @@
    /**
     * 自定义分页
     *
     * @param query page,size
     * @param directive 指令信息对象
     */
@@ -44,6 +46,7 @@
    /**
     * 新增
     *
     * @param directive 指令信息对象
     */
    @PostMapping("/save")
@@ -55,6 +58,7 @@
    /**
     * 指令信息新增,同时新增图片到指令文件表中
     *
     * @param directive 指令信息对象
     */
    @PostMapping("/saveDirectiveAndFile")
@@ -63,16 +67,35 @@
        boolean status = false;
        directive.setSendTime(new Date());
        status = directiveService.save(directive);
        //数据同步
        String s1 =
            "insert into sys_directive(id,type,send_directive_id,receive_directive_ids,send_time,content) " +
                "values(" + "'" + directive.getId() + "'" + "," +
                "'" + directive.getType() + "'" + "," +
                "'" + directive.getSendDirectiveId() + "'" + "," +
                "'" + directive.getReceiveDirectiveIds() + "'" + "," +
                "'" + directive.getSendTime() + "'" + "," +
                "'" + directive.getContent() + "'" + ")";
        FtpUtil.sqlFileUpload(s1);
        if (status){
            //新增图片
            if (null!=directive.getUrl() && directive.getUrl()!=""){
                String[] directiveUrl = directive.getUrl().split(",");
                for (String url : directiveUrl) {
                    String s = url.substring(26, url.length());
                    String urls = FtpConstant.ip + s;
                    DirectiveFile directiveFile = new DirectiveFile();
                    directiveFile.setType(1);
                    directiveFile.setDirectiveId(directive.getId());
                    directiveFile.setUrl(url);
                    directiveFile.setUrl(urls);
                    status = directiveService.saveDirectiveFile(directiveFile);
                    String s2 =
                        "insert into sys_directive_file(id,type,directive_id,url) " +
                            "values(" + "'" + directiveFile.getId() + "'" + "," +
                            "'" + directiveFile.getType() + "'" + "," +
                            "'" + directiveFile.getDirectiveId() + "'" + "," +
                            "'" + urls+ "'"+ ")";
                    FtpUtil.sqlFileUpload(s2);
                    if (!status){
                        return R.status(false);
                    }
@@ -87,15 +110,22 @@
    /**
     * 指令信息修改,同时新增图片到指令文件表中
     *
     * @param directive 指令信息对象
     */
    @PostMapping("/updateDirectiveAndFile")
    public R updateDirectiveAndFile(@RequestBody DirectiveVo directive) throws Exception {
        //新增指令信息
        boolean update = directiveService.updateById(directive);
        //内网同步
        String s1 = "update sys_directive set type = " + "'" + directive.getType() + "'" +
            ",send_directive_id = " + "'" + directive.getSendDirectiveId() + "'" +
            ",receive_directive_ids = " + "'" + directive.getReceiveDirectiveIds() + "'" +
            ",send_time = " + "'" + directive.getSendTime() + "'" +
            ",content = " + "'" + directive.getContent() + "'" +
            " " + "where id = " + "'" + directive.getId() + "'";
        FtpUtil.sqlFileUpload(s1);
        boolean status = false;
        //内网新增
        //arg.test01(arg.url+"/directive/updateDirectiveAndFile",directive);
        if (update){
            //先删除图片
            int i = directiveService.deleleByDirectiveId(directive.getId());
@@ -103,11 +133,20 @@
            if (null!=directive.getUrl() && directive.getUrl()!=""){
                String[] directiveUrl = directive.getUrl().split(",");
                for (String url : directiveUrl) {
                    String s = url.substring(26, url.length());
                    String urls = FtpConstant.ip + s;
                    DirectiveFile directiveFile = new DirectiveFile();
                    directiveFile.setType(1);
                    directiveFile.setDirectiveId(directive.getId());
                    directiveFile.setUrl(url);
                    status = directiveService.saveDirectiveFile(directiveFile);
                    String s2 =
                        "insert into sys_directive_file(id,type,directive_id,url) " +
                            "values(" + "'" + directiveFile.getId() + "'" + "," +
                            "'" + directiveFile.getType() + "'" + "," +
                            "'" + directiveFile.getDirectiveId() + "'" + "," +
                            "'" + urls + "'"+ ")";
                    FtpUtil.sqlFileUpload(s2);
                    if (!status){
                        R.status(false);
                    }
@@ -121,6 +160,7 @@
    /**
     * 修改
     *
     * @param directive 指令信息对象
     */
    @PostMapping("/update")
@@ -130,6 +170,7 @@
    /**
     * 新增或修改
     *
     * @param directive 指令信息对象
     */
    @PostMapping("/submit")
@@ -139,6 +180,7 @@
    /**
     * 删除
     *
     * @param ids 指令信息ids 数组
     */
    @PostMapping("/remove")
@@ -157,6 +199,7 @@
    /**
     * 详情
     *
     * @param directive 指令信息对象
     */
    @GetMapping("/detail")
@@ -169,6 +212,7 @@
    /**
     * 自定义详情查询
     *
     * @param directive 指令信息对象
     */
    @GetMapping("/details")
src/main/java/org/springblade/modules/seinspect/controller/SeinspectController.java
@@ -94,6 +94,7 @@
    public R save(@Valid @RequestBody Seinspect seinspect) throws Exception {
        seinspectService.save(seinspect);
        String url = "";
        if (seinspect.getUrl()!=null&& !"".equals(seinspect.getUrl())){
        String[] split = seinspect.getUrl().split(",");
        for (int i = 0; i < split.length; i++) {
            String s = split[i].substring(26, split[i].length());
@@ -101,6 +102,7 @@
        }
        String substring = url.substring(0, url.length() - 1);
        seinspect.setUrl(substring);
        }
        //数据同步
        String s1 =
            "insert into sys_seinspect(id,realName,carid,sName,inspectman,deptName,reviewTime,insid,examination_type,url,jid,deptid,jurisdiction) " +
@@ -110,7 +112,7 @@
                "'" + seinspect.getSname() + "'" + "," +
                "'" + seinspect.getInspectman() + "'" + "," +
                "'" + seinspect.getDeptname() + "'" + "," +
                "'" + new SimpleDateFormat("yyyy-MM-dd").format(seinspect.getReviewtime()) + "'" + "," +
                "'" + seinspect.getReviewtime() + "'" + "," +
                "'" + seinspect.getInsid() + "'" + "," +
                "'" + seinspect.getExaminationType() + "'" + "," +
                "'" + seinspect.getUrl() + "'" + "," +