java110 пре 5 година
родитељ
комит
a0b181c94e

+ 4 - 4
service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java

@@ -58,19 +58,19 @@ public class MeterWaterApi {
     /**
      * 导入水电抄表
      *
-     * @param reqJson 请求报文
+     * @param reqString 请求报文
      * @return
      * @serviceCode /meterWater/importMeterWater
      * @path /app/meterWater/importMeterWater
      */
     @RequestMapping(value = "/importMeterWater", method = RequestMethod.POST)
-    public ResponseEntity<String> importMeterWater(@RequestBody String reqJson) {
-
+    public ResponseEntity<String> importMeterWater(@RequestBody String reqString) {
+        JSONObject reqJson = JSONObject.parseObject(reqString);
         Assert.hasKeyAndValue(reqJson, "communityId", "请求信息中未包含小区信息");
         Assert.hasKeyAndValue(reqJson, "configId", "请求信息中未包含费用项");
         Assert.hasKeyAndValue(reqJson, "storeId", "请求信息中未包含商户信息");
         Assert.hasKeyAndValue(reqJson, "feeTypeCd", "请求信息中未包含费用类型");
-        return queryPreMeterWaterImpl.importMeterWater(JSONObject.parseObject(reqJson));
+        return queryPreMeterWaterImpl.importMeterWater(reqJson);
     }
 
 

+ 3 - 2
service-front/src/main/java/com/java110/front/components/assetImport/ImportMeterWaterFeeComponent.java

@@ -4,6 +4,7 @@ import com.java110.core.context.IPageData;
 import com.java110.front.controller.CallComponentController;
 import com.java110.front.smo.assetExport.IExportMeterWaterSMO;
 import com.java110.front.smo.assetExport.IExportRoomSMO;
+import com.java110.front.smo.assetImport.IImportMeterWaterFeeSMO;
 import com.java110.front.smo.assetImport.IImportRoomFeeSMO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,7 +23,7 @@ public class ImportMeterWaterFeeComponent {
 
 
     @Autowired
-    private IImportRoomFeeSMO importRoomFeeSMOImpl;
+    private IImportMeterWaterFeeSMO importMeterWaterFeeSMOImpl;
 
     @Autowired
     private IExportMeterWaterSMO exportMeterWaterSMOImpl;
@@ -35,7 +36,7 @@ public class ImportMeterWaterFeeComponent {
      */
     public ResponseEntity<String> importData(IPageData pd, MultipartFile uploadFile) throws Exception {
 
-        return importRoomFeeSMOImpl.importExcelData(pd, uploadFile);
+        return importMeterWaterFeeSMOImpl.importExcelData(pd, uploadFile);
     }
 
     /**

+ 24 - 0
service-front/src/main/java/com/java110/front/smo/assetImport/IImportMeterWaterFeeSMO.java

@@ -0,0 +1,24 @@
+package com.java110.front.smo.assetImport;
+
+import com.java110.core.context.IPageData;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @ClassName IAssetImportSMO
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2019/9/23 23:13
+ * @Version 1.0
+ * add by wuxw 2019/9/23
+ **/
+public interface IImportMeterWaterFeeSMO {
+
+    /**
+     * 导入excel数据
+     * @param pd 前台数据封装
+     * @param uploadFile excel 文件
+     * @return ResponseEntity
+     */
+    public ResponseEntity<String> importExcelData(IPageData pd,  MultipartFile uploadFile) throws Exception;
+}

+ 220 - 0
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java

@@ -0,0 +1,220 @@
+package com.java110.front.smo.assetImport.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.component.BaseComponentSMO;
+import com.java110.core.context.IPageData;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.meterWater.ImportExportMeterWaterDto;
+import com.java110.entity.component.ComponentValidateResult;
+import com.java110.front.smo.assetImport.IImportMeterWaterFeeSMO;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ImportExcelUtils;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName AssetImportSmoImpl
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2019/9/23 23:14
+ * @Version 1.0
+ * add by wuxw 2019/9/23
+ **/
+@Service("importMeterWaterFeeSMOImpl")
+public class ImportMeterWaterFeeSMOImpl extends BaseComponentSMO implements IImportMeterWaterFeeSMO {
+    private final static Logger logger = LoggerFactory.getLogger(ImportMeterWaterFeeSMOImpl.class);
+
+    private static final int DEFAULT_ADD_FEE_COUNT = 500;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Override
+    public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
+
+        try {
+            ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+
+            //InputStream is = uploadFile.getInputStream();
+
+            Workbook workbook = ImportExcelUtils.createWorkbook(uploadFile);  //工作簿
+
+            List<ImportExportMeterWaterDto> rooms = new ArrayList<ImportExportMeterWaterDto>();
+
+            //获取楼信息
+            getRooms(workbook, rooms);
+            // 保存数据
+            return dealExcelData(pd, rooms, result);
+        } catch (Exception e) {
+            logger.error("导入失败 ", e);
+            return new ResponseEntity<String>("非常抱歉,您填写的模板数据有误:" + e.getMessage(), HttpStatus.BAD_REQUEST);
+        }
+    }
+
+    /**
+     * 处理ExcelData数据
+     */
+    private ResponseEntity<String> dealExcelData(IPageData pd,
+                                                 List<ImportExportMeterWaterDto> rooms,
+
+                                                 ComponentValidateResult result) {
+        ResponseEntity<String> responseEntity = null;
+        //保存单元信息 和 楼栋信息
+        responseEntity = savedRoomFees(pd, rooms, result);
+
+        if (responseEntity == null || responseEntity.getStatusCode() != HttpStatus.OK) {
+            return responseEntity;
+        }
+
+        return responseEntity;
+    }
+
+    private ResponseEntity<String> savedRoomFees(IPageData pd, List<ImportExportMeterWaterDto> rooms, ComponentValidateResult result) {
+
+        JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
+        if (rooms.size() < 1) {
+            throw new IllegalArgumentException("没有数据需要处理");
+        }
+
+        JSONObject data = JSONObject.parseObject(pd.getReqData());
+        data.put("importFeeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+        data.put("storeId", result.getStoreId());
+        data.put("userId", result.getUserId());
+        data.put("configId", reqJson.getString("configId"));
+        data.put("feeTypeCd", reqJson.getString("feeTypeCd"));
+        data.put("communityId", result.getCommunityId());
+
+        List<ImportExportMeterWaterDto> tmpImportRoomFees = new ArrayList<>();
+        for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
+
+            tmpImportRoomFees.add(rooms.get(roomIndex));
+
+            if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
+
+                createRoomFee(pd, tmpImportRoomFees, data);
+
+                tmpImportRoomFees = new ArrayList<>();
+            }
+        }
+        if (tmpImportRoomFees != null && tmpImportRoomFees.size() > 0) {
+
+            createRoomFee(pd, tmpImportRoomFees, data);
+        }
+        return ResultVo.success();
+    }
+
+    /**
+     * 创建费用
+     *
+     * @param pd
+     * @param tmpImportRoomFees
+     */
+    private void createRoomFee(IPageData pd, List<ImportExportMeterWaterDto> tmpImportRoomFees, JSONObject data) {
+
+        JSONArray importRoomFees = JSONArray.parseArray(JSONObject.toJSONString(tmpImportRoomFees));
+        data.put("importMeteWaterFees", importRoomFees);
+
+        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/meterWater/importMeterWater";
+
+        this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
+    }
+
+
+    /**
+     * 获取 房屋信息
+     *
+     * @param workbook
+     * @param rooms
+     */
+    private void getRooms(Workbook workbook, List<ImportExportMeterWaterDto> rooms) {
+        Sheet sheet = null;
+        sheet = ImportExcelUtils.getSheet(workbook, "房屋费用信息");
+        List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
+        ImportExportMeterWaterDto importRoomFee = null;
+        for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
+            Object[] os = oList.get(osIndex);
+            if (osIndex == 0 || osIndex == 1) { // 第一行是 头部信息 直接跳过
+                continue;
+            }
+            if (StringUtil.isNullOrNone(os[0])) {
+                continue;
+            }
+            Assert.hasValue(os[1], (osIndex + 1) + "单元编号不能为空");
+            Assert.hasValue(os[2], (osIndex + 1) + "房屋编号不能为空");
+            Assert.hasValue(os[3], (osIndex + 1) + "上期度数不能为空");
+            Assert.hasValue(os[4], (osIndex + 1) + "上期度数时间不能为空");
+            Assert.hasValue(os[5], (osIndex + 1) + "本期度数不能为空");
+            Assert.hasValue(os[6], (osIndex + 1) + "本期度数时间不能为空");
+
+//
+
+            String startTime = excelDoubleToDate(os[4].toString());
+            String endTime = excelDoubleToDate(os[6].toString());
+            Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_A, (osIndex + 1) + "行开始时间格式错误 请填写YYYY-MM-DD hh:mm:ss 文本格式");
+            Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_A, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD hh:mm:ss 文本格式");
+
+
+            importRoomFee = new ImportExportMeterWaterDto();
+            importRoomFee.setFloorNum(os[0].toString());
+            importRoomFee.setUnitNum(os[1].toString());
+            importRoomFee.setRoomNum(os[2].toString());
+            importRoomFee.setPreDegrees(os[3].toString());
+            importRoomFee.setPreReadingTime(startTime);
+            importRoomFee.setCurDegrees(endTime);
+            importRoomFee.setCurReadingTime(os[6].toString());
+            rooms.add(importRoomFee);
+        }
+    }
+
+
+    //解析Excel日期格式
+    public static String excelDoubleToDate(String strDate) {
+        if (strDate.length() == 5) {
+            try {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                Date tDate = DoubleToDate(Double.parseDouble(strDate));
+                return sdf.format(tDate);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return strDate;
+            }
+        }
+        return strDate;
+    }
+
+    //解析Excel日期格式
+    public static Date DoubleToDate(Double dVal) {
+        Date tDate = new Date();
+        long localOffset = tDate.getTimezoneOffset() * 60000; //系统时区偏移 1900/1/1 到 1970/1/1 的 25569 天
+        tDate.setTime((long) ((dVal - 25569) * 24 * 3600 * 1000 + localOffset));
+
+        return tDate;
+    }
+
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+}

+ 37 - 33
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.BaseComponentSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.meterWater.ImportExportMeterWaterDto;
+import com.java110.entity.assetImport.ImportRoomFee;
 import com.java110.entity.component.ComponentValidateResult;
 import com.java110.front.smo.assetImport.IImportRoomFeeSMO;
 import com.java110.utils.constant.ServiceConstant;
@@ -58,7 +58,7 @@ public class ImportRoomFeeSMOImpl extends BaseComponentSMO implements IImportRoo
 
             Workbook workbook = ImportExcelUtils.createWorkbook(uploadFile);  //工作簿
 
-            List<ImportExportMeterWaterDto> rooms = new ArrayList<ImportExportMeterWaterDto>();
+            List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
 
             //获取楼信息
             getRooms(workbook, rooms);
@@ -72,14 +72,16 @@ public class ImportRoomFeeSMOImpl extends BaseComponentSMO implements IImportRoo
 
     /**
      * 处理ExcelData数据
+     *
+     * @param roomFees 房屋费用
      */
     private ResponseEntity<String> dealExcelData(IPageData pd,
-                                                 List<ImportExportMeterWaterDto> rooms,
+                                                 List<ImportRoomFee> roomFees,
 
                                                  ComponentValidateResult result) {
         ResponseEntity<String> responseEntity = null;
         //保存单元信息 和 楼栋信息
-        responseEntity = savedRoomFees(pd, rooms, result);
+        responseEntity = savedRoomFees(pd, roomFees, result);
 
         if (responseEntity == null || responseEntity.getStatusCode() != HttpStatus.OK) {
             return responseEntity;
@@ -88,10 +90,9 @@ public class ImportRoomFeeSMOImpl extends BaseComponentSMO implements IImportRoo
         return responseEntity;
     }
 
-    private ResponseEntity<String> savedRoomFees(IPageData pd, List<ImportExportMeterWaterDto> rooms, ComponentValidateResult result) {
+    private ResponseEntity<String> savedRoomFees(IPageData pd, List<ImportRoomFee> roomFees, ComponentValidateResult result) {
 
-        JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
-        if (rooms.size() < 1) {
+        if (roomFees.size() < 1) {
             throw new IllegalArgumentException("没有数据需要处理");
         }
 
@@ -99,14 +100,12 @@ public class ImportRoomFeeSMOImpl extends BaseComponentSMO implements IImportRoo
         data.put("importFeeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
         data.put("storeId", result.getStoreId());
         data.put("userId", result.getUserId());
-        data.put("configId", reqJson.getString("configId"));
-        data.put("feeTypeCd", reqJson.getString("feeTypeCd"));
         data.put("communityId", result.getCommunityId());
 
-        List<ImportExportMeterWaterDto> tmpImportRoomFees = new ArrayList<>();
-        for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
+        List<ImportRoomFee> tmpImportRoomFees = new ArrayList<>();
+        for (int roomIndex = 0; roomIndex < roomFees.size(); roomIndex++) {
 
-            tmpImportRoomFees.add(rooms.get(roomIndex));
+            tmpImportRoomFees.add(roomFees.get(roomIndex));
 
             if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
 
@@ -126,14 +125,14 @@ public class ImportRoomFeeSMOImpl extends BaseComponentSMO implements IImportRoo
      * 创建费用
      *
      * @param pd
-     * @param tmpImportRoomFees
+     * @param tmpImportRoomFee
      */
-    private void createRoomFee(IPageData pd, List<ImportExportMeterWaterDto> tmpImportRoomFees, JSONObject data) {
+    private void createRoomFee(IPageData pd, List<ImportRoomFee> tmpImportRoomFee, JSONObject data) {
 
-        JSONArray importRoomFees = JSONArray.parseArray(JSONObject.toJSONString(tmpImportRoomFees));
-        data.put("importMeteWaterFees", importRoomFees);
+        JSONArray importRoomFees = JSONArray.parseArray(JSONObject.toJSONString(tmpImportRoomFee));
+        data.put("importRoomFees", importRoomFees);
 
-        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/meterWater/importMeterWater";
+        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeApi/importRoomFees";
 
         this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
     }
@@ -145,11 +144,11 @@ public class ImportRoomFeeSMOImpl extends BaseComponentSMO implements IImportRoo
      * @param workbook
      * @param rooms
      */
-    private void getRooms(Workbook workbook, List<ImportExportMeterWaterDto> rooms) {
+    private void getRooms(Workbook workbook, List<ImportRoomFee> rooms) {
         Sheet sheet = null;
         sheet = ImportExcelUtils.getSheet(workbook, "房屋费用信息");
         List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
-        ImportExportMeterWaterDto importRoomFee = null;
+        ImportRoomFee importRoomFee = null;
         for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
             Object[] os = oList.get(osIndex);
             if (osIndex == 0 || osIndex == 1) { // 第一行是 头部信息 直接跳过
@@ -158,29 +157,34 @@ public class ImportRoomFeeSMOImpl extends BaseComponentSMO implements IImportRoo
             if (StringUtil.isNullOrNone(os[0])) {
                 continue;
             }
-            Assert.hasValue(os[1], (osIndex + 1) + "单元编号不能为空");
-            Assert.hasValue(os[2], (osIndex + 1) + "房屋编号不能为空");
-            Assert.hasValue(os[3], (osIndex + 1) + "上期度数不能为空");
-            Assert.hasValue(os[4], (osIndex + 1) + "上期度数时间不能为空");
-            Assert.hasValue(os[5], (osIndex + 1) + "本期度数不能为空");
-            Assert.hasValue(os[6], (osIndex + 1) + "本期度数时间不能为空");
+
+            //费用名称没有填写,默认跳过
+            if (StringUtil.isNullOrNone(os[4])) {
+                continue;
+            }
+            Assert.hasValue(os[1], (osIndex + 1) + "行单元编号不能为空");
+            Assert.hasValue(os[2], (osIndex + 1) + "行房屋编号不能为空");
+            Assert.hasValue(os[3], (osIndex + 1) + "行费用名称不能为空");
+            Assert.hasValue(os[4], (osIndex + 1) + "行开始时间不能为空");
+            Assert.hasValue(os[5], (osIndex + 1) + "行结束时间不能为空");
+            Assert.hasValue(os[6], (osIndex + 1) + "行费用不能为空");
 
 //
 
             String startTime = excelDoubleToDate(os[4].toString());
-            String endTime = excelDoubleToDate(os[6].toString());
-            Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_A, (osIndex + 1) + "行开始时间格式错误 请填写YYYY-MM-DD hh:mm:ss 文本格式");
-            Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_A, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD hh:mm:ss 文本格式");
+            String endTime = excelDoubleToDate(os[5].toString());
+            Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误 请填写YYYY-MM-DD 文本格式");
+            Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");
 
 
-            importRoomFee = new ImportExportMeterWaterDto();
+            importRoomFee = new ImportRoomFee();
             importRoomFee.setFloorNum(os[0].toString());
             importRoomFee.setUnitNum(os[1].toString());
             importRoomFee.setRoomNum(os[2].toString());
-            importRoomFee.setPreDegrees(os[3].toString());
-            importRoomFee.setPreReadingTime(startTime);
-            importRoomFee.setCurDegrees(endTime);
-            importRoomFee.setCurReadingTime(os[6].toString());
+            importRoomFee.setFeeName(os[3].toString());
+            importRoomFee.setStartTime(startTime);
+            importRoomFee.setEndTime(endTime);
+            importRoomFee.setAmount(os[6].toString());
             rooms.add(importRoomFee);
         }
     }