From cd4d500d96857baeb5979a1c601afcbb89e13dea Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 30 Aug 2021 10:34:26 +0800
Subject: [PATCH] 1.附件
---
src/main/java/org/springblade/modules/coinspect/controller/CoinspectController.java | 29 +++++++++++++-
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 2 +
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 12 ++++--
src/main/java/org/springblade/modules/seinspect/controller/SeinspectController.java | 32 +++++++++++++++-
src/main/java/org/springblade/modules/directive/controller/DirectiveController.java | 14 ++++++-
5 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/coinspect/controller/CoinspectController.java b/src/main/java/org/springblade/modules/coinspect/controller/CoinspectController.java
index a8a20ce..c0bfd9a 100644
--- a/src/main/java/org/springblade/modules/coinspect/controller/CoinspectController.java
+++ b/src/main/java/org/springblade/modules/coinspect/controller/CoinspectController.java
@@ -22,18 +22,21 @@
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.boot.ctrl.BladeController;
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.coinspect.entity.Coinspect;
import org.springblade.modules.coinspect.service.ICoinspectService;
import org.springblade.modules.coinspect.vo.CoinspectVO;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
/**
* 控制器
@@ -89,8 +92,29 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入coinspect")
public R save(@Valid @RequestBody Coinspect coinspect) throws Exception {
- //arg.test01(arg.url+"/coinspect/save",coinspect);
- return R.status(coinspectService.save(coinspect));
+ coinspectService.save(coinspect);
+ String url = "";
+ String[] split = coinspect.getUrl().split(",");
+ for (int i = 0; i < split.length; i++) {
+ String s = split[i].substring(26, split[i].length());
+ url += FtpConstant.ip + s + ",";
+ }
+ 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) " +
+ "values(" + "'" + coinspect.getId() + "'" + "," +
+ "'" + coinspect.getName() + "'" + "," +
+ "'" + coinspect.getSname() + "'" + "," +
+ "'" + coinspect.getSname() + "'" + "," +
+ "'" + coinspect.getDeptname() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(coinspect.getReviewtime()) + "'" + "," +
+ "'" + coinspect.getInsid() + "'" + "," +
+ "'" + coinspect.getResults() + "'" + "," +
+ "'" + coinspect.getUrl() + "'" + ")";
+ FtpUtil.sqlFileUpload(s1);
+ return R.success("新增成功");
}
/**
@@ -100,7 +124,6 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入coinspect")
public R update(@Valid @RequestBody Coinspect coinspect) throws Exception {
- //arg.test01(arg.url+"/coinspect/update",coinspect);
return R.status(coinspectService.updateById(coinspect));
}
diff --git a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
index 7dd3762..ba9c00b 100644
--- a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
+++ b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
@@ -9,12 +9,14 @@
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.directive.entity.Directive;
import org.springblade.modules.directive.entity.DirectiveFile;
import org.springblade.modules.directive.service.DirectiveService;
import org.springblade.modules.directive.vo.DirectiveVo;
import org.springframework.web.bind.annotation.*;
+import java.text.SimpleDateFormat;
import java.util.Date;
/**
@@ -61,8 +63,16 @@
boolean status = false;
directive.setSendTime(new Date());
status = directiveService.save(directive);
- //内网新增
- //arg.test01(arg.url+"/directive/saveDirectiveAndFile",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() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(directive.getStartTime()) + "'" + "," +
+ "'" +directive.getContent() + "'" + ")";
+ FtpUtil.sqlFileUpload(s1);
if (status){
//新增图片
if (null!=directive.getUrl() && directive.getUrl()!=""){
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 98b7c58..564f306 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -61,9 +61,11 @@
IFNULL(C.pnum ,0) as pnum
FROM
sys_information i
- LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
+ LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE
+ ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' ) AND
status=1 GROUP BY dept_id ) A ON A.dept_id = i.departmentid
- LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
+ LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE
+ ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' ) AND
status=1 AND hold=1 GROUP BY dept_id ) B ON B.dept_id = i.departmentid
LEFT JOIN ( SELECT COUNT( * ) AS pnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
status=1 AND dispatch=0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
@@ -229,7 +231,8 @@
FROM
blade_user
WHERE
- `status` = 1
+ ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' )
+ and `status` = 1
AND is_deleted = 0
AND dispatch = 0
GROUP BY
@@ -242,7 +245,8 @@
FROM
blade_user
WHERE
- `status` = 1
+ ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' )
+ and `status` = 1
AND is_deleted = 0
AND dispatch = 1
GROUP BY
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index 4997f72..fd71472 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -208,6 +208,7 @@
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);
//添加自定义内容类型
@@ -218,6 +219,7 @@
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;
return R.data(urls);
diff --git a/src/main/java/org/springblade/modules/seinspect/controller/SeinspectController.java b/src/main/java/org/springblade/modules/seinspect/controller/SeinspectController.java
index 140dbec..2b3ce84 100644
--- a/src/main/java/org/springblade/modules/seinspect/controller/SeinspectController.java
+++ b/src/main/java/org/springblade/modules/seinspect/controller/SeinspectController.java
@@ -22,18 +22,21 @@
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.boot.ctrl.BladeController;
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.seinspect.entity.Seinspect;
import org.springblade.modules.seinspect.service.ISeinspectService;
import org.springblade.modules.seinspect.vo.SeinspectVO;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
/**
* 控制器
@@ -89,8 +92,33 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入seinspect")
public R save(@Valid @RequestBody Seinspect seinspect) throws Exception {
- //arg.test01(arg.url+"/seinspect/save",seinspect);
- return R.status(seinspectService.save(seinspect));
+ seinspectService.save(seinspect);
+ String url = "";
+ String[] split = seinspect.getUrl().split(",");
+ for (int i = 0; i < split.length; i++) {
+ String s = split[i].substring(26, split[i].length());
+ url += FtpConstant.ip + s + ",";
+ }
+ 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) " +
+ "values(" + "'" + seinspect.getId() + "'" + "," +
+ "'" + seinspect.getRealname() + "'" + "," +
+ "'" + seinspect.getCarid() + "'" + "," +
+ "'" + seinspect.getSname() + "'" + "," +
+ "'" + seinspect.getInspectman() + "'" + "," +
+ "'" + seinspect.getDeptname() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(seinspect.getReviewtime()) + "'" + "," +
+ "'" + seinspect.getInsid() + "'" + "," +
+ "'" + seinspect.getExaminationType() + "'" + "," +
+ "'" + seinspect.getUrl() + "'" + "," +
+ "'" + seinspect.getJid() + "'" + "," +
+ "'" + seinspect.getDeptid() + "'" + "," +
+ "'" +seinspect.getJurisdiction() + "'" + ")";
+ FtpUtil.sqlFileUpload(s1);
+ return R.success("成功");
}
/**
--
Gitblit v1.9.3