20220208_1后端日志更新代码_代码质量测试1-编译器自测修复

src/main/java/com/jkcredit/invoice/common/ApiResult.java

@@ -9,8 +9,8 @@ import java.util.Map;
 
 /**
  * @Description: 接口请求返回结果
- * @Author: junqiang.lu
- * @Date: 2018/10/9
+ * @Author: 马圣毅
+ * @Date: 2021/10/09
  */
 @Data
 @ApiModel(value = "接口返回结果")
@@ -44,18 +44,6 @@ public class ApiResult<T> implements Serializable {
     private T data;
 
     /**
-     * 附加数据
-     */
-   /* @ApiModelProperty(value = "附加数据", name = "extraData")
-    private Map<String, Object> extraData;*/
-
-    /**
-     * 系统当前时间
-     */
-   /* @ApiModelProperty(value = "服务器系统时间，时间戳(精确到毫秒)", name = "timestamp")
-    private Long timestamp = System.currentTimeMillis();
-*/
-    /**
      * 获取成功状态结果
      *
      * @return
@@ -86,7 +74,6 @@ public class ApiResult<T> implements Serializable {
         apiResult.setCode(ResponseCode.SUCCESS.getCode());
         apiResult.setMsg(ResponseCode.SUCCESS.getMsg());
         apiResult.setData(data);
-        //apiResult.setExtraData(extraData);
         return apiResult;
     }
 

src/main/java/com/jkcredit/invoice/common/RequestApi.java

@@ -1,5 +1,14 @@
 package com.jkcredit.invoice.common;
 
+/**
+* @Description 包装接口返回值工具类
+* @Author  mashengyi
+* @Date   2022/2/8 18:14
+* @Param
+* @Return
+* @Exception
+*
+*/
 public class RequestApi {
     String api = "";
     String appKey = "";

src/main/java/com/jkcredit/invoice/component/SendMailService.java

@@ -10,6 +10,15 @@ import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 @Component
 @Slf4j
+/**
+* @Description 发送邮箱
+* @Author  mashengyi
+* @Date   2022/2/8 18:07
+* @Param
+* @Return
+* @Exception
+*
+*/
 public class SendMailService {
     
     @Autowired

src/main/java/com/jkcredit/invoice/component/StatisRequestIdTimeComp.java

@@ -13,6 +13,15 @@ import java.util.concurrent.TimeUnit;
 
 @Component
 @Slf4j
+/**
+* @Description 接口服务容器限流工具
+* @Author  mashengyi
+* @Date   2022/2/8 18:13
+* @Param
+* @Return
+* @Exception
+*
+*/
 public class StatisRequestIdTimeComp {
     /**
      * 关注的请求时间秒
@@ -46,7 +55,7 @@ public class StatisRequestIdTimeComp {
     }
     @PostConstruct
     public void initScan(){
-        log.info("kaishilunxunjishu 啦啦啦");
+        log.info("StatisRequestIdTimeComp-initScan-开始轮训计数");
         service.scheduleAtFixedRate(new Runnable() {
             @Override
             public void run() {
@@ -64,7 +73,7 @@ public class StatisRequestIdTimeComp {
                 }else{
                     isLimit=false;
                 }
-                log.info("dangqian请求数："+map.size()+"当前耗时请求数："+count+"是否限制："+isLimit);
+                log.info("当前请求数："+map.size()+"当前耗时请求数："+count+"是否限制："+isLimit);
             }
         },1,1, TimeUnit.SECONDS);
     }

src/main/java/com/jkcredit/invoice/controller/localBussiness/CustomerController.java

@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.*;
 
@@ -37,6 +36,15 @@ import java.util.*;
 @Api(tags = "客户操作")
 @RestController
 @RequestMapping(value = {"/customer"})
+/**
+* @Description 客户操作
+* @Author  mashengyi
+* @Date   2022/2/8 18:16
+* @Param
+* @Return
+* @Exception
+*
+*/
 public class CustomerController {
     @Autowired
     CustomerService customerService;
@@ -372,19 +380,6 @@ public class CustomerController {
         IPage ipage = customerService.findAllNomoneyCustomers(page, customer);
 
         return new RespR(ipage);
-       /* List<Customer> lists = ipage.getRecords();
-        if(lists.size()>0){
-            //遍历删除
-            Iterator<Customer> iterator = lists.iterator();
-            while (iterator.hasNext()) {
-                Customer customer1 = iterator.next();
-                if (new BigDecimal(Double.valueOf(param.getParamValue())).compareTo(new BigDecimal(customer1.getAccountBalance())) < 0) {
-                    iterator.remove();//使用迭代器的删除方法删除
-                }
-            }
-        }
-        ipage.setTotal(lists.size());
-        return new RespR(ipage);*/
     }
     /**
      * @param customerRec

src/main/java/com/jkcredit/invoice/controller/localBussiness/NoCarController.java

@@ -38,6 +38,15 @@ import java.util.List;
 @RestController
 @RequestMapping(value = {"/noCar"})
 @Slf4j
+/**
+* @Description 无车操作
+* @Author  mashengyi
+* @Date   2022/2/8 18:15
+* @Param
+* @Return
+* @Exception
+*
+*/
 public class NoCarController {
 
 
@@ -267,7 +276,6 @@ public class NoCarController {
             ImportParams params = new ImportParams();
             params.setTitleRows(1);
             params.setHeadRows(1);
-           // params.setKeyIndex(2);
             List<BillInvoice> list = ExcelImportUtil.importExcel(file.getInputStream(), BillInvoice.class,params) ;
             RespR respR = nocarInvoiceService.findImportNocarInvoices(list);
             return respR;
@@ -292,7 +300,6 @@ public class NoCarController {
             ImportParams params = new ImportParams();
             params.setTitleRows(1);
             params.setHeadRows(1);
-          //  params.setKeyIndex(2);
             List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params) ;
             RespR respR = noCarBillWayService.findImportNocarBillWay(list);
             return respR;
@@ -375,7 +382,7 @@ public class NoCarController {
             params.setHeadRows(1);
             params.setKeyIndex(2);
             List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);
-            log.info("1111111111batchImprotHistoryBillWay"+list.size());
+            log.info("batchImprotHistoryBillWay数量"+list.size());
             buildDate(list);
             RespR respR = noCarBillWayService.batchHsitoryBillWay(list,customerName);
             return respR;
@@ -401,7 +408,7 @@ public class NoCarController {
             params.setKeyIndex(2);
             List<NoCarWayBill> list = ExcelImportUtil.importExcel(file.getInputStream(), NoCarWayBill.class,params);
             buildDateEnd(list);
-            log.info("1111111111batchImprotEndBillWay"+list.size());
+            log.info("batchImprotEndBillWay数量"+list.size());
             RespR respR = noCarBillWayService.batchBillWayEnd(list,customerName);
             return respR;
         }catch (Exception e){

src/main/java/com/jkcredit/invoice/controller/localBussiness/SelfCarController.java

@@ -10,9 +10,7 @@ import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
 import com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
-import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice;
-import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
 import com.jkcredit.invoice.service.CalculateInfor.SelfCarCalculateInfoService;
 import com.jkcredit.invoice.service.customer.CustomerService;
@@ -36,6 +34,15 @@ import java.util.*;
 @Api(tags = "自有车操作")
 @RestController
 @RequestMapping(value = {"/selfCar"})
+/**
+* @Description 自有车操作
+* @Author  mashengyi
+* @Date   2022/2/8 18:18
+* @Param
+* @Return
+* @Exception
+*
+*/
 public class SelfCarController {
     @Autowired
     SelfCarService selfCarService;
@@ -248,11 +255,6 @@ public class SelfCarController {
                 }
             }
         }
-        //通过车牌号查询所有的Etc卡号
-        /*List<CustomerCarRec> customerCarRecs = selfCarService.getEtcsByCarNum(tradeRequestCarNumVo.getCarNum());
-        if(customerCarRecs == null || customerCarRecs.size()<=0){
-            return new RespR(false,"请输入有绑定ETC卡号的车牌");
-        }*/
         StringBuffer stringBuffer = new StringBuffer();
         for(Map.Entry<String,InvoiceApplVo> elm:map.entrySet()){
             InvoiceApplVo invoiceApplVo = elm.getValue();
@@ -261,37 +263,6 @@ public class SelfCarController {
                 stringBuffer.append(invoiceApplVo.getCardId()+"开票申请失败原因:"+respR.getMsg()+"#");
             }
         }
-/*        customerCarRecs.forEach(customerCarRec -> {
-            TradeRequestVo tradeRequestVo = new TradeRequestVo();
-            tradeRequestVo.setCompanyName(tradeRequestCarNumVo.getCompanyName());
-            tradeRequestVo.setCustomerName(tradeRequestCarNumVo.getCustomerName());
-            DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            tradeRequestVo.setStartTime(format.format(new Date(Long.parseLong(tradeRequestCarNumVo.getStartTime()))));
-            tradeRequestVo.setEndTime(format.format(new Date(Long.parseLong(tradeRequestCarNumVo.getEndTime()))));
-            tradeRequestVo.setTradeStatus(1);
-            tradeRequestVo.setEtcId(customerCarRec.getEtcNum());
-            RespR<List<CardTradeModel>> respRbefore = selfCarServicel.getTradeList(tradeRequestVo);
-            if(respRbefore.getCode() == 0){
-                if(respRbefore.getData()!=null && respRbefore.getData().size()>0){
-                    //进行开票申请
-                    InvoiceApplVo invoiceApplVo = new InvoiceApplVo();
-                    invoiceApplVo.setCompanyName(tradeRequestCarNumVo.getCompanyName());
-                    invoiceApplVo.setCustomerName(tradeRequestCarNumVo.getCustomerName());
-                    invoiceApplVo.setCardId(customerCarRec.getEtcNum());
-                    invoiceApplVo.setTradeIds(new ArrayList<String>());
-                    respRbefore.getData().forEach(cardTradeModel -> {
-                        invoiceApplVo.getTradeIds().add(cardTradeModel.getTradeId());
-                    });
-                    RespR respR = selfCarServicel.applInvoice(invoiceApplVo);
-                    if(respR.getCode() == 1){
-                        stringBuffer.append(customerCarRec.getEtcNum()+"开票申请失败原因:"+respRbefore.getMsg()+"#");
-                    }
-
-                }
-            }else {
-                stringBuffer.append(customerCarRec.getEtcNum()+"开票申请失败原因:"+respRbefore.getMsg()+"#");
-            }
-        });*/
         if(StringUtils.isEmpty(stringBuffer.toString())){
             return new RespR(true);
         }else{
@@ -364,7 +335,6 @@ public class SelfCarController {
             ImportParams params = new ImportParams();
             params.setTitleRows(1);
             params.setHeadRows(1);
-            // params.setKeyIndex(2);
             List<SelfCarTrade> list = ExcelImportUtil.importExcel(file.getInputStream(), SelfCarTrade.class,params) ;
             RespR respR = selfCarTradeService.batchImportSelfcarTrades(list);
             return respR;
@@ -390,7 +360,6 @@ public class SelfCarController {
             ImportParams params = new ImportParams();
             params.setTitleRows(1);
             params.setHeadRows(1);
-            // params.setKeyIndex(2);
             List<SelfCarInvoice> list = ExcelImportUtil.importExcel(file.getInputStream(), SelfCarInvoice.class,params) ;
             RespR respR = selfCarInvoiceService.findImportSelfcarInvoices(list);
             return respR;

src/main/java/com/jkcredit/invoice/controller/service/CustomerLowerServiceController.java

@@ -1,13 +1,8 @@
 package com.jkcredit.invoice.controller.service;
 
-import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.service.customer.CustomerService;
-import com.jkcredit.invoice.service.customer.impl.CustomerServiceImpl;
 import com.jkcredit.invoice.service.lowerService.CustomeLowerService;
-import com.jkcredit.invoice.service.lowerService.vo.EtcBindVo;
-import com.jkcredit.invoice.service.lowerService.vo.EtcValidVo;
-import com.jkcredit.invoice.service.upService.CommInterFace;
 import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,7 +29,6 @@ public class CustomerLowerServiceController {
      */
     @PostMapping("/customeRec")
     @ApiOperation(value="用户备案", notes="用户备案")
-    //@LoginRequired
     public RespR customeRec(@RequestBody List<CustomerRec> customerRecs){
         return lowerService.customeRec(customerRecs);
     }
@@ -46,7 +40,6 @@ public class CustomerLowerServiceController {
      */
     @PostMapping("/customeRecQueryList")
     @ApiOperation(value="用户备案列表查询", notes="用户备案列表查询")
-    //@LoginRequired
     public RespR customeRecQueryList(@RequestBody CustomerRec customerRec){
         return lowerService.customeRecQueryList(customerRec);
     }
@@ -67,7 +60,6 @@ public class CustomerLowerServiceController {
      */
     @PostMapping("/customeRecQuery")
     @ApiOperation(value="用户备案信息查询", notes="用户备案信息查询")
-    //@LoginRequired
     public RespR customeRecQuery(@RequestBody CustomerRec customerRec){
         return lowerService.customeRecQuery(customerRec);
     }

src/main/java/com/jkcredit/invoice/controller/service/NoCarServiceController.java

@@ -2,9 +2,7 @@ package com.jkcredit.invoice.controller.service;
 
 import com.jkcredit.invoice.mapper.calculateInfor.MounthAccMapper;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
-import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
-import com.jkcredit.invoice.service.lowerService.CustomeLowerService;
 import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.lowerService.vo.HCInvoiceQueryVo;
 import com.jkcredit.invoice.service.lowerService.vo.MonthAccountQueryVo;
@@ -31,7 +29,6 @@ public class NoCarServiceController {
      */
     @PostMapping("/noCarVoiceQuery")
     @ApiOperation(value="发票查询接口（走本地库）", notes="发票查询接口（走本地库）")
-    //@LoginRequired
     public RespR noCarVoiceQuery(@RequestBody NoCarWayBill noCarWayBill){
         return noCarService.getInvoiceByWayBillNumReal(noCarWayBill,true);
     }
@@ -42,7 +39,6 @@ public class NoCarServiceController {
      */
     @PostMapping("/hCVoiceQuery")
     @ApiOperation(value="红冲发票查询接口", notes="红冲发票查询接口")
-    //@LoginRequired
     public RespR hCVoiceQuery(@RequestBody HCInvoiceQueryVo hcInvoiceQueryVo){
         return noCarService.hCInvoiceQuery(hcInvoiceQueryVo);
     }
@@ -53,7 +49,6 @@ public class NoCarServiceController {
      */
     @PostMapping("/monthAccQuery")
     @ApiOperation(value="月账单交易查询", notes="月账单交易查询")
-    //@LoginRequired
     public RespR monthAccQuery(@RequestBody MonthAccountQueryVo monthAccountQueryVo){
         return noCarService.monthAccQuery(monthAccountQueryVo);
     }
@@ -65,7 +60,6 @@ public class NoCarServiceController {
      */
     @PostMapping("/monthAccUpdate")
     @ApiOperation(value="月账单交易查询更新", notes="月账单交易查询更新")
-    //@LoginRequired
     public RespR monthAccQueryUpdate(@RequestBody MonthAccountQueryVo monthAccountQueryVo){
         String [] companys = new String[]{"内蒙古书宏超网络科技有限公司邳州分公司",
                 "山西云启正通物流有限责任公司",
@@ -216,7 +210,6 @@ public class NoCarServiceController {
      */
     @PostMapping("/customerCarRec")
     @ApiOperation(value="", notes="车辆备案")
-    //@LoginRequired
     public RespR customerCarRec(@RequestBody List<CustomerCarRec> customerCarRecs){
         return noCarService.customerCarRec(customerCarRecs);
     }
@@ -226,7 +219,6 @@ public class NoCarServiceController {
      */
     @PostMapping("/customeRecUpperQuery")
     @ApiOperation(value="车辆备案信息查询", notes="用户备案信息查询")
-    //@LoginRequired
     public RespR customeRecUpperQuery(@RequestBody CustomerCarRec customerCarRec){
         return noCarService.customerCarRecQueryUpper(customerCarRec);
     }
@@ -239,7 +231,6 @@ public class NoCarServiceController {
      */
     @PostMapping("/customerCarRecQuery")
     @ApiOperation(value="", notes="车辆备案查询")
-    // @LoginRequired
     public RespR customerCarRecQuery(@RequestBody CustomerCarRec customerCarRec){
         return noCarService.customerCarRecQuery(customerCarRec);
     }

src/main/java/com/jkcredit/invoice/controller/service/SelfCarServiceController.java

@@ -28,7 +28,6 @@ public class SelfCarServiceController {
      */
     @PostMapping("/getTradeList")
     @ApiOperation(value="获取交易Id列表", notes="获取交易Id列表")
-    //@LoginRequired
     public RespR getTradeList(@RequestBody TradeRequestVo tradeRequestVo){
         if(tradeRequestVo.getTradeStatus() ==null){
             tradeRequestVo.setTradeStatus(1);
@@ -61,7 +60,6 @@ public class SelfCarServiceController {
      */
     @PostMapping("/applInvoice")
     @ApiOperation(value="开票申请", notes="开票申请")
-    //@LoginRequired
     public RespR applInvoice(@RequestBody InvoiceApplVo invoiceApplVo){
         return selfCarService.applInvoice(invoiceApplVo);
     }
@@ -72,7 +70,6 @@ public class SelfCarServiceController {
      */
     @PostMapping("/getSelfCarInvoicesByTime")
     @ApiOperation(value="已开发票查询", notes="已开发票查询")
-    //@LoginRequired
     public RespR getSelfCarInvoicesByTime(@RequestBody SelfCarDueQueryVo selfCarDueQueryVo){
         return selfCarService.getSelfCarInvoicesByTime(selfCarDueQueryVo,null);
     }
@@ -82,7 +79,6 @@ public class SelfCarServiceController {
      */
     @PostMapping("/getSelfCarInvoicePackage")
     @ApiOperation(value="发票打包下载", notes="发票打包下载")
-    //@LoginRequired
     public RespR getSelfCarInvoicePackage(@RequestBody InvoicePackageVo invoicePackageVo){
         return selfCarService.getInvoicePackge(invoicePackageVo);
     }
@@ -92,7 +88,6 @@ public class SelfCarServiceController {
      */
     @PostMapping("/getSelfCarInvoicesByAppl")
     @ApiOperation(value="按申请id查询发票", notes="按申请id查询发票")
-    //@LoginRequired
     public RespR getSelfCarInvoicesByAppl(@RequestBody ApplQueryInvVo ApplQueryInvVo){
         return selfCarService.getSelfCarInvoicesByApplyIds(ApplQueryInvVo);
     }
@@ -102,7 +97,6 @@ public class SelfCarServiceController {
      */
     @PostMapping("/customerETCQuery")
     @ApiOperation(value="", notes="ETC绑定列表查询")
-    //@LoginRequired
     public RespR customerETCQuery(@RequestBody EtcQueryVo etcQueryVo){
         return selfCarService.getEtcInfo(etcQueryVo);
     }
@@ -125,7 +119,6 @@ public class SelfCarServiceController {
      */
     @PostMapping("/customerETCRec")
     @ApiOperation(value="", notes="ETC备案")
-    //@LoginRequired
     public RespR customerETCRec(@RequestBody EtcBindVo etcBindVo){
         return selfCarService.customerEtcRec(etcBindVo);
     }
@@ -137,7 +130,6 @@ public class SelfCarServiceController {
      */
     @PostMapping("/customerETCRecValid")
     @ApiOperation(value="", notes="ETC备案验证")
-    //@LoginRequired
     public RespR customerETCRecValid(@RequestBody EtcValidVo etcValidVo){
         return selfCarService.customerEtcRecValid(etcValidVo);
     }
@@ -148,7 +140,6 @@ public class SelfCarServiceController {
      */
     @PostMapping("/customerCarUnRec")
     @ApiOperation(value="", notes="etc解绑")
-    //@LoginRequired
     public RespR customerCarUnRec(@RequestBody List<CustomerCarRec> customerCarRecs){
         return selfCarService.customerCarUnRec(customerCarRecs);
     }

src/main/java/com/jkcredit/invoice/credit/SimpleCORSFilter.java

@@ -202,16 +202,7 @@ public class SimpleCORSFilter implements Filter {
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
         HttpServletRequest httpRequest = (HttpServletRequest) servletRequest;
         HttpServletResponse httpResponse = (HttpServletResponse) servletResponse;
-        // *表示允许所有域名跨域
-        //httpResponse.addHeader("Access-Control-Allow-Origin", "'*");
-        //httpResponse.addHeader("Access-Control-Allow-Headers","*");
-        // 允许跨域的Http方法
         httpResponse.addHeader("Access-Control-Allow-Methods", "GET,HEAD,POST,PUT,PATCH,DELETE,OPTIONS,TRACE");
-        // 允许浏览器访问 Token 认证响应头
-        //httpResponse.addHeader("Access-Control-Expose-Headers", TokenConst.TOKEN_HEADERS_FIELD);
-        // 默认返回原 Token
-        //httpResponse.setHeader(TokenConst.TOKEN_HEADERS_FIELD, httpRequest.getHeader(TokenConst.TOKEN_HEADERS_FIELD));
-        // 应对探针模式请求(OPTIONS)
         String methodOptions = "OPTIONS";
         if (httpRequest.getMethod().equals(methodOptions)) {
             httpResponse.setStatus(HttpServletResponse.SC_ACCEPTED);
@@ -237,7 +228,6 @@ public class SimpleCORSFilter implements Filter {
             ResponseCode responseCode = checkToken(httpRequest, httpResponse,startTime,flagUuid,requestApi);
             if (!Objects.equals(responseCode, ResponseCode.SUCCESS)) {
                 log.error("FILE - SimpleCORSFilterError = {}", responseCode + " ,requestURI = {" + httpRequest.getRequestURI() +"}");
-                //httpResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
                 httpResponse.setContentType("application/json; charset=utf-8");
                 httpResponse.setCharacterEncoding("utf-8");
                 PrintWriter writer = httpResponse.getWriter();
@@ -256,7 +246,6 @@ public class SimpleCORSFilter implements Filter {
                     dataResult.setRequestid(requestid);
                     dataResult.setMsg("无法认证");
                 }
-                //httpResponse.setStatus(HttpServletResponse.SC_BAD_REQUEST);
                 httpResponse.setContentType("application/json; charset=utf-8");
                 httpResponse.setCharacterEncoding("utf-8");
                 PrintWriter writer = httpResponse.getWriter();
@@ -374,7 +363,7 @@ public class SimpleCORSFilter implements Filter {
             if (contentLength < 0) {
                 return null;
             }
-            byte buffer[] = new byte[contentLength];
+            byte[] buffer = new byte[contentLength];
             for (int i = 0; i < contentLength;) {
 
                 int readlen = request.getInputStream().read(buffer, i, contentLength - i);

src/main/java/com/jkcredit/invoice/credit/custInterface/CustomerInterLowerService.java

@@ -4,13 +4,36 @@ import com.jkcredit.invoice.common.DataResult;
 
 public interface CustomerInterLowerService {
 
-    //自有车、无车 客户企业备案接口；
+    /**
+    * @Description 自有车、无车 客户企业备案接口；
+    * @Author  mashengyi
+    * @Date   2022/2/8 18:00
+    * @Param
+    * @Return
+    * @Exception
+    *
+    */
     DataResult customeInterRec(String appKey, String api, String data,String requestid);
 
-
-    //自有车、无车 客户企业查询接口；
+    /**
+     * @Description //自有车、无车 客户企业查询接口；
+     * @Author  mashengyi
+     * @Date   2022/2/8 18:00
+     * @Param
+     * @Return
+     * @Exception
+     *
+     */
     DataResult customeInterRecQuery(String appKey, String api, String data,String requestid);
 
-    //无车 自有车协议上传
+    /**
+     * @Description //无车 自有车协议上传
+     * @Author  mashengyi
+     * @Date   2022/2/8 18:00
+     * @Param
+     * @Return
+     * @Exception
+     *
+     */
     DataResult customeProtocolUpLoad(String appKey, String api, String data, String requestid);
 }

src/main/java/com/jkcredit/invoice/credit/custInterface/CustomerInterLowerServiceImpl.java

@@ -134,11 +134,6 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
             customerRec.setBussinessType(String.valueOf(cust.getBussinessType()));//业务类型 0 -自有车 1-外协车 2-无车
             customerRec.setOperatingRangeType(operatingRangeType);//运用类型
             customerRec.setCompanyType(companyType);//所属类型
-           // customerRec.setServiceStartTime(serviceStartTime);//服务开始时间
-          //  customerRec.setServiceEndTime(serviceEndTime);//服务结束时间
-          //  customerRec.setServiceType(serviceType);//协议类型
-           // customerRec.setContractFileName(contractFileName);//协议名称
-           // customerRec.setBase64Str(base64Str);//协议base64编码
 
             List<CustomerRec> customerRecs = new ArrayList<CustomerRec>();
             customerRecs.add(customerRec);
@@ -286,11 +281,6 @@ public class CustomerInterLowerServiceImpl implements CustomerInterLowerService
                 return result;
             }
 
-          /*  if((Base64Util.base64FileSize(base64Str)/1024)> 10){
-                result.setMsg("pdf不可超过10M!");
-                return  result;
-            }*/
-
 
             String fileType = contractFileName.substring(contractFileName.lastIndexOf(".") + 1, contractFileName.length()).toLowerCase();
             if(!PDF.equals(fileType)){

src/main/java/com/jkcredit/invoice/credit/custInterface/NoCarInterServiceImpl.java

@@ -24,9 +24,6 @@ import net.sf.json.JSONArray;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -100,8 +97,6 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             List<CustomerCarRec> customerCarRecList = new ArrayList<CustomerCarRec>();
             CustomerCarRec customerCarRec = new CustomerCarRec();
                 customerCarRec.setCustomerName(appKey);
-            //    String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
-            //    String appKeyDemo = paramService.getParamsByParamName("REQUEST_COMPANY_NAME").getParamValue();
                 Customer cust = customerMapper.selectByCustomerName(appKey);
 
                 CustomerRec customerRec = new CustomerRec();
@@ -282,10 +277,6 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 result.setMsg("客户："+appKey+";税号"+taxplayerCode+"未在平台备案成功，请先做备案");
                 return result;
             }
-           /* CustomerCarRec customerCarRec1 = customerCarRecMapper.selectByCarNum(plateNumber);
-            if (null == customerCarRec1){
-                return result;
-            }*/
 
             NoCarWayBill noCarWayBill = new NoCarWayBill();
             noCarWayBill.setCustomerName(appKey);

src/main/java/com/jkcredit/invoice/credit/custInterface/SelfCarInterServiceImpl.java

@@ -137,9 +137,6 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             JSONObject jsonObject = JSONObject.parseObject(data);
             String companyNum =  jsonObject.getString("companyNum");//企业编号 必输
             JSONArray vehicleList = jsonObject.getJSONArray("vehicleList");//车牌的json字符串 必输
-            //JSONObject jb = vehicleList.getJSONObject(0);
-          //  String plateNum = jb.getString("plateNum");//车牌号
-            //Integer plateColor = jb.getInteger("plateColor");//车牌颜色
             if(StringUtils.isEmpty(data)|| null == jsonObject || StringUtils.isEmpty(companyNum)
                     || null == vehicleList
                      ){
@@ -236,8 +233,6 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             String companyNum =  jsonObject.getString("companyNum");//企业编号 必输
             String mobile =  jsonObject.getString("mobile");//企业预留手机号 必输
             JSONArray cardIdList = jsonObject.getJSONArray("cardIdList");//ETC卡编号列表 必输
-            //JSONObject jb = cardIdList.getJSONObject(0);
-           // String cardId = jb.getString("cardId");//用户卡Id
             if(StringUtils.isEmpty(data)|| null == jsonObject || StringUtils.isEmpty(companyNum)
                     || StringUtils.isEmpty(mobile)
                     || null == cardIdList
@@ -519,8 +514,6 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             String cardId =  jsonObject.getString("cardId");//卡号 必输
             JSONArray tradeIdModel = jsonObject.getJSONArray("tradeIdModel");//交易ID集合 必输
 
-            /*String startExTime =  jsonObject.getString("startExTime");//开始时间 必输
-            String endExTime =  jsonObject.getString("endExTime");//结束时间 必输*/
             if(StringUtils.isEmpty(data)|| null == jsonObject || StringUtils.isEmpty(companyNum)
                     || StringUtils.isEmpty(cardId)
                     || null == tradeIdModel

src/main/java/com/jkcredit/invoice/mapper/customer/CustomerCarRecMapper.java

@@ -12,7 +12,6 @@ import java.util.List;
 
 @Repository
 public interface CustomerCarRecMapper extends BaseMapper<CustomerCarRec> {
-   // int deleteByPrimaryKey(String carNum);
 
     @Override
     int insert(CustomerCarRec record);

src/main/java/com/jkcredit/invoice/mapper/customer/CustomerOperMapper.java

@@ -3,9 +3,7 @@ package com.jkcredit.invoice.mapper.customer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jkcredit.invoice.model.entity.CustomerRecharge;
 import com.jkcredit.invoice.model.entity.customer.CustomerOper;
-import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/jkcredit/invoice/mapper/customer/CustomerRechargeMapper.java

@@ -29,5 +29,4 @@ public interface CustomerRechargeMapper extends BaseMapper<CustomerRecharge> {
 
     int updateByPrimaryKey(CustomerRecharge record);
 
- //   List<CustomerRecharge> findAllCustomerRechargeForExport(CustomerRecharge customerRecharge);
 }

src/main/java/com/jkcredit/invoice/model/entity/manager/Param.java

@@ -3,7 +3,6 @@ package com.jkcredit.invoice.model.entity.manager;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/jkcredit/invoice/service/CalculateInfor/impl/NocarCalculateInfoServiceImpl.java

@@ -14,6 +14,15 @@ import java.util.List;
 import java.util.Map;
 
 @Service
+/**
+* @Description 无车计费服务
+* @Author  mashengyi
+* @Date   2022/2/8 18:28
+* @Param
+* @Return
+* @Exception
+*
+*/
 public class NocarCalculateInfoServiceImpl extends ServiceImpl<NoCarCalculateInforMapper,NoCarCalculateInfor> implements NoCarCalculateInfoService {
     @Autowired
     NoCarCalculateInforMapper noCarCalculateInforMapper;

src/main/java/com/jkcredit/invoice/service/CalculateInfor/impl/SelfcarCalculateInfoServiceImpl.java

@@ -15,6 +15,16 @@ import java.util.List;
 import java.util.Map;
 
 @Service
+
+/**
+* @Description 自有车计费服务
+* @Author  mashengyi
+* @Date   2022/2/8 18:28
+* @Param
+* @Return
+* @Exception
+*
+*/
 public class SelfcarCalculateInfoServiceImpl extends ServiceImpl<SelfCarCalculateInforMapper,SelfCarCalculateInfor> implements SelfCarCalculateInfoService {
     @Autowired
     SelfCarCalculateInforMapper CarCalculateInforMapper ;

src/main/java/com/jkcredit/invoice/service/customer/impl/CustomerServiceImpl.java

@@ -74,10 +74,6 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
         }
         Customer customer = customerMapper.selectByCustomerName(customerRecharge.getCustomerName());
         Double currentMoney = MathUtil.add(customer.getAccountBalance(),customerRecharge.getRechargeMony());
-        /*if(currentMoney.compareTo(0.0) < 0){
-            log.error("充值失败：CustomerServiceImpl.customRecharge：" + currentMoney);
-            return false;
-        }*/
         customer.setAccountBalance(currentMoney);
         customerMapper.updateByPrimaryKeySelective(customer);
         customerRecharge.setRechargeTime(DateUtil.getCurrentDateStr());
@@ -93,9 +89,6 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
         if(customerRec.getRecStatus().intValue() == 2){
             return new RespR(false,"无法上传协议，未注册");
         }
-        /*if(customerRec.getContractSuc().intValue() == 1){
-            return new RespR(false,"协议已经上传");
-        }*/
         B2bContractAddRequest b2bContractAddRequest = new B2bContractAddRequest();
         b2bContractAddRequest.setCompanyNum(customerRec.getCompanyNum());
         b2bContractAddRequest.setServiceStartTime(DateUtil.dateToTime(customerRec.getServiceStartTime()));
@@ -133,18 +126,6 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
             return new RespR(false,"客户已经备案成功，无需备案");
         }
         customerRecMapper.updateByPrimaryKeySelective(customerRec);
-        //主动查询上游接口，如果已经备案则更新
-    /*    RespR respR1 = customerService.customerRecQuery(customerRec);
-        if(respR1.getCode() == 0){
-            log.info("客户注册查上游成功：CustomerServiceImpl.customeRec{}",customerRec);
-            List<B2bCompanyModel> b2bCompanyModels = (List<B2bCompanyModel>)respR1.getData();
-            if(b2bCompanyModels.size()==1){
-                customerRec.setCompanyNum(b2bCompanyModels.get(0).getCompanyNum());
-                customerRec.setRecStatus(1);
-                customerRecMapper.updateByPrimaryKeySelective(customerRec);
-                return new RespR("注册成功");
-            }
-        }*/
         CompanyAddRequest companyAddRequest = buildCompany(customerRec);
         log.info("开始客户上游注册：CustomerServiceImpl.customeRec{}",customerRec);
         //注册企业

src/main/java/com/jkcredit/invoice/service/lowerService/impl/CustomerLowerServiceImpl.java

@@ -169,19 +169,6 @@ public class CustomerLowerServiceImpl implements CustomeLowerService {
     }
     @Override
     public RespR customeRecQueryList(CustomerRec customerRec) {
-       /* List<CustomerRec> customerRecs = customerRecMapper.selectByCustomerNameAll(customerRec.getCustomerName());
-        if(customerRec.getBussinessType()!=null){
-            List<CustomerRec> customerRecsN = new ArrayList<>();
-            if(customerRecs!=null && customerRecs.size()>0){
-                customerRecs.forEach(customerRec1 -> {
-                    if(customerRec.getBussinessType().equals(customerRec1.getBussinessType())){
-                        if(customerRec1.getRecStatus() == 1)
-                        customerRecsN.add(customerRec1);
-                    }
-                });
-            }
-            return new RespR(customerRecsN); TODO
-        }*/
 
         return new RespR(customerRecMapper.selectByCustomerNameCpAll(customerRec));
     }

src/main/java/com/jkcredit/invoice/service/lowerService/impl/NoCarServiceImpl.java

@@ -178,14 +178,6 @@ public class NoCarServiceImpl implements NoCarService{
             res.append("#客户："+customer.getCustomerName()+"不存在或状态异常");
             return new RespR(false,res.toString());
         }
-     /*   CustomerRec customerRecP = new CustomerRec();
-        customerRecP.setCustomerName(customerCarRec.getCustomerName());
-        customerRecP.setCompanyName(customerCarRec.getCompanyName());
-        CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecP);
-        if(customerRec == null){
-            res.append("#客户："+customerCarRec.getCustomerName()+"企业:"+customerCarRec.getCompanyName()+"备案信息不存在");
-            return new RespR(false,res.toString());
-        }*/
 
         VehicleQueryRequest vehicleQueryRequest = new VehicleQueryRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
@@ -240,10 +232,6 @@ public class NoCarServiceImpl implements NoCarService{
             insertOrUpdateBillStart(noCarWayBill);
             return new RespR(false,"失败，运单开始时间超72小时");
         }
-       /* if((DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96) && (noCarWayBill.getInterType() != 0)){
-            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
-            return new RespR(false,"失败，承运时长超96小时");
-        }*/
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
             log.info("运单上传失败：NoCarServiceImpl.noCarWaybillStart{}，msg{}",noCarWayBill,respR.getMsg());
@@ -356,13 +344,6 @@ public class NoCarServiceImpl implements NoCarService{
         noCarWayBillDb.setPredictEndTime(noCarWayBill.getPredictEndTime());
         noCarWayBillDb.setBatchNumEnd(noCarWayBill.getBatchNumEnd());
         noCarWayBillDb.setInterType(noCarWayBill.getInterType());
-        /*if((DateUtil.getDistanceHours(noCarWayBill1.getStartTime(),DateUtil.StringToDate(noCarWayBill1.getPredictEndTime()))<-96) && (noCarWayBill.getInterType() != 0)){
-            //noCarWayBill1.setBillwayStatus(4);
-            noCarWayBill1.setFailReason("失败，承运时长超96小时");
-            noCarWaybillMapper.updateByBillNumTimeRes(noCarWayBill);
-            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"运单已经超时，请拆分");
-            return new RespR(false,"失败，承运时长超96小时");
-        }*/
 
         WaybillEndRequest waybillEndRequest = new WaybillEndRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
@@ -436,10 +417,6 @@ public class NoCarServiceImpl implements NoCarService{
             insertOrUpdateBillStart(noCarWayBill);
             return new RespR(false,"失败，运单未满20天时效");
         }
-       /* if((DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96) && (noCarWayBill.getInterType() != 0)){
-            log.info("历史运单开始上传失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
-            return new RespR(false,"失败，承运时长超96小时");
-        }*/
 
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
@@ -514,12 +491,6 @@ public class NoCarServiceImpl implements NoCarService{
         noCarWayBillDb.setDestAddr(noCarWayBill.getDestAddr());
         noCarWayBillDb.setPredictEndTime(noCarWayBill.getPredictEndTime());
         noCarWayBillDb.setInterType(noCarWayBill.getInterType());
-        /*if((DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96) && (noCarWayBill.getInterType() != 0)){
-            log.info("历史运单结束上传失败：NoCarServiceImpl.noCarHisWaybillEnd{},msg{}",noCarWayBill,"运单已经超时，请拆分");
-            noCarWayBill.setFailReason("失败，承运时长超96小时");
-            noCarWaybillMapper.updateByBillNumTimeRes(noCarWayBill);
-            return new RespR(false,"失败，承运时长超96小时");
-        }*/
         WaybillHistoryEndRequest waybillEndRequest = new WaybillHistoryEndRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
         waybillEndRequest.setCompanyNum(companyNum);

src/main/java/com/jkcredit/invoice/service/lowerService/impl/SelfCarServiceLImpl.java

@@ -215,7 +215,6 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
             customer.setInvoiceTime(DateUtil.getCurrentDateStr());
             customer.setAccountBalance(MathUtil.sub(customer.getAccountBalance(),needFee));
             customerMapper.updateByPrimaryKeySelective(customer);
-            //SelfCarTrade selfCarTrade =  sellCarTradeMapper.selectByTradeId(cardTradeModel.getTradeId());
             return new RespR(respR.getData());
         }
 

src/main/java/com/jkcredit/invoice/service/manager/impl/ParamServiceImpl.java

@@ -46,12 +46,6 @@ public class ParamServiceImpl extends ServiceImpl<ParamMapper, Param> implements
 
     @Override
     public RespR<Boolean> updateParam(Param param){
-       /* if(user.getRoleId()!=null){
-            //根据角色ID查询角色信息
-            Role role =roleService.getById(user.getRoleId());
-            //设置角色名称
-            user.setRoleName(role.getRoleName());
-        }*/
         return new RespR<>(baseMapper.updateParam(param));
     }
 

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayServiceImpl.java

@@ -113,14 +113,6 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
                         return;
 
                     }
-                   /* if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
-                        log.info("运单结束失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
-                        noCarWaybillMapperImprt.updateBillway(-2,"失败，承运时长超96小时#",noCarWayBill);
-                        noCarWayBill.setBillwayStatus(-2);
-                        noCarWayBill.setFailReason("失败，承运时长超96小时");
-                        insertOrUpdateBill(noCarWayBill,noCarWayBillDb);
-                        return;
-                    }*/
                     //1.查询是否有车辆备案
                     CustomerCarRec customerCarRec;
 
@@ -186,7 +178,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
             public void run() {
                 noCarWayBills.parallelStream().forEach(noCarWayBill -> {
                     try {
-                        log.info("kai shi chu li li si yun dan"+noCarWayBill.getBillNum());
+                        log.info("开始处理历史运单："+noCarWayBill.getBillNum());
                         //根据税号，查询备案企业
                         CustomerRec customerRec = new CustomerRec();
                         customerRec.setCustomerName(customerName);

src/main/java/com/jkcredit/invoice/util/CorsFilterCheckUtil.java

@@ -72,7 +72,6 @@ public class CorsFilterCheckUtil {
 
         }
         if(StringUtils.isEmpty(data)){
-            // data = getsrt("\"data\":", ",", request).trim();;
             data = JSONObject.parseObject(requestData.substring(0, requestData.length()-1)).getString("data");
         }
         return  data;

src/main/java/com/jkcredit/invoice/util/FileHandleUtil.java

@@ -14,11 +14,8 @@ import java.io.InputStream;
  */
 public class FileHandleUtil {
 
-	/** 绝对路径 **/
-//	private static String absolutePath = "/Users/sunzhaoning/Downloads";
 
 	private static String absolutePath ="";
-//	private static String absolutePath ="/Users/Administrator/Desktop/excel/";
 
 	/** 静态目录 **/
 	private static String staticDir = "static";

src/main/java/com/jkcredit/invoice/util/HttpUtil.java

@@ -23,7 +23,6 @@ public class HttpUtil {
     @Autowired
     private RestTemplate restTemplate;
 
-//    private static final String URL = "http://api.jkcredit.com:58080/gateway?api=credit.sec.data";
     private static final String URL = "http://192.168.1.28:58080/gateway?api=credit.sec.data";
     private static final String APPKEY= "JIAO_KE";
     private static final String SECRETKEY= "D78C393359BF128715C65D91C67051478A4DFC13";
@@ -61,6 +60,5 @@ public class HttpUtil {
         Map<String, Object> arrayData = new HashMap<>(5);
         arrayData.put("plateNumber", "苏G1815E");
         arrayData.put("plateColor", Integer.parseInt("1"));
-//        System.out.println(getCheckResult(arrayData,"VEHICLE_REGISTER"));
     }
 }

src/main/java/com/jkcredit/invoice/util/MD5Util.java

@@ -11,7 +11,7 @@ import java.security.MessageDigest;
 public class MD5Util {
 
     public final static String encrypt(String s) {
-        char hexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+        char[] hexDigits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
         try {
             byte[] btInput = s.getBytes();
             // 获得MD5摘要算法的 MessageDigest 对象
@@ -22,7 +22,7 @@ public class MD5Util {
             byte[] md = mdInst.digest();
             // 把密文转换成十六进制的字符串形式
             int j = md.length;
-            char str[] = new char[j * 2];
+            char[] str = new char[j * 2];
             int k = 0;
             for (int i = 0; i < j; i++) {
                 byte byte0 = md[i];

src/main/java/com/jkcredit/invoice/util/PlateCheckUtil.java

@@ -84,8 +84,6 @@ public class PlateCheckUtil {
     }
 
     public static void main(String[] args) {
-//        System.out.println(isNumeric("6"));
-//        System.out.println(isBefoTime("2019-05-27T00:00:00",19));
         System.out.println(isPlateNumber("粤BD58041"));
 
     }

src/main/java/com/jkcredit/invoice/util/QueryDemo_Test.java

@@ -52,7 +52,7 @@ public class QueryDemo_Test {
 	 *
 	 * @param args
 	 */
-	public static void main(String args[]) throws Exception {
+	public static void main(String[] args) throws Exception {
 
 		for (int i = 0;i<=1000000;i++){
 			QueryDemo_Test demo = new QueryDemo_Test();