bug修复

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/BasePageDto.java

@@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 @Data
 public class BasePageDto {
 
-    @ApiModelProperty(value = "页码",required = true)
+    @ApiModelProperty(value = "页码")
     private int pageNum = 1;
 
-    @ApiModelProperty(value = "条数",required = true)
+    @ApiModelProperty(value = "条数")
     private int pageSize = 15;
 
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/readrate/ReadRateDto.java

@@ -2,6 +2,7 @@ package com.zcxk.rmcp.api.dto.readrate;
 
 import com.zcxk.rmcp.api.dto.BasePageDto;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -26,4 +27,7 @@ public class ReadRateDto extends BasePageDto {
 
     @ApiModelProperty(value = "抄表率结束")
     private BigDecimal readRateEnd;
+
+    @ApiModelProperty(value = "排序：0 升序，1 降序")
+    private Integer sort;
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/DeviceStatisticsVo.java

@@ -2,6 +2,7 @@ package com.zcxk.rmcp.api.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 
@@ -43,4 +44,8 @@ public class DeviceStatisticsVo {
 
     }
 
+    public String getTotal(){
+        return StringUtils.isEmpty(total) ? "0" : total;
+    }
+
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/MeterReplaceVo.java

@@ -2,6 +2,7 @@ package com.zcxk.rmcp.api.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zcxk.rmcp.api.pojo.LocalDateTimeConverter;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,11 +21,11 @@ public class MeterReplaceVo {
     @ApiModelProperty(value="Id")
     private Long id;
 
-    @ApiModelProperty(value = "新设备编号", position = 106)
+    @ApiModelProperty(value = "新设备编号")
     @ExcelProperty(value = {"新设备编号"}, index = 1)
     private String newDeviceNo;
 
-    @ApiModelProperty(value = "旧设备编号", position = 109)
+    @ApiModelProperty(value = "旧设备编号")
     @ExcelProperty(value = {"旧设备编号"}, index = 2)
     private String oldDeviceNo;
 
@@ -37,13 +38,23 @@ public class MeterReplaceVo {
     private String oldMeterNo;
 
     @ApiModelProperty(value="新产品类型/新设备型号")
-    @ExcelProperty(value = {"新产品类型/新设备型号"}, index = 5)
     private String newProductId;
 
     @ApiModelProperty(value="旧产品类型/旧设备型号")
-    @ExcelProperty(value = {"旧产品类型/旧设备型号"}, index = 6)
     private String oldProductId;
 
+    @ApiModelProperty(value="新产品类型/新设备型号")
+    @ExcelProperty(value = {"新设备型号"}, index = 5)
+    private String newDeviceModel;
+
+    @ApiModelProperty(value="旧产品类型/旧设备型号")
+    @ExcelProperty(value = {"旧设备型号"}, index = 6)
+    private String oldDeviceModel;
+
+    @ApiModelProperty(value = "水表档案号")
+    @ExcelProperty(value = {"水表档案号"}, index = 7)
+    private String fileNo;
+
     @ApiModelProperty(value="新表起度")
     @ExcelProperty(value = {"新表起度"}, index = 9)
     private String newBeginDegree;
@@ -52,10 +63,6 @@ public class MeterReplaceVo {
     @ExcelProperty(value = {"旧表止度"}, index = 8)
     private String oldEndDegree;
 
-    @ApiModelProperty(value = "水表档案号", position = 101)
-    @ExcelProperty(value = {"水表档案号"}, index = 7)
-    private String fileNo;
-
     @ApiModelProperty(value="更换方案，1 更换模块，2:更换整表")
     @ExcelProperty(value = {"更换方案"}, index = 10)
     private String replaceMethod;
@@ -70,7 +77,7 @@ public class MeterReplaceVo {
 
     @ApiModelProperty(value="创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
-    @ExcelProperty(value = {"更换时间"}, index = 0)
+    @ExcelProperty(value = {"上报时间"}, index = 13, converter = LocalDateTimeConverter.class)
     private LocalDateTime dateCreate;
 
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/ReadRateVo.java

@@ -16,28 +16,32 @@ import java.math.BigDecimal;
 @Data
 public class ReadRateVo {
 
+    @ApiModelProperty(value="抄表日期")
+    @ExcelIgnore
+    private String statDay;
+
     @ApiModelProperty(value="小区名字")
-    @ExcelProperty(value = {"小区名字"},index = 0)
+    @ExcelProperty(value = {"小区名字"},index = 1)
     private String communityName;
 
     @ApiModelProperty(value="水表名字")
-    @ExcelProperty(value = {"水表名字"},index = 1)
+    @ExcelProperty(value = {"水表名字"},index = 2)
     private String categoryName;
 
     @ApiModelProperty(value="公司名字")
-    @ExcelProperty(value = {"公司名字"},index = 2)
+    @ExcelProperty(value = {"公司名字"},index = 3)
     private String companyOrgName;
 
     @ApiModelProperty(value="部门名字")
-    @ExcelProperty(value = {"部门名字"},index = 3)
+    @ExcelProperty(value = {"部门名字"},index = 4)
     private String deptOrgName;
 
     @ApiModelProperty(value="应抄数据")
-    @ExcelProperty(value = {"应抄水表总数"},index = 4)
+    @ExcelProperty(value = {"应抄水表总数"},index = 5)
     private int readTimes;
 
     @ApiModelProperty(value="实抄数据")
-    @ExcelProperty(value = {"抄收成功总数"},index = 5)
+    @ExcelProperty(value = {"抄收成功总数"},index = 6)
     private int realReadTimes;
 
     @ApiModelProperty(value="未抄数据")
@@ -45,7 +49,7 @@ public class ReadRateVo {
     private int unReadTimes;
 
     @ApiModelProperty(value="抄表率")
-    @ExcelProperty(value = {"抄收成功率(%)"},index = 6)
+    @ExcelProperty(value = {"抄收成功率(%)"},index = 7)
     private BigDecimal readRate;
 
 

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceCommandMapper.xml

@@ -279,6 +279,7 @@
     <if test="dto.startDate != null and dto.startDate != ''"> and dc.issue_date <![CDATA[ >= ]]> #{dto.startDate}</if>
     <if test="dto.endDate != null and dto.endDate != ''"> and dc.issue_date <![CDATA[ <= ]]> #{dto.endDate}</if>
     <include refid="permissionCondition"/>
+    order by dc.issue_date desc
   </select>
 
   <update id="updateStatus">

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/MeterReplaceLogMapper.xml

@@ -291,6 +291,8 @@
     rl.old_meter_no,
     rl.new_product_id,
     rl.old_product_id,
+    CONCAT(sdm1.name,"/",sdt1.product_name,"/",sdt1.product_model) as newDeviceModel,
+    CONCAT(sdm2.name,"/",sdt2.product_name,"/",sdt2.product_model) as oldDeviceModel,
     d.file_no,
     rl.new_begin_degree,
     rl.old_end_degree,
@@ -313,6 +315,7 @@
     <if test="dto.startDate != null and dto.startDate!= ''"> and rl.create_date <![CDATA[ >= ]]> #{dto.startDate}</if>
     <if test="dto.endDate != null and dto.endDate != ''"> and rl.create_date <![CDATA[ <= ]]> #{dto.endDate}</if>
     <include refid="permissionCondition"/>
+    order by rl.create_date desc
   </select>
 
   <update id="updateStatus">

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ReadRate7Day.xml

@@ -69,7 +69,7 @@
 
   <select id="listReadRate" resultType="com.zcxk.rmcp.api.vo.ReadRateVo">
     SELECT
-    rc.name categoryName, rm.`name` communityName, rd.read_times, rd.real_read_times,
+    rc.name categoryName,rd.stat_day, rm.`name` communityName, rd.read_times, rd.real_read_times,
     rd.un_read_times,rd.read_rate,
     org1.org_name as companyOrgName,
     org2.org_name as deptOrgName
@@ -87,5 +87,11 @@
       and rd.read_rate BETWEEN #{dto.readRateBegin} and  #{dto.readRateEnd}
     </if>
     <include refid="permissionCondition"></include>
+    <if test="dto.sort == null or dto.sort == 1">
+      order by rd.read_rate desc
+    </if>
+    <if test="dto.sort != null and dto.sort == 0">
+      order by rd.read_rate asc
+    </if>
   </select>
 </mapper>

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ReadRateMonth.xml

@@ -68,7 +68,7 @@
 
   <select id="listReadRate" resultType="com.zcxk.rmcp.api.vo.ReadRateVo">
     SELECT
-    rc.name categoryName, rm.`name` communityName, rd.read_times, rd.real_read_times,
+    rc.name categoryName, rd.stat_day, rm.`name` communityName, rd.read_times, rd.real_read_times,
     rd.un_read_times,rd.read_rate,
     org1.org_name as companyOrgName,
     org2.org_name as deptOrgName
@@ -86,5 +86,11 @@
       and rd.read_rate BETWEEN #{dto.readRateBegin} and  #{dto.readRateEnd}
     </if>
     <include refid="permissionCondition"></include>
+    <if test="dto.sort == null or dto.sort == 1">
+      order by rd.read_rate desc
+    </if>
+    <if test="dto.sort != null and dto.sort == 0">
+      order by rd.read_rate asc
+    </if>
   </select>
 </mapper>

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ReadRateToday.xml

@@ -69,7 +69,7 @@
 
   <select id="listReadRate" resultType="com.zcxk.rmcp.api.vo.ReadRateVo">
     SELECT
-    rc.name categoryName, rm.`name` communityName, rd.read_times, rd.real_read_times,
+    rc.name categoryName, rd.stat_day, rm.`name` communityName, rd.read_times, rd.real_read_times,
     rd.un_read_times,rd.read_rate,
     org1.org_name as companyOrgName,
     org2.org_name as deptOrgName
@@ -87,5 +87,11 @@
       and rd.read_rate BETWEEN #{dto.readRateBegin} and  #{dto.readRateEnd}
     </if>
     <include refid="permissionCondition"></include>
+    <if test="dto.sort == null or dto.sort == 1">
+      order by rd.read_rate desc
+    </if>
+    <if test="dto.sort != null and dto.sort == 0">
+      order by rd.read_rate asc
+    </if>
   </select>
 </mapper>

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ReadRateYesterday.xml

@@ -69,7 +69,7 @@
 
   <select id="listReadRate" resultType="com.zcxk.rmcp.api.vo.ReadRateVo">
     SELECT
-    rc.name categoryName, rm.`name` communityName, rd.read_times, rd.real_read_times,
+    rc.name categoryName, rd.stat_day, rm.`name` communityName, rd.read_times, rd.real_read_times,
     rd.un_read_times,rd.read_rate,
     org1.org_name as companyOrgName,
     org2.org_name as deptOrgName
@@ -87,5 +87,11 @@
       and rd.read_rate BETWEEN #{dto.readRateBegin} and  #{dto.readRateEnd}
     </if>
     <include refid="permissionCondition"></include>
+    <if test="dto.sort == null or dto.sort == 1">
+      order by rd.read_rate desc
+    </if>
+    <if test="dto.sort != null and dto.sort == 0">
+      order by rd.read_rate asc
+    </if>
   </select>
 </mapper>

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/DeviceCommandController.java

@@ -54,9 +54,6 @@ public class DeviceCommandController extends BaseController{
     @ApiOperation(value = "excel导出")
     public void exportExcel(DeviceCommandPageDto deviceCommandPageDto, HttpServletResponse response) {
         List<DeviceCommandVo> list = deviceCommandService.listDeviceCommand(deviceCommandPageDto);
-        if (CollectionUtils.isEmpty(list)) {
-            throw BusinessException.builder(RmcpErrorEnum.RMCP_NOT_FOUND);
-        }
         try {
             EasyExcelUtil.excelWrite(response, DeviceCommandVo.class, "阀控管理记录", list);
         } catch (Exception e) {

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/MeterReadRecordController.java

@@ -75,7 +75,12 @@ public class MeterReadRecordController extends BaseController {
     public void exportExcel(MeterReadRecordDto dto, HttpServletResponse response) {
         List<MeterReadRecordVo> list = meterReadRecordService.listMeterReadRecord(dto);
         if (CollectionUtils.isEmpty(list)) {
-            throw BusinessException.builder(RmcpErrorEnum.RMCP_NOT_FOUND);
+            try {
+                EasyExcelUtil.excelWrite(response, MeterReadRecordExcelVo.class, dto.getCategoryName() +"抄表记录", list);
+            } catch (Exception e) {
+                throw BusinessException.builder(RmcpErrorEnum.RMCP_DOWNLOAD_ERROR);
+            }
+            return;
         }
         List<MeterReadRecordExcelVo> dataList = new ArrayList<>();
         for (MeterReadRecordVo meterReadRecordVo : list) {

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/MeterReplaceController.java

@@ -51,12 +51,9 @@ public class MeterReplaceController  extends BaseController {
     }
 
     @RequestMapping(value="export/excel" , method = RequestMethod.GET)
-    @ApiOperation(value = "excel导出")
+    @ApiOperation(value = "excel导出", produces = "application/octet-stream")
     public void exportExcel(MeterReplacePageDto pageDto, HttpServletResponse response) {
         List<MeterReplaceVo> list = meterReplaceLogService.listMeterReplace(pageDto);
-        if (CollectionUtils.isEmpty(list)) {
-            throw BusinessException.builder(RmcpErrorEnum.RMCP_NOT_FOUND);
-        }
         try {
             EasyExcelUtil.excelWrite(response, MeterReplaceVo.class, "换表记录", list);
         } catch (Exception e) {

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/ReadRateController.java

@@ -70,9 +70,6 @@ public class ReadRateController extends BaseController{
     public void exportExcel(ReadRateDto dto, HttpServletResponse response) {
         ReadRateEnum readRateEnum = ReadRateEnum.getReadRateEnum(dto.getStatDaysCode());
         List<ReadRateVo> list = readRateFactory.getReadRateService(dto.getStatDaysCode()).listReadRate(dto);
-        if (CollectionUtils.isEmpty(list)) {
-            throw BusinessException.builder(RmcpErrorEnum.RMCP_NOT_FOUND);
-        }
         try {
             EasyExcelUtil.excelWrite(response, ReadRateVo.class, readRateEnum.getMessage() +"抄表率记录", list);
         } catch (Exception e) {

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/AbstractReadRateService.java

@@ -72,30 +72,32 @@ public abstract class AbstractReadRateService implements ReadRateService{
     }
 
     /**
+    * 统计抄表率
     * @author Andy
-    * @description 统计抄表率
-    * @date 11:31 2021/7/26
-    * @param
+    * @date 16:12 2021/8/20
+    * @param userCondition:
     * @return java.util.List<com.zcxk.rmcp.api.vo.StatisticsReadRateVo>
     **/
     public abstract List<StatisticsReadRateVo> statReadRateGroupCategory(UserCondition userCondition);
 
     /**
-     * @author Andy
-     * @description 统计抄表率
-     * @date 11:31 2021/7/26
-     * @param
-     * @return java.util.List<com.zcxk.rmcp.api.vo.StatisticsReadRateVo>
-     **/
+    * 统计抄表率
+    * @author Andy
+    * @date 16:11 2021/8/20
+    * @param dto:
+    * @param userCondition:
+    * @return java.util.List<com.zcxk.rmcp.api.vo.ReadRateVo>
+    **/
     public abstract List<ReadRateVo> listReadRate(ReadRateDto dto, UserCondition userCondition);
 
     /**
-     * @author Andy
-     * @description 统计抄表总数
-     * @date 11:31 2021/7/26
-     * @param
-     * @return java.util.List<com.zcxk.rmcp.api.vo.StatisticsReadRateVo>
-     **/
+    * 统计抄表总数
+    * @author Andy
+    * @date 16:11 2021/8/20
+    * @param dto:
+    * @param userCondition:
+    * @return com.zcxk.rmcp.api.vo.StatisticsReadRateVo
+    **/
     public abstract StatisticsReadRateVo countReadRate(ReadRateDto dto, UserCondition userCondition);
 
 }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/ReadRateService.java

@@ -1,11 +1,9 @@
 package com.zcxk.rmcp.web.service;
 
-import com.zcxk.core.common.pojo.UserCondition;
 import com.zcxk.core.mysql.pageing.Pagination;
 import com.zcxk.rmcp.api.dto.readrate.ReadRateCountDto;
 import com.zcxk.rmcp.api.dto.readrate.ReadRateDto;
 import com.zcxk.rmcp.api.enums.ReadRateEnum;
-import com.zcxk.rmcp.api.vo.ReadRatePageVo;
 import com.zcxk.rmcp.api.vo.ReadRateVo;
 import com.zcxk.rmcp.api.vo.StatisticsReadRateVo;
 

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/MeterReadRecordServiceImpl.java

@@ -34,7 +34,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService {
     @Override
     public void saveMeterReadRecord(MeterReadRecord readRecord) {
         for (MeterReadRecord.MeterReadInfo datum : readRecord.getData()) {
-            datum.setReadTime(new Date().getTime());
+            datum.setReadTime(System.currentTimeMillis());
         }
         meterReadRecordDao.saveMeterReadRecord(readRecord);
     }