update com.alibaba:fastjson from 1.2.83 to 2.0.53 and fix break change.

Readme_cn.md

@@ -2,8 +2,8 @@
 ## 说明
  HC小区管理系统是一套saas物业管理的系统，包括 房产、业主、 费用 （可以线上缴费）、报修（可以线上报修）、投诉建议、采购、巡检、停车、门径、道闸、监控、工作流、问卷和公告等功能。
 
-目前很多地方商用超过一年半时间 欢饮直接使用或者推广使用
- 
+ 当前，众多地区已进入商用阶段达一年半之久，其应用成效已获充分验证，欢迎各界直接采用或广泛推广，携手共创更大价值与更优效益。
+
  相关代码：<br/><br/>
  1、[物业系统前端](https://gitee.com/java110/MicroCommunityWeb) : 物业员工使用电脑端<br/>
  2、[物业系统后端](https://gitee.com/wuxw7/MicroCommunity): 核心业务处理端<br/>

docs/db/tt.sql

@@ -28949,8 +28949,8 @@ CREATE TABLE `pay_fee_detail_month` (
   `fee_id` varchar(30) NOT NULL COMMENT '费用ID',
   `detail_id` varchar(30) NOT NULL COMMENT '费用明细ID',
   `community_id` varchar(30) NOT NULL COMMENT '小区ID',
-  `detail_year` int(11) NOT NULL COMMENT '年',
-  `detail_month` int(11) NOT NULL COMMENT '月',
+  `detail_year` int NOT NULL COMMENT '年',
+  `detail_month` int NOT NULL COMMENT '月',
   `receivable_amount` decimal(10,4) NOT NULL COMMENT '应收金额',
   `received_amount` decimal(10,4) NOT NULL COMMENT '应收金额',
   `discount_amount` decimal(10,4) NOT NULL DEFAULT '0.0000' COMMENT '折扣金额',
@@ -28968,19 +28968,22 @@ CREATE TABLE `pay_fee_detail_month` (
   `fee_name` varchar(64) DEFAULT NULL COMMENT '费用名称',
   `config_id` varchar(30) NOT NULL COMMENT '标准ID',
   `deadline_time` date NOT NULL DEFAULT '1000-01-01' COMMENT '缴费截止时间',
+  `obj_fpc_id` varchar(30) NOT NULL COMMENT '对象目录，房屋时 floor_id 车辆时 pa_id 合同时 contract_type_id',
+  `fee_type_cd` varchar(30) NOT NULL COMMENT '费用大类',
   PRIMARY KEY (`month_id`),
   KEY `i_pfdm_community_id` (`community_id`),
   KEY `i_pfdm_cur_month_time` (`cur_month_time`),
   KEY `i_pfdm_fee_id` (`fee_id`),
   KEY `i_pfdm_obj_id` (`obj_id`),
   KEY `i_pfdm_config_id` (`config_id`),
-  KEY `i_pfdm_owner_id` (`owner_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+  KEY `i_pfdm_owner_id` (`owner_id`),
+  KEY `i_oc_pay_fee_detail_month` (`obj_fpc_id`,`cur_month_time`),
+  KEY `i_fc_pay_fee_detail_month` (`fee_type_cd`,`cur_month_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
 
 -- ----------------------------
 -- Records of pay_fee_detail_month
 -- ----------------------------
-INSERT INTO `pay_fee_detail_month` VALUES ('79202401081920015305000055', '902024010804100039', '912024010830450050', '2024010802740034', '2024', '1', '120.0000', '120.0000', '0.0000', '程序计算生成', '2024-01-08 19:20:01', '0', '1-1-1001', '752024010827870016', '测试业主', '772024010866770019', '18109711443', 'W', '2024-01-08 19:19:47', '2024-01-01 00:00:00', '物业费', '922024010877430036', '2024-02-01');
 
 -- ----------------------------
 -- Table structure for pay_fee_qrcode

java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java

@@ -109,6 +109,8 @@ public class OwnerCarDto extends PageDto implements Serializable {
     private String logStartTime;
     private String logEndTime;
 
+    private String paId;
+
     private List<OwnerCarAttrDto> ownerCarAttrDto;
 
     public String getCarColor() {
@@ -566,4 +568,12 @@ public String getLogEndTime() {
     public void setLogEndTime(String logEndTime) {
         this.logEndTime = logEndTime;
     }
+
+    public String getPaId() {
+        return paId;
+    }
+
+    public void setPaId(String paId) {
+        this.paId = paId;
+    }
 }

java110-bean/src/main/java/com/java110/dto/payFee/PayFeeDetailMonthDto.java

@@ -58,6 +58,11 @@ public class PayFeeDetailMonthDto extends FeeDto implements Serializable {
     private String feeName;
     private String configId;
 
+    private String objFpcId;
+
+    private String feeTypeCd;
+
+
     private List<FeeAttrDto> feeAttrs;
 
     public String getDetailMonth() {
@@ -276,4 +281,22 @@ public String getFeeState() {
     public void setFeeState(String feeState) {
         this.feeState = feeState;
     }
+
+    public String getObjFpcId() {
+        return objFpcId;
+    }
+
+    public void setObjFpcId(String objFpcId) {
+        this.objFpcId = objFpcId;
+    }
+
+    @Override
+    public String getFeeTypeCd() {
+        return feeTypeCd;
+    }
+
+    @Override
+    public void setFeeTypeCd(String feeTypeCd) {
+        this.feeTypeCd = feeTypeCd;
+    }
 }

java110-bean/src/main/java/com/java110/dto/payFee/PayFeeMonthOwnerDto.java

@@ -17,6 +17,8 @@ public class PayFeeMonthOwnerDto implements Serializable {
     private String link;
     private String payFeeTime;
 
+    private String objFpcId;
+
     public String getObjName() {
         return objName;
     }
@@ -64,4 +66,12 @@ public String getPayFeeTime() {
     public void setPayFeeTime(String payFeeTime) {
         this.payFeeTime = payFeeTime;
     }
+
+    public String getObjFpcId() {
+        return objFpcId;
+    }
+
+    public void setObjFpcId(String objFpcId) {
+        this.objFpcId = objFpcId;
+    }
 }

java110-bean/src/main/java/com/java110/dto/report/QueryStatisticsDto.java

@@ -17,6 +17,7 @@ public class QueryStatisticsDto extends PageDto implements Serializable {
     private String endDate;
 
     private String floorId;
+    private String[] floorIds;
 
     private String configId;
 
@@ -29,6 +30,7 @@ public class QueryStatisticsDto extends PageDto implements Serializable {
     private String link;
 
     private String feeTypeCd;
+    private String[] feeTypeCds;
 
     private String[] unitIds;
 
@@ -159,4 +161,20 @@ public String getHisDate() {
     public void setHisDate(String hisDate) {
         this.hisDate = hisDate;
     }
+
+    public String[] getFloorIds() {
+        return floorIds;
+    }
+
+    public void setFloorIds(String[] floorIds) {
+        this.floorIds = floorIds;
+    }
+
+    public String[] getFeeTypeCds() {
+        return feeTypeCds;
+    }
+
+    public void setFeeTypeCds(String[] feeTypeCds) {
+        this.feeTypeCds = feeTypeCds;
+    }
 }

java110-bean/src/main/java/com/java110/dto/report/ReportFloorFeeStatisticsDto.java

@@ -0,0 +1,123 @@
+package com.java110.dto.report;
+
+public class ReportFloorFeeStatisticsDto {
+
+    private String floorId;
+
+    private String floorNum;
+
+    private String floorName;
+    private String oweRoomCount;
+    private String feeRoomCount;
+    private String receivedFee;
+    private String preReceivedFee;
+    private String hisOweFee;
+    private String curReceivableFee;
+    private String curReceivedFee;
+    private String hisReceivedFee;
+
+    //todo 欠费房屋数 oweRoomCount
+
+    //todo 收费房屋数 feeRoomCount
+
+    //todo 实收金额 receivedFee
+
+    //todo 预收金额 preReceivedFee
+
+    //todo 历史欠费金额 hisOweFee
+
+    //todo 当期应收金额 curReceivableFee
+
+    //todo 当期实收金额 curReceivedFee
+
+    //todo 欠费追回 hisReceivedFee
+
+
+    public String getFloorId() {
+        return floorId;
+    }
+
+    public void setFloorId(String floorId) {
+        this.floorId = floorId;
+    }
+
+    public String getFloorNum() {
+        return floorNum;
+    }
+
+    public void setFloorNum(String floorNum) {
+        this.floorNum = floorNum;
+    }
+
+    public String getFloorName() {
+        return floorName;
+    }
+
+    public void setFloorName(String floorName) {
+        this.floorName = floorName;
+    }
+
+    public String getOweRoomCount() {
+        return oweRoomCount;
+    }
+
+    public void setOweRoomCount(String oweRoomCount) {
+        this.oweRoomCount = oweRoomCount;
+    }
+
+    public String getFeeRoomCount() {
+        return feeRoomCount;
+    }
+
+    public void setFeeRoomCount(String feeRoomCount) {
+        this.feeRoomCount = feeRoomCount;
+    }
+
+    public String getReceivedFee() {
+        return receivedFee;
+    }
+
+    public void setReceivedFee(String receivedFee) {
+        this.receivedFee = receivedFee;
+    }
+
+    public String getPreReceivedFee() {
+        return preReceivedFee;
+    }
+
+    public void setPreReceivedFee(String preReceivedFee) {
+        this.preReceivedFee = preReceivedFee;
+    }
+
+    public String getHisOweFee() {
+        return hisOweFee;
+    }
+
+    public void setHisOweFee(String hisOweFee) {
+        this.hisOweFee = hisOweFee;
+    }
+
+    public String getCurReceivableFee() {
+        return curReceivableFee;
+    }
+
+    public void setCurReceivableFee(String curReceivableFee) {
+        this.curReceivableFee = curReceivableFee;
+    }
+
+    public String getCurReceivedFee() {
+        return curReceivedFee;
+    }
+
+    public void setCurReceivedFee(String curReceivedFee) {
+        this.curReceivedFee = curReceivedFee;
+    }
+
+    public String getHisReceivedFee() {
+        return hisReceivedFee;
+    }
+
+    public void setHisReceivedFee(String hisReceivedFee) {
+        this.hisReceivedFee = hisReceivedFee;
+    }
+}

java110-bean/src/main/java/com/java110/dto/user/LoginOwnerResDto.java

@@ -23,6 +23,9 @@ public class LoginOwnerResDto implements Serializable {
 
     private String communityName;
 
+    private String communityTel;
+
+
     private String token;
 
     private String key;
@@ -31,6 +34,7 @@ public class LoginOwnerResDto implements Serializable {
 
     private String ownerTypeCd;
 
+
     public String getUserId() {
         return userId;
     }
@@ -126,4 +130,12 @@ public String getOwnerTypeCd() {
     public void setOwnerTypeCd(String ownerTypeCd) {
         this.ownerTypeCd = ownerTypeCd;
     }
+
+    public String getCommunityTel() {
+        return communityTel;
+    }
+
+    public void setCommunityTel(String communityTel) {
+        this.communityTel = communityTel;
+    }
 }

java110-bean/src/main/java/com/java110/po/payFee/PayFeeDetailMonthPo.java

@@ -36,6 +36,10 @@ public class PayFeeDetailMonthPo implements Serializable {
 
     private String deadlineTime;
 
+    private String objFpcId;
+
+    private String feeTypeCd;
+
 
     public String getDetailMonth() {
         return detailMonth;
@@ -228,4 +232,20 @@ public String getDeadlineTime() {
     public void setDeadlineTime(String deadlineTime) {
         this.deadlineTime = deadlineTime;
     }
+
+    public String getObjFpcId() {
+        return objFpcId;
+    }
+
+    public void setObjFpcId(String objFpcId) {
+        this.objFpcId = objFpcId;
+    }
+
+    public String getFeeTypeCd() {
+        return feeTypeCd;
+    }
+
+    public void setFeeTypeCd(String feeTypeCd) {
+        this.feeTypeCd = feeTypeCd;
+    }
 }

java110-core/src/main/java/com/java110/core/factory/AuthenticationFactory.java

@@ -311,7 +311,7 @@ public static void createSign(HttpHeaders headers, HttpMethod httpMethod, String
             transactionId = headers.getFirst(CommonConstant.TRANSACTION_ID);
         }
         String requestTime = headers.getFirst(CommonConstant.HTTP_REQ_TIME);
-        if (StringUtil.isEmpty(transactionId)) {
+        if (StringUtil.isEmpty(requestTime)) {
             requestTime = headers.getFirst(CommonConstant.REQUEST_TIME);
         }
 
@@ -329,6 +329,8 @@ public static void createSign(HttpHeaders headers, HttpMethod httpMethod, String
             paramStr = param;
         }
         String sign = transactionId + requestTime + appId + paramStr + appRoutes.get(0).getSecurityCode();
+        logger.debug("鉴权前createSign:{}",sign);
+
         headers.remove("sign");
         headers.add("sign", md5(sign));
     }
@@ -351,7 +353,7 @@ public static void createSign(Map<String, String> headers, HttpMethod httpMethod
             transactionId = headers.get(CommonConstant.HTTP_TRANSACTION_ID);
         }
         String requestTime = headers.get(CommonConstant.REQUEST_TIME);
-        if (StringUtil.isEmpty(transactionId)) {
+        if (StringUtil.isEmpty(requestTime)) {
             requestTime = headers.get(CommonConstant.HTTP_REQ_TIME);
         }
 
@@ -369,6 +371,8 @@ public static void createSign(Map<String, String> headers, HttpMethod httpMethod
             paramStr = param;
         }
         String sign = transactionId + requestTime + appId + paramStr + appRoutes.get(0).getSecurityCode();
+        logger.debug("鉴权前createSign:{}",sign);
+
         headers.put("sign", md5(sign));
     }
 

java110-core/src/main/java/com/java110/core/log/LoggerFactory.java

@@ -355,6 +355,6 @@ public void info(Marker marker, String msg, Throwable t) {
 
     @Override
     public boolean isWarnEnabled() {
-        return this.isWarnEnabled();
+        return this.logger.isWarnEnabled();
     }
 }