黑名单信息管理

src/main/java/com/nmgs/controller/BlackBatchImportController.java

@@ -1,5 +1,6 @@
 package com.nmgs.controller;
 
+import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.nmgs.config.ResultData;
 import com.nmgs.service.IBlackBatchImportSerive;
@@ -16,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.net.URL;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -44,8 +46,11 @@ public class BlackBatchImportController {
             fileName="黑名单模板";
         }
         fileName =fileName+".xlsx";
-        String fileP=com.nmgs.util.PathUtil.webappsPath+File.separator+ fileName;
+       // String fileP=com.nmgs.util.PathUtil.webappsPath+File.separator+ fileName;
-        fileP=fileP.replaceAll("webapps","blackListFile");
+       // fileP=fileP.replaceAll("webapps","blackListFile");
+        String fileP=File.separator+"excel"+File.separator+fileName;
+        URL resource = BlackBatchImportController.class.getClassLoader().getResource(fileP);
+        fileP= resource.getPath();
         LogUtil.WriteLog_Info("模板下载地址====="+fileP,"BlackBatchImportController");
         File file = new File(fileP);
         // 如果文件名存在，则进行下载
@@ -56,7 +61,6 @@ public class BlackBatchImportController {
             // 下载文件能正常显示中文
             response.addHeader("Content-Length", String.valueOf(file.length()));
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(file.getName(), "UTF-8"));
-
             // 实现文件下载
             byte[] buffer = new byte[1024*1024*100];
             FileInputStream fis = null;

src/main/java/com/nmgs/controller/ExportData.java

@@ -29,19 +29,19 @@ public class ExportData {
     @Autowired
     private ExcelDateImpl excelDateImpl;
 
-    @GetMapping(value="/exportWhiteCarnoList")
+    @GetMapping(value="/exportHangList")
     @ApiOperation(httpMethod="GET",value = "白名单数据导出")
-    @OperationLogDesc(module = "白名单管理",events = "白名单数据导出")
+    @OperationLogDesc(module = "黑名单管理",events = "黑名单数据导出")
     public void exportDivOutPortGroadList(String paramsData,@RequestBody(required = false) Object req,HttpServletResponse response) throws SQLException {
         try {
             if(req==null && !PubTools.isNull(paramsData)){
                 req=JSONObject.parse(paramsData);
             }
             List<HangTableDto> list = excelDateImpl.exportDivOutPortGroadList((Map<String, Object>)req);
-            ExcelUtil.exportExcel(response,list, HangTableDto.class,"白名单数据信息","白名单数据信息");
+            ExcelUtil.exportExcel(response,list, HangTableDto.class,"黑名单数据信息","黑名单数据信息");
         } catch (IOException e) {
             e.printStackTrace();
-            LogUtil.WriteLog_Error("白名单数据导出失败"+e.getMessage(),"ExportData");
+            LogUtil.WriteLog_Error("黑名单数据导出失败"+e.getMessage(),"ExportData");
         }
     }
 }

src/main/java/com/nmgs/controller/HangController.java

@@ -100,4 +100,28 @@ public class HangController {
 
         return ResultData.fail("发布失败");
     }
+    @PostMapping(value = "/checkVersion")
+    @ApiOperation(httpMethod="POST",value="判断当前系统中版本号是否统一")
+    public ResultData<String> checkVersion(HttpServletRequest request, @RequestBody(required = false) Map<String,Object> req) throws Exception {
+        try{
+            String retStr = iHangSerive.checkVersion();
+                return ResultData.success("校验成功",retStr,1);
+        }catch (Exception e){
+            return ResultData.fail("系统内部错误:"+e.getMessage());
+        }
+    }
+    @PostMapping(value = "/importCollect")
+    @ApiOperation(httpMethod="POST",value="导入采集表")
+    public ResultData<String> importCollect(HttpServletRequest request, @RequestBody(required = false) Map<String,Object> req) throws Exception {
+        try{
+            int retStr = iHangSerive.importCollect();
+            if(retStr>0){
+                return ResultData.success("导入成功","",1);
+            }else{
+                return ResultData.success("导入失败","",1);
+            }
+        }catch (Exception e){
+            return ResultData.fail("系统内部错误:"+e.getMessage());
+        }
+    }
 }

src/main/java/com/nmgs/controller/HangResultController.java

@@ -0,0 +1,69 @@
+package com.nmgs.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nmgs.config.ResultData;
+import com.nmgs.entity.HangListTable;
+import com.nmgs.entity.HangResultTable;
+import com.nmgs.service.IHangListService;
+import com.nmgs.service.IHangResultService;
+import com.nmgs.util.PubTools;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.Map;
+
+/**
+ * 黑名单流水管理
+ */
+@RestController
+@RequestMapping("/hangresult")
+@Api(tags = "黑名单处理结果管理")
+public class HangResultController {
+    public IHangResultService iHangListService;
+    @Autowired
+    public void setiHangListService(IHangResultService iHangListService) {
+        this.iHangListService = iHangListService;
+    }
+
+    SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd");
+    @PostMapping(value="/getListByPage")
+    @ApiOperation(httpMethod="POST",value="查询分页黑名单日志数据")
+    public Object getListByPage(HttpServletRequest request, @RequestBody(required = false) Map<String, Object> req) throws SQLException {
+        Page<HangResultTable> whiteCarnoListList =null;
+        try{
+            whiteCarnoListList=iHangListService.getBlackListByPage(req);
+            if (PubTools.isEmpty(whiteCarnoListList)) {
+                return ResultData.fail(-1,"数据查询失败");
+            }
+        }catch (Exception e){
+            String throwableStr=e.toString();
+            if(throwableStr.contains(":")){
+                throwableStr = throwableStr.substring(throwableStr.indexOf(":") + 1);
+            }
+            return ResultData.fail(-1,"数据查询失败==>"+throwableStr);
+        }
+        return whiteCarnoListList;
+    }
+    @PostMapping(value = "/addData")
+    @ApiOperation(httpMethod="POST",value="新增记录")
+    public ResultData<String> addData(HttpServletRequest request, @RequestBody(required = false) Map<String, Object> req) throws Exception {
+        int ret = iHangListService.insertData((HangResultTable)PubTools.map2Object(req, HangResultTable.class));
+        if(ret>-1){
+            return ResultData.success("新增成功");
+        }else{
+            if(ret==-2){
+                return ResultData.fail("黑名单存在该信息！");
+            }
+        }
+        return ResultData.fail("新增失败");
+    }
+
+}

src/main/java/com/nmgs/controller/HangTableCollectController.java

@@ -0,0 +1,47 @@
+package com.nmgs.controller;
+
+import com.nmgs.config.ResultData;
+import com.nmgs.entity.HangListTable;
+import com.nmgs.entity.HangTableCollect;
+import com.nmgs.service.IHangTableCollectService;
+import com.nmgs.util.PubTools;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.Map;
+
+/**
+ * 黑名单收集管理
+ */
+@RestController
+@RequestMapping("/hangTableCollect")
+@Api(tags = "黑名单收集")
+public class HangTableCollectController {
+    public IHangTableCollectService iHangTableCollectService;
+    @Autowired
+    public void setiHangListService(IHangTableCollectService iHangListService) {
+        this.iHangTableCollectService = iHangListService;
+    }
+
+    SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd");
+    @PostMapping(value = "/addData")
+    @ApiOperation(httpMethod="POST",value="新增记录")
+    public ResultData<String> addData(HttpServletRequest request, @RequestBody(required = false) Map<String, Object> req) throws Exception {
+        int ret = iHangTableCollectService.insertData((HangTableCollect) PubTools.map2Object(req, HangListTable.class));
+        if(ret>-1){
+            return ResultData.success("新增成功");
+        }else{
+            if(ret==-2){
+                return ResultData.fail("黑名单存在该信息！");
+            }
+        }
+        return ResultData.fail("新增失败");
+    }
+
+}

src/main/java/com/nmgs/entity/HangListTable.java

@@ -26,9 +26,9 @@ public class HangListTable {
   @TableField("RPTIME")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
   private Date rptime;
-  @TableField("BEGDT")
+  @TableField("BEGDATE")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-  private Date begdt;
+  private Date begdate;
   @TableField("CARDID")
   private String cardid;
   @TableField("CARDNO")

src/main/java/com/nmgs/entity/HangResultTable.java

@@ -0,0 +1,67 @@
+package com.nmgs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("HANGRESULT_TABLE")
+public class HangResultTable {
+  @TableField("REPORTROADNO")
+  private int reportroadno;
+  @TableField("REPORTSTANO")
+  private int reportstano;
+  @TableField("ROADNO")
+  private int roadno;
+  @TableField("STANO")
+  private int stano;
+  @TableField("CARDID")
+  private String cardid;
+  @TableField("CARDNO")
+  private String cardno;
+  @TableField("CARDTP")
+  private int cardtp;
+  @TableField("RESULT")
+  private String result;
+  @TableField("APNAME")
+  private String apname;
+  @TableField("ADDTIME")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+  private Date addtime;
+  @TableField("HANDLETIME")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+  private Date handletime;
+  @TableField("DT")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+  private Date dt;
+  @TableField("BLACKLISTINDT")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+  private Date blacklistindt;
+  @TableField("PLATECOLOR")
+  private String platecolor;
+  @TableField("CASH")
+  private BigDecimal cash;
+  @TableField("TYPE")
+  private int type;
+  @TableField("INPROVINCECASH")
+  private BigDecimal inprovincecash;
+  @TableField("OUTPROVINCECASH")
+  private BigDecimal outprovincecash;
+  @TableField(exist = false)
+  private String cardtpName;
+  @TableField(exist = false)
+  private String typeName;
+  @TableField(exist = false)
+  private String roadnoName;
+  @TableField(exist = false)
+  private String stanoName;
+
+}

src/main/java/com/nmgs/entity/HangTable.java

@@ -15,7 +15,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName("WHITE_CARNO_TABLE")
+@TableName("HANG_TABLE")
 public class HangTable {
   @TableField("BEGDATE")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@@ -53,5 +53,7 @@ public class HangTable {
   private String reportstanoName;
   @TableField(exist = false)
   private String jtflagName;
+  @TableField(exist = false)
+  private String apname;
 
 }

src/main/java/com/nmgs/entity/HangTableCollect.java

@@ -0,0 +1,41 @@
+package com.nmgs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("HANG_TABLE_COLLECT")
+public class HangTableCollect {
+  @TableField("BEGDATE")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+  private Date begdate;
+  @TableField("CARDID")
+  private String cardid;
+  @TableField("CARDNO")
+  private String cardno;
+  @TableField("CARDTP")
+  private int cardtp;
+  @TableField("DT")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+  private Date dt;
+  @TableField("PLATECOLOR")
+  private String platecolor;
+  @TableField("VERNO")
+  private int verno;
+  @TableField("CASH")
+  private BigDecimal cash;
+  @TableField("TYPE")
+  private int type;
+  @TableField("JTFLAG")
+  private int jtflag;
+
+}

src/main/java/com/nmgs/entity/HangTableDto.java

@@ -9,169 +9,111 @@ import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
 import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
 import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
 @ExcelIgnoreUnannotated
 public class HangTableDto {
-  @ExcelProperty("ID")
+  @ExcelProperty("版本号")
-  @ColumnWidth(10)
+  @ColumnWidth(30)
-  @ContentStyle(verticalAlignment= VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
+  @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  @ExcelIgnore
+  private String verno;
-  private int id;
+  @ExcelProperty("生效时间")
-  @ExcelProperty("启用时间")
   @ColumnWidth(30)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
   private Date begdate;
-  @ExcelProperty("车牌")
+  @ExcelProperty("通行卡号/车牌号")
-  @ColumnWidth(10)
+  @ColumnWidth(50)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private String acarno;
+  private String cardid;
   @ExcelProperty("车牌颜色")
-  //@ExcelIgnore
+  @ColumnWidth(30)
-  @ColumnWidth(10)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private String colorName;
+  private String platecolor;
-  @ExcelProperty("起始时间")
+  @ExcelProperty("车型")
   @ColumnWidth(30)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private Date begdt;
+  private String typeName;
-  @ExcelProperty("终止时间")
+  @ExcelProperty("黑名单类型")
   @ColumnWidth(30)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private Date enddt;
+  private String cardtpName;
-  @ExcelProperty("类型")
+  @ExcelProperty("金额")
-  @ColumnWidth(10)
+  @ColumnWidth(30)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private String vehicleClassName;
+  private BigDecimal cash;
-  @ExcelProperty("状态")
+  @ExcelProperty("黑名单原因")
-  @ColumnWidth(10)
+  @ColumnWidth(30)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private String flagName;
+  private String cardno;
-  @ExcelProperty("车型")
   @ExcelIgnore
-  @ColumnWidth(10)
+  @ExcelProperty("上报路段")
+  @ColumnWidth(50)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private int vehicleName;
+  private String reportroadnoName;
-  @ExcelProperty("状态码")
+  @ExcelProperty("上报站")
   @ExcelIgnore
-  @ColumnWidth(10)
+  @ColumnWidth(50)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private String dataflag;
+  private String reportstanoName;
-  @ExcelProperty("车辆描述")
+  @ExcelProperty("是/否交通集团黑名单")
-  @ColumnWidth(10)
+  @ColumnWidth(70)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  private String describ;
+  private String jtflagName;
-  @ExcelProperty("录入时间")
+  @ExcelProperty("添加时间")
   @ColumnWidth(30)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
   private Date dt;
-  @ExcelProperty("所属分公司编号")
+  @ExcelProperty("填报人")
-  @ExcelIgnore
-  @ColumnWidth(10)
-  @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
-          borderBottom = BorderStyleEnum.THIN,
-          borderLeft = BorderStyleEnum.THIN,
-          borderRight = BorderStyleEnum.THIN)
-  private int account;
-  @ExcelProperty("所属公司")
-  @ColumnWidth(10)
-  @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
-          borderBottom = BorderStyleEnum.THIN,
-          borderLeft = BorderStyleEnum.THIN,
-          borderRight = BorderStyleEnum.THIN)
-  private String accountName;
-  @ExcelProperty("版本")
-  @ColumnWidth(10)
-  @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
-          borderBottom = BorderStyleEnum.THIN,
-          borderLeft = BorderStyleEnum.THIN,
-          borderRight = BorderStyleEnum.THIN)
-  private String verno;
-  @ExcelProperty("备注1")
   @ExcelIgnore
-  @ColumnWidth(10)
+  @ColumnWidth(30)
-  @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
-          borderBottom = BorderStyleEnum.THIN,
-          borderLeft = BorderStyleEnum.THIN,
-          borderRight = BorderStyleEnum.THIN)
-  private String bak1;
-  @ExcelProperty("备注2")
-  @ExcelIgnore
-  @ColumnWidth(10)
-  @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
-          borderBottom = BorderStyleEnum.THIN,
-          borderLeft = BorderStyleEnum.THIN,
-          borderRight = BorderStyleEnum.THIN)
-  private String bak2;
-  @ExcelProperty("备注3")
-  @ExcelIgnore
-  @ColumnWidth(10)
-  @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
-          borderBottom = BorderStyleEnum.THIN,
-          borderLeft = BorderStyleEnum.THIN,
-          borderRight = BorderStyleEnum.THIN)
-  private String bak3;
-  @ExcelProperty("减免路段/收费站")
-  @ColumnWidth(10)
-  @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
-          borderBottom = BorderStyleEnum.THIN,
-          borderLeft = BorderStyleEnum.THIN,
-          borderRight = BorderStyleEnum.THIN)
-  private String discrp;
-  @ExcelProperty("车种code")
-  @ExcelIgnore
-  @ColumnWidth(10)
-  @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
-          borderBottom = BorderStyleEnum.THIN,
-          borderLeft = BorderStyleEnum.THIN,
-          borderRight = BorderStyleEnum.THIN)
-  private int vehicleClass;
-  @ExcelProperty("重点提示")
-  @ColumnWidth(10)
   @ContentStyle(verticalAlignment=VerticalAlignmentEnum.CENTER,horizontalAlignment = HorizontalAlignmentEnum.CENTER,
           borderBottom = BorderStyleEnum.THIN,
           borderLeft = BorderStyleEnum.THIN,
           borderRight = BorderStyleEnum.THIN)
-  @ContentFontStyle(color = 10)
+  private String apname;
-  private String promperty;
 
 }

src/main/java/com/nmgs/mapper/HangListMapper.xml

@@ -9,17 +9,15 @@
         t.CARDNO,t.CARDTP,t.APNAME,t.DT,
         t.PLATECOLOR,t.CASH,t.TYPE,t.CREATEFLAG,t.JTFLAG,
         ht.text as cardtpName,tt.TEXT as typeName,rta.roadname as roadnoName,
-        nta.staname as stanoName,(case when t.CREATEFLAG=1 THEN '添加' else '修改' end) As createflagName,
+        nta.staname as stanoName,(case when t.CREATEFLAG=1 THEN '添加' when t.CREATEFLAG=4 THEN '版本更新'
+        when t.CREATEFLAG=6 THEN '批量导入' else '修改' end) As createflagName,
         (case when t.JTFLAG=1 THEN '是' else '否' end) As jtflagName
         FROM HANGLIST_TABLE t
-        left join ROAD_TABLE_ALL rta on(t.ROADNO = rta.roadno)
+        left join ROAD_TABLE rta on(t.ROADNO = rta.roadno)
         left join hangtp_text ht on(t.CARDTP = ht.ID)
         left join TYPE_TEXT tt on(t.TYPE = tt.value)
         left join NAME_TABLE nta on(t.STANO = nta.STANO)
         <where>
-            <if test="params.id != null and params.id != ''">
-                AND  t.id = #{params.id}
-            </if>
             <if test="params.queryCreateTimeS!= null and params.queryCreateTimeS!= ''">
                 <if test="params.DBTYPE == 1">
                     AND t.DT >= dateadd(day,0,#{params.queryCreateTimeS})
@@ -128,9 +126,16 @@
             <if test="params.SJTFLAG != null and params.SJTFLAG != ''">
                 AND t.JTFLAG = #{params.SJTFLAG}
             </if>
+            <if test="params.SCARDNO != null and params.SCARDNO!= ''">
+                AND t.CARDNO  like '%'|| #{params.SCARDNO} || '%'
+            </if>
             <if test="params.SPLATECOLOR != null and params.SPLATECOLOR != ''">
-                AND t.JTFLAG = #{params.PLATECOLOR}
+                AND t.PLATECOLOR = #{params.SPLATECOLOR}
+            </if>
+            <if test="params.SCASH != null and params.SCASH != ''">
+                AND t.CASH = #{params.SCASH}
             </if>
         </where>
+        order by t.DT DESC
     </select>
 </mapper>

src/main/java/com/nmgs/mapper/HangResultMapper.java

@@ -0,0 +1,18 @@
+package com.nmgs.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nmgs.entity.HangListTable;
+import com.nmgs.entity.HangResultTable;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * 白名单数据操作日志
+ */
+@Mapper
+public interface HangResultMapper extends BaseMapper<HangResultTable> {
+    Page<HangResultTable> getBlackListByPage(Page<HangResultTable> page, @Param("params") Map<String, Object> params);
+}

src/main/java/com/nmgs/mapper/HangResultMapper.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.nmgs.mapper.HangResultMapper">
+    <select id="getBlackListByPage" parameterType="java.util.HashMap" resultType="com.nmgs.entity.HangResultTable">
+        select
+        t.REPORTROADNO,t.REPORTSTANO,t.ROADNO,t.STANO,t.CARDID,
+        t.CARDNO,t.CARDTP,t.RESULT,t.APNAME,t.ADDTIME,t.HANDLETIME,
+        t.DT,t.BLACKLISTINDT,t.PLATECOLOR,t.CASH,t.TYPE,t.INPROVINCECASH,
+        t.OUTPROVINCECASH,ht.text as cardtpName,tt.TEXT as typeName,rta.roadname as roadnoName,
+        nta.staname as stanoName
+        FROM HANGRESULT_TABLE t
+        left join ROAD_TABLE rta on(t.ROADNO = rta.roadno)
+        left join hangtp_text ht on(t.CARDTP = ht.ID)
+        left join TYPE_TEXT tt on(t.TYPE = tt.value)
+        left join NAME_TABLE nta on(t.STANO = nta.STANO)
+        <where>
+            <if test="params.queryHandleTimeS!= null and params.queryHandleTimeS!= ''">
+                <if test="params.DBTYPE == 1">
+                    AND t.HANDLETIME >= dateadd(day,0,#{params.queryHandleTimeS})
+                </if>
+                <if test="params.DBTYPE == 2">
+                    AND t.HANDLETIME >=  TO_DATE(#{params.queryHandleTimeS}, 'YYYY-MM-DD HH24:mi:ss')
+                </if>
+                <if test="params.DBTYPE == 3">
+                    AND t.HANDLETIME >=  TO_DATE(#{params.queryHandleTimeS}, 'YYYY-MM-DD HH24:mi:ss')
+                </if>
+                <if test="params.DBTYPE == 4">
+                    AND t.HANDLETIME >=  STR_TO_DATE(#{params.queryHandleTimeS}, '%Y-%m-%d %H:%k:%s')
+                </if>
+            </if>
+            <if test="params.queryHandleTimeE!= null and params.queryHandleTimeE!= ''">
+                <if test="params.DBTYPE == 1">
+                    AND t.HANDLETIME &lt;= dateadd(day,0,#{params.queryHandleTimeE})
+                </if>
+                <if test="params.DBTYPE == 2">
+                    AND t.HANDLETIME &lt;=  TO_DATE(#{params.queryHandleTimeE}, 'YYYY-MM-DD HH24:mi:ss')
+                </if>
+                <if test="params.DBTYPE == 3">
+                    AND t.HANDLETIME &lt;= TO_DATE(#{params.queryHandleTimeE}, 'YYYY-MM-DD HH24:mi:ss')
+                </if>
+                <if test="params.DBTYPE == 4">
+                    AND t.HANDLETIME &lt;=  STR_TO_DATE(#{params.queryHandleTimeE}, '%Y-%m-%d %H:%k:%s')
+                </if>
+            </if>
+            <if test="params.queryAddtimeS!= null and params.queryAddtimeS!= ''">
+                <if test="params.DBTYPE == 1">
+                    AND t.ADDTIME >= dateadd(day,0,#{params.queryAddtimeS})
+                </if>
+                <if test="params.DBTYPE == 2">
+                    AND t.ADDTIME >=  TO_DATE(#{params.queryAddtimeS}, 'YYYY-MM-DD HH24:mi:ss')
+                </if>
+                <if test="params.DBTYPE == 3">
+                    AND t.ADDTIME >=  TO_DATE(#{params.queryAddtimeS}, 'YYYY-MM-DD HH24:mi:ss')
+                </if>
+                <if test="params.DBTYPE == 4">
+                    AND t.ADDTIME >=  STR_TO_DATE(#{params.queryAddtimeS}, '%Y-%m-%d %H:%k:%s')
+                </if>
+            </if>
+            <if test="params.queryAddtimeE!= null and params.queryAddtimeE!= ''">
+                <if test="params.DBTYPE == 1">
+                    AND t.ADDTIME &lt;= dateadd(day,0,#{params.queryAddtimeE})
+                </if>
+                <if test="params.DBTYPE == 2">
+                    AND t.ADDTIME &lt;=  TO_DATE(#{params.queryAddtimeE}, 'YYYY-MM-DD HH24:mi:ss')
+                </if>
+                <if test="params.DBTYPE == 3">
+                    AND t.ADDTIME &lt;= TO_DATE(#{params.queryAddtimeE}, 'YYYY-MM-DD HH24:mi:ss')
+                </if>
+                <if test="params.DBTYPE == 4">
+                    AND t.ADDTIME &lt;=  STR_TO_DATE(#{params.queryAddtimeE}, '%Y-%m-%d %H:%k:%s')
+                </if>
+            </if>
+            <if test="params.SROADNO != null and params.SROADNO != ''">
+                AND t.ROADNO = #{params.SROADNO}
+            </if>
+            <if test="params.SSTANO != null and params.SSTANO != ''">
+                AND t.STANO = #{params.SSTANO}
+            </if>
+            <if test="params.SRPNAME != null and params.SRPNAME != ''">
+                AND t.RPNAME like '%'|| #{params.SRPNAME} || '%'
+            </if>
+            <if test="params.SAPNAME != null and params.SAPNAME != ''">
+                AND t.APNAME like '%'|| #{params.SAPNAME} || '%'
+            </if>
+            <if test="params.SCARDID != null and params.SCARDID != ''">
+                AND t.CARDID like '%'|| #{params.SCARDID} || '%'
+            </if>
+            <if test="params.SCARDTP != null and params.SCARDTP != ''">
+                AND t.CARDTP = #{params.SCARDTP}
+            </if>
+            <if test="params.STYPE != null and params.STYPE != ''">
+                AND t.TYPE = #{params.STYPE}
+            </if>
+            <if test="params.SCARDNO != null and params.SCARDNO!= ''">
+                AND t.CARDNO  like '%'|| #{params.SCARDNO} || '%'
+            </if>
+            <if test="params.SPLATECOLOR != null and params.SPLATECOLOR != ''">
+                AND t.PLATECOLOR = #{params.SPLATECOLOR}
+            </if>
+            <if test="params.SRESULT != null and params.SRESULT != ''">
+                AND t.RESULT like '%'|| #{params.SRESULT} || '%'
+            </if>
+            <if test="params.SCASH != null and params.SCASH != ''">
+                AND t.CASH = #{params.SCASH}
+            </if>
+        </where>
+        order by t.DT DESC
+    </select>
+</mapper>

src/main/java/com/nmgs/mapper/HangTableCollectMapper.java

@@ -0,0 +1,18 @@
+package com.nmgs.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nmgs.entity.HangResultTable;
+import com.nmgs.entity.HangTableCollect;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * 白名单数据操作日志
+ */
+@Mapper
+public interface HangTableCollectMapper extends BaseMapper<HangTableCollect> {
+
+}

src/main/java/com/nmgs/mapper/HangTableMapper.xml

@@ -6,15 +6,15 @@
 
     <select id="getHangByPage" parameterType="java.util.HashMap" resultType="com.nmgs.entity.HangTable">
         select
-        t.BEGDATE,t.CARDID,t.CARDNO,t.CARDTP,t.APNAME,t.DT,
+        t.BEGDATE,t.CARDID,t.CARDNO,t.CARDTP,t.DT,
         t.PLATECOLOR,t.VERNO,t.CASH,t.TYPE,t.REPORTROADNO,t.REPORTSTANO,
         t.JTFLAG,ht.text as cardtpName,tt.TEXT as typeName,rta.roadname as reportroadnoName,
         nta.staname as reportstanoName,(case when t.JTFLAG=1 THEN '是' else '否' end) As jtflagName
         FROM HANG_TABLE t
-        left join ROAD_TABLE_ALL rta on(t.ROADNO = rta.roadno)
+        left join ROAD_TABLE rta on(t.REPORTROADNO = rta.roadno)
         left join hangtp_text ht on(t.CARDTP = ht.ID)
         left join TYPE_TEXT tt on(t.TYPE = tt.value)
-        left join NAME_TABLE nta on(t.STANO = nta.STANO)
+        left join NAME_TABLE nta on(t.REPORTSTANO = nta.STANO)
         <where>
             <if test="params.id != null and params.id != ''">
                 AND  t.id = #{params.id}
@@ -104,10 +104,10 @@
                 </if>
             </if>
             <if test="params.SROADNO != null and params.SROADNO != ''">
-                AND t.ROADNO = #{params.SROADNO}
+                AND t.REPORTROADNO = #{params.SROADNO}
             </if>
             <if test="params.SSTANO != null and params.SSTANO != ''">
-                AND t.STANO = #{params.SSTANO}
+                AND t.REPORTSTANO = #{params.SSTANO}
             </if>
             <if test="params.SCARDID != null and params.SCARDID != ''">
                 AND t.CARDID like '%'|| #{params.SCARDID} || '%'
@@ -122,9 +122,10 @@
                 AND t.JTFLAG = #{params.SJTFLAG}
             </if>
             <if test="params.SPLATECOLOR != null and params.SPLATECOLOR != ''">
-                AND t.JTFLAG = #{params.PLATECOLOR}
+                AND t.platecolor = #{params.SPLATECOLOR}
             </if>
         </where>
+        order by t.DT DESC
     </select>
     <update id="updateById" parameterType="com.nmgs.entity.HangTable">
                update HANG_TABLE
@@ -135,9 +136,6 @@
                    <if test="params.type !='' and params.type != null">
                        type= #{params.type},
                    </if>
-                   <if test="params.verno !='' and params.verno != null">
-                       verno= #{params.verno},
-                   </if>
                    <if test="params.cash !='' and params.cash != null">
                        cash= #{params.cash},
                    </if>
@@ -180,15 +178,15 @@
     </delete>
     <select id="getHangList" parameterType="java.util.HashMap" resultType="com.nmgs.entity.HangTable">
         select
-        t.BEGDATE,t.CARDID,t.CARDNO,t.CARDTP,t.APNAME,t.DT,
+        t.BEGDATE,t.CARDID,t.CARDNO,t.CARDTP,t.DT,
         t.PLATECOLOR,t.VERNO,t.CASH,t.TYPE,t.REPORTROADNO,t.REPORTSTANO,
         t.JTFLAG,ht.text as cardtpName,tt.TEXT as typeName,rta.roadname as reportroadnoName,
         nta.staname as reportstanoName,(case when t.JTFLAG=1 THEN '是' else '否' end) As jtflagName
         FROM HANG_TABLE t
-        left join ROAD_TABLE_ALL rta on(t.ROADNO = rta.roadno)
+        left join ROAD_TABLE rta on(t.REPORTROADNO = rta.roadno)
         left join hangtp_text ht on(t.CARDTP = ht.ID)
         left join TYPE_TEXT tt on(t.TYPE = tt.value)
-        left join NAME_TABLE nta on(t.STANO = nta.STANO)
+        left join NAME_TABLE nta on(t.REPORTSTANO = nta.STANO)
         <where>
             <if test="params.id != null and params.id != ''">
                 AND  t.id = #{params.id}
@@ -278,10 +276,10 @@
                 </if>
             </if>
             <if test="params.SROADNO != null and params.SROADNO != ''">
-                AND t.ROADNO = #{params.SROADNO}
+                AND t.REPORTROADNO = #{params.SROADNO}
             </if>
             <if test="params.SSTANO != null and params.SSTANO != ''">
-                AND t.STANO = #{params.SSTANO}
+                AND t.REPORTSTANO = #{params.SSTANO}
             </if>
             <if test="params.SCARDID != null and params.SCARDID != ''">
                 AND t.CARDID like '%'|| #{params.SCARDID} || '%'
@@ -296,7 +294,7 @@
                 AND t.JTFLAG = #{params.SJTFLAG}
             </if>
             <if test="params.SPLATECOLOR != null and params.SPLATECOLOR != ''">
-                AND t.PLATECOLOR = #{params.PLATECOLOR}
+                AND t.PLATECOLOR = #{params.SPLATECOLOR}
             </if>
         </where>
     </select>

src/main/java/com/nmgs/service/IHangResultService.java

@@ -0,0 +1,26 @@
+package com.nmgs.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.nmgs.entity.HangListTable;
+import com.nmgs.entity.HangResultTable;
+
+import java.util.Map;
+
+public interface IHangResultService extends IService<HangResultTable> {
+
+
+    /**
+     * 分页查询黑名单流水
+     * @param params
+     * @return
+     */
+   public Page<HangResultTable> getBlackListByPage(Map<String, Object> params);
+    /**
+     * 单条数据插入
+     * @param hangListTable
+     * @return
+     * @throws Exception
+     */
+    int insertData(HangResultTable hangListTable) throws Exception;
+}

src/main/java/com/nmgs/service/IHangSerive.java

@@ -62,6 +62,17 @@ public interface IHangSerive {
      */
     Map<String,String>  getVersion(Map<String, Object> req) throws Exception;
 
+    /**
+     * 校验版本号是否一致
+     * @return
+     */
+    public String checkVersion();
+
+    /**
+     * 导入数据到采集表
+     * @return
+     */
+    public int importCollect();
     /**
      * 查询数据
      * @param params

src/main/java/com/nmgs/service/IHangTableCollectService.java

@@ -0,0 +1,16 @@
+package com.nmgs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.nmgs.entity.HangTableCollect;
+
+
+public interface IHangTableCollectService extends IService<HangTableCollect> {
+
+    /**
+     * 单条数据插入
+     * @param hangTableCollect
+     * @return
+     * @throws Exception
+     */
+    int insertData(HangTableCollect hangTableCollect) throws Exception;
+}

src/main/java/com/nmgs/service/impl/HangListServiceImpl.java

@@ -57,10 +57,13 @@ public class HangListServiceImpl extends ServiceImpl<HangListMapper, HangListTab
                 return -2;//黑名单存在该信息！
             }
             HangTable hangTable=new HangTable();
+            BeanUtils.copyProperties(hangListTable,hangTable);
             hangTable.setDt(dateTimeFormatter.parse(dateTimeFormatter.format(new Date())));
-            BeanUtils.copyProperties(hangTable,hangListTable);
+            hangTable.setReportroadno(hangListTable.getRoadno());
+            hangTable.setReportstano(hangListTable.getStano());
             ret= hangTableMapper.insert(hangTable);
             if(ret>0){
+                hangListTable.setDt(hangTable.getDt());
                 hangListTable.setCreateflag(Consistent.ADD);
                 hangListMapper.insert(hangListTable);
             }

src/main/java/com/nmgs/service/impl/HangResultServiceImpl.java

@@ -0,0 +1,51 @@
+package com.nmgs.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.nmgs.entity.HangResultTable;
+import com.nmgs.mapper.HangResultMapper;
+import com.nmgs.service.IHangResultService;
+import com.nmgs.util.LogUtil;
+import com.nmgs.util.PubTools;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+@Service
+public class HangResultServiceImpl extends ServiceImpl<HangResultMapper, HangResultTable> implements IHangResultService {
+    SimpleDateFormat dateTimeFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    public HangResultMapper hangResultMapper;
+    @Autowired
+    public void setHangListMapper(HangResultMapper hangResultMapper) {
+        this.hangResultMapper = hangResultMapper;
+    }
+    @Override
+    public Page<HangResultTable> getBlackListByPage(Map<String, Object> params) {
+        //从配置文件中读取数据库连接类型
+        params.put("DBTYPE", PubTools.getDBType());
+        //设置分页
+        Integer pageNum = (Integer) params.get("pageNum");
+        Integer pageSize = (Integer) params.get("pageSize");
+        Page<HangResultTable> page = new Page<>(pageNum,pageSize);
+        page = hangResultMapper.getBlackListByPage(page,params);
+        return page;
+
+    }
+    @Override
+    public int insertData(HangResultTable hangTable) throws Exception {
+        int ret=-1;
+        try{
+            hangTable.setDt(dateTimeFormatter.parse(dateTimeFormatter.format(new Date())));
+            hangTable.setAddtime(dateTimeFormatter.parse(dateTimeFormatter.format(new Date())));
+            ret= hangResultMapper.insert(hangTable);
+        }catch (Exception e){
+            LogUtil.WriteLog_Error("新增黑名单处理数据出错："+e.getMessage(),"HangResultServiceImpl");
+            throw new Exception(e);
+        }
+        return ret;
+    }
+}

src/main/java/com/nmgs/service/impl/HangSeriveImpl.java

@@ -116,6 +116,9 @@ public class HangSeriveImpl implements IHangSerive {
             BeanUtils.copyProperties(params,wclt,"id");
             wclt.setDt(dateTimeFormatter.parse(dateTimeFormatter.format(new Date())));
             wclt.setCreateflag(Consistent.UPDATE);
+            wclt.setRoadno(params.getReportroadno());
+            wclt.setStano(params.getReportstano());
+            wclt.setApname(params.getApname());
             iHangListService.save(wclt);
         }catch (Exception e){
             throw new Exception(e);
@@ -150,7 +153,8 @@ public class HangSeriveImpl implements IHangSerive {
             wclt.setApname(req.get("opermaname").toString());
             wclt.setCardid("版本更新");
             wclt.setPlatecolor("蓝");
-            wclt.setBegdt(dateTimeFormatter.parse(dateTimeFormatter.format(new Date())));
+            wclt.setCardno("版本发布");
+            wclt.setBegdate(dateTimeFormatter.parse(dateTimeFormatter.format(new Date())));
             iHangListService.save(wclt);
         }
         return ret;
@@ -180,12 +184,16 @@ public class HangSeriveImpl implements IHangSerive {
                 String oymd = oldVerno.substring(0, 6);
                 int oldymd = Integer.parseInt(oymd);
                 if (oldymd == newymd) {//当天更改的    每次加  1
-                    int count = Integer.parseInt(oldVerno.substring(oldVerno.length() - 1));
+                    int count = Integer.parseInt(oldVerno.substring(6));
                     int i = count + 1;
-                    verN = nydm + (i+"");
+                    if(i<10){
+                        verN = nydm + ("0"+i);
+                    }else{
+                        verN = nydm + (i+"");
+                    }
                 }
                 else{
-                    verN = (nydm + "1");
+                    verN = (nydm + "01");
                 }
             }
         }
@@ -196,6 +204,32 @@ public class HangSeriveImpl implements IHangSerive {
         map.put("verno",verN);
         return map;
     }
+    @Override
+    public String checkVersion() {
+        String str="";
+        try {
+            List selectDistinctVernoFromHangTable = this.mapperI.selectforlist("select distinct verno from HANG_TABLE");
+            if(selectDistinctVernoFromHangTable !=null && selectDistinctVernoFromHangTable.size()>1){
+                str="数据版本号不一致，请先更新版本号之后再操作";
+            }
+        }catch (Exception e){
+            str="系统内部错误";
+        }
+        return str;
+    }
+    @Override
+    public int importCollect() {
+        int str=1;
+        try {
+            this.mapperI.update("delete from HANG_TABLE_COLLECT");
+            String  strSql="insert into HANG_TABLE_COLLECT(BEGDATE,CARDID,CARDNO,CARDTP,DT,PLATECOLOR,VERNO,CASH,TYPE,JTFLAG) select " +
+                    "BEGDATE,CARDID,CARDNO,CARDTP,DT,PLATECOLOR,VERNO,CASH,TYPE,JTFLAG from HANG_TABLE";
+            this.mapperI.update(strSql);
+        }catch (Exception e){
+            str=-1;
+        }
+        return str;
+    }
 
     @Override
     public List<HangTable> getHangMaxVarnoBySql(Map<String, Object> params) {

src/main/java/com/nmgs/service/impl/HangTableCollectServiceImpl.java

@@ -0,0 +1,35 @@
+package com.nmgs.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.nmgs.entity.HangTableCollect;
+import com.nmgs.mapper.HangTableCollectMapper;
+import com.nmgs.service.IHangTableCollectService;
+import com.nmgs.util.LogUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Service
+public class HangTableCollectServiceImpl extends ServiceImpl<HangTableCollectMapper, HangTableCollect> implements IHangTableCollectService {
+    SimpleDateFormat dateTimeFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    public HangTableCollectMapper hangListMapper;
+    @Autowired
+    public void setHangListMapper(HangTableCollectMapper hangListMapper) {
+        this.hangListMapper = hangListMapper;
+    }
+    @Override
+    public int insertData(HangTableCollect hangTable) throws Exception {
+        int ret=-1;
+        try{
+            hangTable.setDt(dateTimeFormatter.parse(dateTimeFormatter.format(new Date())));
+            ret= hangListMapper.insert(hangTable);
+        }catch (Exception e){
+            LogUtil.WriteLog_Error("黑名单收集数据出错："+e.getMessage(),"HangTableCollectServiceImpl");
+            throw new Exception(e);
+        }
+        return ret;
+    }
+}

src/main/java/com/nmgs/service/impl/SelectDataImpl.java

@@ -32,7 +32,7 @@ public class SelectDataImpl implements ISelectData {
            roadNoSql=paramsData.get("roadNoSql").toString();
        }
       if("ROAD".equals(selectType)){//自定义白名单全部路段
-            sql="select a.roadno value,a.roadname||':'||a.roadno label from ROAD_TABLE a where 1=1 ";
+            sql="select a.roadno value,a.roadname label from ROAD_TABLE a where 1=1 ";
             if(!PubTools.isNull(roadNoSql)){
                 sql += roadNoSql;
             }
@@ -42,9 +42,10 @@ public class SelectDataImpl implements ISelectData {
               if(!PubTools.isNull(roadNoSql)){
                   sql += roadNoSql;
               }
+
             sql +=" order by a.roadname ";
         }  else if ("STANONAME".equals(selectType)) {//站名称
-            sql = "select a.stano as value,a.staname||':'||a.stano as label from NAME_TABLE a where 1=1 AND a.STATYPE=1 ";
+            sql = "select a.stano as value,a.staname as label from NAME_TABLE a where 1=1 AND a.STATYPE=1 ";
               if(!PubTools.isNull(roadNoSql)){
                   sql += roadNoSql;
               }
@@ -57,16 +58,10 @@ public class SelectDataImpl implements ISelectData {
             sql = "select a.value as VALUE,a.text as LABEL from PLATECOLOR_TEXT a order by a.value  ";
         } else if ("EXITFEETYPE".equals(selectType)) {//计费类型
             sql = "select a.value as VALUE,a.text as LABEL from EXITFEETYPE_TEXT a order by a.value  ";
-        } else if ("SPECIAL".equals(selectType)) {//特情
+        } else if ("BLACKTYPE".equals(selectType)) {//黑名单类型
-            sql = "select a.value as VALUE,a.text as LABEL from FLAG_TEXT a order by a.value  ";
+            sql = "select a.ID as VALUE,a.text as LABEL from HANGTP_TEXT a order by a.ID  ";
-        }else if ("COMNO".equals(selectType)) {//所属公司，白名单使用
+        } else if ("TYPE".equals(selectType)) {//车型
-            sql = "select a.acountid as VALUE,a.acountname as LABEL from WHITE_ACCOUNT_TEXT a order by a.acountname  ";
+          sql = "select a.value as VALUE,a.text as LABEL from TYPE_TEXT a order by a.value  ";
-        }else if ("WHITE_VEH_CLASS".equals(selectType)) {//车种，白名单使用
-            sql = "select a.value as VALUE,a.text as LABEL from WHITE_VEHICLE_CLASS a WHERE a.useflag='1' order by a.value  ";
-        }else if ("WHITE_PLATECOLOR".equals(selectType)) {//车牌颜色，白名单使用
-            sql = "select a.value as VALUE,a.text as LABEL from white_PLATE_COLOR a WHERE a.useflag='1'  order by a.value  ";
-        }else if ("WHITE_ZDYZH".equals(selectType)) {//自定义组合，白名单使用
-          sql = "select a.memo as VALUE,a.DICNAME as LABEL,a.DISCRP as discrp from WHITE_CARNO_DIC_TABLE a WHERE 1=1  ";
       }
 
         try {

src/main/java/com/nmgs/util/PubTools.java

@@ -133,8 +133,15 @@ public class PubTools {
                         case "java.util.Date":
                             field.set(obj, df.parse(map.get(field.getName()).toString()));
                             break;
+                        case "java.math.BigDecimal":
+                            field.set(obj, new BigDecimal(map.get(field.getName()).toString()));
+                            break;
                         default:
-                            field.set(obj, map.get(field.getName()).toString());
+                            if(map.get(field.getName()) instanceof String){
+                                field.set(obj, map.get(field.getName()).toString());
+                            }else if(map.get(field.getName()) instanceof Integer){
+                                field.set(obj, (map.get(field.getName())+""));
+                            }
                             break;
                     }
                 }else{

target/BlackListManageSys/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Created-By: IntelliJ IDEA
-Built-By: BMP
+Built-By: 22814
-Build-Jdk: Oracle OpenJDK version 1.8.0_201
+Build-Jdk: 1.8.0_201
 Implementation-Version: 1.0-SNAPSHOT
 Implementation-Vendor-Id: com.example
 Main-Class: ${start-class}

target/BlackListManageSys/WEB-INF/classes/com/nmgs/mapper/HangListMapper.xml

@@ -9,17 +9,15 @@
         t.CARDNO,t.CARDTP,t.APNAME,t.DT,
         t.PLATECOLOR,t.CASH,t.TYPE,t.CREATEFLAG,t.JTFLAG,
         ht.text as cardtpName,tt.TEXT as typeName,rta.roadname as roadnoName,
-        nta.staname as stanoName,(case when t.CREATEFLAG=1 THEN '添加' else '修改' end) As createflagName,
+        nta.staname as stanoName,(case when t.CREATEFLAG=1 THEN '添加' when t.CREATEFLAG=4 THEN '版本更新'
+        when t.CREATEFLAG=6 THEN '批量导入' else '修改' end) As createflagName,
         (case when t.JTFLAG=1 THEN '是' else '否' end) As jtflagName
         FROM HANGLIST_TABLE t
-        left join ROAD_TABLE_ALL rta on(t.ROADNO = rta.roadno)
+        left join ROAD_TABLE rta on(t.ROADNO = rta.roadno)
         left join hangtp_text ht on(t.CARDTP = ht.ID)
         left join TYPE_TEXT tt on(t.TYPE = tt.value)
         left join NAME_TABLE nta on(t.STANO = nta.STANO)
         <where>
-            <if test="params.id != null and params.id != ''">
-                AND  t.id = #{params.id}
-            </if>
             <if test="params.queryCreateTimeS!= null and params.queryCreateTimeS!= ''">
                 <if test="params.DBTYPE == 1">
                     AND t.DT >= dateadd(day,0,#{params.queryCreateTimeS})
@@ -128,9 +126,16 @@
             <if test="params.SJTFLAG != null and params.SJTFLAG != ''">
                 AND t.JTFLAG = #{params.SJTFLAG}
             </if>
+            <if test="params.SCARDNO != null and params.SCARDNO!= ''">
+                AND t.CARDNO  like '%'|| #{params.SCARDNO} || '%'
+            </if>
             <if test="params.SPLATECOLOR != null and params.SPLATECOLOR != ''">
-                AND t.JTFLAG = #{params.PLATECOLOR}
+                AND t.PLATECOLOR = #{params.SPLATECOLOR}
+            </if>
+            <if test="params.SCASH != null and params.SCASH != ''">
+                AND t.CASH = #{params.SCASH}
             </if>
         </where>
+        order by t.DT DESC
     </select>
 </mapper>

target/BlackListManageSys/WEB-INF/classes/com/nmgs/mapper/HangTableMapper.xml

@@ -6,15 +6,15 @@
 
     <select id="getHangByPage" parameterType="java.util.HashMap" resultType="com.nmgs.entity.HangTable">
         select
-        t.BEGDATE,t.CARDID,t.CARDNO,t.CARDTP,t.APNAME,t.DT,
+        t.BEGDATE,t.CARDID,t.CARDNO,t.CARDTP,t.DT,
         t.PLATECOLOR,t.VERNO,t.CASH,t.TYPE,t.REPORTROADNO,t.REPORTSTANO,
         t.JTFLAG,ht.text as cardtpName,tt.TEXT as typeName,rta.roadname as reportroadnoName,
         nta.staname as reportstanoName,(case when t.JTFLAG=1 THEN '是' else '否' end) As jtflagName
         FROM HANG_TABLE t
-        left join ROAD_TABLE_ALL rta on(t.ROADNO = rta.roadno)
+        left join ROAD_TABLE rta on(t.REPORTROADNO = rta.roadno)
         left join hangtp_text ht on(t.CARDTP = ht.ID)
         left join TYPE_TEXT tt on(t.TYPE = tt.value)
-        left join NAME_TABLE nta on(t.STANO = nta.STANO)
+        left join NAME_TABLE nta on(t.REPORTSTANO = nta.STANO)
         <where>
             <if test="params.id != null and params.id != ''">
                 AND  t.id = #{params.id}
@@ -104,10 +104,10 @@
                 </if>
             </if>
             <if test="params.SROADNO != null and params.SROADNO != ''">
-                AND t.ROADNO = #{params.SROADNO}
+                AND t.REPORTROADNO = #{params.SROADNO}
             </if>
             <if test="params.SSTANO != null and params.SSTANO != ''">
-                AND t.STANO = #{params.SSTANO}
+                AND t.REPORTSTANO = #{params.SSTANO}
             </if>
             <if test="params.SCARDID != null and params.SCARDID != ''">
                 AND t.CARDID like '%'|| #{params.SCARDID} || '%'
@@ -122,9 +122,10 @@
                 AND t.JTFLAG = #{params.SJTFLAG}
             </if>
             <if test="params.SPLATECOLOR != null and params.SPLATECOLOR != ''">
-                AND t.JTFLAG = #{params.PLATECOLOR}
+                AND t.platecolor = #{params.SPLATECOLOR}
             </if>
         </where>
+        order by t.DT DESC
     </select>
     <update id="updateById" parameterType="com.nmgs.entity.HangTable">
                update HANG_TABLE
@@ -135,9 +136,6 @@
                    <if test="params.type !='' and params.type != null">
                        type= #{params.type},
                    </if>
-                   <if test="params.verno !='' and params.verno != null">
-                       verno= #{params.verno},
-                   </if>
                    <if test="params.cash !='' and params.cash != null">
                        cash= #{params.cash},
                    </if>
@@ -180,15 +178,15 @@
     </delete>
     <select id="getHangList" parameterType="java.util.HashMap" resultType="com.nmgs.entity.HangTable">
         select
-        t.BEGDATE,t.CARDID,t.CARDNO,t.CARDTP,t.APNAME,t.DT,
+        t.BEGDATE,t.CARDID,t.CARDNO,t.CARDTP,t.DT,
         t.PLATECOLOR,t.VERNO,t.CASH,t.TYPE,t.REPORTROADNO,t.REPORTSTANO,
         t.JTFLAG,ht.text as cardtpName,tt.TEXT as typeName,rta.roadname as reportroadnoName,
         nta.staname as reportstanoName,(case when t.JTFLAG=1 THEN '是' else '否' end) As jtflagName
         FROM HANG_TABLE t
-        left join ROAD_TABLE_ALL rta on(t.ROADNO = rta.roadno)
+        left join ROAD_TABLE rta on(t.REPORTROADNO = rta.roadno)
         left join hangtp_text ht on(t.CARDTP = ht.ID)
         left join TYPE_TEXT tt on(t.TYPE = tt.value)
-        left join NAME_TABLE nta on(t.STANO = nta.STANO)
+        left join NAME_TABLE nta on(t.REPORTSTANO = nta.STANO)
         <where>
             <if test="params.id != null and params.id != ''">
                 AND  t.id = #{params.id}
@@ -278,10 +276,10 @@
                 </if>
             </if>
             <if test="params.SROADNO != null and params.SROADNO != ''">
-                AND t.ROADNO = #{params.SROADNO}
+                AND t.REPORTROADNO = #{params.SROADNO}
             </if>
             <if test="params.SSTANO != null and params.SSTANO != ''">
-                AND t.STANO = #{params.SSTANO}
+                AND t.REPORTSTANO = #{params.SSTANO}
             </if>
             <if test="params.SCARDID != null and params.SCARDID != ''">
                 AND t.CARDID like '%'|| #{params.SCARDID} || '%'
@@ -296,7 +294,7 @@
                 AND t.JTFLAG = #{params.SJTFLAG}
             </if>
             <if test="params.SPLATECOLOR != null and params.SPLATECOLOR != ''">
-                AND t.PLATECOLOR = #{params.PLATECOLOR}
+                AND t.PLATECOLOR = #{params.SPLATECOLOR}
             </if>
         </where>
     </select>

target/classes/com/nmgs/mapper/HangListMapper.xml

@@ -9,17 +9,15 @@
         t.CARDNO,t.CARDTP,t.APNAME,t.DT,
         t.PLATECOLOR,t.CASH,t.TYPE,t.CREATEFLAG,t.JTFLAG,
         ht.text as cardtpName,tt.TEXT as typeName,rta.roadname as roadnoName,
-        nta.staname as stanoName,(case when t.CREATEFLAG=1 THEN '添加' else '修改' end) As createflagName,
+        nta.staname as stanoName,(case when t.CREATEFLAG=1 THEN '添加' when t.CREATEFLAG=4 THEN '版本更新'
+        when t.CREATEFLAG=6 THEN '批量导入' else '修改' end) As createflagName,
         (case when t.JTFLAG=1 THEN '是' else '否' end) As jtflagName
         FROM HANGLIST_TABLE t
-        left join ROAD_TABLE_ALL rta on(t.ROADNO = rta.roadno)
+        left join ROAD_TABLE rta on(t.ROADNO = rta.roadno)
         left join hangtp_text ht on(t.CARDTP = ht.ID)
         left join TYPE_TEXT tt on(t.TYPE = tt.value)
         left join NAME_TABLE nta on(t.STANO = nta.STANO)
         <where>
-            <if test="params.id != null and params.id != ''">
-                AND  t.id = #{params.id}
-            </if>
             <if test="params.queryCreateTimeS!= null and params.queryCreateTimeS!= ''">
                 <if test="params.DBTYPE == 1">
                     AND t.DT >= dateadd(day,0,#{params.queryCreateTimeS})
@@ -128,9 +126,16 @@
             <if test="params.SJTFLAG != null and params.SJTFLAG != ''">
                 AND t.JTFLAG = #{params.SJTFLAG}
             </if>
+            <if test="params.SCARDNO != null and params.SCARDNO!= ''">
+                AND t.CARDNO  like '%'|| #{params.SCARDNO} || '%'
+            </if>
             <if test="params.SPLATECOLOR != null and params.SPLATECOLOR != ''">
-                AND t.JTFLAG = #{params.PLATECOLOR}
+                AND t.PLATECOLOR = #{params.SPLATECOLOR}
+            </if>
+            <if test="params.SCASH != null and params.SCASH != ''">
+                AND t.CASH = #{params.SCASH}
             </if>
         </where>
+        order by t.DT DESC
     </select>
 </mapper>

target/classes/com/nmgs/mapper/HangTableMapper.xml

@@ -6,15 +6,15 @@
 
     <select id="getHangByPage" parameterType="java.util.HashMap" resultType="com.nmgs.entity.HangTable">
         select
-        t.BEGDATE,t.CARDID,t.CARDNO,t.CARDTP,t.APNAME,t.DT,
+        t.BEGDATE,t.CARDID,t.CARDNO,t.CARDTP,t.DT,
         t.PLATECOLOR,t.VERNO,t.CASH,t.TYPE,t.REPORTROADNO,t.REPORTSTANO,
         t.JTFLAG,ht.text as cardtpName,tt.TEXT as typeName,rta.roadname as reportroadnoName,
         nta.staname as reportstanoName,(case when t.JTFLAG=1 THEN '是' else '否' end) As jtflagName
         FROM HANG_TABLE t
-        left join ROAD_TABLE_ALL rta on(t.ROADNO = rta.roadno)
+        left join ROAD_TABLE rta on(t.REPORTROADNO = rta.roadno)
         left join hangtp_text ht on(t.CARDTP = ht.ID)
         left join TYPE_TEXT tt on(t.TYPE = tt.value)
-        left join NAME_TABLE nta on(t.STANO = nta.STANO)
+        left join NAME_TABLE nta on(t.REPORTSTANO = nta.STANO)
         <where>
             <if test="params.id != null and params.id != ''">
                 AND  t.id = #{params.id}
@@ -104,10 +104,10 @@
                 </if>
             </if>
             <if test="params.SROADNO != null and params.SROADNO != ''">
-                AND t.ROADNO = #{params.SROADNO}
+                AND t.REPORTROADNO = #{params.SROADNO}
             </if>
             <if test="params.SSTANO != null and params.SSTANO != ''">
-                AND t.STANO = #{params.SSTANO}
+                AND t.REPORTSTANO = #{params.SSTANO}
             </if>
             <if test="params.SCARDID != null and params.SCARDID != ''">
                 AND t.CARDID like '%'|| #{params.SCARDID} || '%'
@@ -122,9 +122,10 @@
                 AND t.JTFLAG = #{params.SJTFLAG}
             </if>
             <if test="params.SPLATECOLOR != null and params.SPLATECOLOR != ''">
-                AND t.JTFLAG = #{params.PLATECOLOR}
+                AND t.platecolor = #{params.SPLATECOLOR}
             </if>
         </where>
+        order by t.DT DESC
     </select>
     <update id="updateById" parameterType="com.nmgs.entity.HangTable">
                update HANG_TABLE
@@ -135,9 +136,6 @@
                    <if test="params.type !='' and params.type != null">
                        type= #{params.type},
                    </if>
-                   <if test="params.verno !='' and params.verno != null">
-                       verno= #{params.verno},
-                   </if>
                    <if test="params.cash !='' and params.cash != null">
                        cash= #{params.cash},
                    </if>
@@ -180,15 +178,15 @@
     </delete>
     <select id="getHangList" parameterType="java.util.HashMap" resultType="com.nmgs.entity.HangTable">
         select
-        t.BEGDATE,t.CARDID,t.CARDNO,t.CARDTP,t.APNAME,t.DT,
+        t.BEGDATE,t.CARDID,t.CARDNO,t.CARDTP,t.DT,
         t.PLATECOLOR,t.VERNO,t.CASH,t.TYPE,t.REPORTROADNO,t.REPORTSTANO,
         t.JTFLAG,ht.text as cardtpName,tt.TEXT as typeName,rta.roadname as reportroadnoName,
         nta.staname as reportstanoName,(case when t.JTFLAG=1 THEN '是' else '否' end) As jtflagName
         FROM HANG_TABLE t
-        left join ROAD_TABLE_ALL rta on(t.ROADNO = rta.roadno)
+        left join ROAD_TABLE rta on(t.REPORTROADNO = rta.roadno)
         left join hangtp_text ht on(t.CARDTP = ht.ID)
         left join TYPE_TEXT tt on(t.TYPE = tt.value)
-        left join NAME_TABLE nta on(t.STANO = nta.STANO)
+        left join NAME_TABLE nta on(t.REPORTSTANO = nta.STANO)
         <where>
             <if test="params.id != null and params.id != ''">
                 AND  t.id = #{params.id}
@@ -278,10 +276,10 @@
                 </if>
             </if>
             <if test="params.SROADNO != null and params.SROADNO != ''">
-                AND t.ROADNO = #{params.SROADNO}
+                AND t.REPORTROADNO = #{params.SROADNO}
             </if>
             <if test="params.SSTANO != null and params.SSTANO != ''">
-                AND t.STANO = #{params.SSTANO}
+                AND t.REPORTSTANO = #{params.SSTANO}
             </if>
             <if test="params.SCARDID != null and params.SCARDID != ''">
                 AND t.CARDID like '%'|| #{params.SCARDID} || '%'
@@ -296,7 +294,7 @@
                 AND t.JTFLAG = #{params.SJTFLAG}
             </if>
             <if test="params.SPLATECOLOR != null and params.SPLATECOLOR != ''">
-                AND t.PLATECOLOR = #{params.PLATECOLOR}
+                AND t.PLATECOLOR = #{params.SPLATECOLOR}
             </if>
         </where>
     </select>

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,8 +1,10 @@
 com\nmgs\config\ResultData.class
+com\nmgs\service\IHangResultService.class
 com\nmgs\mapper\HangTableMapper.class
 com\nmgs\service\impl\SelectDataImpl.class
 com\nmgs\util\PlateRegexutil.class
 com\nmgs\service\impl\ExcelDateImpl.class
+com\nmgs\service\IHangTableCollectService.class
 com\nmgs\util\LogUtil.class
 com\nmgs\service\impl\HangSeriveImpl.class
 com\nmgs\config\ErrorConfig.class
@@ -13,28 +15,34 @@ com\nmgs\service\ISelectData.class
 com\nmgs\entity\Consistent.class
 com\nmgs\config\ThreadPoolConfig.class
 com\nmgs\entity\HangTable.class
+com\nmgs\controller\HangResultController.class
 com\nmgs\service\IHangSerive.class
 com\nmgs\config\RedisSessionConfig.class
 com\nmgs\util\DESUtil.class
+com\nmgs\entity\HangTableCollect.class
 com\nmgs\service\impl\HangListServiceImpl.class
 com\nmgs\util\PagesUtils.class
 com\nmgs\util\main.class
 com\nmgs\controller\SelectController.class
+com\nmgs\controller\HangTableCollectController.class
 com\nmgs\BlackListManageSysApplication.class
 com\nmgs\annotation\OperationLogDesc.class
 com\nmgs\entity\HangListTable.class
 com\nmgs\controller\HangListController.class
+com\nmgs\mapper\HangTableCollectMapper.class
 com\nmgs\util\WebsocketUtil.class
 com\nmgs\service\IOperationLogService.class
 com\nmgs\service\IHangListService.class
 com\nmgs\entity\MyReturnMap.class
 com\nmgs\controller\HangController.class
+com\nmgs\mapper\HangResultMapper.class
 com\nmgs\service\IBlackBatchImportSerive.class
 com\nmgs\util\PropertiesUtil.class
 com\nmgs\config\CorsConfig.class
 com\nmgs\controller\ExportData.class
 com\nmgs\util\LogUtils.class
 com\nmgs\mapper\Mapper.class
+com\nmgs\service\impl\HangTableCollectServiceImpl.class
 com\nmgs\util\ReadExcel$1.class
 com\nmgs\service\impl\OperationLogServiceImpl.class
 com\nmgs\util\TokenUtil.class
@@ -48,6 +56,7 @@ com\nmgs\util\CRCUtil.class
 com\nmgs\entity\HangTableDto.class
 com\nmgs\entity\WhiteVehicleClass.class
 com\nmgs\aop\LoggerAspect.class
+com\nmgs\service\impl\HangResultServiceImpl.class
 com\nmgs\util\ExcelUtil.class
 com\nmgs\util\WebServiceUtil.class
 com\nmgs\util\DateUtils.class
@@ -58,3 +67,4 @@ com\nmgs\config\FilterConfig.class
 com\nmgs\config\MybatisPlusConfig.class
 com\nmgs\util\ReadExcel.class
 com\nmgs\entity\WhiteVehicleType.class
+com\nmgs\entity\HangResultTable.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,59 +1,69 @@
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\PropertiesUtil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\mapper\WhiteOperationLogMapper.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\mapper\Mapper.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\IHangTableCollectService.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\CRCUtil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\entity\HangTableCollect.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\config\FilterConfig.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\ISelectData.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\mapper\HangListMapper.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\IpUtil.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\entity\HangListTable.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\TokenUtil.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\DateUtils.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\IBlackBatchImportSerive.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\mapper\WhiteOperationLogMapper.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\ExcelUtil.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\config\CorsConfig.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\PathUtil.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\PlateRegexutil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\config\CorsConfig.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\mapper\HangTableMapper.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\entity\WhiteVehicleType.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\BlackListManageSysApplication.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\IHangResultService.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\ReadExcel.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\LogUtils.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\service\IHangSerive.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\BlackListManageSysApplication.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\config\ThreadPoolConfig.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\PubTools.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\MyEnvironmentPostProcessor.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\IOperationLogService.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\service\IBlackBatchImportSerive.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\MyEnvironmentPostProcessor.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\service\impl\OperationLogServiceImpl.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\config\RedisSessionConfig.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\aop\LoggerAspect.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\ExceptionUtil.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\WebsocketUtil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\config\ThreadPoolConfig.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\entity\HangTableDto.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\controller\ExportData.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\controller\HangListController.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\mapper\HangTableCollectMapper.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\controller\BlackBatchImportController.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\controller\HangResultController.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\entity\MyReturnMap.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\entity\HangTableDto.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\service\impl\BlackBatchImportSeriveImpl.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\controller\HangController.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\controller\HangController.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\entity\HangResultTable.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\controller\ExportData.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\impl\ExcelDateImpl.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\config\ResultData.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\controller\BlackBatchImportController.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\config\ErrorConfig.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\impl\HangListServiceImpl.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\entity\WhiteVehicleType.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\DateUtils.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\WebServiceUtil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\PlateRegexutil.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\service\impl\HangSeriveImpl.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\impl\HangResultServiceImpl.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\IpUtil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\IHangSerive.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\PathUtil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\IHangListService.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\service\impl\SelectDataImpl.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\annotation\OperationLogDesc.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\service\ISelectData.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\mapper\HangResultMapper.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\controller\SelectController.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\CRCUtil.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\service\impl\HangListServiceImpl.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\impl\HangSeriveImpl.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\service\IHangListService.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\impl\SelectDataImpl.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\annotation\OperationLogDesc.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\controller\SelectController.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\config\Knife4jConfiguration.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\mapper\HangTableMapper.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\config\MybatisPlusConfig.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\config\Knife4jConfiguration.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\entity\WhiteVehicleClass.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\LogUtil.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\service\impl\ExcelDateImpl.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\PropertiesUtil.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\config\RedisSessionConfig.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\config\FilterConfig.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\config\WebSocketConfig.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\DESUtil.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\PubTools.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\aop\LoggerAspect.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\entity\WhiteOperationLog.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\mapper\Mapper.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\DESUtil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\impl\HangTableCollectServiceImpl.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\entity\Consistent.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\entity\MyReturnMap.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\LogUtil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\config\WebSocketConfig.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\main.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\controller\HangListController.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\PagesUtils.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\entity\WhiteOperationLog.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\TokenUtil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\controller\HangTableCollectController.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\ExcelUtil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\WebServiceUtil.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\entity\HangTable.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\main.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\LogUtils.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\config\ResultData.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\service\IOperationLogService.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\config\MybatisPlusConfig.java
-E:\work\TGGLT-WorkSpace\BlackListManageSys\src\main\java\com\nmgs\util\ExceptionUtil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\entity\WhiteVehicleClass.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\ReadExcel.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\impl\OperationLogServiceImpl.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\PagesUtils.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\service\impl\BlackBatchImportSeriveImpl.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\config\ErrorConfig.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\entity\HangListTable.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\util\WebsocketUtil.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\entity\HangTable.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\entity\Consistent.java
+D:\workspace\BlackListManageSys\src\main\java\com\nmgs\mapper\HangListMapper.java