Merge remote-tracking branch 'origin/master'

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/common/annotate/repeatableHttpServletRequest/FilterRegistrationConfiguration.java

@@ -1,31 +0,0 @@
-package com.tofly.fees.common.annotate.repeatableHttpServletRequest;
-
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.servlet.Filter;
-
-/**
- * @description:
- * @Title: FilterRegistrationConfiguration
- * @Package com.tofly.fees.common.annotate
- * @Date 2023-06-27 13:36
- */
-@Configuration
-public class FilterRegistrationConfiguration {
-    @Bean
-    public FilterRegistrationBean someFilterRegistration() {
-        FilterRegistrationBean registration = new FilterRegistrationBean();
-        registration.setFilter(repeatableFilter());
-        registration.addUrlPatterns("/*");
-        registration.setName("repeatableFilter");
-        registration.setOrder(1);
-        return registration;
-    }
-
-    @Bean
-    public Filter repeatableFilter() {
-        return new RepeatableFilter();
-    }
-}

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/common/annotate/repeatableHttpServletRequest/RepeatableFilter.java

@@ -1,22 +0,0 @@
-package com.tofly.fees.common.annotate.repeatableHttpServletRequest;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * @description:
- * @Title: RepeatableFilter
- * @Package com.tofly.fees.common.annotate
- * @Author 芝士汉堡
- * @Date 2023-06-27 13:35
- */
-public class RepeatableFilter implements Filter {
-    @Override
-    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-        HttpServletRequest httpServletRequest = new RepeatableHttpServletRequest((HttpServletRequest)servletRequest);
-        HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse;
-        filterChain.doFilter(httpServletRequest,httpServletResponse);
-    }
-}

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/common/annotate/repeatableHttpServletRequest/RepeatableHttpServletRequest.java

@@ -1,86 +0,0 @@
-package com.tofly.fees.common.annotate.repeatableHttpServletRequest;
-
-import org.apache.commons.io.IOUtils;
-
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-/**
- * @description:
- * @Title: RepeatableHttpServletRequest
- * @Package com.tofly.fees.common.annotate
- * @Author 芝士汉堡
- * @Date 2023-06-27 12:00
- */
-public class RepeatableHttpServletRequest  extends HttpServletRequestWrapper {
-    private final byte[] bytes;
-    public RepeatableHttpServletRequest(HttpServletRequest request) throws IOException {
-        super(request);
-        bytes = IOUtils.toByteArray(request.getInputStream());
-    }
-    @Override
-    public ServletInputStream getInputStream() throws IOException {
-        return new ServletInputStream() {
-            private int lastIndexRetrieved = -1;
-            private ReadListener readListener = null;
-            @Override
-            public boolean isFinished() {
-                return (lastIndexRetrieved == bytes.length-1);
-            }
-            @Override
-            public boolean isReady() {
-                // This implementation will never block
-                // We also never need to call the readListener from this method, as this method will never return false
-                return isFinished();
-            }
-            @Override
-            public void setReadListener(ReadListener readListener) {
-                this.readListener = readListener;
-                if (!isFinished()) {
-                    try {
-                        readListener.onDataAvailable();
-                    } catch (IOException e) {
-                        readListener.onError(e);
-                    }
-                } else {
-                    try {
-                        readListener.onAllDataRead();
-                    } catch (IOException e) {
-                        readListener.onError(e);
-                    }
-                }
-            }
-            @Override
-            public int read() throws IOException {
-                int i;
-                if (!isFinished()) {
-                    i = bytes[lastIndexRetrieved+1];
-                    lastIndexRetrieved++;
-                    if (isFinished() && (readListener != null)) {
-                        try {
-                            readListener.onAllDataRead();
-                        } catch (IOException ex) {
-                            readListener.onError(ex);
-                            throw ex;
-                        }
-                    }
-                    return i;
-                } else {
-                    return -1;
-                }
-            }
-        };
-    }
-    @Override
-    public BufferedReader getReader() throws IOException {
-        ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-        BufferedReader temp = new BufferedReader(new InputStreamReader(is));
-        return temp;
-    }
-}

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/meterreadingmgt/controller_easy/TestController.java

@@ -113,12 +113,22 @@ public class TestController extends BaseController {
     }
 
 
-    @ApiOperation(value = "测试MAP接口2")
-    @PostMapping("/test5")
-    public ResultRespone getValues(@RequestPostSingleParam List name,@RequestPostSingleParam String id  ) {
-        return  ResultRespone.success(name);
+    @ApiOperation(value = "传入")
+    @PostMapping("/importTest")
+    public ResultRespone getValues(@RequestParam(value = "file",required = false) MultipartFile file,@RequestParam String a ) {
+        try {
+            return ResultRespone.success(file.getOriginalFilename());
+        }catch (Exception ex){
+            return ResultRespone.success(ex.getMessage().toString());
+        }
     }
 
+    @ApiOperation(value = "测试")
+    @PostMapping("/importTest2")
+    public ResultRespone getValues(@RequestPostSingleParam String    a,@RequestPostSingleParam String b) {
+
+        return  ResultRespone.success(a);
+    }
 
 
 }

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/entity/DaCustomerSelect.java

@@ -123,4 +123,7 @@ public class DaCustomerSelect extends Model<DaCustomerSelect> {
     @ColumnWidth(20)
     @ExcelProperty("证件号码")
     private String certNo;
+
+    @ExcelIgnore
+    private String invoiceType;
 }

collect-fees/collect-fees-service/src/main/resources/mapper/userprofilemgt/DaCustomerMapper.xml

@@ -33,7 +33,7 @@
         customerName,a.customer_address customerAddress,a.customer_phone customerPhone,a.apply_datetime
         applyDatetime,a.created_datetime createdDatetime,a.created_oname createdOname,nvl(a.meternumber,0) meterNumber
         ,a.customer_state customerState,a.CERT_TYPE certType,a.CERT_NO certNo, e.last_reading lastReading,e.this_reading thisReading,b.METER_CARD_ID meterCardId
-        ,f.name priceName,g.name meterTypeName
+        ,f.name priceName,g.name meterTypeName,a.INVOICE_TYPE invoiceType
         from tf_ywys_da_customer a inner join tf_ywys_da_meter b on a.CUSTOMER_NO=b.CUSTOMER_NO
         left join tf_ywys_bm_mr_area c on a.mr_area=c.code left join tf_ywys_bm_mr_book d on a.mr_book=d.code
         left join tf_ywys_bw_meter_read_plan e on a.customer_no=e.customer_no