diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7713299..a7f1a7e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,402 +9,24 @@
-
+
+
+
+
+
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -458,58 +80,58 @@
- {
- "keyToString": {
- "Application.DivPassDataImpl.executor": "Run",
- "Application.ImageUtils.executor": "Debug",
- "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/IntegralManager",
- "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": "Artifacts",
- "project.structure.proportion": "0.15",
- "project.structure.side.proportion": "0.37169158",
- "settings.editor.selected.configurable": "MavenSettings",
- "vue.rearranger.settings.migration": "true"
+
+}]]>
@@ -525,8 +147,8 @@
-
+
@@ -889,7 +511,9 @@
-
+
+
+
@@ -923,7 +547,23 @@
1721810298082
-
+
+
+ 1727138802549
+
+
+
+ 1727138802549
+
+
+
+ 1727400199126
+
+
+
+ 1727400199127
+
+
@@ -934,7 +574,9 @@
-
+
+
+
@@ -949,6 +591,16 @@
1150
+
+ file://$PROJECT_DIR$/src/main/java/com/nmgs/controller/FileController.java
+ 37
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/nmgs/util/ImageUtils.java
+ 38
+
+
diff --git a/pom.xml b/pom.xml
index 5a66892..76ac64c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,6 +213,8 @@
httpclient
4.5.14
+
+
diff --git a/src/main/java/com/nmgs/config/ThreadPoolConfig.java b/src/main/java/com/nmgs/config/ThreadPoolConfig.java
index 266284e..a6cdaca 100644
--- a/src/main/java/com/nmgs/config/ThreadPoolConfig.java
+++ b/src/main/java/com/nmgs/config/ThreadPoolConfig.java
@@ -27,6 +27,21 @@ public class ThreadPoolConfig {
executor.initialize();
return executor;
}
+
+ @Bean("integralManagerHttpThreadPool") //线程池实例名，多个线程池配置需要声明，一个线程池可有可无
+ public Executor executorNormalHttp() {
+ ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+ executor.setCorePoolSize(4);
+ executor.setMaxPoolSize(10);
+ executor.setQueueCapacity(3);
+ executor.setKeepAliveSeconds(60);
+ executor.setThreadNamePrefix("INTEGRAL_HTTP-");
+ executor.setRejectedExecutionHandler(new ThreadPoolExecutor.AbortPolicy());
+ // 所有任务结束后关闭线程池
+ executor.setWaitForTasksToCompleteOnShutdown(true);
+ executor.initialize();
+ return executor;
+ }
@Bean
public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
ThreadPoolTaskScheduler ThreadPoolTaskScheduler = new ThreadPoolTaskScheduler();
diff --git a/src/main/java/com/nmgs/controller/AppointmentInfoController.java b/src/main/java/com/nmgs/controller/AppointmentInfoController.java
index fbec157..f6c061a 100644
--- a/src/main/java/com/nmgs/controller/AppointmentInfoController.java
+++ b/src/main/java/com/nmgs/controller/AppointmentInfoController.java
@@ -135,9 +135,10 @@ public class AppointmentInfoController {
@RequestParam(value = "operatorId",required = false) String operatorId,
@RequestParam(value = "endDate",required = false) String endDate,
@RequestParam(value = "appointmentType") String appointmentType,
+ @RequestParam(value = "completeStatus", required = false) String completeStatus,
@RequestParam(value = "isCurrentDateAfter") String isCurrentDateAfter,
@RequestParam(value = "refreshDate",required = false) String refreshDate){
- List ret =this.appointmentInfoService.getAppointListByServiceId(serviceAreaId,operatorId,beginDate,endDate,appointmentType,isCurrentDateAfter,refreshDate);
+ List ret = this.appointmentInfoService.getAppointListByServiceId(serviceAreaId, operatorId, beginDate, endDate, appointmentType, isCurrentDateAfter, refreshDate, completeStatus);
if(ret ==null){
return ResultData.fail("查询失败");
}else{
diff --git a/src/main/java/com/nmgs/controller/FileController.java b/src/main/java/com/nmgs/controller/FileController.java
new file mode 100644
index 0000000..a697ac2
--- /dev/null
+++ b/src/main/java/com/nmgs/controller/FileController.java
@@ -0,0 +1,87 @@
+package com.nmgs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.nmgs.config.ResultData;
+import com.nmgs.util.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.File;
+import java.util.Base64;
+import java.util.Properties;
+
+@RestController
+@RequestMapping(value = "/fileSolve")
+@Api(tags = "附件处理")
+@Async("integralManagerHttpThreadPool")
+public class FileController {
+ @RequestMapping(value = "/delFile", method = {RequestMethod.POST})
+ @ApiOperation(value = "删除附件")
+ public ResultData delFile(@RequestParam(value = "fileName") String fileName, @RequestParam(value = "canDel") String canDel) {
+ boolean isXunhuan = false;
+ if ("Y".equals(canDel)) {
+ isXunhuan = true;
+ }
+ LogUtil.WriteLog_Info("附件删除接口执行开始===========" + PubTools.getCurrentDate() + "==参数fileName====" + fileName, "FileController");
+ ImageUtils.delFile(fileName, isXunhuan);
+ LogUtil.WriteLog_Info("附件删除接口执行结束===========" + PubTools.getCurrentDate(), "FileController");
+ return ResultData.success(1, "删除成功");
+ }
+
+ @RequestMapping(value = "/uploadFile", method = {RequestMethod.POST})
+ @ApiOperation(value = "上传附件到本项目和远程指定目录")
+ public ResultData uploadFile(@RequestParam("jsonArray") String jsonArray) {
+ try {
+ LogUtil.WriteLog_Info("附件上传接口执行开始===========" + PubTools.getCurrentDate(), "FileController");
+ Properties props = System.getProperties();
+ String os = props.getProperty("os.name").toLowerCase();
+ String fileAddressLocal = PathUtil.uploadPath;
+ if (os.startsWith("win")) {
+ // fileAddressLocal = PropertiesUtil.getValue("fileAddressWin");
+ fileAddressLocal = fileAddressLocal.replace("/", "\\");
+ } else {
+ // fileAddressLocal = PropertiesUtil.getValue("fileAddressLinux");
+ }
+ LogUtil.WriteLog_Info("附件上传接口====fileAddressLocal====" + fileAddressLocal, "FileController");
+ if (!PubTools.isNull(fileAddressLocal)) {
+ File filePath = new File(fileAddressLocal);
+ if (!filePath.exists()) {
+ filePath.mkdir();
+ }
+ JSONArray from = JSONObject.parseArray(jsonArray);
+ LogUtil.WriteLog_Info("附件上传接口====jsonArray====" + jsonArray, "FileController");
+ if (from.size() > 0) {
+ for (int k = 0; k < from.size(); k++) {
+ JSONObject map = (JSONObject) from.get(k);
+ String fileName = map.get("fileName").toString();
+ String imageBase64 = map.get("imageBase64").toString();
+ if (PubTools.isNull(fileName) && PubTools.isNull(imageBase64)) {
+ continue;
+ }
+ if (!PubTools.isNull(imageBase64)) {
+ // ImageUtils.delFile(fileName, false);
+ byte[] imageBytes = Base64.getDecoder().decode(imageBase64);
+ // 创建文件
+ File file = new File(fileAddressLocal, fileName); // 指定上传位置
+ if (file.exists()) {
+ file.delete();
+ }
+ // 保存文件
+ LogUtil.WriteLog_Info("附件开始上传到服务器===========" + PubTools.getCurrentDate(), "FileController");
+ org.apache.commons.io.FileUtils.writeByteArrayToFile(file, imageBytes);
+ LogUtil.WriteLog_Info("附件上传到服务器结束===========" + PubTools.getCurrentDate(), "FileController");
+ }
+ }
+ }
+
+ }
+ LogUtil.WriteLog_Info("附件上传接口执行结束===========" + PubTools.getCurrentDate(), "FileController");
+ } catch (Exception e) {
+ return ResultData.fail("上传附件失败====" + e.getMessage());
+ }
+ return ResultData.success(1, "上传成功");
+ }
+}
diff --git a/src/main/java/com/nmgs/controller/SolveUserAndVehclePicController.java b/src/main/java/com/nmgs/controller/SolveUserAndVehclePicController.java
new file mode 100644
index 0000000..6f5db70
--- /dev/null
+++ b/src/main/java/com/nmgs/controller/SolveUserAndVehclePicController.java
@@ -0,0 +1,43 @@
+package com.nmgs.controller;
+
+import com.nmgs.config.ResultData;
+import com.nmgs.service.UserTableService;
+import com.nmgs.service.impl.SolveUserAndVehcleServiceImpl;
+import com.nmgs.util.PubTools;
+import com.nmgs.util.WebsocketUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("solveUserAndVehclePic")
+@Api(tags = "用户和车辆照片处理")
+public class SolveUserAndVehclePicController {
+
+ public SolveUserAndVehcleServiceImpl solveUserAndVehcleServiceImpl;
+
+ @Autowired
+ public void setUserTableService(SolveUserAndVehcleServiceImpl solveUserAndVehcleServiceImplT) {
+ this.solveUserAndVehcleServiceImpl = solveUserAndVehcleServiceImplT;
+ }
+
+ @RequestMapping(value = "syncFile",
+ method = {RequestMethod.POST}
+ )
+ @ApiOperation(value = "同步附件到服务器", httpMethod = "POST")
+ public ResultData syncFile(@RequestParam("syncType") String syncType) {
+ try {
+ solveUserAndVehcleServiceImpl.syncFile(syncType);
+ } catch (Exception e) {
+ return ResultData.fail("同步失败====>" + e.getMessage());
+ }
+ return ResultData.success(1, "同步成功");
+ }
+
+}
diff --git a/src/main/java/com/nmgs/controller/UserVehicleController.java b/src/main/java/com/nmgs/controller/UserVehicleController.java
index f832b03..d245f56 100644
--- a/src/main/java/com/nmgs/controller/UserVehicleController.java
+++ b/src/main/java/com/nmgs/controller/UserVehicleController.java
@@ -142,7 +142,7 @@ public class UserVehicleController {
@RequestParam(value ="CERTIFICATION",required = false) String CERTIFICATION,
@RequestParam(value ="REFERRERCODE",required = false) String REFERRERCODE
){
- LogUtil.WriteLog_Info("更新用户车牌信息=====USERID==>"+USERID+"=====ACARNO======>"+ACARNO,"UserVehicleController");
+ LogUtil.WriteLog_Info("更新用户车牌信息=====USERID==>" + USERID + "=====ACARNO======>" + ACARNO + "======CHECKUSERNAME======" + CHECKUSERNAME + "====CHECKUSERNUMBER=====" + CHECKUSERNUMBER, "UserVehicleController");
if(PubTools.isNull(LICENSEPIC) || PubTools.isNull(PERMITPIC) || PubTools.isNull(VEHICLEPIC)){
return ResultData.fail("附件不允许为空");
}
diff --git a/src/main/java/com/nmgs/service/AppointmentInfoService.java b/src/main/java/com/nmgs/service/AppointmentInfoService.java
index 107c35f..3e04649 100644
--- a/src/main/java/com/nmgs/service/AppointmentInfoService.java
+++ b/src/main/java/com/nmgs/service/AppointmentInfoService.java
@@ -46,9 +46,10 @@ public interface AppointmentInfoService {
* @param endTime 结束时间
* @param appointmentType 预约类型(加油还是加气)
* @param isCurrentDateAfter 是否只查询今日及以后得数据
+ * @param completeStatus 核销状态
* @return
*/
- public List getAppointListByServiceId(String serviceAreaId,String operatorId,String beginTime,String endTime,String appointmentType,String isCurrentDateAfter,String refreshDate);
+ public List getAppointListByServiceId(String serviceAreaId, String operatorId, String beginTime, String endTime, String appointmentType, String isCurrentDateAfter, String refreshDate, String completeStatus);
/**
* 获取餐饮预约核销二维码
diff --git a/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java b/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java
index 8e5f247..d8a09b7 100644
--- a/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java
@@ -507,7 +507,7 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
}
@Override
- public List getAppointListByServiceId(String serviceAreaId,String operatorId, String beginTime, String endTime, String appointmentType,String isCurrentDateAfter,String refreshDate) {
+ public List getAppointListByServiceId(String serviceAreaId, String operatorId, String beginTime, String endTime, String appointmentType, String isCurrentDateAfter, String refreshDate, String completeStatus) {
List ret=null;
List listRet=new ArrayList();
String sqlTemp=sql;
@@ -559,6 +559,9 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
sqlTemp += " and ait.CREATETIME >=str_to_date('"+refreshDate+"','%Y-%m-%d %H:%i:%s')";
}
}
+ if (!PubTools.isNull(completeStatus)) {
+ sqlTemp += " and ait.COMPLETESTATUS ='" + completeStatus + "'";
+ }
sqlTemp +=" order by ait.APPOINTMENTTYPE ,ait.APPOINTMENTTIME DESC,ait.CREATETIME DESC";
ret= this.mapperI.selectforlist(sqlTemp);
if(ret != null && ret.size()>0){
@@ -578,6 +581,7 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
jo.put("MEALNAME",select.get("MEALNAME"));
jo.put("APPOINTMENTTIME",map.get("APPOINTMENTTIME"));
jo.put("CREATETIME",map.get("CREATETIME"));
+ jo.put("COMPLETESTATUS", map.get("COMPLETESTATUS"));
jo.put("MEALCOUNT",splitMealCount[k]);
jo.put("MEALINFO",select.get("MEALINFO"));
jo.put("MEALPIC",PubTools.isEmpty(select.get("MEALPIC"))?"":(PubTools.isNull(PubTools.ClobToString(select.get("MEALPIC")))?"":PubTools.ClobToString(select.get("MEALPIC"))));
diff --git a/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java b/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
index bbc6b42..d4c1836 100644
--- a/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
@@ -180,7 +180,7 @@ static{
Map obj1 = (Map) obj;
if(!PubTools.isEmpty(obj1.get("PICDATA")) ){
Object o=obj1.get("PICDATA");
- String s = ClobToString( o);
+ String s = PubTools.ClobToString(o);
if(!PubTools.isNull(s)){
obj1.remove("PICDATA");
obj1.put("PICDATA",s);
diff --git a/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java b/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java
new file mode 100644
index 0000000..00df76f
--- /dev/null
+++ b/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java
@@ -0,0 +1,188 @@
+package com.nmgs.service.impl;
+
+import cn.hutool.core.collection.ListUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.nmgs.mapper.Mapper;
+import com.nmgs.util.HttpClientUtil;
+import com.nmgs.util.LogUtil;
+import com.nmgs.util.PropertiesUtil;
+import com.nmgs.util.PubTools;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+
+@Service
+public class SolveUserAndVehcleServiceImpl {
+ @Autowired
+ public Mapper mapperI;
+ public String userSql = "select wut.OPENID FROM WEIXN_USER_TABLE wut WHERE wut.CERTIFICATION in(1,2,3) ";
+ public String userVehcleSql = "select uvt.USERID,uvt.ACARNO,uvt.LICENSEPIC,uvt.PERMITPIC,uvt.VEHICLEPIC FROM USER_VEHICLE_TABLE uvt WHERE uvt.CERTIFICATION in(1,2,3) ";
+
+ /**
+ * 同步附件到服务器
+ *
+ * @param syncType ALL 同步全部，PART 同步未同步过的数据
+ * @return
+ */
+ public void syncFile(String syncType) throws IOException, InterruptedException {
+ Properties props = System.getProperties();
+ String os = props.getProperty("os.name").toLowerCase();
+ String fileAddress = "";
+ if (os.startsWith("win")) {
+ fileAddress = PropertiesUtil.getValue("fileAddressWin");
+ fileAddress = fileAddress.replace("/", "\\");
+ } else {
+ fileAddress = PropertiesUtil.getValue("fileAddressLinux");
+ }
+ if (!"ALL".equals(syncType)) {
+ userSql += " AND (wut.NUMBERPICNAME IS NULL OR wut.NUMBERPICNAME='')";
+ userVehcleSql += "AND (uvt.LICENSEPICNAME IS NULL OR uvt.LICENSEPICNAME='')";
+ }
+
+ List selectforlist = this.mapperI.selectforlist(userSql);
+ List userVehcleList = this.mapperI.selectforlist(userVehcleSql);
+ Map map = new HashMap();
+ JSONArray jsonA = new JSONArray();
+ if (selectforlist != null && selectforlist.size() > 0) {
+ LogUtil.WriteLog_Info("人员附件开始同步====" + PubTools.getCurrentDate() + "==={执行数据量}====" + selectforlist.size(), "SolveUserAndVehcleServiceImpl");
+ for (int k = 0; k < selectforlist.size(); k++) {
+ Object o = selectforlist.get(k);
+ if (!PubTools.isEmpty(o)) {
+ Map mapObjectUser = (Map) o;
+ String openId = mapObjectUser.get("OPENID").toString();
+ String sqlTemp = "select NUMBERPIC FROM WEIXN_USER_TABLE WHERE OPENID='" + openId + "'";
+ Map mapObject = this.mapperI.select(sqlTemp);
+ String numPicName = "";
+ if (!PubTools.isEmpty(mapObject.get("NUMBERPIC"))) {
+ String numberpic = PubTools.ClobToString(mapObject.get("NUMBERPIC"));
+ String fileName = openId + "NUMPIC" + ".jpg";
+ numPicName = fileName;
+ byte[] imageBytes = Base64.getDecoder().decode(numberpic);
+ // 创建文件
+ File file = new File(fileAddress, fileName); // 指定上传位置
+ //先删除附件
+ if (file.exists()) {
+ file.delete();
+ }
+ // 保存文件
+ org.apache.commons.io.FileUtils.writeByteArrayToFile(file, imageBytes);
+ JSONObject mapParam = new JSONObject();
+ mapParam.put("fileName", fileName);
+ mapParam.put("imageBase64", numberpic);
+ jsonA.add(mapParam);
+
+ }
+ if (!PubTools.isNull(numPicName)) {
+ String sql = "UPDATE WEIXN_USER_TABLE set NUMBERPICNAME='" + numPicName + "' WHERE CERTIFICATION in(1,2,3) AND OPENID='" + openId + "'";
+ this.mapperI.update(sql);
+ }
+ }
+
+ if ((k + 1) % 5 == 0) {
+ Thread.sleep(10 * 1000);
+ }
+ }
+ }
+ if (userVehcleList != null && userVehcleList.size() > 0) {
+ for (int k = 0; k < userVehcleList.size(); k++) {
+ Object o = userVehcleList.get(k);
+ if (!PubTools.isEmpty(o)) {
+ Map mapObjectVeh = (Map) o;
+ String vehPicName = "";
+ String perPicName = "";
+ String licPicName = "";
+ String userId = mapObjectVeh.get("USERID").toString();
+ String aCarNo = mapObjectVeh.get("ACARNO").toString();
+ String fileNamePre = userId + "-" + aCarNo + "-";
+ String fileNameAfter = ".jpg";
+
+ String tempSql = "select uvt.LICENSEPIC,uvt.PERMITPIC,uvt.VEHICLEPIC FROM USER_VEHICLE_TABLE uvt WHERE uvt.CERTIFICATION in(1,2,3) AND uvt.USERID=" + userId + " AND uvt.ACARNO='" + aCarNo + "'";
+ List selectforlist1 = this.mapperI.selectforlist(tempSql);
+ Map mapObject = new HashMap();
+ if (selectforlist1 != null && selectforlist1.size() > 0) {
+ mapObject = (Map) selectforlist1.get(0);
+ }
+ if (!PubTools.isEmpty(mapObject.get("LICENSEPIC"))) {
+ String numberpic = PubTools.ClobToString(mapObject.get("LICENSEPIC"));
+ String fileName = fileNamePre + "LICPIC" + fileNameAfter;
+ licPicName = fileName;
+ byte[] imageBytes = Base64.getDecoder().decode(numberpic);
+ // 创建文件
+ File file = new File(fileAddress, fileName); // 指定上传位置
+ //先删除附件
+ if (file.exists()) {
+ file.delete();
+ }
+ // 保存文件
+ org.apache.commons.io.FileUtils.writeByteArrayToFile(file, imageBytes);
+ Map mapParam = new HashMap();
+ mapParam.put("fileName", fileName);
+ mapParam.put("imageBase64", numberpic);
+ jsonA.add(mapParam);
+
+ }
+ if (!PubTools.isEmpty(mapObject.get("PERMITPIC"))) {
+ String numberpic = PubTools.ClobToString(mapObject.get("PERMITPIC"));
+ String fileName = fileNamePre + "PERPIC" + fileNameAfter;
+ perPicName = fileName;
+ byte[] imageBytes = Base64.getDecoder().decode(numberpic);
+ // 创建文件
+ File file = new File(fileAddress, fileName); // 指定上传位置
+ //先删除附件
+ if (file.exists()) {
+ file.delete();
+ }
+ // 保存文件
+ org.apache.commons.io.FileUtils.writeByteArrayToFile(file, imageBytes);
+ Map mapParam = new HashMap();
+ mapParam.put("fileName", fileName);
+ mapParam.put("imageBase64", numberpic);
+ jsonA.add(mapParam);
+
+ }
+ if (!PubTools.isEmpty(mapObject.get("VEHICLEPIC"))) {
+ String numberpic = PubTools.ClobToString(mapObject.get("VEHICLEPIC"));
+ String fileName = fileNamePre + "VEHPIC" + fileNameAfter;
+ vehPicName = fileName;
+ byte[] imageBytes = Base64.getDecoder().decode(numberpic);
+ // 创建文件
+ File file = new File(fileAddress, fileName); // 指定上传位置
+ //先删除附件
+ if (file.exists()) {
+ file.delete();
+ }
+ // 保存文件
+ org.apache.commons.io.FileUtils.writeByteArrayToFile(file, imageBytes);
+ JSONObject mapParam = new JSONObject();
+ mapParam.put("fileName", fileName);
+ mapParam.put("imageBase64", numberpic);
+ jsonA.add(mapParam);
+
+ }
+
+ if (!PubTools.isNull(vehPicName) || !PubTools.isNull(perPicName) || !PubTools.isNull(licPicName)) {
+ String sql = "UPDATE USER_VEHICLE_TABLE set LICENSEPICNAME='" + licPicName + "',PERMITPICNAME='" + perPicName + "',VEHICLEPICNAME='" + vehPicName + "' WHERE CERTIFICATION in(1,2,3) AND USERID=" + userId + " AND ACARNO='" + aCarNo + "'";
+ this.mapperI.update(sql);
+ }
+ }
+ if ((k + 1) % 5 == 0) {
+ Thread.sleep(10 * 1000);
+ }
+ }
+ }
+ if (jsonA.size() > 0) {
+ map.put("jsonArray", jsonA.toJSONString());
+ //保存到附件服务器上面
+ String fileUploadUrl = PropertiesUtil.getValue("fileUploadUrl");
+ LogUtil.WriteLog_Info("ImageUtils====附件上传接口fileUploadUrl=====" + fileUploadUrl, "FileController");
+ String s = HttpClientUtil.doPost(fileUploadUrl, map);
+ LogUtil.WriteLog_Info("ImageUtils====附件上传结果显示=====" + s, "FileController");
+ }
+ }
+
+}
diff --git a/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java b/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
index 7a09639..77b9d02 100644
--- a/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
@@ -37,6 +37,7 @@ public class UserTableServiceImpl implements UserTableService {
" ROUND((ut.CAFENABLEINTEGRATION/100),1) AS CAFENABLEINTEGRATION," +
" ROUND((ut.OGENABLEINTEGRATION/100),1) AS OGENABLEINTEGRATION," +
" ROUND((ut.CPENABLEINTEGRATION/100),1) AS CPENABLEINTEGRATION," +
+ " ut.NUMBERPICNAME AS NUMBERPICNAME," +
" ut.REFERRERCODE AS REFERRERCODE," +
" cst.VALUE as CERTIFICATIONNAME" +
" from WEIXN_USER_TABLE ut " +
@@ -57,6 +58,7 @@ public class UserTableServiceImpl implements UserTableService {
" ROUND((ut.OGENABLEINTEGRATION/100),1) AS OGENABLEINTEGRATION," +
" ROUND((ut.CPENABLEINTEGRATION/100),1) AS CPENABLEINTEGRATION," +
" ut.REFERRERCODE AS REFERRERCODE," +
+ " ut.NUMBERPICNAME AS NUMBERPICNAME," +
" cst.VALUE as CERTIFICATIONNAME" +
" from WEIXN_USER_TABLE ut " +
" left join certification_status_text cst on(ut.CERTIFICATION = cst.ID)" +
@@ -121,17 +123,19 @@ public class UserTableServiceImpl implements UserTableService {
int ret=-1;
try{
//图片加水印
+ String fileName = userId + "NUMPIC" + ".jpg";
if(!PubTools.isNull(numberPic)){
- String permitpicPic = ImageUtils.addImageWaterMark(numberPic, "仅用于内蒙古交通货运车辆积分会员认证", userId + "NUMPIC" + ".jpg");
+ String permitpicPic = ImageUtils.addImageWaterMark(numberPic, "仅用于内蒙古交通货运车辆积分会员认证", fileName);
if(!PubTools.isNull(permitpicPic)){
numberPic=permitpicPic;
}
}
+
if("2".equals(DBType)){
numberPic=PubTools.StringToClob(numberPic);
}
String sql="update WEIXN_USER_TABLE " +
- " set CERTIFICATION=2 ";
+ " set CERTIFICATION=2,NUMBERPICNAME='" + fileName + "'";
if (!PubTools.isNull(realName)) {
sql += ",REALNAME='" + realName + "'";
}
@@ -252,6 +256,7 @@ public class UserTableServiceImpl implements UserTableService {
" ROUND((ut.OGENABLEINTEGRATION/100),1) AS OGENABLEINTEGRATION," +
" ROUND((ut.CPENABLEINTEGRATION/100),1) AS CPENABLEINTEGRATION," +
" ut.REFERRERCODE AS REFERRERCODE," +
+ " ut.NUMBERPICNAME AS NUMBERPICNAME," +
" cst.VALUE as CERTIFICATIONNAME" +
" from WEIXN_USER_TABLE ut " +
" left join certification_status_text cst on(ut.CERTIFICATION = cst.ID)" +
@@ -265,7 +270,7 @@ public class UserTableServiceImpl implements UserTableService {
for(Object obj:list){
Map obj1 = (Map) obj;
Object o=obj1.get("NUMBERPIC");
- String s = ClobToString( o);
+ String s = PubTools.ClobToString(o);
if(!PubTools.isNull(s)){
obj1.remove("NUMBERPIC");
obj1.put("NUMBERPIC",s);
diff --git a/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java b/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java
index 8e4b40e..2db00b0 100644
--- a/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java
@@ -178,6 +178,9 @@ public class UserVehicleServiceImpl implements UserVehicleService {
" uvt.ACARNO,uvt.LICENSEPIC AS LICENSEPIC," +
" uvt.PERMITPIC AS PERMITPIC," +
" uvt.VEHICLEPIC AS VEHICLEPIC," +
+ " uvt.PERMITPICNAME AS PERMITPICNAME," +
+ " uvt.VEHICLEPICNAME AS VEHICLEPICNAME," +
+ " uvt.LICENSEPICNAME AS LICENSEPICNAME," +
" uvt.CERTIFICATION," +
" uvt.UNPASSINFO," +
" COALESCE(uvt.REFERRERCODE,'') AS REFERRERCODE," +
@@ -195,6 +198,9 @@ public class UserVehicleServiceImpl implements UserVehicleService {
" uvt.ACARNO,uvt.LICENSEPIC AS LICENSEPIC," +
" uvt.PERMITPIC AS PERMITPIC," +
" uvt.VEHICLEPIC AS VEHICLEPIC," +
+ " uvt.PERMITPICNAME AS PERMITPICNAME," +
+ " uvt.VEHICLEPICNAME AS VEHICLEPICNAME," +
+ " uvt.LICENSEPICNAME AS LICENSEPICNAME," +
" uvt.CERTIFICATION," +
" uvt.UNPASSINFO," +
" COALESCE(uvt.REFERRERCODE,'') AS REFERRERCODE," +
@@ -214,17 +220,17 @@ public class UserVehicleServiceImpl implements UserVehicleService {
Object o=obj1.get("LICENSEPIC");
Object oP=obj1.get("PERMITPIC");
Object oV=obj1.get("VEHICLEPIC");
- String s = ClobToString( o);
+ String s = PubTools.ClobToString(o);
if(!PubTools.isNull(s)){
obj1.remove("LICENSEPIC");
obj1.put("LICENSEPIC", s);
}
- String s2 = ClobToString(oP);
+ String s2 = PubTools.ClobToString(oP);
if(!PubTools.isNull(s2)){
obj1.remove("PERMITPIC");
obj1.put("PERMITPIC",s2);
}
- String s3 = ClobToString(oV);
+ String s3 = PubTools.ClobToString(oV);
if(!PubTools.isNull(s3)){
obj1.remove("VEHICLEPIC");
obj1.put("VEHICLEPIC",s);
@@ -246,54 +252,60 @@ public class UserVehicleServiceImpl implements UserVehicleService {
String permitpic,String vehiclePic,String certification,String referrerCode) {
int ret=1;
try{
+ String fileNamePre = userId + "-" + aCarNo + "-";
+ String fileNameAfter = ".jpg";
//图片加水印
if(!PubTools.isNull(permitpic)){
- String permitpicPic = ImageUtils.addImageWaterMark(permitpic, "仅用于内蒙古交通货运车辆积分会员认证", userId + aCarNo + "per.jpg");
+ String permitpicPic = ImageUtils.addImageWaterMark(permitpic, "仅用于内蒙古交通货运车辆积分会员认证", fileNamePre + "PERPIC" + fileNameAfter);
if(!PubTools.isNull(permitpicPic)){
permitpic=permitpicPic;
}
}
- if(!PubTools.isNull(permitpic) && "2".equals(DBType)){
- permitpic=PubTools.StringToClob(permitpic);
- }else if(!PubTools.isNull(permitpic) && "4".equals(DBType)){
-
- }else{
- permitpic="";
- }
//图片加水印
if(!PubTools.isNull(licensepic)){
- String permitpicPic = ImageUtils.addImageWaterMark(licensepic, "仅用于内蒙古交通货运车辆积分会员认证", userId + aCarNo + "lic.jpg");
+ String permitpicPic = ImageUtils.addImageWaterMark(licensepic, "仅用于内蒙古交通货运车辆积分会员认证", fileNamePre + "LICPIC" + fileNameAfter);
if(!PubTools.isNull(permitpicPic)){
licensepic=permitpicPic;
}
}
-
- if(!PubTools.isNull(licensepic) && "2".equals(DBType)){
- licensepic=PubTools.StringToClob(licensepic);
- }else if(!PubTools.isNull(licensepic) && "4".equals(DBType)){
-
- }else{
- licensepic="";
- }
//图片加水印
if(!PubTools.isNull(vehiclePic)){
- String permitpicPic = ImageUtils.addImageWaterMark(vehiclePic, "仅用于内蒙古交通货运车辆积分会员认证", userId + aCarNo + "veh.jpg");
+ String permitpicPic = ImageUtils.addImageWaterMark(vehiclePic, "仅用于内蒙古交通货运车辆积分会员认证", fileNamePre + "VEHPIC" + fileNameAfter);
if(!PubTools.isNull(permitpicPic)){
vehiclePic=permitpicPic;
}
}
- if(!PubTools.isNull(vehiclePic) && "2".equals(DBType)){
- vehiclePic=PubTools.StringToClob(vehiclePic);
- }else if(!PubTools.isNull(vehiclePic) && "4".equals(DBType)){
-
- }else{
- vehiclePic="";
- }
-
- String sql="update user_vehicle_table "+
- " set LICENSEPIC=" + licensepic + ",PERMITPIC=" + permitpic + ",VEHICLEPIC=" + vehiclePic + " ";
- if (!PubTools.isNull(certification)) {
- sql += ",CERTIFICATION=" + certification;
+ String sql = "update user_vehicle_table " +
+ " set CERTIFICATION=" + certification + "";
+ if ("2".equals(DBType)) {
+ if (!PubTools.isNull(licensepic)) {
+ licensepic = PubTools.StringToClob(licensepic);
+ sql += ",LICENSEPIC=" + licensepic;
+ sql += ",LICENSEPICNAME='" + fileNamePre + "LICPIC" + fileNameAfter + "'";
+ }
+ if (!PubTools.isNull(permitpic)) {
+ permitpic = PubTools.StringToClob(permitpic);
+ sql += ",PERMITPIC=" + permitpic;
+ sql += ",PERMITPICNAME='" + fileNamePre + "PERPIC" + fileNameAfter + "'";
+ }
+ if (!PubTools.isNull(vehiclePic)) {
+ vehiclePic = PubTools.StringToClob(vehiclePic);
+ sql += ",VEHICLEPIC=" + vehiclePic;
+ sql += ",VEHICLEPICNAME='" + fileNamePre + "VEHPIC" + fileNameAfter + "'";
+ }
+ } else if ("4".equals(DBType)) {
+ if (!PubTools.isNull(licensepic)) {
+ sql += ",LICENSEPIC='" + licensepic + "'";
+ sql += ",LICENSEPICNAME='" + fileNamePre + "LICPIC" + fileNameAfter + "'";
+ }
+ if (!PubTools.isNull(permitpic)) {
+ sql += ",PERMITPIC='" + permitpic + "'";
+ sql += ",PERMITPICNAME='" + fileNamePre + "PERPIC" + fileNameAfter + "'";
+ }
+ if (!PubTools.isNull(vehiclePic)) {
+ sql += ",VEHICLEPIC='" + vehiclePic + "'";
+ sql += ",VEHICLEPICNAME='" + fileNamePre + "VEHPIC" + fileNameAfter + "'";
+ }
}
if (!PubTools.isNull(referrerCode)) {
sql += ",REFERRERCODE='" + referrerCode + "'";
@@ -307,29 +319,9 @@ public class UserVehicleServiceImpl implements UserVehicleService {
if (!PubTools.isNull(referrerCode)) {
sql += ",REFERRERCODE='" + referrerCode + "'";
}
-
sql += " where USERID=" + userId + " and ACARNO='" + aCarNo + "' AND CERTIFICATION not in(4)";
- if("4".equals(DBType)){
- sql="update user_vehicle_table "+
- " set LICENSEPIC='" + licensepic + "',PERMITPIC='" + permitpic + "',VEHICLEPIC='" + vehiclePic + "'";
- if (!PubTools.isNull(certification)) {
- sql += ",CERTIFICATION=" + certification;
- }
- if (!PubTools.isNull(referrerCode)) {
- sql += ",REFERRERCODE='" + referrerCode + "'";
- }
- if (!PubTools.isNull(checkName)) {
- sql += ",CHECKUSERNAME='" + checkName + "'";
- }
- if (!PubTools.isNull(checkUserNumber) && !checkUserNumber.contains("*")) {
- sql += ",CHECKUSERNUMBER='" + checkUserNumber + "'";
- }
- if (!PubTools.isNull(referrerCode)) {
- sql += ",REFERRERCODE='" + referrerCode + "'";
- }
- sql += " where USERID=" + userId + " and ACARNO='" + aCarNo + "' AND CERTIFICATION not in(4)";
- }
- this.mapperI.insert(sql);
+
+ this.mapperI.insert(sql);
}catch (Exception e){
LogUtil.WriteLog_Error("批量修改车牌失败===>"+e.getMessage(),"UserVehicleServiceImpl");
return ret=-1;
diff --git a/src/main/java/com/nmgs/util/HttpClientUtil.java b/src/main/java/com/nmgs/util/HttpClientUtil.java
index d193d37..2413fd5 100644
--- a/src/main/java/com/nmgs/util/HttpClientUtil.java
+++ b/src/main/java/com/nmgs/util/HttpClientUtil.java
@@ -81,7 +81,7 @@ public class HttpClientUtil {
paramList.add(new BasicNameValuePair(key, param.get(key)));
}
// 模拟表单
- UrlEncodedFormEntity entity = new UrlEncodedFormEntity(paramList);
+ UrlEncodedFormEntity entity = new UrlEncodedFormEntity(paramList, "UTF-8");
httpPost.setEntity(entity);
}
// 执行http请求
@@ -90,16 +90,18 @@ public class HttpClientUtil {
if (response.getStatusLine().getStatusCode() == 200) {
resultString = EntityUtils.toString(response.getEntity(), "utf-8");
}else{
- resultString="积分变动通知失败";
+ resultString = "http请求失败";
}
} catch (Exception e) {
e.printStackTrace();
+ LogUtil.WriteLog_Info("远程接口请求报错HttpClientUtil=========" + e.getMessage(), "FileController");
} finally {
try {
response.close();
} catch (IOException e) {
e.printStackTrace();
+ LogUtil.WriteLog_Info("远程接口请求报错HttpClientUtil222=========" + e.getMessage(), "FileController");
}
}
return resultString;
diff --git a/src/main/java/com/nmgs/util/ImageUtils.java b/src/main/java/com/nmgs/util/ImageUtils.java
index 294df95..93266a0 100644
--- a/src/main/java/com/nmgs/util/ImageUtils.java
+++ b/src/main/java/com/nmgs/util/ImageUtils.java
@@ -6,14 +6,11 @@ package com.nmgs.util;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Base64;
-import java.util.Properties;
+import java.util.*;
import javax.imageio.ImageIO;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import org.springframework.scheduling.annotation.Async;
@Async
public class ImageUtils {
@@ -30,21 +27,47 @@ public class ImageUtils {
String retStr="";
Properties props = System.getProperties();
String os = props.getProperty("os.name").toLowerCase();
- String fileAddress = PropertiesUtil.getValue("fileAddress");
- InputStream inputStream = null;
+ String fileAddress = PathUtil.uploadPath;
+ ByteArrayInputStream inputStream = null;
try {
+ if (os.startsWith("win")) {
+ // fileAddress = PropertiesUtil.getValue("fileAddressWin");
+ fileAddress = fileAddress.replace("/", "\\");
+ } else {
+ // fileAddress = PropertiesUtil.getValue("fileAddressLinux");
+ }
byte[] imageBytes = Base64.getDecoder().decode(imageBase64);
// 构造 BufferedImage 对象
inputStream = new ByteArrayInputStream(imageBytes);
BufferedImage bufferedImage1 = ImageIO.read(inputStream);
+ LogUtil.WriteLog_Info("ImageUtils====附件地址urlfileAddress=====" + fileAddress, "FileController");
if (PubTools.isEmpty(bufferedImage1)) {
- /* // 创建文件
- if (os.startsWith("win")) {
- fileAddress=fileAddress.replaceALl("/","\\");
- }
- File file = new File(, fileName); // 指定上传位置
+ File fileDir = new File(fileAddress); // 指定上传位置
+ if (!fileDir.exists()) {
+ fileDir.mkdirs();
+ }
+ // 创建文件
+ File file = new File(fileAddress, fileName); // 指定上传位置
+ //先删除附件
+ if (file.exists()) {
+ file.delete();
+ }
+
// 保存文件
- org.apache.commons.io.FileUtils.writeByteArrayToFile(file, imageBytes);*/
+ org.apache.commons.io.FileUtils.writeByteArrayToFile(file, imageBytes);
+
+ //保存到附件服务器上面
+ String fileUploadUrl = PropertiesUtil.getValue("fileUploadUrl");
+ LogUtil.WriteLog_Info("ImageUtils====附件上传接口fileUploadUrl=====" + fileUploadUrl, "FileController");
+ Map map = new HashMap();
+ JSONArray jsonA = new JSONArray();
+ JSONObject mapParam = new JSONObject();
+ mapParam.put("fileName", fileName);
+ mapParam.put("imageBase64", imageBase64);
+ jsonA.add(mapParam);
+ map.put("jsonArray", jsonA.toJSONString());
+ String s = HttpClientUtil.doPost(fileUploadUrl, map);
+ LogUtil.WriteLog_Info("ImageUtils====附件上传结果显示=====" + s, "FileController");
return imageBase64;
}
int w1 = bufferedImage1.getWidth();
@@ -111,10 +134,27 @@ public class ImageUtils {
ImageIO.write(bufferedImage1, "jpg", baos);
byte[] watermarkedImageBytes = baos.toByteArray();
retStr = Base64.getEncoder().encodeToString(watermarkedImageBytes);
- /* // 创建文件
- File file = new File(PropertiesUtil.getValue("fileAddress"), fileName); // 指定上传位置
+ // 创建文件，若有则删除在新增
+ File file = new File(fileAddress, fileName); // 指定上传位置
+ if (file.exists()) {
+ file.delete();
+ }
// 保存文件
- org.apache.commons.io.FileUtils.writeByteArrayToFile(file, watermarkedImageBytes);*/
+ org.apache.commons.io.FileUtils.writeByteArrayToFile(file, watermarkedImageBytes);
+
+ //保存到附件服务器上面
+ String fileUploadUrl = PropertiesUtil.getValue("fileUploadUrl");
+ LogUtil.WriteLog_Info("ImageUtils====附件上传接口fileUploadUrl=====" + fileUploadUrl, "FileController");
+ Map map = new HashMap();
+ JSONArray jsonA = new JSONArray();
+ JSONObject mapParam = new JSONObject();
+ mapParam.put("fileName", fileName);
+ mapParam.put("imageBase64", imageBase64);
+ jsonA.add(mapParam);
+ map.put("jsonArray", jsonA.toJSONString());
+ String s = HttpClientUtil.doPost(fileUploadUrl, map);
+ LogUtil.WriteLog_Info("ImageUtils====附件上传结果显示END=====" + s, "FileController");
+
return retStr;
} catch (Exception e) {
e.printStackTrace();
@@ -124,77 +164,6 @@ public class ImageUtils {
}
}
-
-
- /**
- * 添加文字水印
- *
- * @param waterMarkText 水印文字内容
- * @param fontName 字体名称， 如：宋体
- * @param fontStyle 字体样式，如：粗体和斜体(Font.BOLD|Font.ITALIC)
- * @param color 字体颜色
- * @param degree 水印文字顺时针旋转角度，允许为负数。
- * @param alpha 透明度(0.0 -- 1.0, 0.0为完全透明，1.0为完全不透明)
- * @param isOpen 是否添加水印
- */
- public static String watermarkAdd(String base64, String waterMarkText, String fontName, int fontStyle, Color color, Integer degree,
- float alpha, String isOpen) {
- byte[] image=base64.getBytes(StandardCharsets.UTF_8);
- if (null == image)
- return null;
-
- if ("off".equalsIgnoreCase(isOpen))
- return base64;
- if(PubTools.isNull(fontName)){
- fontName="宋体";
- }
- try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- // 得到源图片
- Image srcImg = ImageIO.read(new ByteArrayInputStream(image));
- int imgWidth = srcImg.getWidth(null);
- int imgHeight = srcImg.getHeight(null);
-
- BufferedImage buffImg = new BufferedImage(imgWidth, imgHeight, BufferedImage.TYPE_INT_RGB);
- // 得到画笔对象
- Graphics2D g = buffImg.createGraphics();
- // 设置对线段的锯齿状边缘处理
- // g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
- g.drawImage(srcImg.getScaledInstance(imgWidth, imgHeight, Image.SCALE_SMOOTH), 0, 0, null);
- // 设置水印文字大小
- int fontSize = buffImg.getWidth(null) / 300 * 8;
- // 设置水印Font
- g.setFont(new Font(fontName,fontStyle,fontSize));
- // 设置水印文字颜色
- g.setColor(color);
- // 设置水印旋转
- if (null != degree) {
- g.rotate(Math.toRadians(degree), (double) imgWidth / 2, (double) imgHeight / 2);
- }
- // 设置水印文字透明度
- g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
-
- // 计算水印文字的大小
- int textWidth = fontSize * getLength(waterMarkText);
- int textHeight = fontSize;
- // 循环打印多个水印
- for (int y = -imgHeight; y < imgHeight * 2; y += textHeight + fontSize * 3) {
- for (int x = 0; x < imgWidth * 2; x += textWidth + fontSize * 3 / 2) {
- // 笫一参数-> 设置的内容,后面两个参数->文字在图片上的坐标位置
- g.drawString(waterMarkText, x, y);
- }
- }
- g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
- // 释放资源
- g.dispose();
- // 生成图片
- ImageIO.write(buffImg, "JPG", os);
- return os.toByteArray().toString();
- } catch (IOException e) {
- e.printStackTrace();
- return "";
- }
- }
-
/**
* 获取字符长度，一个汉字作为 1 个字符, 一个英文字母作为 0.5 个字符
*
@@ -212,33 +181,33 @@ public class ImageUtils {
return (length % 2 == 0) ? length / 2 : length / 2 + 1;
}
- public void deleteImage(String imagePath) {
- Path path = Paths.get(imagePath);
- try {
- // 检查文件是否存在
- if (Files.exists(path)) {
- // 删除文件
- Files.delete(path);
- System.out.println("图片删除成功：" + imagePath);
- } else {
- System.out.println("图片不存在：" + imagePath);
- }
- } catch (IOException e) {
- System.out.println("删除图片失败：" + imagePath);
- e.printStackTrace();
- }
- }
- public static void main(String[] args) {
- try {
- String basae64="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";
- String encode = ImageUtils.addImageWaterMark(basae64, "内蒙古积分", "测试.png");
- System.out.print(encode);
- } catch (IOException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
+ public static int delFile(String fileName, boolean isXunhuan) {
+ Properties props = System.getProperties();
+ String os = props.getProperty("os.name").toLowerCase();
+ String fileAddressLocal = "";
+ fileAddressLocal = PathUtil.uploadPath;
+ if (os.startsWith("win")) {
+ //fileAddressLocal = PropertiesUtil.getValue("fileAddressWin");
+ fileAddressLocal = fileAddressLocal.replace("/", "\\");
+ } else {
+ // fileAddressLocal = PropertiesUtil.getValue("fileAddressLinux");
}
- }
+ LogUtil.WriteLog_Info("ImageUtils本地文件地址=====fileAddressLocal====" + fileAddressLocal, "FileController");
+ File file = new File(fileAddressLocal, fileName); // 指定上传位置
+ if (file.exists()) {
+ file.delete();
+ }
+ if (isXunhuan) {
+ String fileDelAddress = PropertiesUtil.getValue("fileDelUrl");
+ LogUtil.WriteLog_Info("ImageUtil远程删除文件地址=====fileAddressLocal====" + fileDelAddress, "FileController");
+ Map map = new HashMap();
+ map.put("fileName", fileName);
+ map.put("canDel", "N");
+ String s = HttpClientUtil.doPost(fileDelAddress, map);
+ LogUtil.WriteLog_Info("ImageUtil远程删除文件地址=====执行结果====" + s, "FileController");
+ }
+ return 1;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/util/PathUtil.java b/src/main/java/com/nmgs/util/PathUtil.java
index c8d35a0..11d48e6 100644
--- a/src/main/java/com/nmgs/util/PathUtil.java
+++ b/src/main/java/com/nmgs/util/PathUtil.java
@@ -48,21 +48,23 @@ public class PathUtil {
isWin = true;
// TomcatPath = System.getProperty("user.dir").substring(0, System.getProperty("user.dir").lastIndexOf('\\'));
webappsPath = TomcatPath + "\\webapps";
- uploadPath = TomcatPath + "\\integralFile";
+ // uploadPath = TomcatPath + "\\integralFile";
uploadWarPath = TomcatPath + "\\taskWarFiles\\uploadWarFile";
downloadWarPath = TomcatPath + "\\taskWarFiles\\downloadWarFile";
webPath = webPath.substring(1, webPath.length()) + webName;
} else {
webappsPath = TomcatPath + "/webapps";
- uploadPath = TomcatPath + "/integralFile";
+ // uploadPath = TomcatPath + "/integralFile";
uploadWarPath = TomcatPath + "/taskWarFiles/uploadWarFile";
downloadWarPath = TomcatPath + "/taskWarFiles/downloadWarFile";
webPath = webPath + webName;
}
+ uploadPath = webappsPath + "/integralFile";
applicationPath = webappsPath + "/application.properties";
applicationTextPath = webappsPath + "/applicationText.properties";
WebServiceWarPath = TomcatPath + "/WebServiceWar";
tomcatUserXMLPath = TomcatPath + "/conf/tomcat-users.xml";
+
// hostAddress = Inet4Address.getLocalHost().getHostAddress();
hostAddress = String.valueOf(getInet4Address());
if(isWin){
diff --git a/src/main/java/com/nmgs/util/PubTools.java b/src/main/java/com/nmgs/util/PubTools.java
index b11e42e..7a02e30 100644
--- a/src/main/java/com/nmgs/util/PubTools.java
+++ b/src/main/java/com/nmgs/util/PubTools.java
@@ -221,6 +221,8 @@ public class PubTools {
reString = ((CLOB)clob).getSubString((long) 1, (int) ((CLOB)clob).length());
}else if(clob instanceof Blob){
reString = clob.toString();
+ } else if (clob instanceof String) {
+ reString = clob.toString();
}
}catch (Exception e){
reString="";