开发更新

jiangping

2024-11-29 a5ec987b79393b9d26c621823461c5f4755cabfd

开发更新

 server/system_gateway/src/main/resources/application.yml

@@ -82,7 +82,7 @@
  compression:
    enabled: true
    mime-types: application/json
  port: 10010
  port: 10030

  tomcat:
    max-swallow-size: -1

 server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java

@@ -72,7 +72,6 @@
                                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"没有该操作权限");
                            }
                        }

                    }
                  /* try {
                        CustomHttpServletRequestWrapper requestWrapper = (CustomHttpServletRequestWrapper)request;

 server/system_service/src/main/java/com/doumee/core/utils/DateCompare.java

@@ -68,22 +68,22 @@

        int yearDays = day - DateUtil.daysBetweenDates(DateUtil.addYearToDate(fromDate,year),fromDate) ;
        if(yearDays!=0){
            yearFloat = yearFloat.add(new BigDecimal(yearDays).divide(new BigDecimal(365), 2,RoundingMode.FLOOR));
            yearFloat = yearFloat.add(new BigDecimal(1.0*yearDays).divide(new BigDecimal(365.0), 2,RoundingMode.HALF_UP));
        }
        int monthDays = day - DateUtil.daysBetweenDates(DateUtil.addMonthToDate(fromDate,month),fromDate) ;
        if(monthDays!=0){
            monthFloat = monthFloat.add(new BigDecimal(monthDays*12).divide(new BigDecimal(365), 2,RoundingMode.FLOOR));
            monthFloat = monthFloat.add(new BigDecimal(1.0*monthDays*12).divide(new BigDecimal(365.0), 2,RoundingMode.HALF_UP));
        }
        return DateCompare.builder().day(day).month(month).year(year).yearFloat(yearFloat).monthFloat(monthFloat).yearDays(yearDays).monthDays(monthDays).build();
    }

    public static void main(String[] args) {
        DateCompare dateCompare =   DateCompare.dayCompare(DateUtil.getDateFromString("2024-12-01 00:00:00"),DateUtil.getDateByString("2025-03-01 00:00:00")
                ,DateUtil.getDateFromString("2024-12-01 00:00:00"),DateUtil.getDateFromString("2024-12-03 00:00:00"));
        DateCompare dateCompare =   DateCompare.dayCompare(DateUtil.getDateFromString("2024-12-01 00:00:00"),DateUtil.getDateByString("2024-12-31 00:00:00")
                ,DateUtil.getDateFromString("2024-12-01 00:00:00"),DateUtil.getDateFromString("2024-12-02 00:00:00"));
        System.out.println(dateCompare.monthFloat);
        System.out.println(dateCompare.yearFloat);
        System.out.println(dateCompare.yearFloat);
        System.out.println(dateCompare.yearFloat);
        System.out.println(dateCompare.yearFloat.multiply(new BigDecimal(365.0)));
        System.out.println(new BigDecimal(29.0).divide(new BigDecimal(365.0), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(365.0)));
    }
    public static DateCompare monthYearCompare(Date fromDate,Date toDate ){
        //开始时间往后延伸，除去有效时期
@@ -106,11 +106,11 @@

        int yearDays = day - DateUtil.daysBetweenDates(DateUtil.addYearToDate(fromDate,year),fromDate) ;
        if(yearDays!=0){
            yearFloat = yearFloat.add(new BigDecimal(yearDays).divide(new BigDecimal(365), 2,RoundingMode.FLOOR));
            yearFloat = yearFloat.add(new BigDecimal(1.0*yearDays).divide(new BigDecimal(365.0), 2,RoundingMode.HALF_UP));
        }
        int monthDays = day - DateUtil.daysBetweenDates(DateUtil.addMonthToDate(fromDate,month),fromDate) ;
        if(monthDays!=0){
            monthFloat = monthFloat.add(new BigDecimal(monthDays*12).divide(new BigDecimal(365), 2,RoundingMode.FLOOR));
            monthFloat = monthFloat.add(new BigDecimal(1.0*monthDays*12).divide(new BigDecimal(365.0), 2,RoundingMode.HALF_UP));
        }
        return DateCompare.builder().day(day).month(month).year(year).yearFloat(yearFloat).monthFloat(monthFloat).yearDays(yearDays).monthDays(monthDays).build();
    }

 server/visits/dmvisit_admin/src/main/resources/application.yml

@@ -68,7 +68,7 @@
  compression:
    enabled: true
    mime-types: application/json
  port: 10028
  port: 10038
  tomcat:
    max-swallow-size: -1
  servlet:

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java

@@ -152,6 +152,7 @@
    @ApiModelProperty(value = "项目名称")
    @TableField(exist = false)
    private String projectName;

    @ApiModelProperty(value = "楼宇名称")
    @TableField(exist = false)
    private String buildingName;

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java

@@ -101,7 +101,7 @@
        if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
            if(StringUtils.isNotBlank(smsConfig.getContent())){
                String content  = smsConfig.getContent().replace("{验证码}",code);
                emayService.sendSmsByHk(smsEmail.getPhone(),content);
                emayService.sendSingleSms(smsEmail.getPhone(),content);
                smsEmail.setRemark(code);
                smsEmail.setIsdeleted(Constants.ZERO);
                smsEmail.setCreateDate(new Date());

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java

@@ -410,7 +410,8 @@
            queryWrapper.eq(YwWorkorder::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.eq(YwWorkorder::getStatus, pageWrap.getModel().getStatus());
            queryWrapper.eq(!Constants.equalsInteger(pageWrap.getModel().getStatus(),-1),YwWorkorder::getStatus, pageWrap.getModel().getStatus());
            queryWrapper.in(Constants.equalsInteger(pageWrap.getModel().getStatus(),-1),YwWorkorder::getStatus, Constants.ZERO,Constants.ONE);
        }
        if (pageWrap.getModel().getSortnum() != null) {
            queryWrapper.eq(YwWorkorder::getSortnum, pageWrap.getModel().getSortnum());