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

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

@@ -108,6 +108,7 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
 		return list;
     	
     }
+    @Override
     public List<DataDictionary> getByType(String type)  {
     	LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<DataDictionary>();
     	wrapper.eq(DataDictionary::getIsDelete, false);
@@ -125,7 +126,7 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
         ) {
             if( null != m.children) {
                 List<Menu> children = m.getChildren();
-                int count = 0;
+                int count = m.num;
                 for (Menu mm:children
                 ) {
                     count = count + mm.num;

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

@@ -107,6 +107,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     @DataAuth(interfacePath="")
     List<OrgUsr> companyDeptListWithPersonCount(Map<String, Object> param);
 
+    List<OrgUsr> companyTreeByUser(String bizOrgCode);
+
     Map<String,String> selectPersonone(@Param("name")String name ,@Param("id")Long id);
 
     List<OrgUsr> listByOrgTypes(@Param("orgTypeList") List<String> orgTypeList,@Param("bizOrgCode") String bizOrgCode);

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -315,4 +315,7 @@ public interface IOrgUsrService {
      * @return List<OrgMenuDto>
      */
     List<OrgMenuDto> companyTreeByUserNumber(ReginParams reginParams);
+
+    List<OrgMenuDto> companyTreeByUser(ReginParams reginParams);
+
 }

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

@@ -780,6 +780,19 @@ LEFT JOIN (
          (usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
         and usr.is_delete = false
     </select>
+
+    <select id="companyTreeByUser"
+            resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT
+            usr.*
+        FROM
+            cb_org_usr usr
+        where
+            (usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
+          and usr.is_delete = false
+          and usr.biz_org_code like CONCAT(#{bizOrgCode},'%')
+    </select>
+
     <select id="listByOrgTypes" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
         select
             *

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

@@ -185,8 +185,14 @@ public class KeySiteController extends BaseController {
         Page<KeySiteDto> page = new Page<KeySiteDto>();
         page.setCurrent(current);
         page.setSize(size);
+
+        // 获取登陆人角色
+        ReginParams reginParams = getSelectedOrgInfo();
+        // 权限赋值
+        PermissionInterceptorContext.setDataAuthRule(authKey);
+
         return ResponseHelper.buildResponse(keySiteServiceImpl.getPageList(page, name, buildingId, fireEnduranceRate,
-                useNature, fireFacilitiesInfo, bizOrgCode));
+                useNature, fireFacilitiesInfo, reginParams.getPersonIdentity().getBizOrgCode()));
     }
 
     @PersonIdentify

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

@@ -165,7 +165,7 @@ public class OrgPersonController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public ResponseModel<Object> listPage(@RequestParam Map<String, Object> requestBody) {

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

@@ -435,6 +435,17 @@ public class OrgUsrController extends BaseController {
         return ResponseHelper.buildResponse(menus);
     }
 
+    @PersonIdentify
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/companyTreeByUserCurrent", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据登录人获取当前公司部门树", notes = "根据登录人获取当前公司部门树")
+    public ResponseModel<List<OrgMenuDto>> companyTreeByUser() {
+        // 获取登陆人角色
+        ReginParams reginParams = getSelectedOrgInfo();
+        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUser(reginParams);
+        return ResponseHelper.buildResponse(menus);
+    }
+
     /**
      * 获取单位部门树
      *

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

@@ -182,23 +182,25 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 						// 获取当前装备ID下的排版数据
 						List<Map<String, Object>> specifyDateList = dutyPersonShiftMapper.getPositionStaffDutyForSpecifyDate(dutyDay,
 								this.getGroupCode(), instanceIds,null);
-						if(specifyDateList==null || specifyDateList.size() < 1 || specifyDateList.get(0)==null) {
+						/*if(specifyDateList==null || specifyDateList.size() < 1 || specifyDateList.get(0)==null) {
 							continue;
-						}
+						}*/
 						LinkedHashMap<String, Object> infoMap_1 =new LinkedHashMap<String, Object>();
 						//取消掉班次的显示---2022-01-16 by chenhao ---start
 						//infoMap_1.put(dutyDetail.get("name").toString(), "");
 						//resultList.add(infoMap_1);
 						//取消掉班次的显示---2022-01-16 by chenhao ---end
+						if (specifyDateList.size()>0 && specifyDateList != null) {
 					for (Map<String, Object> specify : specifyDateList) {
-							LinkedHashMap<String, Object> infoMap_2 =new LinkedHashMap<String, Object>();
+						LinkedHashMap<String, Object> infoMap_2 = new LinkedHashMap<String, Object>();
 //							infoMap_2.put(specify.get("postTypeName").toString(),specify.get("userName").toString());
 //							resultList.add(infoMap_2);
-							if( specify.containsKey("postTypeName")&& specify.get("postTypeName")!=null && specify.containsKey("userName")&& specify.get("userName")!=null ) {
-								infoMap_2.put(specify.get("postTypeName").toString(),specify.get("userName").toString());
+						if (specify.containsKey("postTypeName") && specify.get("postTypeName") != null && specify.containsKey("userName") && specify.get("userName") != null) {
+							infoMap_2.put(specify.get("postTypeName").toString(), specify.get("userName").toString());
 							resultList.add(infoMap_2);
 						}
 					}
+				}
 				//	}
 				//}
 			}

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

@@ -129,7 +129,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 			 ) {
 			if( null != m.children) {
 				List<Menu> children = m.getChildren();
-				int count = 0;
+				int count = m.num;
 				for (Menu mm:children
 					 ) {
 					count = count + mm.num;

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

@@ -392,7 +392,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             query.eq(OrgUsr::getBizOrgCode, req.get("bizOrgCode").toString());
             OrgUsr orgUsr = this.getOne(query);
             req.remove("bizOrgCode");
-            map.put("company", orgUsr.getSequenceNbr());
+            map.put("company", orgUsr.getSequenceNbr().toString());
         }
 
         /* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
@@ -2138,6 +2138,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<OrgUsr> list = orgUsrMapper.companyDeptListWithPersonCount(param);
         return buildTreeParallel(list);
     }
+
+    @Override
+    public List<OrgMenuDto> companyTreeByUser(ReginParams reginParams) {
+        Map<String, Object> param = new HashMap<>();
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
+        List<OrgUsr> list = orgUsrMapper.companyTreeByUser(reginParams.getPersonIdentity().getBizOrgCode());
+        return buildTreeParallel(list);
+    }
     /**
      * 同步单位信息到防火监督point表
      *

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

@@ -240,7 +240,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
 
     @Override
     public List<UnitAreaTreeVo> getAreaTreeListVo() {
-        // 获取公司部门list
+        // 获取公司list
         List<OrgUsrDto> orgCompanyLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey, "COMPANY");
         Map<String,Long> orgMap = orgCompanyLists.stream().collect(Collectors.toMap(OrgUsrDto::getBizOrgCode,OrgUsrDto::getSequenceNbr));
         List<UnitAreaTreeVo> orgTreeList = orgCompanyLists.stream()

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

@@ -1137,6 +1137,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             vo.setName(orgUsrDto.getBizOrgName());
             vo.setId(orgUsrDto.getSequenceNbr());
             vo.setBizOrgName(orgUsrDto.getBizOrgName());
+            vo.setTotal(allListVo.stream().filter(b-> b.getBizOrgCode() != null && b.getBizOrgCode().contains(vo.getBizOrgCode()) && "building".equals(b.getGroupType())).count());
             if ("".equals(orgUsrDto.getParentId()) || "-1".equals(orgUsrDto.getParentId()) || null == orgUsrDto.getParentId()) {
                 flag.set(true);
             }

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

@@ -80,13 +80,13 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
         Map map = new HashMap<String, Object>();
         List<EquipmentManageVo> utils = equipmentManageMapper.getUtils();
 
-       /* List<DynamicFormGroup> list = iEqDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
-            //    .eq(DynamicFormGroup::getOrgCode, orgCode)
+        List<DynamicFormGroup> list = iEqDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
+                .eq(DynamicFormGroup::getOrgCode, orgCode)
                 .eq(DynamicFormGroup::getParentId, 0)
-                .orderByDesc(BaseEntity::getCreateDate));*/
-      List<EquipmentManageVo> systemList = equipmentManageMapper.getSystemList();
+                .orderByDesc(BaseEntity::getCreateDate));
+     // List<EquipmentManageVo> systemList = equipmentManageMapper.getSystemList();
         map.put("utils", utils);
-        map.put("systemType", systemList);
+        map.put("systemType", list);
         return map;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -367,7 +367,7 @@ public class FirefightersController extends BaseController {
      * @return
      * @throws Exception
      */
-    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/job/getFirefightersJobTitleCount", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public ResponseModel<Object> getFirefightersJobTitleCount(String bizOrgCode) throws Exception {

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

@@ -138,9 +138,9 @@
     <select id="getEquipBySceneId" resultMap="EquiplistBySystemId">
         SELECT
                 spe.id,
-                det.NAME equipment_name,
-                spe.CODE,
-                wlec.NAME AS category_name
+                det.name equipment_name,
+                spe.code,
+                wlec.name AS category_name
                 FROM
                 wl_equipment_specific AS spe
                 LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id

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

@@ -88,7 +88,7 @@
         MAX( CASE WHEN a.field_name = 'code' THEN a.field_value END ) AS code,
         MAX( CASE WHEN a.field_name = 'isRisk' THEN a.field_value END ) AS isRisk,
         MAX( CASE WHEN a.field_name = 'address' THEN a.field_value END ) AS address,
-        MAX( CASE WHEN a.field_name = 'orgCode' THEN a.field_value END ) AS bizOrgCode,
+        MAX( CASE WHEN a.field_name = 'bizOrgCode' THEN a.field_value END ) AS bizOrgCode,
         MAX( CASE WHEN a.field_name = 'bizOrgName' THEN a.field_value END ) AS bizOrgName
         FROM
         `wl_form_instance` a