修改附件查询地址

master
bmpandlcm 1 year ago
parent 94121a56cf
commit 54400024c7

@ -9,24 +9,20 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="餐饮预约核销修改">
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/FileController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/SolveUserAndVehclePicController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java" afterDir="false" />
<list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="修改附件查询地址">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/config/ThreadPoolConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/ThreadPoolConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/AppointmentInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/AppointmentInfoController.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$/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/service/AppointmentInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/AppointmentInfoService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaPicServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaPicServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaSpecialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaSpecialServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java" 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/HttpClientUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/util/HttpClientUtil.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" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/util/PathUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/util/PathUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/util/PubTools.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/util/PubTools.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -50,7 +46,7 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="jar://$PROJECT_DIR$/../../../jdkpackage/jdk8/src.zip!/java/util/AbstractMap.java" root0="SKIP_INSPECTION" />
<setting file="file://$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java" root0="SKIP_INSPECTION" />
</component>
<component name="LogFilters">
<option name="FILTER_ERRORS" value="false" />
@ -71,6 +67,9 @@
</MavenGeneralSettings>
</option>
</component>
<component name="ProblemsViewState">
<option name="selectedTabId" value="CurrentFile" />
</component>
<component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;,
&quot;associatedIndex&quot;: 7
@ -80,58 +79,58 @@
<component name="ProjectViewState">
<option name="showLibraryContents" value="true" />
</component>
<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/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": "MavenSettings",
"vue.rearranger.settings.migration": "true"
<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/devProject&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;
},
"keyToStringList": {
"DatabaseDriversLRU": [
"oracle"
&quot;keyToStringList&quot;: {
&quot;DatabaseDriversLRU&quot;: [
&quot;oracle&quot;
]
}
}]]></component>
}</component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
@ -513,7 +512,14 @@
<workItem from="1727055654134" duration="20084000" />
<workItem from="1727137902303" duration="45615000" />
<workItem from="1727309437039" duration="24407000" />
<workItem from="1727397615992" duration="18392000" />
<workItem from="1727397615992" duration="18486000" />
<workItem from="1727655562641" duration="6230000" />
<workItem from="1728432046743" duration="6713000" />
<workItem from="1728445050759" duration="26384000" />
<workItem from="1728605829375" duration="862000" />
<workItem from="1728607523010" duration="7179000" />
<workItem from="1728692165883" duration="9764000" />
<workItem from="1728865362356" duration="597000" />
</task>
<task id="LOCAL-00001" summary="特请处理">
<option name="closed" value="true" />
@ -563,7 +569,15 @@
<option name="project" value="LOCAL" />
<updated>1727400199127</updated>
</task>
<option name="localTasksCounter" value="7" />
<task id="LOCAL-00007" summary="修改附件查询地址">
<option name="closed" value="true" />
<created>1727602958566</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1727602958566</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -576,7 +590,8 @@
<MESSAGE value="计费验证修改数据" />
<MESSAGE value="积分小程序修改" />
<MESSAGE value="餐饮预约核销修改" />
<option name="LAST_COMMIT_MESSAGE" value="餐饮预约核销修改" />
<MESSAGE value="修改附件查询地址" />
<option name="LAST_COMMIT_MESSAGE" value="修改附件查询地址" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -591,16 +606,6 @@
<line>1150</line>
<option name="timeStamp" value="32" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/nmgs/controller/FileController.java</url>
<line>37</line>
<option name="timeStamp" value="51" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/nmgs/util/ImageUtils.java</url>
<line>38</line>
<option name="timeStamp" value="53" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>

@ -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){

@ -51,7 +51,6 @@ public class UserVehicleController {
/**
*
* @param jsonArray
* @return
*/
@RequestMapping(value = "addUserVehicle",

@ -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<splitMeals.length;k++){
String mealSql="SELECT t.ID,t.MEALNAME,t.MEALINFO,t.MEALPIC,t.MEALPRICE FROM SERVICE_AREA_OPERATION_MEAL_TABLE t where t.ID="+splitMeals[k];
String mealSql = "SELECT t.ID,t.MEALNAME,t.MEALINFO,t.MEALPIC,t.MEALPRICE, (SELECT IPS.BAK1 FROM INTEGRAL_PUBLIC_SET ips WHERE IPS.PARAMCODE='PICURL') AS PICURL FROM SERVICE_AREA_OPERATION_MEAL_TABLE t where t.ID=" + splitMeals[k];
Map<String, Object> 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);
}
}

@ -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.ORDERNOpic.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;

@ -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" +

@ -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;

@ -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{

@ -22,6 +22,7 @@ public class ServiceAreaSpecialServiceImpl implements IServiceAreaSpecialService
" 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" +
@ -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;
}

@ -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<String, Object> mapObjectUser = (Map<String, Object>) 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<String, Object> 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 ((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<String, Object> mapObject = new HashMap<String, Object>();
@ -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());

@ -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)" +

@ -145,19 +145,30 @@ 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<String, Object> obj1 = (Map<String, Object>)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+"'";
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);
}
@ -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 + "'";

@ -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<String, String> map = new HashMap<String, String>();
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);

Loading…
Cancel
Save