From 54400024c79d55087bff7ab6ad8b7fff43f854c4 Mon Sep 17 00:00:00 2001
From: bmpandlcm <1102247926@qq.com>
Date: Mon, 14 Oct 2024 09:57:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=84=E4=BB=B6=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 153 +++++++++---------
.../com/nmgs/controller/UserController.java | 3 +
.../controller/UserVehicleController.java | 1 -
.../impl/ApponintmentInfoServiceImpl.java | 5 +-
.../service/impl/RotationServiceImpl.java | 2 +-
.../SerivceAreaOperationMealServiceImpl.java | 1 +
.../impl/ServiceAreaPicServiceImpl.java | 2 +-
.../service/impl/ServiceAreaServiceImpl.java | 8 +-
.../impl/ServiceAreaSpecialServiceImpl.java | 19 +--
.../impl/SolveUserAndVehcleServiceImpl.java | 34 ++--
.../service/impl/UserTableServiceImpl.java | 8 +-
.../service/impl/UserVehicleServiceImpl.java | 33 ++--
src/main/java/com/nmgs/util/ImageUtils.java | 7 +-
13 files changed, 153 insertions(+), 123 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a7f1a7e..5eeec24 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,24 +9,20 @@
-
-
-
-
+
-
-
-
+
-
+
+
+
+
+
-
-
-
@@ -50,7 +46,7 @@
-
+
@@ -71,6 +67,9 @@
+
+
+
{
"customColor": "",
"associatedIndex": 7
@@ -80,58 +79,58 @@
- {
+ "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/devProject",
+ "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"
},
- "keyToStringList": {
- "DatabaseDriversLRU": [
- "oracle"
+ "keyToStringList": {
+ "DatabaseDriversLRU": [
+ "oracle"
]
}
-}]]>
+}
@@ -513,7 +512,14 @@
-
+
+
+
+
+
+
+
+
@@ -563,7 +569,15 @@
1727400199127
-
+
+
+ 1727602958566
+
+
+
+ 1727602958566
+
+
@@ -576,7 +590,8 @@
-
+
+
@@ -591,16 +606,6 @@
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/src/main/java/com/nmgs/controller/UserController.java b/src/main/java/com/nmgs/controller/UserController.java
index 8a58b87..e784609 100644
--- a/src/main/java/com/nmgs/controller/UserController.java
+++ b/src/main/java/com/nmgs/controller/UserController.java
@@ -5,6 +5,7 @@ import com.nmgs.config.ResultData;
import com.nmgs.entity.Consistant;
import com.nmgs.service.UserTableService;
import com.nmgs.service.impl.IntegralSeriveImpl;
+import com.nmgs.util.LogUtil;
import com.nmgs.util.PubTools;
import com.nmgs.util.WebsocketUtil;
import com.nmgs.util.redisConfigUtil;
@@ -60,7 +61,9 @@ public class UserController {
@RequestParam("REALNAME") String REALNAME,
@RequestParam(value = "PHONE",required = false) String PHONE,
@RequestParam("NUMBERPIC") String NUMBERPIC){
+ LogUtil.WriteLog_Info("用户实名认证开始====" + PubTools.getCurrentDate() + "====" + USERID, "UserController");
int i = userTableService.updateUser(USERID,IDNUMBER,PHONE,REALNAME,NUMBERPIC);
+ LogUtil.WriteLog_Info("用户实名认证结束========" + PubTools.getCurrentDate(), "UserController");
if(i<0){
return ResultData.fail("认证失败");
}else if(i>0){
diff --git a/src/main/java/com/nmgs/controller/UserVehicleController.java b/src/main/java/com/nmgs/controller/UserVehicleController.java
index d245f56..38ad99e 100644
--- a/src/main/java/com/nmgs/controller/UserVehicleController.java
+++ b/src/main/java/com/nmgs/controller/UserVehicleController.java
@@ -51,7 +51,6 @@ public class UserVehicleController {
/**
* 批量添加用户车牌
- * @param jsonArray
* @return
*/
@RequestMapping(value = "addUserVehicle",
diff --git a/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java b/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java
index d8a09b7..aebde19 100644
--- a/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java
@@ -125,7 +125,7 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
public static String ordersqlEnd=" order by ait.APPOINTMENTTYPE ,ait.APPOINTMENTTIME DESC,ait.CREATETIME DESC";
- public static String returnSql="SELECT ID,AREANAME,USERNAME,STROEPIC,APPOINTMENTTIME,CREATETIME,TOTALINTEGRAL,APPOINTMENTTYPE," +
+ public static String returnSql = "SELECT ID,AREANAME,USERNAME,STROEPIC,APPOINTMENTTIME,CREATETIME,TOTALINTEGRAL,APPOINTMENTTYPE,(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL," +
"MEALS,MEALSCOUNT,APPOINTMENTLINEID,INTEGRATIONLISTID,ACARNONAME,ORDERID,COMPLETESTATUS,(CASE COMPLETESTATUS WHEN 1 THEN '待使用' WHEN 2 THEN '已使用' ELSE '已过期' END ) AS COMPLETESTATUSNAME ";
@Override
public List getList(String id, String orderId, String userId, String appointmentType, String orderSope, int start, int end) {
@@ -197,7 +197,7 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
String[] splitMeals = meals.split(",");
String[] splitMealCount = mealsCount.split(",");
for(int k=0;k select = this.mapperI.select(mealSql);
JSONObject jo=new JSONObject();
jo.put("MEALNAME",select.get("MEALNAME"));
@@ -205,6 +205,7 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
jo.put("MEALINFO",select.get("MEALINFO"));
jo.put("MEALPIC",PubTools.isEmpty(select.get("MEALPIC"))?"":PubTools.ClobToString(select.get("MEALPIC")));
jo.put("MEALPRICE",select.get("MEALPRICE"));
+ jo.put("PICURL", select.get("PICURL"));
ja.add(jo);
}
}
diff --git a/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java b/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java
index f2e7e59..8e335d1 100644
--- a/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java
@@ -19,7 +19,7 @@ public class RotationServiceImpl {
@Autowired
public Mapper mapperI;
private static String DBType= PropertiesUtil.getValue("DBType");
- private String sql="select pic.ID,pic.RETATIONPIC,pic.JUMPURL,pic.ORDERNO from INTEGRAL_ROTATION pic where 1=1 " ;
+ private String sql = "select pic.ID,pic.RETATIONPIC,pic.JUMPURL,pic.ORDERNO，pic.RETATIONPICNAME,(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL from INTEGRAL_ROTATION pic where 1=1 ";
public List getRotationList(String picType) {
List list=null;
diff --git a/src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java b/src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java
index 39a3d52..24d47f1 100644
--- a/src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java
@@ -21,6 +21,7 @@ public class SerivceAreaOperationMealServiceImpl {
"\tsaom.MEALNAME,\n" +
"\tsaom.MEALINFO,\n" +
"\tsaom.MEALPIC,\n" +
+ "\t(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL,\n" +
"\tsaom.MEALPRICE \n" +
"FROM\n" +
"\tservice_area_operation_meal_table saom,\n" +
diff --git a/src/main/java/com/nmgs/service/impl/ServiceAreaPicServiceImpl.java b/src/main/java/com/nmgs/service/impl/ServiceAreaPicServiceImpl.java
index 980bd44..1155d54 100644
--- a/src/main/java/com/nmgs/service/impl/ServiceAreaPicServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/ServiceAreaPicServiceImpl.java
@@ -22,7 +22,7 @@ public class ServiceAreaPicServiceImpl {
@Autowired
public Mapper mapperI;
private static String DBType= PropertiesUtil.getValue("DBType");
- private String sql="select pic.ID,pic.SERVICEID,pic.PICDATA from SERVICE_AREA_PIC_TABLE pic where 1=1 " ;
+ private String sql = "select pic.ID,pic.SERVICEID,pic.PICDATA,(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL from SERVICE_AREA_PIC_TABLE pic where 1=1 ";
public List getServiceAreaPicList(String serviceId) {
List list=null;
diff --git a/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java b/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
index d4c1836..0d27fb4 100644
--- a/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
@@ -55,6 +55,7 @@ public class ServiceAreaServiceImpl implements IServiceAreaService {
"\tarea.SERVICEFEETYPE,\n" +
" (select LISTAGG ( kind2.TEXT, ', ' ) WITHIN GROUP ( ORDER BY kind2.VALUE ) from service_area_kind_text kind2 where INSTR( area.SERVICEFEETYPE, kind2.VALUE ) > 0 AND kind2.VALUE >=50 GROUP BY area.SERVICEFEETYPE) AS SERVICEFEETYPENAME,\n" +
"@PICPARAM AS PICDATA,"+
+ "(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL," +
"area.CODE AS CODE,"+
"area.ROADNO AS ROADNO,"+
"sart.TEXT AS ROADNONAME,"+
@@ -81,6 +82,7 @@ static{
"\tarea.SERVICEFEETYPE,\n" +
"(select GROUP_CONCAT(DISTINCT kind2.TEXT ORDER BY kind2.VALUE Separator ',') from service_area_kind_text kind2 where INSTR( area.SERVICEFEETYPE, kind2.VALUE ) > 0 AND kind2.VALUE >=50 GROUP BY area.SERVICEFEETYPE) AS SERVICEFEETYPENAME,\n" +
"@PICPARAM AS PICDATA,"+
+ "(SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL," +
"area.CODE AS CODE,"+
"area.ROADNO AS ROADNO,"+
"sart.TEXT AS ROADNONAME,"+
@@ -119,7 +121,7 @@ static{
}
sqlTemp += sqlEnd+" order by area.AREANAME";
- String sqlStartTemp="SELECT ROWNUM AS NUM,ID,AREANAME,AREANAMEPOSITION,SERVICETYPE,SERVICEKIND,SERVICEKINDNAME,SERVICETYPENAME,PICDATA,CODE,ROADNO,ROADNONAME,OPEN,OPENNAME,SERVICEFEETYPE,SERVICEFEETYPENAME,LAT,LNG FROM("+sqlTemp+") WHERE 1=1 ";
+ String sqlStartTemp = "SELECT ROWNUM AS NUM,ID,AREANAME,AREANAMEPOSITION,SERVICETYPE,SERVICEKIND,SERVICEKINDNAME,SERVICETYPENAME,PICDATA,CODE,ROADNO,ROADNONAME,OPEN,OPENNAME,SERVICEFEETYPE,PICURL,SERVICEFEETYPENAME,LAT,LNG FROM(" + sqlTemp + ") WHERE 1=1 ";
if(start>0){
sqlStartTemp +=" AND ROWNUM <="+end;
}
@@ -133,7 +135,7 @@ static{
ret= this.mapperI.selectforlist(sqlTemp);
}else{
- String startSql="SELECT ID,AREANAME,AREANAMEPOSITION,SERVICETYPE,SERVICEKIND,SERVICEKINDNAME,SERVICETYPENAME,PICDATA,CODE,ROADNO,ROADNONAME,OPEN,OPENNAME,SERVICEFEETYPE,SERVICEFEETYPENAME,LAT,LNG" +
+ String startSql = "SELECT ID,AREANAME,AREANAMEPOSITION,SERVICETYPE,SERVICEKIND,SERVICEKINDNAME,SERVICETYPENAME,PICDATA,CODE,ROADNO,ROADNONAME,PICURL,OPEN,OPENNAME,SERVICEFEETYPE,SERVICEFEETYPENAME,LAT,LNG" +
" FROM("+sqlStartTemp+")tt where tt.NUM >= "+start;
if(PubTools.isNull(showPic) || "N".equals(showPic)){
@@ -166,7 +168,7 @@ static{
if(start==0 && end==0){
ret= this.mapperI.selectforlist(sqlTemp);
}else{
- String startSql="SELECT ID,AREANAME,AREANAMEPOSITION,SERVICETYPE,SERVICEKIND,SERVICEKINDNAME,SERVICETYPENAME,PICDATA,CODE,ROADNO,ROADNONAME,OPEN,OPENNAME,SERVICEFEETYPE,SERVICEFEETYPENAME,LAT,LNG FROM("+sqlTemp+")tt";
+ String startSql = "SELECT ID,AREANAME,AREANAMEPOSITION,SERVICETYPE,SERVICEKIND,SERVICEKINDNAME,SERVICETYPENAME,PICDATA,CODE,ROADNO,ROADNONAME,OPEN,OPENNAME,SERVICEFEETYPE,SERVICEFEETYPENAME,PICURL,LAT,LNG FROM(" + sqlTemp + ")tt";
if(PubTools.isNull(showPic) || "N".equals(showPic)){
startSql= startSql.replace("@PICPARAM","''");
}else{
diff --git a/src/main/java/com/nmgs/service/impl/ServiceAreaSpecialServiceImpl.java b/src/main/java/com/nmgs/service/impl/ServiceAreaSpecialServiceImpl.java
index 5e8729e..1af07b6 100644
--- a/src/main/java/com/nmgs/service/impl/ServiceAreaSpecialServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/ServiceAreaSpecialServiceImpl.java
@@ -19,14 +19,15 @@ public class ServiceAreaSpecialServiceImpl implements IServiceAreaSpecialService
@Autowired
private Mapper mapperI;
private String sql=" select\n" +
- " special.ID,\n" +
- " special.SERVICEID,\n" +
- " special.PICDATA,\n" +
- " special.SPECIALNAME,\n" +
- " area.AREANAME as areaName\n" +
- " from\n" +
- " SERVICE_AREA_SPECIAL_TABLE special\n" +
- " left join SERVICE_AREA_TABLE area on area.ID = special.SERVICEID";
+ " special.ID,\n" +
+ " special.SERVICEID,\n" +
+ " special.PICDATA,\n" +
+ " (SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL,\n" +
+ " special.SPECIALNAME,\n" +
+ " area.AREANAME as areaName\n" +
+ " from\n" +
+ " SERVICE_AREA_SPECIAL_TABLE special\n" +
+ " left join SERVICE_AREA_TABLE area on area.ID = special.SERVICEID";
@Override
public List getServiceAreaSpecialList(String serviceId) {
@@ -58,7 +59,7 @@ public class ServiceAreaSpecialServiceImpl implements IServiceAreaSpecialService
}
}catch (Exception e){
LogUtil.WriteLog_Error("查询服务区特色列表失败：===>"+e.getMessage(),"ServiceAreaSpecialServiceImpl");
- return retList=new ArrayList();
+ return new ArrayList();
}
return retList;
}
diff --git a/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java b/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java
index 00df76f..a32a948 100644
--- a/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java
@@ -4,10 +4,7 @@ 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 com.nmgs.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,7 +17,7 @@ import java.util.*;
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 userSql = "select wut.OPENID FROM WEIXN_USER_TABLE wut WHERE wut.CERTIFICATION in(1,2,3) AND wut.NUMBERPIC IS NOT NULL ";
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) ";
/**
@@ -32,12 +29,12 @@ public class SolveUserAndVehcleServiceImpl {
public void syncFile(String syncType) throws IOException, InterruptedException {
Properties props = System.getProperties();
String os = props.getProperty("os.name").toLowerCase();
- String fileAddress = "";
+ String fileAddress = PathUtil.uploadPath;
if (os.startsWith("win")) {
fileAddress = PropertiesUtil.getValue("fileAddressWin");
fileAddress = fileAddress.replace("/", "\\");
} else {
- fileAddress = PropertiesUtil.getValue("fileAddressLinux");
+ //fileAddress = PropertiesUtil.getValue("fileAddressLinux");
}
if (!"ALL".equals(syncType)) {
userSql += " AND (wut.NUMBERPICNAME IS NULL OR wut.NUMBERPICNAME='')";
@@ -55,6 +52,7 @@ public class SolveUserAndVehcleServiceImpl {
if (!PubTools.isEmpty(o)) {
Map mapObjectUser = (Map) o;
String openId = mapObjectUser.get("OPENID").toString();
+ LogUtil.WriteLog_Info("人员ID========" + openId, "SolveUserAndVehcleServiceImpl");
String sqlTemp = "select NUMBERPIC FROM WEIXN_USER_TABLE WHERE OPENID='" + openId + "'";
Map mapObject = this.mapperI.select(sqlTemp);
String numPicName = "";
@@ -75,20 +73,21 @@ public class SolveUserAndVehcleServiceImpl {
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 (!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) {
+ if ((k + 1) % 10 == 0) {
Thread.sleep(10 * 1000);
}
}
+ LogUtil.WriteLog_Info("人员附件同步结束====" + PubTools.getCurrentDate() + "=======", "SolveUserAndVehcleServiceImpl");
}
if (userVehcleList != null && userVehcleList.size() > 0) {
+ LogUtil.WriteLog_Info("车辆附件同步开始====" + PubTools.getCurrentDate() + "==={执行数据量}====" + userVehcleList.size(), "SolveUserAndVehcleServiceImpl");
for (int k = 0; k < userVehcleList.size(); k++) {
Object o = userVehcleList.get(k);
if (!PubTools.isEmpty(o)) {
@@ -100,7 +99,7 @@ public class SolveUserAndVehcleServiceImpl {
String aCarNo = mapObjectVeh.get("ACARNO").toString();
String fileNamePre = userId + "-" + aCarNo + "-";
String fileNameAfter = ".jpg";
-
+ LogUtil.WriteLog_Info("人员ID========" + userId + "=====车牌号====" + aCarNo, "SolveUserAndVehcleServiceImpl");
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();
@@ -162,18 +161,17 @@ public class SolveUserAndVehcleServiceImpl {
mapParam.put("fileName", fileName);
mapParam.put("imageBase64", numberpic);
jsonA.add(mapParam);
-
}
-
- if (!PubTools.isNull(vehPicName) || !PubTools.isNull(perPicName) || !PubTools.isNull(licPicName)) {
+ 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) {
+ if ((k + 1) % 10 == 0) {
Thread.sleep(10 * 1000);
}
}
+ LogUtil.WriteLog_Info("车辆附件同步结束====" + PubTools.getCurrentDate() + "=======", "SolveUserAndVehcleServiceImpl");
}
if (jsonA.size() > 0) {
map.put("jsonArray", jsonA.toJSONString());
diff --git a/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java b/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
index 77b9d02..d50d355 100644
--- a/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
@@ -124,8 +124,11 @@ public class UserTableServiceImpl implements UserTableService {
try{
//图片加水印
String fileName = userId + "NUMPIC" + ".jpg";
+ LogUtil.WriteLog_Info("用户实名认证修改附件水印=开始===" + PubTools.getCurrentDate() + "====", "UserController");
if(!PubTools.isNull(numberPic)){
+ LogUtil.WriteLog_Info("用户实名认证修改附件水印===IF里面=" + PubTools.getCurrentDate() + "====", "UserController");
String permitpicPic = ImageUtils.addImageWaterMark(numberPic, "仅用于内蒙古交通货运车辆积分会员认证", fileName);
+ LogUtil.WriteLog_Info("用户实名认证修改附件水印=完成===" + PubTools.getCurrentDate() + "====", "UserController");
if(!PubTools.isNull(permitpicPic)){
numberPic=permitpicPic;
}
@@ -135,7 +138,7 @@ public class UserTableServiceImpl implements UserTableService {
numberPic=PubTools.StringToClob(numberPic);
}
String sql="update WEIXN_USER_TABLE " +
- " set CERTIFICATION=2,NUMBERPICNAME='" + fileName + "'";
+ " set CERTIFICATION=2,CREATETIME=to_date('" + PubTools.getCurrentDate() + "','yyyy-MM-dd HH24:mi:ss'),NUMBERPICNAME='" + fileName + "'";
if (!PubTools.isNull(realName)) {
sql += ",REALNAME='" + realName + "'";
}
@@ -151,7 +154,7 @@ public class UserTableServiceImpl implements UserTableService {
sql += " where OPENID='" + userId + "'";
if("4".equals(DBType)){
sql="update WEIXN_USER_TABLE " +
- " set CERTIFICATION=2 ";
+ " set CERTIFICATION=2,CREATETIME=str_to_date('" + PubTools.getCurrentDate() + "','%Y-%m-%d %H:%i:%s') ,NUMBERPICNAME='" + fileName + "'";
if (!PubTools.isNull(realName)) {
sql += ",REALNAME='" + realName + "'";
}
@@ -257,6 +260,7 @@ public class UserTableServiceImpl implements UserTableService {
" ROUND((ut.CPENABLEINTEGRATION/100),1) AS CPENABLEINTEGRATION," +
" ut.REFERRERCODE AS REFERRERCODE," +
" ut.NUMBERPICNAME AS NUMBERPICNAME," +
+ " (SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS NUMBERPICURL," +
" cst.VALUE as CERTIFICATIONNAME" +
" from WEIXN_USER_TABLE ut " +
" left join certification_status_text cst on(ut.CERTIFICATION = cst.ID)" +
diff --git a/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java b/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java
index 2db00b0..8e8541f 100644
--- a/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java
@@ -145,21 +145,32 @@ public class UserVehicleServiceImpl implements UserVehicleService {
int ret=1;
try{
String CREATETIME=PubTools.getCurrentDate() ;
- String sqlQuery="SELECT uvt.USERID,uvt.ACARNO,uvt.CERTIFICATION from user_vehicle_table uvt where uvt.USERID="+userId+" and uvt.ACARNO='"+aCarNo+"'" ;
+ String sqlQuery = "SELECT uvt.USERID,uvt.ACARNO,uvt.CERTIFICATION,uvt.PERMITPICNAME ,uvt.VEHICLEPICNAME ,uvt.LICENSEPICNAME from user_vehicle_table uvt where uvt.USERID=" + userId + " and uvt.ACARNO='" + aCarNo + "' AND uvt.CERTIFICATION not in(4)";
List selectforlist = this.mapperI.selectforlist(sqlQuery);
if(selectforlist.size()>0){
Map obj1 = (Map)selectforlist.get(0);
String certification = obj1.get("CERTIFICATION").toString();
- if(Integer.parseInt(certification) != 1 && Integer.parseInt(certification) != 4){
- String sqlDel="DELETE FROM user_vehicle_table where USERID="+userId+" and ACARNO='"+aCarNo+"'" ;
+ if (Integer.parseInt(certification) != 1) {
+ String sqlDel = "DELETE FROM user_vehicle_table where USERID=" + userId + " and ACARNO='" + aCarNo + "' AND CERTIFICATION not in(1,4)";
this.mapperI.update(sqlDel);
+ if (!PubTools.isEmpty(obj1.get("PERMITPICNAME"))) {
+ //需要删除附件
+ ImageUtils.delFile(obj1.get("PERMITPICNAME").toString(), true);
+ }
+ if (!PubTools.isEmpty(obj1.get("VEHICLEPICNAME"))) {
+ //需要删除附件
+ ImageUtils.delFile(obj1.get("VEHICLEPICNAME").toString(), true);
+ }
+ if (!PubTools.isEmpty(obj1.get("LICENSEPICNAME"))) {
+ //需要删除附件
+ ImageUtils.delFile(obj1.get("LICENSEPICNAME").toString(), true);
+ }
}else{
- String sqlTemp="update user_vehicle_table set CERTIFICATION=4,CANCELTIME=to_date('"+CREATETIME+"','YYYY-MM-DD HH24:MI:SS') where USERID="+userId+" and ACARNO='"+aCarNo+"'";
- if("4".equals(DBType)){
- sqlTemp="update user_vehicle_table set CERTIFICATION=4,CANCELTIME=str_to_date('"+CREATETIME+"','%Y-%m-%d %H:%i:%s') where USERID="+userId+" and ACARNO='"+aCarNo+"'";
-
- }
- this.mapperI.update(sqlTemp);
+ String sqlTemp = "update user_vehicle_table set CERTIFICATION=4,CANCELTIME=to_date('" + CREATETIME + "','YYYY-MM-DD HH24:MI:SS') where USERID=" + userId + " and ACARNO='" + aCarNo + "' AND CERTIFICATION=1";
+ if ("4".equals(DBType)) {
+ sqlTemp = "update user_vehicle_table set CERTIFICATION=4,CANCELTIME=str_to_date('" + CREATETIME + "','%Y-%m-%d %H:%i:%s') where USERID=" + userId + " and ACARNO='" + aCarNo + "' AND CERTIFICATION=1";
+ }
+ this.mapperI.update(sqlTemp);
}
}
}catch (Exception e){
@@ -181,6 +192,7 @@ public class UserVehicleServiceImpl implements UserVehicleService {
" uvt.PERMITPICNAME AS PERMITPICNAME," +
" uvt.VEHICLEPICNAME AS VEHICLEPICNAME," +
" uvt.LICENSEPICNAME AS LICENSEPICNAME," +
+ " (SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL," +
" uvt.CERTIFICATION," +
" uvt.UNPASSINFO," +
" COALESCE(uvt.REFERRERCODE,'') AS REFERRERCODE," +
@@ -201,6 +213,7 @@ public class UserVehicleServiceImpl implements UserVehicleService {
" uvt.PERMITPICNAME AS PERMITPICNAME," +
" uvt.VEHICLEPICNAME AS VEHICLEPICNAME," +
" uvt.LICENSEPICNAME AS LICENSEPICNAME," +
+ " (SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL," +
" uvt.CERTIFICATION," +
" uvt.UNPASSINFO," +
" COALESCE(uvt.REFERRERCODE,'') AS REFERRERCODE," +
@@ -278,6 +291,7 @@ public class UserVehicleServiceImpl implements UserVehicleService {
String sql = "update user_vehicle_table " +
" set CERTIFICATION=" + certification + "";
if ("2".equals(DBType)) {
+ sql += ",CREATETIME=to_date('" + PubTools.getCurrentDate() + "','yyyy-MM-dd HH24:mi:ss')";
if (!PubTools.isNull(licensepic)) {
licensepic = PubTools.StringToClob(licensepic);
sql += ",LICENSEPIC=" + licensepic;
@@ -294,6 +308,7 @@ public class UserVehicleServiceImpl implements UserVehicleService {
sql += ",VEHICLEPICNAME='" + fileNamePre + "VEHPIC" + fileNameAfter + "'";
}
} else if ("4".equals(DBType)) {
+ sql += ",CREATETIME=str_to_date('" + PubTools.getCurrentDate() + "','%Y-%m-%d %H:%i:%s')";
if (!PubTools.isNull(licensepic)) {
sql += ",LICENSEPIC='" + licensepic + "'";
sql += ",LICENSEPICNAME='" + fileNamePre + "LICPIC" + fileNameAfter + "'";
diff --git a/src/main/java/com/nmgs/util/ImageUtils.java b/src/main/java/com/nmgs/util/ImageUtils.java
index 93266a0..956a855 100644
--- a/src/main/java/com/nmgs/util/ImageUtils.java
+++ b/src/main/java/com/nmgs/util/ImageUtils.java
@@ -42,6 +42,7 @@ public class ImageUtils {
BufferedImage bufferedImage1 = ImageIO.read(inputStream);
LogUtil.WriteLog_Info("ImageUtils====附件地址urlfileAddress=====" + fileAddress, "FileController");
if (PubTools.isEmpty(bufferedImage1)) {
+ LogUtil.WriteLog_Info("ImageUtils====附件不规范==不走水印处理===", "FileController");
File fileDir = new File(fileAddress); // 指定上传位置
if (!fileDir.exists()) {
fileDir.mkdirs();
@@ -58,7 +59,7 @@ public class ImageUtils {
//保存到附件服务器上面
String fileUploadUrl = PropertiesUtil.getValue("fileUploadUrl");
- LogUtil.WriteLog_Info("ImageUtils====附件上传接口fileUploadUrl=====" + fileUploadUrl, "FileController");
+ LogUtil.WriteLog_Info("ImageUtils====附件不规范==不走水印处理======附件上传接口fileUploadUrl=====" + fileUploadUrl, "FileController");
Map map = new HashMap();
JSONArray jsonA = new JSONArray();
JSONObject mapParam = new JSONObject();
@@ -67,7 +68,7 @@ public class ImageUtils {
jsonA.add(mapParam);
map.put("jsonArray", jsonA.toJSONString());
String s = HttpClientUtil.doPost(fileUploadUrl, map);
- LogUtil.WriteLog_Info("ImageUtils====附件上传结果显示=====" + s, "FileController");
+ LogUtil.WriteLog_Info("ImageUtils=====附件不规范==不走水印处理===上传结果显示=====" + s, "FileController");
return imageBase64;
}
int w1 = bufferedImage1.getWidth();
@@ -149,7 +150,7 @@ public class ImageUtils {
JSONArray jsonA = new JSONArray();
JSONObject mapParam = new JSONObject();
mapParam.put("fileName", fileName);
- mapParam.put("imageBase64", imageBase64);
+ mapParam.put("imageBase64", retStr);
jsonA.add(mapParam);
map.put("jsonArray", jsonA.toJSONString());
String s = HttpClientUtil.doPost(fileUploadUrl, map);