消防系统 筛选参数 120警情 消防队伍互相父子级 消防队伍部门返回上级单位的队伍

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

@@ -73,4 +73,7 @@ public class RequestData {
 
     @ApiModelProperty(value = "筛选条件-所属单位")
     private String bizOrgCode;
+
+    @ApiModelProperty(value = "筛选条件-是否120警情")
+    private String isAid ;
 }

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

@@ -43,9 +43,12 @@
         WHEN '1166' THEN '原地待命'
         ELSE '' END responseLevelCode
         FROM jc_alert_called a
-        where a.is_delete=0   and a.alert_type_code <![CDATA[ <> ]]> 1214
+        where a.is_delete=0
         <!--AND a.coordinate_x IS NOT NULL
         AND a.coordinate_y IS NOT NULL-->
+    <if test='par.isAid == null '>
+            and a.alert_type_code <![CDATA[ <> ]]> 1214
+    </if>
     <if test='par.status==0'>
         and a.alert_status =0
     </if>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireTeamController.java

@@ -185,12 +185,11 @@ public class FireTeamController extends BaseController {
         OrgUsr our=iOrgUsrService.getById(companyId);
         if(our.getParentId()!=null){
           //判断是不是部门
-
             if(our.getBizOrgType().equals("COMPANY")){
                 columnMap.put("company", companyId);
             }else{
-               String id= orgUsrMapper.getParentList(companyId);
-               columnMap.put("company", id);
+                OrgUsr orgUsr = iOrgUsrService.selectParentOrgUsr(our);
+                columnMap.put("company", orgUsr.getSequenceNbr());
             }
         }
         List<Menu> menus = iFireTeamService.getTeamTree(columnMap);
@@ -212,9 +211,8 @@ public class FireTeamController extends BaseController {
             if(our.getBizOrgType().equals("COMPANY")){
                 fireTeamQueryWrapper.likeRight("biz_org_code",our.getBizOrgCode());
             }else{
-                String id= orgUsrMapper.getParentList(companyId);
-                OrgUsr ourf=iOrgUsrService.getById(id);
-                fireTeamQueryWrapper.likeRight("biz_org_code",ourf.getBizOrgCode());
+                OrgUsr orgUsr = iOrgUsrService.selectParentOrgUsr(our);
+                fireTeamQueryWrapper.likeRight("biz_org_code",orgUsr.getBizOrgCode());
             }
         }
         List<Menu> menus = iFireTeamService.getTeamTreeLikeCode(fireTeamQueryWrapper);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireTeamServiceImpl.java

@@ -35,6 +35,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.annotation.Resource;
@@ -258,6 +259,10 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
             fireTeam.setTreeCode(TreeParser.genTreeCode());
         } else {
             FireTeam parentTeam = getById(fireTeam.getParent());
+            //防止互为上级 造成树死循环
+            if (fireTeam.getSequenceNbr() != null && parentTeam.getParent() != null && parentTeam.getParent().equals(fireTeam.getSequenceNbr()) ){
+                throw new BadRequest("该上级队伍不可选，本队伍已经是其上级");
+            }
             fireTeam.setTreeCode(parentTeam.getTreeCode() + TreeParser.genTreeCode());
         }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -599,6 +599,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				//tuisongxinjingqing
 				RequestData par=new RequestData();
 				par.setAlertId(alertCalled.getSequenceNbr());
+				if (alertCalled.getAlertTypeCode().equals(AlertStageEnums.JJJQ.getCode())){
+					par.setIsAid("0");
+				}
 				List<AlertCalledZhDto> list = this.alertCalledListByAlertStatus(null, null, par);
 
 				String json="";

amos-boot-system-equip/src/main/resources/application.properties

@@ -30,7 +30,7 @@ patrol.fegin.name=AMOS-PATROL
 maintenance.feign.name=AMOS-MAINTENANCE-API
 precontrol.feign.name=JEPCC-PRECONTROL-SERVER
 security.privilege.name=AMOS-API-PRIVILEGE
-security.systemctl.name=AMOS-API-SYSTEMCTL
+security.systemctl.name=AMOS-API-PRIVILEGE
 #jpush
 Push.fegin.name=AppMessagePushService
 dutyMode.fegin.name=AMOS-DUTYMODE

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

@@ -52,9 +52,15 @@
 	            <if test="bizOrgCode != null and bizOrgCode != ''">
 	                AND sys.biz_org_code like CONCAT(#{bizOrgCode},'%')
 	            </if>
+                <if test="companyCode != null and companyCode != ''">
+                    AND sys.biz_org_code like CONCAT(#{companyCode},'%')
+                </if>
 	            <if test="formGroupId != null and formGroupId != '' and formGroupId != '-1'">
 	                AND sys.form_group_id = #{formGroupId}
 	            </if>
+                <if test="controBoxBuildId != null ">
+                    AND sys.contro_box_build = #{controBoxBuildId}
+                </if>
             </where>
             order by sys.id DESC
             LIMIT #{spage},#{pageSize}