Merge remote-tracking branch 'origin/master'

java110-db/src/main/resources/mapper/fee/MeterWaterServiceDaoImplMapper.xml

@@ -280,7 +280,7 @@
         VALUES
         <foreach collection="meterWaterPos" item="item" separator=",">
             (#{item.remark},'0',#{item.curReadingTime},#{item.waterId},#{item.curDegrees},#{item.meterType},#{item.preDegrees},
-            '-1',#{item.objId},#{item.preReadingTime},'-1',#{item.communityId},#{item.objType},#{item.feeId},#{item.objName})
+            #{item.objId},#{item.preReadingTime},'-1',#{item.communityId},#{item.objType},#{item.feeId},#{item.objName})
         </foreach>
     </insert>
 

service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.java110.common;
 
 import com.java110.core.annotation.Java110ListenerDiscovery;

service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.java110.community;
 
 import com.java110.core.annotation.Java110ListenerDiscovery;

service-eureka/src/main/java/com/java110/eureka/ConfigServerEurekaApplication.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.java110.eureka;
 
 import org.springframework.boot.SpringApplication;

service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java

@@ -160,6 +160,7 @@ public class QueryPreMeterWaterImpl implements IQueryPreMeterWater {
         payFeePo.setUserId(userId);
         payFeePo.setFeeTypeCd(feeTypeCd);
         payFeePo.setConfigId(configId);
+        payFeePo.setCommunityId(communityId);
         fees.add(payFeePo);
 
         MeterWaterPo meterWaterPo = new MeterWaterPo();
@@ -174,6 +175,7 @@ public class QueryPreMeterWaterImpl implements IQueryPreMeterWater {
         meterWaterPo.setPreDegrees(importExportMeterWaterDto.getPreDegrees());
         meterWaterPo.setPreReadingTime(importExportMeterWaterDto.getPreReadingTime());
         meterWaterPo.setWaterId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_waterId));
+        meterWaterPo.setRemark(importExportMeterWaterDto.getRemark());
         meterWaterPos.add(meterWaterPo);
     }
 

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

@@ -135,7 +135,17 @@ public class ImportMeterWaterFeeSMOImpl extends BaseComponentSMO implements IImp
 
         String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/meterWater/importMeterWater";
 
-        this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
+        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new IllegalArgumentException(responseEntity.getBody());
+        }
+
+        JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+        if (ResultVo.CODE_OK != paramOut.getInteger("code")) {
+            throw new IllegalArgumentException(paramOut.getString("msg"));
+        }
+
     }
 
 
@@ -179,8 +189,8 @@ public class ImportMeterWaterFeeSMOImpl extends BaseComponentSMO implements IImp
             importRoomFee.setRoomNum(os[2].toString());
             importRoomFee.setPreDegrees(os[3].toString());
             importRoomFee.setPreReadingTime(startTime);
-            importRoomFee.setCurDegrees(endTime);
-            importRoomFee.setCurReadingTime(os[6].toString());
+            importRoomFee.setCurDegrees(os[5].toString());
+            importRoomFee.setCurReadingTime(endTime);
             rooms.add(importRoomFee);
         }
     }

service-front/src/main/java/com/java110/front/smo/meterWaterImport/impl/MeterWaterImportSMOImpl.java

@@ -38,7 +38,7 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/9/23
  **/
-@Service("feeImportSMOImpl")
+@Service("meterWaterImportSMOImpl")
 public class MeterWaterImportSMOImpl extends BaseComponentSMO implements IMeterWaterImportSMO {
     private final static Logger logger = LoggerFactory.getLogger(MeterWaterImportSMOImpl.class);
 

service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.java110.order;
 
 import com.java110.utils.cache.MappingCache;