Skip to content

A
amos-boot-biz
Commit d5999b18 authored by tangwei's avatar tangwei
Browse files
Options

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

parents c3b0819d 47d5d94d
Hide whitespace changes
Inline Side-by-side
Showing with 273 additions and 33 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/FireFightingSystemEntity.java
View file @ d5999b18
......@@ -122,4 +122,10 @@ public class FireFightingSystemEntity {
@ApiModelProperty("系统类型编码")
private String systemTypeCode;
@ApiModelProperty("机构/部门名称")
private String bizOrgName;
@ApiModelProperty("机构编码")
private String bizOrgCode;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/FireFightingSystemTreeVo.java 0 → 100644
View file @ d5999b18
package com.yeejoin.equipmanage.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author DELL
*/
@Data
@ApiModel("部门公司消防系统树")
public class FireFightingSystemTreeVo {
@ApiModelProperty("id主键")
private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("机构编码")
private String bizOrgCode;
@ApiModelProperty("父级id")
private String parentId;
@ApiModelProperty("children")
private List<FireFightingSystemTreeVo> children;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/FireFightingSystemTypeTreeVo.java 0 → 100644
View file @ d5999b18
package com.yeejoin.equipmanage.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author DELL
*/
@Data
@ApiModel("部门公司消防系统树")
public class FireFightingSystemTypeTreeVo {
@ApiModelProperty("id主键")
private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("父级id")
private String parentId;
@ApiModelProperty("数量")
private String total;
@ApiModelProperty("children")
private List<FireFightingSystemTypeTreeVo> children;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/FireFightingSystemVo.java
View file @ d5999b18
......@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.vo;
import com.yeejoin.equipmanage.common.entity.DynamicFormInstance;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
......@@ -165,4 +166,14 @@ public class FireFightingSystemVo implements Serializable {
*/
private String status;
/**
* 机构编码
*/
private String bizOrgCode;
/**
* 机构名称
*/
private String bizOrgName;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentManageController.java
View file @ d5999b18
......@@ -51,10 +51,11 @@ public class EquipmentManageController extends AbstractBaseController{
@RequestParam(value = "equipmentCode",required = false) String equipmentCode,
@RequestParam(value = "construction",required = false) String construction,
@RequestParam(value = "maintenance",required = false) String maintenance,
@RequestParam(value = "maintenance",required = false) String bizOrgCode,
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int pageSize
) {
return equipmentManageService.queryEquipmenInfoAndCount(equipmentName,equipmentCode,construction,maintenance,current,pageSize);
return equipmentManageService.queryEquipmenInfoAndCount(equipmentName,equipmentCode,construction,maintenance,bizOrgCode,current,pageSize);
}
@GetMapping(value = "/getUtils")
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java
View file @ d5999b18
......@@ -7,6 +7,9 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.equipmanage.common.vo.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
......@@ -47,11 +50,6 @@ import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
import com.yeejoin.equipmanage.common.utils.StringUtil;
import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
import com.yeejoin.equipmanage.common.vo.BuildingTreeVo;
import com.yeejoin.equipmanage.common.vo.EquipmentManageVo;
import com.yeejoin.equipmanage.common.vo.FireFightingSystemVo;
import com.yeejoin.equipmanage.common.vo.SpeIndexVo;
import com.yeejoin.equipmanage.mapper.EquipmentSpecificIndexMapper;
import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
import com.yeejoin.equipmanage.remote.RemoteSecurityService;
......@@ -329,10 +327,11 @@ public class FireFightingSystemController extends AbstractBaseController {
@RequestParam(value = "equipmentCode", required = false) String equipmentCode,
@RequestParam(value = "construction", required = false) String construction,
@RequestParam(value = "maintenance", required = false) String maintenance,
@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int pageSize
) {
return fireFightingSystemService.queryEquipmenInfoAndCount(equipmentName, equipmentCode, construction, maintenance, current, pageSize);
return fireFightingSystemService.queryEquipmenInfoAndCount(equipmentName, equipmentCode, construction, maintenance, bizOrgCode, current, pageSize);
}
/**
......@@ -542,4 +541,43 @@ public class FireFightingSystemController extends AbstractBaseController {
return fireFightingSystemService.getSystemCategory();
}
/**
* 获取公司部门系统树
* @return list
*/
@PersonIdentify
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据登陆人获取公司部门系统树", notes = "根据登陆人获取公司部门系统树")
@GetMapping(value = "/companySystemTreeByUser")
public List<FireFightingSystemTreeVo> getSystemTree(){
ReginParams reginParams = getSelectedOrgInfo();
ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
String bizOrgCode = personIdentity.getBizOrgCode();
return fireFightingSystemService.getSystemTreeByOrgCode(bizOrgCode);
}
/**
* 获取人员部门树
* @return list
*/
@PersonIdentify
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据登陆人、机构类型获取人员部门树", notes = "根据登陆人、机构类型获取人员部门树")
@GetMapping(value = "/companyTreeByUserAndType")
public List<OrgMenuDto> companyTreeByUserAndType(@RequestParam(required = false) String type){
// 获取登陆人角色
ReginParams reginParams = getSelectedOrgInfo();
return fireFightingSystemService.companyTreeByUserAndType(reginParams ,type);
}
/**
* 获取系统分类树
* @return list
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "获取系统分类树", notes = "获取系统分类树")
@GetMapping(value = "/systemTypeTree")
public List<FireFightingSystemTypeTreeVo> systemTypeTree(){
return fireFightingSystemService.systemTypeTree();
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/EquipmentManageService.java
View file @ d5999b18
......@@ -26,7 +26,7 @@ public interface EquipmentManageService extends IService<EquipmentManageEntity>
* @param pageSize
* @return
*/
Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, int spage, int pageSize);
Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, int spage, int pageSize);
/**
* 获取下拉菜单数据
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java
View file @ d5999b18
......@@ -2,6 +2,8 @@ package com.yeejoin.equipmanage.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.feign.morphic.model.ResourceDTO;
import com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem;
import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
......@@ -31,7 +33,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
* @param pageSize
* @return
*/
Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, int current, int pageSize);
Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, int current, int pageSize);
FireFightingSystemEntity getOneById(Long id);
/**
......@@ -151,7 +153,25 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
* @return Map<String,Object>
*/
Map<String,Object> integrationPageSysData(String systemCode, Boolean isUpdate);
/**
* 根据bizOrgCode获取消防系统树
* @param bizOrgCode 登陆人的机构编码
* @return list
*/
List<FireFightingSystemTreeVo> getSystemTreeByOrgCode(String bizOrgCode);
/**
* 根据登录人及类型获取公司部门树
* @param reginParams 公司及部门信息
* @param type 默认查询公司及部门，公司：COMPANY，部门：DEPARTMENT
* @return
*/
List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type);
/**
* 获取消防系统类型树
* @return
*/
List<FireFightingSystemTypeTreeVo> systemTypeTree();
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java
View file @ d5999b18
......@@ -62,7 +62,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
private String fireSystemId;
@Override
public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, int current, int pageSize) {
public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, int current, int pageSize) {
HttpServletRequest request = null;
Map map = new HashMap<String, Object>();
map.put("equimentName", equimentName);
......@@ -71,6 +71,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
map.put("maintenance", maintenance);
map.put("spage", current);
map.put("pageSize", pageSize);
map.put("bizOrgCode", bizOrgCode);
List<EquipmentManageVo> dataList = equipmentManageMapper.queryEquipmenInfo(map);
Long count = equipmentManageMapper.queryEquipmenCount(map);
map.clear();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @ d5999b18
......@@ -4,17 +4,16 @@ import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.equipmanage.common.vo.*;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -60,12 +59,6 @@ import com.yeejoin.equipmanage.common.enums.EquipmentSpeIndexEnum;
import com.yeejoin.equipmanage.common.enums.SystemTypeEnum;
import com.yeejoin.equipmanage.common.enums.TrueOrFalseEnum;
import com.yeejoin.equipmanage.common.utils.StringUtil;
import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
import com.yeejoin.equipmanage.common.vo.EquipmentManageVo;
import com.yeejoin.equipmanage.common.vo.FileUploadVo;
import com.yeejoin.equipmanage.common.vo.FireFightingSystem3dVo;
import com.yeejoin.equipmanage.common.vo.FireFightingSystemVo;
import com.yeejoin.equipmanage.common.vo.SpeIndexVo;
import com.yeejoin.equipmanage.mapper.BuildingMapper;
import com.yeejoin.equipmanage.mapper.EquipmentManageMapper;
import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
......@@ -142,6 +135,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Autowired
MqttSendGateway mqttSendGateway;
@Autowired
private IOrgUsrService iOrgUsrService;
@Value("${systemctl.sync.switch}")
private Boolean syncSwitch;
......@@ -157,8 +153,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
}
@Override
public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, int current, int pageSize) {
Map<String, Object> map = equipmentManageService.queryEquipmenInfoAndCount(equimentName, equimentCode, construction, maintenance, current, pageSize);
public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, int current, int pageSize) {
Map<String, Object> map = equipmentManageService.queryEquipmenInfoAndCount(equimentName, equimentCode, construction, maintenance, bizOrgCode, current, pageSize);
List<EquipmentManageVo> dataList = (List<EquipmentManageVo>) map.get("dataList");
StringBuilder stb = new StringBuilder();
dataList.forEach(y -> {
......@@ -841,5 +837,83 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
}
}
@Override
public List<FireFightingSystemTreeVo> getSystemTreeByOrgCode(String bizOrgCode) {
// 获取公司部门list
List<OrgUsr> orgUsrLists = iOrgUsrService.getListByBizOrgTypeCode("COMPANY,DEPARTMENT", bizOrgCode);
List<FireFightingSystemTreeVo> fireFightingSystemTreeList = orgUsrLists.stream()
.map(key -> {
FireFightingSystemTreeVo vo = new FireFightingSystemTreeVo();
vo.setId(String.valueOf(key.getSequenceNbr()));
vo.setName(key.getBizOrgName());
vo.setType(key.getBizOrgType());
vo.setBizOrgCode(key.getBizOrgCode());
vo.setParentId(key.getParentId());
return vo;
}).collect(Collectors.toList());
// 根据bizOrgCode获取系统list
LambdaQueryWrapper<FireFightingSystemEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.likeRight(FireFightingSystemEntity::getBizOrgCode, bizOrgCode);
List<FireFightingSystemEntity> fireFightingSystemEntityList = this.baseMapper.selectList(wrapper);
List<FireFightingSystemTreeVo> systemList = fireFightingSystemEntityList.stream()
.map(key -> {
FireFightingSystemTreeVo vo = new FireFightingSystemTreeVo();
vo.setId(String.valueOf(key.getId()));
vo.setName(key.getName());
vo.setType("system");
vo.setBizOrgCode(key.getBizOrgCode());
return vo;
}).collect(Collectors.toList());
// 组装公司部门树
fireFightingSystemTreeList.addAll(systemList);
return fireFightingSystemTreeList.stream()
.filter(d -> bizOrgCode.equals(d.getBizOrgCode()) && !"system".equals(d.getType()))
.peek((m) -> m.setChildren(getChildren(m, fireFightingSystemTreeList)))
.collect(Collectors.toList());
}
private List<FireFightingSystemTreeVo> getChildren(FireFightingSystemTreeVo root, List<FireFightingSystemTreeVo> all) {
return all.stream().filter(d -> StringUtil.isNotEmpty(d.getParentId()) && d.getParentId().equals(root.getId())
|| (StringUtil.isNotEmpty(d.getBizOrgCode())
&& d.getBizOrgCode().equals(root.getBizOrgCode())
&& !"system".equals(root.getType())
&& !d.getId().equals(root.getId()))
)
.peek(m -> m.setChildren(getChildren(m, all)))
.collect(Collectors.toList());
}
@Override
public List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type) {
return iOrgUsrService.companyTreeByUserAndType(reginParams, type);
}
@Override
public List<FireFightingSystemTypeTreeVo> systemTypeTree() {
// 获取所有系统list
LambdaQueryWrapper<DynamicFormGroup> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(DynamicFormGroup::getGroupType, "fireSystem");
wrapper.eq(DynamicFormGroup::getParentId,0);
List<DynamicFormGroup> list = iEqDynamicFormGroupService.list(wrapper);
List<FireFightingSystemTypeTreeVo> childrenList = list.stream().map(item -> {
FireFightingSystemTypeTreeVo vo = new FireFightingSystemTypeTreeVo();
vo.setName(item.getGroupName());
vo.setTotal("0");
vo.setType(item.getGroupType());
vo.setId(String.valueOf(item.getId()));
return vo;
}).collect(Collectors.toList());
// 自定义根节点返回树
FireFightingSystemTypeTreeVo parentNode = new FireFightingSystemTypeTreeVo();
parentNode.setType("all");
parentNode.setName("全部分类");
parentNode.setId("-1");
parentNode.setParentId("-1");
parentNode.setChildren(childrenList);
return Collections.singletonList(parentNode);
}
}
amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
View file @ d5999b18
......@@ -2121,4 +2121,15 @@
alter table `f_fire_fighting_system` add column `biz_org_name` varchar(128) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构/部门名称';
</sql>
</changeSet>
<changeSet author="chenzhao" id="2021-122201">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_fire_station"/>
</preConditions>
<comment>新增机构/部门名称 机构编码 </comment>
<sql>
ALTER TABLE `cb_fire_station` add column `biz_org_name` varchar(104) DEFAULT NULL COMMENT '机构/部门名称';
ALTER TABLE `cb_fire_station` add column `biz_org_code` varchar(1000) DEFAULT NULL COMMENT '机构编码';
</sql>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml
View file @ d5999b18
......@@ -35,6 +35,9 @@
<if test="maintenance != 'all' ">
AND MAINTENANCE_UNIT = #{maintenance}
</if>
<if test="bizOrgCode != 'null' and bizOrgCode != ''">
AND biz_org_code like CONCAT(#{bizOrgCode},'%')
</if>
order by id DESC
LIMIT #{spage},#{pageSize}
</select>
......@@ -56,6 +59,9 @@
<if test="maintenance != 'all' ">
AND maintenance_unit = #{maintenance}
</if>
<if test="bizOrgCode != 'null' and bizOrgCode != ''">
AND biz_org_code like CONCAT(#{bizOrgCode},'%')
</if>
</select>
<select id="getUtils" resultType="com.yeejoin.equipmanage.common.vo.EquipmentManageVo">
select
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ d5999b18
......@@ -93,7 +93,9 @@
instance_id,
pro_code,
factory,
contro_box_address
contro_box_address,
biz_org_code,
biz_org_name
)
VALUES(
#{id},
......@@ -119,7 +121,9 @@
#{instanceId},
#{proCode},
#{factory},
#{controBoxAddress}
#{controBoxAddress},
#{bizOrgCode},
#{bizOrgName}
)
</insert>
<insert id="insertFile">
......@@ -164,7 +168,9 @@
factory=#{factory},
code=#{code},
form_group_id =#{formGroupId},
contro_box_address = #{controBoxAddress}
contro_box_address = #{controBoxAddress},
biz_org_code=#{bizOrgCode},
biz_org_name=#{bizOrgName}
where id = #{id}
</update>
<delete id="deleteFilre">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment