抄表记录导出和部分BUG

smart-city-platform/src/main/java/com/bz/smart_city/controller/water/WaterMeterReadController.java

@@ -1073,6 +1073,7 @@ public class WaterMeterReadController {
 
         CommonQueryCondition condition = new CommonQueryCondition();
         condition.setSiteId(loginUser.getSiteId());
+		condition.setUserId(loginUser.getId());
         //condition.setProgramItems(programItems);
         // 2,根据入参构造查询条件
         condition.setStartDate(startDate);
@@ -1125,6 +1126,7 @@ public class WaterMeterReadController {
 
         CommonQueryCondition condition = new CommonQueryCondition();
         condition.setSiteId(loginUser.getSiteId());
+        condition.setUserId(loginUser.getId());
         //condition.setProgramItems(programItems);
         // 2,根据入参构造查询条件
         condition.setStartDate(startDate);

smart-city-platform/src/main/java/com/bz/smart_city/entity/MeterReadRecord.java

@@ -122,5 +122,14 @@ public class MeterReadRecord {
     private BigDecimal lastCost;
     
     private Integer startDate ;
-    private Integer endDate ; 
+    private Integer endDate ;
+
+    @ApiModelProperty(value = "系列", position = 100)
+    private String equipmentType;
+
+    @ApiModelProperty(value = "型号", position = 101)
+    private String model;
+
+    @ApiModelProperty(value="通道号")
+    private String channelNumberName;
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceServiceImpl.java

@@ -368,6 +368,7 @@ public  class DeviceServiceImpl implements DeviceService {
         device.setCustomerId(deviceDataDto.getCustomerId());
         device.setWaterMeterNo(deviceDataDto.getWaterMeterNo());
         device.setRegisterStatus(0);
+        device.setSealNo(deviceDataDto.getSealNo());
 
 
         if(linheCustomerId.equals(device.getCustomerId())){
@@ -574,6 +575,7 @@ public  class DeviceServiceImpl implements DeviceService {
         device.setWaterMeterNo(deviceDataDto.getWaterMeterNo());
         device.setWaterMeterFileNo(deviceDataDto.getWaterMeterFileNo());
         device.setCustomerId(deviceDataDto.getCustomerId());
+        device.setSealNo(deviceDataDto.getSealNo());
         if (udipId != null) {
             device.setUdipId(udipId);
             device.setRegisterStatus(1);

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/GdServiceImpl.java

@@ -127,6 +127,7 @@ public class GdServiceImpl implements GdService {
                 Boolean result = redisTemplate.opsForSet().isMember("GdReadingDeviceId",record.getDeviceId().toString());
                 if(!result){
                     if(record.getConcentratorId() != null){
+                        System.out.println(record.getConcentratorId().toString());
                         if(map.containsKey(record.getConcentratorId().toString())){
                             map.get(record.getConcentratorId().toString()).add(record.getDeviceId().toString());
                         }else {

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/MeterReadRecordServiceImpl.java

@@ -634,22 +634,22 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 		log.info("begin MeterReadRecordService getMeterReadRecordExcel,param = "+JSON.toJSONString(condition));
 		List<MeterReadRecord> result = meterReadRecordMapper.queryMeterReadRecordWithCondtion(condition);
 		String title = "抄表记录";
-		String[] rowsName = new String[]{"序号", "节点编号","水表电子号","水表档案号","集中器编码","采集器编码","水表厂商", "所属客户", "抄表状态", "抄表止度", "抄表时间", "小区","建筑", "位置信息"};
+		String[] rowsName = new String[]{"序号","水表档案号","水表电子号","设备型号","客户","集中器编码","通道号","采集器编码","当前读数", "抄表状态", "抄表时间", "小区","建筑", "安装地址"};
 		List<Object[]> dataList = newArrayList();
 		Object[] objs = null;
 		for (int i = 0; i < result.size(); i++) {
 			MeterReadRecord meterReadRecord = result.get(i);
 			objs = new Object[rowsName.length];
 			objs[0] = i;
-			objs[1] = meterReadRecord.getDeviceNo();
+			objs[1] = meterReadRecord.getMeterFileNo();
 			objs[2] = meterReadRecord.getMeterNo();
-			objs[3] = meterReadRecord.getMeterFileNo();
-			objs[4] = meterReadRecord.getConcentratorNo();
-			objs[5] = meterReadRecord.getCollectorNo();
-			objs[6] = meterReadRecord.getFactoryName();
-			objs[7] = meterReadRecord.getCustomerName();
-			objs[8] = MeterReadEnum.getName(meterReadRecord.getReadStatus()) ;
-			objs[9] = meterReadRecord.getReadData() == null ? "":meterReadRecord.getReadData()+"度";
+			objs[3] = meterReadRecord.getFactoryName()+"/"+meterReadRecord.getEquipmentType()+"/"+meterReadRecord.getModel();
+			objs[4] = meterReadRecord.getCustomerName();
+			objs[5] = meterReadRecord.getConcentratorNo();
+			objs[6] = meterReadRecord.getChannelNumberName();
+			objs[7] = meterReadRecord.getCollectorNo();
+            objs[8] = meterReadRecord.getReadData();
+            objs[9] = MeterReadEnum.getName(meterReadRecord.getReadStatus()) ;
 			objs[10] = meterReadRecord.getReadTime() == null ?"":DateTimeUtil.formatDate(meterReadRecord.getReadTime(), DateTimeUtil.DATE_TIME_FORMAT);
 			objs[11] = meterReadRecord.getCommunityName();
 			objs[12] = meterReadRecord.getBuildingName();

smart-city-platform/src/main/resources/mapper/BuildingMapper.xml

@@ -809,7 +809,7 @@
         IFNULL((SELECT 1 as device_count
         from sc_device sd
         <if test="programItems != null and programItems.size() != 0">left join sc_device_dimension sdd on (sdd.device_id = sd.id and sdd.status = 1)</if>
-        WHERE sd.status = 1 and sd.sys_id != -99 and sd.building_id = sb.id
+        WHERE sd.status = 1 and sd.building_id = sb.id
         <if test="programItems != null and programItems.size() != 0"> and
             <foreach collection="programItems" item="item" open="(" separator=" or " close=")">
                 sdd.${item.dimensionCode} = #{item.dimensionValue}
@@ -1232,8 +1232,8 @@
         left join sc_concentrator scon on ( scon.id = swrd.concentrator_id and scon.status = 1)
         left join sc_collector scol on ( scol.id = swrd.collector_id)</if>
         left join sc_install_list sil on (sil.device_id = sd.id)
-        where sd.status = 1 and sys_id = -99 and sil.status = 1
-        <if test="channelId != null">  and sd.device_type in(select scdtu.device_type_id from sc_channel_device_type_use scdtu where scdtu.status = 1 and scdtu.channel_id = #{sysId})</if>
+        where sd.status = 1 and sd.sys_id = -99 and sil.status = 1
+        <if test="channelId != null">  and sd.device_type in(select scdtu.device_type_id from sc_channel_device_type_use scdtu where scdtu.status = 1 and scdtu.channel_id = #{channelId})</if>
         <if test="buildingId != null"> AND sd.building_id = #{buildingId}</if>
         <if test="siteId != null"> AND sd.site_id = #{siteId}</if>
         <if test="deviceNo != null and deviceNo != ''"> AND (sd.device_no LIKE concat('%',#{deviceNo},'%') or sd.water_meter_no LIKE concat('%',#{deviceNo},'%') or sd.water_meter_file_no LIKE concat('%',#{deviceNo},'%'))</if>

smart-city-platform/src/main/resources/mapper/DeviceMapper.xml

@@ -387,7 +387,6 @@
         <if test="programItems != null and programItems.size() != 0">left join sc_device_dimension sdd on (sdd.device_id = sd.id and sdd.status = 1)</if>
         where sd.status = 1
         <if test="sysId != null"> AND sd.sys_id = #{sysId}</if>
-        <if test="sysId == null"> AND sd.sys_id <![CDATA[ <> ]]> -99</if>
         <if test="buildingId != null"> AND sd.building_id = #{buildingId}</if>
         <if test="siteId != null"> AND sd.site_id = #{siteId}</if>
         <if test="deviceNo != null and deviceNo != ''"> AND (sd.device_no LIKE concat('%',#{deviceNo},'%') or sd.water_meter_no LIKE concat('%',#{deviceNo},'%') or sd.water_meter_file_no LIKE concat('%',#{deviceNo},'%'))</if>

smart-city-platform/src/main/resources/mapper/MeterReadRecordMapper.xml

@@ -783,7 +783,7 @@
 			b.NAME AS building_name,
 			m.location AS location,
 			device_type_id ,
-			device_id,
+			m.device_id,
 			device_no,
 			meter_no,
 			meter_file_no,
@@ -797,7 +797,10 @@
 			m.customer_id as customer_id,
 			cust.customer_name as customer_name,
 			dt.manufacturer_id as factory_id,
-			dm.`name` as factory_name
+            dt.equipment_type,
+            dt.model,
+			dm.`name` as factory_name,
+            scn.channel_name as channel_number_name
 		FROM
 			sc_meter_read_record m
 			LEFT JOIN sc_building b ON ( m.building_id = b.id ) 
@@ -807,7 +810,8 @@
 			left join sc_collector col on (col.id = m.collector_id)
 			left join sc_device_type dt on (dt.id = m.device_type_id)
 			left join sc_device_manufacturer dm on (dm.id = dt.manufacturer_id)
-            <if test = "param.channelNumberId != null">left join sc_water_related_device wrd on (wrd.device_id = m.device_id)</if>
+            left join sc_water_related_device wrd on (wrd.device_id = m.device_id)
+            left join sc_channel_number scn on (scn.id = wrd.channel_number_id)
 		WHERE m.STATUS = 1
 			<!-- 数据权限 -->
 			<if test="param.siteId != null and param.siteId != 0">
@@ -826,13 +830,11 @@
                 and m.customer_id in <foreach collection="param.customerIds" item="item" open="(" separator="," close=")">#{item}</foreach>
             </if>
 			<if test = "param.concentratorCode != null and param.concentratorCode != '' "> and con.serial_number like #{param.concentratorCode}</if>
-			<if test = "param.concentratorId != null"> and con.id = #{param.concentratorId}</if>
+			<if test = "param.concentratorId != null"> and m.concentrator_id = #{param.concentratorId}</if>
 			<if test = "param.channelNumberId != null"> and wrd.channel_number_id = #{param.channelNumberId}</if>
 			<if test = "param.collectorCode != null and param.collectorCode != '' "> and col.collector like #{param.collectorCode}</if>
 			<if test = "param.deviceNo != null and param.deviceNo != '' "> 
-				and (  m.device_no like #{param.deviceNo} 
-					or m.meter_no like #{param.deviceElectricNo}
-					or m.meter_file_no like #{param.devicefileNo})
+				and m.meter_no like #{param.deviceElectricNo}
 			</if>
 			<if test = "param.custormerId !=null and param.custormerId != 0"> and m.customer_id = #{param.custormerId}</if>
 			<if test = "param.communityId != null and param.communityId != 0"> and m.community = #{param.communityId}</if>
@@ -843,6 +845,51 @@
 		    <if test = "param.endDate != null and param.endDate != 0"> and  read_date <![CDATA[ <= ]]>  #{param.endDate}</if>
     		order by read_time desc 
     </select>
+    <select id="queryMeterReadRecordWithCondtion_COUNT" resultType="Long">
+        SELECT
+        count(1)
+        FROM
+        sc_meter_read_record m
+        <if test = "param.concentratorCode != null and param.concentratorCode != '' ">left join sc_concentrator con on (con.id = m.concentrator_id)</if>
+        <if test = "param.collectorCode != null and param.collectorCode != '' ">left join sc_collector col on (col.id = m.collector_id)</if>
+
+        <if test = "param.channelNumberId != null">left join sc_water_related_device wrd on (wrd.device_id = m.device_id)</if>
+
+        WHERE m.STATUS = 1
+        <!-- 数据权限 -->
+        <if test="param.siteId != null and param.siteId != 0">
+            and m.site_id = #{param.siteId}
+        </if>
+        <if test="param.sites != null and param.sites.size() != 0">
+            and m.site_id in
+            <foreach collection="param.sites" item="site" open="(" separator="," close=")">
+                #{site.id}
+            </foreach>
+        </if>
+        <if test="param.buildingIds != null and param.buildingIds.size() != 0">
+            and m.building_id in <foreach collection="param.buildingIds" item="item" open="(" separator="," close=")">#{item}</foreach>
+        </if>
+        <if test="param.customerIds != null and param.customerIds.size() != 0">
+            and m.customer_id in <foreach collection="param.customerIds" item="item" open="(" separator="," close=")">#{item}</foreach>
+        </if>
+        <if test = "param.concentratorCode != null and param.concentratorCode != '' "> and con.serial_number like #{param.concentratorCode}</if>
+        <if test = "param.concentratorId != null"> and m.concentrator_id = #{param.concentratorId}</if>
+        <if test = "param.channelNumberId != null"> and wrd.channel_number_id = #{param.channelNumberId}</if>
+        <if test = "param.collectorCode != null and param.collectorCode != '' "> and col.collector like #{param.collectorCode}</if>
+        <if test = "param.deviceNo != null and param.deviceNo != '' ">
+            and  m.meter_no like #{param.deviceElectricNo}
+        </if>
+        <if test = "param.custormerId !=null and param.custormerId != 0"> and m.customer_id = #{param.custormerId}</if>
+        <if test = "param.communityId != null and param.communityId != 0"> and m.community = #{param.communityId}</if>
+        <if test = "param.buildingId != null and param.buildingId != 0"> and m.building_id = #{param.buildingId}</if>
+        <if test = 'param.readStatus != null and param.readStatus != ""'> and read_status = #{param.readStatus}</if>
+        <if test = "param.channelId != null and param.channelId != 0"> and m.sys_id = #{param.channelId}</if>
+        <if test = "param.startDate != null and param.startDate != 0"> and  read_date >= #{param.startDate}</if>
+        <if test = "param.endDate != null and param.endDate != 0"> and  read_date <![CDATA[ <= ]]>  #{param.endDate}</if>
+        order by read_time desc
+    </select>
+
+
     <select id="queryUnReadDeviceListWithNew" resultType="com.bz.smart_city.dto.DeviceDto">
 		SELECT
 		  	d.site_id as siteId,