Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireEquipmentSignalLogDto.java

@@ -115,4 +115,10 @@ public class FireEquipmentSignalLogDto extends BaseDto {
 
     @ApiModelProperty(value = "负责人联系电话")
     private String chargePersonPhone;
+
+    /**
+     * 3维页面访问地址
+     */
+    @ApiModelProperty(value = "3维页面访问地址")
+    private String view3dUrl;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireStationInfoDto.java

@@ -80,4 +80,10 @@ public class FireStationInfoDto extends BaseDto {
     @ApiModelProperty(value = "现存隐患")
     private Long existDangerNumber;
 
+    /**
+     * 3维页面访问地址
+     */
+    @ApiModelProperty(value = "3维页面访问地址")
+    private String view3dUrl;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/FireStationInfo.java

@@ -129,4 +129,10 @@ public class FireStationInfo extends BaseEntity {
      */
     @TableField("fire_captain_phone")
     private String fireCaptainPhone;
+
+    /**
+     * 3维页面访问地址
+     */
+    @TableField("view3d_url")
+    private String view3dUrl;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireEquipmentSignalLogMapper.xml

@@ -32,7 +32,8 @@
             a.system_names,
             s.station_charge_person,
             s.charge_person_phone,
-            a.fire_building_mrid
+            a.fire_building_mrid,
+            s.view3d_url
         from
             asf_fire_equipment_signal_log a,
             asf_fire_station_info s

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamListDto.java

@@ -32,4 +32,11 @@ public class FireTeamListDto {
 
     @ApiModelProperty(value = "树节点子节点id集合")
     private List<String> nodeIds;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "所属单位")
+    private String company;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireStationMapper.java

@@ -27,6 +27,7 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 			+ "<if test='par.name!=null'> and a.name like  CONCAT('%',#{par.name},'%') </if>"
 			+ "<if test='par.bizCompanyId!=null'> and a.biz_company_id = #{par.bizCompanyId} </if>"
 			+ "<if test='par.bizCompanyCode!=null'> and a.biz_company_code like  CONCAT('',#{par.bizCompanyCode},'%') </if>"
+			+ "<if test='par.address!=null'> and a.address like  CONCAT('',#{par.address},'%') </if>"
 			+" order by a.rec_date desc limit  #{pageNum},#{pageSize}"
 			+ "</script>")	
 	List<FireStationDto>getFireStation(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
@@ -35,6 +36,7 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 			+ "<if test='par.name!=null'> and cb_fire_station.name like  CONCAT('%',#{par.name},'%') </if>"	
 			+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"
 			+ "<if test='par.bizCompanyCode!=null'> and cb_fire_station.biz_company_code like  CONCAT('',#{par.bizCompanyCode},'%') </if>"
+			+ "<if test='par.address!=null'> and cb_fire_station.address like  CONCAT('',#{par.address},'%') </if>"
 			+ "</script>")	
 	 Map<String, Long> getFireStationCount(@Param("par")FireStationDto par);
 

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

@@ -44,7 +44,9 @@
         <if test='par.parent != null'>and a.parent = #{par.parent}</if>
         <if test='par.typeCode != null'>and a.type_code = #{par.typeCode}</if>
         <if test='par.companyCode != null'>and a.company_code = #{par.companyCode}</if>
+        <if test='par.company != null and par.company != -1'>and a.company = #{par.company}</if>
         <if test='par.name != null'>and a.name like concat('%', #{par.name}, '%')</if>
+        <if test='par.address != null'>and a.address like concat('%', #{par.address}, '%')</if>
         <if test='par.nodeType != null and par.nodeType == "1" and par.nodeIds != null'>
             and a.company in
             <foreach collection="par.nodeIds" separator="," open="(" item="nodeId" close=")">

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

@@ -24,6 +24,7 @@
         <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}</if>
         <if test='par.name!=null'>and a.name like concat ('%',#{par.name},'%')</if>
         <if test='par.state!=null'>and a.state_code= #{par.state}</if>
+        <if test='par.company!=null and par.company!= -1'>and a.company= #{par.company}</if>
         <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
         <if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
         <if
@@ -43,6 +44,7 @@
         <if test='par.name!=null'>and a.name like concat ('%',#{par.name},'%')</if>
         <if test='par.state!=null'>and a.state_code= #{par.state}</if>
         <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
+        <if test='par.company!=null and par.company!= -1'>and a.company= #{par.company}</if>
         <if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
         <if
                 test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code

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

@@ -140,6 +140,9 @@
             <if test="map.amosOrgCode != null and map.amosOrgCode != '-1'">
                 AND u.amos_org_code like concat('%',#{map.amosOrgCode}, '%')
             </if>
+            <if test="map.company != null and map.company != '-1'">
+            AND u.parent_id = #{company}
+            </if>
             GROUP BY
             u.sequence_nbr ,
             u.biz_org_name ,

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -147,11 +147,11 @@
             <if test="alertStatus!= null ">
                 and a.alert_status = #{alertStatus}
             </if>
-            <if test="startTime!= null and endTime != null">
+            <if test="startTime!= null and endTime != null and startTime!= '' and endTime != ''">
                 and a.call_time between #{startTime} and #{endTime}
             </if>
-            <if test="alertTypeCode!= null ">
-                and a.alarm_type_code = #{alertTypeCode}
+            <if test="alertTypeCode!= null and alertTypeCode!= '' ">
+                and a.alert_type_code = #{alertTypeCode}
             </if>
             <if test="alertSourceCode!= null ">
                 and a.alert_source_code = #{alertSourceCode}
@@ -176,11 +176,8 @@
     </select>
 
     <select id="selectAllCount" resultType="int">
-        SELECT
-        sum(b.num)
-        FROM
-        (SELECT
-        count(distinct a.sequence_nbr) as num
+       SELECT
+        count(a.sequence_nbr) as num
         FROM
         jc_alert_called a
         <if test="isFatherAlert!= null and isFatherAlert == 'true' ">
@@ -190,23 +187,23 @@
             <if test="alertStatus!= null ">
                 and a.alert_status = #{alertStatus}
             </if>
-            <if test="startTime!= null and endTime != null">
+            <if test="startTime!= null and endTime != null and startTime!= '' and endTime != ''">
                 and a.call_time between #{startTime} and #{endTime}
             </if>
-            <if test="alertTypeCode!= null ">
+            <if test="alertTypeCode!= null and alertTypeCode!= '' ">
                 and a.alarm_type_code = #{alertTypeCode}
             </if>
             <if test="alertSourceCode!= null ">
                 and a.alert_source_code = #{alertSourceCode}
             </if>
             <if test="systemSourceCode!= null ">
-                and a.system_source_code = #{systemSourceCode}
+                and a.system_source_code in (${systemSourceCode})
             </if>
             <if test="isFatherAlert!= null and isFatherAlert == 'true' ">
                 and j.alert_called_id = a.sequence_nbr
                 GROUP BY a.sequence_nbr
             </if>
-        </where>) b
+        </where>
     </select>