用户告警列表账户信息获取

smart-city-platform/src/main/java/com/bz/smart_city/dto/WarningLogDto.java

@@ -35,4 +35,5 @@ public class WarningLogDto extends WarningLog {
 
     @ApiModelProperty(value = "位置描述", position = 109)
     private String locDesc;
+    private String meterCode;
 }

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

@@ -1,5 +1,7 @@
 package com.bz.smart_city.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.bz.smart_city.commom.model.Pagination;
 import com.bz.smart_city.commom.util.UserUtil;
 import com.bz.smart_city.dao.MeterReadRecordMapper;
@@ -11,15 +13,24 @@ import com.bz.smart_city.dto.WarningLogDto;
 import com.bz.smart_city.entity.WarningRule;
 import com.bz.smart_city.service.BuildingService;
 import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.bz.smart_city.entity.WarningLog;
 import com.bz.smart_city.dao.WarningLogMapper;
 import com.bz.smart_city.service.WarningLogService;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
 import java.time.LocalDateTime;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class WarningLogServiceImpl implements WarningLogService{
@@ -33,6 +44,10 @@ public class WarningLogServiceImpl implements WarningLogService{
     private BuildingService buildingService;
     @Resource
     private MeterReadRecordMapper meterReadRecordMapper;
+    @Value("${account_userInfo_url}")
+    private String accountUserInfoUrl;
+
+
 
     @Override
     public int insertSelective(WarningLog record) {
@@ -49,8 +64,44 @@ public class WarningLogServiceImpl implements WarningLogService{
         LoginUser loginUser = UserUtil.getCurrentUser();
         PageHelper.startPage(pageNum,pageSize);
         List<WarningLogDto> list =  warningLogMapper.getList(loginUser.getSiteId(),channelId,deviceNo,warningType,clientName,feedbackStatus,provinceId,cityId,regionId,communityId,buildingId,startDate,endDate,UserUtil.getCurrentSiteProgramItems(loginUser));
+        Set<String>meterCodes=new HashSet<>();
+        list.forEach(warningLogDto -> {
+            meterCodes.add(warningLogDto.getMeterCode());
+        });
+        Map<String,Object>args=new HashMap<>();
+        args.put("metercodes", meterCodes);
+        String result = sendApiReQuest(accountUserInfoUrl, JSONObject.toJSONString(args));
+        if(result!=null){
+            JSONArray array = JSONArray.parseArray(result);
+            list.forEach(warningLogDto -> {
+                for (int i = 0; i < array.size(); i++) {
+                     JSONObject accountInfo=array.getJSONObject(i);
+                     if(accountInfo.getString("metercode").equals(warningLogDto.getMeterCode())){
+                         warningLogDto.setAccountName(accountInfo.getString("userName"));
+                         warningLogDto.setAccountPhone(accountInfo.getString("phone"));
+                         warningLogDto.setAccountNumber(accountInfo.getString("accountNumber"));
+                     }
+                }
+            });
+        }
+
         return new Pagination<>(list);
     }
+    private String sendApiReQuest(String path , String args){
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<String> formEntity = new HttpEntity<>(args, headers);
+
+        RestTemplate restTemplate=new RestTemplate();
+        ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity(path, formEntity,
+                String.class);
+        JSONObject info = JSONObject.parseObject(stringResponseEntity.getBody());
+        String result=null;
+        if(info.getInteger("status")==0){
+            result=info.getString("data");
+        }
+        return result;
+    }
 
     @Override
     public List<BuildingSelectDto> getAreaList(Integer channelId, String deviceNo, Integer warningType, String clientName, Integer feedbackStatus, LocalDateTime startDate, LocalDateTime endDate) {

smart-city-platform/src/main/resources/application-dev.properties

@@ -180,4 +180,5 @@ sync.customer.wuhan.id=136
 #mongodb url
 #spring.data.mongodb.uri=mongodb://114.135.61.188:17017/meter-reading-database
 spring.data.mongodb.uri=mongodb://water:zcxk100@114.135.61.189:27071/meter-reading-database?authSource=meter-reading-database
-logging.level.org.springframework.data.mongodb.core=DEBUG
+logging.level.org.springframework.data.mongodb.core=DEBUG
+account_userInfo_url=http://114.135.61.188:58084/api/pay/getAccountInfoByMetercode

smart-city-platform/src/main/resources/application-sit.properties

@@ -182,4 +182,5 @@ sync.customer.wuhan.id=136
 
 #mongodb url
 spring.data.mongodb.uri=mongodb://114.135.61.188:17017/meter-reading-database
-logging.level.org.springframework.data.mongodb.core=DEBUG
+logging.level.org.springframework.data.mongodb.core=DEBUG
+account_userInfo_url=http://114.135.61.188:58084/api/pay/getAccountInfoByMetercode

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

@@ -130,20 +130,17 @@
   <select id="getList" resultType="com.bz.smart_city.dto.WarningLogDto">
     select
     swl.*,
-    pba.accountnumber as account_number,
-    pba.name as account_name,
-    pba.mobilephone as account_phone,
     sd.device_no,
     sd.water_meter_no,
     sd.loc_desc,
     sdt1.equipment_type as equipment_type,
     sdt1.model as model,
-    sdm1.name as manufacturer_name
+    sdm1.name as manufacturer_name,
+    sil.metercode meterCode
     from sc_warning_log swl
     left join sc_device sd on(sd.id = swl.device_id)
+    left join sc_install_list sil on sd.id=sil.device_id
     left join sc_building sb on(sb.id = sd.building_id)
-    left join pay_base_customerandmeterrela pbc on(pbc.watermeter_id = swl.device_id)
-    left join pay_base_account pba on(pba.id = pbc.account_id)
     left join sc_device_type sdt1 on(sdt1.id = sd.device_type)
     left join sc_device_manufacturer sdm1 on(sdm1.id = sdt1.manufacturer_id)
     <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>