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

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/controller/FireSourceController.java

@@ -139,13 +139,14 @@ public class FireSourceController extends AbstractBaseController {
             @ApiParam(value = "设备名称", required = false) @RequestParam(required = false) String fireEquipmentName,
             @ApiParam(value = "按保护对象名称", required = false) @RequestParam(required = false) String equipmentName,
             @ApiParam(value = "开始日期", required = false) @RequestParam(required = false) String startTime,
+            @ApiParam(value = "建筑id", required = false) @RequestParam(required = false) String buildId,
             @ApiParam(value = "结束日期", required = false) @RequestParam(required = false) String endTime, int pageNumber,
             int pageSize) {
 
         CommonPageable commonPageable = new CommonPageable(pageNumber, pageSize);
         return CommonResponseUtil.success(iFireEquipService.queryForFireEquipmentHistory(
                 StringUtils.trimToNull(fireEquipmentName), StringUtils.trimToNull(equipmentName),
-                StringUtils.trimToNull(startTime), StringUtils.trimToNull(endTime), commonPageable));
+                StringUtils.trimToNull(startTime), StringUtils.trimToNull(endTime),StringUtils.trimToNull(buildId), commonPageable));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FireEquipMapper.java

@@ -27,7 +27,8 @@ public interface FireEquipMapper extends BaseMapper {
     long queryForFireEquipmentHistoryCount(@Param("fireEquipmentName") String fireEquipmentName,
                                            @Param("equipmentName") String equipmentName,
                                            @Param("startTime") String startTime,
-                                           @Param("endTime") String endTime);
+                                           @Param("endTime") String endTime,
+                                           @Param("buildId") String buildId);
 
     //查询 消防设备历史数据
     List<Map> queryForFireEquipmentHistory(
@@ -36,7 +37,8 @@ public interface FireEquipMapper extends BaseMapper {
             @Param("startTime") String startTime,
             @Param("endTime") String endTime,
             @Param("start") long start,
-            @Param("length") int length
+            @Param("length") int length,
+            @Param("buildId") String buildId
     );
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipServiceImpl.java

@@ -14,10 +14,12 @@ import com.yeejoin.amos.fas.business.vo.FireStationVo;
 import com.yeejoin.amos.fas.common.enums.EquipClassifyEnum;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.CommonPage;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -90,18 +92,21 @@ public class FireEquipServiceImpl implements IFireEquipService {
                                              String equipmentName,
                                              String startTime,
                                              String endTime,
+                                             String buildId,
                                              CommonPageable commonPageable) {
 
         long total = fireEquipMapper.queryForFireEquipmentHistoryCount(fireEquipmentName, equipmentName,
                 startTime,
-                endTime);
+                endTime,
+                buildId);
 
         List<Map> content = fireEquipMapper.queryForFireEquipmentHistory(fireEquipmentName,
                 equipmentName,
                 startTime,
                 endTime,
                 commonPageable.getOffset(),
-                commonPageable.getPageSize());
+                commonPageable.getPageSize(),
+                buildId);
         Page result = new CommonPage(content, commonPageable, total);
         return result;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IFireEquipService.java

@@ -30,6 +30,7 @@ public interface IFireEquipService {
 												  String equipmentName,
 												  String startTime,
 												  String endTime,
+												  String buildId,
 												  CommonPageable commonPageable);
 
 	Page queryForEquipmentList(String name, String code,String equipClassify,CommonPageable commonPageable,String bindStation);

amos-boot-system-fas/src/main/resources/db/mapper/dbTemplate_fire_equip.xml

@@ -130,7 +130,8 @@
         WHERE
         efe.fire_equipment_id = ind.equipment_specific_id
         ) equipmentName,
-        ind.update_date
+        ind.update_date,
+        spe.warehouse_structure_id buildId
         FROM
         wl_equipment_specific_index as ind
         left join wl_equipment_specific as spe on spe.id = ind.equipment_specific_id
@@ -147,6 +148,12 @@
 	        <if test="startTime!=null">
 	            AND d.update_date  BETWEEN '${startTime}' AND '${endTime}'
 	        </if>
+            <if test="buildId!=null">
+               AND d.buildId in
+                <foreach item="item" index="index"  collection="buildId" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
 
@@ -194,6 +201,12 @@
 	        <if test="startTime!=null">
 	            AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
 	        </if>
+            <if test="buildId!=null">
+             AND d.buildId in
+           <foreach item="item" index="index"  collection="buildId" open="(" separator="," close=")">
+               #{item}
+          </foreach>
+      </if>
       </where>
         ORDER BY d.create_date desc
         LIMIT ${start},${length}

amos-boot-system-supervision/src/main/resources/application-dev.properties

@@ -53,4 +53,9 @@ emqx.max-inflight=1000
 
 rule.definition.localIp=172.16.3.89
 file.url=http://39.98.45.134:9000/
-supervision.person.charger.role=Person_charge_unit_fire_protection_supervision_inspection
\ No newline at end of file
+supervision.person.charger.role=Person_charge_unit_fire_protection_supervision_inspection
+
+
+#隐患治理模块用于对多角色判断时，在缺少唯一充足的判断下使用当前角色的主键id作为判断条件，
+supervision.role.isIncludOrgAirRoleId=1476527279111151618
+supervision.role.includOrgCompanyRoleId=1476527581793099777

pom.xml

@@ -25,7 +25,7 @@
 		<springcloud.version>Hoxton.SR8</springcloud.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<tyboot-version>1.1.20</tyboot-version>
-		<amos.version>1.6.6</amos.version>
+		<amos.version>1.7.1</amos.version>
 		<itext.version>7.1.1</itext.version>
 	</properties>