添加推送信息查询

smart-city-platform/src/main/java/com/bz/smart_city/controller/common/TestController.java

@@ -6,10 +6,7 @@ import com.bz.smart_city.commom.model.AjaxMessage;
 import com.bz.smart_city.commom.model.ResultStatus;
 import com.bz.smart_city.commom.util.*;
 import com.bz.smart_city.config.AccessTokenService;
-import com.bz.smart_city.dao.PermissionMapper;
-import com.bz.smart_city.dao.SitePermissionMapper;
-import com.bz.smart_city.dao.WarningLogMapper;
-import com.bz.smart_city.dao.WarningMessageMapper;
+import com.bz.smart_city.dao.*;
 import com.bz.smart_city.dto.LoginUser;
 import com.bz.smart_city.dto.ZipStreamEntity;
 import com.bz.smart_city.entity.*;
@@ -78,6 +75,8 @@ public class TestController {
     @Autowired
     private DeviceService deviceService;
     @Autowired
+    private DeviceMapper deviceMapper;
+    @Autowired
     private PublisherService publisherService;
     @Autowired
     private BPMNService bpmnService;
@@ -93,6 +92,8 @@ public class TestController {
     WarningLogMapper warningLogMapper;
     @Resource
     WarningMessageMapper warningMessageMapper;
+    @Autowired
+    private GridManagementMapper gridManagementMapper;
 
     @GetMapping("test")
     @ApiOperation(value = "test")
@@ -534,11 +535,14 @@ public class TestController {
         warningMessageMapper.insertSelective(warningMessageNew);
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
+        Device device = deviceMapper.findByDeviceId(deviceId);
+        GridManagement gridManagement = gridManagementMapper.getByDeviceId(deviceId);
+
         String accessToken = accessTokenService.getMpAccessToken();
         String url = "https://www.zoniot.com";
         String pagepath = "";
-        String result = SendWechatPush.sendAbnormalNotice(accessToken, "wx6b2ce547cd593413", openId, url, "wx759db34b9c2e1491", pagepath, "用户用水异常", "水量预警", content,
-                LocalDateTime.now().format(df), "1030844808林家栋13765510000长泽花园2-1-502楼梯间用水量有异常情况，请及时关注用户情况！");
+        String result = SendWechatPush.sendAbnormalNotice(accessToken, "wx6b2ce547cd593413", openId, url, "wx27f831675081e293", pagepath, "用户用水异常", "水量预警", content,
+                LocalDateTime.now().format(df), device.getWaterMeterNo()+gridManagement.getCustomerName()+gridManagement.getCustomerPhone()+device.getLocDesc()+"用水量有异常情况，请及时关注用户情况！");
         log.info(result);
         return "ok";
     }

smart-city-platform/src/main/java/com/bz/smart_city/dao/GridManagementMapper.java

@@ -83,7 +83,7 @@ public interface GridManagementMapper {
     int count();
 
     List<GridUser> selectGirdUserInfo(@Param("username") String username,
-                                      @Param("orgId")Integer orgId,
+                                      @Param("orgId") Integer orgId,
                                       @Param("roleId") Integer roleId);
 
     List<Community> getCommutityByOrg(@Param("orgId") Integer orgId);
@@ -92,4 +92,6 @@ public interface GridManagementMapper {
 
     List<Device> getDevices(@Param("buildingId") Integer buildingId,
                             @Param("userId") Integer userId);
+
+    GridManagement getByDeviceId(@Param("deviceId") Long deviceId);
 }

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

@@ -174,4 +174,7 @@
          id not in (select distinct device_id from sc_grid_management where user_id=#{userId})
     </select>
 
+    <select id="getByDeviceId" resultMap="GridManagementMap">
+        select * from sc_grid_management where device_id = #{deviceId}
+    </select>
 </mapper>