Merge remote-tracking branch 'origin/master'

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

@@ -28,18 +28,8 @@ public class RepeatableFilter implements Filter {
         } else if (contentType.startsWith("multipart/")) {
             //文件上传类型
             filterChain.doFilter(servletRequest, servletResponse);
-            //return;
         }else if(contentType.startsWith("application/json")){
-
-//            HttpServletRequest httpServletRequestInfo =null;
-//            if (servletRequest instanceof HttpServletRequest) {
-//                httpServletRequestInfo=new RepeatableHttpServletRequest((HttpServletRequest)servletRequest);
-//            }
-//            if (null == httpServletRequestInfo) {
-//                filterChain.doFilter(servletRequest, servletResponse);
-//            } else {
                 filterChain.doFilter(httpServletRequest,httpServletResponse);
-            //}
         }else {
             filterChain.doFilter(servletRequest, servletResponse);
         }

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/controller/DaCustomerController.java

@@ -6,6 +6,7 @@ package com.tofly.fees.userprofilemgt.controller;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.util.ListUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -37,7 +38,10 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
+import static com.tofly.fees.common.ControllerConstants.*;
+import static com.tofly.fees.common.ControllerConstants.PAGE_NUMBER_PARA_NAME;
 import static com.tofly.fees.common.util.copyPropertiesUtils.copyProperties;
 
 /**
@@ -774,4 +778,73 @@ public class DaCustomerController {
         HashMap<String, Object> obj = daCustomerService.selCustomerAcc(customerNo);
         return ResultRespone.success(obj);
     }
+
+    @ApiOperation(value = "获取用户批量档案信息")
+    @GetMapping("/getCusDaPrice")
+    public ResultRespone getCusDaPrice(@ApiParam(value = "searchText", required = true)
+                                       @RequestParam(value = "searchText") String searchText,
+                                       @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
+                                       @RequestParam(value = PAGE_SIZE_PARA_NAME) int pageSize,
+                                       @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
+                                       @RequestParam(value = PAGE_NUMBER_PARA_NAME) int page
+    ) {
+
+        Page<HashMap<String, Object>> pg = new Page<HashMap<String, Object>>(page, pageSize);
+        Page<List<HashMap<String, Object>>> newPage = daCustomerService.selCusPriceInfo(pg, searchText);
+
+        CollectionData<List<HashMap<String, Object>>> m = new CollectionData<>(newPage.getRecords().stream().collect(Collectors.toList())
+                , newPage.getTotal());
+        //参数返回
+        return ResultRespone.success(m);
+    }
+
+
+    @ApiOperation(value = "批量设置用户水价信息")
+    @PostMapping("/updateSetCusDaPrice")
+    @Transactional
+    public ResultRespone updateSetCusDaPrice(@ApiParam(value = "customer_no(,号分割)", required = true) @RequestParam(value = "customer_no") String yhbhs,
+                                             @ApiParam(value = "pricecode", required = true) @RequestParam(value = "pricecode") String pricecode,
+                                             @ApiParam(value = "pricecode1", required = false) @RequestParam(value = "pricecode1") String pricecode1,
+                                             @ApiParam(value = "pricecode2", required = false) @RequestParam(value = "pricecode2") String pricecode2
+    ) {
+
+
+        String[] yhbhArr = yhbhs.split(",");
+        if (yhbhArr == null) {
+            return ResultRespone.failed("用户编号为Null");
+        }
+
+        int sucessCode = 0;
+        int failCode = 0;
+
+        for (String yhbh : yhbhArr) {
+            QueryWrapper<DaMeter> wapper = new QueryWrapper<>();
+            wapper.eq("customer_no", yhbh);
+            DaMeter meter = daMeterService.getOne(wapper);
+            if (meter != null) {
+
+                if (!StringUtils.isBlank(pricecode)) {
+                    meter.setPriceCode(pricecode);
+                }
+
+                if (!StringUtils.isBlank(pricecode1)) {
+                    meter.setPriceCode1(pricecode1);
+                }
+
+                if (!StringUtils.isBlank(pricecode2)) {
+                    meter.setPriceCode2(pricecode2);
+                }
+            }
+            boolean isSave = daMeterService.update(meter, wapper);
+            if (isSave) {
+                sucessCode += 1;
+            } else {
+                failCode += 1;
+            }
+        }
+
+        String msg = String.format("批量设置成功[%s]条,失败[%s]条", sucessCode, failCode);
+        return ResultRespone.success(1,msg);
+    }
+
 }

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/mapper/DaCustomerMapper.java

@@ -40,5 +40,18 @@ public interface DaCustomerMapper extends BaseMapper<DaCustomer> {
 
     List<DaCustomerSelect> selectDaCustomerPage(String searchText, String mr_area, String mr_book, String meter_model, String price_code, String customer_state, String garbage_fee_flag, String start_created_datetime, String end_created_datetime, String mr_ocode,String companyBranch);
 
+      /**
+         * @MethodName selDaCustomerAcc
+         * @Description 查询用户余额信息
+         * @Author xb
+         * @Date 17:37 2023-07-25
+         */ 
    HashMap<String,Object> selDaCustomerAcc(String customerNo);
+      /**
+         * @MethodName selCusPriceInfo
+         * @Description 查询用户信息   
+         * @Author xb
+         * @Date 17:36 2023-07-25
+         */ 
+    Page<List<HashMap<String, Object>>> selCusPriceInfo(Page<HashMap<String, Object>> page,String customerNo);
 }

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

@@ -4,10 +4,14 @@
  */
 package com.tofly.fees.userprofilemgt.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.tofly.fees.userprofilemgt.entity.DaCustomer;
+import io.micrometer.core.instrument.search.Search;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * 用户基本信息
@@ -17,4 +21,7 @@ import java.util.HashMap;
  */
 public interface DaCustomerService extends IService<DaCustomer> {
     HashMap<String,Object> selCustomerAcc(String customerNo);
+
+
+    Page<List<HashMap<String, Object>>> selCusPriceInfo(Page<HashMap<String, Object>> page,@Param("searchText")String SearchText);
 }

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/service/impl/DaCustomerServiceImpl.java

@@ -4,6 +4,7 @@
  */
 package com.tofly.fees.userprofilemgt.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tofly.fees.userprofilemgt.entity.DaCustomer;
 import com.tofly.fees.userprofilemgt.service.DaCustomerService;
@@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
 import com.tofly.fees.userprofilemgt.mapper.DaCustomerMapper;
 
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * 用户基本信息
@@ -26,4 +28,11 @@ public class DaCustomerServiceImpl extends ServiceImpl<DaCustomerMapper, DaCusto
   public HashMap<String,Object> selCustomerAcc(String customerNo){
       return  daCustomerMapper.selDaCustomerAcc(customerNo);
   }
+
+    @Override
+    public Page<List<HashMap<String, Object>>> selCusPriceInfo(Page<HashMap<String, Object>> page,String SearchText) {
+        return daCustomerMapper.selCusPriceInfo(page,SearchText);
+    }
+
+
 }

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

@@ -95,6 +95,18 @@
                 </if>
     </select>
 
+    <select id="selCusPriceInfo" resultType="java.util.HashMap">
+        select a.*,b.METER_MUL_FLAG,b.PRICE_CODE,b.RATE,
+               (select name from tf_ywys_bm_price where  b.PRICE_CODE=tf_ywys_bm_price.code)  pricename,
+               b.PRICE_CODE1,b.RATE1,
+               (select name from tf_ywys_bm_price where  b.PRICE_CODE1=tf_ywys_bm_price.code)  pricename1,
+                 b.PRICE_CODE2,b.RATE2,
+               (select name from tf_ywys_bm_price where  b.PRICE_CODE1=tf_ywys_bm_price.code)  pricename2
+        from tf_ywys_da_customer a
+                 left join tf_ywys_da_meter b on a.customer_no=b.customer_no
+        where a.CUSTOMER_STATE='1'
+    </select>
+
     <resultMap id="daCustomerMap" type="com.tofly.fees.userprofilemgt.entity.DaCustomer">
         <id property="customerNo" column="CUSTOMER_NO"/>
         <result property="customerNoOld" column="CUSTOMER_NO_OLD"/>