Merge remote-tracking branch 'origin/develop' into develop

gather-app/src/main/java/com/ruoyi/business/controller/BigScreenController.java

@@ -56,14 +56,18 @@ public class BigScreenController extends BaseController {
     @ApiOperation("资源概况")
     public AjaxResult overviewResources() {
         try {
+            //人户一致	101
+            //流动人口	102
+            //人在户不在	124
+            //户在人不在  201
             // 流口查询
             QueryWrapper<MetaActualUserInfo> queryLdrkWrapper = new QueryWrapper<>();
             queryLdrkWrapper.eq("actual_user_type", 102);
             int actualUserLdrkCount = actualUserInfoService.count(queryLdrkWrapper);
 //            实有人口总数
-//            QueryWrapper<MetaActualUserInfo> querySyrkWrapper = new QueryWrapper<>();
+            QueryWrapper<MetaActualUserInfo> querySyrkWrapper = new QueryWrapper<>();
-//            querySyrkWrapper.ne("actual_user_type", 101);
+            querySyrkWrapper.ne("actual_user_type", 101);
-            int actualUserSyrkCount = actualUserInfoService.count();
+            int actualUserSyrkCount = actualUserInfoService.count(querySyrkWrapper);
             //实有房屋总数
 //            int countSyfw = realEstateInfoService.countSyfw(new MetaRealEstateInfo());
             int countSyfw = realEstateInfoService.count();
@@ -289,6 +293,7 @@ public class BigScreenController extends BaseController {
     @ApiOperation("警情统计列表，重点警情")
     public AjaxResult policeSituationStatisticsList() {
         try {
+
             List<MetaAlarmInfoAndHandleAlarmVo> metaAlarmInfos = alarmInfoService.listAlarmAndHandleAlarm();
             return AjaxResult.success(metaAlarmInfos);
         } catch (Exception e) {
@@ -307,7 +312,22 @@ public class BigScreenController extends BaseController {
 
             Date thirtyMinutesAgo = DateUtil.offsetMinute(new Date(), -NumKit.checkInt(time));
             QueryWrapper<MetaAlarmInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.gt("alarm_response_time", DateUtil.format(thirtyMinutesAgo, "yyyyMMddHHmmss"));
+            queryWrapper.gt("alarm_response_time", DateUtil.format(thirtyMinutesAgo, "yyyyMMddHHmmss"))
+                    .and(wrapper -> wrapper.like("alarm_response_unit", "射阳县公安局临海派出所").or()
+                            .like("alarm_response_unit", "射阳县公安局临海派出所第一警务区").or()
+                            .like("alarm_response_unit", "射阳县公安局临海派出所第二警务区").or()
+                            .like("alarm_response_unit", "射阳县公安局临海派出所第三警务区").or()
+                            .like("alarm_response_unit", "射阳县公安局临海派出所第四警务区").or()
+                            .like("alarm_response_unit", "射阳县公安局临港派出所").or()
+                            .like("alarm_response_unit", "射阳县公安局临港派出所社区警务责任区").or()
+                            .like("alarm_response_unit", "射阳县公安局临港派出所第一警务区").or()
+                            .like("alarm_response_unit", "射阳县公安局临港派出所第二警务区").or()
+                            .like("alarm_response_unit", "射阳县公安局临港派出所第一警务区").or()
+                            .like("alarm_response_unit", "射阳县公安局扁担港边防派出所").or()
+                            .like("alarm_response_unit", "射阳县公安局扁担港边防派出所第一警务区").or()
+                            .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所").or()
+                            .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所第一警务区").or()
+                            .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所第三警务区"));
             List<MetaAlarmInfo> metaAlarmInfos = alarmInfoService.list(queryWrapper);
             return AjaxResult.success(metaAlarmInfos);
         } catch (Exception e) {

gather-app/src/main/java/com/ruoyi/database/controller/MetaAlarmInfoController.java

@@ -44,7 +44,23 @@ public class MetaAlarmInfoController extends BaseController {
     @ApiOperation("查询接警信息表")
     public TableDataInfo<MetaAlarmInfo> list(MetaAlarmInfo metaAlarmInfo) {
         startPage();
-        List<MetaAlarmInfo> list = metaAlarmInfoService.list(new QueryWrapper<>(metaAlarmInfo));
+        QueryWrapper<MetaAlarmInfo> wrapper = new QueryWrapper<>(metaAlarmInfo);
+        wrapper.and(w -> w.like("alarm_response_unit", "射阳县公安局临海派出所").or()
+                .like("alarm_response_unit", "射阳县公安局临海派出所第一警务区").or()
+                .like("alarm_response_unit", "射阳县公安局临海派出所第二警务区").or()
+                .like("alarm_response_unit", "射阳县公安局临海派出所第三警务区").or()
+                .like("alarm_response_unit", "射阳县公安局临海派出所第四警务区").or()
+                .like("alarm_response_unit", "射阳县公安局临港派出所").or()
+                .like("alarm_response_unit", "射阳县公安局临港派出所社区警务责任区").or()
+                .like("alarm_response_unit", "射阳县公安局临港派出所第一警务区").or()
+                .like("alarm_response_unit", "射阳县公安局临港派出所第二警务区").or()
+                .like("alarm_response_unit", "射阳县公安局临港派出所第一警务区").or()
+                .like("alarm_response_unit", "射阳县公安局扁担港边防派出所").or()
+                .like("alarm_response_unit", "射阳县公安局扁担港边防派出所第一警务区").or()
+                .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所").or()
+                .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所第一警务区").or()
+                .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所第三警务区"));
+        List<MetaAlarmInfo> list = metaAlarmInfoService.list(wrapper);
         return getDataTable(list);
     }
 

gather-app/src/main/java/com/ruoyi/database/mapper/MetaAlarmInfoMapper.java

@@ -27,7 +27,7 @@ public interface MetaAlarmInfoMapper extends BaseMapper<MetaAlarmInfo> {
     public List<MetaAlarmInfoVo> selectTop3AlarmInfo();
 
 
-    @Select(" select a.id,  " +
+    @Select("SELECT a.id, " +
             "a.alarm_code jjxx_alarm_code, " +
             "a.police_receiver_name jjxx_police_receiver_name, " +
             "a.alarm_response_unit jjxx_alarm_response_unit, " +
@@ -39,9 +39,24 @@ public interface MetaAlarmInfoMapper extends BaseMapper<MetaAlarmInfo> {
             "a.informant_time jjxx_informant_time, " +
             "a.alarm_address jjxx_alarm_address, " +
             "a.longitude jjxx_longitude, " +
-            "a.latitude jjxx_latitude  from (  " +
+            "a.latitude jjxx_latitude " +
-            "select * from meta_alarm_info order by informant_time desc limit 100  " +
+            "FROM (SELECT * FROM meta_alarm_info WHERE " +
-            ") a   "  )
+            "alarm_response_unit LIKE '射阳县公安局临海派出所' OR " +
+            "alarm_response_unit LIKE '射阳县公安局临海派出所第一警务区' OR " +
+            "alarm_response_unit LIKE '射阳县公安局临海派出所第二警务区' OR " +
+            "alarm_response_unit LIKE '射阳县公安局临海派出所第三警务区' OR " +
+            "alarm_response_unit LIKE '射阳县公安局临海派出所第四警务区' OR " +
+            "alarm_response_unit LIKE '射阳县公安局临港派出所' OR " +
+            "alarm_response_unit LIKE '射阳县公安局临港派出所社区警务责任区' OR " +
+            "alarm_response_unit LIKE '射阳县公安局临港派出所第一警务区' OR " +
+            "alarm_response_unit LIKE '射阳县公安局临港派出所第二警务区' OR " +
+            "alarm_response_unit LIKE '射阳县公安局临港派出所第一警务区' OR " +
+            "alarm_response_unit LIKE '射阳县公安局扁担港边防派出所' OR " +
+            "alarm_response_unit LIKE '射阳县公安局扁担港边防派出所第一警务区' OR " +
+            "alarm_response_unit LIKE '射阳县公安局黄沙河边防派出所' OR " +
+            "alarm_response_unit LIKE '射阳县公安局黄沙河边防派出所第一警务区' OR " +
+            "alarm_response_unit LIKE '射阳县公安局黄沙河边防派出所第三警务区' " +
+            "ORDER BY informant_time DESC LIMIT 100) a")
     public List<MetaAlarmInfoAndHandleAlarmVo> listAlarmAndHandleAlarm();