格式化代码

airport-admin/src/main/java/com/sundot/airport/web/controller/item/ItemLargeScreenController.java

@@ -125,7 +125,8 @@ public class ItemLargeScreenController extends BaseController {
     }
 
     /**
-     *  app端 查获位置分布
+     * app端 查获位置分布
+     *
      * @param dto 大屏查询参数
      * @return 查获位置分布
      */

airport-item/src/main/java/com/sundot/airport/item/mapper/ItemLargeScreenMapper.java

@@ -112,13 +112,15 @@ public interface ItemLargeScreenMapper {
 
     /**
      * app端 查获位置分布
+     *
      * @param dto
      * @return
      */
     List<ItemLargeScreenPositionAppDto> appPosition(BaseLargeScreenQueryParamDto dto);
-    
+
     /**
      * 按天统计查获趋势数据
+     *
      * @param dto 查询参数
      * @return 按天统计的查获数据
      */

airport-item/src/main/java/com/sundot/airport/item/service/ItemLargeScreenService.java

@@ -55,6 +55,7 @@ public interface ItemLargeScreenService {
 
     /**
      * app端查获总数量+移交公安数量+故意隐匿数量
+     *
      * @param dto 大屏查询参数
      * @return 查获总数量+移交公安数量+故意隐匿数量
      */
@@ -79,6 +80,7 @@ public interface ItemLargeScreenService {
 
     /**
      * app端查获时段分布
+     *
      * @param dto
      * @return
      */
@@ -93,7 +95,8 @@ public interface ItemLargeScreenService {
     public List<ItemLargeScreenPositionDto> position(BaseLargeScreenQueryParamDto dto);
 
     /**
-     *  app端 查获位置分布
+     * app端 查获位置分布
+     *
      * @param dto
      * @return
      */
@@ -108,5 +111,4 @@ public interface ItemLargeScreenService {
     public List<ItemLargeScreenChannelDto> channel(BaseLargeScreenQueryParamDto dto);
 
 
-
 }

airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemLargeScreenServiceImpl.java

@@ -112,6 +112,7 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
 
     /**
      * app端查获总数量+移交公安数量+故意隐匿数量
+     *
      * @param dto 大屏查询参数
      * @return
      */
@@ -143,10 +144,10 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
                 break;
             case 3:
                 result = itemLargeScreenMapper.rankByIndividual(dto);
-                for(ItemLargeScreenCommonDto itemLargeScreenCommonDto : result){
-                    if(Objects.nonNull(itemLargeScreenCommonDto)){
+                for (ItemLargeScreenCommonDto itemLargeScreenCommonDto : result) {
+                    if (Objects.nonNull(itemLargeScreenCommonDto)) {
                         SysUser sysUser = sysUserService.selectUserById(itemLargeScreenCommonDto.getId());
-                        if(Objects.nonNull(sysUser)){
+                        if (Objects.nonNull(sysUser)) {
                             itemLargeScreenCommonDto.setName(sysUser.getNickName());
                         }
                     }
@@ -174,8 +175,9 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
     }
 
     /**
-     *  app端 查获时段分布
-     * @param dto  大屏查询参数
+     * app端 查获时段分布
+     *
+     * @param dto 大屏查询参数
      * @return 查获时段分布
      */
     @Override
@@ -240,7 +242,8 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
     }
 
     /**
-     *  app端 查获位置分布
+     * app端 查获位置分布
+     *
      * @param dto
      * @return
      */

airport-item/src/main/resources/mapper/item/ItemLargeScreenMapper.xml

@@ -9,7 +9,7 @@
         select ifnull(sum(isi.quantity), 0) totalSum
         from item_seizure_record isr
         left join item_seizure_items isi on isr.id = isi.record_id
-        where  isr.process_status=3
+        where isr.process_status=3
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
         <if test="startDate != null and endDate != null">
             and (isr.seizure_time >= #{startDate}
@@ -63,7 +63,7 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         and isr.process_status=3
         order by isr.seizure_time desc
     </select>
@@ -110,7 +110,7 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         order by isr.seizure_time desc
     </select>
 
@@ -118,39 +118,39 @@
     <select id="category" resultType="com.sundot.airport.item.domain.ItemLargeScreenCommonDto">
         select
         <!--判断参数里的级别类型，根据级别类型，查询对应级别-->
-            <if test="levelType == 1">
-                isi.category_code_one code,
-                isi.category_name_one name,
-                sum(isi.quantity) total
-            </if>
-            <if test="levelType == 2">
-                isi.category_code_two code,
-                isi.category_name_two name,
-                sum(isi.quantity) total
-            </if>
+        <if test="levelType == 1">
+            isi.category_code_one code,
+            isi.category_name_one name,
+            sum(isi.quantity) total
+        </if>
+        <if test="levelType == 2">
+            isi.category_code_two code,
+            isi.category_name_two name,
+            sum(isi.quantity) total
+        </if>
         from item_seizure_record isr
         left join item_seizure_items isi on isr.id = isi.record_id
-        where  isr.process_status=3
+        where isr.process_status=3
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
         <if test="startDate != null and endDate != null">
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
-        <if test="levelType == 2  and categoryCode != null and  categoryCode != ''" >
+        <if test="levelType == 2  and categoryCode != null and  categoryCode != ''">
             and isi.category_code_one = #{categoryCode}
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
         group by
-            <if test="levelType == 1">
-                isi.category_code_one,
-                isi.category_name_one
-            </if>
-            <if test="levelType == 2">
-                isi.category_code_two,
-                isi.category_name_two
-            </if>
+        <if test="levelType == 1">
+            isi.category_code_one,
+            isi.category_name_one
+        </if>
+        <if test="levelType == 2">
+            isi.category_code_two,
+            isi.category_name_two
+        </if>
         order by total desc
     </select>
 
@@ -161,13 +161,13 @@
         sum(isi.quantity) total
         from item_seizure_record isr
         left join item_seizure_items isi on isr.id = isi.record_id
-        where  isr.process_status=3
+        where isr.process_status=3
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
         <if test="startDate != null and endDate != null">
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
         group by isr.check_method,
@@ -183,13 +183,13 @@
         ifnull(sum(case when isi.is_active_concealment = 1 then isi.quantity else 0 end), 0) as concealTotal
         from item_seizure_record isr
         left join item_seizure_items isi on isr.id = isi.record_id
-        where  isr.process_status=3
+        where isr.process_status=3
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
         <if test="startDate != null and endDate != null">
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
     </select>
 
     <!--查获排名-按科室-->
@@ -199,13 +199,13 @@
         sum(isi.quantity) total
         from item_seizure_record isr
         left join item_seizure_items isi on isr.id = isi.record_id
-        where  isr.process_status=3
+        where isr.process_status=3
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
         <if test="startDate != null and endDate != null">
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="categoryCodeOne != null and  categoryCodeOne != ''">
             and isi.category_code_one = #{categoryCodeOne}
         </if>
@@ -226,13 +226,13 @@
         sum(isi.quantity) total
         from item_seizure_record isr
         left join item_seizure_items isi on isr.id = isi.record_id
-        where  isr.process_status=3
+        where isr.process_status=3
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
         <if test="startDate != null and endDate != null">
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="categoryCodeOne != null and  categoryCodeOne != ''">
             and isi.category_code_one = #{categoryCodeOne}
         </if>
@@ -253,14 +253,14 @@
         sum(isi.quantity) total
         from item_seizure_record isr
         left join item_seizure_items isi on isr.id = isi.record_id
-        where  isr.process_status=3
+        where isr.process_status=3
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
         <if test="startDate != null and endDate != null">
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
-        <if test="inspectTeamId != null"> and isr.inspect_team_id = #{inspectTeamId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
+        <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
         <if test="categoryCodeOne != null and  categoryCodeOne != ''">
             and isi.category_code_one = #{categoryCodeOne}
         </if>
@@ -276,63 +276,63 @@
 
     <!--查获时段分布-->
     <select id="timeSpan" resultType="com.sundot.airport.item.domain.ItemLargeScreenTimeSpanDto">
-        select hours.hour                   as hourOfDay,
-               ifnull(sum(isi.quantity), 0) as total
+        select hours.hour as hourOfDay,
+        ifnull(sum(isi.quantity), 0) as total
         from (select 0 as hour
-              union
-              select 1
-              union
-              select 2
-              union
-              select 3
-              union
-              select 4
-              union
-              select 5
-              union
-              select 6
-              union
-              select 7
-              union
-              select 8
-              union
-              select 9
-              union
-              select 10
-              union
-              select 11
-              union
-              select 12
-              union
-              select 13
-              union
-              select 14
-              union
-              select 15
-              union
-              select 16
-              union
-              select 17
-              union
-              select 18
-              union
-              select 19
-              union
-              select 20
-              union
-              select 21
-              union
-              select 22
-              union
-              select 23) as hours
-                 left join item_seizure_record isr
-                           on hours.hour = hour (isr.seizure_time)
+        union
+        select 1
+        union
+        select 2
+        union
+        select 3
+        union
+        select 4
+        union
+        select 5
+        union
+        select 6
+        union
+        select 7
+        union
+        select 8
+        union
+        select 9
+        union
+        select 10
+        union
+        select 11
+        union
+        select 12
+        union
+        select 13
+        union
+        select 14
+        union
+        select 15
+        union
+        select 16
+        union
+        select 17
+        union
+        select 18
+        union
+        select 19
+        union
+        select 20
+        union
+        select 21
+        union
+        select 22
+        union
+        select 23) as hours
+        left join item_seizure_record isr
+        on hours.hour = hour (isr.seizure_time)
         <if test="specifiedDate != null and specifiedDate != null">
-        and date (isr.seizure_time) = #{specifiedDate}
+            and date (isr.seizure_time) = #{specifiedDate}
         </if>
-            left join item_seizure_items isi
+        left join item_seizure_items isi
         on isr.id = isi.record_id
-        where  isr.process_status=3
+        where isr.process_status=3
         <if test="startDate != null and endDate != null">
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
@@ -343,7 +343,7 @@
         <if test="categoryCodeTwo != null and  categoryCodeTwo != ''">
             and isi.category_code_two = #{categoryCodeTwo}
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="isPolice=='1' or isPolice==1 ">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
         <if test="isConceal=='1' or  isConceal==1 ">and isi.is_active_concealment = 1</if>
         group by hours.hour
@@ -353,7 +353,7 @@
     <!--按天统计趋势数据-->
     <select id="dailyTrend" resultType="com.sundot.airport.item.domain.ItemLargeScreenDailyTrendDto">
         select DATE(isr.seizure_time) as date,
-               ifnull(sum(isi.quantity), 0) as total
+        ifnull(sum(isi.quantity), 0) as total
         from item_seizure_record isr
         left join item_seizure_items isi on isr.id = isi.record_id
         where isr.process_status = 3
@@ -361,7 +361,7 @@
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="categoryCodeOne != null and categoryCodeOne != ''">
             and isi.category_code_one = #{categoryCodeOne}
         </if>
@@ -383,13 +383,13 @@
         sum(isi.quantity) total
         from item_seizure_record isr
         left join item_seizure_items isi on isr.id = isi.record_id
-        where  isr.process_status=3
+        where isr.process_status=3
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
         <if test="startDate != null and endDate != null">
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
         group by isi.check_position_code_one,
@@ -408,13 +408,13 @@
         sum(isi.quantity) total
         from item_seizure_record isr
         left join item_seizure_items isi on isr.id = isi.record_id
-        where  isr.process_status=3
+        where isr.process_status=3
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
         <if test="startDate != null and endDate != null">
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         group by isr.regional_code,
         isr.regional_name,
         isi.category_code_one,
@@ -435,16 +435,18 @@
         sum(isi.quantity) total
         from item_seizure_record isr
         left join item_seizure_items isi on isr.id = isi.record_id
-        where  isr.process_status=3
+        where isr.process_status=3
         <if test="specifiedDate != null">and date(isr.seizure_time) = #{specifiedDate}</if>
         <if test="startDate != null and endDate != null">
             and (isr.seizure_time >= #{startDate}
             and isr.seizure_time <![CDATA[ < ]]> date_add(#{endDate}, interval 1 day))
         </if>
-        <if test="inspectDepartmentId != null"> and isr.inspect_department_id = #{inspectDepartmentId} </if>
+        <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="isPolice=='1' or isPolice==1">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
         <if test="isConceal=='1' or isConceal==1">and isi.is_active_concealment = 1</if>
-        <if test="levelType == 2 and positionCode!=null and positionCode!=''">and  isi.check_position_code_one = #{positionCode}</if>
+        <if test="levelType == 2 and positionCode!=null and positionCode!=''">and isi.check_position_code_one =
+            #{positionCode}
+        </if>
         group by
         <if test="levelType == 1">
             isi.check_position_code_one,