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

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

@@ -30,4 +30,6 @@ public class BuildSearchDTO {
      * 分组类型
      */
     private String groupType;
+
+    private String bizOrgCode;
 }

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

@@ -15,4 +15,6 @@ public class VideoDTO extends BaseDTO<Video> {
      * 监控
      */
     Video video;
+
+    String orgTypes;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BuildingController.java

@@ -281,4 +281,12 @@ public class BuildingController extends AbstractBaseController {
     public Map<String, String> getBuildingToLongitudeAndLatitude(@RequestParam String instanceId){
     	return buildService.getBuildingToLongitudeAndLatitude(instanceId);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("公司消防建筑树")
+    @GetMapping(value = "/companyBuildingTree")
+    public List<BuildingTreeVo> getCompanyBuildingTree() {
+        return buildService.getCompanyBuildingTree();
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -18,6 +18,7 @@ import com.yeejoin.equipmanage.mapper.EquipmentDetailMapper;
 import com.yeejoin.equipmanage.mapper.ManufacturerInfoMapper;
 import com.yeejoin.equipmanage.mapper.StockDetailMapper;
 import com.yeejoin.equipmanage.service.*;
+import com.yeejoin.equipmanage.service.impl.FireFightingSystemServiceImpl;
 import com.yeejoin.equipmanage.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.MediaType;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -83,6 +85,8 @@ public class EquipmentDetailController extends AbstractBaseController {
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
     
+    @Autowired
+    FireFightingSystemServiceImpl fireFightingSystemServiceImpl;
     /**
      * 新增
      *
@@ -92,9 +96,18 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public EquipmentDetail saveEquipmentDetail(HttpServletRequest request, @RequestBody EquipmentDetail equipmentDetail) {
+      	equipmentSpecificSerivce.refreshStaData();
         return iEquipmentDetailService.saveOne(equipmentDetail);
     }
+    @Async
+   	public void refreshCount(String bizOrgCode) {
+       	equipmentSpecificSerivce.refreshStaData();
+   		try {
+   			fireFightingSystemServiceImpl.refreshCarTypeAndCount(bizOrgCode);
+   		} catch (Exception e) {
+   		}
 
+   	}
     /**
      * 设备新增带打码入库
      ***/
@@ -102,6 +115,7 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public EquipmentDate saveEquipmentDetail(@RequestBody EquipmentDate equipmentDate) {
+    	equipmentSpecificSerivce.refreshStaData();
         if (equipmentDate.getEquipmentSpecific().getSingle() == null) {
             throw new BadRequest("管理方式未输入");
         }
@@ -202,6 +216,7 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
     public EquipmentDate updateByIdEquipmentDetail(HttpServletRequest request, @RequestBody EquipmentDate equipmentDate) {
+    	equipmentSpecificSerivce.refreshStaData();
         EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
         String sysCode = vo.getCode();
         if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())) {
@@ -258,6 +273,7 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(HttpServletRequest request, @PathVariable Long id) {
+    	equipmentSpecificSerivce.refreshStaData();
         return iEquipmentDetailService.removeOneById(id);
     }
 
@@ -265,6 +281,7 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
     public boolean quotaUpdate(HttpServletRequest request, @RequestBody List<EquProperty> e) {
+    	equipmentSpecificSerivce.refreshStaData();
         return iEquipmentDetailService.quotaUpdate(e);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -8,6 +8,7 @@ import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,13 +30,13 @@ import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentSpecificDTO;
 import com.yeejoin.equipmanage.common.entity.dto.SourceNameListDTO;
 import com.yeejoin.equipmanage.common.entity.vo.ComplementCodeVO;
-import com.yeejoin.equipmanage.common.entity.vo.DetailPaneVO;
 import com.yeejoin.equipmanage.common.entity.vo.SourceNameByEquipSpeIdVO;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.vo.EquipmentOnCarVo;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
 import com.yeejoin.equipmanage.service.IEquipmentDetailService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
+import com.yeejoin.equipmanage.service.impl.FireFightingSystemServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -71,11 +72,9 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "列表分页查询", notes = "补码列表接口,废弃未用到")
     public IPage<ComplementCodeVO> saveEquipmentPoint(@RequestBody EquipmentSpecificDTO equipmentSpecific) {
-    	equipmentSpecificSerivce.refreshStaData();
         return equipmentSpecificSerivce.selectEquipmentSpecific(equipmentSpecific);
     }
 
-
     /**
      * 通过id获取设备区域建筑等信息
      *
@@ -107,9 +106,8 @@ public class EquipmentSpecificController extends AbstractBaseController {
      */
     @RequestMapping(value = "/exit", method = RequestMethod.POST)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "POST", value = "修改", notes = "修改")
+    @ApiOperation(httpMethod = "POST", value = "修改"	, notes = "修改")
     public EquipmentSpecific updateEquipmentSpecific(@RequestBody EquipmentSpecific equipmentSpecific) {
-    	equipmentSpecificSerivce.refreshStaData();
         EquipmentSpecific updateEquipmentSpecific = equipmentSpecificSerivce.updateEquipmentSpecific(equipmentSpecific, getSelectedOrgInfo(), getUserInfo());
         if (syncSwitch) {
             // TODO 后续判断成功，执行同步
@@ -249,7 +247,6 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation( value = "删除装备相关所有数据", notes = "删除装备相关所有数据")
     public ResponseModel delEquipmentBySpecificId(@RequestParam Long specificId) {
-    	equipmentSpecificSerivce.refreshStaData();
         return CommonResponseUtil.success(equipmentSpecificSerivce.delEquipmentBySpecificId(specificId));
     }
     
@@ -262,7 +259,6 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation( value = "批量删除装备相关所有数据", notes = "批量删除装备相关所有数据")
     public ResponseModel delEquipmentBySpecificId(@RequestBody List<Long> specificIds) {
-    	equipmentSpecificSerivce.refreshStaData();
     	if(ObjectUtils.isEmpty(specificIds)){
     		 return CommonResponseUtil.failure("参数为空");
     	}

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

@@ -17,7 +17,7 @@ import java.util.List;
  */
 @Mapper
 public interface VideoMapper extends BaseMapper<Video> {
-    Page<PageVideoVO> pageVideo(@Param("page")IPage<Video> page, @Param("video")Video video);
+    Page<PageVideoVO> pageVideo(@Param("page") IPage<Video> page, @Param("video") Video video, @Param("list") List<String> bizOrgCodeList);
 
     Page<BuildingVideoVO> pageBuildingVideo(@Param("page") Page page, @Param("dto") BuildingVideoListVO dto);
 

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

@@ -308,4 +308,11 @@ public interface IBuilldService extends IService<Building> {
  */
 	Map<String, String> getBuildingToLongitudeAndLatitude(String instanceId);
 
+
+    /**
+     * 根据登陆人获取公司部门树
+     * @return list
+     */
+    List<BuildingTreeVo> getCompanyBuildingTree();
+
 }

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

@@ -50,6 +50,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -1195,4 +1196,47 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         // TODO Auto-generated method stub
         return formInstanceMapper.getBuildingToLongitudeAndLatitude(instanceId);
     }
+
+    @Override
+    public List<BuildingTreeVo> getCompanyBuildingTree() {
+        List<BuildingTreeVo> allListVo = getBuildingTreeVos();
+        // 获取公司部门list
+        List<OrgUsrDto> orgUsrLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey,"COMPANY");
+        AtomicReference<Boolean> flag = new AtomicReference<>(false);
+        List<BuildingTreeVo> collect = orgUsrLists.stream().map(orgUsrDto -> {
+            BuildingTreeVo vo = new BuildingTreeVo();
+            vo.setGroupType("allBuilding");
+            vo.setGroupCode("allBuilding");
+            vo.setInstanceName(orgUsrDto.getBizOrgName());
+            vo.setBizOrgCode(orgUsrDto.getBizOrgCode());
+            vo.setInstanceId(orgUsrDto.getSequenceNbr());
+            vo.setParentId(orgUsrDto.getParentId());
+            vo.setName(orgUsrDto.getBizOrgName());
+            vo.setId(orgUsrDto.getSequenceNbr());
+            if ("".equals(orgUsrDto.getParentId()) || "-1".equals(orgUsrDto.getParentId()) || null == orgUsrDto.getParentId()) {
+                flag.set(true);
+            }
+            return vo;
+        }).collect(Collectors.toList());
+
+        allListVo.addAll(collect);
+        return allListVo.stream().filter(s -> flag.get() ? "allBuilding".equals(s.getGroupType()) && s.getBizOrgCode() != null && ("".equals(s.getParentId()) || "-1".equals(s.getParentId()) || null == s.getParentId())
+                                            : "allBuilding".equals(s.getGroupType()) && s.getBizOrgCode() != null)
+                .peek(m -> m.setChildren(this.getCompanyBuildingChildrenTree(m, allListVo)))
+                .collect(Collectors.toList());
+    }
+
+    private List<BuildingTreeVo> getCompanyBuildingChildrenTree(BuildingTreeVo root , List<BuildingTreeVo> all) {
+       return   all.stream().filter(b ->
+                        (root.getId() != null && StringUtil.isNotEmpty(b.getParentId()) && b.getParentId().equals(root.getId().toString())) ||
+                        ("allBuilding".equals(root.getGroupType())
+                        && "building".equals(b.getGroupType())
+                        && StringUtil.isNotEmpty(root.getBizOrgCode())
+                        && root.getBizOrgCode().equals(b.getBizOrgCode())
+                        && !b.getId().equals(root.getId())))
+               .peek(m -> {m.setChildren(getCompanyBuildingChildrenTree(m, all));
+                           m.setDetailPaneApi(address);
+                           m.setApiUrl(apiUrl);})
+               .collect(Collectors.toList());
+    }
 }

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

@@ -59,6 +59,7 @@ import com.yeejoin.equipmanage.mapper.StockMapper;
 import com.yeejoin.equipmanage.service.EquipmentManageService;
 import com.yeejoin.equipmanage.service.IEquipmentIndexService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
+import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
 import com.yeejoin.equipmanage.service.IEquipmentSystemSourceStatisticsService;
 import com.yeejoin.equipmanage.service.IFireFightingSystemService;
 import com.yeejoin.equipmanage.service.IJournalService;
@@ -122,6 +123,8 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Autowired
     private RelationRedisUtil relationRedisUtil;
 
+    @Autowired
+    IEquipmentSpecificSerivce equipmentSpecificSerivce;
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public StockBill in(List<StockDetail> list, String type, AgencyUserModel agencyUserModel) {
@@ -284,6 +287,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<EquipmentSpecific> uploadListByTemplate(List<EquipmentDetailDownloadTemplateDto> equipmentDetailDownloadVOS, ReginParams reginParams, AgencyUserModel agencyUserModel) {
+    	equipmentSpecificSerivce.refreshStaData();//添加对于装备类型统计数据的刷新
     	StringBuffer fireFightSysIdsBuffer = new StringBuffer();
         SimpleDateFormat stf = new SimpleDateFormat("yyyy-MM-dd");
         List<EquipmentSpecific> list = new ArrayList<>();

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
+import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.VideoDTO;
 import com.yeejoin.equipmanage.common.entity.dto.VideoSaveDto;
@@ -23,6 +24,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -201,7 +203,17 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
 
     @Override
     public Page<PageVideoVO> pageVideo(VideoDTO videoDTO) {
-        return this.baseMapper.pageVideo(videoDTO.getPage(), videoDTO.getVideo());
+        Video video = videoDTO.getVideo();
+        String orgTypes = videoDTO.getOrgTypes();
+        String bizOrgCode = video.getBizOrgCode();
+        List<String> bizOrgCodeList = new ArrayList<>();
+        if (!StringUtils.isNotBlank(bizOrgCode)) {
+            List<OrgUsrDto> list = jcsRemoteService.getCompanyDeptListWithAuth(authKey, orgTypes);
+            if (!CollectionUtils.isEmpty(list)) {
+                list.stream().filter(o -> StringUtils.isNotBlank(o.getBizOrgCode())).forEach(x -> bizOrgCodeList.add(x.getBizOrgCode()));
+            }
+        }
+        return this.baseMapper.pageVideo(videoDTO.getPage(), video, bizOrgCodeList);
     }
 
     @Override

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

@@ -87,7 +87,8 @@
         MAX( CASE WHEN a.field_name = 'name' THEN a.field_value END ) AS name,
         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 = 'address' THEN a.field_value END ) AS address,
+        MAX( CASE WHEN a.field_name = 'bizOrgCode' THEN a.field_value END ) AS bizOrgCode
         FROM
         `wl_form_instance` a
         LEFT JOIN wl_source_scene wlss ON wlss.source_id = a.instance_id
@@ -116,7 +117,9 @@
         MAX(CASE WHEN a.field_name = 'hasFirePlan' THEN a.field_value END)AS hasFirePlan,
         MAX(CASE WHEN a.field_name = 'installLoc' THEN a.field_value END)AS installLoc,
         MAX(CASE WHEN a.field_name = 'inwhichBuild' THEN a.field_value END)AS inwhichBuild,
-        MAX(CASE WHEN a.field_name = 'maintenanceUnit' THEN a.field_value END)AS maintenanceUnit
+        MAX(CASE WHEN a.field_name = 'maintenanceUnit' THEN a.field_value END)AS maintenanceUnit,
+        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
         GROUP BY
@@ -129,6 +132,9 @@
             <if test="query.fieldValue != null and query.fieldValue !=''">
                 AND sa.fieldValue = #{query.fieldValue}
             </if>
+            <if test="query.bizOrgCode != null and query.bizOrgCode !=''">
+                AND sa.bizOrgCode LIKE CONCAT(#{query.bizOrgCode},'%')
+            </if>
         </where>
         ORDER BY sa.instanceId DESC
     </select>

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

@@ -48,7 +48,13 @@
             and wlv.type_code like concat('%',#{video.typeCode},'%')
         </if>
         <if test="video!=null and video.bizOrgCode!=null and video.bizOrgCode!=''">
-            and wlv.biz_org_code = #{video.bizOrgCode}
+            and wlv.biz_org_code LIKE CONCAT(#{video.bizOrgCode}, '%')
+        </if>
+        <if test="list != null and list.size() >0">
+            and wlv.biz_org_code IN
+            <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         group by  wlv.id
         order by wlv.create_date desc