BMP
/
IntegralManager
mirror of https://gitee.com/bmpandlcm/IntegralManager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

新增附件上传接口

Browse Source
master
bmpandlcm 1 year ago
parent 55bd770c31
commit 592c85184d
7 changed files with 137 additions and 85 deletions
Show Stats Download Patch File Download Diff File

126
.idea/workspace.xml
Unescape Escape View File

@ -9,13 +9,14 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="人员认证加了一个校验">
<list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="给后端服务提供的websocket，进行消息内容修改">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/config/SubscribeListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/SubscribeListener.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/FileController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/FileController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserVehicleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserVehicleController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/WebSocketRedis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/WebSocketRedis.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/static/Sensitive.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/Sensitive.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/util/ImageUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/util/ImageUtils.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -72,58 +73,58 @@
<component name="ProjectViewState">
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;Application.DivPassDataImpl.executor&quot;: &quot;Run&quot;,
&quot;Application.ImageUtils.executor&quot;: &quot;Run&quot;,
&quot;Application.PubTools.executor&quot;: &quot;Run&quot;,
&quot;Application.QCodeInfoServiceImpl.executor&quot;: &quot;Debug&quot;,
&quot;Application.SensitiveFilter.executor&quot;: &quot;Run&quot;,
&quot;Application.main.executor&quot;: &quot;Debug&quot;,
&quot;Application.redisConfigUtil.executor&quot;: &quot;Debug&quot;,
&quot;Maven.IntegraManager [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegraManager [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManager [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManager [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManager [validate].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManagerSys [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManagerSys [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.devProject [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.devProject [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.dev_project [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.dev_project [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [package].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [validate].executor&quot;: &quot;Run&quot;,
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
&quot;TomEE Server.special_event.executor&quot;: &quot;Debug&quot;,
&quot;Tomcat Server.Tomcat 9.0.80.executor&quot;: &quot;Debug&quot;,
&quot;deletionFromPopupRequiresConfirmation&quot;: &quot;false&quot;,
&quot;git-widget-placeholder&quot;: &quot;master&quot;,
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
&quot;last_opened_file_path&quot;: &quot;E:/work/TGGLT-WorkSpace/IntegralManager&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
&quot;project.structure.proportion&quot;: &quot;0.15&quot;,
&quot;project.structure.side.proportion&quot;: &quot;0.37169158&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;vcs.Git&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"Application.DivPassDataImpl.executor": "Run",
"Application.ImageUtils.executor": "Run",
"Application.PubTools.executor": "Run",
"Application.QCodeInfoServiceImpl.executor": "Debug",
"Application.SensitiveFilter.executor": "Run",
"Application.main.executor": "Debug",
"Application.redisConfigUtil.executor": "Debug",
"Maven.IntegraManager [clean].executor": "Run",
"Maven.IntegraManager [install].executor": "Run",
"Maven.IntegralManager [clean].executor": "Run",
"Maven.IntegralManager [install].executor": "Run",
"Maven.IntegralManager [validate].executor": "Run",
"Maven.IntegralManagerSys [clean].executor": "Run",
"Maven.IntegralManagerSys [install].executor": "Run",
"Maven.devProject [clean].executor": "Run",
"Maven.devProject [install].executor": "Run",
"Maven.dev_project [clean].executor": "Run",
"Maven.dev_project [install].executor": "Run",
"Maven.special_event [clean].executor": "Run",
"Maven.special_event [install].executor": "Run",
"Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor": "Run",
"Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor": "Run",
"Maven.special_event [package].executor": "Run",
"Maven.special_event [validate].executor": "Run",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"TomEE Server.special_event.executor": "Debug",
"Tomcat Server.Tomcat 9.0.80.executor": "Debug",
"deletionFromPopupRequiresConfirmation": "false",
"git-widget-placeholder": "master",
"kotlin-language-version-configured": "true",
"last_opened_file_path": "E:/work/TGGLT-WorkSpace/special_event",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.15",
"project.structure.side.proportion": "0.37169158",
"settings.editor.selected.configurable": "vcs.Git",
"vue.rearranger.settings.migration": "true"
},
&quot;keyToStringList&quot;: {
&quot;DatabaseDriversLRU&quot;: [
&quot;oracle&quot;
"keyToStringList": {
"DatabaseDriversLRU": [
"oracle"
]
}
}</component>
}]]></component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
@ -529,6 +530,10 @@
<workItem from="1730798249931" duration="969000" />
<workItem from="1730799271800" duration="752000" />
<workItem from="1730875183642" duration="901000" />
<workItem from="1731025124463" duration="72000" />
<workItem from="1731049718437" duration="3388000" />
<workItem from="1731392801577" duration="11435000" />
<workItem from="1731462347759" duration="16550000" />
</task>
<task id="LOCAL-00001" summary="特请处理">
<option name="closed" value="true" />
@ -618,7 +623,15 @@
<option name="project" value="LOCAL" />
<updated>1729842478482</updated>
</task>
<option name="localTasksCounter" value="12" />
<task id="LOCAL-00012" summary="给后端服务提供的websocket，进行消息内容修改">
<option name="closed" value="true" />
<created>1731025181036</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1731025181036</updated>
</task>
<option name="localTasksCounter" value="13" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -634,7 +647,8 @@
<MESSAGE value="修改附件查询地址" />
<MESSAGE value="修改redis 配置以及websocket信息" />
<MESSAGE value="人员认证加了一个校验" />
<option name="LAST_COMMIT_MESSAGE" value="人员认证加了一个校验" />
<MESSAGE value="给后端服务提供的websocket，进行消息内容修改" />
<option name="LAST_COMMIT_MESSAGE" value="给后端服务提供的websocket，进行消息内容修改" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>

6
pom.xml
Unescape Escape View File

@ -213,7 +213,11 @@
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
</dependencies>

9
src/main/java/com/nmgs/controller/FileController.java
Unescape Escape View File

@ -6,20 +6,24 @@ import com.nmgs.config.ResultData;
import com.nmgs.util.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.io.FileUtils;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.util.Base64;
import java.util.Properties;
@RestController
@Controller
@RequestMapping(value = "/fileSolve")
@Api(tags = "附件处理")
@Async("integralManagerHttpThreadPool")
public class FileController {
@RequestMapping(value = "/delFile", method = {RequestMethod.POST})
@ApiOperation(value = "删除附件")
@ResponseBody
public ResultData<String> delFile(@RequestParam(value = "fileName") String fileName, @RequestParam(value = "canDel") String canDel) {
boolean isXunhuan = false;
if ("Y".equals(canDel)) {
@ -33,6 +37,7 @@ public class FileController {
@RequestMapping(value = "/uploadFile", method = {RequestMethod.POST})
@ApiOperation(value = "上传附件到本项目和远程指定目录")
@ResponseBody
public ResultData<String> uploadFile(@RequestParam("jsonArray") String jsonArray) {
try {
LogUtil.WriteLog_Info("附件上传接口执行开始===========" + PubTools.getCurrentDate(), "FileController");
@ -84,4 +89,6 @@ public class FileController {
}
return ResultData.success(1, "上传成功");
}
}

6
src/main/java/com/nmgs/controller/UserVehicleController.java
Unescape Escape View File

@ -135,9 +135,9 @@ public class UserVehicleController {
@RequestParam("ACARNO") String ACARNO,
@RequestParam(value = "CHECKUSERNAME",required = false) String CHECKUSERNAME,
@RequestParam(value ="CHECKUSERNUMBER",required = false) String CHECKUSERNUMBER,
@RequestParam(value ="LICENSEPIC",required = false) String LICENSEPIC,
@RequestParam(value ="PERMITPIC",required = false) String PERMITPIC,
@RequestParam(value ="VEHICLEPIC",required = false) String VEHICLEPIC,
@RequestParam(value = "LICENSEPIC", required = true) String LICENSEPIC,
@RequestParam(value = "PERMITPIC", required = true) String PERMITPIC,
@RequestParam(value = "VEHICLEPIC", required = true) String VEHICLEPIC,
@RequestParam(value ="CERTIFICATION",required = false) String CERTIFICATION,
@RequestParam(value ="REFERRERCODE",required = false) String REFERRERCODE
){

3
src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
Unescape Escape View File

@ -124,7 +124,7 @@ public class UserTableServiceImpl implements UserTableService {
//图片加水印
String fileName = userId + "NUMPIC" + ".jpg";
LogUtil.WriteLog_Info("用户实名认证修改附件水印=开始===" + PubTools.getCurrentDate() + "====", "UserController");
if(!PubTools.isNull(numberPic)){
if (!PubTools.isNull(numberPic) && !numberPic.contains("NUMPIC")) {
LogUtil.WriteLog_Info("用户实名认证修改附件水印===IF里面=" + PubTools.getCurrentDate() + "====", "UserController");
String permitpicPic = ImageUtils.addImageWaterMark(numberPic, "仅用于内蒙古交通货运车辆积分会员认证", fileName);
LogUtil.WriteLog_Info("用户实名认证修改附件水印=完成===" + PubTools.getCurrentDate() + "====", "UserController");
@ -132,7 +132,6 @@ public class UserTableServiceImpl implements UserTableService {
numberPic=permitpicPic;
}
}
if("2".equals(DBType)){
numberPic=PubTools.StringToClob(numberPic);
}

24
src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java
Unescape Escape View File

@ -268,21 +268,21 @@ public class UserVehicleServiceImpl implements UserVehicleService {
String fileNamePre = userId + "-" + aCarNo + "-";
String fileNameAfter = ".jpg";
//图片加水印
if(!PubTools.isNull(permitpic)){
if (!PubTools.isNull(permitpic) && !permitpic.contains("PERPIC")) {
String permitpicPic = ImageUtils.addImageWaterMark(permitpic, "仅用于内蒙古交通货运车辆积分会员认证", fileNamePre + "PERPIC" + fileNameAfter);
if(!PubTools.isNull(permitpicPic)){
permitpic=permitpicPic;
}
}
//图片加水印
if(!PubTools.isNull(licensepic)){
if (!PubTools.isNull(licensepic) && !licensepic.contains("LICPIC")) {
String permitpicPic = ImageUtils.addImageWaterMark(licensepic, "仅用于内蒙古交通货运车辆积分会员认证", fileNamePre + "LICPIC" + fileNameAfter);
if(!PubTools.isNull(permitpicPic)){
licensepic=permitpicPic;
}
}
//图片加水印
if(!PubTools.isNull(vehiclePic)){
if (!PubTools.isNull(vehiclePic) && !vehiclePic.contains("VEHPIC")) {
String permitpicPic = ImageUtils.addImageWaterMark(vehiclePic, "仅用于内蒙古交通货运车辆积分会员认证", fileNamePre + "VEHPIC" + fileNameAfter);
if(!PubTools.isNull(permitpicPic)){
vehiclePic=permitpicPic;
@ -340,25 +340,7 @@ public class UserVehicleServiceImpl implements UserVehicleService {
}catch (Exception e){
LogUtil.WriteLog_Error("批量修改车牌失败===>"+e.getMessage(),"UserVehicleServiceImpl");
return ret=-1;
//throw new RuntimeException();
}
return ret;
}
/* public String ClobToString(Object clob) throws Exception {
String reString = "";
try {
if(clob instanceof CLOB){
reString = ((CLOB)clob).getSubString((long) 1, (int) ((CLOB)clob).length());
}else if(clob instanceof Blob){
reString = clob.toString();
}
} catch (Exception e) {
LogUtil.WriteLog_Error("Oracle数据由Clob类型转化String类型处理失败====>"+ e.getMessage(),"UserTableServiceImpl");
throw new Exception("Oracle数据处理失败");
}
return reString;
}*/
}

46
src/main/java/com/nmgs/util/ImageUtils.java
Unescape Escape View File

@ -12,6 +12,9 @@ import javax.imageio.ImageIO;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.multipart.MultipartFile;
import sun.misc.BASE64Encoder;
@Async
public class ImageUtils {
@ -36,6 +39,7 @@ public class ImageUtils {
} else {
// fileAddress = PropertiesUtil.getValue("fileAddressLinux");
}
imageBase64 = imageBase64.replaceAll(" ", "+").replace("\r\n", "");
byte[] imageBytes = Base64.getDecoder().decode(imageBase64);
// 构造 BufferedImage 对象
inputStream = new ByteArrayInputStream(imageBytes);
@ -211,4 +215,46 @@ public class ImageUtils {
}
return 1;
}
public static String byteToBase64(byte[] b) {
try {
BASE64Encoder encoder = new BASE64Encoder();
return encoder.encode(b);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
/**
* imgFile 图片本地存储路径
*/
public static String getImgFileToBase64(String imgFile) {
//将图片文件转化为字节数组字符串，并对其进行Base64编码处理
InputStream inputStream = null;
byte[] buffer = null;
//读取图片字节数组
try {
inputStream = new FileInputStream(imgFile);
int count = 0;
while (count == 0) {
count = inputStream.available();
}
buffer = new byte[count];
inputStream.read(buffer);
} catch (IOException e) {
e.printStackTrace();
} finally {
if (inputStream != null) {
try {
// 关闭inputStream流
inputStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
// 对字节数组Base64编码
return new BASE64Encoder().encode(buffer);
}
}
Write Preview
Loading…
Cancel
Save