修改附件上传接口,校验是否上传成功

master
白美平 1 month ago
parent 27c1995aa7
commit 41a4a5ece1

@ -10,9 +10,10 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="解决轮播图查询报错的问题"> <list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="修改附件上传接口,校验是否上传成功">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -77,65 +78,65 @@
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;, "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
&quot;Application.DivPassDataImpl.executor&quot;: &quot;Run&quot;, "Application.DivPassDataImpl.executor": "Run",
&quot;Application.ImageUtils.executor&quot;: &quot;Run&quot;, "Application.ImageUtils.executor": "Run",
&quot;Application.OcrUtil.executor&quot;: &quot;Debug&quot;, "Application.OcrUtil.executor": "Debug",
&quot;Application.PubTools.executor&quot;: &quot;Run&quot;, "Application.PubTools.executor": "Run",
&quot;Application.QCodeInfoServiceImpl.executor&quot;: &quot;Debug&quot;, "Application.QCodeInfoServiceImpl.executor": "Debug",
&quot;Application.SensitiveFilter.executor&quot;: &quot;Run&quot;, "Application.SensitiveFilter.executor": "Run",
&quot;Application.main.executor&quot;: &quot;Run&quot;, "Application.main.executor": "Run",
&quot;Application.redisConfigUtil.executor&quot;: &quot;Debug&quot;, "Application.redisConfigUtil.executor": "Debug",
&quot;Maven.IntegraManager [clean].executor&quot;: &quot;Run&quot;, "Maven.IntegraManager [clean].executor": "Run",
&quot;Maven.IntegraManager [install].executor&quot;: &quot;Run&quot;, "Maven.IntegraManager [install].executor": "Run",
&quot;Maven.IntegralManager [clean].executor&quot;: &quot;Run&quot;, "Maven.IntegralManager [clean].executor": "Run",
&quot;Maven.IntegralManager [install].executor&quot;: &quot;Run&quot;, "Maven.IntegralManager [install].executor": "Run",
&quot;Maven.IntegralManager [site].executor&quot;: &quot;Run&quot;, "Maven.IntegralManager [site].executor": "Run",
&quot;Maven.IntegralManager [validate].executor&quot;: &quot;Run&quot;, "Maven.IntegralManager [validate].executor": "Run",
&quot;Maven.IntegralManager [verify].executor&quot;: &quot;Run&quot;, "Maven.IntegralManager [verify].executor": "Run",
&quot;Maven.IntegralManagerSys [clean].executor&quot;: &quot;Run&quot;, "Maven.IntegralManagerSys [clean].executor": "Run",
&quot;Maven.IntegralManagerSys [install].executor&quot;: &quot;Run&quot;, "Maven.IntegralManagerSys [install].executor": "Run",
&quot;Maven.devProject [clean].executor&quot;: &quot;Run&quot;, "Maven.devProject [clean].executor": "Run",
&quot;Maven.devProject [install].executor&quot;: &quot;Run&quot;, "Maven.devProject [install].executor": "Run",
&quot;Maven.dev_project [clean].executor&quot;: &quot;Run&quot;, "Maven.dev_project [clean].executor": "Run",
&quot;Maven.dev_project [install].executor&quot;: &quot;Run&quot;, "Maven.dev_project [install].executor": "Run",
&quot;Maven.special_event [clean].executor&quot;: &quot;Run&quot;, "Maven.special_event [clean].executor": "Run",
&quot;Maven.special_event [install].executor&quot;: &quot;Run&quot;, "Maven.special_event [install].executor": "Run",
&quot;Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor&quot;: &quot;Run&quot;, "Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor": "Run",
&quot;Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor&quot;: &quot;Run&quot;, "Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor": "Run",
&quot;Maven.special_event [package].executor&quot;: &quot;Run&quot;, "Maven.special_event [package].executor": "Run",
&quot;Maven.special_event [validate].executor&quot;: &quot;Run&quot;, "Maven.special_event [validate].executor": "Run",
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;, "RunOnceActivity.OpenProjectViewOnStart": "true",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;RunOnceActivity.go.formatter.settings.were.checked&quot;: &quot;true&quot;, "RunOnceActivity.go.formatter.settings.were.checked": "true",
&quot;RunOnceActivity.go.migrated.go.modules.settings&quot;: &quot;true&quot;, "RunOnceActivity.go.migrated.go.modules.settings": "true",
&quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;, "SHARE_PROJECT_CONFIGURATION_FILES": "true",
&quot;TomEE Server.special_event.executor&quot;: &quot;Debug&quot;, "TomEE Server.special_event.executor": "Debug",
&quot;Tomcat Server.Tomcat 9.0.80.executor&quot;: &quot;Debug&quot;, "Tomcat Server.Tomcat 9.0.80.executor": "Debug",
&quot;deletionFromPopupRequiresConfirmation&quot;: &quot;false&quot;, "deletionFromPopupRequiresConfirmation": "false",
&quot;git-widget-placeholder&quot;: &quot;master&quot;, "git-widget-placeholder": "master",
&quot;go.import.settings.migrated&quot;: &quot;true&quot;, "go.import.settings.migrated": "true",
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;, "kotlin-language-version-configured": "true",
&quot;last_opened_file_path&quot;: &quot;D:/workspace/IntegralManager&quot;, "last_opened_file_path": "D:/workspace/IntegralManager",
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;, "node.js.detected.package.eslint": "true",
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;, "node.js.detected.package.tslint": "true",
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.eslint": "(autodetect)",
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.tslint": "(autodetect)",
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;, "nodejs_package_manager_path": "npm",
&quot;project.structure.last.edited&quot;: &quot;Artifacts&quot;, "project.structure.last.edited": "Modules",
&quot;project.structure.proportion&quot;: &quot;0.15&quot;, "project.structure.proportion": "0.15",
&quot;project.structure.side.proportion&quot;: &quot;0.37169158&quot;, "project.structure.side.proportion": "0.37169158",
&quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.project.maven.importing&quot;, "settings.editor.selected.configurable": "vcs.Subversion",
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot; "vue.rearranger.settings.migration": "true"
}, },
&quot;keyToStringList&quot;: { "keyToStringList": {
&quot;DatabaseDriversLRU&quot;: [ "DatabaseDriversLRU": [
&quot;oracle&quot; "oracle"
] ]
} }
}</component> }]]></component>
<component name="ReactorSettings"> <component name="ReactorSettings">
<option name="notificationShown" value="true" /> <option name="notificationShown" value="true" />
</component> </component>
@ -186,8 +187,7 @@
</method> </method>
</configuration> </configuration>
<configuration name="Tomcat 9.0.80" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.80" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8 (2)" nameIsGenerated="true"> <configuration name="Tomcat 9.0.80" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.80" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8 (2)" nameIsGenerated="true">
<option name="OPEN_IN_BROWSER" value="false" /> <option name="OPEN_IN_BROWSER_URL" value="http://192.168.101.106:9003/IntegralManager/doc.html" />
<option name="OPEN_IN_BROWSER_URL" value="http://192.168.101.39:9002/IntegralManager/doc.html" />
<option name="COMMON_VM_ARGUMENTS" value="-Dfile.encoding=utf-8" /> <option name="COMMON_VM_ARGUMENTS" value="-Dfile.encoding=utf-8" />
<option name="UPDATING_POLICY" value="restart-server" /> <option name="UPDATING_POLICY" value="restart-server" />
<deployment> <deployment>
@ -199,6 +199,7 @@
</deployment> </deployment>
<server-settings> <server-settings>
<option name="BASE_DIRECTORY_NAME" value="f3020269-24f5-4e17-a252-787d327c95f4" /> <option name="BASE_DIRECTORY_NAME" value="f3020269-24f5-4e17-a252-787d327c95f4" />
<option name="HTTP_PORT" value="9003" />
</server-settings> </server-settings>
<log_file alias="Tomcat Host Manager Log" path="%IDEA_RUN:CATALINA_BASE%/logs/host-manager.*" /> <log_file alias="Tomcat Host Manager Log" path="%IDEA_RUN:CATALINA_BASE%/logs/host-manager.*" />
<predefined_log_file enabled="true" id="Tomcat" /> <predefined_log_file enabled="true" id="Tomcat" />
@ -398,6 +399,9 @@
</recent_temporary> </recent_temporary>
</component> </component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration">
<configuration>C:\Users\22814\AppData\Roaming\Subversion</configuration>
</component>
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="Default task"> <task active="true" id="Default" summary="Default task">
<changelist id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="" /> <changelist id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="" />
@ -644,7 +648,15 @@
<workItem from="1757377185874" duration="47000" /> <workItem from="1757377185874" duration="47000" />
<workItem from="1757493113742" duration="2736000" /> <workItem from="1757493113742" duration="2736000" />
<workItem from="1757559975874" duration="2606000" /> <workItem from="1757559975874" duration="2606000" />
<workItem from="1757636618124" duration="1103000" /> <workItem from="1757636618124" duration="3767000" />
<workItem from="1757907231205" duration="1253000" />
<workItem from="1758789404009" duration="2916000" />
<workItem from="1760065739520" duration="64000" />
<workItem from="1760076734417" duration="19000" />
<workItem from="1760148919195" duration="8085000" />
<workItem from="1760946026852" duration="6098000" />
<workItem from="1760953807434" duration="337000" />
<workItem from="1761095809116" duration="3066000" />
</task> </task>
<task id="LOCAL-00001" summary="特请处理"> <task id="LOCAL-00001" summary="特请处理">
<option name="closed" value="true" /> <option name="closed" value="true" />
@ -918,7 +930,23 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1757320171471</updated> <updated>1757320171471</updated>
</task> </task>
<option name="localTasksCounter" value="35" /> <task id="LOCAL-00035" summary="解决商户总积分查询失败的问题">
<option name="closed" value="true" />
<created>1757648724231</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1757648724231</updated>
</task>
<task id="LOCAL-00036" summary="修改附件上传接口,校验是否上传成功">
<option name="closed" value="true" />
<created>1760165539298</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1760165539298</updated>
</task>
<option name="localTasksCounter" value="37" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -936,7 +964,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="解析车牌确认和车牌车型确认参数" />
<MESSAGE value="特请处理" /> <MESSAGE value="特请处理" />
<MESSAGE value="数据拆分流水,新加车牌颜色查询条件" /> <MESSAGE value="数据拆分流水,新加车牌颜色查询条件" />
<MESSAGE value="计费验证修改数据" /> <MESSAGE value="计费验证修改数据" />
@ -960,7 +987,9 @@
<MESSAGE value="数据同步" /> <MESSAGE value="数据同步" />
<MESSAGE value="数据同步功能修改" /> <MESSAGE value="数据同步功能修改" />
<MESSAGE value="解决轮播图查询报错的问题" /> <MESSAGE value="解决轮播图查询报错的问题" />
<option name="LAST_COMMIT_MESSAGE" value="解决轮播图查询报错的问题" /> <MESSAGE value="解决商户总积分查询失败的问题" />
<MESSAGE value="修改附件上传接口,校验是否上传成功" />
<option name="LAST_COMMIT_MESSAGE" value="修改附件上传接口,校验是否上传成功" />
</component> </component>
<component name="VgoProject"> <component name="VgoProject">
<integration-enabled>false</integration-enabled> <integration-enabled>false</integration-enabled>
@ -994,6 +1023,16 @@
<line>221</line> <line>221</line>
<option name="timeStamp" value="44" /> <option name="timeStamp" value="44" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/nmgs/util/ImageUtils.java</url>
<line>57</line>
<option name="timeStamp" value="46" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java</url>
<line>156</line>
<option name="timeStamp" value="47" />
</line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
</component> </component>

@ -152,7 +152,7 @@ public class IntegralSignServiceImpl implements IntegralSignService {
String date=signDate.substring(8); String date=signDate.substring(8);
String sqlExists=sql+" AND ist.USERID=(SELECT ID FROM WEIXN_USER_TABLE WHERE OPENID='"+userId+"') AND ist.MONTH ='"+yM+"' "; String sqlExists=sql+" AND ist.USERID=(SELECT ID FROM WEIXN_USER_TABLE WHERE OPENID='"+userId+"') AND ist.MONTH ='"+yM+"' ";
List list= this.mapperI.selectforlist(sqlExists); List list= this.mapperI.selectforlist(sqlExists);
if(list.size()>0){//说明已经有签到记录 if(!list.isEmpty()){//说明已经有签到记录
Map<String,Object> paramsUpdate=new HashMap<>(); Map<String,Object> paramsUpdate=new HashMap<>();
paramsUpdate.put("dayvalue",date); paramsUpdate.put("dayvalue",date);
paramsUpdate.put("openId",userId); paramsUpdate.put("openId",userId);
@ -161,7 +161,7 @@ public class IntegralSignServiceImpl implements IntegralSignService {
if ("Y".equals(PropertiesUtil.getValue("BAKEnabled"))) { if ("Y".equals(PropertiesUtil.getValue("BAKEnabled"))) {
String bakDBType = PropertiesUtil.getValue("BakDBType"); String bakDBType = PropertiesUtil.getValue("BakDBType");
paramsUpdate.put("DBTYPEBAK",bakDBType); paramsUpdate.put("DBTYPEBAK",bakDBType);
ret=integralSignMyMapper.updateIntegralSign(paramsUpdate); integralSignMyMapper.updateIntegralSign(paramsUpdate);
} }
}else{ }else{
Map<String,Object> paramsUpdate=new HashMap<>(); Map<String,Object> paramsUpdate=new HashMap<>();

@ -95,7 +95,7 @@ static{
public List getServiceAreaList(String areaName,String areaScope,String showPic,int start,int end) { public List getServiceAreaList(String areaName,String areaScope,String showPic,int start,int end) {
List ret=null; List ret=null;
List retlist=new ArrayList(); List retlist=new ArrayList();
String sqlTemp=sqlStart; String sqlTemp=sqlStart +" AND area.OPEN=1 and exists(select 1 from SERVICE_AREA_OPERATION_MEAL_TABLE tt3,SERVICE_AREA_OPERATORS_TABLE tt4 where tt3.JOBNUMBER = tt4.JOBNUMBER AND tt4.SERVICEAREAID = area.ID )";
try{ try{
if("2".equals(DBType)){//oralce数据库 if("2".equals(DBType)){//oralce数据库
if(!PubTools.isNull(areaName)){ if(!PubTools.isNull(areaName)){
@ -169,7 +169,7 @@ static{
ret= this.mapperI.selectforlist(startSql); ret= this.mapperI.selectforlist(startSql);
} }
}else{} }else{}
if(ret.size()>0 && start>0 && "Y".equals(showPic)){ if(!ret.isEmpty() && start>0 && "Y".equals(showPic)){
for(Object obj:ret){ for(Object obj:ret){
Map<String, Object> obj1 = (Map<String, Object>) obj; Map<String, Object> obj1 = (Map<String, Object>) obj;
if(!PubTools.isEmpty(obj1.get("PICDATA")) ){ if(!PubTools.isEmpty(obj1.get("PICDATA")) ){

Loading…
Cancel
Save