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

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -572,7 +572,7 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         WHERE
         @s > DATEDIFF( date_add( curdate(), INTERVAL - DAY ( curdate()) + 1 DAY ), CURDATE() )) t
         LEFT JOIN cb_sign cs ON cs.date = t.date
-        LEFT JOIN cb_org_usr ou ON ou.`amos_org_id` = cs.`user_id`
+        LEFT JOIN cb_org_usr ou ON ou.`biz_org_code` = cs.`biz_org_code`
         AND ou.is_delete = 0
         LEFT JOIN idx_biz_station_info si ON si.`code` = ou.`code`
         GROUP BY
@@ -596,26 +596,24 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
 
     <select id="getUsrSignInfoByBizOrgCode" resultType="java.util.Map">
         SELECT
-        count( 1 ) AS total,
-        count( DISTINCT cs.user_id ) AS qualifiedNum,
+        a.qualifiedNum,
+        a.allNum - a.qualifiedNum AS unQualifiedNum,
         (
-        count( 1 ) - count( DISTINCT cs.user_id )) AS unQualifiedNum,
-        (TRUNCATE (
-        abs(
-        count( DISTINCT cs.user_id ) /
-        IF
-        (( count( 1 ) = 0 ), 1, count( 1 ) )) * 100,
-        2
-        )) as qualifiedAbs
+        TRUNCATE ( abs( a.qualifiedNum / IF (( a.allNum = 0 ), 1, a.allNum )) * 100, 2 )) AS qualifiedAbs
         FROM
-        cb_org_usr u
-        LEFT JOIN cb_sign cs ON cs.user_id = u.amos_org_id
-        WHERE
-        u.is_delete = 0
-        AND u.biz_org_type = 'PERSON'
+        (
+        SELECT
+        ( SELECT count( DISTINCT user_id ) FROM `cb_sign` WHERE `date` = CURRENT_DATE
         <if test="bizOrgCode != null and bizOrgCode != ''">
-            AND u.`biz_org_code` LIKE concat(#{bizOrgCode}, '%')
+            AND `biz_org_code` LIKE concat(#{bizOrgCode}, '%')
         </if>
+        ) AS qualifiedNum,
+        ( SELECT count( 1 ) FROM cb_org_usr WHERE is_delete = 0 AND biz_org_type = 'PERSON'
+        <if test="bizOrgCode != null and bizOrgCode != ''">
+            AND `biz_org_code` LIKE concat(#{bizOrgCode}, '%')
+        </if>
+        ) AS allNum
+        ) a
     </select>
 
     <select id="getUserInfoByYJYA" resultType="java.util.Map">

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipTypeImgAmountVO.java

@@ -66,5 +66,7 @@ public class EquipTypeImgAmountVO {
     
     @ApiModelProperty(value = "物联设备实时状态")
     private Double equipStatus;
-   
+
+    @ApiModelProperty(value = "车牌号")
+    private String carNum;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/WlCarMileageMapper.java

@@ -19,6 +19,6 @@ public interface WlCarMileageMapper extends BaseMapper<WlCarMileage> {
 
 	Double totalMileage(String iotCode);
 
-	List<WlCarMileage> list();
+	List<WlCarMileage> list(@Param("date") String date);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1466,9 +1466,9 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             vo.setBizOrgName(orgUsrDto.getBizOrgName());
             //此处为公共接口 未区分导致消防建筑页面树统计错误
             if(ment.equals("video")){
-                vo.setTotal(buildingTreeVos.stream().filter(b -> !ObjectUtils.isEmpty(b.getBizOrgCode()) && b.getBizOrgCode().contains(ObjectUtils.isEmpty(vo.getBizOrgCode())?"":vo.getBizOrgCode()) && "building".equals(b.getGroupType())).count());
-            }else {
                 vo.setTotal(!StringUtils.isEmpty(orgUsrDto.getBizOrgCode()) ? formInstanceMapper.queryVideoCountByBizOrgCode(orgUsrDto.getBizOrgCode()) : 0L);
+            }else {
+                vo.setTotal(buildingTreeVos.stream().filter(b -> !ObjectUtils.isEmpty(b.getBizOrgCode()) && b.getBizOrgCode().contains(ObjectUtils.isEmpty(vo.getBizOrgCode())?"":vo.getBizOrgCode()) && "building".equals(b.getGroupType())).count());
             }
             return vo;
         }).collect(Collectors.toList());

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/WlCarMileageServiceImpl.java

@@ -279,8 +279,13 @@ public class WlCarMileageServiceImpl extends ServiceImpl<WlCarMileageMapper, WlC
 	@Override
 	@Scheduled(cron = "${mileage.segmentation.cron}")
 	public void mileageSegmentation() {
-		log.info("轨迹切分定时任务开始执行时间.............{}", new Date());
-		List<WlCarMileage> list = this.baseMapper.list();
+		log.info("轨迹切分定时任务开始执行时间.............{}", LocalDateTime.now());
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(new Date());
+		cal.add(Calendar.DATE, -1);
+		String nowDate = new SimpleDateFormat("yyyy-MM-dd").format(cal.getTime());
+		log.info("轨迹切分定时任务数据过滤时间.............{}", nowDate);
+		List<WlCarMileage> list = this.baseMapper.list(nowDate);
 		log.info("需要切分数据, {}", list);
 		list.forEach(item -> {
 			Calendar calendar = Calendar.getInstance();

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -1870,7 +1870,7 @@
         wlai.`name` manufacturerName,
         wlc.car_num as code,
         wlc.iot_code as iotCode,
-        wlc.car_num,
+        wlc.car_num as carNum,
         CASE
         wlc.car_state
         WHEN '1' THEN

amos-boot-system-equip/src/main/resources/mapper/WlCarMileageMapper.xml

@@ -50,7 +50,7 @@
 		FROM
 			`wl_car_mileage` wcm
 		WHERE
-			wcm.date = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
+			wcm.date = #{date}
 		  AND wcm.start_time IS NOT NULL
 		  AND wcm.end_time IS NULL
 	</select>