diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a5151a0..07d32ce 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,69 +10,14 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -172,7 +117,7 @@
"deletionFromPopupRequiresConfirmation": "false",
"git-widget-placeholder": "master",
"kotlin-language-version-configured": "true",
- "last_opened_file_path": "D:/workspace/IntegralManager/src/main/java/com/nmgs/mapperset/mysqlmapper",
+ "last_opened_file_path": "D:/workspace/IntegralManager_20250714",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -668,6 +613,13 @@
+
+
+
+
+
+
+
@@ -885,7 +837,15 @@
1746759881177
-
+
+
+ 1752539808619
+
+
+
+ 1752539808620
+
+
@@ -921,7 +881,8 @@
-
+
+
@@ -943,9 +904,14 @@
file://$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
- 116
+ 115
+
+ file://$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java
+ 1073
+
+
diff --git a/src/main/java/com/nmgs/controller/ExportData.java b/src/main/java/com/nmgs/controller/ExportData.java
index f6b6317..058c3ee 100644
--- a/src/main/java/com/nmgs/controller/ExportData.java
+++ b/src/main/java/com/nmgs/controller/ExportData.java
@@ -23,277 +23,5 @@ import java.util.Map;
@RequestMapping("/exportData")
@ApiIgnore
public class ExportData {
-/*
- @Autowired
- private ExcelDateImpl excelDateImpl;
-
- @GetMapping(value = "/exportDivPassidAllData")
- public void exportData(String paramsData,@RequestBody(required = false) Object req, HttpServletResponse response) {
- try {
-
- if(req==null || req== "undefined"){
- req=JSONObject.parse(paramsData);
- }
- Integer start=0;
- Integer end=0;
- Integer pageSize=0;//每页条数
- Integer pageNum=0;//当前页码
- String status="";//拆分结果
- String vecheClass="";//车种
- String vecheType="";
- //查询条件
- String classDate="";
- String sPassId="";
- String enSTANAME="";
- String exSTANAME="";
- String sVEHICLEID="";
- String sVecheClass="";//车种
- String sVecheType="";//车型
- String sExitfeeType="";//出口计费方式
- String SENSTANAMEID="";//入口站ID
- String SEXSTANAMEID="";//出口站ID
- String sStatus="";
- String isPage="";//是否分页
- if(!PubTools.isEmpty(req)){
- if(req instanceof Map){
- classDate=((Map) req).get("dataTime").toString();
- vecheType=!PubTools.isEmpty(((Map) req).get("vecheType"))?((Map) req).get("vecheType").toString():"";
- vecheClass=!PubTools.isEmpty(((Map) req).get("vecheClass"))?((Map) req).get("vecheClass").toString():"";
- status=!PubTools.isEmpty(((Map) req).get("status"))?((Map) req).get("status").toString():"";
- pageSize= !PubTools.isEmpty(((Map) req).get("pageSize"))?Integer.parseInt(((Map) req).get("pageSize").toString()):0;
- pageNum= !PubTools.isEmpty(((Map) req).get("pageNum"))?Integer.parseInt(((Map) req).get("pageNum").toString()):0;
- sPassId=!PubTools.isEmpty(((Map) req).get("SPASSID"))?((Map) req).get("SPASSID").toString():"";
- enSTANAME=!PubTools.isEmpty(((Map) req).get("ENSTANAME"))?((Map) req).get("ENSTANAME").toString():"";
- exSTANAME=!PubTools.isEmpty(((Map) req).get("EXSTANAME"))?((Map) req).get("EXSTANAME").toString():"";
- sVEHICLEID=!PubTools.isEmpty(((Map) req).get("SVEHICLEID"))?((Map) req).get("SVEHICLEID").toString():"";
- sVecheClass=!PubTools.isEmpty(((Map) req).get("SVECHECLASS"))?((Map) req).get("SVECHECLASS").toString():"";
- sVecheType=!PubTools.isEmpty(((Map) req).get("SVECHETYPE"))?((Map) req).get("SVECHETYPE").toString():"";
- sExitfeeType=!PubTools.isEmpty(((Map) req).get("SEXITFEETYPE"))?((Map) req).get("SEXITFEETYPE").toString():"";
- SENSTANAMEID=!PubTools.isEmpty(((Map) req).get("SENSTANAMEID"))?((Map) req).get("SENSTANAMEID").toString():"";
- SEXSTANAMEID=!PubTools.isEmpty(((Map) req).get("SEXSTANAMEID"))?((Map) req).get("SEXSTANAMEID").toString():"";
- sStatus=!PubTools.isEmpty(((Map) req).get("SSTATUS"))?((Map) req).get("SSTATUS").toString():"";
- isPage=!PubTools.isEmpty(((Map) req).get("ISPAGE"))?((Map) req).get("ISPAGE").toString():"";
- }else if(req instanceof JSONObject){
- classDate=((JSONObject) req).get("dataTime").toString();
- pageSize= !PubTools.isEmpty(((JSONObject) req).get("pageSize"))?Integer.parseInt(((JSONObject) req).get("pageSize").toString()):0;
- pageNum= !PubTools.isEmpty(((JSONObject) req).get("pageNum"))?Integer.parseInt(((JSONObject) req).get("pageNum").toString()):0;
- vecheType=((JSONObject) req).get("vecheType").toString();
- vecheClass=!PubTools.isEmpty(((JSONObject) req).get("vecheClass"))?((JSONObject) req).get("vecheClass").toString():"";
- status=!PubTools.isEmpty(((JSONObject) req).get("status"))?((JSONObject) req).get("status").toString():"";
- sPassId=!PubTools.isEmpty(((JSONObject) req).get("SPASSID"))?((JSONObject) req).get("SPASSID").toString():"";
- enSTANAME=!PubTools.isEmpty(((JSONObject) req).get("ENSTANAME"))?((JSONObject) req).get("ENSTANAME").toString():"";
- exSTANAME=!PubTools.isEmpty(((JSONObject) req).get("EXSTANAME"))?((JSONObject) req).get("EXSTANAME").toString():"";
- sVEHICLEID=!PubTools.isEmpty(((JSONObject) req).get("SVEHICLEID"))?((JSONObject) req).get("SVEHICLEID").toString():"";
- sVecheClass=!PubTools.isEmpty(((JSONObject) req).get("SVECHECLASS"))?((JSONObject) req).get("SVECHECLASS").toString():"";
- sVecheType=!PubTools.isEmpty(((JSONObject) req).get("SVECHETYPE"))?((JSONObject) req).get("SVECHETYPE").toString():"";
- sExitfeeType=!PubTools.isEmpty(((JSONObject) req).get("SEXITFEETYPE"))?((JSONObject) req).get("SEXITFEETYPE").toString():"";
- SENSTANAMEID=!PubTools.isEmpty(((JSONObject) req).get("SENSTANAMEID"))?((JSONObject) req).get("SENSTANAMEID").toString():"";
- SEXSTANAMEID=!PubTools.isEmpty(((JSONObject) req).get("SEXSTANAMEID"))?((JSONObject) req).get("SEXSTANAMEID").toString():"";
- sStatus=!PubTools.isEmpty(((JSONObject) req).get("SSTATUS"))?((Map) req).get("SSTATUS").toString():"";
- isPage=!PubTools.isEmpty(((JSONObject) req).get("ISPAGE"))?((Map) req).get("ISPAGE").toString():"";
- }
- }
- String whereParams="[{\"colName\":\"sPassId\",\"value\":\""+sPassId+"\"},{\"colName\":\"enSTANAME\",\"value\":\""+enSTANAME+"\"}," +
- "{\"colName\":\"exSTANAME\",\"value\":\""+exSTANAME+"\"},{\"colName\":\"sVEHICLEID\",\"value\":\""+sVEHICLEID+"\"}," +
- "{\"colName\":\"sVecheClass\",\"value\":\""+sVecheClass+"\"},{\"colName\":\"sVecheType\",\"value\":\""+sVecheType+"\"}," +
- "{\"colName\":\"sExitfeeType\",\"value\":\""+sExitfeeType+"\"},{\"colName\":\"SENSTANAMEID\",\"value\":\""+SENSTANAMEID+"\"}," +
- "{\"colName\":\"SEXSTANAMEID\",\"value\":\""+SEXSTANAMEID+"\"},{\"colName\":\"sStatus\",\"value\":\""+sStatus+"\"}]";
- if(PubTools.isNull(isPage) || "Y".equals(isPage)){
- start=(pageNum-1)*pageSize+1;
- end=pageNum*pageSize;
- }else{
- start=pageNum;
- end=pageSize;
- }
- List list = excelDateImpl.getDivPassidAll(classDate,vecheType,status,vecheClass,start,end,JSONArray.parseArray(whereParams));
- ExcelUtil.exportExcel(response,list,DivPassidAllDto.class,"流水信息","流水信息");
- } catch (IOException e) {
- e.printStackTrace();
- LogUtil.WriteLog_Error("流水数据导出失败"+e.getMessage(),"ExportData");
- }
- }
-
- @GetMapping(value = "/exportoutPortDivPassid")
- public void exportoutPortDivPassid(String paramsData,@RequestBody(required = false) Object req, HttpServletResponse response) {
- try {
-
- if(req==null || req== "undefined"){
- req=JSONObject.parse(paramsData);
- }
- String classDate="";
- Integer start=0;
- Integer end=0;
- Integer pageSize=0;//每页条数
- Integer pageNum=0;//当前页码
- //查询条件
- String sPassId="";
- String enSTANAME="";
- String exSTANAME="";
- String sVEHICLEID="";
- String sVecheClass="";//车种
- String sVecheType="";//车型
- String sExitfeeType="";//出口计费方式
- String SENSTANAMEID="";//入口站ID
- String SEXSTANAMEID="";//出口站ID
- String subconno="";//出口站ID
- String roadno="";//出口站ID
- String stano="";//出口站ID
- String sStatus="";
- String isPage="";
- if(!PubTools.isEmpty(req)){
- if(req instanceof Map){
- classDate=((Map) req).get("dataTime").toString();
- pageSize= !PubTools.isEmpty(((Map) req).get("pageSize"))?Integer.parseInt(((Map) req).get("pageSize").toString()):0;
- pageNum= !PubTools.isEmpty(((Map) req).get("pageNum"))?Integer.parseInt(((Map) req).get("pageNum").toString()):0;
- sPassId=!PubTools.isEmpty(((Map) req).get("SPASSID"))?((Map) req).get("SPASSID").toString():"";
- enSTANAME=!PubTools.isEmpty(((Map) req).get("ENSTANAME"))?((Map) req).get("ENSTANAME").toString():"";
- exSTANAME=!PubTools.isEmpty(((Map) req).get("EXSTANAME"))?((Map) req).get("EXSTANAME").toString():"";
- sVEHICLEID=!PubTools.isEmpty(((Map) req).get("SVEHICLEID"))?((Map) req).get("SVEHICLEID").toString():"";
- sVecheClass=!PubTools.isEmpty(((Map) req).get("SVECHECLASS"))?((Map) req).get("SVECHECLASS").toString():"";
- sVecheType=!PubTools.isEmpty(((Map) req).get("SVECHETYPE"))?((Map) req).get("SVECHETYPE").toString():"";
- sExitfeeType=!PubTools.isEmpty(((Map) req).get("SEXITFEETYPE"))?((Map) req).get("SEXITFEETYPE").toString():"";
- SENSTANAMEID=!PubTools.isEmpty(((Map) req).get("SENSTANAMEID"))?((Map) req).get("SENSTANAMEID").toString():"";
- SEXSTANAMEID=!PubTools.isEmpty(((Map) req).get("SEXSTANAMEID"))?((Map) req).get("SEXSTANAMEID").toString():"";
- sStatus=!PubTools.isEmpty(((Map) req).get("SSTATUS"))?((Map) req).get("SSTATUS").toString():"";
- subconno=!PubTools.isEmpty(((Map) req).get("SSUBCOMNO"))?((Map) req).get("SSUBCOMNO").toString():"";
- roadno=!PubTools.isEmpty(((Map) req).get("SROADNO"))?((Map) req).get("SROADNO").toString():"";
- stano=!PubTools.isEmpty(((Map) req).get("SSTANO"))?((Map) req).get("SSTANO").toString():"";
- isPage=!PubTools.isEmpty(((Map) req).get("ISPAGE"))?((Map) req).get("ISPAGE").toString():"";
- }else if(req instanceof JSONObject){
- classDate=((JSONObject) req).get("dataTime").toString();
- pageSize= !PubTools.isEmpty(((JSONObject) req).get("pageSize"))?Integer.parseInt(((JSONObject) req).get("pageSize").toString()):0;
- pageNum= !PubTools.isEmpty(((JSONObject) req).get("pageNum"))?Integer.parseInt(((JSONObject) req).get("pageNum").toString()):0;
- sPassId=!PubTools.isEmpty(((JSONObject) req).get("SPASSID"))?((JSONObject) req).get("SPASSID").toString():"";
- enSTANAME=!PubTools.isEmpty(((JSONObject) req).get("ENSTANAME"))?((JSONObject) req).get("ENSTANAME").toString():"";
- exSTANAME=!PubTools.isEmpty(((JSONObject) req).get("EXSTANAME"))?((JSONObject) req).get("EXSTANAME").toString():"";
- sVEHICLEID=!PubTools.isEmpty(((JSONObject) req).get("SVEHICLEID"))?((JSONObject) req).get("SVEHICLEID").toString():"";
- sVecheClass=!PubTools.isEmpty(((JSONObject) req).get("SVECHECLASS"))?((JSONObject) req).get("SVECHECLASS").toString():"";
- sVecheType=!PubTools.isEmpty(((JSONObject) req).get("SVECHETYPE"))?((JSONObject) req).get("SVECHETYPE").toString():"";
- sExitfeeType=!PubTools.isEmpty(((JSONObject) req).get("SEXITFEETYPE"))?((JSONObject) req).get("SEXITFEETYPE").toString():"";
- SENSTANAMEID=!PubTools.isEmpty(((JSONObject) req).get("SENSTANAMEID"))?((JSONObject) req).get("SENSTANAMEID").toString():"";
- SEXSTANAMEID=!PubTools.isEmpty(((JSONObject) req).get("SEXSTANAMEID"))?((JSONObject) req).get("SEXSTANAMEID").toString():"";
- sStatus=!PubTools.isEmpty(((JSONObject) req).get("SSTATUS"))?((JSONObject) req).get("SSTATUS").toString():"";
- subconno=!PubTools.isEmpty(((JSONObject) req).get("SSUBCOMNO"))?((JSONObject) req).get("SSUBCOMNO").toString():"";
- roadno=!PubTools.isEmpty(((JSONObject) req).get("SROADNO"))?((JSONObject) req).get("SROADNO").toString():"";
- stano=!PubTools.isEmpty(((JSONObject) req).get("STANO"))?((JSONObject) req).get("STANO").toString():"";
- isPage=!PubTools.isEmpty(((JSONObject) req).get("ISPAGE"))?((JSONObject) req).get("ISPAGE").toString():"";
- }
- }
-
- String whereParams="[{\"colName\":\"sPassId\",\"value\":\""+sPassId+"\"},{\"colName\":\"enSTANAME\",\"value\":\""+enSTANAME+"\"}," +
- "{\"colName\":\"exSTANAME\",\"value\":\""+exSTANAME+"\"},{\"colName\":\"sVEHICLEID\",\"value\":\""+sVEHICLEID+"\"}," +
- "{\"colName\":\"sVecheClass\",\"value\":\""+sVecheClass+"\"},{\"colName\":\"sVecheType\",\"value\":\""+sVecheType+"\"}," +
- "{\"colName\":\"sExitfeeType\",\"value\":\""+sExitfeeType+"\"},{\"colName\":\"SENSTANAMEID\",\"value\":\""+SENSTANAMEID+"\"}," +
- "{\"colName\":\"SEXSTANAMEID\",\"value\":\""+SEXSTANAMEID+"\"},{\"colName\":\"sStatus\",\"value\":\""+sStatus+"\"}," +
- "{\"colName\":\"subcomno\",\"value\":\""+subconno+"\"},{\"colName\":\"stano\",\"value\":\""+stano+"\"},{\"colName\":\"roadno\",\"value\":\""+roadno+"\"}]";
- if(PubTools.isNull(isPage) || "Y".equals(isPage)){
- start=(pageNum-1)*pageSize+1;
- end=pageNum*pageSize;
- }else{
- start=pageNum;
- end=pageSize;
- }
- List list = excelDateImpl.getOutPortDivPassid(classDate,start,end, JSONArray.parseArray(whereParams));
- ExcelUtil.exportExcel(response,list, OutPortDivPassidDto.class,"出口流水信息","出口流水信息");
- } catch (IOException e) {
- e.printStackTrace();
- LogUtil.WriteLog_Error("出口流水数据导出失败"+e.getMessage(),"ExportData");
- }
- }
-
- @GetMapping(value="/exportGantryPassDivList")
- public void getGantryPassDivList(String paramsData, @RequestBody(required = false) Object req,HttpServletResponse response) throws SQLException {
- try {
- if(req==null || req== "undefined"){
- req=JSONObject.parse(paramsData);
- }
- Integer start=0;
- Integer end=0;
- Integer pageSize=0;//每页条数
- Integer pageNum=0;//当前页码
-
- //查询条件
- String classDate="";
- String sPassId="";
- String enSTANAME="";
- String exSTANAME="";
- String sVEHICLEID="";
- String sVecheClass="";//车种
- String sVecheType="";//车型
- String sExitfeeType="";//出口计费方式
- String SENSTANAMEID="";//入口站ID
- String SEXSTANAMEID="";//出口站ID
- String sStatus="";//拆分状态
- String subconno="";//出口站ID
- String roadno="";//出口站ID
- String stano="";//出口站ID
- String sGANTRYHEX="";//省门架hex
- String sEACHGANTRY="";//互通站
- String isPage="";
- if(!PubTools.isEmpty(req)){
- if(req instanceof Map){
- classDate=((Map) req).get("dataTime").toString();
- pageSize= !PubTools.isEmpty(((Map) req).get("pageSize"))?Integer.parseInt(((Map) req).get("pageSize").toString()):0;
- pageNum= !PubTools.isEmpty(((Map) req).get("pageNum"))?Integer.parseInt(((Map) req).get("pageNum").toString()):0;
- sPassId=!PubTools.isEmpty(((Map) req).get("SPASSID"))?((Map) req).get("SPASSID").toString():"";
- enSTANAME=!PubTools.isEmpty(((Map) req).get("ENSTANAME"))?((Map) req).get("ENSTANAME").toString():"";
- exSTANAME=!PubTools.isEmpty(((Map) req).get("EXSTANAME"))?((Map) req).get("EXSTANAME").toString():"";
- sVEHICLEID=!PubTools.isEmpty(((Map) req).get("SVEHICLEID"))?((Map) req).get("SVEHICLEID").toString():"";
- sVecheClass=!PubTools.isEmpty(((Map) req).get("SVECHECLASS"))?((Map) req).get("SVECHECLASS").toString():"";
- sVecheType=!PubTools.isEmpty(((Map) req).get("SVECHETYPE"))?((Map) req).get("SVECHETYPE").toString():"";
- sExitfeeType=!PubTools.isEmpty(((Map) req).get("SEXITFEETYPE"))?((Map) req).get("SEXITFEETYPE").toString():"";
- SENSTANAMEID=!PubTools.isEmpty(((Map) req).get("SENSTANAMEID"))?((Map) req).get("SENSTANAMEID").toString():"";
- SEXSTANAMEID=!PubTools.isEmpty(((Map) req).get("SEXSTANAMEID"))?((Map) req).get("SEXSTANAMEID").toString():"";
- sStatus=!PubTools.isEmpty(((Map) req).get("SSTATUS"))?((Map) req).get("SSTATUS").toString():"";
- subconno=!PubTools.isEmpty(((Map) req).get("SSUBCOMNO"))?((Map) req).get("SSUBCOMNO").toString():"";
- roadno=!PubTools.isEmpty(((Map) req).get("SROADNO"))?((Map) req).get("SROADNO").toString():"";
- stano=!PubTools.isEmpty(((Map) req).get("SSTANO"))?((Map) req).get("SSTANO").toString():"";
- sGANTRYHEX=!PubTools.isEmpty(((Map) req).get("SGANTRYHEX"))?((Map) req).get("SGANTRYHEX").toString():"";
- sEACHGANTRY=!PubTools.isEmpty(((Map) req).get("SEACHGANTRY"))?((Map) req).get("SEACHGANTRY").toString():"";
- isPage=!PubTools.isEmpty(((Map) req).get("ISPAGE"))?((Map) req).get("ISPAGE").toString():"";
- }else if(req instanceof JSONObject){
- classDate=((JSONObject) req).get("dataTime").toString();
- pageSize= !PubTools.isEmpty(((JSONObject) req).get("pageSize"))?Integer.parseInt(((JSONObject) req).get("pageSize").toString()):0;
- pageNum= !PubTools.isEmpty(((JSONObject) req).get("pageNum"))?Integer.parseInt(((JSONObject) req).get("pageNum").toString()):0;
- sPassId=!PubTools.isEmpty(((JSONObject) req).get("SPASSID"))?((JSONObject) req).get("SPASSID").toString():"";
- enSTANAME=!PubTools.isEmpty(((JSONObject) req).get("ENSTANAME"))?((JSONObject) req).get("ENSTANAME").toString():"";
- exSTANAME=!PubTools.isEmpty(((JSONObject) req).get("EXSTANAME"))?((JSONObject) req).get("EXSTANAME").toString():"";
- sVEHICLEID=!PubTools.isEmpty(((JSONObject) req).get("SVEHICLEID"))?((JSONObject) req).get("SVEHICLEID").toString():"";
- sVecheClass=!PubTools.isEmpty(((JSONObject) req).get("SVECHECLASS"))?((JSONObject) req).get("SVECHECLASS").toString():"";
- sVecheType=!PubTools.isEmpty(((JSONObject) req).get("SVECHETYPE"))?((JSONObject) req).get("SVECHETYPE").toString():"";
- sExitfeeType=!PubTools.isEmpty(((JSONObject) req).get("SEXITFEETYPE"))?((JSONObject) req).get("SEXITFEETYPE").toString():"";
- SENSTANAMEID=!PubTools.isEmpty(((JSONObject) req).get("SENSTANAMEID"))?((JSONObject) req).get("SENSTANAMEID").toString():"";
- SEXSTANAMEID=!PubTools.isEmpty(((JSONObject) req).get("SEXSTANAMEID"))?((JSONObject) req).get("SEXSTANAMEID").toString():"";
- sStatus=!PubTools.isEmpty(((Map) req).get("SSTATUS"))?((Map) req).get("SSTATUS").toString():"";
- subconno=!PubTools.isEmpty(((JSONObject) req).get("SSUBCOMNO"))?((JSONObject) req).get("SSUBCOMNO").toString():"";
- roadno=!PubTools.isEmpty(((JSONObject) req).get("SROADNO"))?((JSONObject) req).get("SROADNO").toString():"";
- stano=!PubTools.isEmpty(((JSONObject) req).get("SSTANO"))?((JSONObject) req).get("SSTANO").toString():"";
- sGANTRYHEX=!PubTools.isEmpty(((JSONObject) req).get("SGANTRYHEX"))?((JSONObject) req).get("SGANTRYHEX").toString():"";
- sEACHGANTRY=!PubTools.isEmpty(((JSONObject) req).get("SEACHGANTRY"))?((JSONObject) req).get("SEACHGANTRY").toString():"";
- isPage=!PubTools.isEmpty(((JSONObject) req).get("ISPAGE"))?((Map) req).get("ISPAGE").toString():"";
- }
- }
- String whereParams="[{\"colName\":\"sPassId\",\"value\":\""+sPassId+"\"},{\"colName\":\"enSTANAME\",\"value\":\""+enSTANAME+"\"}," +
- "{\"colName\":\"exSTANAME\",\"value\":\""+exSTANAME+"\"},{\"colName\":\"sVEHICLEID\",\"value\":\""+sVEHICLEID+"\"}," +
- "{\"colName\":\"sVecheClass\",\"value\":\""+sVecheClass+"\"},{\"colName\":\"sVecheType\",\"value\":\""+sVecheType+"\"}," +
- "{\"colName\":\"sExitfeeType\",\"value\":\""+sExitfeeType+"\"},{\"colName\":\"SENSTANAMEID\",\"value\":\""+SENSTANAMEID+"\"}," +
- "{\"colName\":\"SEXSTANAMEID\",\"value\":\""+SEXSTANAMEID+"\"},{\"colName\":\"sStatus\",\"value\":\""+sStatus+"\"}" +
- "{\"colName\":\"subcomno\",\"value\":\""+subconno+"\"},{\"colName\":\"stano\",\"value\":\""+stano+"\"},{\"colName\":\"roadno\",\"value\":\""+roadno+"\"}," +
- "{\"colName\":\"sGANTRYHEX\",\"value\":\""+sGANTRYHEX+"\"},{\"colName\":\"sEACHGANTRY\",\"value\":\""+sEACHGANTRY+"\"}]]";
- if(PubTools.isNull(isPage) || "Y".equals(isPage)){
- start=(pageNum-1)*pageSize+1;
- end=pageNum*pageSize;
- }else{
- start=pageNum;
- end=pageSize;
- }
- Integer totalCount=0;
- List list = excelDateImpl.exportGantryPassDivList(classDate,start,end, JSONArray.parseArray(whereParams));
- ExcelUtil.exportExcel(response,list, GantryPassDivDto.class,"计费验证信息","计费验证信息");
- } catch (IOException e) {
- e.printStackTrace();
- LogUtil.WriteLog_Error("计费验证数据导出失败"+e.getMessage(),"ExportData");
- }
- }*/
}
diff --git a/src/main/java/com/nmgs/service/impl/ExcelDateImpl.java b/src/main/java/com/nmgs/service/impl/ExcelDateImpl.java
index d6c2367..97981eb 100644
--- a/src/main/java/com/nmgs/service/impl/ExcelDateImpl.java
+++ b/src/main/java/com/nmgs/service/impl/ExcelDateImpl.java
@@ -5,603 +5,4 @@ import org.springframework.stereotype.Service;
@Service
public class ExcelDateImpl {
- /* @Autowired
- public Mapper mapperI;
- public List getDivPassidAll(String classDate, String vecheType, String status, String vecheClass, Integer start, Integer end,
- JSONArray whereParams) {
- List list=new ArrayList();
- List listRet=new ArrayList();
- String sql="";
- String resultSql="SELECT \n" +
- " tt.rn,\n" +
- "\ttt.ID,\n" +
- "\ttt.PASSID,\n" +
- "\tto_char(tt.GPA_TOLLINTERVALID) as GPA_TOLLINTERVALID,\n" +
- "\t to_char(tt.GPA_FEEGROUP) as GPA_FEEGROUP,\n" +
- "\ttt.GPA_FEE /100 AS GPA_FEE,\n" +
- "\tto_char(tt.DIV_TOLLINTERVALID) as DIV_TOLLINTERVALID,\n" +
- "\tto_char(tt.DIV_FEEGROUP) as DIV_FEEGROUP,\n" +
- "\ttt.DIV_FEE/100 AS DIV_FEE,\n" +
- "\ttt.CLASSDATE,\n" +
- "\ttt.GPA_ENTIME,\n" +
- "\ttt.GPA_EXTIME,\n" +
- "\ttt.GPA_ENTOLLSTATIONNAME,\n" +
- "\ttt.GPA_EXTOLLSTATIONNAME,\n" +
- "\ttt.GPA_ENPOINTID,\n" +
- "\ttt.GPA_EXPOINTID,\n" +
- "\ttt.GPA_VEHICLEID,\n" +
- "\tttd.VALUE as GPA_VEHICLETYPE,\n" +
- "\ttt.STATUS,\n" +
- "\ttt.CHECKSTATUS,\n" +
- "\ttt.STATUSNAME,\n" +
- "\ttt.CHECKSTATUSNAME,\n" +
- "\tttd.text AS VEHICLENAME,\n" +
- "\tvt.text as VEHICLECLASSName,\n" +
- "\ta.TYPE,\n" +
- "\te.text AS KIND,\n" +
- "\t( a.incash + a.paycash )/100 AS FEE,\n" +
- "\t a.CASH/100 AS PAYFEE,\n" +
- "\tc.TEXT AS PAYTYPE,\n" +
- "\td.TEXT AS EXITFEETYPE,\n" +
- "\ta.FLAG AS FLAGVALUE,\n" +
- "\ttt.VEHICLECLASS" ;
- String startsql ="SELECT \n" +
- "\tss.rn,\n" +
- "\tss.ID,\n" +
- "\tss.PASSID,\n" +
- "\t ss.GPA_TOLLINTERVALID AS GPA_TOLLINTERVALID,\n" +
- "\tss.GPA_FEEGROUP AS GPA_FEEGROUP,\n" +
- "\tss.GPA_FEE,\n" +
- "\tss.DIV_TOLLINTERVALID AS DIV_TOLLINTERVALID,\n" +
- "\tss.DIV_FEEGROUP AS DIV_FEEGROUP,\n" +
- "\tss.DIV_FEE,\n" +
- "\tss.CLASSDATE,\n" +
- "\tss.GPA_ENTIME,\n" +
- "\tss.GPA_EXTIME,\n" +
- "\tss.GPA_ENTOLLSTATIONNAME,\n" +
- "\tss.GPA_EXTOLLSTATIONNAME,\n" +
- "\tss.GPA_ENPOINTID,\n" +
- "\tss.GPA_EXPOINTID,\n" +
- "\tss.GPA_VEHICLEID ,\n" +
- "\tss.STATUS,\n" +
- "\tss.CHECKSTATUS,\n" +
- "\tss.STATUSNAME,\n" +
- "\tss.CHECKSTATUSNAME,\n" +
- "\tss.VEHICLECLASS,\n" +
- "\tss.VEHICLETYPE ";
-
-
- String startsqlPage ="SELECT ROWNUM AS\n" +
- "\trn,\n" +
- "\tt.ID,\n" +
- "\tt.PASSID,\n" +
- "\t t.GPA_TOLLINTERVALID AS GPA_TOLLINTERVALID,\n" +
- "\tt.GPA_FEEGROUP AS GPA_FEEGROUP,\n" +
- "\tt.GPA_FEE,\n" +
- "\tt.DIV_TOLLINTERVALID AS DIV_TOLLINTERVALID,\n" +
- "\tt.DIV_FEEGROUP AS DIV_FEEGROUP,\n" +
- "\tt.DIV_FEE,\n" +
- "\tt.CLASSDATE,\n" +
- "\tt.GPA_ENTIME,\n" +
- "\tt.GPA_EXTIME,\n" +
- "\tt.GPA_ENTOLLSTATIONNAME,\n" +
- "\tt.GPA_EXTOLLSTATIONNAME,\n" +
- "\tt.GPA_ENPOINTID,\n" +
- "\tt.GPA_EXPOINTID,\n" +
- "\tCONCAT(substr( t.VEHICLEID, 1,instr(t.VEHICLEID,'_')-1) || '_',(select text from PLATECOLOR_TEXT where value=substr( t.VEHICLEID, instr(t.VEHICLEID,'_')+1))) AS GPA_VEHICLEID,\n" +
- "\tt.VEHICLETYPE AS GPA_VEHICLETYPE,\n" +
- "\tt.STATUS,\n" +
- "\tt.CHECKSTATUS,\n" +
- "\t(\n" +
- "\tCASE\n" +
- "\t\t\tt.STATUS \n" +
- "\t\t\tWHEN 1 THEN\n" +
- "\t\t\t'拆分准确' \n" +
- "\t\t\tWHEN 2 THEN\n" +
- "\t\t\t'计费大于拆分' \n" +
- "\t\t\tWHEN 3 THEN\n" +
- "\t\t\t'计费小于拆分' \n" +
- "\t\t\tWHEN 4 THEN\n" +
- "\t\t\t'未计费' \n" +
- "\t\t\tWHEN 5 THEN\n" +
- "\t\t\t'未拆分' \n" +
- "\t\t\tWHEN 6 THEN\n" +
- "\t\t\t'拒付' \n" +
- "\t\t\tWHEN 7 THEN\n" +
- "\t\t\t'逾期' \n" +
- "\t\t\tWHEN 99 THEN\n" +
- "\t\t\t'U转' ELSE '未知' \n" +
- "\t\tEND \n" +
- "\t\t) STATUSNAME,\n" +
- "\t( CASE t.CHECKSTATUS WHEN 0 THEN '未稽核' WHEN 1 THEN '已稽核' ELSE '未知' END ) CHECKSTATUSNAME,\n" +
- "\tt.VEHICLECLASS,\n" +
- "\tt.VEHICLETYPE AS VEHICLETYPE";
- String endSql=" FROM\n" +
- " div_passid_all t " +
- "WHERE\n" +
- "\t t.classdate = to_date( '"+classDate+"', 'yyyy-mm-dd' ) \n";
- try{
- if(!PubTools.isNull(vecheType)){
- endSql += " AND t.vehicletype = ( SELECT value FROM type_text WHERE text = '"+vecheType+"' )";
- }
- if(!PubTools.isNull(vecheClass) && ("8".equals(vecheClass) || "21".equals(vecheClass))){
- endSql += "\tAND t.VEHICLECLASS = "+vecheClass+"";
- }else{
- if(!PubTools.isNull(status)){
- endSql += "\tAND t.STATUS = "+status+" and (t.VEHICLECLASS not in(8,21) or t.VEHICLECLASS is null) ";
- }
- }
- if(whereParams.size()>0){
- endSql += solveSearchJSOn(whereParams);
- }
- if(start >=0 && end >0){
- sql = resultSql+" from ("+startsql+" from ("+startsqlPage+endSql+ " and ROWNUM <= "+end+")ss where 1=1 AND ss.rn >= "+start+" )tt " +
- " LEFT JOIN VEHICLECLASS_TEXT vt ON ( tt.VEHICLECLASS = vt.value ) " +
- " LEFT JOIN type_text ttd ON ( tt.VEHICLETYPE = ttd.value ) " +
- " left join out_port a on(a.passId = tt.passId) " +
- " left join paytype_text c on(a.paytype = c.value) " +
- " left join exitfeetype_text d on(a.exitfeetype = d.value)" +
- " left join kind_text e on(a.kind = e.value) where 1=1 order by tt.rn " ;
- }
- LogUtil.WriteLog_Info("getDivDataTableList===sql==="+sql,"ExcelDateImpl");
- LogUtil.WriteLog_Info("sql===执行开始"+PubTools.getCurrentDate(),"ExcelDateImpl");
- list= this.mapperI.selectforlist(sql);
- LogUtil.WriteLog_Info("sql===执行结束"+PubTools.getCurrentDate(),"ExcelDateImpl");
- if(list.size()>0){
- if(PubTools.isEmpty(list.get(0))){
- list=new ArrayList();
- }else{
- //解析特情值不是查询总数
- if(start >=0 && end>0){
- for(int i=0;i) list.get(i);
- if(!PubTools.isEmpty(map.get("FLAGVALUE"))){
- String flagType="";
- if (!PubTools.isNull(map.get("FLAGVALUE").toString())) {
- String binaryString = Long.toBinaryString(Long.parseLong(map.get("FLAGVALUE").toString()));//转换为二进制字符串
- if ("0".equals(binaryString)) {
- flagType = "0";
- } else {
- char[] bytes = binaryString.toCharArray();
- int j = 1;
- for (int k = bytes.length - 1; k > -1; k--) {
- if (bytes[k] == '1') {
- if ("".equals(flagType)) {
- flagType = j + "";
- } else {
- flagType += "," + j;
- }
- }
- j++;
- }
- }
- }
- if(!PubTools.isNull(flagType)){
- String flagType1 = getFlagType(flagType);
- map.put("FLAG",flagType1);
- }else{
- map.put("FLAG","");
- }
-
- }else{
- map.put("FLAG","");
- }
- *//* ObjectMapper objectMapper= new ObjectMapper();
- listRet.add(objectMapper.convertValue(map,DivPassidAllDto.class));*//*
- DivPassidAllDto dto=new DivPassidAllDto();
- dto.setRN(Integer.parseInt(map.get("RN").toString()));
- dto.setPASSID((map.get("PASSID").toString()));
- dto.setCLASSDATE((map.get("CLASSDATE").toString()));
- if(!PubTools.isEmpty(map.get("DIV_FEE"))){
- dto.setDIV_FEE(new BigDecimal(map.get("DIV_FEE").toString()));
- }
- if(!PubTools.isEmpty(map.get("FEE"))){
- dto.setFEE(new BigDecimal(map.get("FEE").toString()));
- }
- dto.setCONTENT(!PubTools.isEmpty(map.get("CONTENT"))?map.get("CONTENT").toString():"");
- dto.setFLAG(!PubTools.isEmpty(map.get("FLAG"))?map.get("FLAG").toString():"");
- dto.setEXITFEETYPE(!PubTools.isEmpty(map.get("EXITFEETYPE"))?map.get("EXITFEETYPE").toString():"");
- if(!PubTools.isEmpty(map.get("GPA_ENTIME"))){
- dto.setGPA_ENTIME((Date)(map.get("GPA_ENTIME")));
- }
- dto.setGPA_ENTOLLSTATIONNAME(!PubTools.isEmpty(map.get("GPA_ENTOLLSTATIONNAME"))?map.get("GPA_ENTOLLSTATIONNAME").toString():"");
- if(!PubTools.isEmpty(map.get("GPA_EXTIME"))){
- dto.setGPA_EXTIME((Date)(map.get("GPA_EXTIME")));
- }
- dto.setGPA_EXTOLLSTATIONNAME(!PubTools.isEmpty(map.get("GPA_EXTOLLSTATIONNAME"))?map.get("GPA_EXTOLLSTATIONNAME").toString():"");
- if(!PubTools.isEmpty(map.get("GPA_FEE"))){
- dto.setGPA_FEE(new BigDecimal(map.get("GPA_FEE").toString()));
- }
-
- dto.setGPA_VEHICLEID(!PubTools.isEmpty(map.get("GPA_VEHICLEID"))?map.get("GPA_VEHICLEID").toString():"");
- if(!PubTools.isEmpty(map.get("PAYFEE"))){
- dto.setPAYFEE(new BigDecimal(map.get("PAYFEE").toString()));
- }
- dto.setPAYTYPE(!PubTools.isEmpty(map.get("PAYTYPE"))?map.get("PAYTYPE").toString():"");
- dto.setSTATUSNAME(!PubTools.isEmpty(map.get("STATUSNAME"))?map.get("STATUSNAME").toString():"");
- dto.setVEHICLECLASSNAME(!PubTools.isEmpty(map.get("VEHICLECLASSNAME"))?map.get("VEHICLECLASSNAME").toString():"");
- dto.setVEHICLENAME(!PubTools.isEmpty(map.get("VEHICLENAME"))?map.get("VEHICLENAME").toString():"");
- listRet.add(dto);
-
- }
-
- }
- }
- }
- }catch(Exception e){
- e.printStackTrace();
- LogUtil.WriteLog_Error("查询数据失败==="+e.getMessage(),"ExcelDateImpl");
- return new ArrayList();
- }
- return listRet;
-
- }
- public List getOutPortDivPassid(String classDate, Integer start, Integer end, JSONArray whereParams) {
- List list=new ArrayList();
- List listRet=new ArrayList();
- String sql="";
- String resultSql="SELECT \n" +
- "tt.rn,\n" +
- "\ttt.ID,\n" +
- "\ttt.PASSID,\n" +
- "\tdnt.STANAME AS STANAME,\n" +
- "\tto_char(t.GPA_TOLLINTERVALID) as GPA_TOLLINTERVALID,\n" +
- "\t to_char(t.GPA_FEEGROUP) as GPA_FEEGROUP,\n" +
- "\tt.GPA_FEE /100 AS GPA_FEE,\n" +
- "\tto_char(t.DIV_TOLLINTERVALID) as DIV_TOLLINTERVALID,\n" +
- "\tto_char(t.DIV_FEEGROUP) as DIV_FEEGROUP,\n" +
- "\tt.DIV_FEE/100 AS DIV_FEE,\n" +
- "\ttt.CLASSDATE,\n" +
- "\tt.GPA_ENTIME,\n" +
- "\tt.GPA_EXTIME,\n" +
- "\tt.GPA_ENTOLLSTATIONNAME,\n" +
- "\tt.GPA_EXTOLLSTATIONNAME,\n" +
- "\tt.GPA_ENPOINTID,\n" +
- "\tt.GPA_EXPOINTID,\n" +
- "\ttt.ACARNO AS GPA_VEHICLEID,\n" +
- "\ttt.TYPE AS GPA_VEHICLETYPE,\n" +
- "\tt.STATUS,\n" +
- "\tt.CHECKSTATUS,\n" +
- "\t(\n" +
- "\tCASE\n" +
- "\t\t\tt.STATUS \n" +
- "\t\t\tWHEN 1 THEN\n" +
- "\t\t\t'拆分准确' \n" +
- "\t\t\tWHEN 2 THEN\n" +
- "\t\t\t'计费大于拆分' \n" +
- "\t\t\tWHEN 3 THEN\n" +
- "\t\t\t'计费小于拆分' \n" +
- "\t\t\tWHEN 4 THEN\n" +
- "\t\t\t'未计费' \n" +
- "\t\t\tWHEN 5 THEN\n" +
- "\t\t\t'未拆分' \n" +
- "\t\t\tWHEN 6 THEN\n" +
- "\t\t\t'拒付' \n" +
- "\t\t\tWHEN 7 THEN\n" +
- "\t\t\t'逾期' \n" +
- "\t\t\tWHEN 99 THEN\n" +
- "\t\t\t'U转' ELSE '未知' \n" +
- "\t\tEND \n" +
- "\t\t) STATUSNAME,\n" +
- "\t( CASE t.CHECKSTATUS WHEN 0 THEN '未稽核' WHEN 1 THEN '已稽核' ELSE '未知' END ) CHECKSTATUSNAME,\n" +
- "\ttt.VEHICLECLASS,\n" +
- "\tvt.text AS VEHICLECLASSNAME,\n" +
- "\ttt.TYPE AS TYPE,\n" +
- "\te.TEXT AS KIND,\n" +
- "\ttt.FEE/100 AS FEE,\n" +
- "\ttt.PAYFEE/100 AS PAYFEE,\n" +
- "\tc.TEXT AS PAYTYPE,\n" +
- "\td.TEXT AS EXITFEETYPE,\n" +
- "\ttt.FLAG AS FLAGVALUE,\n" +
- "\tttd.TEXT AS VEHICLENAME";
-
- String startsql ="SELECT " +
- "\tss.rn,\n" +
- "\tss.ID,\n" +
- "\tss.PASSID,\n" +
- "\tss.ACARNO,\n" +
- "\tss.STANO AS STANO,\n" +
- "\tss.CLASSDATE,\n" +
- "\tss.GPA_VEHICLEID AS GPA_VEHICLEID,\n" +
- "\tss.VEHICLECLASS,\n" +
- "\tss.TYPE AS TYPE,\n" +
- "\tss.KIND AS KIND,\n" +
- "\tss.FEE AS FEE,\n" +
- "\tss.PAYFEE AS PAYFEE,\n" +
- "\tss.paytype AS PAYTYPE,\n" +
- "\tss.exitfeetype AS EXITFEETYPE,\n" +
- "\tss.FLAG AS FLAG " ;
- String startPagesql ="SELECT ROWNUM AS\n" +
- "\trn,\n" +
- "\ta.ID,\n" +
- "\ta.PASSID,\n" +
- "\ta.ACARNO,\n" +
- "\ta.STANO AS STANO,\n" +
- "\ta.CLASSDATE,\n" +
- "\ta.ACARNO AS GPA_VEHICLEID,\n" +
- "\ta.VEHICLECLASS,\n" +
- "\ta.TYPE AS TYPE,\n" +
- "\ta.KIND AS KIND,\n" +
- "\t( a.incash + a.paycash ) AS FEE,\n" +
- "\ta.CASH AS PAYFEE,\n" +
- "\ta.paytype AS PAYTYPE,\n" +
- "\ta.exitfeetype AS EXITFEETYPE,\n" +
- "\ta.FLAG AS FLAG " ;
- String endSql=" FROM\n" +
- " out_port a" +
- " WHERE\n" +
- "\t a.flag <>1 and a.classdate = to_date( '"+classDate+"', 'yyyy-mm-dd' ) \n";
- try{
- *//*if(!PubTools.isNull(vecheType)){
- endSql += " AND t.vehicletype = ( SELECT value FROM type_text WHERE text = '"+vecheType+"' )";
- }
- if(!PubTools.isNull(vecheClass) && ("8".equals(vecheClass) || "21".equals(vecheClass))){
- endSql += "\tAND t.VEHICLECLASS = "+vecheClass+"";
- }else{
- if(!PubTools.isNull(status)){
- endSql += "\tAND t.STATUS = "+status+" and (t.VEHICLECLASS not in(8,21) or t.VEHICLECLASS is null) ";
- }
- }*//*
-
- if(whereParams.size()>0){
- endSql += solveSearchJSOn(whereParams);
- }
- if(start >=0 && end >0){
- sql = resultSql+" from ("+ startsql + " FROM ("+ startPagesql +endSql+ " and ROWNUM <= "+end+" order by a.PASSID )ss where 1=1 AND ss.rn >= "+start+ ")tt"+
- " left join div_passid_all t on(tt.passId = t.passId) " +
- " LEFT JOIN VEHICLECLASS_TEXT vt ON ( tt.VEHICLECLASS = vt.value ) " +
- " LEFT JOIN type_text ttd ON ( tt.TYPE = ttd.value ) " +
- " left join paytype_text c on(tt.paytype = c.value) " +
- " left join exitfeetype_text d on(tt.exitfeetype = d.value) " +
- " left join kind_text e on(tt.kind = e.value) " +
- " left join DIV_NAME_TABLE dnt on (dnt.STATYPE=1 and dnt.STANO = tt.STANO) where 1=1 order by tt.rn" ;
- }
- LogUtil.WriteLog_Info("getDivDataTableList===sql==="+sql,"ExcelDateImpl");
- LogUtil.WriteLog_Info("sql===执行开始"+PubTools.getCurrentDate(),"ExcelDateImpl");
- list= this.mapperI.selectforlist(sql);
- LogUtil.WriteLog_Info("sql===执行结束"+PubTools.getCurrentDate(),"ExcelDateImpl");
- if(list.size()>0){
- if(PubTools.isEmpty(list.get(0))){
- list=new ArrayList();
- }else{
- //解析特情值不是查询总数
- if(start >=0 && end>0){
- for(int i=0;i) list.get(i);
- if(!PubTools.isEmpty(map.get("FLAGVALUE"))){
- String flagType="";
- if (!PubTools.isNull(map.get("FLAGVALUE").toString())) {
- String binaryString = Long.toBinaryString(Long.parseLong(map.get("FLAGVALUE").toString()));//转换为二进制字符串
- if ("0".equals(binaryString)) {
- flagType = "0";
- } else {
- char[] bytes = binaryString.toCharArray();
- int j = 1;
- for (int k = bytes.length - 1; k > -1; k--) {
- if (bytes[k] == '1') {
- if ("".equals(flagType)) {
- flagType = j + "";
- } else {
- flagType += "," + j;
- }
- }
- j++;
- }
- }
- }
- if(!PubTools.isNull(flagType)){
- String flagType1 = getFlagType(flagType);
- map.put("FLAG",flagType1);
- }else{
- map.put("FLAG","");
- }
-
- }else{
- map.put("FLAG","");
- }
- *//* ObjectMapper objectMapper= new ObjectMapper();
- listRet.add(objectMapper.convertValue(map,DivPassidAllDto.class));*//*
- OutPortDivPassidDto dto=new OutPortDivPassidDto();
- dto.setRN(Integer.parseInt(map.get("RN").toString()));
- dto.setPASSID((map.get("PASSID").toString()));
- dto.setSTANAME((map.get("STANAME").toString()));
- dto.setCLASSDATE((map.get("CLASSDATE").toString()));
- dto.setDIV_FEE(new BigDecimal(map.get("DIV_FEE").toString()));
- dto.setFEE(new BigDecimal(map.get("FEE").toString()));
- dto.setCONTENT(!PubTools.isEmpty(map.get("CONTENT"))?map.get("CONTENT").toString():"");
- dto.setFLAG(!PubTools.isEmpty(map.get("FLAG"))?map.get("FLAG").toString():"");
- dto.setEXITFEETYPE(map.get("EXITFEETYPE").toString());
- dto.setGPA_ENTIME((Date)(map.get("GPA_ENTIME")));
- dto.setGPA_ENTOLLSTATIONNAME(map.get("GPA_ENTOLLSTATIONNAME").toString());
- dto.setGPA_EXTIME((Date)(map.get("GPA_EXTIME")));
- dto.setGPA_EXTOLLSTATIONNAME(map.get("GPA_EXTOLLSTATIONNAME").toString());
- dto.setGPA_FEE(new BigDecimal(map.get("DIV_FEE").toString()));
- dto.setGPA_VEHICLEID(map.get("GPA_VEHICLEID").toString());
- dto.setPAYFEE(new BigDecimal(map.get("PAYFEE").toString()));
- dto.setPAYTYPE(map.get("PAYTYPE").toString());
- dto.setSTATUSNAME(map.get("STATUSNAME").toString());
- dto.setVEHICLECLASSNAME(map.get("VEHICLECLASSNAME").toString());
- dto.setVEHICLENAME(map.get("VEHICLENAME").toString());
- listRet.add(dto);
-
- }
-
- }
- }
- }
- }catch(Exception e){
- e.printStackTrace();
- LogUtil.WriteLog_Error("查询数据失败==="+e.getMessage(),"ExcelDateImpl");
- return new ArrayList();
- }
- return listRet;
-
- }
-
- public List exportGantryPassDivList(String classDate, Integer start, Integer end, JSONArray whereParams) {
- List list=new ArrayList();
- List listRet=new ArrayList();
- String sql="";
- String resultSql="SELECT \n" +
- " RN,\n" +
- "\t PASSID,\n" +
- "\t CLASSDATE,\n" +
- "\t PAYFEE,\n" +
- "\t FEE,\n" +
- " VEHICALTYPENAME,\n" +
- "\t VEHICLEID,\n" +
- "\t ENPOINTNAME,\n" +
- "\t EXPOINTNAME,\n" +
- "\t ENTIME,\n" +
- "\t EXTIME";
-
- String startsql ="SELECT \n" +
- "\t\t\t\t ROWNUM as RN,\n" +
- "\t\t\t\t t.PASSID,\n" +
- "\t\t\t\t t.CLASSDATE,\n" +
- "\t\t\t\t t.PAYFEE/100 AS PAYFEE,\n" +
- "\t\t\t\t t.FEE/100 AS FEE,\n" +
- "\t\t\t\t ttd.TEXT AS VEHICALTYPENAME,\n" +
- "\t\t\t\t CONCAT(substr( t.VEHICLEID, 1,instr(t.VEHICLEID,'_')-1) || '_',(select text from PLATECOLOR_TEXT where value=substr( t.VEHICLEID, instr(t.VEHICLEID,'_')+1))) AS VEHICLEID,\n" +
- "\t\t\t\t gten.NAME AS ENPOINTNAME,\n" +
- "\t\t\t\t gtex.NAME AS EXPOINTNAME,\n" +
- "\t\t\t\t t.ENTIME,\n" +
- "\t\t\t\t t.EXTIME" ;
- String endSql=" FROM GANTRY_PASS_DIV t\n" +
- "\t\t\tLEFT JOIN type_text ttd ON ( t.VEHICLETYPE = ttd.value )\n" +
- "\t\t\tLEFT JOIN GANTRY_TABLE gten ON ( t.ENPOINTID = gten.GANTRYHEX)\n" +
- "\t\t\tLEFT JOIN GANTRY_TABLE gtex ON ( t.EXPOINTID = gtex.GANTRYHEX )" +
- "\t where t.classdate = to_date( '"+classDate+"', 'yyyy-mm-dd' ) \n";
- try{
- if(whereParams.size()>0){
- endSql += solveSearchJsonGantry(whereParams);
- }
- if(start >=0 && end >0){
- sql = resultSql+" from ("+ startsql +endSql+ " and ROWNUM <= "+end+" )ss where 1=1 AND ss.rn >= "+start+ "" ;
- }
- list= this.mapperI.selectforlist(sql);
- if(list.size()>0){
- if(!PubTools.isEmpty(list.get(0))){
- //解析特情值不是查询总数
- if(start >=0 && end>0){
- for(int i=0;i) list.get(i);
- GantryPassDivDto dto=new GantryPassDivDto();
- dto.setRN(Integer.parseInt(map.get("RN").toString()));
- dto.setPASSID((map.get("PASSID").toString()));
- dto.setCLASSDATE((map.get("CLASSDATE").toString()));
- if(!PubTools.isEmpty(map.get("FEE"))){
- dto.setFEE(new BigDecimal(map.get("FEE").toString()));
- }
- dto.setENTIME(PubTools.isEmpty(map.get("ENTIME"))?null:(Date)(map.get("ENTIME")));
- dto.setENPOINTNAME(PubTools.isEmpty(map.get("ENPOINTNAME"))?"":map.get("ENPOINTNAME").toString());
- dto.setEXTIME(PubTools.isEmpty(map.get("EXTIME"))?null:(Date)(map.get("EXTIME")));
- dto.setEXPOINTNAME(PubTools.isEmpty(map.get("EXPOINTNAME"))?"":map.get("EXPOINTNAME").toString());
- dto.setVEHICLEID(map.get("VEHICLEID").toString());
- dto.setVEHICALTYPENAME(PubTools.isEmpty(map.get("VEHICALTYPENAME"))?"":map.get("VEHICALTYPENAME").toString());
- listRet.add(dto);
- }
-
- }
- }
- }
- }catch(Exception e){
- e.printStackTrace();
- LogUtil.WriteLog_Error("查询数据失败==="+e.getMessage(),"ExcelDateImpl");
- return new ArrayList();
- }
- return listRet;
-
- }
-
- private String solveSearchJSOn(JSONArray params){
- String querySql="";
- if(params.size()>0){
- for(int k=0;k0){
- for(int k=0;k select1D=new HashMap<>();
- if(temp != null && temp.size()>0){
- Map select1=(Map)temp.get(0);
- ret= select1.get("FLAGTEXT").toString();
- }
- }catch(Exception e){
- e.printStackTrace();
- ret="";
- }
-
- return ret;
- }*/
}
diff --git a/src/main/java/com/nmgs/service/impl/IntegralSeriveImpl.java b/src/main/java/com/nmgs/service/impl/IntegralSeriveImpl.java
index 0043469..ecb9188 100644
--- a/src/main/java/com/nmgs/service/impl/IntegralSeriveImpl.java
+++ b/src/main/java/com/nmgs/service/impl/IntegralSeriveImpl.java
@@ -176,7 +176,7 @@ public class IntegralSeriveImpl {
if("4".equals(DBType)){
sqlTemp="SELECT ORDERNO AS\n" +
"\tORDERNO,\n" +
- "\tSUBSTR( VEHICLEID, 1, 3 ) || '***' || SUBSTR( VEHICLEID, 7 ) AS VEHICLEID,\n" +
+ "\tCONCAT(SUBSTR( VEHICLEID, 1, 3 ) ,'***' ,SUBSTR( VEHICLEID, 7 )) AS VEHICLEID,\n" +
"\tUSERNAME AS USRENAME,"+
"\tVEHICLEIDTEMP AS VEHICLEIDTEMP,"+
"\tMILEAGE,\n" +
@@ -187,7 +187,7 @@ public class IntegralSeriveImpl {
"\t (@row:=@row+1) AS ORDERNO,"+
"\t\t\tsubstr( vs.VEHICLEID, 1, instr( vs.VEHICLEID, '_' ) - 1 ) AS VEHICLEID,\n" +
"\t\t\tvs.VEHICLEID AS VEHICLEIDTEMP,\n" +
- "\t\t\t(select DISTINCT CASE WHEN LENGTH(COALESCE(wuttemp.REALNAME,''))=2 THEN SUBSTR(wuttemp.REALNAME,1,1)||'*' WHEN LENGTH(COALESCE(wuttemp.REALNAME,''))=3 THEN SUBSTR(wuttemp.REALNAME,1,1)||'*'||SUBSTR(wuttemp.REALNAME,3) WHEN LENGTH(COALESCE(wuttemp.REALNAME,''))>3 THEN SUBSTR(wuttemp.REALNAME,1,1)||'**'||SUBSTR(wuttemp.REALNAME,4) ELSE wuttemp.REALNAME END FROM USER_VEHICLE_TABLE uvttemp,WEIXN_USER_TABLE wuttemp where uvttemp.USERID = wuttemp.ID AND uvttemp.CERTIFICATION in(1) AND uvttemp.ACARNO=vs.VEHICLEID) AS USERNANE,"+
+ "\t\t\t(select DISTINCT CASE WHEN LENGTH(COALESCE(wuttemp.REALNAME,''))=2 THEN CONCAT(SUBSTR(wuttemp.REALNAME,1,1),'*') WHEN LENGTH(COALESCE(wuttemp.REALNAME,''))=3 THEN CONCAT(SUBSTR(wuttemp.REALNAME,1,1),'*',SUBSTR(wuttemp.REALNAME,3)) WHEN LENGTH(COALESCE(wuttemp.REALNAME,''))>3 THEN CONCAT(SUBSTR(wuttemp.REALNAME,1,1),'**',SUBSTR(wuttemp.REALNAME,4)) ELSE wuttemp.REALNAME END FROM USER_VEHICLE_TABLE uvttemp,WEIXN_USER_TABLE wuttemp where uvttemp.USERID = wuttemp.ID AND uvttemp.CERTIFICATION in(1) AND uvttemp.ACARNO=vs.VEHICLEID) AS USERNANE," +
"\tvs.VEHICLEID AS USERNAME,"+
"\t\tROUND(sum( vs.LENGTH / 1000 ),1) AS MILEAGE,\n" +
"\t\tROUND(sum( vs.SCORE ),1) AS INTEGRALSCORE \n" +
@@ -268,7 +268,7 @@ public class IntegralSeriveImpl {
"FROM\n" +
"\t(\n" +
"\tSELECT\n" +
- "\t CASE WHEN LENGTH(COALESCE(ut.REALNAME,''))=2 THEN SUBSTR(ut.REALNAME,1,1)||'*' WHEN LENGTH(COALESCE(ut.REALNAME,''))=3 THEN SUBSTR(ut.REALNAME,1,1)||'*'||SUBSTR(ut.REALNAME,3) WHEN LENGTH(COALESCE(ut.REALNAME,''))>3 THEN SUBSTR(ut.REALNAME,1,1)||'**'||SUBSTR(ut.REALNAME,4) ELSE ut.REALNAME END REALNAME,\n" +
+ "\t CASE WHEN LENGTH(COALESCE(ut.REALNAME,''))=2 THEN CONCAT(SUBSTR(ut.REALNAME,1,1),'*') WHEN LENGTH(COALESCE(ut.REALNAME,''))=3 THEN CONCAT(SUBSTR(ut.REALNAME,1,1),'*',SUBSTR(ut.REALNAME,3)) WHEN LENGTH(COALESCE(ut.REALNAME,''))>3 THEN CONCAT(SUBSTR(ut.REALNAME,1,1),'**',SUBSTR(ut.REALNAME,4)) ELSE ut.REALNAME END REALNAME,\n" +
"\t\tROUND( sum( vs.LENGTH / 1000 ), 1 ) AS MILEAGE,\n" +
"\t\tROUND( sum( vs.SCORE ), 1 ) AS INTEGRALSCORE \n" +
"\tFROM\n" +
@@ -299,28 +299,6 @@ public class IntegralSeriveImpl {
Double ret=0.0;
List json =null;
try{
- /* String sqlTemp="SELECT\n" +
- "ID,\n" +
- "VALUE,\n" +
- "TYPE,\n" +
- "EVERYMONEY,\n" +
- "EVERYMILE,\n" +
- "BEGINMILE,\n" +
- "INTEGRATIONRULE,\n" +
- "MILESCORE\n" +
- "FROM PAY_INTEGRATION_NUMBER_TABLE WHERE TYPE='RAM' ";
- json= this.mapperI.selectforlist(sqlTemp);
- if(json.size()>0){
- Map o =(Map) json.get(0);
- Double BEGINMILE=Double.parseDouble(o.get("BEGINMILE").toString())/1000;//起始里程，大于这个才会有积分
- Double VALUE=Double.parseDouble(o.get("VALUE").toString());
- Double EVERYMILE=Double.parseDouble(o.get("EVERYMILE").toString());
- Double MILESCORE=Double.parseDouble(o.get("MILESCORE").toString())/100;
- if(Double.parseDouble(mileAge)>= BEGINMILE){
- ret=VALUE/100;
- ret =ret+ (Math.floor((Double.parseDouble(mileAge) -BEGINMILE)/(EVERYMILE/1000)) * MILESCORE);
- }
- }*/
String sqlTemp="SELECT\n" +
"SCORE\n" +
"FROM VEHICLE_SCORE_VALUE WHERE TYPE='"+vehicleType+"' AND MINLENGTH <= "+(Double.parseDouble(mileAge)*1000)+" AND MAXLENGTH> "+(Double.parseDouble(mileAge)*1000)+"";
diff --git a/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java b/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java
index 3020b34..e734159 100644
--- a/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java
@@ -18,7 +18,7 @@ public class IntegrationListServiceImpl implements IntegrationListService {
private static String sql="select " +
" ROWNUM AS num,ilt.ID,ilt.USERID ,COALESCE(ilt.ACARNO,'') AS ACARNO," +
" ROUND((ilt.LASTINTEGRATION/100),1) AS LASTINTEGRATION ," +
- " (CASE WHEN substr(ilt.PAYTYPE,1,1)='F' THEN '-' || ROUND((ilt.PAYINTEGRATION/100),1) ELSE '+'||ROUND((ilt.PAYINTEGRATION/100),1) END) AS PAYINTEGRATION ," +
+ " (CASE WHEN substr(ilt.PAYTYPE,1,1)='F' THEN '-' || ROUND((ilt.PAYINTEGRATION/100),1) when ilt.PAYINTEGRATION<0 then ''||ROUND((ilt.PAYINTEGRATION/100),1) ELSE '+'||ROUND((ilt.PAYINTEGRATION/100),1) END) AS PAYINTEGRATION ," +
" ROUND((ilt.RESTINTEGRATION/100),1) AS RESTINTEGRATION," +
" TO_CHAR(ilt.PAYTIME, 'YYYY-MM-DD HH24:MI:SS') AS PAYTIME," +
" ilt.BAK1,ilt.BAK2,ilt.BAK3," +
@@ -32,7 +32,7 @@ public class IntegrationListServiceImpl implements IntegrationListService {
sql="select " +
" ilt.ID,ilt.USERID ,COALESCE(ilt.ACARNO,'') AS ACARNO," +
" ROUND((ilt.LASTINTEGRATION/100),1) AS LASTINTEGRATION ," +
- " (CASE WHEN substr(ilt.PAYTYPE,1,1)='F' THEN '-' || ROUND((ilt.PAYINTEGRATION/100),1) ELSE '+'||ROUND((ilt.PAYINTEGRATION/100),1) END) AS PAYINTEGRATION ," +
+ " (CASE WHEN substr(ilt.PAYTYPE,1,1)='F' THEN CONCAT('-',ROUND((ilt.PAYINTEGRATION/100),1)) when ilt.PAYINTEGRATION<0 then CONCAT(ROUND((ilt.PAYINTEGRATION/100),1),'') ELSE CONCAT('+',ROUND((ilt.PAYINTEGRATION/100),1)) END) AS PAYINTEGRATION ," +
" ROUND((ilt.RESTINTEGRATION/100),1) AS RESTINTEGRATION," +
" date_format(ilt.PAYTIME, '%Y-%m-%d %H:%i:%s') AS PAYTIME," +
" ilt.BAK1,ilt.BAK2,ilt.BAK3," +
diff --git a/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java b/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java
index 70a4565..7f0e78c 100644
--- a/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java
@@ -1014,6 +1014,7 @@ public class QCodeInfoServiceImpl {
}
this.messagePushServiceImpl.pushMsg(openId,integralTypePu,"-"+rebateIntegrateSave,enabledIntegral);
}
+ ret = "1";
//积分核减成功
}else{
diff --git a/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java b/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
index fae082b..2fa09dc 100644
--- a/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
+++ b/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
@@ -39,7 +39,6 @@ public class UserTableServiceImpl implements UserTableService {
private static String sql="select " +
" ut.ID ,ut.OPENID ,ut.USERNAME ,ut.PHONE ," +
" ut.REALNAME,substr(ut.IDNUMBER,1,6)||'********'||substr(ut.IDNUMBER,15) AS IDNUMBER," +
- //" ut.NUMBERPIC AS NUMBERPIC," +
" ut.CERTIFICATION,ut.CREATETIME," +
" ut.UNPASSINFO," +
" ROUND((ut.ENABLEINTEGRATION/100),1) AS ENABLEINTEGRATION,ut.REFERRER,ut.BAK1," +
@@ -206,7 +205,7 @@ public class UserTableServiceImpl implements UserTableService {
param.put("filename",fileName);
param.put("phone",phone);
param.put("realName", realName);
- param.put("idNumber", idNumber);
+ param.put("idNumber", ((!PubTools.isNull(idNumber) && !idNumber.contains("*")) ? idNumber : ""));
param.put("createTime", PubTools.getCurrentDate());
param.put("openid", userId);
ret=this.userTableMapperOracle.updateUser(param);
@@ -214,7 +213,6 @@ public class UserTableServiceImpl implements UserTableService {
String bakDBType = PropertiesUtil.getValue("BakDBType");
param.put("DBTYPEBAK",bakDBType);
ret=this.userTableMysqlMapper.updateUser(param);
-
}
return ret;
}